From 04f0af131eaf5f52fe1c3af60232059e28178654 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Fri, 17 Mar 2023 11:20:53 +0100 Subject: [PATCH 001/533] show ontologies lang dynamically --- app/controllers/ontologies_controller.rb | 15 ++++++++++++++ app/views/layouts/_ontology_viewer.html.haml | 21 +++++++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index 12035ac7f..f5ef8c616 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -340,6 +340,10 @@ def show # Get the latest submission (not necessarily the latest 'ready' submission) @submission_latest = @ontology.explore.latest_submission rescue @ontology.explore.latest_submission(include: '') + + submission_lang = get_submission_languages(@submission_latest.naturalLanguage) + + @submission_lang_options = transform_langs_to_select_options(submission_lang) # Is the ontology downloadable? @ont_restricted = ontology_restricted?(@ontology.acronym) @@ -459,6 +463,17 @@ def widgets private + + def get_submission_languages(submission_natural_language = []) + submission_natural_language.map do |natural_language| + natural_language[/iso639-3\/(\w+)/, 1] + end.compact + end + + def transform_langs_to_select_options(langs = []) + langs.map { |lang| [lang.upcase, lang.slice(0, 2).upcase] } + end + def ontology_params p = params.require(:ontology).permit(:name, :acronym, { administeredBy:[] }, :viewingRestriction, { acl:[] }, { hasDomain:[] }, :isView, :viewOf, :subscribe_notifications, {group:[]}) diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index 709267865..397ceb2e2 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -106,19 +106,22 @@ %div.card-header - sections = sections_to_show -# Tabbed navigation bar for ontology content sections - %ul.nav.nav-tabs.card-header-tabs{id: "navbar-ontology", role: "tablist"} - - sections.each do |section| - %li.nav-item - = link_to(section_name(section) , ontology_path(@ontology.acronym, p: section), - id: "ont-#{section}-tab", class: "nav-link #{selected_section?(section) ? 'active show' : ''}", - data: {toggle: "tab", target: "#ont_#{section}_content", 'bp-ont-page': section , - 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section) }) + %div{style: "display: flex; justify-content: space-between;"} + %ul.nav.nav-tabs.card-header-tabs{id: "navbar-ontology", role: "tablist"} + - sections.each do |section| + %li.nav-item + = link_to(section_name(section) , ontology_path(@ontology.acronym, p: section), + id: "ont-#{section}-tab", class: "nav-link #{selected_section?(section) ? 'active show' : ''}", + data: {toggle: "tab", target: "#ont_#{section}_content", 'bp-ont-page': section , + 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section) }) + = select_tag :category, options_for_select(@submission_lang_options), data: { controller: "langs" }, id: "category-select", style: "background-color: #f2f2f2; color: #333; font-size: 14px; padding: 2px 6px 2px 6px; border: 1px solid #ccc; border-radius: 4px;outline: none;" + %div.card-body %div.tab-content - sections.each do |section| %div.tab-pane{id: "ont_#{section}_content", class: selected_section?(section) ? 'active show' : ''} - = lazy_load_section(section) do - - yield + = lazy_load_section(section) { yield } + = render partial: "layouts/footer" From c96339f345cc86aa50fcc51b123e331c63a6aa1f Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Tue, 21 Mar 2023 20:00:13 +0100 Subject: [PATCH 002/533] change the ui when change language --- app/controllers/application_controller.rb | 12 ++++++------ app/controllers/ontologies_controller.rb | 17 ++++++----------- app/javascript/controllers/application.js | 2 +- .../controllers/chosen_controller.js | 3 --- app/javascript/controllers/index.js | 3 +++ .../controllers/language_change_controller.js | 19 +++++++++++++++++++ .../controllers/turbo_frame_controller.js | 2 ++ app/views/concepts/_show.html.haml | 1 + app/views/layouts/_ontology_viewer.html.haml | 9 +++++---- .../ontologies/sections/visualize.html.haml | 2 +- 10 files changed, 44 insertions(+), 26 deletions(-) create mode 100644 app/javascript/controllers/language_change_controller.js diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 20c34ccfb..a880a8a5f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -437,7 +437,7 @@ def get_class(params) @concept.children = [] else # Display only the requested class in the tree - @concept = @ontology.explore.single_class({full: true}, params[:conceptid]) + @concept = @ontology.explore.single_class({full: true, lang: "FR"}, params[:conceptid]) @concept.children = [] end @root = LinkedData::Client::Models::Class.new @@ -452,7 +452,7 @@ def get_class(params) if ignore_concept_param # get the top level nodes for the root # TODO_REV: Support views? Replace old view call: @ontology.top_level_classes(view) - roots = @ontology.explore.roots(concept_schemes: params[:concept_schemes]) + roots = @ontology.explore.roots(concept_schemes: params[:concept_schemes], lang: "FR") if roots.nil? || roots.empty? LOG.add :debug, "Missing roots for #{@ontology.acronym}" not_found("Missing roots for #{@ontology.acronym}") @@ -463,7 +463,7 @@ def get_class(params) # get the initial concept to display root_child = @root.children.first - @concept = root_child.explore.self(full: true) + @concept = root_child.explore.self(full: true, lang: "FR") # Some ontologies have "too many children" at their root. These will not process and are handled here. if @concept.nil? LOG.add :debug, "Missing class #{root_child.links.self}" @@ -471,16 +471,16 @@ def get_class(params) end else # if the id is coming from a param, use that to get concept - @concept = @ontology.explore.single_class({full: true}, params[:conceptid]) + @concept = @ontology.explore.single_class({full: true, lang: "FR"}, params[:conceptid]) if @concept.nil? || @concept.errors LOG.add :debug, "Missing class #{@ontology.acronym} / #{params[:conceptid]}" not_found("Missing class #{@ontology.acronym} / #{params[:conceptid]}") end # Create the tree - rootNode = @concept.explore.tree(include: "prefLabel,hasChildren,obsolete", concept_schemes: params[:concept_schemes]) + rootNode = @concept.explore.tree(include: "prefLabel,hasChildren,obsolete", concept_schemes: params[:concept_schemes], lang: "FR") if rootNode.nil? || rootNode.empty? - roots = @ontology.explore.roots(concept_schemes: params[:concept_schemes]) + roots = @ontology.explore.roots(concept_schemes: params[:concept_schemes], lang: "FR") if roots.nil? || roots.empty? LOG.add :debug, "Missing roots for #{@ontology.acronym}" not_found("Missing roots for #{@ontology.acronym}") diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index f5ef8c616..05e03624d 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -28,8 +28,7 @@ def index @app_name = 'FacetedBrowsing' @app_dir = '/browse' @base_path = @app_dir - ontologies = LinkedData::Client::Models::Ontology.all( -include: LinkedData::Client::Models::Ontology.include_params + ',viewOf', include_views: true, display_context: false) + ontologies = LinkedData::Client::Models::Ontology.all(include: LinkedData::Client::Models::Ontology.include_params + ',viewOf', include_views: true, display_context: false) ontologies_hash = Hash[ontologies.map {|o| [o.id, o] }] @admin = session[:user] ? session[:user].admin? : false @development = Rails.env.development? @@ -39,8 +38,7 @@ def index # The attributes used when retrieving the submission. We are not retrieving all attributes to be faster browse_attributes = 'ontology,acronym,submissionStatus,description,pullLocation,creationDate,released,name,naturalLanguage,hasOntologyLanguage,hasFormalityLevel,isOfType,contact' - submissions = LinkedData::Client::Models::OntologySubmission.all(include_views: true, display_links: false, -display_context: false, include: browse_attributes) + submissions = LinkedData::Client::Models::OntologySubmission.all(include_views: true, display_links: false,display_context: false, include: browse_attributes) submissions_map = Hash[submissions.map {|sub| [sub.ontology.acronym, sub] }] @categories = LinkedData::Client::Models::Category.all(display_links: false, display_context: false) @@ -236,8 +234,7 @@ def mappings def new @ontology = LinkedData::Client::Models::Ontology.new - @ontologies = LinkedData::Client::Models::Ontology.all(include: 'acronym', include_views: true, -display_links: false, display_context: false) + @ontologies = LinkedData::Client::Models::Ontology.all(include: 'acronym', include_views: true,display_links: false, display_context: false) @categories = LinkedData::Client::Models::Category.all @groups = LinkedData::Client::Models::Group.all @user_select_list = LinkedData::Client::Models::User.all.map {|u| [u.username, u.id]} @@ -343,7 +340,7 @@ def show submission_lang = get_submission_languages(@submission_latest.naturalLanguage) - @submission_lang_options = transform_langs_to_select_options(submission_lang) + @submission_lang_options = transform_langs_to_select_options(submission_lang) # Is the ontology downloadable? @ont_restricted = ontology_restricted?(@ontology.acronym) @@ -465,13 +462,11 @@ def widgets def get_submission_languages(submission_natural_language = []) - submission_natural_language.map do |natural_language| - natural_language[/iso639-3\/(\w+)/, 1] - end.compact + submission_natural_language.map { |natural_language| natural_language["iso639"] && natural_language.split('/').last }.compact end def transform_langs_to_select_options(langs = []) - langs.map { |lang| [lang.upcase, lang.slice(0, 2).upcase] } + langs.map { |lang| [lang.upcase, lang.slice(0, 2)] } end def ontology_params diff --git a/app/javascript/controllers/application.js b/app/javascript/controllers/application.js index 258ab85b4..4f68f0621 100644 --- a/app/javascript/controllers/application.js +++ b/app/javascript/controllers/application.js @@ -3,7 +3,7 @@ import { Application } from "@hotwired/stimulus" const application = Application.start() // Configure Stimulus development experience -application.debug = false +application.debug = true window.Stimulus = application diff --git a/app/javascript/controllers/chosen_controller.js b/app/javascript/controllers/chosen_controller.js index 38d1a092d..3293c985f 100644 --- a/app/javascript/controllers/chosen_controller.js +++ b/app/javascript/controllers/chosen_controller.js @@ -61,9 +61,6 @@ export default class extends Controller { chosenClose.style.position = "unset" chosenClose.style.margin = "auto" - - - } }) } diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index 553504b0a..fabc20e78 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -25,6 +25,9 @@ application.register("label-ajax", LabelAjaxController) import LabelsAjaxContainerController from "./labels_ajax_container_controller" application.register("labels-ajax-container", LabelsAjaxContainerController) +import LanguageChangeController from "./language_change_controller" +application.register("language-change", LanguageChangeController) + import LoadChartController from "./load_chart_controller" application.register("load-chart", LoadChartController) diff --git a/app/javascript/controllers/language_change_controller.js b/app/javascript/controllers/language_change_controller.js new file mode 100644 index 000000000..07a2798d6 --- /dev/null +++ b/app/javascript/controllers/language_change_controller.js @@ -0,0 +1,19 @@ +import { Controller } from "@hotwired/stimulus" + +// Connects to data-controller="language-change" +export default class extends Controller { + + onChange() { + + this.element.dispatchEvent(new CustomEvent('lang_changed', { + bubbles: true, + cancelable: true, + detail: { + data: { + language: [this.element.value] + } + } + })); + + } +} diff --git a/app/javascript/controllers/turbo_frame_controller.js b/app/javascript/controllers/turbo_frame_controller.js index 821bb4fc5..8f559aa90 100644 --- a/app/javascript/controllers/turbo_frame_controller.js +++ b/app/javascript/controllers/turbo_frame_controller.js @@ -19,7 +19,9 @@ export default class extends Controller { if (values.filter(x => x.length !== 0).length === 0) { this.frame.innerHTML = this.placeHolderValue } else { + debugger this.frame.innerHTML = "" + // this.urlValue = this.urlValue || window.location.href; this.urlValue = new HistoryService().getUpdatedURL(this.urlValue, newData); this.frame.src = this.urlValue } diff --git a/app/views/concepts/_show.html.haml b/app/views/concepts/_show.html.haml index 71f02f9a3..040134fec 100644 --- a/app/views/concepts/_show.html.haml +++ b/app/views/concepts/_show.html.haml @@ -1,5 +1,6 @@ = render TurboFrameComponent.new(id: 'concept_show', data: {controller:'labels-ajax-container', 'action': 'turbo:before-fetch-request->labels-ajax-container#abortAll', 'labels-ajax-container-label-ajax-outlet': '#concept_show a[data-controller="label-ajax"]'}) do + / When we have an ontology with a flat hierarchy, we initially disable the tabs because we don't have a class to display - if @concept.id.eql?("bp_fake_root") %div{:style => "padding: 100px 0; font-size: larger; font-weight: bold; text-align: center;"} diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index 397ceb2e2..c6c8cf6f0 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -94,13 +94,14 @@ = link_to(sub.documentation, "aria-label": "Ontology documentation", title: "Ontology documentation", target: "_blank") do %i.fas.fa-lg.fa-book-reader{"aria-hidden": true} - unless sub.publication.nil? - = link_to(sub.publication, "aria-label": "Ontology publications", title: "Ontology publications", target: "_blank") do - %i.fas.fa-lg.fa-book{"aria-hidden": true} + - sub.publication.each do |pub| + = link_to(pub, "aria-label": "Ontology publications", title: "Ontology publications", target: "_blank") do + %i.fas.fa-lg.fa-book{"aria-hidden": true} - if @ontology.admin?(session[:user]) = link_to(edit_ontology_path(@ontology.acronym), "aria-label": "Edit ontology details", title: "Edit ontology details") do %i.fas.fa-lg.fa-user-edit - %div.row.pb-4 + %div.row.pb-4{ data: { controller: "history turbo-frame", action: "lang_changed->history#updateURL lang_changed->turbo-frame#updateFrame", "turbo-frame-url-value": "/ontologies/INRAETHES/?p=classes"}} %div.col %div.card %div.card-header @@ -114,7 +115,7 @@ id: "ont-#{section}-tab", class: "nav-link #{selected_section?(section) ? 'active show' : ''}", data: {toggle: "tab", target: "#ont_#{section}_content", 'bp-ont-page': section , 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section) }) - = select_tag :category, options_for_select(@submission_lang_options), data: { controller: "langs" }, id: "category-select", style: "background-color: #f2f2f2; color: #333; font-size: 14px; padding: 2px 6px 2px 6px; border: 1px solid #ccc; border-radius: 4px;outline: none;" + = select_tag :category, options_for_select(@submission_lang_options), data: { controller: "language-change", action: "change->language-change#onChange"}, id: "category-select", style: "background-color: #f2f2f2; color: #333; font-size: 14px; padding: 2px 6px 2px 6px; border: 1px solid #ccc; border-radius: 4px;outline: none;" %div.card-body %div.tab-content diff --git a/app/views/ontologies/sections/visualize.html.haml b/app/views/ontologies/sections/visualize.html.haml index 14dee3422..52f9808b7 100644 --- a/app/views/ontologies/sections/visualize.html.haml +++ b/app/views/ontologies/sections/visualize.html.haml @@ -1,4 +1,4 @@ -= turbo_frame_tag 'classes' do += render TurboFrameComponent.new(id: "classes", data: {"turbo-frame-target": "frame"} ) do - unless @error - @title = "#{@ontology.name} - #{@concept.prefLabel}" - @new_term_request_ontologies From a7ab06c348c9947b875cf03b627d09f5aca68822 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Thu, 23 Mar 2023 15:24:18 +0100 Subject: [PATCH 003/533] show concepts dynamically based on requested_lang --- app/controllers/application_controller.rb | 14 ++++++++------ app/controllers/ontologies_controller.rb | 16 +++++++++++++--- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a880a8a5f..a775d05f1 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -421,6 +421,8 @@ def using_captcha? def get_class(params) + lang = params[:language]&.upcase&.to_sym + if @ontology.flat? ignore_concept_param = params[:conceptid].nil? || @@ -437,7 +439,7 @@ def get_class(params) @concept.children = [] else # Display only the requested class in the tree - @concept = @ontology.explore.single_class({full: true, lang: "FR"}, params[:conceptid]) + @concept = @ontology.explore.single_class({full: true, lang: lang }, params[:conceptid]) @concept.children = [] end @root = LinkedData::Client::Models::Class.new @@ -452,7 +454,7 @@ def get_class(params) if ignore_concept_param # get the top level nodes for the root # TODO_REV: Support views? Replace old view call: @ontology.top_level_classes(view) - roots = @ontology.explore.roots(concept_schemes: params[:concept_schemes], lang: "FR") + roots = @ontology.explore.roots(concept_schemes: params[:concept_schemes], lang: lang) if roots.nil? || roots.empty? LOG.add :debug, "Missing roots for #{@ontology.acronym}" not_found("Missing roots for #{@ontology.acronym}") @@ -463,7 +465,7 @@ def get_class(params) # get the initial concept to display root_child = @root.children.first - @concept = root_child.explore.self(full: true, lang: "FR") + @concept = root_child.explore.self(full: true, lang: lang) # Some ontologies have "too many children" at their root. These will not process and are handled here. if @concept.nil? LOG.add :debug, "Missing class #{root_child.links.self}" @@ -471,16 +473,16 @@ def get_class(params) end else # if the id is coming from a param, use that to get concept - @concept = @ontology.explore.single_class({full: true, lang: "FR"}, params[:conceptid]) + @concept = @ontology.explore.single_class({full: true, lang: lang}, params[:conceptid]) if @concept.nil? || @concept.errors LOG.add :debug, "Missing class #{@ontology.acronym} / #{params[:conceptid]}" not_found("Missing class #{@ontology.acronym} / #{params[:conceptid]}") end # Create the tree - rootNode = @concept.explore.tree(include: "prefLabel,hasChildren,obsolete", concept_schemes: params[:concept_schemes], lang: "FR") + rootNode = @concept.explore.tree(include: "prefLabel,hasChildren,obsolete", concept_schemes: params[:concept_schemes], lang: lang) if rootNode.nil? || rootNode.empty? - roots = @ontology.explore.roots(concept_schemes: params[:concept_schemes], lang: "FR") + roots = @ontology.explore.roots(concept_schemes: params[:concept_schemes], lang: lang) if roots.nil? || roots.empty? LOG.add :debug, "Missing roots for #{@ontology.acronym}" not_found("Missing roots for #{@ontology.acronym}") diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index 05e03624d..ee45bb347 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -340,7 +340,7 @@ def show submission_lang = get_submission_languages(@submission_latest.naturalLanguage) - @submission_lang_options = transform_langs_to_select_options(submission_lang) + @submission_lang_options = transform_langs_to_select_options(submission_lang, params[:language]) # Is the ontology downloadable? @ont_restricted = ontology_restricted?(@ontology.acronym) @@ -465,10 +465,20 @@ def get_submission_languages(submission_natural_language = []) submission_natural_language.map { |natural_language| natural_language["iso639"] && natural_language.split('/').last }.compact end - def transform_langs_to_select_options(langs = []) - langs.map { |lang| [lang.upcase, lang.slice(0, 2)] } + def transform_langs_to_select_options(langs = [], current_lang = nil) + # Transform each language into a select option + options = langs.map do |lang| + lang = lang.split('/').last + [lang.capitalize, lang.upcase, { selected: lang.casecmp(current_lang) == 0 }] + end + + # If none of the languages are marked as default, mark "All" as default + options.unshift(['All', nil, { selected: options.none? { |option| option[2][:selected] } }]) + + options end + def ontology_params p = params.require(:ontology).permit(:name, :acronym, { administeredBy:[] }, :viewingRestriction, { acl:[] }, { hasDomain:[] }, :isView, :viewOf, :subscribe_notifications, {group:[]}) From 92797bcf8797cfbe23f192b5a8f7906a187c09b3 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Thu, 23 Mar 2023 15:24:48 +0100 Subject: [PATCH 004/533] Refactor history controller --- app/javascript/controllers/history_controller.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/controllers/history_controller.js b/app/javascript/controllers/history_controller.js index d339c32f8..48518c64a 100644 --- a/app/javascript/controllers/history_controller.js +++ b/app/javascript/controllers/history_controller.js @@ -1,5 +1,5 @@ -import {Controller} from "@hotwired/stimulus" -import {HistoryService} from "../mixins/useHistory"; +import { Controller } from "@hotwired/stimulus" +import { HistoryService } from "../mixins/useHistory"; // Connects to data-controller="history" export default class extends Controller { @@ -7,9 +7,9 @@ export default class extends Controller { this.history = new HistoryService() } updateURL(event) { - const newData = event.detail.data - if (newData !== undefined) { - this.history.updateHistory(document.location.pathname + document.location.search, newData) + const { data } = event.detail + if (data !== undefined && Object.keys(data).length > 0) { + this.history.updateHistory(document.location.pathname + document.location.search, data) } } From dfed0d4b3c15008a066fd2b54402c57994bd5250 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Thu, 23 Mar 2023 15:25:35 +0100 Subject: [PATCH 005/533] refacto tubo_frame controller and update views --- .../controllers/turbo_frame_controller.js | 24 ++++++++----- app/javascript/mixins/useHistory.js | 34 ++++++++++++------- app/views/layouts/_ontology_viewer.html.haml | 2 +- .../ontologies/sections/visualize.html.haml | 2 +- 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/app/javascript/controllers/turbo_frame_controller.js b/app/javascript/controllers/turbo_frame_controller.js index 8f559aa90..7fbf6603d 100644 --- a/app/javascript/controllers/turbo_frame_controller.js +++ b/app/javascript/controllers/turbo_frame_controller.js @@ -1,11 +1,11 @@ -import {Controller} from "@hotwired/stimulus" -import {HistoryService} from "../mixins/useHistory"; +import { Controller } from "@hotwired/stimulus" +import { HistoryService } from "../mixins/useHistory"; // Connects to data-controller="turbo-frame" export default class extends Controller { static values = { url: String, - placeHolder: {type: String, default: 'Nothing loaded'}, + placeHolder: { type: String, default: 'Nothing loaded' }, } static targets = ['frame'] @@ -14,15 +14,21 @@ export default class extends Controller { } updateFrame(event) { - const newData = event.detail.data - const values = Object.entries(newData)[0][1] - if (values.filter(x => x.length !== 0).length === 0) { + const { data } = event.detail + const values = Object.values(data) + + // remove null and empty values + values.filter((value) => value !== "" || value !== null) + + if (values.length === 0) { this.frame.innerHTML = this.placeHolderValue } else { - debugger this.frame.innerHTML = "" - // this.urlValue = this.urlValue || window.location.href; - this.urlValue = new HistoryService().getUpdatedURL(this.urlValue, newData); + + this.urlValue ||= window.location.pathname + window.location.search; + + this.urlValue = new HistoryService().getUpdatedURL(this.urlValue, data); + this.frame.src = this.urlValue } } diff --git a/app/javascript/mixins/useHistory.js b/app/javascript/mixins/useHistory.js index 24a59cbec..911773588 100644 --- a/app/javascript/mixins/useHistory.js +++ b/app/javascript/mixins/useHistory.js @@ -1,5 +1,8 @@ export class HistoryService { + unWantedData = ['turbo', 'controller', 'target', 'value'] + + constructor() { this.history = History } @@ -20,27 +23,32 @@ export class HistoryService { } getUpdatedURL(currentUrl, newData) { - const url = new URL(currentUrl, document.location.origin) - const urlParams = url.searchParams - this.#updateURLFromState(urlParams, this.getState()) + const base = document.location.origin + const url = new URL(currentUrl, base) + + this.#updateURLFromState(url.searchParams, this.getState()) + + const wantedData = this.#filterUnwantedData(newData, this.unWantedData); - this.#filterUnwantedData(newData).forEach(([updatedParam, newValue]) => { - newValue = Array.isArray(newValue) ? newValue : [newValue] - if (newValue !== null && Array.from(newValue).length > 0) { - urlParams.set(updatedParam, newValue.join(',')) - } - }) + wantedData.forEach(([updatedParam, newValue]) => { + if (newValue === null) { + url.searchParams.delete(updatedParam) + } else { + newValue = Array.isArray(newValue) ? newValue : [newValue] + url.searchParams.set(updatedParam, newValue.join(',')) + } + }); + return url.pathname + url.search } - #filterUnwantedData(newData){ - const unWantedData = ['turbo', 'controller', 'target', 'value'] - return Object.entries(newData).filter(([key]) => unWantedData.filter(x => key.toLowerCase().includes(x)).length === 0) + #filterUnwantedData(data, unWantedData) { + return Object.entries(data).filter(([key]) => !unWantedData.some(uw => key.toLowerCase().includes(uw.toLowerCase()))) } - #initStateFromUrl(currentUrl) { + #initStateFromUrl(currentUrl) { const url = new URL(currentUrl, document.location.origin) const urlParams = url.searchParams const oldState = this.getState().data diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index c6c8cf6f0..117630308 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -101,7 +101,7 @@ = link_to(edit_ontology_path(@ontology.acronym), "aria-label": "Edit ontology details", title: "Edit ontology details") do %i.fas.fa-lg.fa-user-edit - %div.row.pb-4{ data: { controller: "history turbo-frame", action: "lang_changed->history#updateURL lang_changed->turbo-frame#updateFrame", "turbo-frame-url-value": "/ontologies/INRAETHES/?p=classes"}} + %div.row.pb-4{ data: { controller: "history turbo-frame", action: " lang_changed->history#updateURL lang_changed->turbo-frame#updateFrame"}} %div.col %div.card %div.card-header diff --git a/app/views/ontologies/sections/visualize.html.haml b/app/views/ontologies/sections/visualize.html.haml index 52f9808b7..e243989c5 100644 --- a/app/views/ontologies/sections/visualize.html.haml +++ b/app/views/ontologies/sections/visualize.html.haml @@ -1,4 +1,4 @@ -= render TurboFrameComponent.new(id: "classes", data: {"turbo-frame-target": "frame"} ) do += render TurboFrameComponent.new(id: "concepts", data: {"turbo-frame-target": "frame"} ) do - unless @error - @title = "#{@ontology.name} - #{@concept.prefLabel}" - @new_term_request_ontologies From f3515e2b301b6065c167c46a136e48fb63a988f9 Mon Sep 17 00:00:00 2001 From: OntoPortal Bot Date: Fri, 24 Mar 2023 09:54:37 +0000 Subject: [PATCH 006/533] [ontoportal-bot] Gemfile.lock update --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3bd81f23e..ec070151b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -158,7 +158,7 @@ GEM flamegraph (0.9.5) globalid (1.1.0) activesupport (>= 5.0) - graphql (2.0.18) + graphql (2.0.19) graphql-client (0.18.0) activesupport (>= 3.0) graphql @@ -231,7 +231,7 @@ GEM net-ssh (>= 2.6.5, < 8.0.0) net-smtp (0.3.3) net-protocol - net-ssh (7.0.1) + net-ssh (7.1.0) netrc (0.11.0) newrelic_rpm (9.0.0) nio4r (2.5.8) @@ -251,12 +251,12 @@ GEM puma (5.6.5) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.6.3) + rack (2.2.6.4) rack-accept (0.4.5) rack (>= 0.4) rack-mini-profiler (3.0.0) rack (>= 1.2.0) - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) rails (7.0.3) actioncable (= 7.0.3) @@ -310,7 +310,7 @@ GEM rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.3) + rspec-mocks (3.12.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-rails (6.0.1) @@ -322,7 +322,7 @@ GEM rspec-mocks (~> 3.11) rspec-support (~> 3.11) rspec-support (3.12.0) - rubocop (1.48.0) + rubocop (1.48.1) json (~> 2.3) parallel (~> 1.10) parser (>= 3.2.0.0) @@ -364,7 +364,7 @@ GEM sshkit (1.21.4) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - stackprof (0.2.23) + stackprof (0.2.24) stimulus-rails (1.2.1) railties (>= 6.0.0) temple (0.10.0) From b37447e344d1909dd029fe4217b4216f2758fbf9 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Sat, 25 Mar 2023 21:48:14 +0100 Subject: [PATCH 007/533] on language change load new content [ concept ] --- app/javascript/controllers/application.js | 2 +- .../controllers/language_change_controller.js | 21 +++++----- app/javascript/mixins/showLoader.js | 16 ++++++++ app/views/layouts/_ontology_viewer.html.haml | 41 ++++++++++--------- .../ontologies/sections/visualize.html.haml | 2 +- 5 files changed, 49 insertions(+), 33 deletions(-) create mode 100644 app/javascript/mixins/showLoader.js diff --git a/app/javascript/controllers/application.js b/app/javascript/controllers/application.js index 4f68f0621..258ab85b4 100644 --- a/app/javascript/controllers/application.js +++ b/app/javascript/controllers/application.js @@ -3,7 +3,7 @@ import { Application } from "@hotwired/stimulus" const application = Application.start() // Configure Stimulus development experience -application.debug = true +application.debug = false window.Stimulus = application diff --git a/app/javascript/controllers/language_change_controller.js b/app/javascript/controllers/language_change_controller.js index 07a2798d6..446a37a7f 100644 --- a/app/javascript/controllers/language_change_controller.js +++ b/app/javascript/controllers/language_change_controller.js @@ -1,19 +1,18 @@ import { Controller } from "@hotwired/stimulus" +import { showLoader } from "../mixins/showLoader"; -// Connects to data-controller="language-change" export default class extends Controller { - onChange() { + static targets = ["sections"] - this.element.dispatchEvent(new CustomEvent('lang_changed', { - bubbles: true, - cancelable: true, - detail: { - data: { - language: [this.element.value] - } - } - })); + onChange(event) { + showLoader(this.sectionsTarget); + + const url = new URL(window.location.href); + url.searchParams.set('language', event.target.value); + + Turbo.visit(url.toString()); } + } diff --git a/app/javascript/mixins/showLoader.js b/app/javascript/mixins/showLoader.js new file mode 100644 index 000000000..2235b28c0 --- /dev/null +++ b/app/javascript/mixins/showLoader.js @@ -0,0 +1,16 @@ +const loaderHtml = ` +
+
+
+
+
Loading
+
+
+
+
+`; + +export const showLoader = (element) => { + element.innerHTML = loaderHtml; +} + diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index 117630308..36949970b 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -101,27 +101,28 @@ = link_to(edit_ontology_path(@ontology.acronym), "aria-label": "Edit ontology details", title: "Edit ontology details") do %i.fas.fa-lg.fa-user-edit - %div.row.pb-4{ data: { controller: "history turbo-frame", action: " lang_changed->history#updateURL lang_changed->turbo-frame#updateFrame"}} - %div.col - %div.card - %div.card-header - - sections = sections_to_show - -# Tabbed navigation bar for ontology content sections - %div{style: "display: flex; justify-content: space-between;"} - %ul.nav.nav-tabs.card-header-tabs{id: "navbar-ontology", role: "tablist"} + = turbo_frame_tag 'sections', data: { controller: "language-change"} do + %div.row.pb-4 + %div.col + %div.card + %div.card-header + - sections = sections_to_show + -# Tabbed navigation bar for ontology content sections + %div{style: "display: flex; justify-content: space-between;"} + %ul.nav.nav-tabs.card-header-tabs{id: "navbar-ontology", role: "tablist"} + - sections.each do |section| + %li.nav-item + = link_to(section_name(section) , ontology_path(@ontology.acronym, p: section), + id: "ont-#{section}-tab", class: "nav-link #{selected_section?(section) ? 'active show' : ''}", + data: {toggle: "tab", target: "#ont_#{section}_content", 'bp-ont-page': section , + 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section) }) + = select_tag :category, options_for_select(@submission_lang_options), data: { action: "change->language-change#onChange"}, id: "category-select", style: "background-color: #f2f2f2; color: #333; font-size: 14px; padding: 2px 6px 2px 6px; border: 1px solid #ccc; border-radius: 4px;outline: none;" + -# = link_to "Download", "/ontologies/INRAETHES/?p=classes&language=EN", class: "btn btn-primary btn-sm", style: "margin-left: 10px;" + %div.card-body + %div.tab-content{"data-target": "language-change.sections"} - sections.each do |section| - %li.nav-item - = link_to(section_name(section) , ontology_path(@ontology.acronym, p: section), - id: "ont-#{section}-tab", class: "nav-link #{selected_section?(section) ? 'active show' : ''}", - data: {toggle: "tab", target: "#ont_#{section}_content", 'bp-ont-page': section , - 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section) }) - = select_tag :category, options_for_select(@submission_lang_options), data: { controller: "language-change", action: "change->language-change#onChange"}, id: "category-select", style: "background-color: #f2f2f2; color: #333; font-size: 14px; padding: 2px 6px 2px 6px; border: 1px solid #ccc; border-radius: 4px;outline: none;" - - %div.card-body - %div.tab-content - - sections.each do |section| - %div.tab-pane{id: "ont_#{section}_content", class: selected_section?(section) ? 'active show' : ''} - = lazy_load_section(section) { yield } + %div.tab-pane{id: "ont_#{section}_content", class: selected_section?(section) ? 'active show' : ''} + = lazy_load_section(section) { yield } = render partial: "layouts/footer" diff --git a/app/views/ontologies/sections/visualize.html.haml b/app/views/ontologies/sections/visualize.html.haml index e243989c5..08bac952a 100644 --- a/app/views/ontologies/sections/visualize.html.haml +++ b/app/views/ontologies/sections/visualize.html.haml @@ -1,4 +1,4 @@ -= render TurboFrameComponent.new(id: "concepts", data: {"turbo-frame-target": "frame"} ) do += turbo_frame_tag 'concepts' do - unless @error - @title = "#{@ontology.name} - #{@concept.prefLabel}" - @new_term_request_ontologies From 4526ef624b7e7a27d50cf1d026483b37202abdd6 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 26 Mar 2023 18:17:02 +0200 Subject: [PATCH 008/533] update turbo_frame component to not use "src" attribute if nil --- app/components/turbo_frame_component.rb | 3 +++ .../turbo_frame_component/turbo_frame_component.html.haml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/components/turbo_frame_component.rb b/app/components/turbo_frame_component.rb index d25a16470..f14f587cd 100644 --- a/app/components/turbo_frame_component.rb +++ b/app/components/turbo_frame_component.rb @@ -28,6 +28,9 @@ def turbo_frame_html_options @html_options[:class] += " #{out[:class]}" end + if @src && !@src.empty? + @html_options[:src] = @src + end @html_options end diff --git a/app/components/turbo_frame_component/turbo_frame_component.html.haml b/app/components/turbo_frame_component/turbo_frame_component.html.haml index acedbda10..0991eb213 100644 --- a/app/components/turbo_frame_component/turbo_frame_component.html.haml +++ b/app/components/turbo_frame_component/turbo_frame_component.html.haml @@ -1,5 +1,5 @@ %div.d-flex.flex-column{data: {controller: 'turbo-frame-error'}} - = turbo_frame_tag @id, src: @src , **turbo_frame_html_options do + = turbo_frame_tag @id, **turbo_frame_html_options do %div.hide-if-loading = content %div.show-if-loading.my-auto.mx-auto From bfa29fa774812c0e0e036951dc7158f82f28fcd5 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 26 Mar 2023 18:55:32 +0200 Subject: [PATCH 009/533] refactor transform_langs_to_select_options to be an ontology helper --- app/controllers/ontologies_controller.rb | 24 ++---------------------- app/helpers/ontologies_helper.rb | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index ee45bb347..f37a0e2a3 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -337,11 +337,6 @@ def show # Get the latest submission (not necessarily the latest 'ready' submission) @submission_latest = @ontology.explore.latest_submission rescue @ontology.explore.latest_submission(include: '') - - submission_lang = get_submission_languages(@submission_latest.naturalLanguage) - - @submission_lang_options = transform_langs_to_select_options(submission_lang, params[:language]) - # Is the ontology downloadable? @ont_restricted = ontology_restricted?(@ontology.acronym) @@ -461,24 +456,9 @@ def widgets private - def get_submission_languages(submission_natural_language = []) - submission_natural_language.map { |natural_language| natural_language["iso639"] && natural_language.split('/').last }.compact - end - def transform_langs_to_select_options(langs = [], current_lang = nil) - # Transform each language into a select option - options = langs.map do |lang| - lang = lang.split('/').last - [lang.capitalize, lang.upcase, { selected: lang.casecmp(current_lang) == 0 }] - end - - # If none of the languages are marked as default, mark "All" as default - options.unshift(['All', nil, { selected: options.none? { |option| option[2][:selected] } }]) - - options - end - - + + def ontology_params p = params.require(:ontology).permit(:name, :acronym, { administeredBy:[] }, :viewingRestriction, { acl:[] }, { hasDomain:[] }, :isView, :viewOf, :subscribe_notifications, {group:[]}) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 6e43ba819..658c3baad 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -416,5 +416,29 @@ def sections_to_show end sections end + + + def languages_options(submission = @submission) + current_lang = request_lang + submission_lang = submission_languages(submission) + # Transform each language into a select option + submission_lang = submission_lang.map do |lang| + lang = lang.split('/').last.upcase + [lang, lang, { selected: lang.eql?(current_lang) }] + end + options_for_select(submission_lang) + end + + def request_lang + lang = params[:language] || params[:lang] + lang&.upcase + end + + + private + + def submission_languages(submission = @submission) + submission.naturalLanguage.map { |natural_language| natural_language["iso639"] && natural_language.split('/').last }.compact + end end From 92842cf9f7f857fd7122db53ac34705a9209ed5e Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 26 Mar 2023 18:48:39 +0200 Subject: [PATCH 010/533] add request_lang helper --- app/controllers/application_controller.rb | 4 ++++ app/helpers/application_helper.rb | 5 +++++ app/helpers/ontologies_helper.rb | 6 ------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a775d05f1..5c12ea09f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -758,6 +758,10 @@ def submission_metadata end helper_method :submission_metadata + + def request_lang + helpers.request_lang + end private def not_found_record(exception) @error_message = exception.message diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c177add57..375afdf71 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -602,4 +602,9 @@ def skos? submission = @submission || @submission_latest submission&.hasOntologyLanguage === 'SKOS' end + + def request_lang + lang = params[:language] || params[:lang] + lang&.upcase + end end diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 658c3baad..9c5a7c8a8 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -429,12 +429,6 @@ def languages_options(submission = @submission) options_for_select(submission_lang) end - def request_lang - lang = params[:language] || params[:lang] - lang&.upcase - end - - private def submission_languages(submission = @submission) From 4ea7592ebdb94ccc3418f6e3ec559dee7b8af6e9 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 26 Mar 2023 19:09:47 +0200 Subject: [PATCH 011/533] use request_lang in "get_class" for getting ontology roots --- app/controllers/application_controller.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5c12ea09f..b97df1d12 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -421,7 +421,7 @@ def using_captcha? def get_class(params) - lang = params[:language]&.upcase&.to_sym + lang = request_lang if @ontology.flat? @@ -448,13 +448,14 @@ def get_class(params) else # not ignoring 'bp_fake_root' here + include = 'prefLabel,hasChildren,obsolete' ignore_concept_param = params[:conceptid].nil? || params[:conceptid].empty? || params[:conceptid].eql?("root") if ignore_concept_param # get the top level nodes for the root # TODO_REV: Support views? Replace old view call: @ontology.top_level_classes(view) - roots = @ontology.explore.roots(concept_schemes: params[:concept_schemes], lang: lang) + roots = @ontology.explore.roots(concept_schemes: params[:concept_schemes], lang: lang, include: include) if roots.nil? || roots.empty? LOG.add :debug, "Missing roots for #{@ontology.acronym}" not_found("Missing roots for #{@ontology.acronym}") @@ -480,9 +481,9 @@ def get_class(params) end # Create the tree - rootNode = @concept.explore.tree(include: "prefLabel,hasChildren,obsolete", concept_schemes: params[:concept_schemes], lang: lang) + rootNode = @concept.explore.tree(include: include, concept_schemes: params[:concept_schemes], lang: lang) if rootNode.nil? || rootNode.empty? - roots = @ontology.explore.roots(concept_schemes: params[:concept_schemes], lang: lang) + roots = @ontology.explore.roots(concept_schemes: params[:concept_schemes], lang: lang, include: include) if roots.nil? || roots.empty? LOG.add :debug, "Missing roots for #{@ontology.acronym}" not_found("Missing roots for #{@ontology.acronym}") From e39f1b64c78c4c32268010802bd31c45b73daf8d Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 26 Mar 2023 19:11:41 +0200 Subject: [PATCH 012/533] use request_lang in show concept details and concept children --- app/controllers/concepts_controller.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/concepts_controller.rb b/app/controllers/concepts_controller.rb index 2a6fcda63..fefd77f73 100644 --- a/app/controllers/concepts_controller.rb +++ b/app/controllers/concepts_controller.rb @@ -19,7 +19,7 @@ def show_concept @submission = get_ontology_submission_ready(@ontology) @ob_instructions = helpers.ontolobridge_instructions_template(@ontology) - @concept = @ontology.explore.single_class({full: true}, params[:id]) + @concept = @ontology.explore.single_class({full: true, language: request_lang}, params[:id]) @instances_concept_id = @concept.id concept_not_found(params[:id]) if @concept.nil? @@ -53,9 +53,8 @@ def show @concept = @ontology.explore.single_class({full: true}, params[:id]) concept_not_found(params[:id]) if @concept.nil? - - show_uri_request # process a full call - render :file => '/ontologies/visualize', :use_full_path => true, :layout => 'ontology' + @schemes = params[:concept_schemes].split(',') + show_ajax_request # process a full call end end @@ -189,7 +188,7 @@ def show_ajax_request gather_details render :partial => 'load' when 'children' # Children is called only for drawing the tree - @children = @concept.explore.children(pagesize: 750, concept_schemes: @schemes.join(',')).collection || [] + @children = @concept.explore.children(pagesize: 750, concept_schemes: @schemes.join(','), language: request_lang, display: 'prefLabel,obsolete,hasChildren').collection || [] @children.sort! { |x, y| (x.prefLabel || "").downcase <=> (y.prefLabel || "").downcase } unless @children.empty? render :partial => 'child_nodes' end From 5f1f963e7ad369ed407f6840e31467b47cb79781 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 26 Mar 2023 19:13:18 +0200 Subject: [PATCH 013/533] use request_lang in concept_label to show the correct language label --- app/helpers/concepts_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/concepts_helper.rb b/app/helpers/concepts_helper.rb index 9d438348c..d1aeaa70f 100644 --- a/app/helpers/concepts_helper.rb +++ b/app/helpers/concepts_helper.rb @@ -32,7 +32,7 @@ def concept_label(ont_id, cls_id) ontology_not_found(ont_id) unless @ontology # Retrieve a class prefLabel or return the class ID (URI) # - mappings may contain class URIs that are not in bioportal (e.g. obo-xrefs) - cls = @ontology.explore.single_class(cls_id) + cls = @ontology.explore.single_class({language: request_lang, include: 'prefLabel'}, cls_id) # TODO: log any cls.errors # TODO: NCBO-402 might be implemented here, but it throws off a lot of ajax result rendering. #cls_label = cls.prefLabel({:use_html => true}) || cls_id From eaa6edd35cb532ee3f09767c47385343953808f3 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 26 Mar 2023 19:15:36 +0200 Subject: [PATCH 014/533] use request_lang in the tree view to link to the correct language --- app/helpers/application_helper.rb | 16 +++++++++------- .../concepts_browsers/_concepts_tree.html.haml | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 375afdf71..f58029984 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -180,11 +180,12 @@ def build_tree(node, string, id, concept_schemes: []) end def tree_link_to_concept(child:, ontology_acronym:, active_style:, node: nil) + language = request_lang li_id = child.id.eql?('bp_fake_root') ? 'bp_fake_root' : short_uuid open = child.expanded? ? "class='open'" : '' icons = child.relation_icon(node) muted_style = child.isInActiveScheme&.empty? ? 'text-muted' : '' - href = ontology_acronym.blank? ? '#' : "/ontologies/#{child.explore.ontology.acronym}/concepts/?id=#{CGI.escape(child.id)}" + href = ontology_acronym.blank? ? '#' : "/ontologies/#{child.explore.ontology.acronym}/concepts/?id=#{CGI.escape(child.id)}&language=#{language}" link = <<-EOS
  • #{link}
  • " end @@ -464,7 +466,7 @@ def bp_ont_link(ont_acronym) end def bp_class_link(cls_id, ont_acronym) - return "#{bp_ont_link(ont_acronym)}?p=classes&conceptid=#{escape(cls_id)}" + return "#{bp_ont_link(ont_acronym)}?p=classes&conceptid=#{escape(cls_id)}&language=#{request_lang}" end def bp_scheme_link(scheme_id, ont_acronym) @@ -506,8 +508,8 @@ def get_link_for_cls_ajax(cls_id, ont_acronym, target = nil) if cls_id.start_with?('http://') || cls_id.start_with?('https://') link = bp_class_link(cls_id, ont_acronym) - ajax_url = '/ajax/classes/label' - cls_url = "?p=classes&conceptid=#{CGI.escape(cls_id)}" + ajax_url = "/ajax/classes/label?language=#{request_lang}" + cls_url = "?p=classes&conceptid=#{CGI.escape(cls_id)}&language=#{request_lang}" label_ajax_link(link, cls_id, ont_acronym, ajax_url , cls_url ,target) else auto_link(cls_id, :all, target: '_blank') @@ -523,14 +525,14 @@ def get_link_for_ont_ajax(ont_acronym) def get_link_for_scheme_ajax(scheme, ont_acronym, target = '_blank') link = bp_scheme_link(scheme, ont_acronym) - ajax_url = '/ajax/schemes/label' + ajax_url = "/ajax/schemes/label?language=#{request_lang}" scheme_url = "?p=schemes&schemeid=#{CGI.escape(scheme)}" label_ajax_link(link, scheme, ont_acronym, ajax_url, scheme_url, target) end def get_link_for_collection_ajax(collection, ont_acronym, target = '_blank') link = bp_collection_link(collection, ont_acronym) - ajax_url = '/ajax/collections/label' + ajax_url = "/ajax/collections/label?language=#{request_lang}" collection_url = "?p=collections&collectionid=#{CGI.escape(collection)}" label_ajax_link(link, collection, ont_acronym, ajax_url, collection_url, target) end diff --git a/app/views/ontologies/concepts_browsers/_concepts_tree.html.haml b/app/views/ontologies/concepts_browsers/_concepts_tree.html.haml index 9e0460185..c50c0e603 100644 --- a/app/views/ontologies/concepts_browsers/_concepts_tree.html.haml +++ b/app/views/ontologies/concepts_browsers/_concepts_tree.html.haml @@ -17,5 +17,5 @@ -# Class tree %div#sd_content.card.p-1.py-3{style: 'overflow-y: scroll; height: 60vh;'} = render TurboFrameComponent.new(id: 'concepts_tree_view', - src: "/ajax/classes/treeview?ontology=#{@ontology.acronym}&conceptid=#{escape(@concept.id)}&concept_schemes=#{params[:concept_schemes]}&auto_click=false", + src: "/ajax/classes/treeview?ontology=#{@ontology.acronym}&conceptid=#{escape(@concept.id)}&concept_schemes=#{params[:concept_schemes]}&auto_click=false&language=#{request_lang}", data: {'turbo-frame-target': 'frame'}) \ No newline at end of file From 849e1ad01dafb3c9db0534beae22e0648ca1844e Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Mon, 27 Mar 2023 01:53:56 +0200 Subject: [PATCH 015/533] Refactor language selector, update concept details and tree on language change, and show elements in selected language when expanding tree. 1- show language selector only on needed classes. 2- When we change the language selector we need to update the concept details and the tree 3- When we expand an element in the tree, we need to see the elements in the selected language --- app/controllers/ontologies_controller.rb | 13 +++---- app/helpers/collections_helper.rb | 10 +++--- app/helpers/ontologies_helper.rb | 7 ++++ app/helpers/schemes_helper.rb | 10 +++--- app/javascript/controllers/index.js | 3 ++ .../controllers/tab_change_controller.js | 35 +++++++++++++++++++ app/views/layouts/_ontology_viewer.html.haml | 17 +++++---- 7 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 app/javascript/controllers/tab_change_controller.js diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index ee45bb347..d3058da73 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -151,8 +151,8 @@ def classes get_class(params) if @submission.hasOntologyLanguage == 'SKOS' - @schemes = get_schemes(@ontology) - @collections = get_collections(@ontology, add_colors: true) + @schemes = get_schemes(params, @ontology) + @collections = get_collections(params, @ontology, add_colors: true) else @instance_details, type = get_instance_and_type(params[:instanceid]) unless @instance_details.empty? || type.nil? || concept_id_param_exist?(params) @@ -263,9 +263,9 @@ def instances end def schemes - @schemes = get_schemes(@ontology) + @schemes = get_schemes(params, @ontology) scheme_id = params[:scheme_id] || @submission_latest.URI || nil - @scheme = get_scheme(@ontology, scheme_id) if scheme_id + @scheme = get_scheme(params, @ontology, scheme_id) if scheme_id if request.xhr? render partial: 'ontologies/sections/schemes', layout: false @@ -275,9 +275,9 @@ def schemes end def collections - @collections = get_collections(@ontology) + @collections = get_collections(params, @ontology) collection_id = params[:collection_id] - @collection = get_collection(@ontology, collection_id) if collection_id + @collection = get_collection(params, @ontology, collection_id) if collection_id if request.xhr? render partial: 'ontologies/sections/collections', layout: false @@ -289,6 +289,7 @@ def collections # GET /ontologies/ACRONYM # GET /ontologies/1.xml def show + # Hack to make ontologyid and conceptid work in addition to id and ontology params params[:id] = params[:id].nil? ? params[:ontologyid] : params[:id] diff --git a/app/helpers/collections_helper.rb b/app/helpers/collections_helper.rb index b2c20a2ba..c01ad0ba8 100644 --- a/app/helpers/collections_helper.rb +++ b/app/helpers/collections_helper.rb @@ -1,14 +1,16 @@ module CollectionsHelper - def get_collections(ontology, add_colors: false) - collections = ontology.explore.collections + def get_collections(params, ontology, add_colors: false) + lang = params[:language]&.upcase&.to_sym + collections = ontology.explore.collections({ include: 'all', lang: lang }) generate_collections_colors(collections) if add_colors collections end - def get_collection(ontology, collection_uri) - ontology.explore.collections({ include: 'all' },collection_uri) + def get_collection(params, ontology, collection_uri) + lang = params[:language]&.upcase&.to_sym + ontology.explore.collections({ include: 'all', lang: lang},collection_uri) end def get_collection_label(collection) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 6e43ba819..f0c5bd7ae 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -2,6 +2,9 @@ module OntologiesHelper REST_URI = $REST_URL API_KEY = $API_KEY + LANGUAGE_FILTERABLE_SECTIONS = ['classes', 'schemes', 'collections'] + + def additional_details return "" if $ADDITIONAL_ONTOLOGY_DETAILS.nil? || $ADDITIONAL_ONTOLOGY_DETAILS[@ontology.acronym].nil? @@ -386,6 +389,10 @@ def selected_section?(section_title) current_section.eql?(section_title) end + def allowed_to_show_language_filter?(section) + LANGUAGE_FILTERABLE_SECTIONS.include?(section) + end + def lazy_load_section(section_title, &block) if current_section.eql?(section_title) block.call diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb index 799e52b13..acb732c14 100644 --- a/app/helpers/schemes_helper.rb +++ b/app/helpers/schemes_helper.rb @@ -1,11 +1,13 @@ module SchemesHelper - def get_schemes(ontology) - ontology.explore.schemes + def get_schemes(params, ontology) + lang = params[:language]&.upcase&.to_sym + ontology.explore.schemes({ include: 'all', lang: lang }) end - def get_scheme(ontology, scheme_uri) - ontology.explore.schemes({ include: 'all' }, scheme_uri) + def get_scheme(params, ontology, scheme_uri) + lang = params[:language]&.upcase&.to_sym + ontology.explore.schemes({ include: 'all', lang: lang }, scheme_uri) end def get_scheme_label(scheme) diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index fabc20e78..448e9b76f 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -46,6 +46,9 @@ application.register("simple-tree", SimpleTreeController) import SkosCollectionColorsController from "./skos_collection_colors_controller" application.register("skos-collection-colors", SkosCollectionColorsController) +import TabChangeController from "./tab_change_controller" +application.register("tab-change", TabChangeController) + import TooltipController from "./tooltip_controller" application.register("tooltip", TooltipController) diff --git a/app/javascript/controllers/tab_change_controller.js b/app/javascript/controllers/tab_change_controller.js new file mode 100644 index 000000000..3b0c50b3c --- /dev/null +++ b/app/javascript/controllers/tab_change_controller.js @@ -0,0 +1,35 @@ +import { Controller } from "@hotwired/stimulus" +import { showLoader } from "../mixins/showLoader"; + +export default class extends Controller { + + + static targets = ["sections"] + + + onClick(event) { + + const anchorElement = event.target.closest('a'); + + // add active class to the clicked tab + + if (anchorElement) { + + showLoader(this.sectionsTarget); + + anchorElement.classList.add('active'); + + // remove active class from the other tabs + const otherTabs = anchorElement.parentElement.parentElement.querySelectorAll('a'); + otherTabs.forEach(tab => { + if (tab !== anchorElement) { + tab.classList.remove('active'); + } + }); + + const href = anchorElement.getAttribute('href'); + Turbo.visit(href); + } + + } +} diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index 36949970b..729ebc79e 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -101,7 +101,7 @@ = link_to(edit_ontology_path(@ontology.acronym), "aria-label": "Edit ontology details", title: "Edit ontology details") do %i.fas.fa-lg.fa-user-edit - = turbo_frame_tag 'sections', data: { controller: "language-change"} do + = turbo_frame_tag 'sections', data: { controller: "language-change tab-change"} do %div.row.pb-4 %div.col %div.card @@ -113,13 +113,15 @@ - sections.each do |section| %li.nav-item = link_to(section_name(section) , ontology_path(@ontology.acronym, p: section), - id: "ont-#{section}-tab", class: "nav-link #{selected_section?(section) ? 'active show' : ''}", - data: {toggle: "tab", target: "#ont_#{section}_content", 'bp-ont-page': section , + class: "nav-link #{selected_section?(section) ? 'active show' : ''}", + data: {'bp-ont-page': section , action: "click->tab-change#onClick", 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section) }) - = select_tag :category, options_for_select(@submission_lang_options), data: { action: "change->language-change#onChange"}, id: "category-select", style: "background-color: #f2f2f2; color: #333; font-size: 14px; padding: 2px 6px 2px 6px; border: 1px solid #ccc; border-radius: 4px;outline: none;" - -# = link_to "Download", "/ontologies/INRAETHES/?p=classes&language=EN", class: "btn btn-primary btn-sm", style: "margin-left: 10px;" + + - if allowed_to_show_language_filter?(current_section) + = select_tag :category, options_for_select(@submission_lang_options), data: { action: "change->language-change#onChange"}, id: "category-select", style: "background-color: #f2f2f2; color: #333; font-size: 14px; padding: 2px 6px 2px 6px; border: 1px solid #ccc; border-radius: 4px;outline: none;" + %div.card-body - %div.tab-content{"data-target": "language-change.sections"} + %div.tab-content{"data-target": "language-change.sections tab-change.sections"} - sections.each do |section| %div.tab-pane{id: "ont_#{section}_content", class: selected_section?(section) ? 'active show' : ''} = lazy_load_section(section) { yield } @@ -127,5 +129,8 @@ = render partial: "layouts/footer" + + + From c3c5af7ba18c486d29b8a90e7bc31bbce860cb09 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 01:53:42 +0200 Subject: [PATCH 016/533] move history controller to parent container, removing the duplication --- .../infinite_scroll_component.html.haml | 2 +- app/controllers/concepts_controller.rb | 3 ++- app/views/collections/_list_view.html.haml | 2 +- app/views/ontologies/_treeview.html.haml | 2 +- .../ontologies/concepts_browsers/_concepts_tree.html.haml | 2 +- app/views/schemes/_tree_view.html.haml | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/components/infinite_scroll_component/infinite_scroll_component.html.haml b/app/components/infinite_scroll_component/infinite_scroll_component.html.haml index 661fe92d9..c0fd9abac 100644 --- a/app/components/infinite_scroll_component/infinite_scroll_component.html.haml +++ b/app/components/infinite_scroll_component/infinite_scroll_component.html.haml @@ -2,7 +2,7 @@ - if @collection && !@collection.empty? .hide-if-loading %div - %ul.simpleTree{data:{controller: 'simple-tree history','simple-tree': { 'auto-click-value': auto_click? }, action: 'clicked->history#updateURL'}} + %ul.simpleTree{data:{controller: 'simple-tree','simple-tree': { 'auto-click-value': auto_click? }, action: 'clicked->history#updateURL'}} %li.root %ul = content diff --git a/app/controllers/concepts_controller.rb b/app/controllers/concepts_controller.rb index fefd77f73..d39a19902 100644 --- a/app/controllers/concepts_controller.rb +++ b/app/controllers/concepts_controller.rb @@ -112,7 +112,8 @@ def show_date_sorted_list page: page, sortby:'modified,created', order:'desc,desc', - display: 'prefLabel,modified,created' + display: 'prefLabel,modified,created', + language: request_lang } if @last_date params.merge!(last_date: @last_date) diff --git a/app/views/collections/_list_view.html.haml b/app/views/collections/_list_view.html.haml index 73fe49b21..acecf36c9 100644 --- a/app/views/collections/_list_view.html.haml +++ b/app/views/collections/_list_view.html.haml @@ -5,7 +5,7 @@ no collections detected - else %div - %ul.simpleTree{data:{controller: 'simple-tree history', 'simple-tree': { 'auto-click-value': "true" }, action: 'clicked->history#updateURL'}} + %ul.simpleTree{data:{controller: 'simple-tree', 'simple-tree': { 'auto-click-value': "true" }, action: 'clicked->history#updateURL'}} %li.root %ul - collections_labels.sort_by{|s| [s["prefLabel"]]}.each do |s| diff --git a/app/views/ontologies/_treeview.html.haml b/app/views/ontologies/_treeview.html.haml index 1f5573c75..47ac0e041 100644 --- a/app/views/ontologies/_treeview.html.haml +++ b/app/views/ontologies/_treeview.html.haml @@ -1,6 +1,6 @@ = turbo_frame_tag 'concepts_tree_view' do #tree_wrapper.hide-if-loading - %ul.simpleTree{data:{controller: 'simple-tree history', + %ul.simpleTree{data:{controller: 'simple-tree', 'simple-tree': { 'auto-click-value': "#{autoCLick}" }, action: 'clicked->history#updateURL'}} %li.root diff --git a/app/views/ontologies/concepts_browsers/_concepts_tree.html.haml b/app/views/ontologies/concepts_browsers/_concepts_tree.html.haml index c50c0e603..ce58d04fb 100644 --- a/app/views/ontologies/concepts_browsers/_concepts_tree.html.haml +++ b/app/views/ontologies/concepts_browsers/_concepts_tree.html.haml @@ -1,4 +1,4 @@ -%div{data:{controller: 'skos-collection-colors turbo-frame history', +%div{data:{controller: 'skos-collection-colors turbo-frame', 'skos-collection-colors': {'collections-color-select-target-value': 'collection-color-filter'}, 'turbo-frame': { 'url-value': "/ajax/classes/treeview?ontology=#{@ontology.acronym}&conceptid=root", diff --git a/app/views/schemes/_tree_view.html.haml b/app/views/schemes/_tree_view.html.haml index 333f4223d..9c7b429e5 100644 --- a/app/views/schemes/_tree_view.html.haml +++ b/app/views/schemes/_tree_view.html.haml @@ -8,7 +8,7 @@ - if main_scheme_label.nil? = no_main_scheme_alert %div - %ul.simpleTree{data:{controller: 'simple-tree history', action: 'clicked->history#updateURL'}} + %ul.simpleTree{data:{controller: 'simple-tree', action: 'clicked->history#updateURL'}} %li.root %ul - if main_scheme_label.nil? From ccd577099cd88bdb51f07800870cc3087c8f0802 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 01:54:56 +0200 Subject: [PATCH 017/533] use request_lang in the collection show_members endpoint --- app/controllers/collections_controller.rb | 2 +- app/views/ontologies/concepts_browsers/_concepts_list.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb index 773b7361f..4f05afd00 100644 --- a/app/controllers/collections_controller.rb +++ b/app/controllers/collections_controller.rb @@ -18,7 +18,7 @@ def show_members @collection = get_request_collection page = params[:page] || '1' @auto_click = page.to_s.eql?('1') - @page = @collection.explore.members({page: page}) + @page = @collection.explore.members({page: page, language: request_lang}) @concepts = @page.collection if @ontology.nil? ontology_not_found params[:ontology] diff --git a/app/views/ontologies/concepts_browsers/_concepts_list.html.haml b/app/views/ontologies/concepts_browsers/_concepts_list.html.haml index 07d48f680..f6d49f174 100644 --- a/app/views/ontologies/concepts_browsers/_concepts_list.html.haml +++ b/app/views/ontologies/concepts_browsers/_concepts_list.html.haml @@ -1,6 +1,6 @@ %div{data:{controller: 'turbo-frame', 'turbo-frame': { - 'url-value': "/ajax/classes/list?ontology_id=#{@ontology.acronym}", + 'url-value': "/ajax/classes/list?ontology_id=#{@ontology.acronym}&language=#{request_lang}", 'place-holder-value': "Please select a collection to display" }}} %div.pb-2 From 61b712ea63a323197da5138ef83509fc3a49f2a9 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 01:57:52 +0200 Subject: [PATCH 018/533] make 'EN' as the default request_lang --- app/helpers/application_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f58029984..45d630567 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -607,6 +607,7 @@ def skos? def request_lang lang = params[:language] || params[:lang] - lang&.upcase + lang = 'EN' unless lang + lang.upcase end end From da2e5a711d9f230b062108274f36962906e52e87 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 02:02:38 +0200 Subject: [PATCH 019/533] use request_lang in the in collections and schemes calls --- app/helpers/collections_helper.rb | 4 ++-- app/helpers/schemes_helper.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/collections_helper.rb b/app/helpers/collections_helper.rb index b2c20a2ba..9f6de4008 100644 --- a/app/helpers/collections_helper.rb +++ b/app/helpers/collections_helper.rb @@ -2,13 +2,13 @@ module CollectionsHelper def get_collections(ontology, add_colors: false) - collections = ontology.explore.collections + collections = ontology.explore.collections(language: request_lang) generate_collections_colors(collections) if add_colors collections end def get_collection(ontology, collection_uri) - ontology.explore.collections({ include: 'all' },collection_uri) + ontology.explore.collections({ include: 'all', language: request_lang},collection_uri) end def get_collection_label(collection) diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb index 799e52b13..1ecb91908 100644 --- a/app/helpers/schemes_helper.rb +++ b/app/helpers/schemes_helper.rb @@ -1,11 +1,11 @@ module SchemesHelper def get_schemes(ontology) - ontology.explore.schemes + ontology.explore.schemes(language: request_lang) end def get_scheme(ontology, scheme_uri) - ontology.explore.schemes({ include: 'all' }, scheme_uri) + ontology.explore.schemes({ include: 'all', language: request_lang}, scheme_uri) end def get_scheme_label(scheme) From a2a899a2a244b029fcbd6f8e185d0c541e8d5918 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 26 Mar 2023 19:17:02 +0200 Subject: [PATCH 020/533] recfactor turbo frame controller to window.location as default urlValue --- app/javascript/controllers/turbo_frame_controller.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/javascript/controllers/turbo_frame_controller.js b/app/javascript/controllers/turbo_frame_controller.js index 7fbf6603d..41c67dd5d 100644 --- a/app/javascript/controllers/turbo_frame_controller.js +++ b/app/javascript/controllers/turbo_frame_controller.js @@ -18,17 +18,13 @@ export default class extends Controller { const values = Object.values(data) // remove null and empty values - values.filter((value) => value !== "" || value !== null) + values.filter((value) => value !== "" || value !== undefined) if (values.length === 0) { this.frame.innerHTML = this.placeHolderValue } else { this.frame.innerHTML = "" - - this.urlValue ||= window.location.pathname + window.location.search; - - this.urlValue = new HistoryService().getUpdatedURL(this.urlValue, data); - + this.urlValue = new HistoryService().getUpdatedURL(this.urlValue, data) this.frame.src = this.urlValue } } From 057b71ac98c7ce5ac65855401edea25c8c8e1062 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 02:07:47 +0200 Subject: [PATCH 021/533] extract the header and permalink partials from ontology_viewer layout --- .../concepts/_perma_link_modal.html.haml | 12 +++++ app/views/layouts/_ontology_viewer.html.haml | 48 +------------------ .../layouts/ontology_viewer/_header.html.haml | 34 +++++++++++++ 3 files changed, 48 insertions(+), 46 deletions(-) create mode 100644 app/views/concepts/_perma_link_modal.html.haml create mode 100644 app/views/layouts/ontology_viewer/_header.html.haml diff --git a/app/views/concepts/_perma_link_modal.html.haml b/app/views/concepts/_perma_link_modal.html.haml new file mode 100644 index 000000000..4e43ba6dd --- /dev/null +++ b/app/views/concepts/_perma_link_modal.html.haml @@ -0,0 +1,12 @@ +-# Modal dialog for getting a permanent link to a class (must reside in a top-level position in the document to display properly). +%div#classPermalinkModal{class: "modal fade", tabindex: "-1", role: "dialog", aria: {labelledby: "classPermalinkLabel", hidden: "true"}} + %div.modal-dialog.modal-dialog-centered.modal-lg{role: "document"} + %div.modal-content + %div.modal-header + %h5#classPermalinkLabel.modal-title Permanent link to this class + %button.close{type: "button", "data-dismiss": "modal", "aria-label": "Close"} + %span{"aria-hidden": "true"} × + %div.modal-body + = text_field_tag("purl_input", nil, class: "form-control") + %div.modal-footer + %button.btn.btn-secondary{"data-dismiss": "modal"} Close \ No newline at end of file diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index 117630308..85366be80 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -2,10 +2,6 @@ - concept_title = @concept.nil? ? "" : " - #{@concept.prefLabel} - Classes" - @title = "#{@ontology.name}#{concept_title}" -- sub = @submission_latest -- details_available = true -- if sub.nil? || (sub.respond_to?(:status) && sub.status == 404) - - details_available = false = render :partial =>'layouts/header' %div#bd @@ -53,53 +49,13 @@ = render TurboModalComponent.new(id: 'application_modal') - -# Modal dialog for getting a permanent link to a class (must reside in a top-level position in the document to display properly). - %div#classPermalinkModal{class: "modal fade", tabindex: "-1", role: "dialog", aria: {labelledby: "classPermalinkLabel", hidden: "true"}} - %div.modal-dialog.modal-dialog-centered.modal-lg{role: "document"} - %div.modal-content - %div.modal-header - %h5#classPermalinkLabel.modal-title Permanent link to this class - %button.close{type: "button", "data-dismiss": "modal", "aria-label": "Close"} - %span{"aria-hidden": "true"} × - %div.modal-body - = text_field_tag("purl_input", nil, class: "form-control") - %div.modal-footer - %button.btn.btn-secondary{"data-dismiss": "modal"} Close + = render partial: 'concepts/perma_link_modal' = render partial: 'kgcl_dialogs' - -# A header of sorts to display ontology name and subset of details. %div.row.pt-md-3.pb-md-2 %div.col - %div.ont-info-bar.rounded - %div - %h4 - = link_to(@ontology.name, ontology_path(@ontology.acronym)) - %div - - if (details_available && !sub.released.nil?) - %span.text-muted - Last uploaded: - = l(Date.parse(sub.creationDate), format: :monthfull_day_year) - %div.ont-info-links - - unless (@ontology.summaryOnly || @ont_restricted || @submission_latest.nil?) - = link_to(@submission_latest.id + "/download?apikey=#{get_apikey}", "aria-label": "Download latest version", title: "Download latest version") do - %i.fas.fa-lg.fa-download{"aria-hidden": true} - - if details_available - - if $PURL_ENABLED - = link_to(@ontology.purl, "aria-label": "BioPortal PURL", title: "BioPortal PURL", target: "_blank") do - %i.fas.fa-lg.fa-link{"aria-hidden": true} - = link_to(sub.homepage, "aria-label": "Ontology home page", title: "Ontology home page", target: "_blank") do - %i.fas.fa-lg.fa-home{"aria-hidden": true} - - unless sub.documentation.nil? - = link_to(sub.documentation, "aria-label": "Ontology documentation", title: "Ontology documentation", target: "_blank") do - %i.fas.fa-lg.fa-book-reader{"aria-hidden": true} - - unless sub.publication.nil? - - sub.publication.each do |pub| - = link_to(pub, "aria-label": "Ontology publications", title: "Ontology publications", target: "_blank") do - %i.fas.fa-lg.fa-book{"aria-hidden": true} - - if @ontology.admin?(session[:user]) - = link_to(edit_ontology_path(@ontology.acronym), "aria-label": "Edit ontology details", title: "Edit ontology details") do - %i.fas.fa-lg.fa-user-edit + = render partial: 'layouts/ontology_viewer/header' %div.row.pb-4{ data: { controller: "history turbo-frame", action: " lang_changed->history#updateURL lang_changed->turbo-frame#updateFrame"}} %div.col diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml new file mode 100644 index 000000000..82f2c421d --- /dev/null +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -0,0 +1,34 @@ +- sub = @submission_latest +- details_available = true +- if sub.nil? || (sub.respond_to?(:status) && sub.status == 404) + - details_available = false +-# A header of sorts to display ontology name and subset of details. +%div.ont-info-bar.rounded + %div + %h4 + = link_to(@ontology.name, ontology_path(@ontology.acronym)) + %div + - if (details_available && !sub.released.nil?) + %span.text-muted + Last uploaded: + = l(Date.parse(sub.creationDate), format: :monthfull_day_year) + %div.ont-info-links + - unless (@ontology.summaryOnly || @ont_restricted || @submission_latest.nil?) + = link_to(@submission_latest.id + "/download?apikey=#{get_apikey}", "aria-label": "Download latest version", title: "Download latest version") do + %i.fas.fa-lg.fa-download{"aria-hidden": true} + - if details_available + - if $PURL_ENABLED + = link_to(@ontology.purl, "aria-label": "BioPortal PURL", title: "BioPortal PURL", target: "_blank") do + %i.fas.fa-lg.fa-link{"aria-hidden": true} + = link_to(sub.homepage, "aria-label": "Ontology home page", title: "Ontology home page", target: "_blank") do + %i.fas.fa-lg.fa-home{"aria-hidden": true} + - unless sub.documentation.nil? + = link_to(sub.documentation, "aria-label": "Ontology documentation", title: "Ontology documentation", target: "_blank") do + %i.fas.fa-lg.fa-book-reader{"aria-hidden": true} + - unless sub.publication.nil? + - sub.publication.each do |pub| + = link_to(pub, "aria-label": "Ontology publications", title: "Ontology publications", target: "_blank") do + %i.fas.fa-lg.fa-book{"aria-hidden": true} + - if @ontology.admin?(session[:user]) + = link_to(edit_ontology_path(@ontology.acronym), "aria-label": "Edit ontology details", title: "Edit ontology details") do + %i.fas.fa-lg.fa-user-edit \ No newline at end of file From 9643b2dd0a30e7aa1b09cdd9f3d48fe3b40286d6 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 02:10:21 +0200 Subject: [PATCH 022/533] use TurboFrameComponent in collections, schemes, visualize and concept --- app/views/concepts/_show.html.haml | 65 +++++++++---------- .../sections/_collections.html.haml | 2 +- .../ontologies/sections/_schemes.html.haml | 2 +- .../ontologies/sections/visualize.html.haml | 2 +- 4 files changed, 34 insertions(+), 37 deletions(-) diff --git a/app/views/concepts/_show.html.haml b/app/views/concepts/_show.html.haml index 040134fec..6260e9c1c 100644 --- a/app/views/concepts/_show.html.haml +++ b/app/views/concepts/_show.html.haml @@ -1,45 +1,42 @@ -= render TurboFrameComponent.new(id: 'concept_show', - data: {controller:'labels-ajax-container', 'action': 'turbo:before-fetch-request->labels-ajax-container#abortAll', 'labels-ajax-container-label-ajax-outlet': '#concept_show a[data-controller="label-ajax"]'}) do - - / When we have an ontology with a flat hierarchy, we initially disable the tabs because we don't have a class to display += render TurboFrameComponent.new(id: 'concept_show', data: {controller:'labels-ajax-container', 'action': 'turbo:before-fetch-request->labels-ajax-container#abortAll', 'labels-ajax-container-label-ajax-outlet': '#concept_show a[data-controller="label-ajax"]'}) do - if @concept.id.eql?("bp_fake_root") %div{:style => "padding: 100px 0; font-size: larger; font-weight: bold; text-align: center;"} Use the "Jump To" to find a class and display details, visualization, notes, and mappings - else .cls-info-container %ul.nav.nav-tabs.tabs - %li#details_top.nav-item - %a.nav-link.active.py-1{:href => "#details" , data:{toggle: 'tab', target: '#details_content'}} Details - - unless skos? - %li#instances_top.nav-item - %a.nav-link.py-1{:href => "#instances" , data:{toggle: 'tab', target: '#instances_content'}} - Instances - ( - %span#instances_count - ) - %li#visualization_top.nav-item - %a.nav-link.py-1{:href => "#visualization", data:{toggle: 'tab', target: '#visualization_content'}} Visualization - %li#notes_top.nav-item - %a.nav-link.py-1{:href => "#notes", data:{toggle: 'tab', target: '#notes_content'}} - Notes - %span#note_count_wrapper - ( - %span#note_count= @notes.length + %li#details_top.nav-item + %a.nav-link.active.py-1{:href => "#details" , data:{toggle: 'tab', target: '#details_content'}} Details + - unless skos? + %li#instances_top.nav-item + %a.nav-link.py-1{:href => "#instances" , data:{toggle: 'tab', target: '#instances_content'}} + Instances + ( + %span#instances_count + ) + %li#visualization_top.nav-item + %a.nav-link.py-1{:href => "#visualization", data:{toggle: 'tab', target: '#visualization_content'}} Visualization + %li#notes_top.nav-item + %a.nav-link.py-1{:href => "#notes", data:{toggle: 'tab', target: '#notes_content'}} + Notes + %span#note_count_wrapper + ( + %span#note_count= @notes.length + ) + %li#mappings_top.nav-item + %a.nav-link.py-1{:href => "#mappings", data:{toggle: 'tab', target: '#mappings_content'}} + #{concept_label_to_show(submission: @submission)} Mappings ( + %span#mapping_count= 'loading' ) - %li#mappings_top.nav-item - %a.nav-link.py-1{:href => "#mappings", data:{toggle: 'tab', target: '#mappings_content'}} - #{concept_label_to_show(submission: @submission)} Mappings ( - %span#mapping_count= 'loading' - ) - %li#restlink_top.nav-item - %a.nav-link.py-1{:href => "#{@ontology.id}/classes/#{escape(@concept.id)}?display=all", :style => "margin-bottom: 1em; margin-left: 1em;", :target => "_blank"} Access #{concept_label_to_show(submission: @submission)} JSON - - if @enable_ontolobridge - %li#request_term_top.nav-item - %a.nav-link.py-1{:href => "#request_term", data:{toggle: 'tab', target: '#request_term'}} - New Term Requests - - if $PURL_ENABLED - = link_to("#classPermalinkModal", class: "class-permalink nav-link", title: "Get a permanent link to this class", aria: {label: "Get a permanent link to this class"}, data: {toggle: "modal", current_purl: "#{@current_purl}"}) do + %li#restlink_top.nav-item + %a.nav-link.py-1{:href => "#{@ontology.id}/classes/#{escape(@concept.id)}?display=all", :style => "margin-bottom: 1em; margin-left: 1em;", :target => "_blank"} Access #{concept_label_to_show(submission: @submission)} JSON + - if @enable_ontolobridge + %li#request_term_top.nav-item + %a.nav-link.py-1{:href => "#request_term", data:{toggle: 'tab', target: '#request_term'}} + New Term Requests + - if $PURL_ENABLED + = link_to("#classPermalinkModal", class: "class-permalink nav-link", title: "Get a permanent link to this class", aria: {label: "Get a permanent link to this class"}, data: {toggle: "modal", current_purl: "#{@current_purl}"}) do %i{class: "fas fa-link", aria: {hidden: "true"}} #contents.tab-content #details_content.tab-pane.active.show diff --git a/app/views/ontologies/sections/_collections.html.haml b/app/views/ontologies/sections/_collections.html.haml index 3ddd1d27d..aaa22ddcc 100644 --- a/app/views/ontologies/sections/_collections.html.haml +++ b/app/views/ontologies/sections/_collections.html.haml @@ -1,4 +1,4 @@ -= turbo_frame_tag 'collections' do += render TurboFrameComponent.new(id: "collections", data: {"turbo-frame-target": "frame"} ) do - if no_collections? = no_collections_alert - else diff --git a/app/views/ontologies/sections/_schemes.html.haml b/app/views/ontologies/sections/_schemes.html.haml index 5387f37a1..ca791df44 100644 --- a/app/views/ontologies/sections/_schemes.html.haml +++ b/app/views/ontologies/sections/_schemes.html.haml @@ -1,4 +1,4 @@ -= turbo_frame_tag 'schemes' do += render TurboFrameComponent.new(id: "schemes", data: {"turbo-frame-target": "frame"} ) do %div.ont-schemes{data:{controller: 'container-splitter'}} %div#schemesTree{data:{'container-splitter-target': 'container'}} - if no_schemes? diff --git a/app/views/ontologies/sections/visualize.html.haml b/app/views/ontologies/sections/visualize.html.haml index e243989c5..52f9808b7 100644 --- a/app/views/ontologies/sections/visualize.html.haml +++ b/app/views/ontologies/sections/visualize.html.haml @@ -1,4 +1,4 @@ -= render TurboFrameComponent.new(id: "concepts", data: {"turbo-frame-target": "frame"} ) do += render TurboFrameComponent.new(id: "classes", data: {"turbo-frame-target": "frame"} ) do - unless @error - @title = "#{@ontology.name} - #{@concept.prefLabel}" - @new_term_request_ontologies From fec0e0dff78be627c580f7be5c0fd45540d16f26 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 02:11:04 +0200 Subject: [PATCH 023/533] use request_lang in the concepts sorted_by_date_url --- app/helpers/concepts_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/concepts_helper.rb b/app/helpers/concepts_helper.rb index d1aeaa70f..252db950d 100644 --- a/app/helpers/concepts_helper.rb +++ b/app/helpers/concepts_helper.rb @@ -50,7 +50,7 @@ def concept_date(concept) end def sorted_by_date_url(page = 1, last_concept = nil) - out = "/ajax/classes/date_sorted_list?ontology=#{@ontology.acronym}&page=#{page}" + out = "/ajax/classes/date_sorted_list?ontology=#{@ontology.acronym}&page=#{page}&language=#{request_lang}" out += "&last_date=#{concept_date(last_concept)}" if last_concept out end From 2f14c406e4ce409dcb5a27c6b9a13e87331a47a9 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 02:13:56 +0200 Subject: [PATCH 024/533] extract link_to_section helper --- app/helpers/ontologies_helper.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 9c5a7c8a8..ebe1401c2 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -382,6 +382,13 @@ def current_section (params[:p]) ? params[:p] : 'summary' end + def link_to_section(section_title) + link_to(section_name(section_title) , ontology_path(@ontology.acronym, p: section_title), + id: "ont-#{section_title}-tab", class: "nav-link #{selected_section?(section_title) ? 'active show' : ''}", + data: {toggle: "tab", target: "#ont_#{section_title}_content", 'bp-ont-page': section_title , + 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section_title) }) + end + def selected_section?(section_title) current_section.eql?(section_title) end From 2b479e682f435975aa8897a60baed2ea7e762dad Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 02:14:55 +0200 Subject: [PATCH 025/533] rename language-change, onChange method name to dispatchLangChangeEvent --- app/javascript/controllers/language_change_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/controllers/language_change_controller.js b/app/javascript/controllers/language_change_controller.js index 07a2798d6..e4d891317 100644 --- a/app/javascript/controllers/language_change_controller.js +++ b/app/javascript/controllers/language_change_controller.js @@ -3,7 +3,7 @@ import { Controller } from "@hotwired/stimulus" // Connects to data-controller="language-change" export default class extends Controller { - onChange() { + dispatchLangChangeEvent() { this.element.dispatchEvent(new CustomEvent('lang_changed', { bubbles: true, From 2c4c1203ce92b0a7b2fa61ef6d97fdfbba5f724a Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 03:05:03 +0200 Subject: [PATCH 026/533] rename and update tab-change stimulus controller --- app/helpers/ontologies_helper.rb | 3 +- app/javascript/controllers/index.js | 4 +- .../ontology_viewer_tabs_controller.js | 51 +++++++++++++++++++ .../controllers/tab_change_controller.js | 35 ------------- app/views/layouts/_ontology_viewer.html.haml | 14 +---- 5 files changed, 56 insertions(+), 51 deletions(-) create mode 100644 app/javascript/controllers/ontology_viewer_tabs_controller.js delete mode 100644 app/javascript/controllers/tab_change_controller.js diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 8717a4efc..9332d0ff1 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -388,7 +388,8 @@ def current_section def link_to_section(section_title) link_to(section_name(section_title) , ontology_path(@ontology.acronym, p: section_title), id: "ont-#{section_title}-tab", class: "nav-link #{selected_section?(section_title) ? 'active show' : ''}", - data: {toggle: "tab", target: "#ont_#{section_title}_content", 'bp-ont-page': section_title , + data: { action: 'click->ontology-viewer-tabs#selectTab', + toggle: "tab", target: "#ont_#{section_title}_content", 'bp-ont-page': section_title , 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section_title) }) end diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index 448e9b76f..cd0bcb223 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -46,8 +46,8 @@ application.register("simple-tree", SimpleTreeController) import SkosCollectionColorsController from "./skos_collection_colors_controller" application.register("skos-collection-colors", SkosCollectionColorsController) -import TabChangeController from "./tab_change_controller" -application.register("tab-change", TabChangeController) +import Ontology_viewer_tabs_controller from "./ontology_viewer_tabs_controller" +application.register("ontology-viewer-tabs", Ontology_viewer_tabs_controller) import TooltipController from "./tooltip_controller" application.register("tooltip", TooltipController) diff --git a/app/javascript/controllers/ontology_viewer_tabs_controller.js b/app/javascript/controllers/ontology_viewer_tabs_controller.js new file mode 100644 index 000000000..a36cf7de6 --- /dev/null +++ b/app/javascript/controllers/ontology_viewer_tabs_controller.js @@ -0,0 +1,51 @@ +import { Controller } from "@hotwired/stimulus" +import {HistoryService} from "../mixins/useHistory"; + + +export default class extends Controller { + + + static targets = ["languageSelector"] + static values = { + languageSections: Array + } + + connect() { + this.changeEvent = this.languageSelectorTarget.addEventListener("change", (e) => { + this.languageSectionsValue.forEach(p => { + let elem = document.getElementById("language_selector_hidden_"+p) + if(elem){ + elem.value = e.target.value + elem.dispatchEvent(new Event('change')) + } + }) + }) + } + + destroy(){ + this.changeEvent.removeEventListener() + } + + selectTab(event) { + this.#updateURL(event) + } + + #updateURL(event){ + const page = jQuery(event.target).attr("data-bp-ont-page"); + const page_name = jQuery(event.target).attr("data-bp-ont-page-name"); + + (new HistoryService()).pushState({p: page}, page_name + " | " + jQuery(document).data().bp.ont_viewer.org_site, "?p=" + page); + + this.#disableLanguageSelector(page) + } + + #disableLanguageSelector(selectedSection){ + if (this.languageSectionsValue.includes(selectedSection)){ + this.languageSelectorTarget.removeAttribute("disabled") + } else{ + this.languageSelectorTarget.setAttribute("disabled", true) + } + } + + +} diff --git a/app/javascript/controllers/tab_change_controller.js b/app/javascript/controllers/tab_change_controller.js deleted file mode 100644 index 3b0c50b3c..000000000 --- a/app/javascript/controllers/tab_change_controller.js +++ /dev/null @@ -1,35 +0,0 @@ -import { Controller } from "@hotwired/stimulus" -import { showLoader } from "../mixins/showLoader"; - -export default class extends Controller { - - - static targets = ["sections"] - - - onClick(event) { - - const anchorElement = event.target.closest('a'); - - // add active class to the clicked tab - - if (anchorElement) { - - showLoader(this.sectionsTarget); - - anchorElement.classList.add('active'); - - // remove active class from the other tabs - const otherTabs = anchorElement.parentElement.parentElement.querySelectorAll('a'); - otherTabs.forEach(tab => { - if (tab !== anchorElement) { - tab.classList.remove('active'); - } - }); - - const href = anchorElement.getAttribute('href'); - Turbo.visit(href); - } - - } -} diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index 85366be80..3222ed006 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -32,18 +32,6 @@ jQuery(document).data().bp.ont_viewer.concept_name_title = (jQuery(document).data().bp.ont_viewer.concept_name == "") ? "" : " - " + jQuery(document).data().bp.ont_viewer.concept_name; - var nav_ont = function (link) { - const page = jQuery(link).attr("data-bp-ont-page"); - const page_name = jQuery(link).attr("data-bp-ont-page-name"); - History.pushState({p: page}, page_name + " | " + jQuery(document).data().bp.ont_viewer.org_site, "?p=" + page); - } - - jQuery(document).ready(() => { - jQuery("#navbar-ontology a").on("click", function (e) { - e.preventDefault(); - nav_ont(this) - }); - }) @@ -57,7 +45,7 @@ %div.col = render partial: 'layouts/ontology_viewer/header' - %div.row.pb-4{ data: { controller: "history turbo-frame", action: " lang_changed->history#updateURL lang_changed->turbo-frame#updateFrame"}} + %div.row.pb-4{data: {controller: 'ontology-viewer-tabs', 'ontology-viewer-tabs-language-sections-value': ontology_data_sections }} %div.col %div.card %div.card-header From f703f9a8006fe9fc4e202a8f8679c405f73d73b2 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 03:06:29 +0200 Subject: [PATCH 027/533] add ontology_data_section? ontology helper --- app/helpers/ontologies_helper.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 9332d0ff1..ddc660e6f 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -2,7 +2,7 @@ module OntologiesHelper REST_URI = $REST_URL API_KEY = $API_KEY - LANGUAGE_FILTERABLE_SECTIONS = ['classes', 'schemes', 'collections'] + LANGUAGE_FILTERABLE_SECTIONS = %w[classes schemes collections instances] @@ -397,8 +397,12 @@ def selected_section?(section_title) current_section.eql?(section_title) end - def allowed_to_show_language_filter?(section) - LANGUAGE_FILTERABLE_SECTIONS.include?(section) + def ontology_data_sections + LANGUAGE_FILTERABLE_SECTIONS + end + + def ontology_data_section?(section_title = current_section) + ontology_data_sections.include?(section_title) end def lazy_load_section(section_title, &block) From d324b431df032fea76bf40f8f2734c086b40a3fa Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 03:10:09 +0200 Subject: [PATCH 028/533] use link_to_section and update language selector UI in ontology viewer --- app/views/layouts/_ontology_viewer.html.haml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index 3222ed006..c818fe38a 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -48,19 +48,16 @@ %div.row.pb-4{data: {controller: 'ontology-viewer-tabs', 'ontology-viewer-tabs-language-sections-value': ontology_data_sections }} %div.col %div.card - %div.card-header + %div.card-header{style: 'padding-bottom: 3px'} - sections = sections_to_show - -# Tabbed navigation bar for ontology content sections %div{style: "display: flex; justify-content: space-between;"} %ul.nav.nav-tabs.card-header-tabs{id: "navbar-ontology", role: "tablist"} - sections.each do |section| %li.nav-item - = link_to(section_name(section) , ontology_path(@ontology.acronym, p: section), - id: "ont-#{section}-tab", class: "nav-link #{selected_section?(section) ? 'active show' : ''}", - data: {toggle: "tab", target: "#ont_#{section}_content", 'bp-ont-page': section , - 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section) }) - = select_tag :category, options_for_select(@submission_lang_options), data: { controller: "language-change", action: "change->language-change#onChange"}, id: "category-select", style: "background-color: #f2f2f2; color: #333; font-size: 14px; padding: 2px 6px 2px 6px; border: 1px solid #ccc; border-radius: 4px;outline: none;" - + = link_to_section(section) + %div + = select_tag :language_selector, languages_options, class: 'custom-select', disabled: !ontology_data_section?, + data: {'ontology-viewer-tabs-target': 'languageSelector'} %div.card-body %div.tab-content - sections.each do |section| From 267092d44db8eee8fcd2a8a15d4604a276bb845f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 03:16:46 +0200 Subject: [PATCH 029/533] extract section_data, language_selector_tag and language_selector_hidden_tag ontology helpers --- app/helpers/ontologies_helper.rb | 22 ++++++++++++++++++-- app/views/layouts/_ontology_viewer.html.haml | 8 +++---- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index ddc660e6f..b180fcc4e 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -405,11 +405,20 @@ def ontology_data_section?(section_title = current_section) ontology_data_sections.include?(section_title) end + def section_data(section_title) + if ontology_data_section?(section_title) + url_value = selected_section?(section_title) ? request.fullpath : "/ontologies/#{@ontology.acronym}?p=#{section_title}" + { controller: "history turbo-frame" , 'turbo-frame-url-value': url_value ,action: "lang_changed->history#updateURL lang_changed->turbo-frame#updateFrame" } + else + {} + end + end + def lazy_load_section(section_title, &block) if current_section.eql?(section_title) block.call else - render TurboFrameComponent.new(id: section_title, src: "/ontologies/#{@ontology.acronym}?p=#{section_title}", target: '_top') + render TurboFrameComponent.new(id: section_title, src: "/ontologies/#{@ontology.acronym}?p=#{section_title}", target: '_top', data: {"turbo-frame-target": "frame"} ) end end @@ -437,7 +446,16 @@ def sections_to_show end - def languages_options(submission = @submission) + def language_selector_tag(name) + select_tag name, languages_options, class: 'custom-select', disabled: !ontology_data_section?, data: {'ontology-viewer-tabs-target': 'languageSelector'} + end + + def language_selector_hidden_tag(section) + hidden_field_tag "language_selector_hidden_#{section}", '', + data: { controller: "language-change", 'language-change-section-value': section, action: "change->language-change#dispatchLangChangeEvent"} + end + + def languages_options(submission = @submission || @submission_latest) current_lang = request_lang submission_lang = submission_languages(submission) # Transform each language into a select option diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index c818fe38a..2fbcd8e9c 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -47,21 +47,21 @@ %div.row.pb-4{data: {controller: 'ontology-viewer-tabs', 'ontology-viewer-tabs-language-sections-value': ontology_data_sections }} %div.col + - sections = sections_to_show %div.card %div.card-header{style: 'padding-bottom: 3px'} - - sections = sections_to_show %div{style: "display: flex; justify-content: space-between;"} %ul.nav.nav-tabs.card-header-tabs{id: "navbar-ontology", role: "tablist"} - sections.each do |section| %li.nav-item = link_to_section(section) %div - = select_tag :language_selector, languages_options, class: 'custom-select', disabled: !ontology_data_section?, - data: {'ontology-viewer-tabs-target': 'languageSelector'} + = language_selector_tag(:language_selector) %div.card-body %div.tab-content - sections.each do |section| - %div.tab-pane{id: "ont_#{section}_content", class: selected_section?(section) ? 'active show' : ''} + %div.tab-pane{id: "ont_#{section}_content", class: selected_section?(section) ? 'active show' : '', data: section_data(section)} + = language_selector_hidden_tag(section) if ontology_data_section?(section) = lazy_load_section(section) { yield } From eea67f79a5f28ad0dad541370639dfcd78c6ac28 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 03:08:36 +0200 Subject: [PATCH 030/533] refactor and simplify HistoryService --- app/javascript/mixins/useHistory.js | 40 +++++++++++------------------ 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/app/javascript/mixins/useHistory.js b/app/javascript/mixins/useHistory.js index 911773588..f84ff4133 100644 --- a/app/javascript/mixins/useHistory.js +++ b/app/javascript/mixins/useHistory.js @@ -15,24 +15,25 @@ export class HistoryService { return this.history.getState() } - updateHistory(currentUrl, newData) { - const state = this.#initStateFromUrl(currentUrl) - const newUrl = this.getUpdatedURL(currentUrl, newData, state) - this.pushState(state, state.title, newUrl) + const newUrl = this.getUpdatedURL(currentUrl, newData) + const newState = this.#initStateFromUrl(newUrl) + this.pushState(newState, newState.title, newUrl) } getUpdatedURL(currentUrl, newData) { - const base = document.location.origin const url = new URL(currentUrl, base) - - this.#updateURLFromState(url.searchParams, this.getState()) - + + this.#updateURLFromState(url.searchParams, this.getState().data) + this.#addNewDataToUrl(url, newData) + return url.pathname + url.search + } + + #addNewDataToUrl(url, newData) { const wantedData = this.#filterUnwantedData(newData, this.unWantedData); wantedData.forEach(([updatedParam, newValue]) => { - if (newValue === null) { url.searchParams.delete(updatedParam) } else { @@ -40,8 +41,6 @@ export class HistoryService { url.searchParams.set(updatedParam, newValue.join(',')) } }); - - return url.pathname + url.search } #filterUnwantedData(data, unWantedData) { @@ -51,26 +50,17 @@ export class HistoryService { #initStateFromUrl(currentUrl) { const url = new URL(currentUrl, document.location.origin) const urlParams = url.searchParams - const oldState = this.getState().data - let newState = oldState - let oldValue = null + let newState = this.getState().data urlParams.forEach((newVal, key) => { - oldValue = oldState[key] - if (oldValue === undefined) { - newState[key] = newVal - } + newState[key] = newVal }) return newState } #updateURLFromState(urlParams, state) { - let oldValue = null - urlParams.forEach((newVal, key) => { - oldValue = state[key] - if (oldValue !== undefined && oldValue !== newVal) { - urlParams.set(key, newVal) - } else if (oldValue !== undefined) { - state[key] = newVal + Object.entries(state).forEach(([key, val]) => { + if (key !== 'p'){ + urlParams.set(key, val) } }) } From 13c263fe9d80a5942ad19b67546298db7c4a8b8c Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 27 Mar 2023 04:50:15 +0200 Subject: [PATCH 031/533] update Gemfile.lock --- Gemfile.lock | 10 +++-- app/views/concepts/_show.html.haml | 60 +++++++++++++++--------------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5eee9756a..95a8cbf8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,6 +210,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) mini_mime (1.1.2) + mini_portile2 (2.8.1) minitest (5.18.0) msgpack (1.6.1) multi_json (1.15.0) @@ -235,6 +236,9 @@ GEM netrc (0.11.0) newrelic_rpm (9.0.0) nio4r (2.5.8) + nokogiri (1.14.2) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) nokogiri (1.14.2-x86_64-linux) racc (~> 1.4) oj (3.14.2) @@ -332,7 +336,7 @@ GEM rubocop-ast (>= 1.26.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.27.0) + rubocop-ast (1.28.0) parser (>= 3.2.1.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) @@ -348,7 +352,7 @@ GEM sprockets-rails tilt select2-rails (4.0.13) - selenium-webdriver (4.8.1) + selenium-webdriver (4.8.3) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -418,6 +422,7 @@ GEM zeitwerk (2.6.7) PLATFORMS + ruby x86_64-linux DEPENDENCIES @@ -485,4 +490,3 @@ DEPENDENCIES BUNDLED WITH 2.3.23 - diff --git a/app/views/concepts/_show.html.haml b/app/views/concepts/_show.html.haml index 6260e9c1c..0ac47b83e 100644 --- a/app/views/concepts/_show.html.haml +++ b/app/views/concepts/_show.html.haml @@ -5,38 +5,38 @@ - else .cls-info-container %ul.nav.nav-tabs.tabs - %li#details_top.nav-item - %a.nav-link.active.py-1{:href => "#details" , data:{toggle: 'tab', target: '#details_content'}} Details - - unless skos? - %li#instances_top.nav-item - %a.nav-link.py-1{:href => "#instances" , data:{toggle: 'tab', target: '#instances_content'}} - Instances - ( - %span#instances_count - ) - %li#visualization_top.nav-item - %a.nav-link.py-1{:href => "#visualization", data:{toggle: 'tab', target: '#visualization_content'}} Visualization - %li#notes_top.nav-item - %a.nav-link.py-1{:href => "#notes", data:{toggle: 'tab', target: '#notes_content'}} - Notes - %span#note_count_wrapper - ( - %span#note_count= @notes.length - ) - %li#mappings_top.nav-item - %a.nav-link.py-1{:href => "#mappings", data:{toggle: 'tab', target: '#mappings_content'}} - #{concept_label_to_show(submission: @submission)} Mappings ( - %span#mapping_count= 'loading' + %li#details_top.nav-item + %a.nav-link.active.py-1{:href => "#details" , data:{toggle: 'tab', target: '#details_content'}} Details + - unless skos? + %li#instances_top.nav-item + %a.nav-link.py-1{:href => "#instances" , data:{toggle: 'tab', target: '#instances_content'}} + Instances + ( + %span#instances_count + ) + %li#visualization_top.nav-item + %a.nav-link.py-1{:href => "#visualization", data:{toggle: 'tab', target: '#visualization_content'}} Visualization + %li#notes_top.nav-item + %a.nav-link.py-1{:href => "#notes", data:{toggle: 'tab', target: '#notes_content'}} + Notes + %span#note_count_wrapper + ( + %span#note_count= @notes.length ) + %li#mappings_top.nav-item + %a.nav-link.py-1{:href => "#mappings", data:{toggle: 'tab', target: '#mappings_content'}} + #{concept_label_to_show(submission: @submission)} Mappings ( + %span#mapping_count= 'loading' + ) - %li#restlink_top.nav-item - %a.nav-link.py-1{:href => "#{@ontology.id}/classes/#{escape(@concept.id)}?display=all", :style => "margin-bottom: 1em; margin-left: 1em;", :target => "_blank"} Access #{concept_label_to_show(submission: @submission)} JSON - - if @enable_ontolobridge - %li#request_term_top.nav-item - %a.nav-link.py-1{:href => "#request_term", data:{toggle: 'tab', target: '#request_term'}} - New Term Requests - - if $PURL_ENABLED - = link_to("#classPermalinkModal", class: "class-permalink nav-link", title: "Get a permanent link to this class", aria: {label: "Get a permanent link to this class"}, data: {toggle: "modal", current_purl: "#{@current_purl}"}) do + %li#restlink_top.nav-item + %a.nav-link.py-1{:href => "#{@ontology.id}/classes/#{escape(@concept.id)}?display=all", :style => "margin-bottom: 1em; margin-left: 1em;", :target => "_blank"} Access #{concept_label_to_show(submission: @submission)} JSON + - if @enable_ontolobridge + %li#request_term_top.nav-item + %a.nav-link.py-1{:href => "#request_term", data:{toggle: 'tab', target: '#request_term'}} + New Term Requests + - if $PURL_ENABLED + = link_to("#classPermalinkModal", class: "class-permalink nav-link", title: "Get a permanent link to this class", aria: {label: "Get a permanent link to this class"}, data: {toggle: "modal", current_purl: "#{@current_purl}"}) do %i{class: "fas fa-link", aria: {hidden: "true"}} #contents.tab-content #details_content.tab-pane.active.show From d43f30b2b19efdb107ae00dc8fb1497af92b1248 Mon Sep 17 00:00:00 2001 From: OntoPortal Bot Date: Mon, 27 Mar 2023 04:05:19 +0000 Subject: [PATCH 032/533] [ontoportal-bot] Gemfile.lock update --- Gemfile.lock | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 95a8cbf8d..2c9f387e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,7 +210,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) mini_mime (1.1.2) - mini_portile2 (2.8.1) minitest (5.18.0) msgpack (1.6.1) multi_json (1.15.0) @@ -236,9 +235,6 @@ GEM netrc (0.11.0) newrelic_rpm (9.0.0) nio4r (2.5.8) - nokogiri (1.14.2) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) nokogiri (1.14.2-x86_64-linux) racc (~> 1.4) oj (3.14.2) @@ -422,7 +418,6 @@ GEM zeitwerk (2.6.7) PLATFORMS - ruby x86_64-linux DEPENDENCIES @@ -489,4 +484,4 @@ DEPENDENCIES will_paginate (~> 3.0) BUNDLED WITH - 2.3.23 + 2.3.14 From 1842ace059609644776d3f35e227b5805948dd98 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Fri, 31 Mar 2023 01:32:42 +0200 Subject: [PATCH 033/533] Support multi-lingual: UI Internationalization ( use cookies , auto-lang detect) --- Gemfile.lock | 20 +- app/controllers/application_controller.rb | 31 +++ app/controllers/language_controller.rb | 21 ++ .../controllers/language_change_controller.js | 13 +- app/javascript/mixins/cookie.js | 7 + app/views/layouts/_topnav.html.haml | 35 ++-- config/application.rb | 5 + config/locales/en.rb.sample | 112 ----------- config/locales/en.yml | 16 +- config/locales/fr.yml | 185 ++++++++++++++++++ config/routes.rb | 2 + 11 files changed, 309 insertions(+), 138 deletions(-) create mode 100644 app/controllers/language_controller.rb create mode 100644 app/javascript/mixins/cookie.js delete mode 100644 config/locales/en.rb.sample create mode 100644 config/locales/fr.yml diff --git a/Gemfile.lock b/Gemfile.lock index 2c9f387e8..9c318f539 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,7 +133,7 @@ GEM daemons (1.4.1) dalli (3.2.4) date (3.3.3) - debug (1.7.1) + debug (1.7.2) irb (>= 1.5.0) reline (>= 0.3.1) diff-lcs (1.5.0) @@ -210,8 +210,9 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) mini_mime (1.1.2) + mini_portile2 (2.8.1) minitest (5.18.0) - msgpack (1.6.1) + msgpack (1.7.0) multi_json (1.15.0) multipart-post (2.3.0) mysql2 (0.5.3) @@ -233,9 +234,10 @@ GEM net-protocol net-ssh (7.1.0) netrc (0.11.0) - newrelic_rpm (9.0.0) + newrelic_rpm (9.1.0) nio4r (2.5.8) - nokogiri (1.14.2-x86_64-linux) + nokogiri (1.14.2) + mini_portile2 (~> 2.8.0) racc (~> 1.4) oj (3.14.2) open_uri_redirections (0.2.1) @@ -297,7 +299,7 @@ GEM recaptcha (5.9.0) json regexp_parser (2.7.0) - reline (0.3.2) + reline (0.3.3) io-console (~> 0.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -348,7 +350,7 @@ GEM sprockets-rails tilt select2-rails (4.0.13) - selenium-webdriver (4.8.3) + selenium-webdriver (4.8.6) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -394,7 +396,7 @@ GEM unf_ext unf_ext (0.0.8.2) unicode-display_width (2.4.2) - uri (0.12.0) + uri (0.12.1) view_component (2.82.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) @@ -418,7 +420,7 @@ GEM zeitwerk (2.6.7) PLATFORMS - x86_64-linux + ruby DEPENDENCIES bcrypt_pbkdf (>= 1.0, < 2.0) @@ -484,4 +486,4 @@ DEPENDENCIES will_paginate (~> 3.0) BUNDLED WITH - 2.3.14 + 2.1.4 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b97df1d12..7b2b2babe 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -13,6 +13,37 @@ # Likewise, all the methods added will be available for all controllers. class ApplicationController < ActionController::Base + + before_action :set_locale + + def set_locale + I18n.locale = cookies[:locale] || detect_locale + end + + def detect_locale + + binding.pry + + # Parse the Accept-Language header and split it into an array of language codes + languages = request.headers['Accept-Language']&.split(',') + + language_locale_map = { + 'en' => :en, + 'fr' => :fr + } + + languages.each do |language| + # Extract the language code from the language string + language_code = language.split(';').first + + # If the language code is in our map, return the corresponding locale + return language_locale_map[language_code] if language_locale_map[language_code] + end + + return I18n.default_locale + end + + helper :all # include all helpers, all the time helper_method :bp_config_json, :current_license, :using_captcha? rescue_from ActiveRecord::RecordNotFound, with: :not_found_record diff --git a/app/controllers/language_controller.rb b/app/controllers/language_controller.rb new file mode 100644 index 000000000..9f826aaa9 --- /dev/null +++ b/app/controllers/language_controller.rb @@ -0,0 +1,21 @@ +class LanguageController < ApplicationController + + + def set_locale() + language = params[:language] + + if language + if I18n.available_locales.include?(language.to_sym) + cookies.permanent[:locale] = language + else + # in case we want to show a message if the language is not available + flash.now[:notice] = + "#{language} translation not available" + logger.error flash.now[:notice] + end + end + + redirect_to request.referer || root_path + end + +end diff --git a/app/javascript/controllers/language_change_controller.js b/app/javascript/controllers/language_change_controller.js index e4d891317..fccdecc46 100644 --- a/app/javascript/controllers/language_change_controller.js +++ b/app/javascript/controllers/language_change_controller.js @@ -1,10 +1,16 @@ import { Controller } from "@hotwired/stimulus" +import { Turbo } from "@hotwired/turbo-rails"; +import { getCookie } from "../mixins/cookie"; // Connects to data-controller="language-change" export default class extends Controller { - dispatchLangChangeEvent() { + connect() { + const locale = getCookie('locale'); + document.querySelector(`#language-select option[value="${locale}"]`)?.selected = true; + } + dispatchLangChangeEvent() { this.element.dispatchEvent(new CustomEvent('lang_changed', { bubbles: true, cancelable: true, @@ -14,6 +20,11 @@ export default class extends Controller { } } })); + } + setLocale(event) { + const userPreferedLanguage = event.target.value; + Turbo.visit(`/locale/${userPreferedLanguage}`); } + } diff --git a/app/javascript/mixins/cookie.js b/app/javascript/mixins/cookie.js new file mode 100644 index 000000000..1a9782e9d --- /dev/null +++ b/app/javascript/mixins/cookie.js @@ -0,0 +1,7 @@ +export const getCookie = (name) => { + document.cookie.replace(/(?:(?:^|.*;\s*)${name}\s*\=\s*([^;]*).*$)|^.*$/, "$1"); +} + +export const setCookie = (name, value, days) => { + document.cookie = `${name}=${value};max-age=${days * 24 * 60 * 60}`; +} \ No newline at end of file diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 8c3e73e76..d7083da90 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -6,36 +6,41 @@ %div#topNavigationToggler.navbar-collapse.collapse.justify-content-between %ul.navbar-nav %li.nav-item - = link_to("Browse", ontologies_path(), class: "nav-link") + = link_to(t(:_browse), ontologies_path(), class: "nav-link") %li.nav-item - = link_to("Search", "/search", class: "nav-link") + = link_to(t(:_search), "/search", class: "nav-link") %li.nav-item - = link_to("Mappings", mappings_path(), class: "nav-link") + = link_to(t(:_mappings), mappings_path(), class: "nav-link") %li.nav-item - = link_to("Recommender", recommender_index_path, class: "nav-link") + = link_to(t(:_recommender), recommender_index_path, class: "nav-link") %li.nav-item - = link_to("Annotator", annotator_index_path(), class: "nav-link") + = link_to(t(:_annotator), annotator_index_path(), class: "nav-link") - if $NCBO_ANNOTATORPLUS_ENABLED == true %li.nav-item - = link_to("NCBO Annotator+", '/ncbo_annotatorplus', class: "nav-link") + = link_to(t(:_ncbo_annotator_plus), '/ncbo_annotatorplus', class: "nav-link") %li.nav-item - = link_to("Projects", projects_path(), class: "nav-link") + = link_to(t(:_projects), projects_path(), class: "nav-link") %li.nav-item - = link_to("Landscape", '/landscape', class: "nav-link") + = link_to(t(:_landscape), '/landscape', class: "nav-link") -if (!session[:user].nil? && session[:user].admin?) %li.nav-item - = link_to("Admin", admin_index_path, class: "nav-link") + = link_to(t(:_admin), admin_index_path, class: "nav-link") %ul.navbar-nav + %li.nav-item{ style: "margin-right: 10px;" } + %select#language-select.form-control{ data: { controller: "language-change", action: "change->language-change#setLocale"} } + %option{value: "en"} English + %option{value: "fr"} Français + - if session[:user].nil? %li.nav-item - = link_to("Login", login_index_path(redirect: request.original_url), class: "btn btn-bp-login mr-md-2") + = link_to(t(:_login), login_index_path(redirect: request.original_url), class: "btn btn-bp-login mr-md-2") - else -# Account menu %li.nav-item.dropdown = link_to("#", id: "accountMenuDropdownLink", class: "nav-link dropdown-toggle", role: "button", data: {toggle: "dropdown"}, aria: {haspopup: "true", expanded: "false"}) do = session[:user].username %div.dropdown-menu.dropdown-menu-right{aria: {labelledby: "accountMenuDropdownLink"}} - = link_to("Account Settings", "/account", class: "dropdown-item") + = link_to(t(:_account_setting), "/account", class: "dropdown-item") - unless session[:ontologies].nil? %div.dropdown-divider %h6.dropdown-header Recently Viewed @@ -48,9 +53,9 @@ = link_to("#", id: "supportMenuDropdownLink", class: "nav-link dropdown-toggle", role: "button", data: {toggle: "dropdown"}, aria: {haspopup: "true", expanded: "false"}) do Support %div.dropdown-menu.dropdown-menu-right{aria: {labelledby: "supportMenuDropdownLink"}} - = link_to("Submit Feedback", feedback_path(location: encode_param(request.url)), id: "submitFeedbackMenuItem", class: "dropdown-item pop_window") + = link_to(t(:submit_feedback), feedback_path(location: encode_param(request.url)), id: "submitFeedbackMenuItem", class: "dropdown-item pop_window") %div.dropdown-divider %h6.dropdown-header Documentation - = link_to("Help", "#{$WIKI_HELP_PAGE}", target: "_blank", class: "dropdown-item") - = link_to("Release Notes", "#{$RELEASE_NOTES}", target: "_blank", class: "dropdown-item") - = link_to("Publications", $PUBLICATIONS_URL, target: "_blank", class: "dropdown-item") + = link_to(t(:_help), "#{$WIKI_HELP_PAGE}", target: "_blank", class: "dropdown-item") + = link_to(t(:_release_notes), "#{$RELEASE_NOTES}", target: "_blank", class: "dropdown-item") + = link_to(t(:_publications), $PUBLICATIONS_URL, target: "_blank", class: "dropdown-item") diff --git a/config/application.rb b/config/application.rb index f13cb361a..b4796ac09 100644 --- a/config/application.rb +++ b/config/application.rb @@ -11,6 +11,11 @@ class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. config.load_defaults 7.0 + # permitted locales available for the application + config.i18n.available_locales = [:en, :fr] + config.i18n.default_locale = :en + + # Configuration for the application, engines, and railties goes here. # # These settings can be overridden in specific environments using the files diff --git a/config/locales/en.rb.sample b/config/locales/en.rb.sample deleted file mode 100644 index 56e0ccd50..000000000 --- a/config/locales/en.rb.sample +++ /dev/null @@ -1,112 +0,0 @@ -{ - :en => { - :home => { - :intro => 'Use ' + $SITE + ' to access and share ontologies. You can
    create ontology-based - annotations for your own text , link your own project that uses ontologies to the - description of those ontologies , find and create relations between terms in - different ontologies, review and comment on ontologies and their components as you - browse them. Sign in to ' + $SITE + ' - to submit a new ontology or ontology-based project, provide comments on ontologies or add ontology mappings.', - - :facebook_button => '', - - :twitter_button => '', - - :annotate => { - :intro => 'The ' + $ORG_SITE + ' Annotator processes text submitted by users, recognizes relevant ontology terms in the text and returns - the annotations to the user. Use the interface below to submit sample text to get ontology-based annotations. Hover the mouse pointer on any - button to see what it does. Click on the (?) to see a detailed help panel. -

    - Subscribe to the NCBO Annotator Users Google group to learn more about - who and how the Annotator is being used in different projects.' - }, - - :resources => { - :intro => $ORG + ' is building a system for automated ontology-based annotation and indexing of data. We process the textual metadata of diverse elements of resources - to annotate and index them with terms from appropriate ontologies. Use the interface below to search the resulting index of annotations and to identify - data resources annotated with particular ontology terms.' - }, - - :footer => 'Powered by NCBO BioPortal   - Release Notes' - }, - - :projects => { - :intro => 'Browse the ontology-based projects in the community: Each project description is linked to ' + $ORG_SITE + ' ontologies that the project uses. - Use the ‘Add Project’ link to add your ontology-based project to this list and to link it to ' + $ORG_SITE + ' ontologies. - Your project will then appear on the pages that list the details for the ontologies that you selected. We also invite you to review ontologies that you used in your project.' - }, - - :ontologies => { - :intro => 'Access all ontologies that are available in ' + $ORG_SITE + ': - You can filter this list by category to display ontologies relevant for a certain domain. - You can also filter ontologies that belong to a certain group. Subscribe to the ' + $ORG_SITE + ' RSS feed - to receive alerts for submissions of new ontologies, new versions of ontologies, new notes, and new projects. You can subscribe to feeds for a specific ontology at - the individual ontology page. Add a new ontology to ' + $ORG_SITE + ' using the Submit New Ontology link (you need to sign in - to see this link).', - - :metrics => { - :intro => '' + $SITE + ' calculates the metrics on the salient properties of the ontology, including statistics and quality-control - and quality-assurance metrics. Each ontology may have all, some, or no values filled in for its metrics and only metrics - for the most recent version are reflected. The metrics currently do not distinguish between the terms defined directly in - this ontology and imported terms (for OWL) or referenced terms (for OBO). - See metrics descriptions.' - } - }, - - :mappings => { - :intro => 'Use this page to explore mappings between ontologies that you are interested in. You will also see the mappings when you browse individual ontologies.' - }, - - :about => { - :welcome => 'Welcome to the National Center for Biomedical Ontology’s BioPortal. BioPortal is a Web-based application for accessing and sharing biomedical ontologies.', - :getting_started => $SITE + ' allows users to browse, upload, download, search, comment on, and create mappings for ontologies.', - :browse => ' -

    - Users can browse and explore individual ontologies by navigating either a tree structure or an animated graphical view. Users can also view mappings and ontology metadata, and download ontologies. -

    -

    - Additionally, users who are signed in may also submit a new ontology to the library. All submissions to the library are reviewed. -

    ', - :announce_list => 'To receive notices of new ' + $SITE + ' releases or site outages, please email ' + $SUPPORT_EMAIL, - :release_notes => '' - }, - - :most_viewed_date => 'March, 2012', - - :most_viewed => - ' - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    OntologyViews
    ', - - :stats => - '' - } -} diff --git a/config/locales/en.yml b/config/locales/en.yml index b37ebbb55..25e5cc586 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,5 +1,20 @@ en: + _browse: "Browse" + _search: "Search" + _mappings: "Mappings" + _recommender: "Recommender" + _annotator: "Annotator" + _ncbo_annotator_plus: "NCBO Annotator+" + _projects: "Projects" + _landscape: "Landscape" + _login: "Login" + _account_setting: "Account Settings" + submit_feedback: "Submit Feedback" + _help: "Help" + _release_notes: "Release Notes" + _publications: "Publications" + about: >

    Abstract

    @@ -168,4 +183,3 @@ en: mappings: intro: Browse mappings between classes in different ontologies - diff --git a/config/locales/fr.yml b/config/locales/fr.yml new file mode 100644 index 000000000..ba79f7f1e --- /dev/null +++ b/config/locales/fr.yml @@ -0,0 +1,185 @@ +fr: + + _browse: "Parcourir" + _search: "Rechercher" + _mappings: "Mappings" + _recommender: "Recommandateur" + _annotator: "Annotateur" + _ncbo_annotator_plus: "NCBO Annotator+" + _projects: "Projets" + _landscape: "Paysage" + _login: "Se connecter" + _account_setting: "Paramètres du compte" + submit_feedback: "Envoyer un commentaire" + _help: "Aide" + _release_notes: "Notes de version" + _publications: "Publications" + + about: > +
    +

    Abstract

    +

    + Many vocabularies and ontologies are produced to represent and annotate agronomic data. Therefore, there is a need of + a common platform to identify, host and use them in agro-informatics application. The AgroPortal project aims to offer + a reference ontology repository for agronomy, reusing the NCBO BioPortal technology. The scientific outcomes and the + experience of the biomedical domain are thus exploited and transposed in the agronomy domain, including plants, food, + environment and possibly animal sciences. We offer an ontology portal which features ontology hosting, search, versioning, + visualization, comment, recommendation, enables semantic annotation, as well as storing and exploiting ontology alignments. + All of these within a fully semantic web compliant infrastructure. The AgroPortal specifically pays attention to respect the + requirements of the agronomic community in terms of ontology formats (e.g., SKOS, trait dictionaries) or supported features. + AgroPortal project is based on five driving agronomic use cases which participate in the design and orientation of the platform. + AgroPortal already offers a robust and stable reference repository highly valuable for the agronomic domain. +

    +

    Use cases

    + +
    +

    New features

    +

    + See the release notes +

    +
    +

    Partners

    +

    The National Center For Biomedical Ontology (NCBO), Institut de Recherche pour le Développement (IRD), Research Data Alliance (RDA), + Bioversity International, Food & Agriculture Organization (FAO), Global Open Data for Agriculture & Nutrition (Godan Action), Institut National de la Recherche Agronomique (INRA)

    +

    Acknowledgments

    +

    The AgroPortal is partly achieved within the Semantic Indexing of French biomedical Resources (SIFR) project + that received funding from the EU H2020 research and innovation programme under the Marie Sklodowska-Curie (grant 701771) + and the French National Research Agency (grant ANR-12-JS02-01001), the NUMEV Labex (grant ANR-10-LABX-20), + the Computational Biology Institute of Montpellier (grant ANR-11-BINF-0002) as well as by University of Montpellier and the CNRS. + We also thank the National Center for Biomedical Ontologies for help and time spent with us in deploying the AgroPortal.

    +

    Team

    + To contact us: firstname.lastname@lirmm.fr +
      +
    • Clément Jonquet, researcher at LIRMM (Univ. of Montpellier, France), main investigator of the AgroPortal project
    • +
    • Anne Toulet, researcher at LIRMM (Univ. of Montpellier, France)
    • +
    • Vincent Emonet, engineer at LIRMM (Univ. of Montpellier, France)
    • +
    +
    + + activerecord: + errors: + models: + license: + attributes: + encrypted_key: + invalid_license_key: is an invalid license key + no_appliance_id_for_comparison: couldn't be validated. Unable to retrieve virtual appliance ID. + appliance_id_mismatch: is an appliance ID mismatch + + admin: + licenses: + create: + success: License successfully renewed! + + date: + formats: + year_month_day_concise: '%Y-%m-%d' # 2017-03-01 + month_day_year: '%b %-d, %Y' # Mar 1, 2017 + monthfull_day_year: '%B %-d, %Y' # March 1, 2017 + + layouts: + footer: + copyright_html: Copyright © 2005‑2022, The Board of Trustees of Leland Stanford Junior University. All rights reserved. + grant_html: > + %{site} is currently being developed within French ANR D2KAB project (ANR-18-CE23-0017). It also receives or received support from ANR SIFR project (ANR-12-JS02-0010), European Union H2020-MSCA SIFRm project (No 701771), the NUMEV Labex (ANR-10-LABX-20), the IBC of Montpellier project (ANR-11-BINF0002), the Agro Labex (ANR-10-LABX-0001) as well as from University of Montpellier and the CNRS. + notices: + license_contact: > + For more information, email support@ontoportal.org or + visit https://ontoportal.org/licensing. + license_obtain: > + If you are the owner of this OntoPortal installation, you can visit + https://license.ontoportal.org to obtain a license. + license_expired: > + We're sorry, but the license for this OntoPortal installation has expired. If you are the owner of this OntoPortal installation, + please visit https://license.ontoportal.org to renew your license. + license_trial: + one: + This installation of the OntoPortal Appliance is a trial license, which will expire in 1 day. + other: + This installation of the OntoPortal Appliance is a trial license, which will expire in %{count} days. + + home: + index: + find_ontology_placeholder: Start typing ontology name, then choose from list + query_placeholder: Enter a class, e.g. Melanoma + tagline: the world's most comprehensive repository of biomedical ontologies + title: Welcome to the %{organization} + welcome: Welcome to %{site}, + help: + welcome: Welcome to the National Center for Biomedical Ontology’s %{site}. %{site} is a web-based application for accessing and sharing biomedical ontologies. + getting_started: > + %{site} allows users to browse, upload, download, search, comment on, and create mappings for ontologies. + browse: > + Users can browse and explore individual ontologies by navigating either a tree structure or an animated graphical view. Users can also view mappings and + ontology metadata, and download ontologies. Additionally, users who are signed in may submit a new ontology to the library. + rest_examples_html: View documentation and examples of the %{site} REST API. + announce_list_html: > + To receive notices of new releases or site outages, please subscribe to the + bioontology-support list. + + annotator: + index: + intro: Get annotations for biomedical text with classes from the ontologies + annotatorplus_html: Check out AnnotatorPlus beta; a new version of the Annotator with added support for negation, and more! + fast_context: + tooltip: "Enable FastContext to detect : if a concept has been negated (affirmed, negated), who experienced the found concept (patient, other), when the annotated concept occurred (recent, historical, hypothetical), and/or if the annotated concept is uncertain (certain, uncertain)." + sample_text: Melanoma is a malignant tumor of melanocytes which are found predominantly in skin but also in the bowel and the eye. + + nbco_annotatosplus: + index: + intro: > + The NCBO Annotator+ is a proxy calling the NCBO Annotator Web service on the NCBO BioPortal. +

    + Tchechmedjiev, A., Abdaoui, A., Emonet, V., Melzi, S., Jonnagaddala, J., & Jonquet, C. (2018). Enhanced functionalities for annotating and indexing clinical text with the NCBO Annotator+. Bioinformatics, 34(11), 1962-1965. +

    + If using the API, please provide a valid NCBO BioPortal apikey and hit the service at http://services.bioportal.lirmm.fr/ncbo_annotatorplus
    + Text submitted to the NCBO Annotator+ must be in English. + sample_text: Melanoma is a malignant tumor of melanocytes which are found predominantly in skin but also in the bowel and the eye. + + recommender: + intro: Get recommendations for the most relevant ontologies based on an excerpt from a biomedical text or a list of keywords + + search: + index: + intro: Search for a class in multiple ontologies + search_keywords_placeholder: Enter a class, e.g. Melanoma + categories_placeholder: Start typing to select categories or leave blank to use all + property_definition: Named association between two entities. Examples are "definition" (a relation between a class and some text) and "part-of" (a relation between two classes). + obsolete_definition: > + A class that the authors of the ontology have flagged as being obsolete and which they recommend that people not use. These classes + are often left in ontologies (rather than removing them entirely) so that existing systems that depend on them will continue to function. + + projects: + index: + intro: Browse a selection of projects that use %{site} resources + + ontologies: + intro: Browse the library of ontologies + + concepts: + request_term: + new_term_instructions: > +

    This ontology integrates with OntoloBridge, allowing community users to suggest additions to the public ontology. Complete the template below to submit a term request directly to the ontology maintainer.

    +
    +

    Term Label (required)
    Suggested term name. If a term can be described with multiple synonyms, only list the preferred name here.

    +
    +
    +

    Term description (required)
    A brief definition, description, or usage of your suggested term. Additional term synonyms may be listed in this section.

    +
    +
    +

    Superclass (required)
    The parent term of the suggested term. The parent term should be an existing entry of the current ontology. The superclass can be selected directly from Bioportal's Classes tree viewer.

    +
    +
    +

    References (optional)
    Provide evidence for the existence of the requested term such as Pubmed IDs of papers or links to other resources that describe the term.

    +
    +
    +

    Justification (optional)
    Provide any additional information about the requested term here.

    +
    + mappings: + intro: Browse mappings between classes in different ontologies diff --git a/config/routes.rb b/config/routes.rb index 057297ac7..ba90d4f9b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,8 @@ root to: 'home#index' + get 'locale/:language', to: 'language#set_locale' + get '/notes/new_comment', to: 'notes#new_comment' get '/notes/new_proposal', to: 'notes#new_proposal' get '/notes/new_reply', to: 'notes#new_reply' From 597808627d5a6b1841ee1c8a0729013fd9692ee6 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Fri, 31 Mar 2023 01:38:01 +0200 Subject: [PATCH 034/533] Delete Gemfile.lock --- Gemfile.lock | 489 --------------------------------------------------- 1 file changed, 489 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 9c318f539..000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,489 +0,0 @@ -GIT - remote: https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git - revision: 0c8cd2b377d88b66a979664d5b16e5068b6d4548 - branch: development - specs: - ontologies_api_client (2.2.0) - activesupport - excon - faraday - faraday-excon (~> 2.0.0) - faraday-multipart - lz4-ruby - multi_json - oj - spawnling (= 2.1.5) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (7.0.3) - actionpack (= 7.0.3) - activesupport (= 7.0.3) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (7.0.3) - actionpack (= 7.0.3) - activejob (= 7.0.3) - activerecord (= 7.0.3) - activestorage (= 7.0.3) - activesupport (= 7.0.3) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.0.3) - actionpack (= 7.0.3) - actionview (= 7.0.3) - activejob (= 7.0.3) - activesupport (= 7.0.3) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.3) - actionview (= 7.0.3) - activesupport (= 7.0.3) - rack (~> 2.0, >= 2.2.0) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.3) - actionpack (= 7.0.3) - activerecord (= 7.0.3) - activestorage (= 7.0.3) - activesupport (= 7.0.3) - globalid (>= 0.6.0) - nokogiri (>= 1.8.5) - actionview (7.0.3) - activesupport (= 7.0.3) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.3) - activesupport (= 7.0.3) - globalid (>= 0.3.6) - activemodel (7.0.3) - activesupport (= 7.0.3) - activerecord (7.0.3) - activemodel (= 7.0.3) - activesupport (= 7.0.3) - activestorage (7.0.3) - actionpack (= 7.0.3) - activejob (= 7.0.3) - activerecord (= 7.0.3) - activesupport (= 7.0.3) - marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.3) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) - airbrussh (1.4.1) - sshkit (>= 1.6.1, != 1.7.0) - ast (2.4.2) - autoprefixer-rails (10.4.13.0) - execjs (~> 2) - bcrypt_pbkdf (1.1.0) - bindex (0.8.1) - bootsnap (1.16.0) - msgpack (~> 1.2) - bootstrap (4.2.1) - autoprefixer-rails (>= 9.1.0) - popper_js (>= 1.14.3, < 2) - sassc-rails (>= 2.0.0) - brakeman (5.4.1) - builder (3.2.4) - capistrano (3.17.2) - airbrussh (>= 1.0.0) - i18n - rake (>= 10.0.0) - sshkit (>= 1.9.0) - capistrano-bundler (2.1.0) - capistrano (~> 3.1) - capistrano-locally (0.3.0) - capistrano (~> 3.0) - capistrano-passenger (0.2.1) - capistrano (~> 3.0) - capistrano-rails (1.6.2) - capistrano (~> 3.1) - capistrano-bundler (>= 1.1, < 3) - capistrano-yarn (2.0.2) - capistrano (~> 3.0) - capybara (3.38.0) - addressable - matrix - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - chart-js-rails (0.1.7) - railties (> 3.1) - coderay (1.1.3) - concurrent-ruby (1.2.2) - crass (1.0.6) - cube-ruby (0.0.3) - daemons (1.4.1) - dalli (3.2.4) - date (3.3.3) - debug (1.7.2) - irb (>= 1.5.0) - reline (>= 0.3.1) - diff-lcs (1.5.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - ed25519 (1.3.0) - erubi (1.12.0) - erubis (2.7.0) - eventmachine (1.2.7) - excon (0.99.0) - execjs (2.8.1) - faraday (2.0.1) - faraday-net_http (~> 2.0) - ruby2_keywords (>= 0.0.4) - faraday-excon (2.0.0) - excon (>= 0.27.4) - faraday (~> 2.0.0.alpha.pre.2) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (2.1.0) - ffi (1.15.5) - flamegraph (0.9.5) - globalid (1.1.0) - activesupport (>= 5.0) - graphql (2.0.19) - graphql-client (0.18.0) - activesupport (>= 3.0) - graphql - haml (5.2.2) - temple (>= 0.8.0) - tilt - html2haml (2.3.0) - erubis (~> 2.7.0) - haml (>= 4.0) - nokogiri (>= 1.6.0) - ruby_parser (~> 3.5) - http-accept (1.7.0) - http-cookie (1.0.5) - domain_name (~> 0.5) - i18n (1.12.0) - concurrent-ruby (~> 1.0) - iconv (1.0.8) - importmap-rails (1.1.5) - actionpack (>= 6.0.0) - railties (>= 6.0.0) - io-console (0.6.0) - irb (1.6.3) - reline (>= 0.3.0) - jquery-rails (4.5.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-ui-rails (6.0.1) - railties (>= 3.2.16) - jsbundling-rails (1.1.1) - railties (>= 6.0.0) - json (2.6.3) - listen (3.8.0) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.19.1) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - lz4-ruby (0.3.3) - mail (2.8.1) - mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp - marcel (1.0.2) - matrix (0.4.2) - method_source (1.0.0) - mime-types (3.4.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) - mini_mime (1.1.2) - mini_portile2 (2.8.1) - minitest (5.18.0) - msgpack (1.7.0) - multi_json (1.15.0) - multipart-post (2.3.0) - mysql2 (0.5.3) - net-ftp (0.2.0) - net-protocol - time - net-http (0.3.2) - uri - net-imap (0.3.4) - date - net-protocol - net-pop (0.1.2) - net-protocol - net-protocol (0.2.1) - timeout - net-scp (4.0.0) - net-ssh (>= 2.6.5, < 8.0.0) - net-smtp (0.3.3) - net-protocol - net-ssh (7.1.0) - netrc (0.11.0) - newrelic_rpm (9.1.0) - nio4r (2.5.8) - nokogiri (1.14.2) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) - oj (3.14.2) - open_uri_redirections (0.2.1) - parallel (1.22.1) - parser (3.2.1.1) - ast (~> 2.4.1) - popper_js (1.16.1) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) - psych (3.3.4) - public_suffix (5.0.1) - puma (5.6.5) - nio4r (~> 2.0) - racc (1.6.2) - rack (2.2.6.4) - rack-accept (0.4.5) - rack (>= 0.4) - rack-mini-profiler (3.0.0) - rack (>= 1.2.0) - rack-test (2.1.0) - rack (>= 1.3) - rails (7.0.3) - actioncable (= 7.0.3) - actionmailbox (= 7.0.3) - actionmailer (= 7.0.3) - actionpack (= 7.0.3) - actiontext (= 7.0.3) - actionview (= 7.0.3) - activejob (= 7.0.3) - activemodel (= 7.0.3) - activerecord (= 7.0.3) - activestorage (= 7.0.3) - activesupport (= 7.0.3) - bundler (>= 1.15.0) - railties (= 7.0.3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) - rails_autolink (1.1.8) - actionview (> 3.1) - activesupport (> 3.1) - railties (> 3.1) - railties (7.0.3) - actionpack (= 7.0.3) - activesupport (= 7.0.3) - method_source - rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) - rainbow (3.1.1) - rake (13.0.6) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - rdoc (6.3.3) - recaptcha (5.9.0) - json - regexp_parser (2.7.0) - reline (0.3.3) - io-console (~> 0.5) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - rexml (3.2.5) - rspec-core (3.12.1) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.4) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-rails (6.0.1) - actionpack (>= 6.1) - activesupport (>= 6.1) - railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) - rspec-support (3.12.0) - rubocop (1.48.1) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.2.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.26.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.28.0) - parser (>= 3.2.1.0) - ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - ruby_parser (3.20.0) - sexp_processor (~> 4.16) - rubyzip (2.3.2) - sassc (2.4.0) - ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt - select2-rails (4.0.13) - selenium-webdriver (4.8.6) - rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2, < 3.0) - websocket (~> 1.0) - sexp_processor (4.16.1) - spawnling (2.1.5) - sprockets (4.2.0) - concurrent-ruby (~> 1.0) - rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) - sshkit (1.21.4) - net-scp (>= 1.1.2) - net-ssh (>= 2.8.0) - stackprof (0.2.24) - stimulus-rails (1.2.1) - railties (>= 6.0.0) - temple (0.10.0) - terser (1.1.14) - execjs (>= 0.3.0, < 3) - thin (1.8.1) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) - thor (1.2.1) - tilt (2.1.0) - time (0.2.1) - date - timeout (0.3.2) - turbo-rails (1.4.0) - actionpack (>= 6.0.0) - activejob (>= 6.0.0) - railties (>= 6.0.0) - turnout (2.5.0) - i18n (>= 0.7, < 2) - rack (>= 1.3, < 3) - rack-accept (~> 0.4) - tilt (>= 1.4, < 3) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (2.4.2) - uri (0.12.1) - view_component (2.82.0) - activesupport (>= 5.2.0, < 8.0) - concurrent-ruby (~> 1.0) - method_source (~> 1.0) - web-console (4.2.0) - actionview (>= 6.0.0) - activemodel (>= 6.0.0) - bindex (>= 0.4.0) - railties (>= 6.0.0) - webdrivers (5.2.0) - nokogiri (~> 1.6) - rubyzip (>= 1.3.0) - selenium-webdriver (~> 4.0) - websocket (1.2.9) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - will_paginate (3.3.1) - xpath (3.2.0) - nokogiri (~> 1.8) - zeitwerk (2.6.7) - -PLATFORMS - ruby - -DEPENDENCIES - bcrypt_pbkdf (>= 1.0, < 2.0) - bootsnap - bootstrap (~> 4.2.0) - brakeman - capistrano (~> 3.11) - capistrano-bundler - capistrano-locally - capistrano-passenger - capistrano-rails (~> 1.4) - capistrano-yarn - capybara - chart-js-rails - cube-ruby - dalli - debug - ed25519 (>= 1.2, < 2.0) - flamegraph - graphql-client - haml (~> 5.1) - html2haml - i18n - iconv - importmap-rails - jquery-rails - jquery-ui-rails - jsbundling-rails - listen - multi_json - mysql2 (= 0.5.3) - net-ftp (~> 0.2.0) - net-http - newrelic_rpm - oj - ontologies_api_client! - open_uri_redirections - pry - psych (< 4) - puma (~> 5.0) - rack-mini-profiler - rails (= 7.0.3) - rails_autolink - rdoc - recaptcha (~> 5.9.0) - rest-client - rspec-rails - rubocop - sassc-rails - select2-rails - selenium-webdriver - sprockets-rails - stackprof - stimulus-rails - terser - thin - turbo-rails - turnout - tzinfo-data - view_component (~> 2.72) - web-console - webdrivers - will_paginate (~> 3.0) - -BUNDLED WITH - 2.1.4 From d58ff0c4492b28a34e54ffd8f3826ffdec659ee7 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Fri, 31 Mar 2023 07:27:59 +0200 Subject: [PATCH 035/533] refacto --- app/controllers/application_controller.rb | 17 +++++------------ app/controllers/language_controller.rb | 10 +++++----- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7b2b2babe..8ceb3683c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -20,24 +20,17 @@ def set_locale I18n.locale = cookies[:locale] || detect_locale end - def detect_locale - - binding.pry - + def detect_locale # Parse the Accept-Language header and split it into an array of language codes languages = request.headers['Accept-Language']&.split(',') - - language_locale_map = { - 'en' => :en, - 'fr' => :fr - } + supported_languages = I18n.available_locales languages.each do |language| # Extract the language code from the language string - language_code = language.split(';').first + language_code = language.split(';').first.downcase.to_sym - # If the language code is in our map, return the corresponding locale - return language_locale_map[language_code] if language_locale_map[language_code] + # If the language code is in our , return the corresponding locale + return language_code if supported_languages.include?(language_code) end return I18n.default_locale diff --git a/app/controllers/language_controller.rb b/app/controllers/language_controller.rb index 9f826aaa9..a807297e0 100644 --- a/app/controllers/language_controller.rb +++ b/app/controllers/language_controller.rb @@ -1,16 +1,16 @@ class LanguageController < ApplicationController - def set_locale() - language = params[:language] + def set_locale + language = params[:language].strip.downcase.to_sym + supported_languages = I18n.available_locales if language - if I18n.available_locales.include?(language.to_sym) + if supported_languages.include?(language) cookies.permanent[:locale] = language else # in case we want to show a message if the language is not available - flash.now[:notice] = - "#{language} translation not available" + flash.now[:notice] = "#{language} translation not available" logger.error flash.now[:notice] end end From f92a183301ee8b229acf55981c36ccc4ec5038a3 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Sat, 1 Apr 2023 23:17:30 +0200 Subject: [PATCH 036/533] update cookie['locale'] when we detect language first time --- app/controllers/application_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8ceb3683c..6fbdaf4f7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -18,6 +18,7 @@ class ApplicationController < ActionController::Base def set_locale I18n.locale = cookies[:locale] || detect_locale + cookies[:locale] = I18n.locale if cookies[:locale].nil? end def detect_locale @@ -27,7 +28,7 @@ def detect_locale languages.each do |language| # Extract the language code from the language string - language_code = language.split(';').first.downcase.to_sym + language_code = language.split(/[-;]/).first.downcase.to_sym # If the language code is in our , return the corresponding locale return language_code if supported_languages.include?(language_code) From f56ded8a5d8304788dca331d64fda20bfe950137 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Sat, 1 Apr 2023 23:26:00 +0200 Subject: [PATCH 037/533] Remove unnecessary comments --- app/controllers/application_controller.rb | 8 +++----- app/controllers/language_controller.rb | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6fbdaf4f7..377e9a02f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -13,24 +13,22 @@ # Likewise, all the methods added will be available for all controllers. class ApplicationController < ActionController::Base - + before_action :set_locale + # Sets the locale based on the locale cookie or the value returned by detect_locale. def set_locale I18n.locale = cookies[:locale] || detect_locale cookies[:locale] = I18n.locale if cookies[:locale].nil? end + # Returns detedted locale based on the Accept-Language header of the request or the default locale if none is found. def detect_locale - # Parse the Accept-Language header and split it into an array of language codes languages = request.headers['Accept-Language']&.split(',') supported_languages = I18n.available_locales languages.each do |language| - # Extract the language code from the language string language_code = language.split(/[-;]/).first.downcase.to_sym - - # If the language code is in our , return the corresponding locale return language_code if supported_languages.include?(language_code) end diff --git a/app/controllers/language_controller.rb b/app/controllers/language_controller.rb index a807297e0..f05f423b8 100644 --- a/app/controllers/language_controller.rb +++ b/app/controllers/language_controller.rb @@ -1,6 +1,6 @@ class LanguageController < ApplicationController - + # set locale to the language selected by the user def set_locale language = params[:language].strip.downcase.to_sym supported_languages = I18n.available_locales From 95fdcefabb6024c60535d76f5836f2ec0db356ce Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Sat, 1 Apr 2023 23:32:33 +0200 Subject: [PATCH 038/533] store cookie[:locale] as permanent --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 377e9a02f..35f1759bd 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -19,7 +19,7 @@ class ApplicationController < ActionController::Base # Sets the locale based on the locale cookie or the value returned by detect_locale. def set_locale I18n.locale = cookies[:locale] || detect_locale - cookies[:locale] = I18n.locale if cookies[:locale].nil? + cookies.permanent[:locale] = I18n.locale if cookies[:locale].nil? end # Returns detedted locale based on the Accept-Language header of the request or the default locale if none is found. From 18031e8aa0076057427bcb70416236c2afb82c0f Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Tue, 4 Apr 2023 09:17:17 +0200 Subject: [PATCH 039/533] manage platform language changes using separate Stimulus controllers --- app/javascript/controllers/index.js | 9 ++++++--- .../controllers/language_change_controller.js | 12 ++---------- .../platform_language_controller.js | 18 ++++++++++++++++++ app/views/layouts/_topnav.html.haml | 8 ++++---- 4 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 app/javascript/controllers/platform_language_controller.js diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index cd0bcb223..21c0817b8 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -34,9 +34,15 @@ application.register("load-chart", LoadChartController) import MetadataDownloaderController from "./metadata_downloader_controller" application.register("metadata-downloader", MetadataDownloaderController) +import OntologyViewerTabsController from "./ontology_viewer_tabs_controller" +application.register("ontology-viewer-tabs", OntologyViewerTabsController) + import OntoportalAutocompleteController from "./ontoportal_autocomplete_controller" application.register("ontoportal-autocomplete", OntoportalAutocompleteController) +import PlatformLanguageController from "./platform_language_controller" +application.register("platform-language", PlatformLanguageController) + import ShowModalController from "./show_modal_controller" application.register("show-modal", ShowModalController) @@ -46,9 +52,6 @@ application.register("simple-tree", SimpleTreeController) import SkosCollectionColorsController from "./skos_collection_colors_controller" application.register("skos-collection-colors", SkosCollectionColorsController) -import Ontology_viewer_tabs_controller from "./ontology_viewer_tabs_controller" -application.register("ontology-viewer-tabs", Ontology_viewer_tabs_controller) - import TooltipController from "./tooltip_controller" application.register("tooltip", TooltipController) diff --git a/app/javascript/controllers/language_change_controller.js b/app/javascript/controllers/language_change_controller.js index fccdecc46..83c6ba7e3 100644 --- a/app/javascript/controllers/language_change_controller.js +++ b/app/javascript/controllers/language_change_controller.js @@ -3,14 +3,11 @@ import { Turbo } from "@hotwired/turbo-rails"; import { getCookie } from "../mixins/cookie"; // Connects to data-controller="language-change" +// This controller is used to change the language of the Concepts, Schemes and Collections export default class extends Controller { - connect() { - const locale = getCookie('locale'); - document.querySelector(`#language-select option[value="${locale}"]`)?.selected = true; - } - dispatchLangChangeEvent() { + debugger this.element.dispatchEvent(new CustomEvent('lang_changed', { bubbles: true, cancelable: true, @@ -22,9 +19,4 @@ export default class extends Controller { })); } - setLocale(event) { - const userPreferedLanguage = event.target.value; - Turbo.visit(`/locale/${userPreferedLanguage}`); - } - } diff --git a/app/javascript/controllers/platform_language_controller.js b/app/javascript/controllers/platform_language_controller.js new file mode 100644 index 000000000..e45afb199 --- /dev/null +++ b/app/javascript/controllers/platform_language_controller.js @@ -0,0 +1,18 @@ +import { Controller } from "@hotwired/stimulus" + +// Connects to data-controller="platform-language" +// this controller is used to change the language of the whole platform +export default class extends Controller { + + connect() { + const locale = getCookie('locale'); + document.querySelector(`#language-select option[value="${locale}"]`)?.selected = true; + } + + handleLangChanged(event) { + console.log("handleLangChanged", event); + debugger + const userPreferedLanguage = event.target.value; + Turbo.visit(`/locale/${userPreferedLanguage}`); + } +} diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index d7083da90..b3d150c4c 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -27,10 +27,10 @@ = link_to(t(:_admin), admin_index_path, class: "nav-link") %ul.navbar-nav %li.nav-item{ style: "margin-right: 10px;" } - %select#language-select.form-control{ data: { controller: "language-change", action: "change->language-change#setLocale"} } - %option{value: "en"} English - %option{value: "fr"} Français - + %select#language-select.form-control{ data: { controller: "platform-language", action: "change->platform-language#handleLangChanged" } } + %option{ value: "en" } English + %option{ value: "fr" } Français + - if session[:user].nil? %li.nav-item = link_to(t(:_login), login_index_path(redirect: request.original_url), class: "btn btn-bp-login mr-md-2") From 79a085569716bf13a80ca2d744a80e93b7259f26 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Tue, 4 Apr 2023 09:25:57 +0200 Subject: [PATCH 040/533] add for preferred name --- app/views/concepts/_details.html.haml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index 0d55f3130..1afe377ee 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -14,7 +14,11 @@ %tr %td{nowrap: ""} Preferred Name %td - %p= @concept.prefLabel({:use_html => true}).html_safe + - if @concept.prefLabel().nil? + %p No preferred name for the selected language. + - else + %p= @concept.prefLabel({:use_html => true}).html_safe + - unless @concept.synonym.nil? || @concept.synonym.empty? %tr %td{nowrap: ""} Synonyms From 5e3ab6709899bd708471406f4c9654b0ab6b5c8a Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Wed, 5 Apr 2023 11:28:32 +0200 Subject: [PATCH 041/533] Add 'no data available' message to ConceptDetails when data is absent. --- app/components/concept_details_component.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/components/concept_details_component.rb b/app/components/concept_details_component.rb index 380427a3c..b9de46ffe 100644 --- a/app/components/concept_details_component.rb +++ b/app/components/concept_details_component.rb @@ -35,12 +35,14 @@ def render_properties(properties_set, ontology_acronym, &block) end end + displayed_text = ajax_links.length > 0 ? ajax_links.join('

    ') : 'No value for the selected language.' + line = <<-EOS #{remove_owl_notation(key)} - #{"

    #{ajax_links.join('

    ')}

    ".html_safe} + #{"

    #{displayed_text}

    ".html_safe} EOS out += line From 59e52ca34622267bca710a6203d14b654d606af5 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Wed, 5 Apr 2023 12:21:15 +0200 Subject: [PATCH 042/533] fix and refacto --- app/javascript/controllers/language_change_controller.js | 2 -- .../controllers/platform_language_controller.js | 9 ++++++--- app/javascript/mixins/cookie.js | 3 ++- app/views/layouts/_topnav.html.haml | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/javascript/controllers/language_change_controller.js b/app/javascript/controllers/language_change_controller.js index 83c6ba7e3..144b5fa36 100644 --- a/app/javascript/controllers/language_change_controller.js +++ b/app/javascript/controllers/language_change_controller.js @@ -1,6 +1,4 @@ import { Controller } from "@hotwired/stimulus" -import { Turbo } from "@hotwired/turbo-rails"; -import { getCookie } from "../mixins/cookie"; // Connects to data-controller="language-change" // This controller is used to change the language of the Concepts, Schemes and Collections diff --git a/app/javascript/controllers/platform_language_controller.js b/app/javascript/controllers/platform_language_controller.js index e45afb199..88bfd5ad4 100644 --- a/app/javascript/controllers/platform_language_controller.js +++ b/app/javascript/controllers/platform_language_controller.js @@ -1,4 +1,6 @@ import { Controller } from "@hotwired/stimulus" +import { Turbo } from "@hotwired/turbo-rails"; +import { getCookie } from "../mixins/cookie"; // Connects to data-controller="platform-language" // this controller is used to change the language of the whole platform @@ -6,12 +8,13 @@ export default class extends Controller { connect() { const locale = getCookie('locale'); - document.querySelector(`#language-select option[value="${locale}"]`)?.selected = true; + + const option = document.querySelector(`#language-select option[value="${locale}"]`); + option && (option.selected = true); + } handleLangChanged(event) { - console.log("handleLangChanged", event); - debugger const userPreferedLanguage = event.target.value; Turbo.visit(`/locale/${userPreferedLanguage}`); } diff --git a/app/javascript/mixins/cookie.js b/app/javascript/mixins/cookie.js index 1a9782e9d..5e2b5bf0d 100644 --- a/app/javascript/mixins/cookie.js +++ b/app/javascript/mixins/cookie.js @@ -1,5 +1,6 @@ export const getCookie = (name) => { - document.cookie.replace(/(?:(?:^|.*;\s*)${name}\s*\=\s*([^;]*).*$)|^.*$/, "$1"); + const cookieValue = document.cookie.match('(^|[^;]+)\\s*' + name + '\\s*=\\s*([^;]+)'); + return cookieValue ? cookieValue.pop() : ''; } export const setCookie = (name, value, days) => { diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index b3d150c4c..6b483dddc 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -28,7 +28,7 @@ %ul.navbar-nav %li.nav-item{ style: "margin-right: 10px;" } %select#language-select.form-control{ data: { controller: "platform-language", action: "change->platform-language#handleLangChanged" } } - %option{ value: "en" } English + %option{ value: "en" } English %option{ value: "fr" } Français - if session[:user].nil? From da96e85184561675eb5fb0d1fff008c6fa514097 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Tue, 11 Apr 2023 13:47:46 +0200 Subject: [PATCH 043/533] translate the footer and refacto --- Gemfile.lock | 489 ++++++++++++++++++++++++++++ app/helpers/home_helper.rb | 15 +- app/views/layouts/_footer.html.haml | 4 +- app/views/layouts/_topnav.html.haml | 18 +- config/locales/en.yml | 167 ++++++---- config/locales/fr.yml | 271 +++++++-------- 6 files changed, 744 insertions(+), 220 deletions(-) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..c7cb95205 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,489 @@ +GIT + remote: https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git + revision: 0c8cd2b377d88b66a979664d5b16e5068b6d4548 + branch: development + specs: + ontologies_api_client (2.2.0) + activesupport + excon + faraday + faraday-excon (~> 2.0.0) + faraday-multipart + lz4-ruby + multi_json + oj + spawnling (= 2.1.5) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.0.3) + actionpack (= 7.0.3) + activesupport (= 7.0.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (7.0.3) + actionpack (= 7.0.3) + activejob (= 7.0.3) + activerecord (= 7.0.3) + activestorage (= 7.0.3) + activesupport (= 7.0.3) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.3) + actionpack (= 7.0.3) + actionview (= 7.0.3) + activejob (= 7.0.3) + activesupport (= 7.0.3) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.0) + actionpack (7.0.3) + actionview (= 7.0.3) + activesupport (= 7.0.3) + rack (~> 2.0, >= 2.2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.3) + actionpack (= 7.0.3) + activerecord (= 7.0.3) + activestorage (= 7.0.3) + activesupport (= 7.0.3) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.3) + activesupport (= 7.0.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (7.0.3) + activesupport (= 7.0.3) + globalid (>= 0.3.6) + activemodel (7.0.3) + activesupport (= 7.0.3) + activerecord (7.0.3) + activemodel (= 7.0.3) + activesupport (= 7.0.3) + activestorage (7.0.3) + actionpack (= 7.0.3) + activejob (= 7.0.3) + activerecord (= 7.0.3) + activesupport (= 7.0.3) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (7.0.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + addressable (2.8.2) + public_suffix (>= 2.0.2, < 6.0) + airbrussh (1.4.1) + sshkit (>= 1.6.1, != 1.7.0) + ast (2.4.2) + autoprefixer-rails (10.4.13.0) + execjs (~> 2) + bcrypt_pbkdf (1.1.0) + bindex (0.8.1) + bootsnap (1.16.0) + msgpack (~> 1.2) + bootstrap (4.2.1) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 1.14.3, < 2) + sassc-rails (>= 2.0.0) + brakeman (5.4.1) + builder (3.2.4) + capistrano (3.17.2) + airbrussh (>= 1.0.0) + i18n + rake (>= 10.0.0) + sshkit (>= 1.9.0) + capistrano-bundler (2.1.0) + capistrano (~> 3.1) + capistrano-locally (0.3.0) + capistrano (~> 3.0) + capistrano-passenger (0.2.1) + capistrano (~> 3.0) + capistrano-rails (1.6.2) + capistrano (~> 3.1) + capistrano-bundler (>= 1.1, < 3) + capistrano-yarn (2.0.2) + capistrano (~> 3.0) + capybara (3.39.0) + addressable + matrix + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (>= 1.5, < 3.0) + xpath (~> 3.2) + chart-js-rails (0.1.7) + railties (> 3.1) + coderay (1.1.3) + concurrent-ruby (1.2.2) + crass (1.0.6) + cube-ruby (0.0.3) + daemons (1.4.1) + dalli (3.2.4) + date (3.3.3) + debug (1.7.2) + irb (>= 1.5.0) + reline (>= 0.3.1) + diff-lcs (1.5.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + ed25519 (1.3.0) + erubi (1.12.0) + erubis (2.7.0) + eventmachine (1.2.7) + excon (0.99.0) + execjs (2.8.1) + faraday (2.0.1) + faraday-net_http (~> 2.0) + ruby2_keywords (>= 0.0.4) + faraday-excon (2.0.0) + excon (>= 0.27.4) + faraday (~> 2.0.0.alpha.pre.2) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (2.1.0) + ffi (1.15.5) + flamegraph (0.9.5) + globalid (1.1.0) + activesupport (>= 5.0) + graphql (2.0.20) + graphql-client (0.18.0) + activesupport (>= 3.0) + graphql + haml (5.2.2) + temple (>= 0.8.0) + tilt + html2haml (2.3.0) + erubis (~> 2.7.0) + haml (>= 4.0) + nokogiri (>= 1.6.0) + ruby_parser (~> 3.5) + http-accept (1.7.0) + http-cookie (1.0.5) + domain_name (~> 0.5) + i18n (1.12.0) + concurrent-ruby (~> 1.0) + iconv (1.0.8) + importmap-rails (1.1.5) + actionpack (>= 6.0.0) + railties (>= 6.0.0) + io-console (0.6.0) + irb (1.6.3) + reline (>= 0.3.0) + jquery-rails (4.5.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-ui-rails (6.0.1) + railties (>= 3.2.16) + jsbundling-rails (1.1.1) + railties (>= 6.0.0) + json (2.6.3) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.20.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lz4-ruby (0.3.3) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.2) + matrix (0.4.2) + method_source (1.0.0) + mime-types (3.4.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2023.0218.1) + mini_mime (1.1.2) + mini_portile2 (2.8.1) + minitest (5.18.0) + msgpack (1.7.0) + multi_json (1.15.0) + multipart-post (2.3.0) + mysql2 (0.5.3) + net-ftp (0.2.0) + net-protocol + time + net-http (0.3.2) + uri + net-imap (0.3.4) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-smtp (0.3.3) + net-protocol + net-ssh (7.1.0) + netrc (0.11.0) + newrelic_rpm (9.1.0) + nio4r (2.5.9) + nokogiri (1.14.2) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) + oj (3.14.2) + open_uri_redirections (0.2.1) + parallel (1.22.1) + parser (3.2.2.0) + ast (~> 2.4.1) + popper_js (1.16.1) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + psych (3.3.4) + public_suffix (5.0.1) + puma (5.6.5) + nio4r (~> 2.0) + racc (1.6.2) + rack (2.2.6.4) + rack-accept (0.4.5) + rack (>= 0.4) + rack-mini-profiler (3.0.0) + rack (>= 1.2.0) + rack-test (2.1.0) + rack (>= 1.3) + rails (7.0.3) + actioncable (= 7.0.3) + actionmailbox (= 7.0.3) + actionmailer (= 7.0.3) + actionpack (= 7.0.3) + actiontext (= 7.0.3) + actionview (= 7.0.3) + activejob (= 7.0.3) + activemodel (= 7.0.3) + activerecord (= 7.0.3) + activestorage (= 7.0.3) + activesupport (= 7.0.3) + bundler (>= 1.15.0) + railties (= 7.0.3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + rails_autolink (1.1.8) + actionview (> 3.1) + activesupport (> 3.1) + railties (> 3.1) + railties (7.0.3) + actionpack (= 7.0.3) + activesupport (= 7.0.3) + method_source + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) + rainbow (3.1.1) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rdoc (6.3.3) + recaptcha (5.9.0) + json + regexp_parser (2.7.0) + reline (0.3.3) + io-console (~> 0.5) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + rexml (3.2.5) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-rails (6.0.1) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.11) + rspec-expectations (~> 3.11) + rspec-mocks (~> 3.11) + rspec-support (~> 3.11) + rspec-support (3.12.0) + rubocop (1.49.0) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.2.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.28.0) + parser (>= 3.2.1.0) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + ruby_parser (3.20.0) + sexp_processor (~> 4.16) + rubyzip (2.3.2) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + select2-rails (4.0.13) + selenium-webdriver (4.8.6) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) + sexp_processor (4.16.1) + spawnling (2.1.5) + sprockets (4.2.0) + concurrent-ruby (~> 1.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + sprockets (>= 3.0.0) + sshkit (1.21.4) + net-scp (>= 1.1.2) + net-ssh (>= 2.8.0) + stackprof (0.2.24) + stimulus-rails (1.2.1) + railties (>= 6.0.0) + temple (0.10.0) + terser (1.1.14) + execjs (>= 0.3.0, < 3) + thin (1.8.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (1.2.1) + tilt (2.1.0) + time (0.2.2) + date + timeout (0.3.2) + turbo-rails (1.4.0) + actionpack (>= 6.0.0) + activejob (>= 6.0.0) + railties (>= 6.0.0) + turnout (2.5.0) + i18n (>= 0.7, < 2) + rack (>= 1.3, < 3) + rack-accept (~> 0.4) + tilt (>= 1.4, < 3) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + unicode-display_width (2.4.2) + uri (0.12.1) + view_component (2.82.0) + activesupport (>= 5.2.0, < 8.0) + concurrent-ruby (~> 1.0) + method_source (~> 1.0) + web-console (4.2.0) + actionview (>= 6.0.0) + activemodel (>= 6.0.0) + bindex (>= 0.4.0) + railties (>= 6.0.0) + webdrivers (5.2.0) + nokogiri (~> 1.6) + rubyzip (>= 1.3.0) + selenium-webdriver (~> 4.0) + websocket (1.2.9) + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + will_paginate (3.3.1) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (2.6.7) + +PLATFORMS + ruby + +DEPENDENCIES + bcrypt_pbkdf (>= 1.0, < 2.0) + bootsnap + bootstrap (~> 4.2.0) + brakeman + capistrano (~> 3.11) + capistrano-bundler + capistrano-locally + capistrano-passenger + capistrano-rails (~> 1.4) + capistrano-yarn + capybara + chart-js-rails + cube-ruby + dalli + debug + ed25519 (>= 1.2, < 2.0) + flamegraph + graphql-client + haml (~> 5.1) + html2haml + i18n + iconv + importmap-rails + jquery-rails + jquery-ui-rails + jsbundling-rails + listen + multi_json + mysql2 (= 0.5.3) + net-ftp (~> 0.2.0) + net-http + newrelic_rpm + oj + ontologies_api_client! + open_uri_redirections + pry + psych (< 4) + puma (~> 5.0) + rack-mini-profiler + rails (= 7.0.3) + rails_autolink + rdoc + recaptcha (~> 5.9.0) + rest-client + rspec-rails + rubocop + sassc-rails + select2-rails + selenium-webdriver + sprockets-rails + stackprof + stimulus-rails + terser + thin + turbo-rails + turnout + tzinfo-data + view_component (~> 2.72) + web-console + webdrivers + will_paginate (~> 3.0) + +BUNDLED WITH + 2.1.4 diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb index a2a34a755..7b14c5ba4 100644 --- a/app/helpers/home_helper.rb +++ b/app/helpers/home_helper.rb @@ -5,14 +5,11 @@ module HomeHelper def render_footer_link(options = {}) - - link_content = options[:text].presence - link_content ||= image_tag(options[:img_src]) if options[:img_src].present? - link_content ||= content_tag(:i, '', class: options[:icon]) if options[:icon].present? - - unless link_content.blank? - link_to(link_content, options[:url], target: options[:target], class: options[:css_class].to_s, style: options[:text].blank? ? 'text-decoration: none' : '') - end.to_s.html_safe - + link_content = options[:text][I18n.locale] || options[:text][:en] if options[:text] + link_content ||= image_tag(options[:img_src]) if options[:img_src] + link_content ||= content_tag(:i, '', class: options[:icon]) if options[:icon] + + link_to(link_content, options[:url], target: options[:target], class: options[:css_class].to_s, style: options[:text].blank? ? 'text-decoration: none' : '').html_safe if link_content end + end \ No newline at end of file diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index a88f4166f..6a3b0f44c 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -6,7 +6,7 @@ %div.row - $FOOTER_LINKS.to_h[:top].to_a.each do |footer_links_block| %div.col-6.col-md - %h6= footer_links_block[:column_header] + %h6= footer_links_block[:column_header][I18n.locale] || footer_links_block[:column_header][:en] %ul.list-unstyled - footer_links_block[:links].each do |footer_links_row| %li @@ -19,7 +19,7 @@ - $FOOTER_LINKS.to_h[:bottom].to_a.each do |footer_links_block| %div.col-6.col-md - if footer_links_block[:column_header].present? - %h6= footer_links_block[:column_header] + %h6= footer_links_block[:column_header][I18n.locale] || footer_links_block[:column_header][:en] %ul.list-inline - footer_links_block[:links].each do |footer_links_row| - footer_links_row.each_with_index do |footer_link, i| diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 6b483dddc..4bcd46c7a 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -6,25 +6,25 @@ %div#topNavigationToggler.navbar-collapse.collapse.justify-content-between %ul.navbar-nav %li.nav-item - = link_to(t(:_browse), ontologies_path(), class: "nav-link") + = link_to(t('header.browse'), ontologies_path(), class: "nav-link") %li.nav-item - = link_to(t(:_search), "/search", class: "nav-link") + = link_to(t('header.search'), "/search", class: "nav-link") %li.nav-item - = link_to(t(:_mappings), mappings_path(), class: "nav-link") + = link_to(t('header.mappings'), mappings_path(), class: "nav-link") %li.nav-item - = link_to(t(:_recommender), recommender_index_path, class: "nav-link") + = link_to(t('header.recommender'), recommender_index_path, class: "nav-link") %li.nav-item - = link_to(t(:_annotator), annotator_index_path(), class: "nav-link") + = link_to(t('header.annotator'), annotator_index_path(), class: "nav-link") - if $NCBO_ANNOTATORPLUS_ENABLED == true %li.nav-item - = link_to(t(:_ncbo_annotator_plus), '/ncbo_annotatorplus', class: "nav-link") + = link_to(t('header.ncbo_annotator_plus'), '/ncbo_annotatorplus', class: "nav-link") %li.nav-item - = link_to(t(:_projects), projects_path(), class: "nav-link") + = link_to(t('header.projects'), projects_path(), class: "nav-link") %li.nav-item - = link_to(t(:_landscape), '/landscape', class: "nav-link") + = link_to(t('header.landscape'), '/landscape', class: "nav-link") -if (!session[:user].nil? && session[:user].admin?) %li.nav-item - = link_to(t(:_admin), admin_index_path, class: "nav-link") + = link_to(t('header.admin'), admin_index_path, class: "nav-link") %ul.navbar-nav %li.nav-item{ style: "margin-right: 10px;" } %select#language-select.form-control{ data: { controller: "platform-language", action: "change->platform-language#handleLangChanged" } } diff --git a/config/locales/en.yml b/config/locales/en.yml index 25e5cc586..d42db4d54 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,67 +1,96 @@ en: - - _browse: "Browse" - _search: "Search" - _mappings: "Mappings" - _recommender: "Recommender" - _annotator: "Annotator" - _ncbo_annotator_plus: "NCBO Annotator+" - _projects: "Projects" - _landscape: "Landscape" - _login: "Login" - _account_setting: "Account Settings" - submit_feedback: "Submit Feedback" - _help: "Help" - _release_notes: "Release Notes" - _publications: "Publications" - + header: + browse: "Browse" + search: "Search" + mappings: "Mappings" + recommender: "Recommender" + annotator: "Annotator" + ncbo_annotator_plus: "NCBO Annotator+" + projects: "Projects" + landscape: "Landscape" + login: "Login" + account_setting: "Account Settings" + submit_feedback: "Submit Feedback" + help: "Help" + release_notes: "Release Notes" + publications: "Publications" + + footer: + products: "Products" + + main: + find_ontology: "Find an ontology" + search_class: "Search for a class" + welcome_to: "Welcome to" + comprehensive_repository: "the world's most comprehensive repository of biomedical ontologies" + advanced_search: "Advanced Search" + statistics: "Statistics" + ontology_visits: "Ontology Visits" + fair_scores: "FAIR Scores" + clear_selection: "Clear Selection" + slices: "Slices" + latest_notes: "Latest Notes" + supported_by: "Supported by" + collaboration_with: "With the collaboration of" + average: "Average" + min: "Min" + max: "Max" + median: "Median" + + + + + + + + about: > -
    -

    Abstract

    -

    - Many vocabularies and ontologies are produced to represent and annotate agronomic data. Therefore, there is a need of - a common platform to identify, host and use them in agro-informatics application. The AgroPortal project aims to offer - a reference ontology repository for agronomy, reusing the NCBO BioPortal technology. The scientific outcomes and the - experience of the biomedical domain are thus exploited and transposed in the agronomy domain, including plants, food, - environment and possibly animal sciences. We offer an ontology portal which features ontology hosting, search, versioning, - visualization, comment, recommendation, enables semantic annotation, as well as storing and exploiting ontology alignments. - All of these within a fully semantic web compliant infrastructure. The AgroPortal specifically pays attention to respect the - requirements of the agronomic community in terms of ontology formats (e.g., SKOS, trait dictionaries) or supported features. - AgroPortal project is based on five driving agronomic use cases which participate in the design and orientation of the platform. - AgroPortal already offers a robust and stable reference repository highly valuable for the agronomic domain. -

    -

    Use cases

    - -
    -

    New features

    -

    - See the release notes -

    -
    -

    Partners

    -

    The National Center For Biomedical Ontology (NCBO), Institut de Recherche pour le Développement (IRD), Research Data Alliance (RDA), - Bioversity International, Food & Agriculture Organization (FAO), Global Open Data for Agriculture & Nutrition (Godan Action), Institut National de la Recherche Agronomique (INRA)

    -

    Acknowledgments

    -

    The AgroPortal is partly achieved within the Semantic Indexing of French biomedical Resources (SIFR) project - that received funding from the EU H2020 research and innovation programme under the Marie Sklodowska-Curie (grant 701771) - and the French National Research Agency (grant ANR-12-JS02-01001), the NUMEV Labex (grant ANR-10-LABX-20), - the Computational Biology Institute of Montpellier (grant ANR-11-BINF-0002) as well as by University of Montpellier and the CNRS. - We also thank the National Center for Biomedical Ontologies for help and time spent with us in deploying the AgroPortal.

    -

    Team

    - To contact us: firstname.lastname@lirmm.fr -
      -
    • Clément Jonquet, researcher at LIRMM (Univ. of Montpellier, France), main investigator of the AgroPortal project
    • -
    • Anne Toulet, researcher at LIRMM (Univ. of Montpellier, France)
    • -
    • Vincent Emonet, engineer at LIRMM (Univ. of Montpellier, France)
    • -
    -
    - +
    +

    Abstract

    +

    + Many vocabularies and ontologies are produced to represent and annotate agronomic data. Therefore, there is a need of + a common platform to identify, host and use them in agro-informatics application. The AgroPortal project aims to offer + a reference ontology repository for agronomy, reusing the NCBO BioPortal technology. The scientific outcomes and the + experience of the biomedical domain are thus exploited and transposed in the agronomy domain, including plants, food, + environment and possibly animal sciences. We offer an ontology portal which features ontology hosting, search, versioning, + visualization, comment, recommendation, enables semantic annotation, as well as storing and exploiting ontology alignments. + All of these within a fully semantic web compliant infrastructure. The AgroPortal specifically pays attention to respect the + requirements of the agronomic community in terms of ontology formats (e.g., SKOS, trait dictionaries) or supported features. + AgroPortal project is based on five driving agronomic use cases which participate in the design and orientation of the platform. + AgroPortal already offers a robust and stable reference repository highly valuable for the agronomic domain. +

    +

    Use cases

    + +
    +

    New features

    +

    + See the release notes +

    +
    +

    Partners

    +

    The National Center For Biomedical Ontology (NCBO), Institut de Recherche pour le Développement (IRD), Research Data Alliance (RDA), + Bioversity International, Food & Agriculture Organization (FAO), Global Open Data for Agriculture & Nutrition (Godan Action), Institut National de la Recherche Agronomique (INRA)

    +

    Acknowledgments

    +

    The AgroPortal is partly achieved within the Semantic Indexing of French biomedical Resources (SIFR) project + that received funding from the EU H2020 research and innovation programme under the Marie Sklodowska-Curie (grant 701771) + and the French National Research Agency (grant ANR-12-JS02-01001), the NUMEV Labex (grant ANR-10-LABX-20), + the Computational Biology Institute of Montpellier (grant ANR-11-BINF-0002) as well as by University of Montpellier and the CNRS. + We also thank the National Center for Biomedical Ontologies for help and time spent with us in deploying the AgroPortal.

    +

    Team

    + To contact us: firstname.lastname@lirmm.fr +
      +
    • Clément Jonquet, researcher at LIRMM (Univ. of Montpellier, France), main investigator of the AgroPortal project
    • +
    • Anne Toulet, researcher at LIRMM (Univ. of Montpellier, France)
    • +
    • Vincent Emonet, engineer at LIRMM (Univ. of Montpellier, France)
    • +
    +
    + activerecord: errors: models: @@ -79,9 +108,9 @@ en: date: formats: - year_month_day_concise: '%Y-%m-%d' # 2017-03-01 - month_day_year: '%b %-d, %Y' # Mar 1, 2017 - monthfull_day_year: '%B %-d, %Y' # March 1, 2017 + year_month_day_concise: "%Y-%m-%d" # 2017-03-01 + month_day_year: "%b %-d, %Y" # Mar 1, 2017 + monthfull_day_year: "%B %-d, %Y" # March 1, 2017 layouts: footer: @@ -99,17 +128,15 @@ en: We're sorry, but the license for this OntoPortal installation has expired. If you are the owner of this OntoPortal installation, please visit https://license.ontoportal.org to renew your license. license_trial: - one: - This installation of the OntoPortal Appliance is a trial license, which will expire in 1 day. - other: - This installation of the OntoPortal Appliance is a trial license, which will expire in %{count} days. + one: This installation of the OntoPortal Appliance is a trial license, which will expire in 1 day. + other: This installation of the OntoPortal Appliance is a trial license, which will expire in %{count} days. home: index: find_ontology_placeholder: Start typing ontology name, then choose from list query_placeholder: Enter a class, e.g. Melanoma tagline: the world's most comprehensive repository of biomedical ontologies - title: Welcome to the %{organization} + title: Welcome to the %{organization} welcome: Welcome to %{site}, help: welcome: Welcome to the National Center for Biomedical Ontology’s %{site}. %{site} is a web-based application for accessing and sharing biomedical ontologies. diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ba79f7f1e..160d30f95 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,185 +1,196 @@ fr: - - _browse: "Parcourir" - _search: "Rechercher" - _mappings: "Mappings" - _recommender: "Recommandateur" - _annotator: "Annotateur" - _ncbo_annotator_plus: "NCBO Annotator+" - _projects: "Projets" - _landscape: "Paysage" - _login: "Se connecter" - _account_setting: "Paramètres du compte" - submit_feedback: "Envoyer un commentaire" - _help: "Aide" - _release_notes: "Notes de version" - _publications: "Publications" - + header: + browse: "Parcourir" + search: "Rechercher" + mappings: "Mappings" + recommender: "Recommender" + annotator: "Annotateur" + ncbo_annotator_plus: "NCBO Annotator+" + projects: "Projets" + landscape: "Paysage" + login: "Se connecter" + account_setting: "Paramètres du compte" + submit_feedback: "Envoyer un commentaire" + help: "Aide" + release_notes: "Notes de version" + publications: "Publications" + + footer: + products: "Produits" + + main: + find_ontology: "Trouver une ontologie" + search_class: "Rechercher une classe" + welcome_to: "Bienvenue sur" + comprehensive_repository: "le référentiel d'ontologies biomédicales le plus complet au monde" + advanced_search: "Recherche avancée" + statistics: "Statistiques" + ontology_visits: "Visites d'ontologie" + fair_scores: "Scores FAIR" + clear_selection: "Effacer la sélection" + slices: "Tranches" + latest_notes: "Dernières notes" + supported_by: "Pris en charge par" + collaboration_with: "Avec la collaboration de" + average: "Moyenne" + min: "Min" + max: "Max" + median: "Médiane" + about: > -
    -

    Abstract

    -

    - Many vocabularies and ontologies are produced to represent and annotate agronomic data. Therefore, there is a need of - a common platform to identify, host and use them in agro-informatics application. The AgroPortal project aims to offer - a reference ontology repository for agronomy, reusing the NCBO BioPortal technology. The scientific outcomes and the - experience of the biomedical domain are thus exploited and transposed in the agronomy domain, including plants, food, - environment and possibly animal sciences. We offer an ontology portal which features ontology hosting, search, versioning, - visualization, comment, recommendation, enables semantic annotation, as well as storing and exploiting ontology alignments. - All of these within a fully semantic web compliant infrastructure. The AgroPortal specifically pays attention to respect the - requirements of the agronomic community in terms of ontology formats (e.g., SKOS, trait dictionaries) or supported features. - AgroPortal project is based on five driving agronomic use cases which participate in the design and orientation of the platform. - AgroPortal already offers a robust and stable reference repository highly valuable for the agronomic domain. -

    -

    Use cases

    - -
    -

    New features

    -

    - See the release notes -

    -
    -

    Partners

    -

    The National Center For Biomedical Ontology (NCBO), Institut de Recherche pour le Développement (IRD), Research Data Alliance (RDA), - Bioversity International, Food & Agriculture Organization (FAO), Global Open Data for Agriculture & Nutrition (Godan Action), Institut National de la Recherche Agronomique (INRA)

    -

    Acknowledgments

    -

    The AgroPortal is partly achieved within the Semantic Indexing of French biomedical Resources (SIFR) project - that received funding from the EU H2020 research and innovation programme under the Marie Sklodowska-Curie (grant 701771) - and the French National Research Agency (grant ANR-12-JS02-01001), the NUMEV Labex (grant ANR-10-LABX-20), - the Computational Biology Institute of Montpellier (grant ANR-11-BINF-0002) as well as by University of Montpellier and the CNRS. - We also thank the National Center for Biomedical Ontologies for help and time spent with us in deploying the AgroPortal.

    -

    Team

    - To contact us: firstname.lastname@lirmm.fr -
      -
    • Clément Jonquet, researcher at LIRMM (Univ. of Montpellier, France), main investigator of the AgroPortal project
    • -
    • Anne Toulet, researcher at LIRMM (Univ. of Montpellier, France)
    • -
    • Vincent Emonet, engineer at LIRMM (Univ. of Montpellier, France)
    • -
    -
    - +
    +

    Résumé

    +

    + De nombreux vocabulaires et ontologies sont produits pour représenter et annoter les données agronomiques. Il est donc nécessaire de disposer d'une plateforme commune pour les identifier, les héberger et les utiliser dans les applications d'agro-informatique. Le projet AgroPortal vise à offrir un référentiel d'ontologies de référence pour l'agronomie, en réutilisant la technologie NCBO BioPortal. Les résultats scientifiques et l'expérience du domaine biomédical sont ainsi exploités et transposés dans le domaine de l'agronomie, comprenant les plantes, l'alimentation, l'environnement et éventuellement les sciences animales. Nous proposons un portail d'ontologies qui offre l'hébergement d'ontologies, la recherche, la versioning, la visualisation, le commentaire, la recommandation, permet l'annotation sémantique, ainsi que le stockage et l'exploitation d'alignements d'ontologies. Tout cela dans une infrastructure totalement conforme au web sémantique. Le projet AgroPortal accorde une attention particulière au respect des exigences de la communauté agronomique en termes de formats d'ontologies (par exemple, SKOS, dictionnaires de traits) ou de fonctionnalités prises en charge. Le projet AgroPortal est basé sur cinq cas d'utilisation agronomique qui participent à la conception et à l'orientation de la plateforme. AgroPortal offre déjà un référentiel de référence robuste et stable, d'une grande valeur pour le domaine de l'agronomie. +

    +

    Use cases

    + +
    +

    Nouvelles fonctionnalités

    +

    + See the notes de version +

    +
    +

    Les partenaires

    +

    Le Centre National d'Ontologie Biomédicale (NCBO), l'Institut de Recherche pour le Développement (IRD), Research Data Alliance (RDA), + Bioversity International, Food & Agriculture Organization (FAO), Global Open Data for Agriculture & Nutrition (Godan Action), Institut National de la Recherche Agronomique (INRA)

    +

    remerciements

    +

    L'AgroPortail est en partie réalisé dans le cadre du projet d'Indexation Sémantique des Ressources Biomédicales Françaises (SIFR) + qui ont reçu un financement du programme de recherche et d'innovation H2020 de l'UE dans le cadre de Marie Sklodowska-Curie (subvention 701771) + et l'Agence Nationale de la Recherche (bourse ANR-12-JS02-01001), le Labex NUMEV (bourse ANR-10-LABX-20), + l'Institut de Biologie Computationnelle de Montpellier (bourse ANR-11-BINF-0002) ainsi que par l'Université de Montpellier et le CNRS. + Nous remercions également le Centre National des Ontologies Biomédicales pour son aide et le temps passé avec nous dans le déploiement de l'AgroPortail.

    +

    Équipe

    + Pour nous contacter: firstname.lastname@lirmm.fr +
      +
    • Clément Jonquet,chercheur au LIRMM (Univ. de Montpellier, France), investigateur principal du projet AgroPortal
    • +
    • Anne Toulet, chercheuse au LIRMM (Univ. de Montpellier, France)
    • +
    • Vincent Emonet, ingénieur au LIRMM (Univ. de Montpellier, France)
    • +
    +
    + activerecord: errors: models: license: attributes: encrypted_key: - invalid_license_key: is an invalid license key - no_appliance_id_for_comparison: couldn't be validated. Unable to retrieve virtual appliance ID. - appliance_id_mismatch: is an appliance ID mismatch + invalid_license_key: est une clé de licence invalide + no_appliance_id_for_comparison: n'a pas pu être validé. Impossible de récupérer l'ID de l'appliance virtuelle. + appliance_id_mismatch: est une non-concordance d'ID d'appliance admin: licenses: create: - success: License successfully renewed! + success: Licence renouvelée avec succès ! date: formats: - year_month_day_concise: '%Y-%m-%d' # 2017-03-01 - month_day_year: '%b %-d, %Y' # Mar 1, 2017 - monthfull_day_year: '%B %-d, %Y' # March 1, 2017 + year_month_day_concise: "%Y-%m-%d" # 2017-03-01 + month_day_year: "%b %-d, %Y" # Mar 1, 2017 + monthfull_day_year: "%B %-d, %Y" # March 1, 2017 layouts: footer: - copyright_html: Copyright © 2005‑2022, The Board of Trustees of Leland Stanford Junior University. All rights reserved. + copyright_html: Droit d'auteur &copie; 2005‑2022, Conseil d'administration de l'Université Leland Stanford Junior. Tous les droits sont réservés. grant_html: > - %{site} is currently being developed within French ANR D2KAB project (ANR-18-CE23-0017). It also receives or received support from ANR SIFR project (ANR-12-JS02-0010), European Union H2020-MSCA SIFRm project (No 701771), the NUMEV Labex (ANR-10-LABX-20), the IBC of Montpellier project (ANR-11-BINF0002), the Agro Labex (ANR-10-LABX-0001) as well as from University of Montpellier and the CNRS. + %{site} est actuellement développé dans le cadre du projet ANR D2KAB (ANR-18-CE23-0017). Il reçoit ou a également reçu le soutien du projet ANR SIFR (ANR-12-JS02-0010), Union Européenne Projet H2020-MSCA SIFRm ( N° 701771), le Labex NUMEV (ANR-10-LABX-20), le projet IBC de Montpellier (ANR-11-BINF0002) , l'Agro Labex (ANR-10-LABX-0001) ainsi que de l'Université de Montpellier et du CNRS. notices: license_contact: > - For more information, email support@ontoportal.org or - visit https://ontoportal.org/licensing. + Pour plus d'informations, envoyez un e-mail à support@ontoportal.org ou + visitez https://ontoportal.org/licensing. license_obtain: > - If you are the owner of this OntoPortal installation, you can visit - https://license.ontoportal.org to obtain a license. + Si vous êtes le propriétaire de cette installation OntoPortal, vous pouvez visiter + https://license.ontoportal.org pour obtenir une licence. license_expired: > - We're sorry, but the license for this OntoPortal installation has expired. If you are the owner of this OntoPortal installation, - please visit https://license.ontoportal.org to renew your license. + Nous sommes désolés, mais la licence pour cette installation d'OntoPortal a expiré. Si vous êtes le propriétaire de cette installation OntoPortal, + veuillez visiter https://license.ontoportal.org pour renouveler votre licence. license_trial: - one: - This installation of the OntoPortal Appliance is a trial license, which will expire in 1 day. - other: - This installation of the OntoPortal Appliance is a trial license, which will expire in %{count} days. + one: Cette installation de l'appliance OntoPortal est une licence d'essai, qui expirera dans 1 jour. + other: Cette installation de l'appliance OntoPortal est une licence d'essai, qui expirera dans %{count} jours. home: index: - find_ontology_placeholder: Start typing ontology name, then choose from list - query_placeholder: Enter a class, e.g. Melanoma - tagline: the world's most comprehensive repository of biomedical ontologies - title: Welcome to the %{organization} - welcome: Welcome to %{site}, + find_ontology_placeholder: Commencez à taper le nom de l'ontologie, puis choisissez dans + query_placeholder: Entrez une classe, par exemple Melanoma + tagline: le référentiel d'ontologies biomédicales le plus complet au monde + title: Bienvenue à la %{organization} + welcome: Bienvenue à la %{site}, help: - welcome: Welcome to the National Center for Biomedical Ontology’s %{site}. %{site} is a web-based application for accessing and sharing biomedical ontologies. + welcome: Bienvenue à la le %{site} du Centre national d'ontologie biomédicale. %{site} est une application Web permettant d'accéder et de partager des ontologies biomédicales. getting_started: > - %{site} allows users to browse, upload, download, search, comment on, and create mappings for ontologies. + %{site} permet aux utilisateurs de parcourir, charger, télécharger, rechercher, commenter et créer des mappages pour les ontologies. browse: > - Users can browse and explore individual ontologies by navigating either a tree structure or an animated graphical view. Users can also view mappings and - ontology metadata, and download ontologies. Additionally, users who are signed in may submit a new ontology to the library. - rest_examples_html: View documentation and examples of the %{site} REST API. + Les utilisateurs peuvent parcourir et explorer des ontologies individuelles en naviguant soit dans une structure arborescente, soit dans une vue graphique animée. Les utilisateurs peuvent également afficher les mappages et + métadonnées d'ontologie et téléchargement d'ontologies. De plus, les utilisateurs connectés peuvent soumettre une nouvelle ontologie à la bibliothèque. + rest_examples_html : affichez la documentation et des exemples de l'%{site} API REST. announce_list_html: > - To receive notices of new releases or site outages, please subscribe to the - bioontology-support list. + Pour recevoir des avis de nouvelles versions ou de pannes de site, veuillez vous abonner au + liste de support bioontologie. annotator: index: - intro: Get annotations for biomedical text with classes from the ontologies - annotatorplus_html: Check out AnnotatorPlus beta; a new version of the Annotator with added support for negation, and more! + intro: Obtenez des annotations pour le texte biomédical avec des classes des ontologies + annotatorplus_html: Consultez la version bêta d'AnnotatorPlus ; une nouvelle version de l'Annotator avec un support supplémentaire pour la négation, et plus encore ! fast_context: - tooltip: "Enable FastContext to detect : if a concept has been negated (affirmed, negated), who experienced the found concept (patient, other), when the annotated concept occurred (recent, historical, hypothetical), and/or if the annotated concept is uncertain (certain, uncertain)." - sample_text: Melanoma is a malignant tumor of melanocytes which are found predominantly in skin but also in the bowel and the eye. + tooltip: "Activer FastContext pour détecter : si un concept a été nié (affirmé, nié), qui a vécu le concept trouvé (patient, autre), quand le concept annoté s'est produit (récent, historique, hypothétique), et/ou si le concept annoté est incertain (certain, incertain)." + sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. nbco_annotatosplus: index: intro: > - The NCBO Annotator+ is a proxy calling the NCBO Annotator Web service on the NCBO BioPortal. -

    - Tchechmedjiev, A., Abdaoui, A., Emonet, V., Melzi, S., Jonnagaddala, J., & Jonquet, C. (2018). Enhanced functionalities for annotating and indexing clinical text with the NCBO Annotator+. Bioinformatics, 34(11), 1962-1965. -

    - If using the API, please provide a valid NCBO BioPortal apikey and hit the service at http://services.bioportal.lirmm.fr/ncbo_annotatorplus
    - Text submitted to the NCBO Annotator+ must be in English. - sample_text: Melanoma is a malignant tumor of melanocytes which are found predominantly in skin but also in the bowel and the eye. + Le NCBO Annotator+ est un proxy appelant le service Web NCBO Annotator sur le NCBO BioPortal. +

    + Tchechmedjiev, A., Abdaoui, A., Emonet, V., Melzi, S., Jonnagaddala, J., & Jonquet, C. (2018). Fonctionnalités améliorées pour annoter et indexer le texte clinique avec NCBO Annotator+. Bioinformatique, 34(11), 1962-1965. +

    + Si vous utilisez l'API, veuillez fournir une clé API NCBO BioPortal valide et accéder au service sur http://services.bioportal.lirmm.fr/ncbo_annotatorplus
    + Le texte soumis au NCBO Annotator+ doit être en anglais. + sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. recommender: - intro: Get recommendations for the most relevant ontologies based on an excerpt from a biomedical text or a list of keywords + intro: Obtenez des recommandations pour les ontologies les plus pertinentes à partir d'un extrait d'un texte biomédical ou d'une liste de mots-clés search: index: - intro: Search for a class in multiple ontologies - search_keywords_placeholder: Enter a class, e.g. Melanoma - categories_placeholder: Start typing to select categories or leave blank to use all - property_definition: Named association between two entities. Examples are "definition" (a relation between a class and some text) and "part-of" (a relation between two classes). + intro: Rechercher une classe dans plusieurs ontologies + search_keywords_placeholder: Entrez une classe, par ex. Mélanome + categories_placeholder: Commencez à taper pour sélectionner des catégories ou laissez vide pour tout utiliser + property_definition: Association nommée entre deux entités. Les exemples sont "définition" (une relation entre une classe et du texte) et "partie de" (une relation entre deux classes). obsolete_definition: > - A class that the authors of the ontology have flagged as being obsolete and which they recommend that people not use. These classes - are often left in ontologies (rather than removing them entirely) so that existing systems that depend on them will continue to function. + Une classe que les auteurs de l'ontologie ont signalée comme étant obsolète et qu'ils recommandent de ne pas utiliser. Ces cours + sont souvent laissés dans des ontologies (plutôt que de les supprimer entièrement) afin que les systèmes existants qui en dépendent continuent à fonctionner. projects: index: - intro: Browse a selection of projects that use %{site} resources + intro: Parcourez une sélection de projets qui utilisent les ressources %{site} ontologies: - intro: Browse the library of ontologies + intro: Parcourir la bibliothèque d'ontologies concepts: request_term: new_term_instructions: > -

    This ontology integrates with OntoloBridge, allowing community users to suggest additions to the public ontology. Complete the template below to submit a term request directly to the ontology maintainer.

    -
    -

    Term Label (required)
    Suggested term name. If a term can be described with multiple synonyms, only list the preferred name here.

    -
    -
    -

    Term description (required)
    A brief definition, description, or usage of your suggested term. Additional term synonyms may be listed in this section.

    -
    -
    -

    Superclass (required)
    The parent term of the suggested term. The parent term should be an existing entry of the current ontology. The superclass can be selected directly from Bioportal's Classes tree viewer.

    -
    -
    -

    References (optional)
    Provide evidence for the existence of the requested term such as Pubmed IDs of papers or links to other resources that describe the term.

    -
    -
    -

    Justification (optional)
    Provide any additional information about the requested term here.

    -
    +

    Cette ontologie s'intègre à OntoloBridge, permettant aux utilisateurs de la communauté de suggérer des ajouts à l'ontologie publique. Remplissez le modèle ci-dessous pour soumettre une demande de terme directement au responsable de l'ontologie.

    +
    +

    Libellé du terme (obligatoire)
    Nom du terme suggéré. Si un terme peut être décrit avec plusieurs synonymes, n'indiquez ici que le nom préféré.

    +
    +
    +

    Description du terme (obligatoire)
    Une brève définition, description ou utilisation du terme suggéré. Des synonymes de termes supplémentaires peuvent être répertoriés dans cette section.

    +
    +
    +

    Superclasse (obligatoire)
    Le terme parent du terme suggéré. Le terme parent doit être une entrée existante de l'ontologie actuelle. La superclasse peut être sélectionnée directement à partir de l'arborescence des classes de Bioportal.

    +
    +
    +

    Références (facultatif)
    Fournissez des preuves de l'existence du terme demandé, telles que les identifiants Pubmed des articles ou des liens vers d'autres ressources décrivant le terme.

    +
    +
    +

    Justification (facultatif)
    Fournissez ici toute information supplémentaire sur le terme demandé.

    +
    mappings: - intro: Browse mappings between classes in different ontologies + intro: Parcourir les mappages entre les classes dans différentes ontologies From be5056753999b698b95365dd6ee1195723927e98 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Tue, 11 Apr 2023 18:09:01 +0200 Subject: [PATCH 044/533] Translate Home page --- .../platform_language_controller.js | 2 +- .../fair_score/_fair_service_header.html.haml | 4 +-- app/views/home/_fair_score_home.html.haml | 10 +++--- app/views/home/index.html.haml | 36 +++++++++---------- app/views/shared/_ontology_picker.html.erb | 10 ++++-- config/locales/en.yml | 35 +++++++++++++----- config/locales/fr.yml | 34 +++++++++++++----- 7 files changed, 84 insertions(+), 47 deletions(-) diff --git a/app/javascript/controllers/platform_language_controller.js b/app/javascript/controllers/platform_language_controller.js index 88bfd5ad4..682d8e901 100644 --- a/app/javascript/controllers/platform_language_controller.js +++ b/app/javascript/controllers/platform_language_controller.js @@ -16,6 +16,6 @@ export default class extends Controller { handleLangChanged(event) { const userPreferedLanguage = event.target.value; - Turbo.visit(`/locale/${userPreferedLanguage}`); + Turbo.visit(`/locale/${userPreferedLanguage}`, { action: "replace" }); } } diff --git a/app/views/fair_score/_fair_service_header.html.haml b/app/views/fair_score/_fair_service_header.html.haml index f4550d08b..61321623d 100644 --- a/app/views/fair_score/_fair_service_header.html.haml +++ b/app/views/fair_score/_fair_service_header.html.haml @@ -4,7 +4,7 @@ %span.badge.badge-pill.badge-secondary beta %span - = link_to("https://github.com/agroportal/fairness", target: "_blank", "aria-label": "View fair scores definitions", title: "View fair scores definitions") do + = link_to("https://github.com/agroportal/fairness", target: "_blank", "aria-label": t("view_fair_scores_definitions"), title: t("view_fair_scores_definitions")) do %i.fas.fa-lg.fa-question-circle{"aria-hidden": "true", style: "margin-left: 0.5rem"} - = link_to(get_fairness_service_url,id: "fairness-service-url", target: "_blank", "aria-label": "Get the json version", title: "Get the json version") do + = link_to(get_fairness_service_url,id: "fairness-service-url", target: "_blank", "aria-label": t("get_json_version"), title: t("get_json_version")) do %i.fas.fa-lg.fa-code{"aria-hidden": "true", style: "margin-left: 0.5rem" } \ No newline at end of file diff --git a/app/views/home/_fair_score_home.html.haml b/app/views/home/_fair_score_home.html.haml index 9e83a221b..519e62cf3 100644 --- a/app/views/home/_fair_score_home.html.haml +++ b/app/views/home/_fair_score_home.html.haml @@ -5,22 +5,22 @@ = render partial: "fair_score/fair_service_header" %span %h2.p-2.badge.badge-secondary - Average + = t('average') %span.badge.badge-light %span#fair-score-average 0 (0%) %h2.p-2.badge.badge-secondary - Min + = t('min') %span.badge.badge-light %span#fair-score-min 0 (0%) %h2.p-2.badge.badge-secondary - Max + = t('max') %span.badge.badge-light %span#fair-score-max 0 (0%) %h2.p-2.badge.badge-secondary - Median + = t('median') %span.badge.badge-light %span#fair-score-median 0 (0%) @@ -33,6 +33,6 @@ %div.col-md-6.col-sm = render partial: "shared/fair_score_radar" , locals: {data: nil } %a.btn.btn-link{href:"/landscape#fairness_assessment"} - See details + = t('see_details') %div.col-md-6.col-sm = render partial: "shared/fair_score_bars", locals: {data: nil} \ No newline at end of file diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 222b3a746..5ab86c1e5 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -27,7 +27,7 @@ %div.card-deck -# Search for a class across ontologies %div.card - %div.card-header Search for a class + %div.card-header= t('main.search_class') %div.card-body = form_tag("/search", method: "get") do %div.input-group.mb-3 @@ -36,10 +36,10 @@ %div.input-group-append = button_tag(type: "submit", class: "btn btn-primary", aria: {label: "Search for a class"}) do %i{class: "fas fa-search fa-lg", aria: {hidden: "true"}} - %a{:href => "/search?opt=advanced"} Advanced Search + %a{:href => "/search?opt=advanced"}= t("main.advanced_search") -# Search for an ontology %div.card - %div.card-header Find an ontology + %div.card-header= t('main.find_ontology') %div.card-body %input#find_ontology_id{:type => "hidden"} %div.input-group.mb-3 @@ -48,11 +48,11 @@ = button_tag(class: "btn btn-primary", onclick: "jumpToValueOntology()", aria: {label: "Find an ontology"}) do %i{class: "fas fa-search fa-lg", aria: {hidden: "true"}} %div.dropdown - = button_tag("Browse Ontologies", type: "button", id: "ontologyGroupsDropdown", class: "btn btn-info dropdown-toggle", data: {toggle: "dropdown", offset: "0,10"}, aria: {haspopup: "true", expanded: "false"}) + = button_tag(t('main.browse_ontologies'), type: "button", id: "ontologyGroupsDropdown", class: "btn btn-info dropdown-toggle", data: {toggle: "dropdown", offset: "0,10"}, aria: {haspopup: "true", expanded: "false"}) %div.dropdown-menu{"aria-labelledby": "ontologyGroupsDropdown"} - = link_to("All", ontologies_path(), class: "dropdown-item") + = link_to(t('all'), ontologies_path(), class: "dropdown-item") %div.dropdown-divider - %h6.dropdown-header Browse by group + %h6.dropdown-header= t("main.browse_by_group") - @groups.each do |group| = link_to(group[:name], ontologies_path(filter: group[:acronym]), class: "dropdown-item") %div.row.pt-3.statistics @@ -60,33 +60,33 @@ %div.card-deck -# Ontology visits %div.card - %div.card-header Ontology Visits #{"in full #{$SITE} " if at_slice?} (#{@analytics.date.strftime("%B %Y")}) + %div.card-header #{t('main.ontology_visits')} #{"in full #{$SITE} " if at_slice?} (#{@analytics.date.strftime("%B %Y")}) = content_tag(:div, nil, id: "ontology-visits-chart", class: "card-body", data: {ontnames: @anal_ont_names, ontnumbers: @anal_ont_numbers}) do %canvas#myChart - = link_to("More", visits_path()) + = link_to(t('more'), visits_path()) -# Ontology statistics %div.card - %div.card-header #{$SITE} Statistics #{"in full #{$SITE}" if at_slice?} + %div.card-header #{$SITE} #{t('statistics')} #{"in full #{$SITE}" if at_slice?} %ul.list-group.list-group-flush %li.list-group-item %div.d-flex.justify-content-between.align-items-center - %span Ontologies + %span= t('main.ontologies') %span= number_with_delimiter(@ont_count) %li.list-group-item %div.d-flex.justify-content-between.align-items-center - %span Classes + %span= t('main.classes') %span= number_with_delimiter(@cls_count, :delimiter => ",") %li.list-group-item %div.d-flex.justify-content-between.align-items-center - %span Individuals + %span= t('main.individuals') %span= number_with_delimiter(@individuals_count, :delimiter => ",") %li.list-group-item %div.d-flex.justify-content-between.align-items-center - %span Projects + %span= t('main.projects') %span= LinkedData::Client::Models::Project.all.length %li.list-group-item %div.d-flex.justify-content-between.align-items-center - %span Users + %span= t('main.users') %span= LinkedData::Client::Models::User.all.length - if fairness_service_enabled? %div#fair-home.row.mt-3 @@ -96,11 +96,11 @@ %div.card-deck -# Latest Notes %div.card - %div.card-header Latest Notes + %div.card-header= t('main.latest_notes') %ul.list-group.list-group-flush - if @last_notes.nil? || @last_notes.empty? %li.list-group-item - %span No recent notes have been submitted + %span= t('main.no_recent_notes') - else - for note in @last_notes %li.list-group-item @@ -118,7 +118,7 @@ - if !$ENABLE_SLICES.nil? && $ENABLE_SLICES == true && !at_slice? -# Slices %div.card - %div.card-header Slices + %div.card-header= t("slices") %ul.list-group.list-group-flush - LinkedData::Client::Models::Slice.all.each_with_index do |slice, index| - break if index == 10 @@ -135,7 +135,7 @@ %div.col %div.card-deck %div.card - %div.card-header= home_page_logos_row[:title] + %div.card-header= home_page_logos_row[:title][I18n.locale] %div.logos - home_page_logos_row[:links].to_a.each do |logo| = link_to(image_tag(logo[:img_src]), logo[:url], target: logo[:target]) diff --git a/app/views/shared/_ontology_picker.html.erb b/app/views/shared/_ontology_picker.html.erb index 9ddd31268..be357dfaf 100644 --- a/app/views/shared/_ontology_picker.html.erb +++ b/app/views/shared/_ontology_picker.html.erb @@ -35,13 +35,17 @@ var hideChosenResults = function(){
    - <%=select form_object, form_attribute, options_for_select(@onts_for_select, selected_ontologies), { }, :multiple => 'true', "data-placeholder".to_sym => "Start typing to select ontologies or leave blank to use all", :style => "width: 432px;" %> + <%=select form_object, form_attribute, options_for_select(@onts_for_select, selected_ontologies), { }, :multiple => 'true', "data-placeholder".to_sym => t("select_ontologies"), :style => "width: 432px;" %>
    <%=render_advanced_picker(custom_ontologies, selected_ontologies)%> diff --git a/config/locales/en.yml b/config/locales/en.yml index d42db4d54..257c80635 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,4 +1,21 @@ en: + + all : "All" + see_details: "See details" + view_fair_scores_definitions: "View fair scores definitions" + get_json_version: "Get the json version" + select_ontologies: "Start typing to select ontologies or leave blank to use all" + clear_selection: "Clear selection" + select_from_list: "Select from list" + more: "More" + statistics: "Statistics" + average: "Average" + min: "Min" + max: "Max" + median: "Median" + slices: "Slices" + + header: browse: "Browse" search: "Search" @@ -21,21 +38,21 @@ en: main: find_ontology: "Find an ontology" search_class: "Search for a class" - welcome_to: "Welcome to" + browse_by_group: "Browse by group" + browse_ontologies: "Browse Ontologies" comprehensive_repository: "the world's most comprehensive repository of biomedical ontologies" advanced_search: "Advanced Search" - statistics: "Statistics" ontology_visits: "Ontology Visits" fair_scores: "FAIR Scores" clear_selection: "Clear Selection" - slices: "Slices" latest_notes: "Latest Notes" - supported_by: "Supported by" - collaboration_with: "With the collaboration of" - average: "Average" - min: "Min" - max: "Max" - median: "Median" + ontologies: "Ontologies" + classes: "Classes" + individuals: "Individuals" + projects: "Projects" + users: "Users" + no_recent_notes: "No recent notes have been submitted" + diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 160d30f95..1ff4ec297 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,4 +1,20 @@ fr: + + all : "Tout" + see_details: "Voir les détails" + view_fair_scores_definitions: "View fair scores definitions" + get_json_version: "Get the json version" + select_ontologies: "Commencez à taper pour sélectionner des ontologies ou laissez vide pour toutes les utiliser" + clear_selection: "Effacer la sélection" + select_from_list: "Sélectionner dans la liste" + more: "Plus" + statistics: "Statistiques" + average: "Moyenne" + min: "Min" + max: "Max" + median: "Médiane" + slices: "Tranches" + header: browse: "Parcourir" search: "Rechercher" @@ -21,21 +37,21 @@ fr: main: find_ontology: "Trouver une ontologie" search_class: "Rechercher une classe" - welcome_to: "Bienvenue sur" + browse_by_group: "Parcourir par groupe" + browse_ontologies: "Parcourir les ontologies" comprehensive_repository: "le référentiel d'ontologies biomédicales le plus complet au monde" advanced_search: "Recherche avancée" - statistics: "Statistiques" ontology_visits: "Visites d'ontologie" fair_scores: "Scores FAIR" clear_selection: "Effacer la sélection" - slices: "Tranches" latest_notes: "Dernières notes" - supported_by: "Pris en charge par" - collaboration_with: "Avec la collaboration de" - average: "Moyenne" - min: "Min" - max: "Max" - median: "Médiane" + ontologies: "Ontologies" + classes: "Des classes" + individuals: "Personnes" + projects: "Projets" + users: "Utilisateurs" + no_recent_notes: "Aucune note récente n'a été soumise" + about: >
    From 94338cfbbb8165760cde58016dd941126ffe51a0 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Wed, 12 Apr 2023 12:45:56 +0200 Subject: [PATCH 045/533] Translate search page --- app/views/search/index.html.haml | 18 +++++++++--------- config/locales/en.yml | 13 +++++++++++++ config/locales/fr.yml | 15 +++++++++++++++ 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/app/views/search/index.html.haml b/app/views/search/index.html.haml index 5235f869e..de4227627 100644 --- a/app/views/search/index.html.haml +++ b/app/views/search/index.html.haml @@ -1,23 +1,23 @@ -- @title = "Search" +- @title = t("search_page.title") %div.container.mt-5 %h1.display-4 - Class Search + = t("search_page.class_search") = form_tag("/search", method: "post") do %div.form-group = text_field_tag("search_keywords", nil, class: "form-control", aria: {describedby: "classSearchHelpBlock"}) %small#classSearchHelpBlock.form-text.text-muted = t(".search_keywords_placeholder") - = link_to("help", Rails.configuration.settings.links[:help_search], id: "search-help", - aria: {label: "View search documentation"}, class: "float-right") + = link_to(t('help'), Rails.configuration.settings.links[:help_search], id: "search-help", + aria: {label: t('search_page.view_search_documentation')}, class: "float-right") %div.form-group - = link_to("Show advanced options", "javascript:void(0)", id: "advanced_options", data: {text_swap: "Hide advanced options"}, class: "form-text") + = link_to(t('search_page.show_advanced_options'), "javascript:void(0)", id: "advanced_options", data: {text_swap: t('search_page.hide_advanced_options')}, class: "form-text") -# Advanced search options %div#search_options{style: "display: none;"} %div.form-group.row - %div.col-sm-2 Include in search: + %div.col-sm-2= t("search_page.include_in_search") + ":" %div.col-sm-10 %div.form-check = check_box(:search, :include_properties, class: "form-check-input") @@ -29,7 +29,7 @@ = check_box(:search, :include_views, class: "form-check-input") = label(:search, :include_views, "Ontology views", class: "form-check-label") %div.form-group.row - %div.col-sm-2 Narrow search to: + %div.col-sm-2= t("search_page.narrow_search_to") + ":" %div.col-sm-10 %div.form-check = check_box(:search, :exact_match, class: "form-check-input") @@ -38,12 +38,12 @@ = check_box(:search, :require_definition, class: "form-check-input") = label(:search, :require_definition, "Classes with definitions", class: "form-check-label") %div.form-group - %h6{style: "font-size: 10pt !important"} Categories + %h6{style: "font-size: 10pt !important"}= t("search_page.categories") = select(:search, :categories, options_for_select(categories_for_select), {}, style: "width: 432px", multiple: "true", data: {placeholder: t(".categories_placeholder")}) %div.form-group.mb-5{style: "width:432px"} = render :partial => "shared/ontology_picker", locals: {sel_text: "Ontologies"} - = button_tag("Search", id: "search_button", class: "btn btn-primary") + = button_tag(t('search_page.title'), id: "search_button", class: "btn btn-primary") = content_tag(:span, id: "search_spinner") do %img{src: asset_path('spinners/spinner_000000_16px.gif'), style: "vertical-align: middle;"} diff --git a/config/locales/en.yml b/config/locales/en.yml index 257c80635..19f0dad89 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -14,6 +14,7 @@ en: max: "Max" median: "Median" slices: "Slices" + help: "Help" header: @@ -54,6 +55,18 @@ en: no_recent_notes: "No recent notes have been submitted" + search_page: + title: "Search" + class_search: "Class Search" + show_advanced_options: "Show advanced options" + hide_advanced_options: "Hide advanced options" + view_search_documentation: "View search documentation" + include_in_search: "Include in search" + narrow_search_to: "Narrow search to" + categories: "Categories" + + + diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 1ff4ec297..4cacfbc31 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -14,6 +14,7 @@ fr: max: "Max" median: "Médiane" slices: "Tranches" + help: "Aide" header: browse: "Parcourir" @@ -53,6 +54,20 @@ fr: no_recent_notes: "Aucune note récente n'a été soumise" + + search_page: + title: "Rechercher" + class_search: "Recherche de classe" + show_advanced_options: "Afficher les options avancées" + hide_advanced_options: "Masquer les options avancées" + view_search_documentation: "Voir la documentation de recherche" + include_in_search: "Inclure dans la recherche" + narrow_search_to: "Réduire la recherche à" + categories: "Catégories" + + + + about: >

    Résumé

    From 4149c0c3fe705a1e6080134a1d43321a7af81b45 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Wed, 12 Apr 2023 14:00:25 +0200 Subject: [PATCH 046/533] Translate annotator page --- app/views/annotator/index.html.haml | 100 ++++++++++++++-------------- config/locales/en.yml | 58 +++++++++++++++- config/locales/fr.yml | 53 +++++++++++++++ 3 files changed, 158 insertions(+), 53 deletions(-) diff --git a/app/views/annotator/index.html.haml b/app/views/annotator/index.html.haml index 6c12a1f55..d6d8cf691 100644 --- a/app/views/annotator/index.html.haml +++ b/app/views/annotator/index.html.haml @@ -1,4 +1,4 @@ -- @title = "Annotator" +- @title= t('annotator_page.title') %head = javascript_include_tag "bp_annotator" @@ -6,7 +6,7 @@ %div.container-fluid %div.row %div.col - %h2.mt-3 Annotator + %h2.mt-3= t('annotator_page.title') %p = t('annotator.index.intro', site: $SITE).html_safe = link_to(help_path(anchor: "Annotator_Tab"), id: "annotator-help", target: "_blank") do @@ -17,90 +17,90 @@ %form %div.form-group = hidden_field_tag :annotation_sample_text, t('annotator.index.sample_text') - = text_area_tag("annotation_text", nil, rows: 10, class: "form-control", placeholder: "Enter or paste text to be annotated", "aria-describedby": "annotateTextHelpBlock") + = text_area_tag("annotation_text", nil, rows: 10, class: "form-control", placeholder: t('annotator_page.enter_or_paste_text'), "aria-describedby": "annotateTextHelpBlock") %small#annotateTextHelpBlock.form-text - %a#insert_text_link{href: "javascript:void(0);"} insert sample text + %a#insert_text_link{href: "javascript:void(0);"}= t('shared.insert_sample_text') - %a#advancedOptionsLink{:href => "javascript:void(0);"} Show advanced options >> + %a#advancedOptionsLink{:href => "javascript:void(0);"}= t('shared.show_advanced_options') + ">>" %div#advanced-options-container.mt-4 %div.form-group %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("longest_only", "all", false, class: "custom-control-input") - %label.custom-control-label{for: "longest_only"} Match longest only + %label.custom-control-label{for: "longest_only"}= t('annotator_page.filters.match_longest_only') %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("whole_word_only", "all", false, class: "custom-control-input") - %label.custom-control-label{for: "whole_word_only"} Match partial words + %label.custom-control-label{for: "whole_word_only"}= t('annotator_page.filters.match_partial_words') %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("mappings", "all", false, id: "mappings_all", class: "custom-control-input") - %label.custom-control-label{for: "mappings_all"} Include mappings + %label.custom-control-label{for: "mappings_all"}= t('annotator_page.filters.include_mappings') %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("exclude_numbers", "all", false, class: "custom-control-input") - %label.custom-control-label{for: "exclude_numbers"} Exclude numbers + %label.custom-control-label{for: "exclude_numbers"}= t('annotator_page.filters.exclude_numbers') %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("exclude_synonyms", "all", false, class: "custom-control-input") - %label.custom-control-label{for: "exclude_synonyms"} Exclude synonyms + %label.custom-control-label{for: "exclude_synonyms"}= t('annotator_page.filters.exclude_synonyms') %div.form-group - %label{for: "ontology_ontologyId"} Select ontologies + %label{for: "ontology_ontologyId"}= t('annotator_page.select', name: t('ontology')) = select_tag("ontology_ontologyId", options_from_collection_for_select(@annotator_ontologies, :acronym, lambda { |ont| "#{ont.name} (#{ont.acronym})" }), | multiple: true, class: "form-control", "aria-describedby": "selectOntologiesHelpBlock") | - %small#selectOntologiesHelpBlock.form-text.text-muted Start typing to select ontologies or leave blank to use all + %small#selectOntologiesHelpBlock.form-text.text-muted= t('annotator_page.start_typing_to_select', type: t('ontology')) - if @sem_type_ont %div.form-group - %label{for: "semantic_types"} Select UMLS semantic types + %label{for: "semantic_types"}= t('annotator_page.select', name: t('annotator_page.umls.semantic_types')) = select_tag("semantic_types", options_for_select(@semantic_types_for_select), multiple: "true", class: "form-control", "aria-describedby": "selectSemanticTypesHelpBlock") - %small#selectSemanticTypesHelpBlock.form-text.text-muted Start typing to select UMLS semantic types or leave blank to use all + %small#selectSemanticTypesHelpBlock.form-text.text-muted= t('annotator_page.start_typing_to_select', type: t('annotator_page.umls.semantic_types')) %div.form-group - %label{for: "semantic_groups"} Select UMLS semantic groups + %label{for: "semantic_groups"}= t('annotator_page.select', name: t('annotator_page.umls.semantic_groups')) = select_tag("semantic_groups", options_for_select(@semantic_groups_for_select), multiple: "true", class: "form-control", "aria-describedby": "selectSemanticGroupsHelpBlock") - %small#selectSemanticGroupsHelpBlock.form-text.text-muted Start typing to select UMLS semantic groups or leave blank to use all + %small#selectSemanticGroupsHelpBlock.form-text.text-muted= t('annotator_page.start_typing_to_select', type: t('annotator_page.umls.semantic_groups')) %div.form-group - %label{for: "class_hierarchy_max_level"} Include ancestors up to level + %label{for: "class_hierarchy_max_level"}= t('annotator_page.filters.max_hierarchy_level') - options = [["none", 0], *(1..10).map {|i| [i, i]}, ["all", 999]] = select_tag("class_hierarchy_max_level", options_for_select(options, 0), class: "form-control") %div.form-group - %label{for: "score"} Include score + %label{for: "score"}= t('annotator_page.filters.score') - options = [["none", ""], ["old", "old"], ["cvalue", "cvalue"], ["cvalueh", "cvalueh"]] = select_tag(:score, options_for_select(options, 0), class: "form-control", "aria-describedby": "includeScoreHelpBlock") - %small#includeScoreHelpBlock.form-text.text-muted Score annotations following the previous 2009 NCBO measure (old) or the C-Value measure (cvalue). If hierarchy expansion is used, then prefer cvalueh. + %small#includeScoreHelpBlock.form-text.text-muted= t('annotator_page.filters.score_help') %div.form-group - %label{for: "score_threshold"} Filter by score threshold + %label{for: "score_threshold"}= t('annotator_page.filters.score_threshold') = number_field_tag(:score_threshold, 0, id: "score_threshold", class: "form-control", "aria-describedby": "scoreThresholdHelpBlock") - %small#scoreThresholdHelpBlock.form-text.text-muted Specify the minimum score value for annotations + %small#scoreThresholdHelpBlock.form-text.text-muted= t('annotator_page.filters.score_threshold_help') %div.form-group - %label{for: "confidence_threshold"} Filter confidence threshold + %label{for: "confidence_threshold"}= t('annotator_page.filters.confidence_threshold') = number_field_tag(:confidence_threshold, 0, min: 0, max: 100, id: "confidence_threshold", class: "form-control", "aria-describedby": "confidenceThresholdHelpBlock") - %small#confidenceThresholdHelpBlock.form-text.text-muted Specify the minimum position in the scoring distribution (between 1 and 100) + %small#confidenceThresholdHelpBlock.form-text.text-muted= t('annotator_page.filters.confidence_threshold_help') - if @recognizers.length > 1 %div.form-group - %label{for: "recognizer"} Entity recognizer + %label{for: "recognizer"}= t('annotator_page.filters.recognizer') - default_recognizer = @recognizers.include?("mgrep") ? "mgrep" : @recognizers.first = select_tag("recognizer", options_for_select(@recognizers.map {|r| [r, r]}, default_recognizer), class: "form-control") %div.form-group %div.custom-control.custom-checkbox = check_box_tag("fast_context", :all, false, class: "custom-control-input") - %label.custom-control-label{for: "fast_context"} FastContext + %label.custom-control-label{for: "fast_context"}= t('annotator_page.fast_context') %small#fast_contextnHelp.form-text.text-muted= t('annotator.index.fast_context.tooltip') %div.form-group %div.custom-control.custom-checkbox = check_box_tag("lemmatize", false, false, class: "custom-control-input") - %label.custom-control-label{for: "lemmatize"} Lemmatize - %small#lemmatize.form-text.text-muted Enable Lemmatize to lemmatize the submitted text and use a lemmatized dictionary for the annotations + %label.custom-control-label{for: "lemmatize"}= t('annotator_page.lemmatize') + %small#lemmatize.form-text.text-muted= t('annotator.index.lemmatize.tooltip') %div.my-4 - = button_tag("Get annotations", type: "button", id: "annotator_button", class: "btn btn-primary btn-lg") + = button_tag(t('annotator_page.get_annotator'), type: "button", id: "annotator_button", class: "btn btn-primary btn-lg") %span.annotator_spinner %img{src: asset_path('spinners/spinner_000000_16px.gif')}/ %span#annotator_error.annotator_error @@ -109,9 +109,9 @@ %div.col #annotations_container #result_counts - %h4 Annotations + %h4= t('annotator_page.annotations_result') #filter_list{:style => "font-size: 9pt; color: gray; display: none; clear: both; margin: -15px 0 5px"} - %span#filter_title> Results are filtered by + %span#filter_title> #{t('annotator_page.results_filtered_by')}:  \  %span#filter_names #results_error{:style => "color: red; margin-bottom: 7px;"} @@ -119,45 +119,45 @@ %thead %tr %th - Class + = t('class') %span.popup_container %span.bp_popup_link_container - %a#filter_classes.bp_popup_link{:href => "javascript:void(0);"} filter + %a#filter_classes.bp_popup_link{:href => "javascript:void(0);"}= t('filter') %div#classes_filter_list.bp_popup_list %th - Ontology + = t('ontology') %span.popup_container %span.bp_popup_link_container - %a#filter_ontologies.bp_popup_link{:href => "javascript:void(0);"} filter + %a#filter_ontologies.bp_popup_link{:href => "javascript:void(0);"}= t('filter') %div#ontology_filter_list.bp_popup_list %th{class: "match_type"} - Type + = t('type') %span.popup_container %span.bp_popup_link_container - %a#filter_match_type.bp_popup_link{:href => "javascript:void(0);"} filter + %a#filter_match_type.bp_popup_link{:href => "javascript:void(0);"}= t('filter') %div#match_type_filter_list.bp_popup_list - %th UMLS Sem Type - %th{class: "match_context"} Context + %th= t('umls_sem_type') + %th{class: "match_context"}= t('context') %th - Matched Class + = t('matched_class') %span.popup_container %span.bp_popup_link_container - %a#filter_matched_classes.bp_popup_link{:href => "javascript:void(0);"} filter + %a#filter_matched_classes.bp_popup_link{:href => "javascript:void(0);"}= t('filter') %div#matched_classes_filter_list.bp_popup_list %th - Matched Ontology + = t('matched_ontology') %span.popup_container %span.bp_popup_link_container - %a#filter_matched_ontologies.bp_popup_link{:href => "javascript:void(0);"} filter + %a#filter_matched_ontologies.bp_popup_link{:href => "javascript:void(0);"}= t('filter') %div#matched_ontology_filter_list.bp_popup_list - %th Score - %th Negation - %th Experiencer - %th Temporality - %th Certainty + %th= t('score') + %th= t('negation') + %th= t('experiencer') + %th= t('temporality') + %th= t('certainty') %tbody %div.my-3 - %b Format results as + %b= t('format_results') %div.my-3 %span#download_links_tabdelimited.link_button.ui_button %span#download_links_json.link_button.ui_button @@ -165,8 +165,8 @@ %span#download_links_text.link_button.ui_button -# %span#download_links_xml.link_button.ui_button %div.mt-3 - Reproduce these results using the + = link_to(t('reproduce_results')) %span#annotator_parameters %div.mb-4 - Additional parameters explained at + = t('additional_parameters') = link_to('Annotator API documentation', "#{$REST_URL}/documentation#nav_annotator", target: "_blank") diff --git a/config/locales/en.yml b/config/locales/en.yml index 19f0dad89..b97d0c8c2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -15,7 +15,23 @@ en: median: "Median" slices: "Slices" help: "Help" - + + class: "Class" + filter: "Filter" + ontology: "Ontology" + type: "Type" + context: "Context" + umls_sem_type: "UMLS Sem Type" + matched_class: "Matched Class" + matched_ontology: "Matched Ontology" + score: "Score" + negation: "Negation" + experiencer: "Experiencer" + temporality: "Temporality" + certainty: "Certainty" + format_results: "Format results as " + reproduce_results : "Reproduce these results using the " + additional_parameters: "Additional parameters explained at " header: browse: "Browse" @@ -53,7 +69,12 @@ en: projects: "Projects" users: "Users" no_recent_notes: "No recent notes have been submitted" - + + shared: + show_advanced_options: "Show advanced options" + insert_sample_text: "Insert sample text" + umls_semantic: "UMLS semantic" + search_page: title: "Search" @@ -64,7 +85,36 @@ en: include_in_search: "Include in search" narrow_search_to: "Narrow search to" categories: "Categories" - + + annotator_page: + title: "Annotator" + get_annotator: "Get Annotations" + filters: + match_longest_only: "Match longest only" + match_partial_words: "Match partial words" + include_mappings: "Include mappings" + exclude_numbers: "Exclude numbers" + exclude_synonyms: "Exclude synonyms" + max_hierarchy_level: "Include ancestors up to level" + score: "Include score" + score_help: "Score annotations following the previous 2009 NCBO measure (old) or Score annotations following the C-Value measure (cvalue) or Score annotations following the C-Value measure with hierarchy expansion (cvalueh)" + score_threshold: "Filter by score threshold" + score_threshold_help: "Specify the minimum score value for annotations " + confidence_threshold: "Filter confidence threshold" + confidence_threshold_help: "Specify the minimum position in the scoring distribution (between 1 and 100)" + recognizer: "Entity recognizer" + start_typing_to_select: "Start typing to select %{type} or leave blank to use all" + select: "Select %{name}" + enter_or_paste_text: "Enter or paste text to be annotated" + fast_context: "FastContext" + lemmatize: "Lemmatize" + annotations_result: "Annotations" + results_filtered_by: "Results are filtered by" + + + umls: + semantic_types: "UMLS semantic types" + semantic_groups: "UMLS semantic groups" @@ -186,6 +236,8 @@ en: annotatorplus_html: Check out AnnotatorPlus beta; a new version of the Annotator with added support for negation, and more! fast_context: tooltip: "Enable FastContext to detect : if a concept has been negated (affirmed, negated), who experienced the found concept (patient, other), when the annotated concept occurred (recent, historical, hypothetical), and/or if the annotated concept is uncertain (certain, uncertain)." + lemmatize: + tooltip: "Enable Lemmatize to lemmatize the submitted text and use a lemmatized dictionary for the annotations" sample_text: Melanoma is a malignant tumor of melanocytes which are found predominantly in skin but also in the bowel and the eye. nbco_annotatosplus: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 4cacfbc31..6ec061ab0 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -16,6 +16,23 @@ fr: slices: "Tranches" help: "Aide" + class: "Classe" + filter : "Filtre" + ontology: "Ontologie" + type: "Tapez" + context: "Contexte" + umls_sem_type: "Type Sem UMLS" + matched_ontology: "ontologie correspondante" + matched_class: "Classe correspondante" + score: "Score" + negation: "négation" + experiencer: "Experiencer" + temporality : "Temporalité" + certainty : "Certitude" + format_results: "Formater les résultats en " + reproduce_results : "Reproduisez ces résultats en utilisant le " + additional_parameters: "Paramètres supplémentaires expliqués à " + header: browse: "Parcourir" search: "Rechercher" @@ -53,6 +70,11 @@ fr: users: "Utilisateurs" no_recent_notes: "Aucune note récente n'a été soumise" + + shared: + show_advanced_options : "Afficher les options avancées" + insert_sample_text : "Insérer un exemple de texte" + umls_semantic : "sémantique UMLS" search_page: @@ -65,6 +87,35 @@ fr: narrow_search_to: "Réduire la recherche à" categories: "Catégories" + annotator_page: + title: "Annotateur" + get_annotator: "Obtenir les annotations" + filters: + match_longest_only: "Correspond le plus long uniquement" + match_partial_words: "Reconnaître des mots partiels" + include_mappings: "Inclure les mappages" + exclude_numbers: "Exclure des numéros" + exclude_synonyms: "Exclure les synonymes" + max_hierarchy_level: "Inclure les ancêtres jusqu'au niveau" + score: "Inclure le score" + score_help: "Annotations de score suivant la mesure NCBO 2009 précédente (ancienne) ou Annotations de score suivant la mesure C-Value (cvalue) ou Annotations de score suivant la mesure C-Value avec expansion de la hiérarchie (cvalueh)" + score_threshold: "Filtrer par seuil de score" + score_threshold_help: "Spécifier la valeur de score minimum pour les annotations" + confidence_threshold: "Seuil de confiance du filtre" + confidence_threshold_help: "Spécifiez la position minimale dans la distribution des scores (entre 1 et 100)" + recognizer de reconnaissance : "outil de reconnaissance d'entité" + start_typing_to_select: "Commencez à taper pour sélectionner %{type} ou laissez vide pour tout utiliser" + select: "Sélectionnez %{name}" + enter_or_paste_text: "Entrer ou coller le texte à annoter" + fast_context: "FastContext" + lemmatize: "Lemmatiser" + annotations_result: "Annotations" + results_filtered_by: "Les résultats sont filtrés par" + + + umls: + semantic_types: "Types sémantiques UMLS" + semantic_groups: "Groupes sémantiques UMLS" @@ -171,6 +222,8 @@ fr: annotatorplus_html: Consultez la version bêta d'AnnotatorPlus ; une nouvelle version de l'Annotator avec un support supplémentaire pour la négation, et plus encore ! fast_context: tooltip: "Activer FastContext pour détecter : si un concept a été nié (affirmé, nié), qui a vécu le concept trouvé (patient, autre), quand le concept annoté s'est produit (récent, historique, hypothétique), et/ou si le concept annoté est incertain (certain, incertain)." + lemmatize: + tooltip: "Activez Lemmatize pour lemmatiser le texte soumis et utiliser un dictionnaire lemmatisé pour les annotations" sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. nbco_annotatosplus: From 2d1a5221e33058774b1e167dc8cf3b46789bc254 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Fri, 14 Apr 2023 10:13:57 +0200 Subject: [PATCH 047/533] translate ontology_picker and recommender --- app/views/recommender/index.html.haml | 59 +++++++++++----------- app/views/shared/_ontology_picker.html.erb | 2 +- config/locales/en.yml | 34 ++++++++++++- config/locales/fr.yml | 36 ++++++++++++- 4 files changed, 99 insertions(+), 32 deletions(-) diff --git a/app/views/recommender/index.html.haml b/app/views/recommender/index.html.haml index 7abac68a6..16bb8f83e 100644 --- a/app/views/recommender/index.html.haml +++ b/app/views/recommender/index.html.haml @@ -1,6 +1,6 @@ -- @title = "Recommender" +- @title= t('recommender_page.title') -%h2.mt-5 Ontology Recommender +%h2.mt-5= t('recommender_page.ontology_recommender') %p = t('recommender.intro').html_safe = link_to(Rails.configuration.settings.links[:help_recommender], id: "recommender-help", @@ -9,54 +9,55 @@ %form = hidden_field_tag :recommender_sample_text, t('recommender.sample_text') - = hidden_field_tag :recommender_sample_keywords, t('recommender.sample_keywords') + = hidden_field_tag :recommender_sample_keywords,t('recommender.sample_keywords') + -# Specify input format - %h5 Input + %h5= t('input') %div.form-check.form-check-inline %input#radioItText.form-check-input{name: "input_type", type: "radio", value: "1", checked: "checked"} - %label.form-check-label{for: "radioItText"} Text + %label.form-check-label{for: "radioItText"}= t('text') %div.form-check.form-check-inline %input#radioItKeywords.form-check-input{name: "input_type", type: "radio", value: "2"} - %label.form-check-label{for: "radioItKeywords"} Keywords (separated by commas) + %label.form-check-label{for: "radioItKeywords"}= t('keywords') + " ( " + t('keywords_separated_by_commas') + " ) " -# Specify output format - %h5.pt-3 Output + %h5.pt-3= t('output') %div.form-check.form-check-inline %input#radioOtSingle.form-check-input{name: "output_type", type: "radio", value: "1", checked: "checked"} - %label.form-check-label{for: "radioOtSingle"} Ontologies + %label.form-check-label{for: "radioOtSingle"}= t('ontologies.self') %div.form-check.form-check-inline %input#radioOtSets.form-check-input{name: "output_type", type: "radio", value: "2"} - %label.form-check-label{for: "radioOtSets"} Ontology sets + %label.form-check-label{for: "radioOtSets"}= t('ontology_sets') -# Input text or keywords %div.form-group.mt-4 - = text_area_tag("inputText", nil, rows: 10, class: "form-control default", placeholder: "Paste a paragraph of text or some keywords to use in calculating ontology recommendations", aria: {describedby: "inputTextHelpBlock"}) + = text_area_tag("inputText", nil, rows: 10, class: "form-control default", placeholder: t('paste_input_text'), aria: {describedby: "inputTextHelpBlock"}) %div.card#inputTextHighlighted %div.card-body %small#inputTextHelpBlock.form-text - %a#insertInputLink{href: "javascript:void(0);"} insert sample input + %a#insertInputLink{href: "javascript:void(0);"}= t('insert_sample_text') - %a#advancedOptionsLink{:href => "javascript:void(0);"} Show advanced options >> + %a#advancedOptionsLink{:href => "javascript:void(0);"}= t('shared.show_advanced_options') + " >>" -# Advanced options %div#advancedOptions.optionsBox -# Specify weights - %h6 Weights configuration + %h6= t('weights_configuration') %div.form-row %div.form-group.col-md-2 - %label{for: "input_wc"} Coverage + %label{for: "input_wc"}= t('coverage') = number_field_tag("input_wc", "0.55", min: "0", step: "1", class: "form-control") %div.form-group.col-md-2 - %label{for: "input_wa"} Acceptance + %label{for: "input_wa"}= t('acceptance') = number_field_tag("input_wa", "0.15", min: "0", step: "1", class: "form-control") %div.form-group.col-md-2 - %label{for: "input_wd"} Knowledge detail + %label{for: "input_wd"}= t('knowledge_detail') = number_field_tag("input_wd", "0.15", min: "0", step: "1", class: "form-control") %div.form-group.col-md-2 - %label{for: "input_ws"} Specialization + %label{for: "input_ws"}= t('specialization') = number_field_tag("input_ws", "0.15", min: "0", step: "1", class: "form-control") -# Specify ontology set size - %h6 Maximum ontologies per set + %h6= t('max_ontologies_per_set') %div.form-row %div.form-group.col-md-2 = number_field_tag("input_max_ontologies", "3", in: 2...5, class: "form-control") @@ -65,7 +66,7 @@ = render(partial: "shared/ontology_picker") %div.my-4 - = submit_tag("Get Recommendations", id: "recommenderButton", type: "button", class: "btn btn-primary") + = submit_tag(t('get_recommendations'), id: "recommenderButton", type: "button", class: "btn btn-primary") = submit_tag("Edit Input", id: "editButton", type: "button", style: "display: none;", class: "btn btn-primary") = content_tag(:span, class: "recommenderSpinner") do = image_tag("spinners/spinner_000000_16px.gif", style: "vertical-align: middle;") @@ -73,34 +74,34 @@ %div.row#recommenderErrorsDisplay.mb-4 %div.col %span.notTextError - Please paste a paragraph of text or some keywords to use in calculating ontology recommendations. + = t('recommender_page.ontology_recommendation_input') %br/ %span.sumWeightsError - The sum of the weights must be greater than zero. + = t('recommender_page.weight_sum_greater_than_zero') %br/ %span.rangeWeightsError - All the weights must be greater or equal to zero. + = t('recommender_page.weights_greater_than_zero') %br/ %span.invalidWeightsError - All the weights must be valid numeric values. + = t('recommender_page.valid_numeric_weights') %br/ %span.invalidMaxOntError - The maximum ontologies per set must be a valid integer value. + = t('recommender_page.valid_integer_max_ontologies_per_set') %br/ %span.maxOntologiesError - The maximum ontologies per set must be a number between 2 and 4. + = t('recommender_page.valid_max_ontologies_per_set_range') %br/ %span.generalError - Problem getting recommendations, please try again. + = t('recommender_page.recommendation_error') %br/ %span#noResults - No recommendations found. + = t('recommender_page.no_recommendations') %br/ %span#noResultsSets - There are no ontology sets recommended for the input provided. Please try the "Ontologies" output. + = t('recommender_page.no_sets_recommended') %br/ %span.inputSizeError - Please use less than 500 words. If you need to annotate larger pieces of text you can use the Recommender Web Service + = t('recommender_page.text_length_limit') %div.row#resultsDisplay %div.col diff --git a/app/views/shared/_ontology_picker.html.erb b/app/views/shared/_ontology_picker.html.erb index be357dfaf..ea646e798 100644 --- a/app/views/shared/_ontology_picker.html.erb +++ b/app/views/shared/_ontology_picker.html.erb @@ -31,7 +31,7 @@ var hideChosenResults = function(){

    - <%=sel_text%> + <%=t('select_ontologies_list')%>

    diff --git a/config/locales/en.yml b/config/locales/en.yml index b97d0c8c2..da206012b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -19,6 +19,7 @@ en: class: "Class" filter: "Filter" ontology: "Ontology" + type: "Type" context: "Context" umls_sem_type: "UMLS Sem Type" @@ -33,6 +34,23 @@ en: reproduce_results : "Reproduce these results using the " additional_parameters: "Additional parameters explained at " + input: "Input" + text: "Text" + keywords: "Keywords" + keywords_separated_by_commas: "Keywords separated by commas" + output: "Output" + ontology_sets: "Ontology sets" + insert_sample_input: "Insert sample input" + weights_configuration: "Weights configuration" + coverage: "Coverage" + acceptance: "Acceptance" + knowledge_detail: "Knowledge detail" + specialization: "Specialization" + max_ontologies_per_set: "Maximum ontologies per set" + paste_input_text: "Paste a paragraph of text or some keywords to use in calculating ontology recommendations" + get_recommendations: "Get Recommendations" + select_ontologies_list: "Select Ontologies" + header: browse: "Browse" search: "Search" @@ -118,7 +136,20 @@ en: - + recommender_page: + title: "recommender" + ontology_recommender: "Ontology Recommender" + ontology_recommendation_input: "Please paste a paragraph of text or some keywords to use in calculating ontology recommendations." + weight_sum_greater_than_zero: "The sum of the weights must be greater than zero" + weights_greater_than_zero: "All the weights must be greater or equal to zero" + valid_numeric_weights: "All the weights must be valid numeric values" + valid_integer_max_ontologies_per_set: "The maximum ontologies per set must be a valid integer value" + valid_max_ontologies_per_set_range: "The maximum ontologies per set must be a number between 2 and 4" + recommendation_error: "Problem getting recommendations, please try again" + no_recommendations: "No recommendations found" + no_sets_recommended: "There are no ontology sets recommended for the input provided. Please try the 'Ontologies' output." + text_length_limit: "Please use less than 500 words. If you need to annotate larger pieces of text you can use the Recommender Web Service" + @@ -269,6 +300,7 @@ en: intro: Browse a selection of projects that use %{site} resources ontologies: + self: "Ontologies" intro: Browse the library of ontologies concepts: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 6ec061ab0..69b6af512 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -19,7 +19,9 @@ fr: class: "Classe" filter : "Filtre" ontology: "Ontologie" - type: "Tapez" + + + type: "Type" context: "Contexte" umls_sem_type: "Type Sem UMLS" matched_ontology: "ontologie correspondante" @@ -33,6 +35,24 @@ fr: reproduce_results : "Reproduisez ces résultats en utilisant le " additional_parameters: "Paramètres supplémentaires expliqués à " + + input: "Entrée" + text: "Texte" + keywords: "Mots-clés" + keywords_separated_by_commas: "Mots-clés séparés par des virgules" + output: "Sortie" + ontology_sets: "Ensembles d'ontologies" + insert_sample_input: "Insérer une entrée d'exemple" + weights_configuration: "Configuration des poids" + coverage: "Couverture" + acceptance: "Acceptation" + knowledge_detail: "Détail de la connaissance" + specialization: "Spécialisation" + max_ontologies_per_set: "Nombre maximum d'ontologies par ensemble" + paste_input_text: "Collez un paragraphe de texte ou des mots-clés à utiliser dans le calcul des recommandations d'ontologie" + get_recommendations: "Obtenir des recommandations" + select_ontologies_list: "Sélectionnez les ontologies" + header: browse: "Parcourir" search: "Rechercher" @@ -118,6 +138,19 @@ fr: semantic_groups: "Groupes sémantiques UMLS" + recommender_page: + title: "recommandeur" + ontology_recommender: "Recommandeur d'ontologie" + ontology_recommendation_input: "Veuillez coller un paragraphe de texte ou quelques mots-clés pour calculer les recommandations d'ontologie." + weight_sum_greater_than_zero: "La somme des poids doit être supérieure à zéro" + weights_greater_than_zero: "Tous les poids doivent être supérieurs ou égaux à zéro" + valid_numeric_weights: "Tous les poids doivent être des valeurs numériques valides" + valid_integer_max_ontologies_per_set: "Le nombre maximum d'ontologies par ensemble doit être une valeur entière valide" + valid_max_ontologies_per_set_range: "Le nombre maximum d'ontologies par ensemble doit être un nombre entre 2 et 4" + recommendation_error: "Problème lors de la récupération des recommandations, veuillez réessayer" + no_recommendations: "Aucune recommandation trouvée" + no_sets_recommended: "Il n'y a pas d'ensembles d'ontologies recommandés pour l'entrée fournie. Veuillez essayer la sortie 'Ontologies'." + text_length_limit: "Veuillez utiliser moins de 500 mots. Si vous devez annoter de plus grands morceaux de texte, vous pouvez utiliser le service web de recommandation." about: >
    @@ -255,6 +288,7 @@ fr: intro: Parcourez une sélection de projets qui utilisent les ressources %{site} ontologies: + self: "Ontologies" intro: Parcourir la bibliothèque d'ontologies concepts: From d4082f6e88be0b8ca9de15d71b9e7a918da66688 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Fri, 14 Apr 2023 10:55:02 +0200 Subject: [PATCH 048/533] translate mapping --- .../mappings/_concept_mappings_selector.html.haml | 6 +++--- app/views/mappings/_ontology_mappings.html.haml | 6 +++--- app/views/mappings/index.html.haml | 8 ++++---- app/views/shared/_concept_picker.html.haml | 2 +- config/locales/en.yml | 7 ++++--- config/locales/fr.yml | 11 ++++++++++- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/app/views/mappings/_concept_mappings_selector.html.haml b/app/views/mappings/_concept_mappings_selector.html.haml index 19b8bafae..b091cacfd 100644 --- a/app/views/mappings/_concept_mappings_selector.html.haml +++ b/app/views/mappings/_concept_mappings_selector.html.haml @@ -2,13 +2,13 @@ #headingTwo.card-header %h2.mb-0 %button.btn.btn-link.btn-block.text-left.collapsed{"data-target" => "#collapseTwo", "data-toggle" => "collapse", :type => "button"} - Find mappings of a class/concept - = link_to(Rails.configuration.settings.links[:mappings], id: "mappings-help", "aria-label": "View mappings help") do + = t('mappings.find_mappings') + = link_to(Rails.configuration.settings.links[:mappings], id: "mappings-help", "aria-label": t('view_mappings_help')) do %i.fas.fa-question-circle.fa-lg{"aria-hidden": "true"} #collapseTwo.collapse{"data-parent" => "#accordionExample"} .card-body %div - = render partial: 'shared/concept_picker', locals: {name: :concept_mapping_selector, concept_label: '', ontology_acronym: 'all', include_definition: true } + = render partial: 'shared/concept_picker', locals: {name: :concept_mapping_selector, concept_label: '', ontology_acronym: t('all'), include_definition: true } %div.mt-1 = render TurboFrameComponent.new(id:'concept_mappings') :javascript diff --git a/app/views/mappings/_ontology_mappings.html.haml b/app/views/mappings/_ontology_mappings.html.haml index 357784b8e..3e0689d94 100644 --- a/app/views/mappings/_ontology_mappings.html.haml +++ b/app/views/mappings/_ontology_mappings.html.haml @@ -9,10 +9,10 @@ .card-body %div#mappings_select - if @options.empty? - No mappings available + = t('mappings.no_mappings_available') - else - = select('search', 'ontologies', @options, {:include_blank => ""},{:onchange=>"loadMappings(this.value);", "data-placeholder".to_sym => "Select an Ontology", autocomplete: "off"}) + = select('search', 'ontologies', @options, {:include_blank => ""},{:onchange=>"loadMappings(this.value);", "data-placeholder".to_sym => t('select_ontologies_list'), autocomplete: "off"}) #mapping_load %img{src: asset_path("jquery.simple.tree/spinner.gif")}/ - Loading mappings... + = t('mappings.loading_mappings') #mappingCount{style:'min-height: 300px;'} diff --git a/app/views/mappings/index.html.haml b/app/views/mappings/index.html.haml index 438f3658f..ab7f28e1d 100644 --- a/app/views/mappings/index.html.haml +++ b/app/views/mappings/index.html.haml @@ -1,10 +1,10 @@ -- @title = "Mappings" +- @title= t('mappings.title') %div#mappings_container.container-fluid.py-4 - %h1.my-1 Mappings + %h1.my-1= t('mappings.title') %div#mappings_uploader.my-2 - = link_to_modal "Upload mappings" , "/mappings/loader", class: "btn btn-primary btn-block", - data: { show_modal_title_value: "Mappings bulk load", show_modal_size_value: 'modal-xl'} + = link_to_modal t('mappings.upload_mappings') , "/mappings/loader", class: "btn btn-primary btn-block", + data: { show_modal_title_value: t('mappings.mappings_bulk_load'), show_modal_size_value: 'modal-xl'} %hr.my-3.w-100 #accordionExample.accordion = render partial: 'ontology_mappings' diff --git a/app/views/shared/_concept_picker.html.haml b/app/views/shared/_concept_picker.html.haml index d1b32729a..56e3fe3af 100644 --- a/app/views/shared/_concept_picker.html.haml +++ b/app/views/shared/_concept_picker.html.haml @@ -1,5 +1,5 @@ = text_field_tag(name, concept_label, class: "search_autocomplete form-control", - placeholder: "Start typing to select a class", + placeholder: t('mapping.select_class'), data: {controller: "form-auto-complete", "form-auto-complete-ontology_id-value": ontology_acronym , "form-auto-complete-target_property-value": 'name', diff --git a/config/locales/en.yml b/config/locales/en.yml index da206012b..022be952a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -149,9 +149,6 @@ en: no_recommendations: "No recommendations found" no_sets_recommended: "There are no ontology sets recommended for the input provided. Please try the 'Ontologies' output." text_length_limit: "Please use less than 500 words. If you need to annotate larger pieces of text you can use the Recommender Web Service" - - - @@ -322,5 +319,9 @@ en:

    Justification (optional)
    Provide any additional information about the requested term here.

    + mappings: + title: "Mappings" + upload_mappings: "Upload Mappings" + mappings_bulk_load: "Mappings Bulk Load" intro: Browse mappings between classes in different ontologies diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 69b6af512..43153f0ea 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -310,5 +310,14 @@ fr:

    Justification (facultatif)
    Fournissez ici toute information supplémentaire sur le terme demandé.

    + mappings: - intro: Parcourir les mappages entre les classes dans différentes ontologies + title: "Correspondances" + upload_mappings: "Télécharger les correspondances" + mappings_bulk_load: "Chargement en masse des correspondances" + intro: "Parcourir les correspondances entre les classes de différentes ontologies" + no_mappings_available: "Aucune correspondance disponible" + loading_mappings: "Chargement des correspondances en cours..." + find_mappings: "Trouver les correspondances d'une classe / concept" + view_mappings_help: "View mappings help" + select_class: "Commencez à taper pour sélectionner une classe" \ No newline at end of file From d4b1ccca17707870599ca4b08d7727cf127df92a Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 15 Apr 2023 15:40:52 +0100 Subject: [PATCH 049/533] add categories controller --- .../admin/categories_controller.rb | 107 ++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 app/controllers/admin/categories_controller.rb diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb new file mode 100644 index 000000000..4f766a84f --- /dev/null +++ b/app/controllers/admin/categories_controller.rb @@ -0,0 +1,107 @@ +class Admin::CategoriesController < ApplicationController + + layout :determine_layout + before_action :unescape_id, only: [:edit, :show, :update, :destroy] + before_action :authorize_admin + + CATEGORIES_URL = "#{LinkedData::Client.settings.rest_url}/categories" + + def index + response = _categories + render :json => response + end + + def new + @category = LinkedData::Client::Models::Category.new + + respond_to do |format| + format.html { render "new", :layout => false } + end + end + + def edit + @category = LinkedData::Client::Models::Category.find_by_acronym(params[:id]).first + + respond_to do |format| + format.html { render "edit", :layout => false } + end + end + + def create + response = { errors: '', success: '' } + start = Time.now + begin + category = LinkedData::Client::Models::Category.new(values: category_params) + category_saved = category.save + if category_saved && category_saved.errors + response[:errors] = response_errors(category_saved) + else + response[:success] = "category successfully created in #{Time.now - start}s" + end + rescue Exception => e + response[:errors] = "Problem creating the category - #{e.message}" + end + render json: response, status: (response[:errors] == '' ? :created : :internal_server_error) + + end + + def update + response = { errors: '', success: ''} + start = Time.now + begin + category = LinkedData::Client::Models::Category.find_by_acronym(params[:id]).first + category.update_from_params(category_params) + category_update = category.update + if category_update && category_update.errors + response[:errors] = response_errors(category_update) + else + response[:success] = "category successfully updated in #{Time.now - start}s" + end + rescue Exception => e + response[:errors] = "Problem updating the category - #{e.message}" + end + render json: response, status: (response[:errors] == '' ? :ok : :internal_server_error) + end + + def destroy + response = { errors: '', success: ''} + start = Time.now + begin + category = LinkedData::Client::Models::Category.find_by_acronym(params[:id]).first + error_response = category.delete + + if error_response + response[:errors] = response_errors(error_response) + else + response[:success] = "category successfully deleted in #{Time.now - start}s" + end + rescue Exception => e + response[:errors] = "Problem deleting the category - #{e.message}" + end + render json: response, status: (response[:errors] == '' ? :ok : :internal_server_error) + end + + private + + def unescape_id + params[:id] = CGI.unescape(params[:id]) + end + + def category_params + params.require(:category).permit(:acronym, :name, :description, :parentCategory).to_h + end + + def _categories + response = { categories: Hash.new, errors: '', success: '' } + start = Time.now + begin + response[:categories] = JSON.parse(LinkedData::Client::HTTP.get(CATEGORIES_URL, { include: 'all' }, raw: true)) + + response[:success] = "categories successfully retrieved in #{Time.now - start}s" + LOG.add :debug, "Categories - retrieved #{response[:categories].length} groups in #{Time.now - start}s" + rescue Exception => e + response[:errors] = "Problem retrieving categories - #{e.message}" + end + response + end +end From bb4c82e1c31b777044d066ca068360953ee7c32b Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 15 Apr 2023 15:41:21 +0100 Subject: [PATCH 050/533] add categories administration views --- app/views/admin/categories/_form.html.haml | 43 ++++++++++++++++++++++ app/views/admin/categories/edit.html.haml | 6 +++ app/views/admin/categories/new.html.haml | 6 +++ 3 files changed, 55 insertions(+) create mode 100644 app/views/admin/categories/_form.html.haml create mode 100644 app/views/admin/categories/edit.html.haml create mode 100644 app/views/admin/categories/new.html.haml diff --git a/app/views/admin/categories/_form.html.haml b/app/views/admin/categories/_form.html.haml new file mode 100644 index 000000000..1d72c6362 --- /dev/null +++ b/app/views/admin/categories/_form.html.haml @@ -0,0 +1,43 @@ +- new_record = @category.acronym.nil? +%div.alert-box.error{style: @errors.nil? ? "display: none" : nil } + %ul + - unless @errors.nil? + - for error in @errors + %li + = error +%div{:style => "width:500px"} + %span.asterik{:style => "float:right;"} * fields are required + %h3 #{title_text} + %table#category_form.form + %colgroup + %col + %col{style: "width: 100%"} + %tr + %th + Acronym: + %span.asterik * + %td.top + - if new_record + = f.text_field :acronym, class: "form-control" + - else + = f.text_field :acronym, class: "form-control", readonly: true + %tr + %th + Name: + %span.asterik * + %td.top + = f.text_field :name, class: "form-control" + %tr + %th + Description: + %td.top + = f.text_area :description, class: "form-control" + - unless new_record + %tr + %th + Created: + %td.top + = f.text_field :created, readonly: true, class: "form-control" + %div.mt-2 + = f.submit button_text, class: "btn btn-primary mr-sm-2 group-form-accept" + = link_to "Cancel", "javascript:;", class: "btn btn-primary dismiss-dialog" \ No newline at end of file diff --git a/app/views/admin/categories/edit.html.haml b/app/views/admin/categories/edit.html.haml new file mode 100644 index 000000000..31511a88a --- /dev/null +++ b/app/views/admin/categories/edit.html.haml @@ -0,0 +1,6 @@ +- @title = "Edit category" + +%div + = form_for :category, url: admin_categories_path + "/" + URI::escape(@category.acronym), method: "PATCH", remote: true, data: { collection: "categories"}, html: {class: "admin-collection-form" } do |f| + = render partial: "form", locals: {f: f, title_text: "Edit category", + button_text: "Edit category", button_class: "edit-category"} diff --git a/app/views/admin/categories/new.html.haml b/app/views/admin/categories/new.html.haml new file mode 100644 index 000000000..4d3b3082d --- /dev/null +++ b/app/views/admin/categories/new.html.haml @@ -0,0 +1,6 @@ +- @title = "Create new category" + +%div + = form_for :category, url: admin_categories_path, method: "POST", remote: true, data: { collection: "categories"}, html: {class: "admin-collection-form" } do |f| + = render partial: "form", locals: {f: f, title_text: "Create category", + button_text: "Create category" } From 7b00542c534af9cc185739e45e04e48fd7d22c89 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 15 Apr 2023 15:41:49 +0100 Subject: [PATCH 051/533] add categories administration route --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index 057297ac7..963fe753d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -50,6 +50,7 @@ namespace :admin do resources :licenses, only: [:index, :create, :new] + resources :categories, only: [:index, :create, :new, :edit, :update, :destroy] end resources :subscriptions From 8da991b4ad86ff8d9e55afb0d0d6d5b3cc1d3621 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 15 Apr 2023 15:42:20 +0100 Subject: [PATCH 052/533] add groups controller --- app/controllers/admin/groups_controller.rb | 107 +++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 app/controllers/admin/groups_controller.rb diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb new file mode 100644 index 000000000..48e861e03 --- /dev/null +++ b/app/controllers/admin/groups_controller.rb @@ -0,0 +1,107 @@ +class Admin::GroupsController < ApplicationController + + layout :determine_layout + before_action :unescape_id, only: [:edit, :show, :update, :destroy] + before_action :authorize_admin + + GROUPS_URL = "#{LinkedData::Client.settings.rest_url}/groups" + + def index + response = _groups + render :json => response + end + + def new + @group = LinkedData::Client::Models::Group.new + + respond_to do |format| + format.html { render "new", :layout => false } + end + end + + def edit + @group = LinkedData::Client::Models::Group.find_by_acronym(params[:id]).first + + respond_to do |format| + format.html { render "edit", :layout => false } + end + end + + def create + response = { errors: '', success: '' } + start = Time.now + begin + group = LinkedData::Client::Models::Group.new(values: group_params) + group_saved = group.save + if group_saved && group_saved.errors + response[:errors] = response_errors(group_saved) + else + response[:success] = "group successfully created in #{Time.now - start}s" + end + rescue Exception => e + response[:errors] = "Problem creating the group - #{e.message}" + end + render json: response, status: (response[:errors] == '' ? :created : :internal_server_error) + + end + + def update + response = { errors: '', success: ''} + start = Time.now + begin + group = LinkedData::Client::Models::Group.find_by_acronym(params[:id]).first + group.update_from_params(group_params) + group_updated = group.update + if group_updated && group_updated.errors + response[:errors] = response_errors(group_updated) + else + response[:success] = "group successfully updated in #{Time.now - start}s" + end + rescue Exception => e + response[:errors] = "Problem updating the group - #{e.message}" + end + render json: response, status: (response[:errors] == '' ? :ok : :internal_server_error) + end + + def destroy + response = { errors: '', success: ''} + start = Time.now + begin + group = LinkedData::Client::Models::Group.find_by_acronym(params[:id]).first + error_response = group.delete + + if error_response + response[:errors] = response_errors(error_response) + else + response[:success] = "group successfully deleted in #{Time.now - start}s" + end + rescue Exception => e + response[:errors] = "Problem deleting the group - #{e.message}" + end + render json: response, status: (response[:errors] == '' ? :ok : :internal_server_error) + end + + private + + def unescape_id + params[:id] = CGI.unescape(params[:id]) + end + + def group_params + params.require(:group).permit(:acronym, :name, :description).to_h() + end + + def _groups + response = { groups: Hash.new, errors: '', success: '' } + start = Time.now + begin + response[:groups] = JSON.parse(LinkedData::Client::HTTP.get(GROUPS_URL, { include: 'all' }, raw: true)) + + response[:success] = "groups successfully retrieved in #{Time.now - start}s" + LOG.add :debug, "Groups - retrieved #{response[:groups].length} groups in #{Time.now - start}s" + rescue Exception => e + response[:errors] = "Problem retrieving groups - #{e.message}" + end + response + end +end From 51a28594fdbff7e00b2a87d34234333da2e0bbdc Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 15 Apr 2023 15:42:34 +0100 Subject: [PATCH 053/533] add groups administration views --- app/views/admin/groups/_form.html.haml | 43 ++++++++++++++++++++++++++ app/views/admin/groups/edit.html.haml | 6 ++++ app/views/admin/groups/new.html.haml | 6 ++++ 3 files changed, 55 insertions(+) create mode 100644 app/views/admin/groups/_form.html.haml create mode 100644 app/views/admin/groups/edit.html.haml create mode 100644 app/views/admin/groups/new.html.haml diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml new file mode 100644 index 000000000..628f648ae --- /dev/null +++ b/app/views/admin/groups/_form.html.haml @@ -0,0 +1,43 @@ +- new_record = @group.acronym.nil? +%div.alert-box.error{style: @errors.nil? ? "display: none" : nil } + %ul + - unless @errors.nil? + - for error in @errors + %li + = error +%div{:style => "width:500px"} + %span.asterik{:style => "float:right;"} * fields are required + %h3 #{title_text} + %table#group_form.form + %colgroup + %col + %col{style: "width: 100%"} + %tr + %th + Acronym: + %span.asterik * + %td.top + - if new_record + = f.text_field :acronym, class: "form-control" + - else + = f.text_field :acronym, class: "form-control", readonly: true + %tr + %th + Name: + %span.asterik * + %td.top + = f.text_field :name, class: "form-control" + %tr + %th + Description: + %td.top + = f.text_area :description, class: "form-control" + - unless new_record + %tr + %th + Created: + %td.top + = f.text_field :created, readonly: true, class: "form-control" + %div.mt-2 + = f.submit button_text, class: "btn btn-primary mr-sm-2 group-form-accept" + = link_to "Cancel", "javascript:;", class: "btn btn-primary dismiss-dialog" \ No newline at end of file diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml new file mode 100644 index 000000000..76909dcc4 --- /dev/null +++ b/app/views/admin/groups/edit.html.haml @@ -0,0 +1,6 @@ +- @title = "Edit group" + +%div + = form_for :group, url: admin_groups_path + "/" + URI::escape(@group.acronym), method: "PATCH", remote: true, data: { collection: "groups"}, html: {class: "admin-collection-form" } do |f| + = render partial: "form", locals: {f: f, title_text: "Edit group", + button_text: "Edit group", button_class: "edit-group"} diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml new file mode 100644 index 000000000..2a8bf5f42 --- /dev/null +++ b/app/views/admin/groups/new.html.haml @@ -0,0 +1,6 @@ +- @title = "Create new group" + +%div + = form_for :group, url: admin_groups_path, method: "POST", remote: true, data: { collection: "groups"}, html: {class: "admin-collection-form" } do |f| + = render partial: "form", locals: {f: f, title_text: "Create group", + button_text: "Create group" } From 4f59b1912201af528febe1094f8613df2faeacb8 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 15 Apr 2023 15:42:49 +0100 Subject: [PATCH 054/533] add groups administration route --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index 963fe753d..81b907f21 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -50,6 +50,7 @@ namespace :admin do resources :licenses, only: [:index, :create, :new] + resources :groups, only: [:index, :create, :new, :edit, :update, :destroy] resources :categories, only: [:index, :create, :new, :edit, :update, :destroy] end From fca4a8a7fa57f94789124309b078645e66f030ac Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 15 Apr 2023 15:45:10 +0100 Subject: [PATCH 055/533] add groups and categories tabs to the admin panel --- app/views/admin/index.html.haml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/views/admin/index.html.haml b/app/views/admin/index.html.haml index 38bc1a3e5..03faaa9f6 100644 --- a/app/views/admin/index.html.haml +++ b/app/views/admin/index.html.haml @@ -1,4 +1,4 @@ -- @title = "BioPortal Administration" +- @title = "Administration" %div.row %div.col @@ -25,6 +25,10 @@ =link_to("Users", "#users", id: "users-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: users_path() }, aria: { controls: "users", selected: "false" }) %li.nav-item =link_to("Metadata Administration", "#ontologies_metadata_curator", id: "ontologies_metadata_curator-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab"}, aria: { controls: "ontologies_metadata_curator", selected: "false" }) + %li.nav-item + =link_to("Groups", "#groups", id: "groups-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: "groups" }, aria: { controls: "groups", selected: "false" }) + %li.nav-item + =link_to("Categories", "#categories", id: "categories-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: "categories" }, aria: { controls: "categories", selected: "false" }) %div#adminTabContent.tab-content -# Site Administration tab @@ -95,6 +99,17 @@ %div.tab-pane.fade{id: "ontologies_metadata_curator", role: "tabpanel", aria: { labelledby: "ontologies_metadata_curator-admin-tab" }} = render partial: 'ontologies_metadata_curator/metadata_tab' + -# Groups tab + %div.tab-pane.fade{id: "groups", role: "tabpanel", aria: { labelledby: "groups-admin-tab" }} + %div.ontologies_list_container.mt-3 + %table#adminGroups.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"} + + -# Categories tab + %div.tab-pane.fade{id: "categories", role: "tabpanel", aria: { labelledby: "categories-admin-tab" }} + %div.ontologies_list_container.mt-3 + %table#adminCategories.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"} + + \ No newline at end of file From 4fb787a48584e38c015b11a58e64e1368a70ad89 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 15 Apr 2023 16:06:42 +0100 Subject: [PATCH 056/533] add groups and categories administration JS --- app/assets/javascripts/bp_admin.js | 532 ++++++++++++++++++++++++++++- 1 file changed, 531 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/bp_admin.js b/app/assets/javascripts/bp_admin.js index 63ac8ae9e..744a297e9 100644 --- a/app/assets/javascripts/bp_admin.js +++ b/app/assets/javascripts/bp_admin.js @@ -865,6 +865,220 @@ jQuery(".admin.index").ready(function() { }); // end: BUTTON onclick actions ----------------------------------- + + //============================================================== + // GROUPS MANAGEMENT + //============================================================== + displayGroups({}); + + // allow selecting of rows, except on link clicks + jQuery('#adminGroups tbody').on('click', 'tr', function(event) { + if (event.target.tagName.toLowerCase() != 'a') { + jQuery(this).toggleClass('selected'); + } + }); + + jQuery("div.groups_nav").html(` + + + New + + + Apply to Selected Rows:     + +      + + Go + + `); + + jQuery('#group_admin_action_submit').on('click', function(event) { + var action = jQuery('#group_admin_action').val(); + + if (!action) { + alertify.alert("Please choose an action to perform on the selected groups."); + return; + } + + switch(action) { + case "delete": + DeleteGroups.act(); + break; + } + }); + + jQuery(document).on("reveal.facebox", function (event) { + jQuery("#facebox form[data-collection=groups]").validate({ + errorClass: "groupFormError", + errorElement: "div", + rules: { + "group[name]": "required", + "group[acronym]": "required", + }, + messages: { + "group[name]": "Please enter a name", + "group[acronym]": "Please enter an acronym", + }, + }); + + }); + + jQuery('#group_new_action').on('click', function (event) { + jQuery.facebox({ + ajax: "/admin/groups/new?time=" + new Date().getTime() + }); + }); + + jQuery('#adminGroups').on('click', 'a.edit-group', function(event) { + jQuery.facebox({ + ajax: "/admin/groups/" + encodeURIComponent(event.target.dataset.groupName) + "/edit?time=" + new Date().getTime() + }); + }); + + + //============================================================== + // CATEGORIES MANAGEMENT + //============================================================== + displayCategories({}); + + // allow selecting of rows, except on link clicks + jQuery('#adminCategories tbody').on('click', 'tr', function(event) { + if (event.target.tagName.toLowerCase() != 'a') { + jQuery(this).toggleClass('selected'); + } + }); + + jQuery("div.categories_nav").html(` + + + New + + + Apply to Selected Rows:     + +      + + Go + + `); + + jQuery('#category_admin_action_submit').on('click', function(event) { + var action = jQuery('#category_admin_action').val(); + + if (!action) { + alertify.alert("Please choose an action to perform on the selected categories."); + return; + } + + switch(action) { + case "delete": + DeleteCategories.act(); + break; + } + }); + + jQuery(document).on("reveal.facebox", function (event) { + jQuery("#facebox form[data-collection=categories]").validate({ + errorClass: "categoryFormError", + errorElement: "div", + rules: { + "category[name]": "required", + "category[acronym]": "required", + }, + messages: { + "category[name]": "Please enter a name", + "category[acronym]": "Please enter an acronym", + }, + }); + + }); + + jQuery('#category_new_action').on('click', function (event) { + jQuery.facebox({ + ajax: "/admin/categories/new?time=" + new Date().getTime() + }); + }); + + jQuery('#adminCategories').on('click', 'a.edit-category', function(event) { + jQuery.facebox({ + ajax: "/admin/categories/" + encodeURIComponent(event.target.dataset.categoryName) + "/edit?time=" + new Date().getTime() + }); + }); + + //============================================================== + // MANAGEMENT COMMONS + //============================================================== + + jQuery(document).on("click", "#facebox a.dismiss-dialog", function (event) { + jQuery(document).trigger('close.facebox'); + }); + + jQuery(document).on('ajax:success', "#facebox form.admin-collection-form", (event, response, status, xhr) => { + jQuery(document).trigger('close.facebox'); + if (response && response.success) { + _showStatusMessages([response.success], [], [], false); + } + refreshCollection(event.target.dataset.collection); + }); + jQuery(document).on('ajax:error', "#facebox form.admin-collection-form", (event, xhr, status, error) => { + if (xhr.responseJSON) { + displayDialogErrorMessages(xhr.responseJSON) + } else { + displayDialogErrorMessages(status); + } + }); + + function refreshCollection(collectionName) { + switch (collectionName) { + case "groups": + displayGroups({}); + break; + case "categories": + displayCategories({}); + break; + default: + alertify.alert("Unable to refresh unknown collection '" + collectionName + "'"); + } + } + + function displayDialogErrorMessages(data, settings) { + settings ||= {} + + let append = settings.append || false; + + let errorListNode = jQuery("#facebox .alert-box ul"); + + if (!append) { + errorListNode.empty(); + } + + let messages = []; + if (typeof data == "string" || data instanceof String) { + messages.push(data) + } + if (typeof data == "object" && data.errors) { + messages.push.apply(messages, Object.values(data.errors)); + } + if (typeof data == "object" && data.status && data.status / 200 != 1) { + messages.push("Request error: " + data.statusText); + } + + for (let msg of messages) { + errorListNode.append(jQuery("
  • ").text(msg)) + } + + if (messages.length == 0) { + errorListNode.parents(".alert-box").hide(); + } else { + errorListNode.parents(".alert-box").show(); + } + } }); @@ -1040,4 +1254,320 @@ DeleteUsers.prototype.ajaxCall = function (username){ } DeleteUsers.act = function(user) { new DeleteUsers(user).ajaxCall(user); -}; \ No newline at end of file +}; + +/* groups part */ +function displayGroups(data, group) { + let ontTable = null; + let allRows + if (jQuery.fn.dataTable.isDataTable('#adminGroups')) { + ontTable = jQuery('#adminGroups').DataTable().ajax.reload(); + } else { + ontTable = jQuery("#adminGroups").DataTable({ + "ajax": { + "url": "/admin/groups", + "contentType": "application/json", + "dataSrc": function (json) { + return populateGroupRows(json); + } + }, + "rowCallback": function(row, data, index) { + var acronym = jQuery('td:nth-child(4)', row).text(); + + jQuery(row).attr("id", "tr_" + acronym); + }, + "initComplete": function(settings, json) { + }, + "columnDefs": [ + { + "targets": 0, + "searchable": true, + "title": "Name", + }, + { + "targets": 1, + "searchable": true, + "title": "Description", + }, + { + "targets": 2, + "searchable": true, + "title": "Created", + }, + { + "targets": 3, + "searchable": true, + "title": "Id", + }, + { + "targets": 4, + "searchable": false, + "orderable": false, + "title": "Actions", + "width": "210px" + } + ], + "autoWidth": false, + "lengthChange": false, + "searching": true, + "language": { + "search": "Filter: ", + "emptyTable": "No groups available" + }, + "info": true, + "paging": true, + "pageLength": 100, + "ordering": true, + "responsive": true, + "dom": '<"groups_nav"><"top"fi>rtip', + "stripeClasses": ["", "alt"], + }); + } + return ontTable; +} + +function populateGroupRows(data) { + let groups = data['groups']; + let allRows = groups.map(group => { + let name = group['name']; + let description = group['description'] + let created = group['created']; + let id = group['acronym']; + let actions = [ + 'Edit', + ] + return [name, description, created, id , actions.join('|')]; + }) + + return allRows; +} + +function DeleteGroups() { +} + +DeleteGroups.act = function(groupName) { + let group2delete = jQuery("#adminGroups tr.selected td:nth-child(4)").map(function(index, value) { return value.textContent.trim();}).toArray(); + let confirmMsg = "You are about to delete the following groups:
    " + group2delete.join(",") + "

    Should I proceed?"; + alertify.confirm(confirmMsg, (e) => { + if (e) { + _clearStatusMessages(); + let success = []; + let errors = []; + let notices = []; + let errorState = false; + let deferredObj = jQuery.Deferred(); + let initialDeferredObj = deferredObj; + + for (let group of group2delete) { + fun = () => { return jQuery.ajax("/admin/groups/" + encodeURIComponent(group), { + method: "DELETE", + dataType: "json", + success: function(data, msg) { + var reg = /\s*,\s*/g; + + if (data.errors) { + errorState = true; + errors.push.apply(errors, data.errors); + } + + if (data.success) { + success.push(data.success); + } + + if (data.notices) { + notices.push.apply(notices, data.notices); + } + + _showStatusMessages(success, errors, notices, false); + }, + error: function(request, textStatus, errorThrown) { + errorState = true; + errors.push(request.status + ": " + errorThrown); + _showStatusMessages(success, errors, notices, false); + }, + complete: function(request, textStatus) { + if (errorState) { + jQuery("#tr_" + group).removeClass('selected'); + } + } + }) + }; + deferredObj = deferredObj.then(fun, fun); + } + // hide progress message and deselect rows after ALL operations have completed + deferredObj.always(function () { + jQuery("#adminGroups").DataTable().ajax.reload(); + }); + + initialDeferredObj.resolve(); + } + }); +} +/* categories part */ +function displayCategories(data, category) { + let ontTable = null; + let allRows + if (jQuery.fn.dataTable.isDataTable('#adminCategories')) { + ontTable = jQuery('#adminCategories').DataTable().ajax.reload(); + } else { + ontTable = jQuery("#adminCategories").DataTable({ + "ajax": { + "url": "/admin/categories", + "contentType": "application/json", + "dataSrc": function (json) { + return populateCategoryRows(json); + } + }, + "rowCallback": function(row, data, index) { + var acronym = jQuery('td:nth-child(4)', row).text(); + + jQuery(row).attr("id", "tr_" + acronym); + }, + "initComplete": function(settings, json) { + }, + "columnDefs": [ + { + "targets": 0, + "searchable": true, + "title": "Name", + }, + { + "targets": 1, + "searchable": true, + "title": "Description", + }, + { + "targets": 2, + "searchable": true, + "title": "Created", + }, + { + "targets": 3, + "searchable": true, + "title": "Id", + }, + { + "targets": 4, + "searchable": false, + "orderable": false, + "title": "Parent", + }, + { + "targets": 5, + "searchable": false, + "orderable": false, + "title": "Actions", + "width": "210px" + } + ], + "autoWidth": false, + "lengthChange": false, + "searching": true, + "language": { + "search": "Filter: ", + "emptyTable": "No categories available" + }, + "info": true, + "paging": true, + "pageLength": 100, + "ordering": true, + "responsive": true, + "dom": '<"categories_nav"><"top"fi>rtip', + "stripeClasses": ["", "alt"], + }); + } + return ontTable; +} + +function populateCategoryRows(data) { + let categories = data['categories']; + let allRows = categories.map(category => { + let name = category['name']; + let description = category['description'] + let created = category['created']; + let id = category['acronym']; + let parentCategory = category['parentCategory']; + let actions = [ + 'Edit', + ] + return [name, description, created, id , parentCategory, actions.join('|')]; + }) + + return allRows; +} + +function DeleteCategories() { +} + +DeleteCategories.act = function(groupName) { + let category2delete = jQuery("#adminCategories tr.selected td:nth-child(4)").map(function(index, value) { return value.textContent.trim();}).toArray(); + let confirmMsg = "You are about to delete the following categories:
    " + category2delete.join(",") + "

    Should I proceed?"; + alertify.confirm(confirmMsg, (e) => { + if (e) { + _clearStatusMessages(); + let success = []; + let errors = []; + let notices = []; + let errorState = false; + let deferredObj = jQuery.Deferred(); + let initialDeferredObj = deferredObj; + + for (let category of category2delete) { + fun = () => { return jQuery.ajax("/admin/categories/" + encodeURIComponent(category), { + method: "DELETE", + dataType: "json", + success: function(data, msg) { + var reg = /\s*,\s*/g; + + if (data.errors) { + errorState = true; + errors.push.apply(errors, data.errors); + } + + if (data.success) { + success.push(data.success); + } + + if (data.notices) { + notices.push.apply(notices, data.notices); + } + + _showStatusMessages(success, errors, notices, false); + }, + error: function(request, textStatus, errorThrown) { + errorState = true; + errors.push(request.status + ": " + errorThrown); + _showStatusMessages(success, errors, notices, false); + }, + complete: function(request, textStatus) { + if (errorState) { + jQuery("#tr_" + category).removeClass('selected'); + } + } + }) + }; + deferredObj = deferredObj.then(fun, fun); + } + // hide progress message and deselect rows after ALL operations have completed + deferredObj.always(function () { + jQuery("#adminCategories").DataTable().ajax.reload(); + }); + + initialDeferredObj.resolve(); + } + }); +} + +/***************************** + * COMMON FUNCTIONS + *****************************/ +function _clearStatusMessages() { + jQuery("#progress_message").hide(); + jQuery("#success_message").hide(); + jQuery("#error_message").hide(); + jQuery("#info_message").hide(); + jQuery("#progress_message").html(""); + jQuery("#success_message").html(""); + jQuery("#error_message").html(""); + jQuery("#info_message").html(""); +} \ No newline at end of file From 6a305bf52433a5b80b09d75ad7f863be89fe81ae Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 16 Apr 2023 10:15:49 +0100 Subject: [PATCH 057/533] add group from error style --- app/assets/stylesheets/admin.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 181e46e11..ad58c2c44 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -16,6 +16,7 @@ .error { background: #ffecec image-url("error.png") no-repeat 10px 50%; border: 1px solid #f5aca6; + padding-left: 30px; } .success { @@ -139,3 +140,8 @@ table.dataTable tbody tr.selected { margin-right: 8px; } } + +div.groupFormError { + color: red; + padding-top: 3px; +} From 3f907ed422b80b846d7001eb2480ceb4a4a635ee Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 17 Apr 2023 11:07:53 +0200 Subject: [PATCH 058/533] Upload footer assets --- app/assets/images/logos/agroportal-logo.svg | 4 ++++ app/assets/images/social/github.svg | 3 +++ app/assets/images/social/people.svg | 3 +++ app/assets/images/social/twitter.svg | 10 ++++++++++ 4 files changed, 20 insertions(+) create mode 100644 app/assets/images/logos/agroportal-logo.svg create mode 100644 app/assets/images/social/github.svg create mode 100644 app/assets/images/social/people.svg create mode 100644 app/assets/images/social/twitter.svg diff --git a/app/assets/images/logos/agroportal-logo.svg b/app/assets/images/logos/agroportal-logo.svg new file mode 100644 index 000000000..89b08d6a2 --- /dev/null +++ b/app/assets/images/logos/agroportal-logo.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/assets/images/social/github.svg b/app/assets/images/social/github.svg new file mode 100644 index 000000000..9f2ef1737 --- /dev/null +++ b/app/assets/images/social/github.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/images/social/people.svg b/app/assets/images/social/people.svg new file mode 100644 index 000000000..85f1d5fd0 --- /dev/null +++ b/app/assets/images/social/people.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/images/social/twitter.svg b/app/assets/images/social/twitter.svg new file mode 100644 index 000000000..162e21ae2 --- /dev/null +++ b/app/assets/images/social/twitter.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file From 1e510a38c0c4866618b73e9b321c70b60756abe1 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 17 Apr 2023 11:08:17 +0200 Subject: [PATCH 059/533] Update footer design --- app/assets/stylesheets/footer.scss | 45 ++++++++++++++++- app/assets/stylesheets/themes/lirmm/main.scss | 19 ------- app/views/layouts/_footer.html.haml | 49 +++++++++---------- 3 files changed, 65 insertions(+), 48 deletions(-) diff --git a/app/assets/stylesheets/footer.scss b/app/assets/stylesheets/footer.scss index 927971394..cee5b712f 100644 --- a/app/assets/stylesheets/footer.scss +++ b/app/assets/stylesheets/footer.scss @@ -1,3 +1,44 @@ -.legal-text { - font-size: 0.9rem; +.footer-container{ + display: flex; + justify-content: center; + background-color: var(--primary-color); +} +footer{ + width: 1280px; + background-color: var(--primary-color); + padding: 40px 100px; +} + +.footer-header{ + display: flex; + justify-content: space-between; + margin-bottom: 40px; +} +.footer-social-media-links a{ + margin-left: 20px; +} +.footer-nav-links{ + display: flex; + flex-wrap: wrap; + justify-content: space-between; +} +.footer-nav-links div h2{ + font-size: 21px; + font-weight: 700; + color: white; + margin-bottom: 10px; +} +.footer-nav-links div div{ + display:flex; + flex-direction: column; +} +.footer-nav-links div a{ + font-size: 16px; + font-weight: 400; + color: white !important; + margin-bottom: 10px; + opacity: 60%; +} +.footer-nav-links div a:hover{ + opacity: 100%; } \ No newline at end of file diff --git a/app/assets/stylesheets/themes/lirmm/main.scss b/app/assets/stylesheets/themes/lirmm/main.scss index e50dcf48d..d5bb078c1 100644 --- a/app/assets/stylesheets/themes/lirmm/main.scss +++ b/app/assets/stylesheets/themes/lirmm/main.scss @@ -241,22 +241,3 @@ div.logos a { } } -/************************************ - * FOOTER -************************************/ -footer, .footer { - background-color: $color-secondary !important; - position: relative !important; -} - -footer img { - height: 32px; -} - -footer a.logo.connect img { - margin-right: 10px; -} - -.legal-text { - font-size: 0.9rem; -} diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index a88f4166f..23d5a179e 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -1,33 +1,28 @@
    -%footer.footer.pt-4.mt-5 - %div.container - %div.row - - $FOOTER_LINKS.to_h[:top].to_a.each do |footer_links_block| - %div.col-6.col-md - %h6= footer_links_block[:column_header] - %ul.list-unstyled - - footer_links_block[:links].each do |footer_links_row| - %li - - footer_links_row.each do |footer_link| - = render_footer_link footer_link - %div.row.legal-text - %div.col - = t('.grant_html', site: $SITE) - %div.row.pt-2 - - $FOOTER_LINKS.to_h[:bottom].to_a.each do |footer_links_block| - %div.col-6.col-md - - if footer_links_block[:column_header].present? - %h6= footer_links_block[:column_header] - %ul.list-inline - - footer_links_block[:links].each do |footer_links_row| - - footer_links_row.each_with_index do |footer_link, i| - %li.list-inline-item - = render_footer_link footer_link - - unless i >= footer_links_row.size - 1 - %li.list-inline-item - = raw(footer_links_block[:separator]) +%br +%br/ +.footer-container + %footer + - footerlinks = $FOOTER_LINKS[I18n.locale] || $FOOTER_LINKS[:en] + .footer-header + %img{:src => "#{asset_path("logos/agroportal-logo.svg")}"} + .footer-social-media-links + - footerlinks[:social].each do |link| + %a{:href => link[:link], :target => "_blank"} + %img{:src => "#{asset_path(link[:logo])}"}/ + .footer-nav-links + - footerlinks[:links].each do |footerlink| + %div + %h2 + = footerlink[:title] + %div + - footerlink[:items].each do |item| + %a{:href => item[:link], :target => "_blank"} + = item[:title] + + = javascript_include_tag "application" From d77fafc6701fcc181b82a2edb1a7b0c4f004dc84 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 17 Apr 2023 11:42:08 +0200 Subject: [PATCH 060/533] Upload an ontoportal logo --- app/assets/images/logos/ontoportal.svg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/assets/images/logos/ontoportal.svg diff --git a/app/assets/images/logos/ontoportal.svg b/app/assets/images/logos/ontoportal.svg new file mode 100644 index 000000000..dfb0838d3 --- /dev/null +++ b/app/assets/images/logos/ontoportal.svg @@ -0,0 +1,3 @@ + + + From e5a75ceb05774a1a400cd60324557b074584835f Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 17 Apr 2023 11:42:56 +0200 Subject: [PATCH 061/533] Make footer logo changes depending on the portal --- app/assets/images/logos/agroportal-logo.svg | 4 ---- app/assets/stylesheets/footer.scss | 13 ++++++++++++- app/views/layouts/_footer.html.haml | 15 ++++++++++----- 3 files changed, 22 insertions(+), 10 deletions(-) delete mode 100644 app/assets/images/logos/agroportal-logo.svg diff --git a/app/assets/images/logos/agroportal-logo.svg b/app/assets/images/logos/agroportal-logo.svg deleted file mode 100644 index 89b08d6a2..000000000 --- a/app/assets/images/logos/agroportal-logo.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/assets/stylesheets/footer.scss b/app/assets/stylesheets/footer.scss index cee5b712f..dec58f53f 100644 --- a/app/assets/stylesheets/footer.scss +++ b/app/assets/stylesheets/footer.scss @@ -14,6 +14,17 @@ footer{ justify-content: space-between; margin-bottom: 40px; } +.footer-logo{ + color: white; + display: flex; + align-items: center; +} +.footer-logo p{ + margin-bottom: 0; + font-weight: 700; + font-size: 18px; + margin-left: 20px; +} .footer-social-media-links a{ margin-left: 20px; } @@ -41,4 +52,4 @@ footer{ } .footer-nav-links div a:hover{ opacity: 100%; -} \ No newline at end of file +} diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index 23d5a179e..3521d8ff8 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -7,11 +7,16 @@ %footer - footerlinks = $FOOTER_LINKS[I18n.locale] || $FOOTER_LINKS[:en] .footer-header - %img{:src => "#{asset_path("logos/agroportal-logo.svg")}"} - .footer-social-media-links - - footerlinks[:social].each do |link| - %a{:href => link[:link], :target => "_blank"} - %img{:src => "#{asset_path(link[:logo])}"}/ + .footer-logo + %img{:src => "#{asset_path("logos/ontoportal.svg")}"} + - logo = $UI_THEME.to_s.capitalize + - logo.sub! 'portal' , 'Portal' + %p + = logo + .footer-social-media-links + - footerlinks[:social].each do |link| + %a{:href => link[:link], :target => "_blank"} + %img{:src => "#{asset_path(link[:logo])}"}/ .footer-nav-links - footerlinks[:links].each do |footerlink| %div From 8d26002dbe54a332578275f12587350e244978c9 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 18 Apr 2023 12:06:30 +0200 Subject: [PATCH 062/533] Setup lookbook --- Gemfile | 1 + config/routes.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 7de2ef3ea..dbf11f58b 100644 --- a/Gemfile +++ b/Gemfile @@ -69,6 +69,7 @@ gem 'rest-client' gem 'stackprof', require: false gem 'thin' gem 'view_component', '~> 2.72' +gem "lookbook" gem 'turnout' gem 'will_paginate', '~> 3.0' diff --git a/config/routes.rb b/config/routes.rb index 057297ac7..96794aeac 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -207,5 +207,6 @@ get '/visualize' => 'ontologies#visualize', :as => :visualize_concept, :constraints => { ontology: /[^\/?]+/, id: /[^\/?]+/, ontologyid: /[^\/?]+/, conceptid: /[^\/?]+/ } get '/exhibit/:ontology/:id' => 'concepts#exhibit' - + + mount Lookbook::Engine, at: "/lookbook" end From c4358fda29688f0d95af1564d08663b041744b4a Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 18 Apr 2023 12:06:53 +0200 Subject: [PATCH 063/533] Add ships component preview to the lookbook --- test/components/previews/chips_component_preview.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 test/components/previews/chips_component_preview.rb diff --git a/test/components/previews/chips_component_preview.rb b/test/components/previews/chips_component_preview.rb new file mode 100644 index 000000000..984ac5bc1 --- /dev/null +++ b/test/components/previews/chips_component_preview.rb @@ -0,0 +1,6 @@ +class ChipsComponentPreview < ViewComponent::Preview + def default + render(ChipsComponent.new(name:"bug", value: "Bug")) + end + + end \ No newline at end of file From 432809ff3618239c600e2a8bd0bb2e6e1e7bb457 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 18 Apr 2023 12:07:52 +0200 Subject: [PATCH 064/533] Add component preview layout file (so we can add some padding) --- app/views/layouts/component_preview.html.erb | 12 ++++++++++++ config/application.rb | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 app/views/layouts/component_preview.html.erb diff --git a/app/views/layouts/component_preview.html.erb b/app/views/layouts/component_preview.html.erb new file mode 100644 index 000000000..40a42adf7 --- /dev/null +++ b/app/views/layouts/component_preview.html.erb @@ -0,0 +1,12 @@ + + + Component Preview + + <%= stylesheet_link_tag "application" %> + + + + <%= yield %> + + + \ No newline at end of file diff --git a/config/application.rb b/config/application.rb index f13cb361a..ea51961b9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -27,5 +27,8 @@ class Application < Rails::Application config.change_request = config_for :change_request config.generators.template_engine = :haml + + # Set the default layout to app/views/layouts/component_preview.html.erb + config.view_component.default_preview_layout = "component_preview" end end From 24466c43a06889a6cf653d6c030e4c25f0eec87b Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 18 Apr 2023 12:53:24 +0200 Subject: [PATCH 065/533] Add card message component the lookbook --- test/components/previews/card_message_component_preview.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 test/components/previews/card_message_component_preview.rb diff --git a/test/components/previews/card_message_component_preview.rb b/test/components/previews/card_message_component_preview.rb new file mode 100644 index 000000000..6be01f318 --- /dev/null +++ b/test/components/previews/card_message_component_preview.rb @@ -0,0 +1,6 @@ +class CardMessageComponentPreview < ViewComponent::Preview + def default + render(CardMessageComponent.new(message: "A password reset email has been sent to your email, please follow the instructions in the email to reset your password.", button_text: "Back home", type:"success")) + end + + end \ No newline at end of file From cea8d6a01ee3aec99e86c3457ba731d83b720f39 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 18 Apr 2023 13:29:02 +0200 Subject: [PATCH 066/533] Add the parameter link to the component Card message, so the user can specify the link of the action button --- app/components/card_message_component.rb | 4 ++-- .../card_message_component/card_message_component.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/components/card_message_component.rb b/app/components/card_message_component.rb index 255372d5d..d4b10b4d4 100644 --- a/app/components/card_message_component.rb +++ b/app/components/card_message_component.rb @@ -1,10 +1,10 @@ class CardMessageComponent < ViewComponent::Base - def initialize(title: nil ,message:, button_text: nil, type:) + def initialize(title: nil ,message:, button_text: nil, button_link: "/" ,type:) @title = title @message = message @button_text = button_text @type = type - + @button_link = button_link end def no_title? diff --git a/app/components/card_message_component/card_message_component.html.haml b/app/components/card_message_component/card_message_component.html.haml index 4eb55723a..587869335 100644 --- a/app/components/card_message_component/card_message_component.html.haml +++ b/app/components/card_message_component/card_message_component.html.haml @@ -13,8 +13,8 @@ - unless no_button? - case @type - when "success" - %a.card-message-button.card-message-button-success{:href => "/"} + %a.card-message-button.card-message-button-success{:href => @button_link} = @button_text - when "failure" - %a.card-message-button.card-message-button-failure{:href => "/"} + %a.card-message-button.card-message-button-failure{:href => @button_link} = @button_text From 4ca9f7e776570466795e6da7128d85d3b14c75ef Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 18 Apr 2023 13:29:22 +0200 Subject: [PATCH 067/533] Add parameters to the components in the lookbook --- .../previews/card_message_component_preview.rb | 10 ++++++++-- test/components/previews/chips_component_preview.rb | 8 ++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/test/components/previews/card_message_component_preview.rb b/test/components/previews/card_message_component_preview.rb index 6be01f318..02c17f200 100644 --- a/test/components/previews/card_message_component_preview.rb +++ b/test/components/previews/card_message_component_preview.rb @@ -1,6 +1,12 @@ class CardMessageComponentPreview < ViewComponent::Preview - def default - render(CardMessageComponent.new(message: "A password reset email has been sent to your email, please follow the instructions in the email to reset your password.", button_text: "Back home", type:"success")) + + # @param message text + # @param button_text text + # @param type select [success, failure] + # @param button_link text + + def default(message: "Here we can type a success or failure message to the user", button_text: "Do action", type: "success", button_link: "/" ) + render(CardMessageComponent.new(message: message, button_text: button_text, type: type, button_link: button_link)) end end \ No newline at end of file diff --git a/test/components/previews/chips_component_preview.rb b/test/components/previews/chips_component_preview.rb index 984ac5bc1..55ff1b5bc 100644 --- a/test/components/previews/chips_component_preview.rb +++ b/test/components/previews/chips_component_preview.rb @@ -1,6 +1,10 @@ class ChipsComponentPreview < ViewComponent::Preview - def default - render(ChipsComponent.new(name:"bug", value: "Bug")) + + # @param name text + # @param value text + + def default(name: "name", value: "value") + render(ChipsComponent.new(name: name, value: value)) end end \ No newline at end of file From d750f7f9caa7fd363483758312fa9272edebb92b Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 19 Apr 2023 12:03:26 +0200 Subject: [PATCH 068/533] Upload home page assets --- app/assets/images/check-outlined.svg | 4 + app/assets/images/home-random-bubbles.svg | 82 ++++++++++++++++++ .../images/logos/collaboration/cnrs_logo.jpg | Bin 185446 -> 0 bytes .../images/logos/collaboration/d2kab.png | Bin 0 -> 5232 bytes .../images/logos/collaboration/d2kab_logo.png | Bin 12217 -> 0 bytes .../images/logos/collaboration/inrae.png | Bin 0 -> 4793 bytes .../images/logos/collaboration/inrae_logo.jpg | Bin 9230 -> 0 bytes .../images/logos/collaboration/lirmm.png | Bin 0 -> 5146 bytes .../images/logos/collaboration/lirmm_logo.png | Bin 86558 -> 0 bytes .../images/logos/collaboration/sifr_logo.jpg | Bin 6344 -> 0 bytes .../stanford-university_logo.png | Bin 121975 -> 0 bytes .../images/logos/collaboration/stanford.png | Bin 0 -> 15057 bytes .../images/logos/collaboration/um_logo.png | Bin 33687 -> 0 bytes .../supports/agropolisfondation_logo.png | Bin 29060 -> 0 bytes app/assets/images/logos/supports/anr.png | Bin 0 -> 9952 bytes app/assets/images/logos/supports/anr_logo.png | Bin 9198 -> 0 bytes app/assets/images/logos/supports/eu.png | Bin 0 -> 3469 bytes app/assets/images/logos/supports/ibc_logo.jpg | Bin 10343 -> 0 bytes .../images/logos/supports/msca_eu_logo.jpg | Bin 44126 -> 0 bytes app/assets/images/logos/supports/numev.png | Bin 0 -> 4328 bytes .../images/logos/supports/numev_logo.png | Bin 10345 -> 0 bytes app/assets/images/play-white.svg | 3 + 22 files changed, 89 insertions(+) create mode 100644 app/assets/images/check-outlined.svg create mode 100644 app/assets/images/home-random-bubbles.svg delete mode 100644 app/assets/images/logos/collaboration/cnrs_logo.jpg create mode 100644 app/assets/images/logos/collaboration/d2kab.png delete mode 100644 app/assets/images/logos/collaboration/d2kab_logo.png create mode 100644 app/assets/images/logos/collaboration/inrae.png delete mode 100644 app/assets/images/logos/collaboration/inrae_logo.jpg create mode 100644 app/assets/images/logos/collaboration/lirmm.png delete mode 100644 app/assets/images/logos/collaboration/lirmm_logo.png delete mode 100644 app/assets/images/logos/collaboration/sifr_logo.jpg delete mode 100644 app/assets/images/logos/collaboration/stanford-university_logo.png create mode 100644 app/assets/images/logos/collaboration/stanford.png delete mode 100644 app/assets/images/logos/collaboration/um_logo.png delete mode 100644 app/assets/images/logos/supports/agropolisfondation_logo.png create mode 100644 app/assets/images/logos/supports/anr.png delete mode 100644 app/assets/images/logos/supports/anr_logo.png create mode 100644 app/assets/images/logos/supports/eu.png delete mode 100644 app/assets/images/logos/supports/ibc_logo.jpg delete mode 100644 app/assets/images/logos/supports/msca_eu_logo.jpg create mode 100644 app/assets/images/logos/supports/numev.png delete mode 100644 app/assets/images/logos/supports/numev_logo.png create mode 100644 app/assets/images/play-white.svg diff --git a/app/assets/images/check-outlined.svg b/app/assets/images/check-outlined.svg new file mode 100644 index 000000000..db2866523 --- /dev/null +++ b/app/assets/images/check-outlined.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/assets/images/home-random-bubbles.svg b/app/assets/images/home-random-bubbles.svg new file mode 100644 index 000000000..52eee7a98 --- /dev/null +++ b/app/assets/images/home-random-bubbles.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/logos/collaboration/cnrs_logo.jpg b/app/assets/images/logos/collaboration/cnrs_logo.jpg deleted file mode 100644 index a3aeb1d7452c231c402a3be58a87ac921e232c7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185446 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%0Dt%?N7h*>lgT7cUbXm-}}v^S*bh zsrPKVEu%sY?ap&Azuj~EjInp7-<|Pk*8SB5wc`bE=Bmv6hvXTYKOR1@Z<~Esk?xj` zH`VpMQ}-+LD6K!0O-MoxcaGEn3ubs5aPWMwUksYUGkEUB3~tVujt~wKIQ888;&2&h5D^tAnSfRtft&Df{sCGIsncQ?NVU_}Z*6 zae{83F+$iPoqbJtZhlKt>hy5SPp?yjO;6_g2j=#TztVG`Z{vyG>9O3qipkAx=KcE* z{j|-Sz1yqg%q6y@NY0k;4H_SPsrwviYy#^&ceHL#<0XSd;?qfSn%+;{p3Ir^tvux9 zs14pW4(5WPvllOvesvk(vh;~=qE*SP!d2}Hza0IYw|nD8=RbBAy{&GnXu*b*1zf;f zM^Vy6?epp#%>ezN%r=Wk*L%VI&YUYWTvuM3Ys6@*7${w3U@Pd~Aq>iRtcj^b ziC`cF*#h)S(7s8am6kzr&_=&_2v@d+E$Etz4r)(s0kPiHm2d~bTWi~Xj7gVrFdHP$ zMgHWq8zS=OJJjVIg^?gHG1MNR)La$b2kM_hQ|w`%lxo%&A}vL)3MSmlYt3#k6`JB= zVWS53)$)9;IW@Xzz5Gy$4F+y-Y9@{NCpTj?qdNyr?_|Au5WRNUrGS{UGM9dCvlcH}vnJy6XP7~> z;agg)``q@_r^)2c0a%4*aL6ggQlIcm+I_oq5qDFTGg@-$q2fkyyo5h#Ms&{j_ZY+{ zpcf~&;!;s6)x&$h+VK-LcwSHa)mckJFCVV7S-bAza?9~Mn7!w1d~&2_SS93+KS5}G{%bnogTr8EAN%C#RAYpS-qo0cr^NEgo52_ zlynp#2?A0HE;W0ff&4AV-e6fnAq1ARRexE@#lYJz=ww2pVtm2M^iTjp!bxbQMwr)z z4s!zs13rp71?CFyc@an~fTnc3L(q;~NYio&5F17@&BXAd)R=@0d@}X?=Xx_py4E9s zN+ul$1)j~t=m1t34*`;ve-rES!Z0TfJWCJcg>R0)YpxwJrKfL`HoB~{nR1f$!Yo9< z$AB3HwVIA*=GP)C0e(V28H|0h4PVixBQb$7+=$h36orC-I3ewgYpWS0P28t?Nt+N5 zY7WV{nMoCKVpiOMSC-50VnQ37G*ykk*GjDmH)~b%Z(&|AWtzp;3TQ3_5Nq+)G;pVI z79OV|kXnd;V~3W*DX@zPL$MODcRx`Ezh%y6z+f51Znu;cMh`x8l>s`_=~bH(MuvI> zh8a0e?=-+s4*~pHm|qfI0g8u`;@#9G{8;>q4zd6)>iRhVzwNCYZjuhq{7{sxbWncs z%`U{mq>Kz30rvv&gC`t*9Z#Ep?#6=;`<)2`1Of}pjLUI@KExax=6k@Czng61^R@r2 zs#;0@#(Gu~6_YG`$UGJ`F3WA;=0kHPyL!jAcwZ{FZ&P#6Ml!o)EA z8G;Qxq+#xgC>cy3#^W)_JvjldwG<)CgJ2n8VRU4n_$#R%tz9DuyOFYJJQ=C;r=h9A z1%eP3+r`JB;IqeGPV?L3r7M@pb3cBqmt9J^oN&)QpHzZ+78PdV;;k`Dx6~vkyXUEL=>@zR7;i z9jM!FEOhBpEgkk$DBB^Mzc)kOeeWLTYUPC~<&L778(pYY)Oy35>Kv94%1p)P;h7xn=KAr$7a|qOoAQYzkwTM)ZEz($& z=VVir?&5CkOt9O~bc~2x)jBXQOn81vx;1oE>2Q5_D?^y(0CZZjGk0~lSI4wBz3Mtquy$>0G_)4-bQRo&%^~MvkdpjiH2|0cIW%WkYVg8rG zcE$JNQZtxF33Fna$vWw3h9`{P*Bhni00Il)V*{M}BNc`h)tIyk@ASf7!dX>kBCJ7! zDHv^X5~qieKpBhQHcG1Zr;k90qz+`1P6%NgS{=TYjee4>$7?JI^)g~S-sT;TX+HZf zfz8a?50$A~ThJ6Z<6+gf11#gkDfqWc_)bvym#4jGn@&L^ zL+q2=U>hFlrAEwDQJ6XZrl}W&ikD%M`EcB}`XUWf}h*ges`UyCE zk)M{n(Gbc4?eOAs^{td}eR=cBK4Z4gL zhJggu56n!4&@-41>sveakNa*?)65a5cXm10zjwGnX8Rf|Q^(z8f^`UnH%Z5!{9+d@ z2G0{__=w(B1_fVsvORGFC!>b60>Ucdi9_L*vSA7?CTq%37#64lrW^<}MvjI}SnyVj z51N5SA*U8|;_8{=Fc}}rE)tSP=@;yIhc@-0zMKK4;tPmmj~);Q5FJoG=ufPouqHWt z73HEzzb@WV9NyYD>;|vRm$eOt)YIdm;f(>u|e0rZogIsS!a>+eF4qjiA0}w0l*X zwFY$e!ZQO|9cu`g=&oE}35JpRIva|#!GM)0I%WFvm{*yQqis=ZX3VPMaDJzuq9YC#P*L{Gt_gq6s8!1_uIfhrb?+5FxpJJdKx@HPzS>SH#|p`TM&{EIlmQV z*NV`qp`bd@d?ZDYAQ&ppa*nSf&tC4$~@QbTrV7e8u;B&5xG+ zan`F=5)^u+8+Ic3e*Tt@4SOnX>~I?#dFS$u`zbf`))e&d9P2V5e%pmPz3*-sZfLda zx1iAVpwpT=k=>TQJl=n`<1Jl4>dsugeCh66ubUWAvpPyFxAvUaw_b8pI;(b?_bCUm zqC9VLn)zJS(7dg;cVB;-ytv8hz@zz*FPRbwS8+W}0wbIgV9sT?vKf9ZNCD$2mFndl{x?Xj3j9 zX6jlQU!j!N08&M=)!-CNOoZ~I9Bn`fI1|o$P&YnT&;O45qGk+M`dIiO1`*!CBn z%pdBzP0ck*=33XJ`A<7FBO3RUjc?Z`mbeXgv-3{!nO(h8SDtBGW^!SIi|ydezkM`0 z(|=8I>igNx!eE*fZ?7J=gvs~xCOPOl1#A01((KbKT!$oe68&^ym zbYWh9&kY;G4UP*Z_BC5ncQDfRk>(Kc|9iaGSX`c0Ko>+2uZity+a`o{Q~A43L%q}9JT<5a5!gNW zQ4)O+lX9jwmVJXf6hbD*skKtjD@cVrK%28cp-mfr7=Zpi{uc)QsIZ<8V89}BGSZZ7 zlDz@;JKOP=nDd_R=7;DmhHj}^@yD4PO9juk(?YXeEz6(rFflUb(8NZ!pZZO_H1^ta z%fk)t)<4okPjGCyG7vuK!9(WHvf9LBRLthn#C!4glG0w(I2qY0d=}l<4Z<`-FR($w zyC#l2!{$J00DbV_5VC+1s$=LiD0t1`hqK65{U&fTPz$P4pGEaGGpcj!mhL=6k zY7r!)O1d1MO<_s_MHh)Xph!H@>=k}#%}LMQ?K4L-9XWaPLO`t8<&f9pl#i*V?Jf{| z_)X2g+gGQ8-LV21=*4+cDJLP;u?b{zVDjT^QC08%st3akn$4X71J-^wnd<&EqVrNI zHfe%Yl*{I^OZMR-tnTv`_)Yp_%+0HnKPTOOb#zIc)OT4*s~wORs7D98$&YW1-uKs` zpTCfC3mBM1*+qI)d+5}bRgDEUX%4jZSk~v=PLCWyfz$?8xn5`JCqlQ+d!jbTUVED(p~lXS;? z3zTP)X_Pwy$dFhQod!3%|L~^ zYNpB-q*3p4r0sq0Oo0H+AN1}U&u9#OR;U$sGKyinRI=?aDh2+E0t-K|i%MtOwDjeS;2?@lOJ{G2R{muDOq!s4R9sG zZP4top|*lH&BgvO-=4o2afLnq&J|`T$axf@U?gaKFRG-qz-4$TA`#I9d`K@uG7W>X z68=f8i-H~H5V1^R@jBx=p}+L{QwG@-GF?c$#;{gZU;n=sd@+$8XSN#KL_)op3X0yq z_=NBjT_Bz#qb8xNDmyJjw7*kNC=FZzBriRPqmX#=|;2gCjge878giCC>B6u4c6Gtx8EOsEWEt)fXRs=UtRBgx-mDd@aB}7{26b0NAJ^%TJ5`Wo&Un8 z5xX0kgC%KtaYlOG@W)BQHx<(8L!1f5b^E?19PnGWs-VuW^7!h!J$?ag#}xMymc^ZI z%`;2;^W@;Qzts=+-|N3~^qI!)PWHdAQwPJqzJ+E00fFf3;~4JSDk)27J!dc*(CXO$ z3TWJ>P-!ybsuWQ0fyoPPz};JiY|3jY-AK)4tntO~kqWpVLm@*+pvkr=#0?OD++^CsYlO`Q_l>$*T*BG^NH88%MJH; zY`C(3#8@gkN!K~LTz68w>-^GJ*{A0*nb(6EYo6h}Cvk?l$Zuj96uKW@s--k5H4 zvi!lUpvgY&Nt15s4CBNi;t!!oJGz|U5Qz1J0m^Zc!>)}y7pPw88H5jZ9VK~33|UB>EzaHO#l7M9NKsFd*1)KJbu{X zU3G`0wQCm`mfD5`!;MG)lQ_yCby0vh1&m#wMGjTanyp0%{b0HRsJy91bDxw*ku*j} z2fMS_qNCG0!qnn0uxjRL?RrFNM!$1=vLWABhh z)mglUS$lGB_Zh$&JY~f`Wn%DzXAh1J?QlL5?>X^Z!JQJ5iSCm${h1{`JFbH8<_UEA z3qj*~H=mlrXj;8(rAMV-QK0~R%4+yL#e1p2s_-kmncC^s2P~dYZzBlZ`t@{LkJwFb zdL=b}iR^wMc6_nvsE|~ffYdSS3!JPiGT)@ehx~Guk^EU#f}eJ`x%-4n#NU^J8EF=P zecQ}b!HDnSupbo9dw`3DBT$ADNd5}^A`a$2io-npDac~^HDp)5>etm8lC8s#Kmo2Q z=o;ztjKfwLJsL#ll~-C0aZH8PV%13el#PxCnHCBhD82z-6Uw9+%>iO4Yp9googkY$ z_z9ZD6++V)5yn*&0`RaF+#b$^C@lnh!eCiDW)4cJY@>!^N}L|#n8R;!63RNLTzFHD z#a$y{vOi!j0;aGC7hO97PFF-vvD35Bq85=M22#?lMJ?SxACW+|!_MlpX069g73u!J^weBIP-!*`qS;l!#4L1A#ggr~* z__|XaJIcOEUo{GVVzttdyn#13YHg2A#VVf)bn((Q*(d)Fl#)Ol5A`2c`jI|p4%!J? zNx`@9Y3>dyE;}Fvd1$^`Ngb6_+&GF#5kd0Wson{6EDEmyM&p001@mkOxU}pd;Glv& zp8`qm3emTK)8nAv3b|)rhb^ICFkgNB9E#V8FUrUe!^AEc^PK-kV}|(@+n)Yyx5(i3 ze{9hH|C0}AKZj~=Sf{BTigq-US*f;wp)Py@ZPN~6SQ`rr3!4rP0fAOxs3$xkGkeoI`C5xer6w!IKod-{IBp)Q24$Y+o zUoM}9rBkqYIl_lFo6+GdY8X*6E|OhP(TFx&L*xxXRs~-NXvtjo*C$1a0ecvH@xVIY zmPgf+sI4u_7yi6m{l@F@z;%|R8iSV?rd^qvR6j25-u;;EM_tEy{yxCIdE=#0XS0=+ z9v)S%wq%~zc2?JajoQd7EGS4y(bgDSZN5ncdEj+9`QfP#cYRzaF>HCwd#)Tm+I5Td zQs&-wB_VG6OXj;veWnZ=Q(e2>p>*uW=aKmIqM3emNkOxn(hF;d*0kl6<78}_G|DZv zNIIG8V7wx--pN#Zb@Sgg=KkP~eUfH<+9HfKpO&hVT0MD`?{wqL_1K^*7Oo>^tZ^DO zX5QTq2A7nGiOF7n2_>s)($k|0cDSYtKf`}`!ttx9X+xewz_*b#p`zXm={lr!3 z@(mSdVvgL{aptn-*I)YB`>?!rG~ReHLpDP>DZBT@8E1Nj_xL3;ceeZ6cOQEUW%R2l z3XcjDR`@PH@Nmuy^BSX-R`f2Y_*A=P&)o?uUdk(RS#A5lfDM&b=A_&Qf>cV}g)5Iv zW}Vr2Kk3ec``6a)*>m0f)Mv|c&$k7P`pfarr{7*QZeH)^x_wkap4|e|6Sk)*psWDf z1(n-3 zmbDrJ(;CK|Yk6V3kbYpsm0vavQ`a_KCJ#$K{?7eGd~0xLv<*MeF+*g$!UCZ!D`N;# zebVRed@@HecI}+%CVR!PZ7FASH-!z%JaDOZ+Wz`euU+n&ReDak*D~3@F8S%+qo%4q z@m(Vqh!ywsD*Lf`o#-ZTS<+!BHZGy8o2w%siGd0tR^4K+gm?>zhA_SXY$nRv1943m z6gPlq0^S#_OOBDHpb(Wcn}Q65q3weCux1DanjFDDp;Qt6mPPJI{zXij#)YupWX+qnIVhoz?n&2Uc3S?hgB zGVNA}YwnU~`lLrm@@o*zyAJM=^!ZX-!N@0tlU_QN4*S_bt#jyP9)H75|48ks=aE=4q7$O=$Ep(+s!1{|#LESiK1TAH4rqIo@ zm;NWK-mFXt;5yCrFN2D(pi|C=t{1qT3M*ZIGwt)3LZEyFL#gxdJKzH`?vao<$ z5RK7HY1@A@rHve{9Fi}gp)VTKCJrU%r9pnms>SI+P4%sqjHN^slw_1VbBNEi)uz-t zE~vs5imcCpl#{<*!>ZtV{-ZcN1qT*5*VpkIRorQXrb;UDGHH`Fvh9Q@d_P{63T%6O zaQGSgfAO{26xQ2$nX4H{zL8+xpt|_iLHjy9+}{AmCtqJ3Ug=f@NnE(E5_A;t zrE6Zpd70y}L>jsch@i=+(E00v3D z^!}6`lxRi_RC)H|qb%(Ix3aL;D5_GIBgeW0?AvhGMdmLWJKJh^&4i_w2AsY0rnj$Z*`-F`e%c=IcoBrB$W8%9b<6LJf{IuBhZRvKu1ZT%JrD|!QaOLKwf8Egq_ir@& z8G9jLR8;t0K;qSCSgUYZuu{QY07zzSE}v@;uq>~H4;Z~kR^MZ%Cb;%XYW2FV7oenNvE$}C+cH9^KtyHibT8c$^BmRw$9n_a=|54Rbb8e zbzl4JZ`~?}U#(ws^=bKd`pWHHKfkstmYrRtb{T#3Xrk|(F^7VBKV2mrU0c?6QC&Zn z;w*gnYKOhpZ~Y*Lnf$zm7CQ6O012rb-ep-Uq(y+}4I;#JBWg$+wC3`PN!pe8QE$rR zlqIs{PidZGWGfwa00IS(eh?+3-7o1_hd+bWS=mVW)J6_)%W1ci=4iAO93E#QADU;) zvtB%HoI;y<>BEcOkF*u(#7=dbd-0NAZL^m<+AlshJTY@c`i+(m6W@PjmaSXS{oa&e;|(LCwmsaCc5z#2lV@JXZ$j-lQa4=C zUJ5Z~C*#|3@gvXk6I~Jj{;;XK@4e=xlfBvqlH350rpqi#-;;*EymX* zRR99ug(3|t^ewaM!9R9Y!eE%hpK?0Ms{;N?4Lri*ygi&w%dg3=5fb;Q8vdv;mj*?< zP;I^R3yyMCPw=TI5oXjNgY*Dr@HA2$Jxp8%u%Vr#i;Mu$DU`L@kk^ zo?#2RMl6IFYL489K73V%zON}Xe?aKP%jSZ=KyDUF#C?@@W*V6ay!@O_R$I4*(;9lWBvR?|k?Q>hk0qk`q z842Ju$zIYjsU8=<79K8dsrrb=R|Y-B0u9nZn^Mk>R#E~AW z9(Wk7DH|dDI*T0&;52v_K0v!12$#Gdq{=0g5k7R`>2~0IsbMm9k*~e+bVelPfVSRTY-O-a6(Ry!~_ zYomRDawD~0NsG~O3)dZpwQ3) zwRjZ31X2t-y{0K5n>sp;FgdRqA}rOuV#FEx(iCzp!tf$Z2O=I;hwKkPhZsvxOtWl2 z)+OXantmM!g{@GyTx5VVAdAK%9wch-D|+#fY^%UW+I&N~^1(8nnB1km3|{kQW%*h4 z?7MF9FI((Z2rG6>A3XW5Cu@(cDcyGNf{W9Tyr!_V*Uc}mHdM6qo1Ip<;12eLu{sn? z-R9am$@$!Yp&!cmGqQ>eg~v}%8?M=R#k5t<>{2|BaSYKmo+q$EXdwh+@u*}W1C!YZ+J;CW2w1!lbx9(MokKVum=ho za!Jg<04W2gz5&Pb~)QOe(c+l)gwZ(D#`3kf1Ug#!FNg7*_=DNPM?R>(S1IB`f}YdX$5|7 zALFw-wJ7;_6cL6Q*o6*n_0hqKSiF{KOZfrI0cr~tJ_Pt7=vZ+j?YrnB<{9u8=>KiP znQ<614m|c#KzN)B76Bb0;#}D4x+j$X6RRGyV@WW67;)XnduP%ySRcDE^g>iw&9)tD9NJ&q_Bpn9|6#{CvhFg> zUtME5Bi^}P8(Kn@tfRaV9|ODa!aUh$&0^0GBVKn1q!CFaICeWfXeEKKl?8J<3RR3I z48?95L!sQrri9;UBnKKe08cdjVA(#6HfscmQ?xrG!^q`X@ZneoW;po8g?MUTsfSno1Ti<>LIIAeyO}3}uRQcAeGgFfXuPqF?Ye zom3cIMfIm%;R1Ho*$o2YN7>OT4fFJ%r@V~LG$9CjQ>KSRl2&|NWFyyivFkF02D}x3 zn>f0U5gPEDa2nwNgd*7wtOklLvW&pg>Y}36a1UerJO)2b+={%BQq5S!C7KQ!`7|>= zgyhbJ4u4h~a+`ojYct`RbQpTi5Wa>U593WgF+Gf0%z|PqB%A}9F_>e)&53q$)e5ScU8iRuYe!!C zN3mA(KAglq5=>ml%qIU^N6_DfIx#W?x4{1l`7zW9SYbRHJWg)qidLTfSCaWpXE+!7 zk@P^5I)_+NXh4UC&h|avrgJPvIQ10a0w~flKzwf!?GO)vUY;!lYXNku9aOp^pX7#p-bPelk`mctJl_h+(bpjyg%Oj2_6IT@Y?`Ksriz0YFg`vZ zhLm^VBj@iX)Us&dk2%ggGjVFgd|Z#C0obws7=Zo%I@p4z&<&{r4oI&MG|;I9T7WST z)|`UGtpzW~!4I4^A_1f48-|*xP=1gFUdJ0KBt|+ghF{t0v)A9dYZb*$DoTia63w54 zgJ1#`fg1}3MFGgOkz`YJJ>xJ>ZAubwlp8|egb0zrtPx3q7=q13oqFC2A>9M_l!`(U z4bn(Uza|%u7kGO#JbOzgT9KwPI(4Bl=aD&bX!7(pT4)%%|6wCaK9xncZ2;b{YqWEugq;9 zwESJ-r23l43s3%<$Ism#`b|rUA@aC=LyZLKA)%mHW zm94Iuuv;-cX~H(Agv9zrnNvgJ=Ib-^Cl7ov=FyA`_nbwKSKaEq_TJ?azs-t^0}4s9 z(if|RTp|@!ABnPBkSaZ5FH4zfObi2G!&wj|xc4*OEI&xH+UGyh>rdMqu1ctgmJJSD z*xy5IIsasK>WP;oXWpN_FyPNG=JuDD&B~L>OPbR^_@)~sowP3;Fi>6OrW4<^LVaIB z0Jlj(1S^8U!W+yA=|yWP$tt3_0T`cc1UkA#Gb4|$Hb)1nB2-Ty+e>~j{ab55Cxg6(l948+S?f%SQ5Gtom!ENrM zKf=!tEM5Z-I0!`$hJu|y?t{ShTI_Mc*oA@1Q&wJo+^GTW?8`Sk*LGySN=xxK&hoRQ zhers(_1AVA%f6p?`sLg^WiI6(Ek2ST6axbg(4_g?{1c+uy&uAlF*#Dcp80=H=;6q^7&cX2v$#w$*)19Bh=ycT{OzP``e^Q^j-A z*3b+04t+Z|2+6JvpbR9*KQQOh{*i&A@xyT(xax9dJPcp=Q!Fx#J|#jQ$7k3Svz22VHXB|iz0!a zu!W|8Ulg47WFaiFpS-}E7}d!xM*=PA=O?z{l6YW$o*mu3?AwKK-_(0;(`E%#N7Fre z#(h}~vv|F0zMBZujKge&%Qd~?M5C( z%ZrBw=*}+PsbRWquHx>zc~^ssFU`ZW$Gc2e->Qc_bS1KTH04<9T^Beg6@TZBH0#ci zy&x*xREOC9n3@Hb6e2Gd(Hb^A28S#g4@1EM<|r9*tz#uT;9(AThNMZO3xK5^6(lOG zNw|#mQY_;NpEPEybP*M15bT|dBJ{i1>4WzxOnt(xlu|)u;Al8u?@3jd){oO0{@#yX zX|@gZxc(xO>K0zqAKlD2%aQ=*Pw>Ps z0MCACDNUWybEQHQJKxS|Q}yG=RiG?J?*L&8j<+vmNXlFA1i?OtU>{@(KM2N3H^3p1 zLv3s33%oy*1T5-%*8s~0mf~?i$F59&8gDxjs}po4rr#jTqw7(TJWbXy>)GWXZQ0$M zzTk+0?hi}XOqvQ*5puGJAyPU$;jiC!*4F`MMV ztS^i8n@4Y^TpMX&?YmYplAM!abNC`FrMHVU{y6?#e(_2cP*QD?Z%QG`+(Y}(hp`wR$MNdw{r1srEv>`6xVCp z85v~U<|8FETqox}d#meuA0ZTul;0b1jN@1I;o*{z_RZGm`paZ{!@xeU4EYBT4v)(j zmE((Q)VcgNNPXD}LrVwz`iU9k6&?1)L`{y;l3g*uayC!RyXcq5Vqz|o*{FJhAG5d7 zw~}>tXuzUdjI&7#>#d9Gpyq)qZw_UACpM=pzzFFGLwM@wSVA;o5ZG8WbO4^k9}I4& zfq}sdN9`X43cnVkZ|4Jj8~KC2?H$0yF~{xOR->#DC@(6tqo6m;QF-Zs-kq6JU--ju z@|o+Oj*|$9hhyOlG@c84^}@Hk0`N_PqdX12v_O=93WdPZI%mdiQVfoIu@UeQ>KcTV zNgAP&FZWL-Tk^DNUj8w?3+hRzHzpF!Oj!%+Enfa3!Eg?S;e%a>!(07sFiHlp^B;bftk zM!s6HhZ+`|lAiPE_VLNkD_+mGx|Lraq1&vDkR8a`|9ibGUSZ62k@Lz$js*^TD4#7& zc@0aEC>J+TCKaB6H}oXK-~CnCyyaNu@za}aK3Iq}Gr$lF3$`_LIPcs0$8qYa)L~<* zz%455J?$25W|3%GV})6Hwc5SNw*|7{{Oz0_A|l>9KYU5%Aa@f;VP~?wTAi0UBM4%2 z4dfyW9GlLnJiIjD9)1@~!2X0-hIyc`M>bcOTp6PfqPxxu>%$@6ohWq<8OvROl@Cw< z{G;8ZvdQCU1p3@pSZ-41%=8bgXeNA5TpSML*ys?h*biJmEvT~Dmutrgu3PR$SJ;=k zUJY^Fzp_qBlK(O7Y@*eIP2#K0Wn?T~d;h|Z$NTSSt=8Kpn6zGYfNO(w{$Q|QuyD=b-c0|L&Wb^F=Y~gWF*-68b;becsPGw=9WtlS--xxhDHIC1h zDV{GPmF z&l7Q-bkx}OyNs&(jhLXwd#VaaTb+E7{M7x$a@V>a+nd>EheRGd?PbwO_#g$ z#+@@V-{5MqZ)$j%y%QU*g$C2+yApBLlxcwK=5sJGJ%`X-(4zWuxV63rWCTJgRdb}^ zB0&3m=*NWyTGTPDB~J(2AuhR}CZy{X0wpO52V0kTi?GuMaagAJE|U*#wAdXaVcw{a z8iapYRWmnFNpVQ=--}xAo^WX?edI_s!B_xuF<6# zU+bz)X`d__i8z*8WK)gyj$6dW4SL@eT<+QV;nd4Dcaz=yDNv5a(8NeDfI-dkOXp)e7`-cJajS(J>bDIn8C0FbSzQJ4J-xbT^(|iV* z{o39ev+#nAhVXCfxk*S37ttc@UriZ>C>?<0 zqZmmk8OHZd7=k@fCS#fgqMPB}jG?u0kyeA$3dDRMW7WIC3Lss8~g09+zFj1Q?; zEd0e10iqt9jr#q!*m>o@VdqaRIR||{0UX5OuY4ghL@1?Bq}ekjozZ0ck@Zz@HswcI zWTuk}#|KHpVH&W)UW3=Wa(jRUuJQbjJ(1LD3XB1;dxSRke}XVSfW+~zj95?!&+J^Y zP+|pTc^mdiQhW~zXM=;|rP(}2CzpsF7)Wcg04wW9=V12_`C`VHnalkJ)STx+MFZIb zn^;qbnDQ)Orqu*|oxz9gKv-j+M+MHs9D$VpS?>**H3exKp4Na^2qlgApDO{EA{6=y zOG_3*c+-LO2o+jB{K&#rOzk*^edAQ@i(2G42XzhQK2?OL8%=NW^J49Ax%peT(OG># zcfzxQ<8w{kZZqETzVA}`5wp=NB5R>IxQtN{9&ifDg*~tMzj3VijP`*VjR-zGxN-A9 z%VxoR6*h<<>_NRSq=_L;1yg)XtdmT`{FQud`uUxUul7n$EwH+35kbFXKTmImpS{s4 zF*KIHBQDw{cse_cC!8|Pn5HXY1R#=hBArWw*`pudu8H_NEKwr98AqwpsL&dskUWmF z9M6PPilq!HJ{l%q!sOad!wW}km9UXiIMJuBQFDU)FyLCXMwHvsf;~RQ=s6<39s_?( z=nori{y;W88f`qkr6w0b=Ngmi0?ky7UDWA&Ee9?4X|cY^_*FDU&W+Yt%GTd%G9qnr zs3-mJ9Sg@ z$VAuH6F-mo7_p*D-n6*HJMw-SyufdpYTOl_;^G~wp8s@bPp9Mg-bdzwZor(#-1(F5 zT;FGgKRau~*-M@j>#p~s65z&qz-dBgKY3x?M_xlPmFaYY8-g9rN}MH|631f*PZ?+d zry;tf%uFDWLjKr{K427vkL{2@gvhofrMKUCCbNPR2dm=#;6@@OHg#<74eanzd-<}w zt}o`39ao+CmgSe{=D>RqkfkS@SEkn=S?@}_QC)fF$(a^!v)9LNwBF5fHdb`r5??jB zf8f))CuPfdx2@V8R%d@x-An>3>qK;1Ps}Xz2~+N-YeR%XNbUQ&ML!YkG<>I7Zc}f= zoLBC`WvE!`3TL%)@TY)Kq0r4K>}p!8Q|`Wome4aQoqp$jaANwp0NU>OnrCi)SkpOH5YZZj@-T8+A(exUgM_xlJXhZGC47KO1E4R8I?-A zR%fT;PDwT`gMDK*(l2~I=430bk=ftF=*u?dq6{Z3Jg!tHyhGVYIdbo-<#U#_{--jKQ%c@Z1z^=8g3 zoBp=Sc~<4`5}W)!C`65ZML9Q5)^AN%`%A>m!g4%~5vKAq$E&2#Ua2ar+Ek)>W!YuZ zp4GPmFD$OUr|DSynQ`kW__3rydTbLi%PTu+Q&RX2x`R((v$LXvZf6k1hRLdGZ7gr8 zzSR`FGAd%@-B}C!^CQb<2ds53S>2=G)Y0)G_%mX+Omt$&57VgLF;?)hPT2tbMia^~ zc$F7=;Q@n!+QOf`+jVsfwsb)X2u*U%kTn#&$S_>xm(MI3|96TuWJJC*joZS*JTpsh zmKCI$U}iSY33SUT)MgZ6AVT{G;AoTN1kpQx5~-s!;C9LJ3f5qOW1hN7#6d0e*kf=r zM8=pVFl;I;fCxdwR8*rvQTH^TM~D6hS|C_MALNJ$MgD4j3nqolF9B0)AsXz?Kh?|s zaqGgL0DbXrEBLgcYQ0n3#V<_p5M{T>px^QD!5`$GIbb?M_iX5XQD0Y#rOs=e?hO`Z z3w@wv`0;h%$jorGHKpc(@QA=ifc=H@y!k5Co>4(KuC$VGU=cyYrwo*m{-Ii~fW-GA9la(8#4mYdJLEJg z`RTRD*iIEmK{o7sLQ9oLIh!09la=s^sqIh=b9M~>66puQf)}@yM=N}5@Mje~@Pyia zgu&`nc#7vZ{!dBPJBnxzZib`Gg6}VmShxfE0q%??F#h48ECTRe)EU^+*4h`CG7K#AQIaSl z6@G@PPOuS%3IO{jZLacbvsdlv=Crrftt70^_z+nTk*)RWsFm@p!HT#?-)P%{&W4^_ z_h7rs&xD1y_9oqzE_1+VI=nq^`jD2|aDUxKQkMlLiVRI;@|)nX^$SF&eMPgpGzO{c zXb%XGQ0!s9_#mLox1{d0 zzUU}h`Eztk?#Tmq^6To*Reg7#b?hCAa9JfEOSM`ETuSDo2H%%3-3CT_6lZr3=Yv%V z{I<(yNDW}?kD)Z?<5;eMisO;kIJHwS+LlYVAj78`0Pz8vRbOw=10#jm((qLKeDP3b z!PF7Hpy1O_NWtJ&$-|Da`zIg~3w;!GM!Pmn&K7%sE593mQ#EjF!}qLF*@S6MLz-G} ztdzRkMN_N$WfjJmM^dY+jV|!y*WHg!On6}HdtSk>piH3#JXfn z-s#7p$tuey3fNU6sWO?Ho?bin)!?)sb0z0AlewBbm$~CF9A22T%O^QJM1IKcBO{b4 zh^^1N`C2RxziHoD_0sp-5k#&lN`=UHM$b8s9%* zl_YyM?@4x5-kAqmknw5FB?Dz2@f^us@}AnW6_SVE=PBQyOvhAMPNm$`X}GD=qvm%S zQi~*7ty<|pJ}7Nh#?Gw833| zx-LAcs*2pB79mKTm`WHN$X>j=x@eWUn&BtHT&JSB%ZgKr7Vk-YH5`+ z?ne)k_C2Q6CEpIw9uy>HC3ea_PB?$KA-rza#JpfX`<#61H~O1JD~xdC9YqrZ2YdCB z-A%%8fe!c{sj2wx|U0_-hj$?i9FjzW-z7z6iv!Gj_NIXhAagb;H^_c%?J)E7EisLx~{Z zVcc$WRKpht)+<3u;*WOPlP3)^2AcFgGtdS!2Rm9}gT!zve%h&L7*5fP7pBvbGkJaL z&A+%|BkX8AMU4jpw9#95NCY?is41&4Dp=%ViA?lWVb=Zp!If z@u>i7t7|>41OH1nozR2YtE3un@Rl#J1Kr~7?I#VSZmvL-M^nQ(X$AyG%YJkXdo%(D z?xRsu))`AV1sDZkjWmVN^u$-v`~T*|8TywKrzvMRKy(IUq~~10P?7~PV@t$ zbfNgL0L3iS2WJpv;Q+;hPgD@%TYxWsdJD@AE(d&kr-2i;g(ogqUtoC4C+kwW{!!Cy zr{&_Bql^}A2K7-3*i{~Yv(8QOKk0XMKk)a zvcPj+-skC$mz~A^n{;hEgN!Yv#{1-Z2cg_Gjo@1vmh>(HTtLr7XZq=p&jr+7IF3)M~8|6!_N4)@QJF+Tc4-CuDEEI@$T%2EvJ@u#l=6g zar#s}@GV|your=A!146F?85Azp2nghj11giwFi?}$%qvJNH$6i9<|s8B`%%1M#x+B z5N||ExGG%MY%{5fqXkoOV#@9O-VX0w0$J5?)^8s~zW5rd9+Sb-bRz7igTxM)~)_D6N zeLelTSI!P>-x3zGb;F&NSKKeHI=#Yoh?zO}u}H$8rorgYHr1;+sz&KuM$3kzKetI1 zu3h?y^~C$Gx@E}g*MyCG7xdX|m+_yo;?v1Fm1z+wFGyit(btF3km~vd+)$@6@0tjO z2E{}5D3j#x@C23q(PU6S&1jLs}mhca-br5I@kjGsV0PBIbwsfaJ47(

    R>ZmBn?oUp1fWplVqfk9gN^B%SP}XN%M1Oh(6W`dsl}Dtb?Lrz zzA}mH$g^B8O&GOg+X*7^?PeN`qFxk!mQdT8B+I1IB)0Eoh6TXGq=X4>1uo2IJ6g`% zC6Gr<3L|s|eC5RYuO+J=VE(FWvE+oi`dF0l3k$Eh7S#~U&pw}SZ8komVtd7ZbCj!n zMbwj4NloIE#!W zLbU1hZ9bQ?YTPjve5foBP06)sxr(}uR`Tt*utXb$6gLVyu^0ihz^KRee+e`Z$7r+M^IrBt~8?8#S&k*$d!EM>P>(17RiN* z1Lvo1$7r2ZxHv2!u~IU{L!i((B$a2Z9a$UyezUQ)w#o{dwja2?!*bVJuiRT5Udh05 zjk?j=I^st$veB-J4@=4%?{`p>#;B!!xaKcD4+iQ5k6rBkBKoc&Jz=a-vFkBC>WGjm zCbRJQt=@(4R`=tL47NHqd+*cUkoak&H7;VTeA>P$d+*k;m7#qhTdc3e1$fz9xuYGv zhOKH{YZ@M6^GvKu=c!CN4&Qa?)#7u_TAp*m=?f&*tiuib)LG`m@kjQNyUi!&aIU#k zTxnyR85r)Y_9pE-{X(m4I{)1JVf+4|YUb&NhYbP8pRyt@o-~wSIHY|d_t~ouTb;z1 zs*^S0G^&}STgR~n=CM+J2B*0sV-1~&{Raj%x4G%Pcx!d1{-O7Ia%sU@L_?;0Vd2k7 zCp+jr1o&oe^}bL5Ndek4gZ_Kw#c-G68NQ;zgRBL%N%em$5@SGlo87}0a-?CE?{3Sr z#GPzXxj}og`kL`ctIMDmY)OCPu}vm;kEHYBOqYxtsm8oXY2}#aD7^)B!I>7WhnCZl z4YkT-opMzNc^0`%dP${+4^uP9nrfvJQae&pb6T#Nd!J5<*0^;eK|_=J;`r+52J4s=o9YaQ3f_m5>fL+grm;X; zH=1dzxL0?cV_q$?e0lH(k=}vq5^+@+_P(xa@!DKFyrZJX$depV;<@;$ z`q?#U=O22p;Z$R7bW9ez&D<(Q>B=Z*EyLe_yx!`UImxSZ>rJxMUM+ro*hk;QQ9V4# z>E@FUEyjz}k6phWPoOskYs*g17VDjrx^sI#_a*L`y3I4gv#qyIZYPwuPR!@ro7i`Q z|AC{`#*oe4t4|0SSxReB&5Dpz8$R72m1k(oiqf)6))T2Qve%E()qdpvVD8uBg%k1) z>H3Am^`%Q?H01|;Dtl}ZjaNIrjWH}OETWgz;rfrRVTs63_GO`BSY-!xdOY)LX^efT zh3=MfMmo;Nq2$Tp3pzD}LZ>>w4F1}TVuL_M_#NZUov|E;GOQC@uIYl0o5lftjidbG z1LO@xN6`NL#2UXpyxBWiVNzqoWT2Bj0w)FPFLTkFZiCpulQ58%)rf?>X~q#Xz(@X_pg8`j4AY@`_N6;VNjm zRy$4*$zKK#T<|~Fg4Ta*Mp5OkiJ`8Y5K6fy#_on!3*DYTftk%Wg2Zc12HRKIA_fNo zHhVmQd(fGihieR@vbJ%6QT#6kIXYd=5afLb+4-PBXaIS63#tIz!ULUPEpuK?K;Yrn zA)-w1pf<_ib3N)-07|g^3#7_MR$_5An(JL7_1P4 zK>L3W_Tc{&?4kaLi3+?*Km1@2Qq1T?g!Xh}fc#K|jXVVhw*1uk8FebgBFA1g9k$xR zslr-XZvjcomq-PXsgNcDPVz!f(F)504;{ZcKIHXw``x&}jk0f6OO*NRGe1X*?;z-=lNyZo{BJw*I#zi4`NgtL7|x z6S(Im9ytCYKgR}L@Q=uAxolW8n}n-#bC$D{di46aU#GT6XH<0lqg?TOiJO zieKav*RzF&&MMeOz2kUJQT6vJ&Rky3@sq=F8 zZ-mOTwQFk^-E64a_sr`IqjQ-rf`9G^qn>UdU(WIJ4H(>L%o zLDkB$bA?yIi~RV6wqh{&@vt(94^loF9prjHH=?BQ%wv^(Yjh=#f}5(Iw?qHc+)tfm zrKdDD<5!TM!a$*9e`oPMir^8b+r%~?emq*Pixs94=pYDPg$4zVY;ppB5h~Omf$#@< zFc=&RCWB2z6ynbpTB`ZFBCog%K0+@@cEH$au}8}qz0*^b4a6@G*%v%%HBWb~14e7$clqxR^#i|@jpuDDlMkgnSIko(+aV|SpqZ=U8c!PdNH z0p&AZ>8;vVuWDdx^XNQB>w*&&t{|eJvV{gB1<)4_3WO{__!*`F2jb3b%b3Qna7)Te zh*>q0PqD@d!_88`9tDqKnCG*npx-Ja|HO)-hFQP18Hxbo(4TIT6c)-0o%`mw0M z2OH);97#f_GzW(w(1%LyT*!A?xX*L}4tWEM&@b}Woa#fNe04{1sh^qGYT~Blh8P4O z;!5Uw65kAD60-`7(J(v9=Gwtnm;N~WZ5-EM^^B~nfY8ml#-x%{HFT@Ngt*r!uafU< zk5p+=c^bJe@_4RI{ju#fi5G%Hj0qQJ86M$G83QLn$k#D} zo)EM8fQT)WN8v01aWWS;qC)@wQ8t4fCB`OUQ7sV1q~i79CH)cQg79s_XfeY8!C)tB zPh1Cd^vi{wIuWLp{6PFORWRUFhCh?zQgF-B3HJ%j#`+gROU1JShUBjG%oI} zv~DhBozVDI)~8IbZ#kSV>xlO|W)+!5U`RTRMeyCWr+JZ2Lo;{+IVQI2_ve{;#F6~v z&G(<10TDeg@?KQduDwyeb55??0q&O9^q@vQOKInwJ-SLt@1 zT1bk}94-nS?pE0Rd!ab_bDcZ~=Z|z+UN!4w>rCuKZGAVM-G7k!!1r!p{Ayk8Eq1Zp zpV?Ad4$lqlFni$C>Kpof#CC1>wgju>m$C8HhxP=LtW+Ir8yxN#IUUg;osQ%En8RA3 zvZ&?e_sLls%mxj6VsPCj8D+0+!l$(+bsW2F_pD<)u-tmX(-yxx@oP6%G;=&h!clE` z-68f$<2(b2r)sq|G5!fhV_YwO5^W3_@wSV<+;U;N&zAtCtjc|);5&6fpNu+DIk~HI z*&H~Ddo`*PUdBPr7cJB;U2Sq;Gp*ZQ&d>oO+xC|UB1J~4`xzds*;y6)16+U8KdG4? zo~_XkL2R@y@`#FAwO;cEjkQgV6J*w`bUU&$73P>KwhGObGE{U#)nn+KzOU+?K zw1%ajD%Zz1l|F9tR!X~@$+Jzq5E&NpQt^OoaJ{6P#K76jXC{{S?7Mkrzm>(DH?t2n z`{C`!04%!-osL%NK!Mo&A(+c2Sfr)g%c@}g&Z4Le(OV*Bm#6g)28 zQ_+YMT@_fOE$f!({}IB2lCzUr^Sd(cvUUxJqXgbb1SZRKbF!URXCYeRBa@gwI3b_25$a6c3g%7Xur^|E1FBwWlZtv+KtIpb?ZzWS%H zmEZu^mzWPEi(#E!;i^G~r2zKTPXoQZ7bE20@OKC)UgN zjc7&wX*DmZUU$|PqxQodt$rbK*bZ_B4oXHLWgr=dx69GhfIZZASdKlWaH4*RC?VsL zQ=^^e_y3i529*2Yoq@D}jr=9j8fMx%IrSG+30?ZKtdhNJ5Vck2drUpgfjG)X;xLjF z!M$JkJbG8)ZHeks%3w$qwkov{jT7!%`I`ad@=9DkLEuCj9CA!9j4pqPmV*Ce^s6>Z z*(CT=*+l8Y3LSuy90iTDCf{PaI99{iUIoAT2U-3d;VmX!auLF!+%_2&PEt>g_!1XsKKlZ?QDAdNAW z@&Gpiejt541`>HgJ>gtAjU^QdWg1r41!6@tkc}`!0gj0g&QhrO_K&zBN3?+lpK1|f zF$Se~!hcViMzz+prs_A~Hz~DV(h`i9Ul;g4`*?hC-E(_bQqi(MDrK##TuH(f9jErz z+C|EbbOka^d55=mSx=>Zh1-m+MaV-)i}`HH*c59h(?=tby3F>~eqLPQS>Ulyh6WEe}+7 zc}d&13~Q#2+_-u_1EPRs&vA09*V~c$>8lf=G2KbOM2-oh8rDAam7Gg2GQ`c!FFLt66wfM5v<$dF- zU$^gfluT1|h_#S9b6>|qA~@{p10|VeAC*0nb4#EJIuCRHQQN3wEdrnoenbusG<1GxZZ!Ao-xnla*H>l;4N#XW@Qwg!f zTATIM=4<+_Smh$NGd{NA0)zOKVkocRa zGG}Pl_}z<3>9z=2v8MCpv~ z`drv>_5(U>jcDfiZ2Ack#a-pA4E55}=NX^ebtd(L2sHJD1qLFnZ%LDQj+5v&!ejBO z;T^%r1Lxy{@@%eeyLgqSHtZ6%ENi&!eSD-xw0cqSn;?m^M#rMoX&oQ(mpP^$L6Cb; zE1KcDd!oLMm-2C)NyN=6axJnD)gn##PYq-N7X{yWzM)T>?gxPh++DE>n?403T5_KT zdAI=n#Nav8U>VmWCaF)M0<84~P%a_)Bpt#iCe;KcxCXE^27@tEl2jRiU)LP?ECsec z3Xo=B4-E|b6fSvpgqv$tIicCl0n@)kpS{ht%Wbld=C#A^1-mWM52*#KT}t3tS=$%z zo`*;suGS&sI%iICpFB33Go?J+vs;f8-=Ng1W_%pS`aK@ilzwe+?f0+wt>X7?yu&L( zfxX)+-m#L08$hJLScv9AzXRUY-gmG^H`))CwP)%Y*x-Y~ed7@2VW|hkkAhp^1;F-r z>C6g1fj3h46AM?AIN*I0_#WhA5snrl+8gLA#t(!qAVXHjcSeC`%McnyQk&t=$f2oT zA$y<;X+J>zuDmYihNK?H-6yj3Fv z%cbj{$Ssb^_K}_S2;=8XFH<1 z-@GS(c>@{l?Hs>&&K-lU=uYDO7k@IZ{sMdd=l>w?7>!d_3FHv@PHp5(-o*IRC)<}@ zQZgxvO^JKeBJ~UkA={j+o-fUhPKM5VR~mWnN<#ed6B%m*8R?e@7;5Ep4#JKyD~^+hje}O593JpPA~C$+b;t_L%vDVU@&sr07k z+v;w*d{hT?$<#J6OfEY}f)@`t4p>CKHsgFiL}0)2L9nRA?6x6Q)Ix8EM&?PhAb#np|K+v|$h%fTqcAQB ztPIFBI&j6{eu+&7gYl{c%O{tPt#`y@>m3htxs$A;h)CyPDT+C6CxPR(IXG_rX%z;H zu`&>t0W+H_0IM)zKl{f9ssCS9Qut_mGPPdl>q+N{C1fTG6j0n@VF-a~az_i9ore7Z zp6e>83z4`fA$3!r@!aJRPDl1eLyP)4Vp-vQ9sTp~Cit zbcOMP*bwo`p!nb#+=tzDP6b<>9jxbGd=|g&Kxxdqr?bb>cck`*@3&4n_~`D^5X*+5 z4^8?u2Zo$zKgQ?!e5#zNG%uPG^L7Q9uXJLwRAxPAqs8r(mGud)Uc5P1*!10Khm}H> z^1K}m9i)AJ@i)^H_EfA3@-RE@c`>ZKuC8|P*nl`Sm296IQr&%Rz=N}U;^KhVu;~2X zm(53#VfYOmiOsFKI&^6GzyN{A0LC9kndw~TuT+NfD1$u17a$L!Q=sB~y{?$Q_u%Z^+`vf=d&t$< z)2-u?>qeZC@yA%v=oCApx)2A^H<10cr_c~eOV)*f^vFX9}j%qEd08?o7NPKZ} zc(LLU;=k?!J{77P?YE`42h>dmDraISO4;NS<-`Ex=eYxN%G2 zK(~-O3{(C>>dd0yeyDk=cr5==X5+Dp*5^b69`PvGSECU7MZw{ohSQs*b)eXvc#U(3 zc-*KP)=)JfV<9OIqg?pO9Lb4=X?GSr)FDh2%U!TayxMVGozY_cdOP>{w^<1%(zP;k z%M=KEX8mqR-)gsR#W?$e@?rJDZ{-sEL&EWw#PAhsbC%! zAFg-atU+n?O8ZNq!BeZi+nfmX!W?>5n^}00jw12nz&3teZjfh_NVbXcs>`+UH z@yREt9e5yLCcx{q8o90R#UQ{X1tCiuR`;-ZbI>t}$)GL7dN~wNfwvol6E2?WgD*y> z8*oB0;V1|p$3)c-ArJEdZb+0z=OMzOfFD1g%M7dpusVS+#sd1oLkCAsS?H-{LS-kqUtJ=*+B2_3InR94x_lD2=lX{fVr!n-*m>VC~~JFD=APJ~l$ zDv;NE3oWRN!`@HsaJQ3s!Mm6Daq$gY&5&akVR58uHsQnME5CojCjQ%k!NpMHn$OSa z!7-V*o4yqja^BU$EUQcFnrt ziuL`26XL}W{O7G-`Q%AWP+3~jP}ZFV^Q`fb(L0b5(Z>^<5MBT5M;)DRAL<2JgJW`! zrQ_;I&-nLMQZREdQhKyMcW}^gkeNy2I|gD!U^+y2o}*CSfvw8|#I|_uh&PUt^aFX1 zYbh7QnYZ;e@hoo%T}PD-Bh+Ap2Md|hL5b?;uj0ooX}~TzUkh4mMl`+wDL@FoJa)ec z|JHjobF7KB8RmC>Ep!?|kseWy6jM7}0|i9ih?ZX>7+f+le#G}PFt`LM0m;ie!CSCG zD4H%A&f~O3b!gB=gs(h~&9dw2GFOhxTJ%AKZ9cvg6;AmBU8NvKbXFchN zB7F&txwP>XvfOE7zwLafF&e+je5JfsMjS~EqpC5rOVLV$a`HD-KZ{+*Vl z*8unnn-q^#5Tj);K|lygYFS{hXbwap28@WZp`?Rw_ovq=|GCf=+;X^h5ROXfe_@Iy zT-q^@I%2P~7Rt0^P^pu~r2k(=kxD@0BmQr;cA(k z<>1O4q?PgGIkQS)_mKO@yZqTNA{idp%S&9oQx|#O?ejg&d3Yl}R;9)L6{^WJE!}yW zG~^K5Qrmo2)MT{;SNU23dw%n`d0Tu|_Z4|sClp!t4?9b?Zh83bhuVAH^(mK9QWUq* z43`M*)i>X$XFJ&-GF>`}}Y4rINsi=%-2cM@2VRG(b-nb^qf*Q{Yx$lXFn}hU5ZWaz81+^P5j$PyF%c2K^&Gmp}U)ZGDvg z*yJR$;+%ea*;Re8z*+aOVDqMs+AC)R2nHc`w^WVf=&wdTeRJqmP(D-g(Ar9kP(gc) zlEixt-A%qcS!twJr?|Jw(9mc{Xzgi&jNbmqZ#}wiBhM~UODmIEedUtgo}AvMU1}ao znT1vYmM`Ve#c6HI64!@<*0Y^V|zamP02$fK--X{sd@vuMaLziFLcq z^^uv_Xvblu5#E~~cA);MnyDN>X!<#w>*-D?lD;z%;It!0`psxhQ{A3-+OGqzvx>{h zpU3*th)VBU-O;etW0gx7k|TF2Y+>i9V~UUZw~5-Z5DE0!XL2cNs88 z_E&-6IS$M??4Y?adj;@#7=lM6>{Bov<74KULLmtZxWP_=z``JGkcYs|PhtHzC?Mg< z>^rby3ceRKMst|iHRyIB6Ozi1L<)1T0__V@CXcSvnQ(63yt;M3U^JG(Q5>g=FIg?O z>fZM&8uZNEnnlN{_VbiJw$&w^%6Yh2DeQ^X-E#kzXI=(G2T>#!*xhyiZjjo#sKqRJ zUVrHZw>@YG2iL#2Cr0^jYh2{W_0L6Ki|dPS^KCVb@U^;}1>0TouYP9q1dc`Z7H!PC2w@Xr%M=TAQYnOt}V*N~qC`nBtH3;wYcXo_vi>W*@mT*CJ=g z{Ou3g;7-y#zTFf2u-`(iqF7nNY?^awi>Yz)=hVsdYkd=MYP3oFCCz6Ms?k41Jwkr@ zpY$Y*aNe(&#}2O=9L@}HGoN%BE(p$05-7CwW}A$Dw^FKa`fTVabIZ7UGAA-|$9bhE zmD}Y)Yz!55ugQ^a3D~y9HE3;Pm)h(*x;&9evrCDK_K0{zOWCc#)-AOY$P(PWfqUL- ztn7?0G;sTH$JTX7VtS$>+OJ6wJ*w@NlqK)Pay>Ci(Zfk!J1|Vv}*vE?UQiD!N8aGo`J z8gy|sHXi(5%2+pd|C7+Jn1HB7Sz~2tbt{`4uMU4(+dmd%?qFD^ntRId&`Nvxd`gOq zY;d={RAHrk_UihRb02s)$<>C25U<8h@NVR_T-j&w?F>h3vvh!(-=xOnsdLk4I3G!_ z@LS)6)=&8X6Dbq8jlgDX!)kqqk>*jb^8srL2FGcTC;Z@eX8EE=6l>F5$nKq|Tx(H8vFFHMI>3kU$ z(|bJ%?wk;YSxG~EFy8sGNT3VZiF;=kp$0mA;QhuGFh??`Q71mX6B@$W>qLksp3PM_ zYc{?~EM2&OEKrQ=4&}PB^(U~w0`%2UxPj~kznPEVhOpKe^8>*FXa6EB%Y~o(?<-CO z_^ND!=3gR*|9u8TR3-oOZtZM8*sU#;sxv^UUVwSp#WesF@=ro_9|)TLAn?HHL4S@h z?E3{!oME#IiZ6`GH+4Yt!$QK}m{m*hJ&BmTD^mHVQvJ7o-)-`R!QTmMQpk=j(t`}r zG-&ySX3>mx6gTMW$rmccUgOHS+!GOHh)LcTrzhBi`e+q_S-;0n}nB{gw<}(*x;~D5BI@6C}n@W+L(RX&_rp1=o|M+*P z=ddH2GNu}Hj?_izlx>OI-Mz@@&{`4tu`gnFA?<5L8XUV(3ez;6;nKaR`Be28oU|CB zSflC_wW*h@er}75LO`VztOeZ>t*Usxv_{7?sO*xw&CN64xVlH<6R#!3cSVLLMjzr@ zNIfCFV!ia5TJGY}7;)loM-hS;P@DT!@`Qx}<0k>C zC!oU#86sdqO8o**pc;ud2~`n#R0B{2X~7_1II!CU$Un&44l;SRS z1^(h_?&aW34N`WByL!ISObSmgyXw5`d!F6(r*X#O+NLI%rQ(A@k&drydX9A1dTBIs z99>#m(u&$YB9cFeTK=4qMzukiRE{&hyin68VVzWpylGNy_*>nRu01~}i4#|@<$s?V zcYO5CBqYxzO(#Zek<=E&##Lxd$t%I@koK;RpP8G6)v_;Uo-*^uzTk8H0IrWR549I; zw@U2cO5+ShdT$QDOj%O8wA>o1Z<1y%b z4QhKOM5MP?|Ueln!|S^ptL+~$dPM%dT*Zp z$AP{_GBMXO-8RgcJTQmyp7CXuKaGEJI&*xovqxj$0n>P|z)RPCo@6Y1O_upE*6ej( zs_uENNE+dTGQO35;-{Ew-H!S->>%?;jfK?wd|5Q+;pf8Ne-aPhP54$nFEi^-tH#hTl1bACPz*#x=$NKK$^> zbpPg!9Vt-Y!*fD(N>*SGH&KZni zZNmLCzDX_kr@*Q|DMsn!6GTxZd=X#0@`aX^2fP7P4l9n_(IOHHH+V)2E0hHI25F?I zUodZmN>2gS7I`eYnvV(EEkKpS#90bUSnqyR?ZyGjPzzq#Ie_2;NzCCX9Cpjk_ufW8 zwhb{AquEjr=(s)Aq&;y$-3Y~31NN==4niZ0{nMZ+S&6~bn6Ds6dI7{n;<3%t-U+7_ z>z+1!I~Syqn0R-iw&4;BDc6+~)h1PSnuD^dR%V_|)1P-_?*?lZYwHcm4#D7e_F7|t z$KDtneLsYUv7JT z{MJd)Rp_OM$X>5pVhqGT&kwc4nR_Ttq$P98^b-d=7iS8@PS2teQ_P&1c+M#Qgp856pS4w}Ah5O)f z%H^Cn2*BQ6KrRv{rmWW-uooNmHyS>PbixlxekFt62|`URC(xcn z3a|PD^lgPnR~qUTCLY?%s@m~$`9)W``uw{Yhqca??V$a5oWxs`hbmTS(+)D=6tB(- z+C$iT4z*k$c*)elZGuf^Z#Xv3NjLb9M}x{n7B-!YiIUXKV=KB|Y5kN>pInlekmC&*7*DRN`7o8dM$lzwHyNj$ zH;KxjicIe0u;VcmHeZwL1Q-FW!1Wz-l(U9+6Auf=G5yU~BmqyFX-Q0a2T=_u5XW%C zu)v-eP8ITRRV_s|Y(}u;8)}*3^fWy;Yu9K@%vaXZZ?^TcEVGF9%oQDbr*mu8k5xM? zUYwaO$SYf!ny)DS`IFD5jvA9mkb=NC2T7~g3_QqG?=iIteUWGkbDsk}KG9r~^`+pew4zQ-q z_I+DxX={~QtG0?BTUQ-uhl*C@)cProYTOGURogltqM{&@qxG{`t;A8aF5<=oaYtkv z6){+gQ4xYNq6CQ;AOy%xPXG7&9_-hC->=v8zd9};$;msO{oK#U}U9$JVMWQy)u}&b1h7`ob2JXt%cF+SR?_AC?#&^s}pM*#FQTH?DJa zDS2w6*RdE7BOWueC$_V2@yQs8vr0LN$FM7tR8rAFU(~dmzrE%9IQ+y_Zsg#9@zSApms(M9_u&#NGHxChX2!A{F9D|3ith z($04>C?nb8@C(8s*5Na}G}xhL&$AFQ$)VgBqRA?suEcZcZkpG$O6x7o?U$U~R+Z(V; zD|q~Vo3nD`?J|u;$SLh`e0}xlgh~5|yJbwiWpaL%>(Nj2B5R?83fD-%K?jQ>1# zm1DJJgR<_@V=hk!{1C9Ty>|17&5o-&Yd}oHW)xB+z{AezXXNr5_I=)aljGS%b;4rq z+vkgVewub9w#*Ve?!u+{CpKzY&iRzT`FR_+;=`}XFRs|0HFnJ1_tMXIKe1P_;$X*D zla4fRIVSbP&Tbc-Z*MsxDhkCSK-0oIEikbmrtP zxs#_(pWa(Laq`6eKYzO`refvyb4T|XZHrHkbUM2B)wS7<#lc!C5C<&f9 zI&kWgoh!~~3?1kHb<6YDCrSdp-aaf4qvxYO+_|>1zI5Yj?~MH7>V@9Dd%u&_IiX7h zt1U1|-+%xfGB(0`{81q{*tPuJ1-E|5982NgSjDk+;q#B`m06Wf4l9PHuN+xhyl>E) zfM&BN#+)DUzGqA5(9p^0Tkk(O^v;>@t}c5`5xBj2`o|y59Up%pukP(vPBgssmha~e zH_W*^t)lC=8|_-Z-FCto>}S2+2s$|3bAajRdQ0nE#A$u&^59nW&q`rg=gf>>{%A5` z6>qQR-Fe)-jvsI#D`j>>iqjJj#TYgdLm(v1rc+s*UvE_;D+x${tg1pL7%J;3Y;yrRE6E`IMZ8_tPk=1ZqCXxZ1LR} zri2@Jxc6?C4f%X&dC&A;hbB$h8vVRNH{t$~h12>b1@gajIIc^3ES)|2%?$%|V?Q05 z^V`R7DL(6+xJi9?Zc)F>X{X1oTK;+Eu_^1~CoQ)%E%Rnc(;zkX$0me=WIv&?5DIS~oVQBtPN<9&S z*Mb61A{k8{t_-FjBUV82H}qv(6E2gyV&&06yL=k$F3}=mMBVTVSKG7GqI?$1hHgxr zbSdin-^b6IIj}lzOq-qqLl%`c3wwNLP;*(`snHu!g8se!yKQ+-7q#40QeDvQ#k9J7 z=KZeU#{K+paQW(som4_J-(}_1iT7>aUpJ*ZIJ`EgST`wnTVaR8slz4+vw!UK%=WP5 zl#bm4du`~k^+wj?4Ob(7oWSjNy526X8(-4*_~pb=zdGmqA|HuRMEmD2!Wm=g{rnu3 zkL&$7?fYqOzaKt3A+L1nkwstb-raj!;r3s1x}Iwl8h+!FV`*sjUP;asV*|Q`oeXML z^)-9+1MV7g=tqUKV9lo||2_7zl@&v+pSV|NZ27Wo!{nvUP6P~C(mu>1fA&X{6P;@M zew5VO{l%!_J?XE0`HAwJ!Z{^sm&`b>_UfQx+qzZ9JRVf?;El`vgLZvCwa>Yci$1Tt zaemZ@U(yaQ3OtJl?ZXkCU{%X;r7eB`?c1E|2Y>^ssakTG4zt%wts+22VX!%ny=JwHFVV(s4&g2la>Rk|%c@ znScG^mI%Iyz+a}TYI6wDjh0m&8zxC`r zke^-?GsGUv7q!2-dWm%Wt+dmx?s?;_z`r)XNE$gS6?^R8| z+oEe!t*&}a`?$@Mohv#&LltnT|EX6-y)b%JzK;9SJF1h$D;-WQCs9AsA9>Ve8SU>p zUmLgWoLw0fv9a69q9OK$HU7J=R33_cFze^Gm01PfoUhI9dM>y9=M#O*G*%vKY!f*WuyR9&#o4Efa})`ZI45#DYZ!hg;850W2fc zc`GO&O=Z0XD1(4zHiRAkg>`EV^4aXP|YMi}*jPkb0RTK_=9Z z3)d3}vUDGJi!Or)L1tl=0F{==CIZl{Cws`?3!xVxG0;Rws1vPBV9^ljQeYmM+6woW zJlD5Uj?N}Bn;*GPp8C*cISB8Ce!K*=LIL&^M8Ofai%0*;b_fw>I9?^41hN|w^BmNR zVNF~ga)OxPT=Q}UcsBZ$n_bJu@x8F>-DaEKAj2x6i78t~aSkS6DuUF!n-=Xs3wYji zEf+|j{y$Tp9tr$&eNqhey4=j!irooA!9|gmwV1N}%02rw!CzaYAgR!Pjj7OUA*&*k zCa)nEaa1n*?g{Q(Q_IV0%oBf~htZF-1$ZL8gW1G5{n3)u;Nob{tm2Rax-{zKa2k3U$wcsTmgCP8d{sR$ye;rSXA#g zhy97ItU4g4q0V#B2*{(e9uSq()++D=)EKhxxy2Y0iE4d9S}N;pg9+Ww=~B(0GYf4$-ADF^x^GF_kF;c9x1x zCdp{=`s!Yc$RLYUc^2una|1>Gv?s*$NMLoH@IK7t0BA((An}e>v2h&v8(Pq_5|fn{ zpvpc)_UvQF)hiKKoZaeM4@sC9nqhyv_o1t{^9#OBIOU&u@x#NVp+8L>Q@%ji?n*$* zd2f#YVDzQ&ua9t@w6~4j5O->^|D_IZy}iYjnD4pP!uiRIQRQiD%Lf(KAHNOnE$ocm zX4^gt#R>(6Ke3?FKOR!KN+BM17CT)lhCP>79IKQ6uxsyOKi@^hr6uOICr`2CI6e9zFhu&lYG+Z$g0yzbrt*3h3-PVCpeXkT2} zlXXR%Te6=5m)G9s)KY>Fb6c#ouFr=EEi*`CG=Fgp`-D zDA5&C$@MBK3<>CvNgGhC5?sY%<4_VT7J)We2bU2k=xZs7z`@DfO*?+2@Ql=CJ?C25 zSk`9FOjn5I-56S@G@vYlrvi(!u0y0yrlnbU#HA5jBEp<9U8YM8s+~tj?mF+*g5csv z!XZOeDXTSrI58Jl=6J$o%pxBSL#j1WWmvctT|J?`s0dcanE7^e z(Woq}>cbY!M%;{SsK{&ZDmPjBv^jQwxn=&1Sce*EnO zd&E}GcqCU~Ul=C~1C9Tg8UKU%KQrT32|casQ*9uc5xVRQlvAUDtqX7gq;9lWMd%tg z_AykKu)hO0oZQHA4k5!=IjU-+m9-uiGgek-p_k(HC~d{S58#CP!pDG;=n`T8^umT? z(I#2WmePi}c6T-aFO4Z!y&O13dRS)FJ)~wCsWo%GD0IT~SW|(K+yv@a@=RX;<%@~> z)tdtwzoSTC8HH8kc}8jr)YC$VFr&*m2!L@aY&G>-w(6CaR1?dkqerKOY9GktIOxW> zTraMshC?Smhl)^^aIFc85!IM?&`j_Wmi|r%&XEn z@nu!q+nK&=WDaAuz$wn^4Z1RTQqc9ebt^WCpMWTk4e)no!;&9U5h6j z9UJ?xT`?pd?yG-+t+ta!u5UPUi8FMbZhTmxp5?z~=cU7W=bH4d51b)8JQA!fzv=HyQq_0b(IX2rHkS@VrLogiP(DYVu?ZGy56$T?d=>Sf!^v z0_`bg+106^pKyyPgjp~!DTQDjhrTKfXQ*>{<>?5S8*yDK+`uZWXS2|Y>q3Z`hu$&M zpm-!C*iQm4C09i3{U)_OgtQhb9E$5?DkLEf)hxXMEfrD!L9RTL(=U~0lD_Uzuz+x* z)T_(*!tOFctYlUclXviyvLtslUlfaep)SGNpp;5|Y!O5wf@7;_8y1n%4y zP)#$#_x`RGp476X8zGk|%HFIpV8KT8yrz3JHL!IoIW;Y70h!A*MEZyMco7O%=@Fs{({MUr zgfozw!V#yyo27XQyr1@UeG5QE{$*cR%rwdP=b>xuUJhM*!s?5zvMT%L0Il$^7l51Z zXa$@<+Nl3mZQ>JwEx>vJUvm4RHW9i3C%n-p^rY?{>9I~t$`oGTeA_%ulvefvHFT?* z@c(SWe_-Sdd>N%82!DqKu14bx7V<8A0j~Tigp40x?s^yFNCL&A2VI6*qzZ~!VDV)} zp+9-RQ%+mHjAq(8v5dsll-AFLqNBLbQy_q?45!-7;9*Jh$fXa88T)BYH10HTgj52o zehND3;3cSCdjg@)G+dk-QjQkgoGwz-dVCvYlhWA{Qn~{<{@Dr}!jrZLvWh}ju5suM z=u0n8ZyAQ1dXbo3H%p%iZYtD;k74o0(IQR=V-UYY(-{7NQ%s)-w}$?EmX#3l@uH)j zN8%>dfJ#0H4mOku@#4}93I}j&Li#%L3U`wO7x+2|A?T|Hi()>UT8bvp{dbO>_1hZl zp)Z@y3@#TUs7;^AKlO5Y0{RJsbzRM8S%hNp9+k=?gXMsBFXUT&p%J7ep|*t=yR6~- zI7~lDrD~i2B7Bru_hN1xO9*de42xEMPq?zn*h>CgR6&|IYU}jQ9SzytrENT8Q(WCw zIa?I|7~MH>!->_UX&r;^WKYYQ@#FT)x9#6gpR@2(Prt#+PWe5CcU?APKyI3%rg~TT z=}8N@aa_@~q`FyqU3rI?-i6-pD_fs0_&8R3EI7;gLVGvfsCy_aZvF7WpCv}z9|eDk z$b4A1tSZ5$Jiac~={rJkc$YeAMQ*1aFwYJb)MeN9fq3b8rg8D*j9u(T-ZF#3(6>Z3$O@_92~uLFjno@Y zoKKjl93}J&WPv@cM2d;Bf~}dSM1AYPXJ~wCjVD+xnJSJgmzp6Ki0X^2Yj#ELh$I3h z3fIjz^bNv(a+AD+Oj3e`x)POt#lvN?2C)r4gi_FMkcpFu6pWl)M-7Bfxi3u7bH>Vs zc61D!9sm(Z#ouF{|fk#UDNhT1w7qXq7`$wXT@ zgn5`;`0!+5t57unvm8BAh7$JIdC$Uufzd+O?_KBNV6?Xh0^1|glc$8aOqPv7)ZAsy zaxb+n!XO>lGUYmf8XF8crxnF5wNKePfseqb(R@WX<^de9Gr- zF;Gbn0R499z{GNIpTA6~>|5{s3qBcsxHlTY#WT6yi{ede3t@`okk}z~7NF&HB%O7g z!UqUSOPVO!dBZ$$>bTys8N)_tphV7Sc#wMP6Vzi69ENVIxpx=-pV+C?KdJsV-Bsw`v zK1swwWspmA*Z9EFWKWP6GC`Ns_#eHcaxVx1u^I{xHVABj1c$PX$|lrY3pbkrRZEEg zsTJoyGP4CueSO(#-p50Sd~xexV`x0lBtK4_?M$U<7An!i%Tll=F5Z~O_N#BNEX#a673MO5SlXWKvpP|Fc5$l^_~V`1=*GYd_NE z4dd7WF_&^CDBi2i^Zw+bu>xTie4q8u{**dB!!W5)U#+4*4ZT~7avdoRi$-Z(cGeVP z64wmlpI|WU3Ze$D!se(odKKjYrDL;~Y9a))u2*yY8HD>%x7U;mrJJwu-z_4@SxBHjT?l>$N=f%?>#qB_CR{V%_)+E8}C# zk*))GhrF+?3`ybgF1_jeW+Brh>{!s`bFNVJi;fHX7^iDT-B8q?bq0h4#x`Bi^G|dm z|A$!gO8oG=flsf^QHS{qzNGFnaQEkGb$6!6TJ7B4zuXDlnf3k0$2H$t@*`(2K9+L$ z#P*);>dwSH>Udv09AIIrko^HtV~`>J7Kn-0mKn6f23T z8fEJE-H1D7OJh!5UGuv9mHt!e2XrdCwrSDx4-8+`PU*6+-PxRy%u3mr%!Hv>yg}pcu#Y=Sm8(nY#b^!7c=Gp} zevS+wzK&~jz`B5Eg`!4x5-S5;gL{c6j#X+s!EXBGs~$nVf4R)QUW3JDAm^lV%VVgx z@9O1B*<=8b;_&Daq|gu-iKMEYV=crhE{r8dhaYrJ5w{G&c|fV?TavfmV_@$ymWgEd zkP=~f3sW_Shy&?8E(0|e#4;-={MT4L#$u~c z+!ieJ-*9nv?OjjPv($LFNZ?s7ouzVWO9%qfoZ+xHedd zjGd?nSXmnln0l+AkqfJ)3|Jjaqk%{o7H?bXFA57dj;zF?Orjm@@Tq8G;+lMO2sJ=m zcp?P+@Z18oqb1&mqmGu=lg}&g<7xwp#qn>rAlnh@fH<65rwYK5{EPqWFU`QMJCRx z@MUBHQHWKNvAfF%g_uFwXk14cKgGALaG7_6xEe_h2dzSiQ$`k}@l5wB zj35^)A&uNKGH*YphodTF_`bMtS3EPwhcHi-vvpS32s=@_lvOSTBK>UV&6Fu z#_ucgZty&L8L0>Y8?oGRJ%o)5}m)*t6TBlA^TJoj1&y zeyghbba2Qor<%Omv$E5*eZC9q9SUux-uoWO-?+DTwemyTjxU2scZV0qu7nlM>StJ@ z98spJYvZZZ>Fy+7wJ(h75w>Lf>B2!LYC}3CU;eSEFqUoc-uB9lrf zWq5T;@?VTwv4HW<8o7FCwhgn^ghgC-D)NE${={M5Ec5I%Mc1b7I(x_OM%dlTjh5I& zS7*LEVCKgMPnwn-f4r&LE@9@!r#|@LhtD+qmbHLgd09JGlj(y5(im$Op??Qk!jXjK z7iw#g%@bq44ee1K*2cLtQrMk59gyg2UNH2lE2L8JgY+e2s5h>|i*N;r z0S4f;9x0kj*NM~#MYW4r69ghOxt98K&Q@SqBC%GHj=W^}d^|3bC{4uhk7X*AhX@_2 z8a%#^B(}vWSdqts^8MSf`}0z352J0ymt3eX-IT z`YNtaiK4a)U9wQy#}_JEWco}l%Yt7Rs!{|@<>QNr>WLwc!C83-_{QDY*U1ogy+^6t zAh=)10S71SYfV*qrdM*esg>a6%KEZJMf4R+z;e&Qyk&*>fR;f#x&buq5@|LZZ8Xu57_H?E#%I;nyQ2Zm%C+;QC zM;)vaf&vRO_!rNnAZ_yxQ2`G)3QRgD`-(cPVIS-{EHngTP41Dyn$6*B;qRiL%1M6b z(6c*?(^FOXMCiw1qP+r3Uadpn3T%D}eqO=h0oz(zSqZIqH9L$Zt4AJ<&eqUQDr+h` zo`Z3>gC!x@b0D(1CF$T_3P700SX%2&dectz`2E}mqy6U`eDLLyGLP6~^tXfsR~a!9-lJOJZ4uscVY4;&44-#AnSM_AZsI#X{J2K`?)H?9!)`ifE&FY1{*fTAs2Zw@~?wLs7AS?P4mZ4l=ZiA4)$bE#E$s03-*+BI=NLe0Royj-~CrZCs-L;|voBTLp;KE z`gc0Ehz-j8M*48yRQ zIaBLN9JdALrjkOWo_T{Ql!Rt);oKr+0t4e5mE0l97lW88PUUDcYA&}kn5=9yF=I+r zH2`1W>j|c|kB5`oCg#BvN_sR{828eRLr(T-EVqFyE~9~!*o))*#e76dgbnea=vFkb z5ht`GYN{BSD6wW)BXp4;K!~S%oZ0F5?_AWMiTcKx<)W+uh@sY!JiXNUC?C^BZ$ork zPF4jTNo!s%_+BA`6O}%%b!w-P)LQ1xg7BG_Ehqkl4xp(v;>;hkHoS zt2s0cu~4JT+59n;%xV^Rs`G1EJt4%w+Wgl|sAWW(_2$LXWwwVe{JyXq> z#k{mBTnXGjgSSG!9?e1zqNHPK0OAGE9UzU>*fXJIp*Qz@gqQ3=qf0<18i5gQbRmgg zWyRF&O)k6NZL%3&BkBbYV;hLWp@HQu6&P5Q5f?7_k#pi9SLY$RDoSuDY4RQQLY8Y; z5TD3(B6bjL8*k7qh-Y&3UrEPV2Rh7&I#c2<(~_~q0Q*AOxQufvcYX57rZ0Z3cy>Fl z?D@EIt72&YUA9Bvfg83QjRYg-hNk)@@5iOx@+=6S+|m# z1J7>Cse%?{3kNB8OCcaYh#hRJZuZ+Uw4del+y%QMtgmNhhkuuo-0S}6E6W#k%ZbP> znmTIx*p5NL(KT0J6eo}A-KI?&#XMQG`AX^SEBe``cPu&OdG}&`bDFSykKYN2uJ%84 zd82&q$4%?%0Ryjpp6y0QqQ8q@vGU_j@!R}E#i2VB3Jjn9GG$Mn@5gLEzP{TQ)$t$C z$A36{X7jwM_oqFW(&v}_6+2hdU0fFY(fLt7PhHo^_U5DyM!(%+m|t+1seG|Vli8y@ zsFkPC`KBc^y4SqxOTz6TGj;h>mt_S$3Q8&2dOhunq7VH;2fdd+Aos%ZDUk&WngmPV zyZ_mdTREvM&et?uQPjsg%)Fw;`AL@V`GaVverQXD#x8#r7169q{#2O2kC+Sb<*U0& zC6K^zLPo~k6;pM5sr(48DGYu4;896nYZ5w$7c0jaPzhg)BmC7~Th{!nZ1W+jeOlF)wVVAHFFz*g|)iL}Z^+cb;7 z>b4PkLem8qSQin5_$G)?g`0MaH(Sc|=6D*4fEgWD9x2$72_rVqYW)rvfkA{M~u;WUcTS{tJ{6c`t* z^T=wv-A!rSEfr3N5$!VxZmvDSnNb6l{1CGF@eP|tPJ|!{pAxSdf5f6g<63ATk7#fT zyB9yd1L?*tIK^{IN z1nQh?j74J4BD3N!JmANcZuBJ&V_9MVyXs2631)G-8)VE*5wP*t671 zQeEqAcaiK}>7XlQBXX}U^DaKzS{|ept&S8GhT_5~BC=cWHVBW=+k}W$QzS$%4DFw& z(ScyQM1y34nDDiOhQ$DcP=wZcIXo4}#IF7Zr?=Y0V6!xhI?3^Y_eE99o7fk>^y%4* zaF67Kt8;#KUf2hLnPaLt{22QvDZZMRJXP$z5sTh#Q0D-Ejq*TgPLtDW!#AstY zBT9x8XFQ>*#U1c07s*2&BLqgIAe`WIflVftj@Xx#d76#7NSc)8^~Bc`lNT^BO2LhE zKF}e=8Nh5s^`gC8%q7e0hw!)%LgCR6gkFdck-od5&q17 zM0}+%mt2D47EJjn3o0*cam^vF$Wi5Jb%QiLmOFCH;`dt|1bjOuidvY8sEe z8UQCiJmZmdA}z+myl;J#-N!NZemIl0hEGCkFx5%1-mE0Kc} z04Op}IaG;eb5uy_;4qoIgNW!r1v$asWs6ZToo9NjKd7DZfsnC5NGCr=!wrUKMvj1| zM}#$BQgksnMK^C1NruJ=45fq`Uk37$Fac7MR;RkHN1)yux;~?%^g${4$~;7+Cl!;& zsdAlYyg-1`C!}XOSt2g!GOUe=!DNk~Vi}54#D&pJm0?gsEz`nm1)kZ&Cy=e6LoxLulp4oR}`_R74 zBMj3Pc{U7dw(!KlV>{2BD9sBC9X@YyVCOmdW*m4E1odckZdSvdY&c;91>e$7=$W-pwUa5}Q0%kY`0>V!!L zx+e~*A980|{?uoSr+#px&D4l@bKZM9rnukt#j*(5eBr^!9#x&bT(kBdGkkB=qQTOtjs{U$Ll^9C6_7xLr~|+p0T?EeGyf)bgXl z!)?Ni->U;u+Yh`bl2ttWY4OVA)yIyF*(6ELSyG}49gLI~j#s>!u6k;68m7mUb zs6P|1%TTzF_Z_R{Oo&)uZ#?yT5DGf=xL;=lrJmDBPG(@kYd) zMK@o(&rBE*JYh>N+Ss=a8Pl`tk|{#)MrWrk&l1Dw7SoL-c* z@QXbP1>sVFhlohcsyx%OF>=W2{%EZi0doP&IqXtps5j7wVggq(er7yToHDNS&I zs&N~DP$Q&EpJQB4EL)fbrKt3N595c){%8tU!Qgby(RZ3@kd4xz(fg!OY2Qq5-t1T} zXAROYvNG5vrCeLj3<~|l<8(mH@NO!v13`I}G{2>i(({B_Kv#3cuO32t6Xlj9EBOGv z{3;^5MT%p|8i1Y2Fdf*?)v4z^^%{!x(VGBFQ8uc9pE9oFQDmkS2+RVHJ)W^pUegIZ z8#)8cL-ulwH4*$`Hd!PP7Sd}lB+!-s`?6VUfQB~HG9Ly_48~8x=s1DCa3C@q>rp@_pw6dX`CNK- z==j#jh9RdH%vCzNOFQ3gKWTEn9Ba+sw(pITbemS3oH#jU>8x4h{yNRY-HUhf(>j$q z4-ICjL!6&<4Bl^0FWBY(+kooTz0o3odDC-?eXIz(^ci$*w&J0*a!$>#=PgjwvXoG| zgh&S0D@dv53hBiA30;mp5u|GEEId9U%)lsd8lBQ+r)2aLr%e%gm~>-fo;C=(jik>I z?#-xlGI=H$aP?8ZhH}hiIZN7cMj?yikw63x)0p&`SuH4Ou10JkgGf}>5>DTeHjcq# z6z6%pN&EQK(1U z0$+?kzuoOiysiuiQc1(3Vo?p%AfFvB41xM$e^@3U1H#FCGz4r zM2g9R!(3j#8vIFJ0wHl$w-1{(c;|?Lk8&;p(oHM6wqfM#oUIzua1Mbh;|(+f@W|*j z!FVNk;^dp+TsmP1R~AsI2hO$LEK^;1IhStyKf#ehtMDn@*!MCD>3b@Z7?XatFbW^cZ-K5ES@nU2ZA3*m7;)g z>vlM=XL8TxtS+;*Omkb31(N)C3v@Xjewj$6UBEB>^8<2am%1V7{sb!)= zt@Ba?fEz0W?Z?LH3p|+OGSFR#okyMdj!aU~qRwz8b8xjZ(_-BA>oxuvTTk4qh#b&R({%WBMb3lU?`@L*oK*T% z@JHkPmfd`E>)JcPzkYO3xO-^y;q9dhJMUcB>(kfPXk2{I4j+^b9I*;Sctxzxg~DK< z&K!l+pg|8}l7)iIN=$(?;vG2%ujr9DH_aUi>4p>*gdjEfOek>?x&Vnlsg!i_)VlO0 z@=FRDxD8^>U158XUom_xURO_eltI#2Ph+R|Vcq6{=+fhemz6@CrZ}-rPoR{45N~{w_WOp0c>XBGZf;`y4#&`x-4fhY6WsnoqunrHd z>t}1%iAn?$8sK@zXAZ@}TrbckP{-7)#2TrQrQ#ghWOj;`ovlbRtVMYTHN|Lae2(gq z)(%aax+IWmMqy`#M{mldQ98RHCrL(hoYo-MG^QbOk<}THA!cZ^A_S2$3F08VUIvBf zD~6OUjDe$u)K%Q`8MgGAC#;l6w>;FIE%vohvpCv2_*K2~g^$icsDP$pX_eDgntFk6 zV5_}YOW_le%nt`jg@`>2WO7iuGgFB|!upqC8xW76A+oDwOk3oHylj$awMr2UvytmU z4W<$CT^W_~zAn3~Na08#N?K;Kdx{`TiDj5(6bAZ3SvZK%F3f8% zc@mERsl>g^GZ~0`ujm{?4NCyZgtNUklI~p3vp)~EB8lzkTa#(=6BjmnY}&yn{MXUWYz@6#o>NN-+T|F&<)`=gtWe_Q{P5cMQ|X|F+v$L@wb=2y;8wBl|Z zJ;L6(&pif?McG%SE*yJA_`gLZVS+#YgKqtsxFmtpf*i}j?|NPGxF8<$UhSP5 zUPqioEQVZ-5U0u#M3~ql*drHjRuTh66moO@BLGDr_fI?s!56RiQt)0CTxeu<2wmaM z!%6Ikh!L0&&6O%7;Wfeta&@zPwSEW&=?Q5;ivzF)=BCz~rxT09UxEFSdQ@) z4ndwsHndqj3hG~Ii`Y9Mt}DPtCq}Eq?j=^fpsc`E%ihu`>26WkX9WLIhYXTnI$UO% z+*D{fEf3nyI5t}-*QCPewLT#=qGAjnBaYRJXa<$Qw?mee=B3l(;2dR^)6{T=K-rm$ z0?Q%y-3ap65A7ppvi49W0V0X2QnPolH=IOV3JDeJO`HOFQJVYF5yw!>KHy5T>T&c< ziJ19GID*J#0g9l+``-qDP%$wwqfk;-=Ie;mFjAHH(mXG#sn_Juhoty(PzBym8h2h!M$R*LClat52(=}zAY`)iAKTCI!r&|%iUz1(n=5(2<1Hy zpkZCig(Qf`OGsKs2bT6tATh%@wlj<~y16Q@Y`;L{k=dbi+@rcjbqu1pmB5Prf2<`J zR;UvAXc`b{isJWTVYJZ;ZA%3HH6nuAu@t8V$bcFfSWiww0STSwQfmF060*&ZsoLQW zHxLyfo9I&#(HzS4)T>i<= z-)(ueB&zG#JI$7qej*uc=F`pyKa`FMyZia@o#S8gCfBMehMjmm@3(!y`LpG<2iWYg zp_drIQ1(Q7FE$K~Yv;`h9Ub>SX`;XV;gA2qhnmS&$#H-c?tkOlW107jC*P4<#DC!a z=+jP3FW4@P@4LDGFQ&;M7u8e!wtY7+qT$v^^ZRQO@`@Y!U#jeMY4pwRAM|@K;n>PY z+`vb1vN&H&hiQpN*7tOe2(JI2a=^1Q(=X@E`kEbApqziGP5tZto~Mv@?Q5?bf8Ajy zKCt_K$J6m^eCJq4*5)qB$V&(cP8#etAS5qk_y<$FPW+?EJJ-MO`LC#7T^FTozI)pu z`QX!>qvig`9!|e}FSO{=oNdE>wVosEI*mMXVp>hX*dcq8zh_Qu87_Pk^sfnuZ5?0J zqu=^dn%c$?Nc71?&VV{)M(jt0=aB4*pufo&YhU zsT5HbW`rB`Vq^$JUrmYn_y3#P++uJWZa*=6F`UY#8Uw{!ijvBKXCe^=Y^~{%VMdhW~E%}OK-h8 z-hocXkwQE4i?izP%|asBOC*fmt;zF7u#A)%bNo$#)dO5WdKBOwa)`jNbfO4Knezi0 z!i0GPC27zwUz9%S{5Hozl#Lv-`^e6K&*7fUG8%$XG~non9~^(#V{y^18cbUgD! zVytD4@kDWCfM?C83ZFWSEnR8{qL z)s(0YHvQVG+l{J{3uA@pR|9T6+rDSksDZYJH?sX_ySSChHow-(`fhfIL&dA!7cVlUq1g+4+mZGm*#H zh<153(|42>U;1vjbgP(L(heQh_VT?)*V|lde!S~@jFJ6pnPkuNo3a0mdNPw^Ym~Xv z{`^Cn9q_k2{@>nkT<_^6amo&8FE3?(pML6-R+m@JpFHQX@9kNAzWcb%%6>dbrDQR-Fj9KHN?hLuGIogQ=RbFZ< z!kGI-rkwVKTG2XIf-eDXpk**&g~yGGc{N z1=jT>0P62YB*7uhnkp#kK82o3|H97Zp>LOk9spoj#XFp8HX)h@J6R^gBGdzKPec)p zj7O+V4Eos+tPWDbZN~YB7C}NH@MhUDXfI;24 zsF@sGyk`M9^V7(}Nj)qLj*ybAaYS5_{3pbvDEk~nMI&ON)`*aKBB3VKSD0z{3c#g| z%IA&U{&iNh@kOv(BX$YlEgn5eWoh-19ftcBKzGTF!?L!o<@CN-)M`jKAajG13jDGH zQ4#bzu?G>QZGpIq7FCZb5+*h~xiM2O7Ugj!qWiDld_}Si3Pd5eZ zTKMg#vQ7OLcHIS}XRB6YhorsJ);O=LW9ane7#Ln*!di>;cPsEtEnDgMl)%|v0iBDCR zd-4C9N+-lsO3st8522aHmf!y<@mB2A59zUJW!RmPj8&PngS_|8uPS|{tF89B3NK z_B39eQP74e9bj~V)*7SZh&~+CJ`534;xdO4{8>$N5Gm$dUJv{^zF05OctDcqO(i2= z#U&ZMSIV-y5j56@x9Mn5D+ZF=9!lP?a_BG~fu(aYjTmCBj~hfdkgEnOdm{8>>3b@@ zuRvBq$x}(-4O(9b^b_?T0V*)oJ3M5|r_tCk92^rzQ$Ho7M`=fgU0jR zM0nfOKsMVG*@D23#v&1|168_+4ww1h(P>6F_N|e(OQ1Cx9H1QWWC2ak7da6APh-6) zTk0=lCHT5IP{>NQj2Ln>6v#g!~vob-@>i%FvY5rw1KBt&20 z+XWI@LsbG|Fc9xFVqL;xijglh3{0eEzrq6ti8^H^d^=VQt0Ap$*7r$~SRP)qN@)F^ z=U91-zj>qZO`P}gqpL@fKd+7oZ?I0>HvQt&qV5|atJaSQ zd%AwY_QJ}!dxsjszHu$sx8MS2iDym(Kb`E57x=}stA4Lz-SIogyH{Kte~tT^`P{?p ze(E&lbW#`ETSs-ansJVQv+(}UKm4Bn&;R+@WJ$eRm^Fp_T~-z@|9rmTB>O0#Qfla6 zK6HNh*cQDj79Twl@6ON9-?`)DkA3FPn|JPPaPv{Mn%BQqF#Rud3tS%mZe6BrW$3m3 zTZC@@ZHHAp*DunsAB}i3>0d<^57Ux&{HuxU-@h@+L(YJvPNr{W=%YR>hqu_4GxxKG z0nxvwbib_Xu;Z34@6OmzMb3oZ8}cs>xOm}|WZd-86I%!Oi8%HA#gw(dsrNql=7Uka zMhvsQ=oGc!ks<2H55s(N61sQ}dSllx%)B8C^6rIR znTt-Mr9ADfgz_g;dPP%iBDq_g!OI6Ki0G0fLmD;W>d(32&{VEmtc#M_dU&}?YRZ7z zrAY=;OwIAOdVt+Q z!osyUlDH?V19^`@r*$k{M=ru_DsyOT6$$DdBCLw8QYD#6rCn7k&{DkFoCM?F2&<*D z*EmH597Z2%_@J&Sj>X1Rgzp7dv#Lfwp#rkowESfeK`g3qboIFz;B}o_?=E}ACHPWy zrqx?!bapY5C(y#qfB(_s_fnd`DWa8~e^1^FMe=6(f08%%Ab&SU)H3Gk64nt}fmF-+ zlT3l|Pe39VmS+XXolIKRxdE}uN+d6g6a}6J5dirnZM5A49LhQ|#tDP2(i;>{G)gO+ z-x|ysrh@8`2XBWC3^563#U%7*LC%{Y6*|#W#g(RY&?yWyM;RQ(KI}z%8kGX(D{R@I zOI{qvQ$e3FjwWbC1P)&$4`wC`e$@HJsUcA6HP;d8nU710b}1`k=@S&rHVzLr9>864 zEnJbW9XpVmq_T;bjCC@VPT)bw2lZ}*)e#`1srax<(DYF1q6C#Dd1Q?!Vorh6+`==7 zL+M9kc9bX)N}|dlOFR~|MHs;s>b)Dt$`PhTr3k46O;KQD7oaSNAmr*k1xSv3QvWpD zL67h>@{!ybWCO%r-<%R%*Elh(Jf3UBseu!sZ9S>?xGe|UQHfVGbLg8cWBHCSZA&tElkSiP`( z&B~iaF>gNIwSB0S-}~dDMIYV%_|Wl$;~9tdEL`($eCp;ko4-B3uvrVk!;wjtq~40T zktx5@MjPyI`MW#$Uf(w^44)p9xhZJ=-Tkk}^|tyI4rx6FTulAMVxbu>U)6H5t@o(BxzBm#?b-(Y%cMo4EbIfS&&&Wyv3AG2D&47&Wv1!2HZb z?62IYYF)>eM=_fMx!Zx=KibfC-}knNX)BK0T)AEo-2T|W<`;S;elh##gU)ZJzBRV% z`Ek3ZBup=lb89v(u}fSz?AOYhM>cs+Kl3sT8Nr^CixUK^IxKHkXXb2x@tP3)(0XFN z8?!J{TOVY?z!%AYh=IL`n;1(Hd`W=9iyAe~27Yj=Uxfrn_C^Fif z1){RXTf(!=TG6HU_#G_09DX=4&upU_B zsz+gg^aSWxdRPjPe+-@%U1QZ?%3M z0)de6Ayf^dvw%GpKop1zg#d>YLAj)WZ~$XgaRfb6P$sS2s&ekr4`eMJ8tg)YTVEVm z)5E>xGM9_iP9$WB(I_bL9Qa2Qqo6))Z_~h<%8Jqlm82a}I5%FH57)lORIjAdKS{}d zbGL-uUAziLN;=}{g<#}gk{Btjas^u+?Ak1_XiX=8GjXpcJRfl)hwl=L(lm>`zZtJZNBnTP}`KzlQb{7bZ=5LM&m#`EBNz4N&ys{Xb3IAvk(3rQ&1jWrV zTF4Z2EEF$jOc-EFMU~Rojx~s;uO2<46y%D!B*duUh?g_iFo@_(G}3vE3N8x`xrKD1 zZ9#=0sF%gVR#Tv24Zb^-6uf4U%R`*P4FelbOT$t5k$4YU;E;#AymIxWYQe9uI!t0i z!8`qa>AjW+K|;)hb9nqJB&ukP5}-LXQA`;``GOWhEMEC8UhM4RQP_)@Yuq$s$)$7Y zNRIx|BnZb0Xy7}-$1Bab+|~|0hNRI?`Asr^%eFUzzB;++b)WgwS4VEKx3rZ+UA#YK zbVAXPhz&pIzx!HD*YJ0~+CF96d*kCHi~VhPMyvYn-PYN2yRK=)8eaBRBHDzsu9+VB z_!{Db+f{qm4-uG@PL-}h3~2QZC$~oSi0k;pkH0>=_hjoc^{%?phm#I#ZPWf}a(i-K zaB4tl*^EwcZT18oOX#&|d7nGO6iG=(gBLuR_DT2Z)Zz&H`LNmTTd&O=bL0ob1?|I! zPV1+IkA|rqXD^P(*fhwwqe23?eC~dZE#yJwKPSpdiL$^k{rQf6!fF1Gq#YHcH4WWd zT(TTy zL~K}z3QAFk)X*a$1VlsuX#pZcdJQf8`aAE9yWh^v%(icT-#@!UOm2P8^PcjY=QJoT zTCr?4ZLVH;aCjtt^Ruvn>lH63UN!K3jXk9IwsPr(l*T0uZDT7LMXrubQ_^#uNya~4 zl%3((7M-@aHL|_!d4T4Tx<`74my6O4#;qt*cil3xqt-WaE%to{!tmeTK&>KNZS#SX(z@gLx+0hV?wSU!0B>9 zy&Ci1G|K}B)4c$F1J{Fmn-&`S^xLJWXjR(l^_3HQ)URDil8ATvtpAm@nX z;r0M7zYV_JwvF{t9dIXO` z{u&{_372gSf4B;pa>S6VgnvU=?2f{x)vySO1pf_4OHRTDUK^n04AZDVhioX(Sqr;A z$U9oM3Q@+z<}A66HB<&)jzXtRoeCZuU0W5eHz! z>^LX3g|-rXwD4Jju*lG(zGvfAk46eb_Azg*Bm}7iT!m-#q7f;_DL% zu#H(h__oq&d{!v8fF;`1!DxK&`J!@-$CEF;?ujS(q9xrOdh3#Q_s^drnEr`TrM)X> zY@&p8vS7}NZQ*A33li@-Px$rui!i@)x3Lhf^v-#w?N&j)VvJ5dt#`WWk;3#PU#6Cx zQk!glrH~obPny#xq8rAptfYp8{uL%+ef<_U|L}t!f5O`Q9hjmIz5>5+6{(S1LHYQI zH=?oC=W|NUw8Qn6H?_8O6-Gw{N2dwmqN4UMcoF&V;SBp@Rg#Buq-5PqQJO_2v!AF* zK3M4<(ye4ZNVfi-y7m5e73><89qDAz9yBZ{kZG2tRZ_BT{~5L>_gxNbKWqA?iw1h* zx_qB>&}f-aEIkY6V64eeH;T2RUMC|xxo+pQuH_=VX$|`{=eWNtI2^w_-eixF_4eKp z%bjLZjP-9BX|6SQt5{~ce#+O33r}4m)k>wj3(D)Wi+3~@B_`i4bkJ+PJ5EV7QZ(VF zcect1N-2o^DhU|We!5h}9jZ*gW&$IW>v(f5Akc;wf&jEQ7P;P0v56}$xkE!apF*U> zyM?u}5E&krMMtX~f6JGV-#b%@geV3RScPcOaiQJ=Zig886ShoX<>W%B3%&Ws5CCg^ z1_(#z84mw#-Y&$$pu_;n)&YBg2swzgkG>VahwgP`z5qQFK>A<4jMI@RWYOE5a#`Pf z;oT3ULR%&n2EsxH@R|@_$|FA*GXQq^^rs(%Rls7MD@9kwcmeXQhmc=$80{xqXjl5# zstnGhAGG-Q5lvCuvTod%;2}_WpmZ+XA{~QHf|}heQL{TLySoEiiUceuIQ?n%(^#JU zOea{H7$Hc~^(o?iGM|1+K^LDTZ|$VYsM#7)5HK1*bJ`$8C9-MADTf&#eEcy^B}(7z zKzSh54-6&3(>ylF>a`MR2+p{_L@8eifd%mz-h+f8B;exU_ppURA{DoEX9Z&h9(An1_vil9X9S@63qOSvo#Fq z0$ZFN z;S=v_Szv$mZlXucQI)+$YQfPFPuZV$losu=rdV6TP}iMbN-V;P_w2FI4+zc+u&KQm zsZR4$U$EFrq3y%#j>v#*j}=yI=~eNWiroz9Jrpi9h(D2K?j6W^W7gaJre}q*|Jx&W zTWIXgyZ0~iB00Mqrr4M%Kk-X#Q6b;hdwJsL(zv|0d&W7J8+mg+M!4L4y_hSjcve7a zxvmchZ@;(aLc6zaeViT_TQxG&b%ZDndrH3KB+ZwsajG(@)Oe=zhZy%eGUjhSp#1m; zw9Vgq^REYwp-LA_5*g<9*}abT-O)dSvq@xKw${zOp;CFzV*5RHwf6o&r&0$$-h6*? zYgbP79em51i8m}NjK1fs$hW;zawFB~{->%nZ!$0eMeQK{ExY)81mDx!Hfe01YQD}I zeUHgLE_S36WfwaAVMX!u5n;{i)z2EK-z=Jyvv@JTaPrkJ1(UDls_Lp8oMAKl*Y(pB zY0es-QrZ?h+hsI*nQpIvofL}I);?I2*w?2!dH|;NlIuKp@<4`CAsvOpp-^aMgG2V6 zkFyEW;(|ftv0h}|BQS^64#l28jL0c&cs~n^1r=ktWkCk=r|w?2fcpqHyomOob~uC9 zfS4e_p$N*}cPY34@|t>g3=m0Z$Oh7&R0+|K%&ZvYzF_-*50xmy5<&KX;;4u~pnaqB zLyC#0*4tn-$iA^axR`}H{&Lws1o8C^Ayd$B^~?c4Z9D}^3QXcR4QrTWK8wh9LaKi< z7#`uog3t0E_&pd6j*t#cNhS?C*HKymV~FJS5YJ}fVd(N&`++ls*C5<D-?veQ*bBVAwAJf;9~}mXPJc-_r#w zHsQ>p%x7LFFeTA_QEtPAQYSC?0*~uFlAs{um$^Jlz?JiZfQPR}CyEf=e4GjHcnmy# z0%(*3v1AZ41n0}w25=$tv_n5U0|t5>fE3m=5FGJs=Z3%q90JHg0Fnkf5DXLC%jDI8 z{C73v|01N8Ftx?U3)iL!@{kZX@&y~9ZdK`o{u?~mpNd031A_<9Pn4{o-AYITF)m`W zoB-VP9uQ?BvaK|bGR~3`$@s!pHmH5mTjX+v&^dk&zaq6JlrX&LC=)I-#>3=mB@4RE z<)i^XDjz&4g?Kjb$QaO6MIbD^O$a2&JOTzmpcR0dLGZE!(tvNhkmiq&-?R@lz(Bh* zk?tbmAcchC)^Udwb}aeGKChr~YaedV&KP2`zFbJ|q0_&6*Xo)j8M=D2swd{uOnH-g zzs2xz?V9MbddyjSCR^~*w|Uqt8djQHmGn8q+hB6k*hg+^f)!B(TPE@jhfis5&M&I~HJj_4FvTk@1Ct$UVUXGjI?))I*N^`OnI~e;U1>ZZ+{9$_nCvkZm z$6aIRVtY#nvZrlUq>s5D8DiUZaeBrbSL67Ps-xm3mTc93^f9~KAQU$*n|_UUAOFS2 zq~6eud3DN=zD+r=-q$WJWnB*d1b?Z>;KK}~7?)zEgvuU3lgHb;wziQ`zqA8e85th8 zLkSp(Cc-*`Jps)td|(qJMs)?&VaDQl6KXUS5XZF36d}93T?v6lZZ`-k4=~_15ZMl7 z>PgUu{Oixki;xRlc2m(2_QHm2y$`GdBN!R(LNEpJr+kP_71q5M=wXVj2IVL7W${GJ z&qSEp-C7J;QFEdOf`aSMq_)jdfp=zz{BhDF=p1Ir1&Q4e=s{y(?#QSVf2Pj{9AU<-%!n${-l}{UEQceO#-W3sz?7bs49h5 zz($I3ESS*4l1H2rUO(bMXZoV&4gMCF1Xk(UjIPH89OgsCEk_(Ayj9$oZupy3)W z^9F~Avnyd)WMCjNEYDE5zMYoIAhr$|!ZJ-tFP8Wk%aHF3GclARD&!Y~_-V`%v~fTz z4<+y{DT#m-W&^iAn?$@NmHYmr9;07e2^1%$ys?UnuOb7%lYrD75Tk)tMTvq(O(aj!$-QInjjkSPF@b%|rh8=% zZ_hCm$~b)PbLO}iL7uuH#>bSBy_QbfeWCukzZQ!j(m$x# zj?Z;7tUp$8=)~Mx(HJegRCkYhVba-!!&liW?mKp>k>6R}d`z-sWZs@-cXk$0R`k+W z#J2w$m*MHSU=3(8DfE#_NLSBEjXsVneBd_pSdq^$dc$?E^U`5r&xN>&@&di`Z;;UA z0h9siH;=iI$inxzR_z+X4ggLVhk!FoaLef!393QnOLh3>2ifm7=y4IB6ZzO z>P{t2fSS?|n-e7x7i_9Bmg!55kQWvjbip{e{MF>%rRXkT*-pZQ6@IKv;7LKIbpnApM&SFJgVRNj`e09~%Y}gy^wt6N z0APs5c|$ru33L~c=tZDJW&gA0@#-R0XEKZw327_h;Xw6@A>k1w4j{)D%c$~m`Hwt)9phYATSHwZ$DGrS%g+nI;ao9Z+(fnO}p5t2GoE$p(P)Vdq!)3_04As zVz?;5k<;}FULWAr$T%Bm*p<9SGJbi73Pg8hGtOaVW6^ z%M?pNk!cL6op8m#`QqX4-lCg~!^zz`@C%|K1`3rF(U=o>llM1Kc7g%+eOAO%y`e64 zKNO1afR8#S-R{jyB2!u--yPDNRNC_T^)}(52_dVUkLuen>_ZyW{Y23uVV|#2anz&` zUFYl`!MJzi@`kIJQrI$l>3X3@Xt%#B=0r0J`ZqIX2%moQlYhn|{B5B(6PY7g(}9+CU(Rd}T9ysc>y zN5{Vzwsvd@r%<^kb^p!_!<>d4QH^f7rN*9n<;I0!s>76j^|kT-!g?~T*Nux6IwxuB zR8Z^^yb|iUhnuPmlejClEU{u8Y&uo%nW~o%_iAFOn#qH(<))RMttNrmL04Dgf4y0r zJC;*;fIWV|aqfeQT?^KRoIfPB?;Rjrl3ty^sA=5g!PK#X-=1XBs&~-e`PyER`RlGa z2}MFFz?k{rP(K4N+FK^6RMsPih2V?>+a;wHOrM0ZS9m51MgkDb3@|Ti*m_AuL|kAk zW5OP{16D5;z5ELQ0g^eJWDbr3+A7_Phk`m5m>`M;ZIx-TvMUL*g!~KO5L$+>wd`b= z2EIsUg5D2oprk>Pxtv=7XDov{g+$JV!#XgIjPOKQAhAn>S!l2dW78p31t$wYUXqVz zvkY7iPx;W+3JI4CZLw^*a!IrF98b)l%M}Ab-Uo|$%YytjT%#Mbg@9U>7cApgEtvQK zwarK0x~Gfl2s8?5ZY%lVZzimjDnsd(ZFuUmN>(e0bnpl_4rgd z^BuZ!q&-iOB18nZjy#R8q9PRDp0O zO;An@nsl|d?t}GX^_LA{AFKlw!4JqV!!IFW8)9=Ll3F#sy0hg1NfeCqgb{I1_QVt@L< z=R-BM+U1lvdQ5K@#@W--y|VTtx!J``rd!!Z_QJ3NyT)6ZSJeYfotyI-X8PPM>-qY* zyrf{9&G6F`c3TuE^Eb80l0FW)PdLEYyvs#<*f~<)gp1=xW=FQB9uDxRn{jiM>4Np& zOeiatHp!$=H6)Y!N^ zulIcu#b9Hwn<81Jg$}T-Fp$4ieV?hQCy-u8{1s}HAzEBOrV{rR$dhK}TslM2PKrSu z8P6Ac!Q#l4{0ut>VLyj15yDIkz+!_1mo*oyv2Ll^4~6gW5zMYZ&;qO6wg$%_T>42P z<=qBLgRdhH1W}hF76Ud=w9VUaWxiyNsv*l9?AaBjxFENRh%X?2;|cf}0W)IJ_aNm3 z@hYFGM!*>Kp#q6Z3E)c^oiBZ#4~##_LznzzC=DDR@Ou!Z;ThJTzs8iaff>kCT+ zQB^p+5(CodV9UtrDYPQsmf?%gy%8jro8%HfQ6N^#Y~}Jvpr-@z^}iqjncP{cuOt*E z0DRZnH7C3`9F5&6{E2!(^DTuGSsTv}hM&t7%R!4$32xmB;kp<880{CaYo;|r8j(k& z2vSiJTbYl`2_or$*X{5Vj38v%SOccx=e5s4cmgu8;adyDc$}c z$iyH3Epq@a01{*9$uroX5yz14E$(>rH%P1g^vbhrUp!mSRc1_*!&AbgI z%byNar{8S%g{2+>%oACT_d%by-h`%?-1m;O;H!7`e@bc-4YVJUzzGF)W^27jgcZ!S=8CTZ1ur{{ayG;ZIoqGLP?10n}xxyXDpa_x#Y< zx+hw-YnLij8XT`&bMB2-g#Gb3Cl@Y?{C?!&=zw$e9jTW7X<9$M);|YF7c>qWhF-#&ym?tR1@?+(i1lrhE28Z%iodb#<(r`$|K#m(3gDr6B@T8cZGGbX%$#U8s3#m1M@erVh=8{R} z1r5Nf0W|UzxhZMDQEl!6Mjf_|@HcV53@8c^DY@7zfH@_|YomTI98<=w5yd_b$*o4) ze)|O+NYoONXFDatRvZ{)J^)2XMKMi)(%|lp(t)V~@>($}6Z}ODTzf8U50$4jjhA@W)(4MXtOEe}&{DIB`rMOwDi)Vq;C%0-C7D)#LbkXGn+u;Ku z!h^Bl1Eahim-8>hPQ|5thvdpv5YgJ<5}CZE(jU2QxiL`vB$`Pm9gqO?0Cx&K@(e?; zQ3pG$hed2x*iI@y{a*ySrKf-qswC#3TxM}>CoT|zPfnz&z#XlCl1l_Say}HnxkCsn zf&on83Tcl4Y%uj09EdFw5b0NUsSjiYuC0drAn~37!%>o;<1|&SY~zl<<3Z?6C!`|~ ze`qz4RCC2d)4^RQl8f%Za1;Oq1f3Ba$N(q;HxY=<0{I8?9y|hk{aRP(IycT@$wyZJ z5gM|=_C7@OEWYdeM;RJ5d5V|+P|%=%r+y_BCMaF+QvHgLtNx*|EME9Bfa&p?;-0AI`)Ho| zPV-wF8}s2u7f%^F$J%IbS*pIYWszos((n}}y9#$sG1dO)UFwvfo6LOebwXdC`7QW$hE>J(L+H;*5QQ)H()!@6~Jcacp#6CE8XH>5l*rK*&XV~4Lo8DbgzGyJAy?LRu z5%7Xxhb=wbWSyS2YjO8c>Do_6_m{5j@7$l7wt}g3YqBsitTKK>Z{bZ&LZQW!)k~dP zf;6u^IB7q1=F5mvRrGtQ(JJ+O%bS9`W}oTxbXwHcw@4HaP_mqxde$r>^Xq-B!ydF% zBGQU1|H2CcdLr6D0n|59{5QC?Wg!eKT@7|j8X%ky7GNR+7AK_#`47NW5@Y#USqKDy z6#`9W-3QSkh4o!ZWcp*XSlgH4Ni z*2xC=gE*PcVEG~qLi;)e`uP!HLS%!4z%Cqe3Oj=YJ1kQ^xht@j4`pIWO)=XYcz$y zP$ic5lK~uR)Xq&M^1WS#VSR^zTWOBoWFO2zs(^MFbo4F|RfCCZ`~f01M=Qge{oTjV z4=o1xBcBE{>j^YLuVr#;B8`fYvO#GTtJZ6Z?2zZ zBa#%~v6@dgY4kp2?@Hz*RXd!y8gn~EYU&Xul4dFn`FdNT-oj=eXS)tr9NH(45&kbf zVEy=aICcLRYE4BQ+p#NRVqB!VC7eSJ2s6pe9Bjh`E}&%fS^Q8+!-WyL(Ovd z1Mbuh)QdvpmmMwlXTDlnX)|fvigQJ+r5?hlqU|P59aS13bMDmnoZNWmmR0@}?n1w7 zck`p4Z@t#?BGjsRSVm8Wj^!BlY|4-WqM_esl@?@eI?qlQEV@5X=WuPGFwyR+C?XQ4 zh1^@Ft%H(bb^|PsI>}cV0wOU)?@tU`#SDlIDKcuV4Av%CBSf04pDi6&M$Hd}^&+uc z?t|btLmiZ8%F99%Db&D}kR9Oy&{M#Oh$%hpbxFpO0V?bkn61Xp+XaPtAaD;bKGDA(~h?NsggqI8h7y;vbL1dD!OqkFC znJ$8Q0VTF=6e-5DBv^agc4xd7Cg7pVB1UtJ1`!2TALOfvIx7P%$50?pmJo#FzMX&H z3~bz``Ily3P8vq;ZYTnD`n3I3s9cAJ_U`X>y&i)83ff)uZ9b~vII0ZPZb^`=Z z!)bAFk61Cp>@tDW0tkGPpS`&4hd_QS1uiIps3=e%M#RdQginYhe2_J?H4MTg0*wtU z0(uf)f>1jVCqj6Sp0a$FE$dwk#w6GOoGQVBa)ytbJPz)vxgdxfDfL0m8Sv-E&xhOw zuNC6eqV8fMx#tc`!v`nae)N-wX)H-Sq4~!Gy0Kg*gLlhZg0*7A&;?saS2D@p3?Cm* zLeM7mIR~TRBYCJPMJk3vK^P5hTn)WtuDDJL8e)_I!hK9hC3n-5t%-r%EJKL1g)$SV zB{7G)JcsnbPBhfrzj%MLz*%s$Mr8tj$<~Lb(tNVD)OY*bu30s*U~yUPe*Z!X^Qk)2 zvYaDpAI&jaLf-Ay@iaftbg^_s93X7l@Zo z*9VneRi2SmyuMG@aGy5GNQp*QPTSVN*!xY7!fQUz+4ZK~CprAHLnq68UfZjqK_lB& zKB#$d($g{dpHnbKWvq!@N{tDB&<5Gn)3g?Eb)4LVZ zS)X)mHuI{w<}yWbia1o`T8qPANW^~))P4huKmKhJTsL}KXp=!3aVD&Y-+d5O+y@T& zrIt?G&D)OVx3Hma(%lcbUtSkg*d2TIa?9!pid*NolczNM9_hV&e#%sXGN^LypvDE9 zs~B>xbZgljvz-=}v(Gl`8iWRFRaJF*EPlM-(4;7&nXh#J=@6B^duo|Vu7`iIc^sTg zspzn4e@hPxdiE@@zsfo%R_9oKrO$;V!H9x7j=9!;zuH+Qt__QNX3-p*PN<)-ciR7W z^{&uIb8awRJlLACD=(H+TEmzeS2T0m*bC1O?N}c*SK`fZrdNl-T_WwNCO&<}x3jSoJFm}`O7DYzowu`uM} znE)sZIgfmhiW4wLx>@18VQ9@;c_`H_3^gH{ z6FpThLm96DiRt1p`54yjL6~|hb}lX-{0S2tQjC$?SxiP=iq|7x6AYEXXeYRs3^ELp zCD$R@QlK+b^synSCxa&9WR_H&7VqZ973uc+z3!V4t?$;|;Tu}LKPKe*>&S=*hwQ0u zYiG>R(H_6Dc-7gxjgc+xrrH-DPPt`aJlwQ=LTUax1HtGSs_*h#H`s02Y}XojILmKx zRNw4#{kq?;O*mFFXR-dK-LpL}Yf-8qT{A-kb?KHd$&MWzS_6-tab_*DbNE=^Rm-8N zcdD)(o;=v47pC>FuslsYXknbNZOc3#&CVB#hv<6+JP+9NB4~QZ?%1~q`UP)E%&1Wh zcJ8nIvMx#^e|*;RbK;g2=W6OU-QT>hcgE?v4r}fV56QONug^cXd*$Ubx5k_|qczuU zeL81~`LBvQY;s;F6wj^LrmNO5KXa9@Zl2YW$PgJ=6Rbqo42OdM zHH+Z)fb3CSIm*B>(PjokG&T%If&WYc|8D>ZRD$9Pr0IgRV89@y2Q_+gg*3twtN?8; z4u}w>*j_iXYj+W|TxCnVj?Ur1sa^Rd*EwEBCk|`&ovVql zyVx=NSy<5ii4Px6IeBWn iXp3WmUoAU!4zQ~^p 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 diff --git a/app/assets/images/logos/collaboration/inrae.png b/app/assets/images/logos/collaboration/inrae.png new file mode 100644 index 0000000000000000000000000000000000000000..150cf377330d31ee175c14750c21168ec53806fd GIT binary patch literal 4793 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 Tj(zkm00000NkvXXu0mjfO8Gy= literal 0 HcmV?d00001 diff --git a/app/assets/images/logos/collaboration/inrae_logo.jpg b/app/assets/images/logos/collaboration/inrae_logo.jpg deleted file mode 100644 index 2bbf48ea433dba8360f84cb0bb52a1ad2b41689c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9230 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 diff --git a/app/assets/images/logos/collaboration/lirmm.png b/app/assets/images/logos/collaboration/lirmm.png new file mode 100644 index 0000000000000000000000000000000000000000..ea972bbd59ea326b4ebdbc2dbc0807c960229eec GIT binary patch literal 5146 zcmV+#6y@uQP)4`;I~cWZ$MmkwriTnVv=(r^lm%3WtMpY@I&Go&qAXzv36KEUx2iYyyDzu$QdGUF%0|yQ{8}fZ-o5wT``v%P z|BYq{!fk?%+a&2W5S4VxfKU=yTwILY++5sh33cKY5Ep&*>Q#LH`R9m@jg_CAoE!`u zJQ!(dY0xwc4NY1@DoeiV!i5VseE6{Bgb5QSAU-}`KJ$9L*t2I3PMtc1yY9LRUAuOL zt~VUR);kbt_$ybgVE69b^7oM=N1{=qMnQMJu&@vZ4jjO_bLTL0=uot2)22ZHZQC|D91isF z-ybO{DfJ3Sy#c{tckI|9If1O+p+g7B>gsi;PoKuS@4hQVfnw3Td2>Ac@WV(?Pxmia z>5^~0`35mDF%rnc#6;8w)e8^@4<5wPqepS~-FKr)moC+0Ju52<>(;Hq_U+r{@78CW zN~cbp@aUtDqJ8`J{_jWxbi;-XXxp|e#*7(L=lY}0fZ#A^&YY3*-Kte9+;h)8)h0_5 zxpU`EeDu*rsHmt2IgStv#5i;e9yS7#CQTF~ku1J+2s>|b(+@xVAeCzG-o4ScZ{Iot zq*g$%D?dsRy4`M!9z9yJv3kx$(@MPa&O4ILBa?FjUc-x~&D-ILC!Rp}G@&ppE)R7I z$2@uRB!&$eCKW2*RU1%h3U{vyB}HoCLYS;F3k( zTu*nLi|>u!{(WCeAKX^J;JB#|73${An5YSk*~FhxV<&c?_{=!a~#ur5BqA-Wfg0G7_^ zjOpp^#7ynkUg@aMKKl%#Mvan6IvR=y2sXKX{kl|yWXG{%$HM8XVkW~^fy|5_@rT#` zgp6~U=I&{R%}aIo;H_-u#>K>*I3L$td{>?QbxcAe*OF}3EEDeEp!@uVwV$*a!k471Qzz(gW)YM!sXzC$mHcHj%kJy zNu%WFno}rPAs$>RfieLz0#_x00HU`9oGZCtz<>cVvJFQOS&c~Tv%}|vR};G~WIZ{y z0MpVAV`QuISaYr?wp5Hqmb)V=2#QZYqm@dXVDT$&elNeOFidq*i!ej^HFgwsh01A) zgbdA)tPi=*!t(nZNOfPw-*w2qg}6@e=`kh;5DdfQqAK!9QK0T%leQ&S@a&O4W61m& zxcs00g_5h;@R94pTzs;1O7d3j{fVTDVS$lech~ zQE6(OJ}*XJI*fTgY(cxc9B|(aEk@`aY8c_FpF0chbN`0owd>${>T$S*C#gBONhVX< zK|&zN5z6xoMiBuK&OMHbIE-KBHK9{9bk9GJr@mj0J~?N_vvRR`^)B7toO(w(n1>Id z__2RM$+*!-T=+O*Q`^Adw4YlfqG78e=$u#`r`nL;1p1V}05ozt@VoolVfBN}Fu+kP z#HT`vko`aoXvHNkHf%)Rm?_A9bp?FoWwu?YEX&KwZQIxa!GsBcs0(f|HNRAcXe4av zwDeZk{%kttj_Qn*`zNC5whs}%U_QJFi2}58p-2s>eEkzO%#Z0;RI*g50B`yK;Oh7X zac$ivC>LHY!!`(i#VUT}2ztbJWD5kn$~sMe_;jSFCE|~ByNej28*oM&G^$))pRBh5YpBAg2lmLqDbBgo2~n#E$>f}t4Nr8%6sQ~DBt;wFtprK#qB zaeaEB+3L3t^Y~zR<9z~9mz=B-L`+RV(In`xWj++G{}>-FeolPrl@h`+xv6#(cDrlK z5wr>pv865nXryCtt%Qs2S4?jW?q6mDL&PUem{OlZ>Ilv6iJCe?qoXDIeV3Yy7khTW zz9vm2*Ab#f-rE2tU4oT;&gebl%3KUNz!#&zIZ)&`(nQ{3e;kYxZV9jBi?IrS5?N$j&8}3U-V>Vsf?s@xW*L2+szGacOptJ#UfuMqjt0q z7N})oAqcwsuO?&*gij{mRFdj(*0RtcSJj

    y=JU{wbk!i;$(dm5EJ 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 IM6N<$g06@4RR910 literal 0 HcmV?d00001 diff --git a/app/assets/images/logos/collaboration/lirmm_logo.png b/app/assets/images/logos/collaboration/lirmm_logo.png deleted file mode 100644 index a177adc5a142f23a83a28cae03a217e8bd1352ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86558 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 XZ#~CGT={1N{4+JSGHNn#i~IioR}~xX diff --git a/app/assets/images/logos/collaboration/sifr_logo.jpg b/app/assets/images/logos/collaboration/sifr_logo.jpg deleted file mode 100644 index 88cdd39e35d4027490b85b1bbab5078364703462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6344 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 Ten13Xy$ZWvCIt?}9Zvrncs#GA diff --git a/app/assets/images/logos/collaboration/stanford-university_logo.png b/app/assets/images/logos/collaboration/stanford-university_logo.png deleted file mode 100644 index b9abb4b7f6e1561083797a7206a836b3795b48c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121975 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 z 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 diff --git a/app/assets/images/logos/collaboration/stanford.png b/app/assets/images/logos/collaboration/stanford.png new file mode 100644 index 0000000000000000000000000000000000000000..e53d39f254cad05dc3e3727496ae927e72f50d00 GIT binary patch literal 15057 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

    OeK9O*<3LcYvir8K}qW4%T~;}i2&OJS&QEVbD? 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/logos/collaboration/um_logo.png b/app/assets/images/logos/collaboration/um_logo.png deleted file mode 100644 index a1307507344d78c598f63b4e524760396a791147..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33687 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 IM6N<$f*y9qz5oCK diff --git a/app/assets/images/logos/supports/agropolisfondation_logo.png b/app/assets/images/logos/supports/agropolisfondation_logo.png deleted file mode 100644 index 35ec92829e02fb68be4fe22d5a6c87fe0124ab6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29060 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 diff --git a/app/assets/images/logos/supports/anr.png b/app/assets/images/logos/supports/anr.png new file mode 100644 index 0000000000000000000000000000000000000000..ebf81e5cb16a974b8b4457e97a115336ec966e15 GIT binary patch literal 9952 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 Eg7E6ViU0rr diff --git a/app/assets/images/logos/supports/eu.png b/app/assets/images/logos/supports/eu.png new file mode 100644 index 0000000000000000000000000000000000000000..bda2c51f037bce0b2ff3329227e9b2a70e596156 GIT binary patch literal 3469 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 aNgJq1h?WTetN}>jAo$>XCdZ?f`Tqd`;+Fvc diff --git a/app/assets/images/logos/supports/msca_eu_logo.jpg b/app/assets/images/logos/supports/msca_eu_logo.jpg deleted file mode 100644 index 94265988862ceda7f2280e8f0a78b209eed9f82b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44126 zcmeFZ2Ut|u(l)vg6hssQD4@_PAP54IB-189KtM7QMUvz!nKl8^B*{Zoau8aQfaKWZ zoROS!le?P^cjL^Q3Fo`tojKqC-230>pZ3}GUb}Z%wQ5zpRc|ec!^A1ztemv0G(bW^ z0z3o%0mSLEQ&O(xrU0Oz0B`^RKmm}Ehyllb>;V*Ve&zrfxK9H9pc0>O^bMQ=fU~VD zR{(PG7!}x-1UKNy3iyZOXz!oTKN9#y0{=+h9|`;;fqx|Mf1(5))Mpu)TbTgB@eiaw zkOU2g7(RX=``3O^Sm=*^Qel1o2n+jd|2I@Y5pg8Be^AB$iTd+TpZ}4-KN9#y0{=+h z9|`;>0lwS30;0UPMfrrT^4<~U=NIMW2mY&L0Pp}<28;l6zzP5{2$S||bWNG4b^|^_exs3$dW_dN+RdZtrHcdf= z+X{9MOkS8ja(6IMbyrj~a)uyy|LgW#cI7DslbC-9^Fu zqr*JcCB+?#O+{56O8;^O*pj&Z%e%O^xNy7hbK5$Y@$ia>i16IzRqN&kgyFxp;Yv z4Y>@B`FXjF`T3271bKz|OnIMQ|K;(g&BH}!MI!~PE zNEp9+(f_q?{+FaBDQ;{eYIOAOwhli(Ue(0@e>U1y=90ev=$|_XwtwCM?+mKl$&)9= zd4B)Uf0x3KBcRrS*ZoUJ!7H!+zwr6zA%9EA|A^}!as4d`{H>G!(XM~Q^|vJOw@&^? zyZ(PBuHSI3i46#DT|g8|90S2J`SIf?j+2p}IDUeHoScI4+$j)aP|{MLr8-AP%Ro;@ zOLyrq6Wg`RjI4~8=&o~LXJx<1d5e?bDi1#o2Ok>;C&$rENXRKDC{I$-oH|9rafR** z$KU=CYk+eUBz~l5Qj+Vyv2!G(=SYYR00d+nkAqz05ncJqhvXP3+3^$P6elT9fhQE7 z1&)!Bk{%-?J${@FBq~X~z~2F~bH~qL^;Fx)*u>QAg}H^Jlk-a# zS2y>!?|gjy-uuJD!XqN1qJN5sO-@NoOV7y6$}T7@D*jqhTK283zM-)R+1%3F+t)uZ zI5a#mIz2NxH@~pBw7jyly|cTwe}KkdkNQOdkpA4QfA#E7{W=Hs>lhgsDH-`uzetX` zfE(#Kvg6lyPn^G}Om1j@;X2=I3Yz<&pYm%@GV`mTXrDXuP+nvam}cEN>e`Q<{k4w0 z`Hy<`ua5oJuTg-Clmr|+(sKY5*lA@?u0o^jlHu&Y|7II$6dtHs=6T;+I`^lG_sOHM?oaul{r(g}nFA zhyLxH-wu%Wd7mQ!$f_&?4%R%Bq8X24CITT|s(3UJ2+ccCi61i;a?GlQliPX26+9Kq z2nW#UxsbkXCCsHh48aOBIiu9X<*?Zh?QZL9o21m2%ffr|SxuO!>YK50szpFk0rj9! z)Tc9K#_K@?L*&5POS!O((ul8(l=JzC37j=liKffctSv_99sSusWNSb{BB9E1gx|Im?&I)DT>mNoqO8 z6YNZ19OKEGttabj%fiK#^0+bfjzPt%L^~PbbvWlcw2Vjz8j*b4x;)htvsp&>91hea z!#OvV{3zLzU;Xd4iEX}vZPN`^uaVmmflo+9#^XZM5S*{z<{`;<*phvp-#r775F+5} z{T{FR7WRE{g^NZRRQcmH%6E^pMs@C5HRITVsJ8@dp(&0>&$q*qD%=k})FOB2)&@N{ zXqW;(y(EpZr&U+)sS{%zs?PW@02e&Wgff}etkYegwqQq`abD?|P_bR`jMUY?URWtx zvNDYHVYw0rQC1)AL5^SZ8=|#=uh%bV!6{qD-4fHOC7Y%%aYXa2bHNzf7gRE+C?tKu zik_-RQ;{(3skn+)$GAPfYIaZUaJWV{52WF(yuLn7>_*Cu$U1bD$Se_o`wZ;Km8wg} z;OrldHgdLc*a0jvy)S&D`mnlR)pD7ydJ1Z=4JF??MUdVi0>^N3G|E!$8H=B!Xr7Qr z(TuQYrI@pbsY}c5(!|N?Mbfo8D8tK*T`uuz-#01s3W%q6Zz|oo*2#4ZfVn@wa|)?c zTOKCQg)(e0V5zsVop(wDn^NZn*o?ia!%@EHec1b(kclaSjk0zfE__O^7*UH)7&9ADtuxG$iAoSon+v;RRdG+ifNN?e{IK2^GOLZU z*w-W@i|2$)!=g&DoCU##`eDTz6jSOL7kQFx>SYDb&Xpi1 z?udIcMfQ)5OS#$HcsH*^#+2=K+QZe#n3uuo5E5&qD+X`%+Q(#77gekGZSSywx?GC+ z_=^?)qcO0}BLdCkS+JqhYAi_}GpI-&D@mJ3T+mDGCNAJxG~QjF2z+Ef$9Lg3U_335 zjJc$3o{Syb$QD-;pAM`dsaHsq8x9)?W zb(6ja8k}6W#V?*M(}L8qdZ#a^SlpQ+0+Wr1G=d1)~O*Fg= z!_yV-BAO5wmeG4KWr9`F)hr|pfPVv9gk48?V+VBYmu^PJvCA_1rZvkYk$8TLX3S7zm}zK70oJuS z$I+%-V68LIlyN$zHGB!wRS!0HWholqf4GrMdV;3?LsKOYcqSHtKO<_lbh8??jB~sQ z*zlQIBJdzMUX&8k4m+&hm078{Ojv{}zetA9NDi|n!vTP0%E5!O{PdTQ1=|?EISx*# zwkT+waL&`i`tH|Q(<&H$qnbi*`dU~yW>-=O+HNVWQvc+ovS#>dZkWM)WhvV2#l=G( zntJiO+u%!NaHik~$+zQXh>&5cN$cd;9&xECxf-2+Jl`CWLsW)0exb53xe4dYtMj(e|7PJyHWZDcq zpfx+A^o^77Gt=k%}vCV zPsrvODGw}EDZs1L=$FT<((_z{Uz!^h>;Lp!CTodPOf~SH!`GHx8sIR0E*69HzU~n5 z>C%f_NE}pS`fxrAE^FLu-t<{=x6PYnjwy|6Ty$*I04xmnNE`HX)f(HB)HXWo^S zyB!db5XPKbOzpS%b?%li);8Pa;w6ph)hTDlM3c;-c59FpXDgRyFb93qsdL=gf+=hx zf)155%1;@mwMDt6i~DJ{2pa~We%pcxih-fm*AK^hIhH&6V&mPfl(q|s>oYlVShEc6 zEtidh65Y?(dGU+>kSrgK`s}0{5%7l2SyuK>35hCvr{ptv-A%2VMO%BMCBFgygfzmx z9fV4Y+qh7yw=5C3j)g%xk|@`B&&R*>c+{tc%_=}=r0R72=o*enY6P8%kc%@B^Q?9)%O;tluF$mQYz=^ zd-1vucjV{|YA!CU&Tzjz9~ch1@GRs(Iac$drztwxE%W<|{uy|aFjww|x=AVb)3h;P zfXa?PL_di1tX%Wv5aF#I1KmVoFy5r5mMP{_bAu$VM)gwS7&# z&2M6!rB6%jM4vg{r9vx^l%jJ#am=m9B!%ohiRJ7ekb8;@2y{GGI=?z-Yxb3yF`l35 zk-XO;bLQ;pBvmQEb&p2bz}-{$Kbwy(AJD2UwIjt!Jb0GxUTKOV+kPz}{jodtn4l}i z(pSC8nobSMNKuKe?l|l!;F07~G@7Z7N9ugs@J z79N*ZbMI`6m7koLaP8E1D15yvU;gY;i(#zla(kSCm;e#TOON zb@PL^lnp(kgIcVK%?p_k>K80mK30G7EN*4QbT)sDA2XQr*89fjs=i+ESCw8Is=z7O zhzJxU*+fnbP2;2*>G5=GZT9^sXG|v)QMlI+G98R4qO=R=#qC43Iypt@E;!3*;0|jHxVpvc)OxqwhfS9E|2wCZ1o{ zdi-;gX5nZ%FUxrWD~Z}hw+KfL!Te%7Wpq|%2@$Y0*zVgDW%G+?Zz>$s#8H4obhqSk30`4By6Uysu?bO)GEXy%uLl9rpNZA*l;_2+UH|VissH5f#v9Ol+ajWI>pI z|Ch6VBz|)il$?}5xeL-}&~%CpU*U2Z&^E^vA07xO4@$K%K_i9FRJ}4D5YuaVQ1pto z)50=_vi>zrhIU8L0c+ow%^MYxp^o<=0x>A9z^Fiey6LRW6+O|k!Oh~YtC&c}gL2*t z^CD#ftuVP}JQJ_79H%ijTD<>(rKj@pZb^S_lYEE@iDOEv_A%7g#pfCFUe?V#BX(YF z=*95p7-8egW}2Pf<=}~!nJO3l^iP7U`z07io}E62R=il6vZee(Tw0ESJFfhso{*oR z)E9GUs^GZ`OXL;{maux2E4orRW-7^IU;W+&>BZc}q7^0ftmbvoxE;;0Je!uUSwZG5dnH=qYO^L^X4DepK#A9yzpA1>j<%vWj<)wGmTP%e?KwWm_sD7fj>~7ZVH;xfu~-e)mYVlUp6rYx`zTK3kw^sO!XIjc z4dkUYEuR?xo^b@%yj-Xdem0Y@-yxQUaZ5^{5q?uqAQWIX7ZDl0F%b^vBH|F1f7|TP?B5go3cm2bH&cEWE&B9 zcTfl0H4`%0mdSxJl9lPL2a){SRaMOT=^huYA)!uYXe3yJ=LO zAKez(<~;W0VXD(L;Cd>ezBDd?E%BRf1U@#yrE+7uc*NSa0gJ1?r6tH& zWr=}s8;rDMtO#9nJjPNInPQtMoXNRjTJm~0>dg(K{s^+z8Jx*%E?d3Dew4=kL2MN7 z{JYE74;)w5aXFjYosta;f=0geQ}GK2MY}t;<2~+)+{~;Q_qkJ7M%-bw;&%XW00llXs2k=m76d$X#y*Qh;SN=A3?_aivp`R1-TSQThGOC zvuX`(2_rIcKkDdc<<7QfeYie1H$|oChvO=ET_JTR*K?URJ?3O+>W69dxYu2Mf@!ln za8(0L6w_t1lCMzCaVIzOL+CgY-a8T_bmmq~tN~KA`$~qAs+b0WUQ89A1J4u$+NwLD&EXikXeJ0-|D^E`M;d9%&ZOyn^JZCs+ zC}27Jy)Pln-;Cfn z{=vvqQzXUTHt}5&XPAzo`6hSl$fT{LpMtLSt+taK9txJWipXGPDcVExZ4w!6cCxpj zwI7dfPacAE!87&_^x!f9Be+C3jZWBya@RMs-gxUHU-{}Ata3#Hi?2yJq!QPMiR0_EU{D4qJ2g z=n-uN8=SdsIyn}?{Dg`sXFXnw_f{qj>QN^nqU!Q43OlX0S;O)cTMr>WcY*RYJx7gu zsDU&(ydhS`XRQJ+V;JhUk=t|6jrz-)#AT+>tMQPsP>Zri0w3Hp~J@ejYmrGGWc_&;)( zfcmP-B*pA;*K9$-!u1Fq)0v7jB=tIKoog_2%dz6pAj(13qi4Xg%$h5atx?JIpiXS%5319E#@|fAFatzRg%e{!pH+nd}T6o zf^J!)Mw1U;8F2YFd71sO*~GUmf;*H!B28O6J-85=n~jTt#tB*zmkO;Ns-uQVQcgkl zLI|6CX%$dWDku8P_3tcYMz5q#ORf=isipFwN2Pm1n zNDU1LWJJQ(YWo{IGL${49VKD!Z@Zmg;tM`+t)@pi50PIr+riLJ+<*#xLDCt;4)m$E z^{z+L;fHTzt?oPMX{UY&>bNLt@WfJjgzDvoPb--uxa_6AuqL%|J!ta+awe;PdX0-+ zUj3$?y8(^}oYw|NiFx+TFQY`Q@Ov+;@6YmFEAh@@UYerBX}8JWxowMo_sR?8`!JOG zbJ>135isCOA{4XX_z&JnI74tJiNLC6rl#Pm65|qqyqD0I-B#sBvdzUT5@xg}My=vX zyU0}AU@>{TifKvP_?vI8i9Sj} z`iY+yU23~9oZ3Qz2KbBpn)#kQ=zHYv^d*dRP09wpCcym;Ue*Mjg;oqtCAAI0?|Ndu zaA^{9=2z(Qm%p7vt}xu}dAQRa`cOzbkoN9|Y)$H@+}gQK2$ij%*d}=@wrE{=hn{N$ z+404`WwR5;vBnu6t?w z*J#%Q-ey82=VEz|`K`?xU*n%YGJf&h<1HLdUf;B&-0;j&buQ=Rjg8NvmhuOMN}J;1 zJChNd_a?YJ-)APn@eeWGpuIhI&;E9?r6DK9)3-&>P+CqbE}2WoVQ`%@>prr!_JW_= z1dDQM0(w47^*brEXK_lrzLU@mh8qn>qNZJjklQ#54dz*=l-jNh&+y5gn|BHKL4I1r zXvPf{;cgd|bbC^BBQjf~mYuJG-hPTq|I%Iy&T^)7@*JfI*CXK_xfEr1@t#*jui}JR zZp6K|iwSE{i0)km<2vb*4|i)>Iqvh)ljPST2P@t-LND@g+q{#czcDy*rzN5PQZy4X znUMai`ULJ#!4@DdA#akH(tXVS3KAbae8_+^qOHX=QIlVBmUFim+=g$mj#cfi8m-=3 z_({81kFHH05BW5M%^lcV$g=0o6$sbcQ4ykMozx=Y4X7Ps) zPZHzd`3A=W>MH~_6>yc*NXIKwUxZ_n!>i54ok+X!r%m^BIS_nO=aa&3jf*Vn=PA7p zyqsn_CK=$%`z3YWZ{9}5Vi51Vqz>kbSCqQ%2QKE)Jh=+0%df7Pq~&M!s%Y*I0eT*q zQS4&`ntBKqQj5C}GD#J%nraacZ0l!XmX7i!>Iy11;^Y&U>7SP&^Uhd|)6!nezE`^^ zYFFxSn12?*IMa8S&`Aj&82UUox^D8`@CI4vlEK_a4L!`=;Q6R0u(0Pw8NmAYI8&vG`jm z-2M18r;&*28|LQ}>y7_TkL`5%LoO8&0dkhumyz?6t1Qou@krZ^ITs>ehUl%b9M}tb zpg+Lc?;McDowp!jeuePrC26<1?9)WIr^AK(`KCr;itgchF0U$1Ljrg_$2HZ9dy7ir z&dc9gDtH9@23J~fW!hUztc{!IIkCzlFyIpvbYd#iZHT(TE<^*`mxag_KZV+Sgu0Pb z&?0`gOuo5kY>=pAh#%O8V&TBr(osu@DBQ3cyE)yj&66_$mCzt|;Xm{Qc zfqRu=AYn2KMqEIDa;DDeH>vr$TJ!7?C4T(yOsTXf7I=|Lj#LA4>sx;#w@zD`jkZt_ zs*9D(8>{X+*dRx{VW7O>x&!%YnTqioVj|@{LZ(E3rQ@2Ss!D{$XmxWfsCKFC921e5 zjGSt3FxO>MORSd)yvFN4K_7HYtFwPzQ4P`(R?rhPTSC$c7qfPkWUWMh>o}aS(4@8( z+cT9Q|H$Z9tdW9<4H5`%KI%S0%X+TghX+j?t9J_5M0B5zRR&A0CDU)mrDnkIDB- z!2IhzZB`B%eyHU;G3v6twytdSW>oSVK-X1vAQ&xWBubO5D9A?h-PUXrU)^3TBF%ks zsV+D{v`5P7URD;`_fV_Pn#-B(@WIot>j_naJ{-%z70R|`cvBFi+O-xr4o*#zuX&qW z+>R0Ba~pMV_T2ZBH&ORkJKCSz7n0?CcSL{YhFn^Lpn_b(tR-Y$)G;?9(XS!1vGY+J z5%%Zmg*IF6M28i?VsQ$zBBD0QBjyK0pq?&5S<0FI&-xGc@CQHm=WoV?Iw*$9a&n&( zgmT@p8E4)cO_T==2l!VT&|Tr>`j3csBoU~9KJ?D1t=@3ly9j5`V_yFiypY!sbX$=b z4|a3*;xsisCgUhw{iu12Q;p) z-#9O?{<#&P%HdS}@^Dxg+n3?P{LY&E<%TTcQ!o!TeN&*xO9IS8a+E%bGC|AGyepf@J(MCcnQCnoaW(n;p_CuO{()G z;g^k;uvyl2roxl&qB*Y0loOrNj20Z` z|4`jIa>_?mmQ+lqSV+{8hTb)JYeQ^^O>f=NJw1R$v2TW&5Ej>svB z%Mv-4I=b=_Ov+aOUFfx7R_T|a5zoqx!S(DUPo}g6Y7327{XFI z!NLsKkz4Fv^G{yLx;IV)^pv{t>F*dSoxb(*`jz}@J*Fx>DD`zbjfVALA#LPVNz6$) za`!8<67O>@27OrK$3ttuF7fs`p|%#nG)tm)J2*JL8H~12$CjL1W0bWrLS-?R`s%u= zN@I2n71Y!B!>+rED~Rp%g?+_JoCMu)_xurOFL6YR|H5Xv98_;j+Yko`_@g74B3$RT`jQ1lvlm&EVUeKh4E?)>9Oo&&&5(Hkk2M+a;?>nPfp2LcY z6&1a)uq}ZkRA&`EnB$JhA_86+MBswH+ZsgJ+Tfn_z%K1B49Ab~g)OmW!zRs%Km(W& zqgtI#!k)B9Iv52nCYd7wC;E?4SLAN6T^(ip@#&B^-!A!h%2<9Lo-}Ba_`2@TnWY-Z z*?DOK1iiC=1N3SH```EwJ?)I0#h;j9#tj~Jvc2Uk(%PX?6Eo5iQ_(&&gH$HvtO0*!F*7~LOZQEf|N2y6A8shP4=m4z5ZDA>5P>rSjMN%_%7vG>#6@l{w3Xdsrf-s1&31aq zY-}I->>hb3q8S|>usoZOwm@@k_jr!x=uIxBMbC6)v~8Cur>M}nL?toLTWB9#Kn2vZ zgcD*V-p%4TAr0P?D5&o(PrRJv_!`vtnBu8sFJDoQT}01qoLl7c?4}@!{)ogD8H0Az zit%u)y+fQV4}VK$7Pmes1Wh-yVheIaKy{<*Q62A)8G*^Qz(Z>!qOPlsX519C0V+Y2~WD19h$^`II^iv<+ z-2X~(b?&U?c7@rczMKZ9LJpVxCvtaITQ@t>4hF{b-(%&T>ZZJkV$xV}$6+D7J^EnE zhB6Lh(sx=nLB~&x*1R;!#ZxPJMYAX$KC`3Jbmvrf0nbb3>XL0l?>0f8ZHHr(+9yLr z1vakjR??BYW7aj)YB@dKr6S8?fF@4@;nY6zzx0iNmMfTg`7;#_rk(%jT&f%)1Qh-p z7IA_Ily&ukk#K3q*Q4o7$)2WWW}VGvekZK_f(6H>A$ty|8U6rwG5wK|VnFzc8-hE} z+Bc(c!CR(lMmT^(=21%v1{T*HJmg(pE(Y@xl%UaUoyoyJ&&jgX#qHc~@^ZPrfvYH4 z#yeA5`7cPft@b8J87Zb_btsCZ#QK;&$zk|1!A%706~#=w4dxBJ)AQIVKdC*VWY25Y zm(064s?Ckeh%rS6)@dY$>ab!D45i3?bn^lCSf7nZ@2T%z?vzcw=f7SfY(ORb?p)w% zG=gkA8{O>Nym9s14j@yhn$+60@$CR9XB<|M-=yCwy|cIAUyj$=fGlZtu3_ zo?LEK8(81)77co3{rp|#zwJ?c7gjDms%Z10sH{}#R%?~x*nTM;k)@U^s2FRbWL$D1 zWm!uV9VsnUTqYTG4Y|a5XHl#2+i`up_b{Im$K3|_Ie5{|lJ(@ZWsxrvELHVwHa84% z9*z=$5h74TKC-_tcGywLPY{d-Q+bJ5P;((M?Zws7TS5c3yFazhx8}N(Q;wk4dy#hg z+jq!PIKy%G^D{G~b5fKQocP=A1a_!yp#}t0boMS3`A38MDrJ^w}Ne5Cl8K zio!012Jl}A^XPk#)9~CvGjj3ZN|}a&PivOL6Ya_|(6iKRQ<9Uz3oSFo^E&cb!bRd^5@`q%Nk3HYmm^_H2yUVa7vHwMa26DcNuYUT}e$TG_i_KyI zpnW@h{$A*ZGa{y&!MytFJV+kKmTM;c*2(0_Y01yLo$D<$w^w3|$MJ2^Q7bNy!w0PX zxu?nNM2UbuNT@tp*1VKMU*G(SOm#_X%4|#!j2n8v{OiWnBL27`D6dCgBX`)-Z7Vmo z#v|+VrV*o2)G#-Uw)S%&3Wj_IYp!G?kVz4NMor$FrP##Ro>qG~^q=#1OIg|iLzIU@ z?C(M}a1v;r4D_LFn5An+?t0m=g@HI${+`zx8G~???Hh*FSeHglcJ=pg?9HnmK=Lel zPg&}!i0EH0C(R8xw0YTQgpZ#(=7t$dAC&$}NhHwi~<4&(g_!1b*|Z z)G6uUd>QZI5ex$opUo8=-}Pse^DpyITXN2vJ~5{Hi0QjxD#o^jPI&dZy|(lH2{9=3 z((T4uS;uqZIecY=0g}KWp>$8>Zf7p@wNtXT^kRl(aqmFQS*sesb7Bk*h0X;hSd4hl ziz-_$=SJ@8+e{#`u+YJ4(zkugS=lh*=!2&7XeEVrqobITOHxrHkPT@W#}&6JO&<$} zpottW)`b+igA2_Lor}9nZ$~TpX7t1HIa2{qQsZ2oE}aay2jY@m%bJ{hr88O25_LHG zry|vFq+$>B;aw&J5YEI_M2T|vfwdE8Nxfq|QGcfzK~ryPl4(W%a-x{bX^&@Xvu=A0B$OOKHtuh!mvF3)>QmSrw{qEc!0PPpHffm!{s5^!*4K}|2zjMCiY zIj&m!IW|)F7L9In<#@{run>sm8`~!orXm|}qnx>EU3m;NOoe}mWB8x(3Ylrc9D9P^ z!hbmwpWLdI zqERmGwH`T6d%26j<-6C#j~*FN$9YJuyBc4+g0;2DB3}2vF6M;T1+%u+@;0SDcPhle?MEg?LpBf8T*;};i8zI*we^1J<$ha94sN1|$Tr}XpMdK62N zyBs@0k0mm6*PlIy3yjXvK?ubD_cA&p`r8{~oTjn*_H~GZkTi!&nvVL4CJ6=Oe$OP1 z8w_m(4iO$5e%K08{SIbvnxN-b`t5X>_p4}ImZ$7O8x*{^Ee_TaTfA)vV3`~3BIG%Z zvdROplG9%)MjsHGJ5JtN^N&cOD3cwzF3M>-Rv%t5 zduWX$i6zAIU<2tWgyteaX0a^#qAA^29rXyZ$OThLSS7bQL!JhX$LnqD$tR#-&K^}) z{IQ6tWXKh@krIO0izWhh1si@}LX|hE2ZjtTDqvlrENqw5;6e-$sO*}@Fz@2R2~xWR zSe)dw5ImU0`o;-@FQ1pUhdp_^d&iIYbG_@ldk7X^@v`k8J}?sjm81>$A!Hhf3s<5h z0z>Z%u&2SINvDAs(A|0!DNN%TmNIw3mS;}~zl>~wd_=rJFyd3H=Tv)PtGgiCe&Pd@ z6sk0IOa3krvitzUz>YQm6-~aL2<+`cLz92{I~9^TiD&z7351-L$yzZ?6q7P%_CN7B z%t?8DNM!%BC}$F_UogkJC53WXf%VG7g@}da4h5T_O&V9E>X!Q8DsnqFVu4eut2uG8 z|1h>DEjjAasR!iJ0=Ku6;UibGG@OkWg{!*eG4J$9URsX( zx8th0!KtK~{Bs@E|4lLjgi(J?ayTcR-_omo=ajR&K7A;i<@C`01cc?0NXuS}ghWnw za%uiBgD{qw`n~4c;vo;Q5sZPOgh+AHMnjhbW?UmC~FKFa#PY&uC_SLv9&kK7Uopjg}v?4zkqD((X(t*VYAt+g&Qqru|^={=4rphhXsg`~P=e@}n2*hNDX}qPH(KJ$p3hqjmos4OIS!BlE3fnV&}#Vy zGbxrCP^aUFFhWP;%#B4s%hfDQ_5K-?z#NX^>nZJH0|&chwis207kxR#*fSOZV$jLw z-sxeLluua&bDtXYJs7D+|=@E7=tScl}S_o?kK>cW{ z^A>vzztHLOpq@o18B`vXZ8;@?FZiFPq*e7A>cV@9qq zy_*|)45-(=BL7I2mWOrI6Z{NfSkn3Yc>92?bcWbB8~8;mPi;&T_H?{3--(#&F>!D8 z$BYOkp2W!~{oV}hr= zzRQqw3Jf8$Tw#PNAJr#QI5fH z?mS?v=%88ZY4)S~eEVLSvj@=1p8V6lnTkJ~j{ml;iu3pG+7Akv+Z?IBV$)=gQL*Mi znl}APqWw8C{&V}kiCIVBB{`lMw zTY1cf|DB)uS`u`}<#?$(Nw40|C)fv1Y6rB391?*vj~H*mcWJUs&gWe=m%No5(Nr4N zKgpbXmA+CR$=RrmmXq zMw#iDP$B@^P5Jr8kkL|V3?5QRjxC7?)9GM^Eb5{t+%^URCg$bDo52zWtTI056%k14 zIqZi0a~pTq?+YAuLf$Fn+Gbme)FYF?g=}J-0;z|zLxF#;M!xDoQl z<||H5UbH3oE2j~Cx2RRMa?~-0}@2e*89ke-Vp3OZ_9a;SW8sua^S#cAVZlU=t7-7Pd^Z7ZuhDoi6$aCmbD8nc^WqLKpvHnX-##m+J z_~)8zX}WC%nz%M&-ihVtUeo zs~&9$5uh;ehb@tNfomFq_-rZAz7yoJvohsy_NGOb5E7XzK`dYU7p@TvKf-ayjyO-w zpn)O29SO3E6*VAk`dj?`kMnabGI&j7Iei`VJT1P)m!Hn(9f<&6f(H&=I_?IR_)%}= zi4L#bVA74uZsI8nQ`$29lA>XO3V<;mt5j4vxsJY09ZiU!-hVxtl!4#UO-w?8G=L^U zWRZ}zRR3A=>;k#fR{@Di^ZK~K?&6qYcJXjXWC=dr2omXS-Q+2+bXxqDT_jDepol}! zZg9(3<>Yq{jG_StJS98V*#yQvpUs(8fg<<6T9wEy;E|OaEUgx*c6NoD%uDLQA72yE zZ4_@(01s<;V6Z8J>pC}WnPDSyz<&&$?`7zmu2-Ck<04x8S;DR+5h$HlY)A#)j*L0Zb(t90@ zddjDjPcDq2t8`u1l&7t^!sT+Zp3RPdPFA0!ZmN7%e@!KPHSnCQHVyb-(w}qDKQ9ZF zP@S3tDW=K2UT~334+1s^`GsSO$6Y>JV539$CW8xd*L`0g-8{=t^L7{EaS}(D6t@W7 z+>*x{ruY+|q7qg&38yaXNrSpTl^6U-qOl!pIw#6*r_t`2 z;coJffNq1a8g)a7z!8F0(I*A@Co$O6WAG%vRkODGw>qlsShl(@3bcpTTeV)N`qSU( zx94`o^FQ31igyxFA)U|uO9?qr&3Xb$e}$kYw^K{&TSCE&c^0O3F#X~UrVCqDaWk36 z9!{E7DaUZ>?(C`J?pL|zDp8FnWuj9Qi;F{NqGX58U#q`*C5*b80bRv59e={|z81V{ z{!uz+$hfL^rJA-U@vGiX8ucCbMH|8Rm3i5MeLuN6mb#m&64v1E;=6WwFiW!L=Oj~) z%-*s-QNZ&g<;SMUkd_#=_KO#bT6TJ=}j9AeTd zTlv4ldkdBFwbitgn3qiK4sCTvk6@X@SuDYMK0-4nZm#s!j9-4EG(Jgvi3lhpsX0&E zJKGg5q!aY$_Z~X1^xXRJt>toHPFAzw%4t!MY4_PbKa6G=S#-HEA8Vo^LXq)`JmWDz za9DGD!^FpznqKqtNk?|soOKT|Nb-}+mEIufTxa`&M;{t`+gGo=5aQ3TQC?ASlL;hn z2qc;&O}lU;y_Em%;1%8nmT9SO-LKQxB>gUaW@=2dy)}cR-|pVtYEoUr#cG8q$;&lH zS>p8muW4M& z69|11wLQ}gJ~-!yEUU457RzVAAElaRn{3K za7~>mxA7=4!!j&n=4qov>4Gd|^zn)o!`gzyvHhE$_c(Px4qiIq;)b6u#774qq+x8= z+^BWs%^8Y3#QnjJ1+KiV%~u!*h$r#xnD&<{OO5@h8`U(fKUGxr=J>KsP81HBifhMq42GmGXugss5z$)3Shz>W5(cVXCF&##DcCEyy&lJ2coR`lT*Q-%SB z>QQ3|Qe+(Kl&c`w#K^A%?;UwqB6{bOOv!53I<$X-8gQUnC;S>TGuEwXU=1?Z;nArjq{>*a!~2}f1my(J4Z z)|WjH+@?xeh2Up#tE-z}MaQ;$5jA$#V8Qb9wqhQfJ(UC;S@K4wzg9S(wS56px2N%vU3)l3w+o{&6Ch^kjO>@-tT}l|dx=RZq>iOPWlv*jH6W$e;u;ge>$zYYADJux!}7OfN95ve0Vi&o%#I3?-c1+Ni}B_BrF~+c&3` z+&t_v^#nWS(x3hW^a^RzG%01x=ISfe?-p38Kb>Z^P``yS7ztZD6qvx~aA9w0h-!Va zSHD!rRM`U>VuL4cwZB-DBmMiYHgd1u7jUiI>sEvPk(Wkmd_NcXabm@bwFULXr?myle}qgc?A6}w3=yJA0V zF6KxVp|(9des?%(R2{m(@D8-WSFz{xdLoPwmmCZDR0eo&_B3}l7f9PJxsYxuBqw5d zH&Z0ej~Y5!($uHEXGqJ|7LDx5C3W6z)I)TxN=biC{;H64L4||gUXKnWD?*Rt_;)Nc zN!q6uy{qoY+6^z$h2(EYf(iT}_u$C1WvrYygXg`c_6s8OaVxO2XP)A|0w8Gtv+7``t-EdD2xrYl5hQHxF6zLZb zvJ;k|Y!=C(U6A7oD2fc0j{Ppzv2`Z?Tl!l^oBCU4E6jTQm~otPahznn(l)ee;TZLv zEDmR8;fV$T;eUqDvvsqCGNEmdLjS$lw*1X(Pt<}nQ_vyR z9nVEP0jwF4sYej|M}&Ig!sRzLutl}D`wNVLfSY7sxS;T4_H%Gh0I5*!pprY=hU7!8bKmV}5tppnISA-lNRU=?HeUopK<}qnwo9(%SM&>$zsA-*^7nWtOtz=G zWKkUSc3k&i9wn0bnR`hdwCP)i!}{88@A7%svNyQds~)qJrmin!on7qR>>9`KO0j)) zo2g0<7A>q5?ORSe#D#b#aw7)xWSv%=9=#DzyXT|)O5(UEoOAwiRYupZ@#X1g{KF)r zRW*y<>J=6&Oglw)K$3Z%=@dv18WDlZxDVi~$LxPP!UnQa9gc^bYKP+M0hY^p31+!C??InYCzrKl%n|A zjB&oY%?zC+5_g|BHf*)JnX`j%?PT@z)qwV{$T@1BzO1fQ{ZL)A1}CL_t+K-zY0~e{ zG?PNr=8#f49*COxwzM|?kc2L1@>_X0{wlT>pzjpPwdQH~mKe6W?-3Pt)y-G6ObP8x z8!lz05h>a;pP5(Dk|5l#5&KQT@4?{u-WYY!y=_tZTMxJWa1yILjo)U*mQ>Q>;g69m zJLFfv8OVcRRI;c;Nd{PFakU@tKhn5EF}TvGj@11s8e)+%oAc>L#n;eRUq&BhW~PwH z&TU~dn|j*5tn%+aDOVosN*{Gw0hefYC1v=e?R7p{iK-rQi~(KJdPvIOvmPVupq$!GW5Ke(`^`_nl!)ZQI%?LKFl< zK#D+AK$?KkdsGAjM5G2nQxFhB?>!0vN|i2M={@w`tAO+-z4w+tfB+$W%YF8__w0S{ zbMHRq{QZ9TBnw%rx#k>mj`ogsfDhLjzmI>a++IPJK42J2=wjdP!qexy2oVRf5qbD=LR?Gk>I8u;*+%jgLO%=&+!Jc-7BO{uzkXdAhr_sFBMTe|i+ znPwn+^6S9c)ypq)r4&SIwi_f-Ei$N%$;-5S>ACk=sye_YYba!5??IJGRoz`?!~G*I zZ^f~n1Vf45Pzh9(h(WXhvIKeVS?Jmh7zA>*fLZXztmj|2Cb;y8pi7D%ucjf|E_E~F zhrw0l8`DeEgy(Serg)X3{@`t%2^ZO$Cqsyux}OA+6dg6l;2LOjuJ&dzvd50zUj{$4 z4*^J>dKU$%RQuLfY<43wu^J`_tmFoT~vM{}b5+~+PZ3#|(6ipd9vEG-@W@D_Ql%?*I7w?@R z9KSoZMQ=*SHqPqBl|*wa@ZLhU!(#n(qD3I=Ui4r&ZJUnX^4I}6I=+D_w0T1hG`pYa+_Y#QVT&hda&u%Gm7VD=l z>^b0U#_obTd-jRAqAGq0#8c%@w>O@l=i3Y;c}zVeI04>bP>(!e)M$8+*t{UolJ2vh z9%fHu*FcMYHRz&i@bPY$wFYNb@R?aYL){4FFYBN?MbTg&G z!bODT-M##!b!Eo|)adOv&HS+l#eM)3#bTjh!l<`87Q(lM;s*534)cfK7xcnr3IMcS zn$rUOVjxe&Vvt|}a2^14P&TI<;C-PDT6M4ZA@gtFLWMoOh~cv>2x9itlm4@F6@Va+ z4Eq(GrcsP0>IhiiWT{k=doXQ4P2PKJGcTEdNnl(k1eMl-XCK3}n;+Fw)VeuY-BC0E zMJ`+3W(nL+h@0Hp_xMOx+RO6vyGMiq(h$o&PiAxGqKtM7x&$+wxCnAseR`R@idWoh zBydYIa;8p}rFFqeO*<*#Noibk)O^lmTUpNltEI*py8K-fABBXh#it+i&%?KQ40;dA zZk%=tUp^Mzf093Q!Q>Xz$#|E6FczpvC5D@f#$Q>e{^sv`h3o0&WtLk951EHiE{h>^ zLGf0!ZC68b9)T06H@|vfK%iT8Rj(a4Igntiyz>}>rcCa!d>qRYyJ>z(*<1Is|6=Zi z;|m!Rm4dR_3ta((jR_0-rrt7l%CmRPr{h4thXk$*#Bcq=RsjuX;G%!*D}7i0O|pJy znZa(8ZHXEGW2weEsk{|YAF&m2?>WwR=UH;jN<8f;By!!|mDV?Mxeb{F)PcZT4M}V; zNXm)1O{jB8vnBr3)8p%HUbAWAG#iyM#dF&I=Az#nItGi5Sg5CNZs{v_14KeY9&U1K zPsE7xp$DrrNv8BMcZKZ2=KO<{V0~vU)kj!8wyRPi3`+6`k}q-eVckOfWvdnzU8cbIyK#{X7~!tD4rB0?ZOn$QxrI6t&cqUEb<^- zgkSz@k2q&j^o0xc9d1C0YNKwTIqOXSXZNCi1-|d-O^5n`R(Mn3hGMBt*`0U=! z?S;-6_BBv_1XC_hwXH-`FN{eR+Z)7t^q>!=56*qS` zk5+HSWjjrXe?(yamj#J8ECH~igIXo^So$y(qh?dw<#5y-1Kc0snWp9m_|$bHg&VWR&FeB^X%oqNGy?-&_A2w9L>1?VXaF7*9U8r0*DSSnQe3Fma7_5|w3kM8uk=v5@rvQp zkh;g=J@Xa03`@NQ&(SUj48wf5+VpzfsW9(xQH?FH&2q}I8Re60`9)c`>h{asT=^Mr z$6Z^~C}Y-KG1!bm0!Hm3g-kr`L}u+*u;cGR#9yDpJ-=%^_un&3g%&B4XB0$05F2nm zL-0=l`{n!DFWewO0ffSWGXq{RZXY(2_v$<U?&a`EYcX$^wXRENFD zZ93oe`^~*%z4EC+g5oEE0rz+Asa=Lkl@88>`J%0HPp85>$78W6(8}5xI1@jqYyJWv zs_iYk?l?=imkNcE>HNAJgTe6zP^jY}rf+V4#s-%7Os)1w<5QE5xX%LxLj#ZIKgEnd zxt=%wJCo&dy3iTmbX^o;68j4S+4P71oBT(@$bXKbUPWv|0UVJrPK3Zy0EHz4uRp+? zLOX#(K#t0>tXCLn39pa^INe(6A55LumLQsSTodyzT@`!I) zz^)hv-eG|3mSoTZ0vF8(OvU&Qyj-9(?N5R(H9$F^dxb5($t2bUtlz)L;r8N!DF7r$ zB#?;bMl=g+9eZ<^N1Q$h>>EgkTLvPr>d6R3l9l#F7QfcMy66*i?~0AhBf$*ik?b!u z$$JY09B+~tiiew8WvwsRhW`CD7_ zkB+idJdz_6@O#JdTNosyytb;iRw+*`nSRNt=Z-KPxWJq5-8`eUiDD)nSbbt7X;Q19 zV0M3JydO$h4$Tqg&#r`*S4Yl9tMxmE?6)(bqeGdzxUlXSGrvH*{G#ZkV@Hxi|TZ1 zQpP8Y^m}I{2yGMU#7FbY_|tiO^K-RP3eZd#8az}|CWTN%?O-zvnwb1L{^ zaJ1WuduaWlmqcd+QSyDFiUO0Mch;SI?^>y)I<71sX;wy0`K~BYT`duPrl)72X3Znr zqg_6uGa-~2;1`!`b8U0TCAj=2!F|99+M>AsSDc`K-vI&)z6&(pNuA)V*S#jFbC8g# zcRPj5^m0t(WbQmBo2U2OBLZYr`qD1ciWDP_xjW^_L`YIdar7H6A1J<0G((jJ(u3|) zmPt6cXZ44!bhv$fruh)l>7bK2QFewMS9=#o+{1yty$#P$xo-ZEj^y>jG(SoV(gCcM zml=Jz+Aw$H7}3gHD4f1>DZAr%vvHo`M$8NCHseaQ+~?1qD+n1?*EZ4w)0DhjJKIP2 zu?N_!)r{Uf(NHW{K6+Vvwt+E=hcJYd_-%)HrWvP$ss_7}^H)hZ--WFnIa1mW){v>|NzC3k9)b6anXgBE$L_4(9Zy>fcRP2AGX zlpA^N*ao)YRAqgbbd}f7?fOa9-G|fSrx(Sc*BdU5O&pcz<^oZe?__RbviAh})TvZ? z6Onj|b-S0ZD=dLeS|0Ze1SSke7Rjl}7qHNY2D zX*+~u7-NsRxuw*Gw+C5Yd=}3A(sYT+P&uI2b~GMYK^c>58jN=}Qaz6Ow#I@GA8 zY-YXQf>_D1syYoVzl0|mTj+Y4nn-c7cB>0V_QXMwy1*jOkpG4NIet>Cn`?A7&f}$> zhq)m0ZU8t%F;9Om(G*GR=-8pCxB*1uG*tiW-}vUsnGEbL86d6hgtaTX9XB@uw0DhL z=>Rc$<|lyPhywQK(2%TtHua&Zui+CM2R3g3TgPOQ1|LUn99M8J=c#;($n;jb`DMw6 zBExkp498=)0H!zCIOymh{5CZCP5%0mP8QIJ8E6_Rq;D4C73h5jD|%7oqvIUzG7N1K z@{{12U>J1>L}`FmdYmjjL~xws^5eFb9Q}F@{fhgNst=hEEuUdFf$=0r%_?5+cM5_~ z<1>h>*5W~12{ytt&T>2L%@=#o2rW9%!~F!LD~bxn zK$(czo8KAF-CMa^S+j$UgWqn0NR#7mInkR2l&GvJZ|cqbu7nU7ewj|(!5IJ!JwVMXvbB_r`iDCr;nQzVB&Rs`_07rW#;`4{}irXpRRt& zVotA_=*L7Or+_2K-Wrm=_U5C9TlU;^=6YJdc2DvO{&)kokz2bdX*9#sY zY{uoax0+&#>7zXxAT(^WTVD7b>4U<|8yYB7;ZZaoRU1+3sewnK57VTiYJPt&yXb*(Gu_-C|j)~{GAmhcg{li)KS``)!uuP zyg>7^VtUle!U@%&gq6Tr9yNhWYJHEhHx=6LMWi|EqQWnxlTL+n9_Cl??(!yxP)Vlj ziO}o}c5y4gB9zc(IV#+Fd?8b4VNdy-Dg92S`qC>T!mD-z9)#L}t)mq1l~GFQ`AwFY zuX2K%*-yB}l3Xoq7ONQjAomYJ1)8Z9i5iPbJaOr%S+umJ;$HG?>$%3m{;MqKaB|vp ziE+W*p{M;UH%!IusoYJFbyz5hDjF;oI@mOpA$#sqc1;zg1*6&7rDKn#$BT)ci;tbB z_;2qN4X-YA9#^SiwdjI7DP-h!&seyAYzjJB@0ExJNeOSB2TUxoc~mdRFX@NIzT$a* z^KOk>*S7cOxy0z`i(HzA1hxcp7h@XW^l=*Pyh<=2yVKHcob^Gkq6F|U>Pp{Q{vJk$ z0-oF7@DZyyXmAnA5Elf-&MgB+a(;jL-`tUc8N!zF_=N+|F3+P?Qzow{mwY%h>oIu- z^mXv2h9Ad)@&uixPnAtDx~QUyf#$1o)v(Ul+qscU+2__ z=FI7Iw3h~>B(DV+7{7%u)IH~|;LVbPx|~~T zT8wh{#9J>8jSJ+uu01Q}VJh63kO$W;0N^kW9Cyg5q+#x6oQ%lC0%X6NS>RAg*_}== zlJ>)Bp(app5VNMq*if$zD>;yuF>4n$hzX(ICyleir%H;f{eXVngoe+}Nwo=w!?+y- zd41=$G=UPjp8Xn88rO>7YHoiVqpCz-MGw~kvtF-Wb*SQtK=0)t#(~<>aHKMl{}0)_ z$zR8*{NH0n!M!f6?vRi9-d%+osM!{Bji+KVo9XrxLsbfR0#{yh(pw|1Kvyzq3puD@spf;|-$%go4d$15Mw_`$uA0_bnduMVq_WC) z%RR`F07h`?f{@Mu^7Jzj)E+&4fEH?ClHz+yxF|8Fp-S)D?0ORIroERRfrq`po5_1) zuzPBg6I~pfa5HA=PZ!uNLVtkbxmRu8AIFLZbXali;um!jJ~F87e_x3Ui<#-AzR)xH zZ*h!XpPcOVu#Y(^jx+tVaLvhhLl=yC@0x;t3vE2!Evj+cG6B^7B%vi?w__0mWDeYaWy9!@ESu0SM&}o!oX({dG z1SDQ$eDLw{b?4rzsN6X%-LVyOy2oPgTi;KFW`A4$%~Qd<#yZ+T>g(q+ez`cctVD16 z&IO&6zm44`<#@Ltqz@!Xa)6-6srk2lAI1syNPRmo*vgd$+?%jQl>)B{`3|vNV~$t% zt6Y22BO_N!HrymOPBHS4!QCiFsysC-!^{+W$u!j=B& z9E4WB$I`0R4L@~}47Jxjw-7(~k1f*}FNY@-ltK6FC-zHLRy}Kh*fR`3hRR(5IP3w~ zgL8v8>dSzjKCz>6{uo}fnJ_=aBjs#8tfeaVV1K(M)Hpypo*Zq3tS&#jIsR3gMk?`m z82wA22?@Sj{RDCc!gd%G-^Z1Z*Fkbsj<2FkxE?WoSp|Y^mni}p*FjDv6zDvIYv`k| z3vM?+GcH+F2fD>8QUgcQGu%^U$}TEs@?<{2>b7ExiKHNq7&kVIvjb7CoiLtcJ-(iP z6rom`c3g(=U7x^+G7^*0qMj+KU`|{+yV&f;>}2hf$3{l^x)+Zn z5!Vl=01s|&P~RNtEjADT*2VA>kk(Gib#;Ia8Yu|D>3MF*yg#_y1Adh_UgFxb$P?y2 zx^vHY)vEARYfK1pF^TWUA4*ufjKlL#9@dM zzw|aubqJ;voC)Voe2HW?O5)0sAbO}1_7LbI5Hs8ocz?Xq`X_;rGz2zPUR+VCr~A10 z>>a>(_YIl&A}a&ph6lyz3S^Mo&cl(zdRkp#>CDmA0cX>dEBa)iK_bYB`NbSAEiB&TF@TQ>^#Jt%26(zDs^lszq7 zw!;R%^7L=~f`Fre8Z+M}Ruo7Lep3}~5T3d6x`yg0WF-+`$~+|*izX@0=y}f5cxU0c z6VsPM%Mqx^3!N5|+IUf8aNEv1J>m>B@sVd{0tpOxJhz5G(e&sW=*@mNsY_Ov8=Vru zXd5sg)nR+l&VYsr-yH1DRf2`i#m!lyT;sVl!yJ318gT+3XSpag;lU$^GxAW++38aD zH{&ZnZLbr}q3E+x()VMDPP>PQ@vqwh&4XX_wdz{|3(sBtu)sM?AePkF2O8m2bDm zGsKumza`m{jMyzlS|r~YVK~-ph(DUgnBVkc4ix7&qEX~XPk!xB&Bq!{NhyD?ZT6W!R z+>JGRGCSUl^1Nvz6goUZ8*_NNqdf-g-fXOhT4lM5f@j25agnZ#1mfBQL(%a{tjMB% za?SNloe6Vqxq-Gtv4-S;$-1<5n8Ki>I^tC@t9>N+EFk)v%**WJP`inf9sP5D#uBag z16|=1&B|G~>hC#=x34O*JCy=8a^JrJ;hICLwTqFWTS_oI6Z&ccxZyyypnmx(!o$Xn z?qw?w?K{qYK$S=GTqCWQt)w1#P|6!06rtuUCoP{{=-V{;Vyw>Om1V1=0(%nQSzbSu zqN6^x)jhypQq^Q_V@%jc7F=KHdQH-7+Bkfd+nr3hdrXF{AgPXAj#U17PG{yrWLK%p zHTLI8dMqv7NxDLL6Xo><2lB(ON}jARc zvpu9aRJ{C&uY*6 zil$nN-r6#KMyKcz!29whJXyRlu{Rf{X=}<7?l#0kXe7872vUa)9?U;eR*gTA4!H&>aren22y$@xfqC(Ai{ZtG-xMYQljZ&8)#;#YHJ zi}^}}B-XQx{c23qLB5b;VZxxJ7i6B1amLymQ91 zeVQzyr1GM+Yx3Z;yk0Mj(qJi$Y_%Zg6Xvt; z>%)N|qLnt`?YisZ$D$9WiVXK4-4NJV1uAZSX4?4tbLXMZ(4c{pwosn|61V>Y}nFJ zb!2CUWlO+My0sdYTVV0Vz4M4^YKE;u<$-eXp3z0KoP2mqU{n&Do34twc%cPFIDFu6 zeb6YxIQSLiK?yI9EQqT8y469iOgddEN1ymO}jpUp% z{5kdo3~dp=zDmf3N{LJOSbT%Xat-Mjf?xjfVDCD*`u#16`vV6lnY} zbGb?~*PF-R3vWhllyo<us*~mGiMLgZ10J0_}7m`X^RtU)USC>S=f>?bYC#Mfw>p zflT&qyvo`|BfOZ}AG?^7Umbol2Y~Kqhn?kKoTT2E%_S2ZHv$3tgD+<83OxAtpx-8In~=qkk&XiSc~6y!U~9mauNPh0pc zagHIUArcoqE5gTU zX@4!b3e)>YmgYgQF)EL&;ux^svmgB*$L61p)qg%lQ;2wg0+GOS_`|cSr;>xa9d>an z^vK8HD{P%Ozj2_A=Hb?&K(~D|7h0ckj!_CWVziMrxt64A5Ck|R5r(Iv$X~rRw+8=k zH6F0d&r&U0$2(KzH_4A{v2T1{=>x)jRffb|K6`@{*UK{?I*ztz!=`r zfRBO~7z=K4j1Ig;^i$yL9|3D)ZF71x>l_PN(pDkU>E2}DkmL(Wd)HK>{n5TBt^ujU z+Zm^7kns0k#1p3cs<~8mKn$2bP>eqb(3)V)0$kPz!g3z5wgzn2ZwFl5!-xgtUVv3O z3dn!}!1{L8Ki-}@hJS&dXaWcm`T;O|_^Jjp6QE>ENWlAY07K}( znGphX4G<7s{(m37hL=|5e!x*52=DDpfeYhLtrz*jvr(A6~0sj!6{ z9H0=(ZqYOwjemUhpI>n*I zj59+?7@&^M3MiaQU)C)OwXI7HV;j=;k^ClH-wR1f68VdoK?8wjnN@pqI6l-`@aRfi z#Tm~Dm}jSm^e$p@yLIas1u2%jz(Om9((#;s^5}JO4Zqu1bLq_mI^W9TZ<`#2$QHvZ zKgweERi&UD1M_r=WO>UN2rM*k&7UEdTd~fldIjE4q06Vj zgDhMPO`oQ|IY?yX>d_7h2w-)pun``5spX+SuJ+IsA``k;{3eakKP@nQeLOJAQ2yLo zis*UzMo&EXcPQ6uW4hb?&OYuWiW~*sfV2HSq-9Zk$ee_t^l{xi`Ru2f`BZ`Z-Pw=4 zxyCZf#YiFwp3klJR~yw< zCRMabstF6cw^dd$q;*wltCXffE60>te4mxUA4zo{hbPk`_{M3Do~Iyea?LA_kNB@x z?HcPC+s!=vhP;OfqPZGdQ7ool{Ys8WGo2vt>muSB3~Sg5t!YP}&*Yo;*Ikk4kbbCfxPkH7$;J3|*Z_jB+x%AS!ja@6i{E z!lW@lJ{B&H&F{8EkA+D2AJW=hclSmiLL9&}KxshK7NFQuY|cMJyCz>jCXWmS5S?va z{l~z1)a@33b)#2>MgVup{MXuy0s+@mZ*D{vCz>3x*4y|Q8U8{tG&^D9^V=^#3H76= z6jhL4W8eKv{^XDRVsYnyWd3SVi zZc>0qH~R`Z!4;5@lxN&R*hOs3RQu$UV`;`wBY*B62J)_ST-mk?(xZn-w}9RAmL!e0 zGUL&0g+mF^X(wpaLxj4al;<0)Z>|M1cP$E^;=)syVDv zc_l2PGuqfpX!%E%b}GNHlxrqv5`hYT(}9x)xJdgcHf!|mc*!W#mIfzYVXJ&if4cZqdg>CtPx>`?%Gn47V?UAa zTR;aNw@@O_NYq{@4C&{oYQ$0(huO$_T4<%;!@|w@ns6X^jb*65bqScGAgF_H80ND( zqW&SXPvuzXg4*T{Q&EDaSAfZ|L19y{ItGj<3HZnNkAD(aG<-|H@S@8NP8AiiN^Lg^ zdw4k~Z-pX+6%eJFvHMRK$pi48GYGtNsL{_ezC^PU%tyVnJJGQ5fZvRYSfw%9EVy+E z8tL8lIt8>D2i%n90@)_nrwF_R+&_Y*_&$d|-om#G6K)~?TX+ZmAOzTop2uTO5)RTy znREIrH*MmsKHExp7FZ0V6kqM-G}&%kj=6PS zj?T`cnM9&E);?`5A#rVVK>{b6*2})XNmCZoIGpWUD6S z)ChCo(6Y4sqJOeRFx6ZAw|FPof0W5?#G4X%AI$W1$Z)3&z7^UZb3>#iW82x?s_xi@ z-|Y2$pYK2DMZt;$XJ%)Qd+^?XRn(XVl+OM4?rwMpyrtI?G?-Gk^j7lGC)uHpLb%OzyXQ``MVFJFe0Y2JBrgsmDRzMwH(ydrc6`dr`<7 zBBLDZm0qA`>&edJgaLgNK}b>4>XYvMGVp-n=^;3*K>$BAwutHtuC6G$qg0UP|2dQv zf01Iek&T1$jEKM6rE7fBuGW*~8{=0MXF+9XcHY*wI_G zXTB%UR_D2`F94H1Nu#pkwifP>y4eLZ@Q?Z9UgRHz_aOe094}XiF(Y$HQW}jN0MSB zTT%0b?jrApITTgrK$zlzpkS}ilD3MFT-l}-gZ0y%TA>pm;v`NsvZH0L4-P+oCnTqnNig zTgE8z5fDBTCcM@uirboOTzKQkj`vprpKSw^;#s+X1Z^4cRaFH%EZ2?W8IgRKt}%I~ zX$w;rfTzw11vCmJ7=I}XI{+#Is$~~dd<$`ec@vXc!sDgWQA&&I00$)o#Oxqxd-1VHtZ+CW9kcsvF$b|Y|OU-%2i>!QG>jXI?;D^ zj!PYz^UPQ=WT7;ma5>Nv=Wdk;H2ccP*rOkkI5z`}lempa7Dxtx`yNivxf;MQOF{4e zBOc(VlYs%FVt_&gIIhC*LL+VvLNCXZvt2`US{L@_RyxqC-X1`D6F^ZS9W%P^-hxGg z)@6AdcWUl2Je}#`rA`*W0A#H9hWNb6-<+1wPD*ve*?8PE;-p+=rRoF}UH$V#>lwn*NXa(WqXco7wPqp{x&% z5(VsPT5#R;{pHKHcH15dtBngbSW-YHY|em`@^BIBRLNB0OJKYG+6sHs4 z0fy#BgLZTweWCX?eKC61*(G?<9h*+h7LIXINOHsvIq*42!#Cu|I*D8|indeJ z+`%}a=n;n~CT;H5fv15K!QO=Nmp*NwpJ>1CWVNRE`p^j@*x3TqGh`p?6qXJ?W#gVr zSOUF`RzkGMTmPVM3h9DicRVMS_9$f*8<{L%y{Y`V)8Zd|gCA(V_!9mj(Tw`S4!ATH z_wh9A9D&&Osq{oy+SG^5# z2$%~cJOu7x&4vuF4y|}X4=K2IMQPR9>(D#VMb4k@BNQvi}atZYmKw=+HJs&Km zv)RRum4vZgXL&)cAbrvSWcoQxgx1=v#1`Z@EhCh;FSHa65qqb<(*ro?B&ilDE}yU) z4o^<7v&!GH-E4EBXWANUxQOl91~4x;76I+aR09@C7uB{KYMTN9Hj8w9QXGU?=V_2- zqme2fNoZNji`&Ry_t z-4W+F1iJ7KyNy|;X-=OVe-?{-L#VP~*iI(Xd77C9M`TUGc+xrVlwEBrHe~@p6uFLl zZ5rr*Y~7t|j=e!SH(S{9Ng(DEuP)=MJYS#6JfW|H?JU1(n(1rJ{x= z3yJrysvfYu6QWZ@D$oIvs?N3bBu7s>wDe|8F6b-#BzX4xEl`0I-3yror%EUA{3LKW zDcyWRCkx7^SxBL7Ah$Rj57LFAlIpI@yVe$_xxM#bW3;B8STz?C@JeQesWVWl+8ODp%8mw!>_TmwE5|O4++X9sywU zRc|^h&7$$5#|<=7MxD5kBJ+GkceM%QPSc?%4MudRZ2tZ|9y_2X4-^M@CKTHR5WFW( z;~wBR`nh$s&-v|R3p@JuTD2-Ra&(0|o_%;<3|1e$wJ)6sv`PAil5bV{;7yKpN=A|= zSq^qg@v_k7oPA612OBI+ldR+UJ;l-N!Jf*m+`hnC1+PuIJ%63_!hiPpeXkJe7erxz zIYWVyneT;arnKD{Xl45TAYD#u?AfQbT0>pnK(6N2#6nKSL_~-LtapFtB9bSY>JIn_LDDr}gjSnUI)6FGpW+Yd> zNvS-Kp1)yuNz#e!#j;p;U6;vl&=?@KHNizBiXp73nV0lMqhOt?QzMQtsom7BHv6f=oU0WAqiPLgNRD0X5;i zvea)+#@h@_e-eDi=VP^@P`1g@S&lkjrBqBCENwpZ)my`HK^PDNybv5|817B#XVBlS zxqiEb!)35n7V8xkAmt3>&&ox4ZbvC%k2LoV?*QXjPa%JE!+;ibUKpOqsq682lGJNW zN(pRl4{z~wLIre)uZ0PPs4Ev&dMM?E@!y4KsL2h8GbeGReqv5R1+|j!- z+X`8uZjqLSW=)TW{9PmvfJguv2&|v70 diff --git a/app/assets/images/logos/supports/numev.png b/app/assets/images/logos/supports/numev.png new file mode 100644 index 0000000000000000000000000000000000000000..8f3e33df266723eddf0ed9214e6d43e6f60a4c2b GIT binary patch literal 4328 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 + + From d6cd44d8f2293c96ab030267a260bf30ab2ef60f Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 19 Apr 2023 12:04:07 +0200 Subject: [PATCH 069/533] Update home page design according to the one on figma --- app/assets/stylesheets/home.scss | 357 +++++++++++++++++++++++++++++ app/controllers/home_controller.rb | 10 +- app/views/home/index.html.haml | 271 ++++++++++++---------- 3 files changed, 514 insertions(+), 124 deletions(-) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index f26409b71..7620202b1 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -2,3 +2,360 @@ i.fa.fa-caret-square-o-down { vertical-align: middle; margin-left: 2px; } + +.container-fluid{ + padding: 0 !important; +} + +.home-header-container{ + height: 310px; +} + +.home-header-background{ + background-color: var(--primary-color);; + width: 100%; + height: 309px; + position: absolute; + z-index: 0; +} + +.home-bubbles{ + display: flex; + justify-content: center; +} +.home-bubble{ + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + background-color: rgba(255, 255, 255, 0.4); + position: absolute; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.05); + transform: scale(0.1); + animation: scale-up 1s ease forwards; +} +.home-bubble-one{ + width: 232px; + height: 232px; + border-radius: 116px; + z-index: 1; + margin-left: 622px; +} +.home-bubble-two{ + width: 194px; + height: 194px; + border-radius: 97px; + z-index: 2; + margin-left: 387px; + margin-top: 161px; +} +.home-bubble-three{ + width: 130px; + height: 130px; + border-radius: 65px; + z-index: 3; + margin-left: 656px; + margin-top: 192px; +} +.home-bubble-four{ + width: 70px; + height: 70px; + border-radius: 35px; + z-index: 4; + margin-left: 815px; + margin-top: 189px; + transform: scale(1); + +} + +.home-bubble h5{ + color: white; + font-size: 18px; + margin: 0; + font-weight: 600; +} +.home-bubble p{ + color: white; + font-size: 15px; + margin: 0; +} +.home-random-bubbles{ + position: absolute; + transform: scale(0.1); + animation: scale-up-random 1s ease forwards; +} +.home-header-title-container{ + display: flex; + justify-content: center; +} +.home-header-title{ + position: absolute; + z-index: 4; + width: 481px; + margin-right: 664px; + margin-top: 123px; + opacity: 0; + transform: translateY(-100%); + animation: slide-and-fade 1s ease forwards; +} +.home-header-title h4{ + font-size: 40px; + font-weight: 800; + color: white; +} + +.home-header-title p{ + font-size: 20px; + font-weight: 400; + color: white; +} + +.home-header-title input{ + font-size: 16px; + outline: none; + padding: 20px; + width: 100%; + margin-top: 20px; + border-radius: 14px; + border: none; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); +} +.home-header-title input:focus{ + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.15); +} + + +.home-body-container{ + display: flex; + flex-direction: column; + align-items: center; +} +.home-section{ + margin-top: 70px; + width: 1138px; +} +.home-section > h4{ + font-size: 20px; + margin-bottom: 5px; + font-weight: 700; +} + +.home-section-line{ + width: 60px; + margin-top: 3px; + border: 0.5px solid var(--primary-color);; + border-radius: 5px; + margin-bottom: 20px; +} +.home-statistics{ + display: flex; + justify-content: space-between; +} +.home-statistics-container{ + border-radius: 8px; + box-shadow: 2px 0px 60px rgba(0, 0, 0, 0.10); + padding: 30px 40px; + +} +.home-statistics-container > div { + display: flex; + align-items: center; + +} +.home-agroportal-figures{ + margin-bottom: 20px; +} + +.home-statistics-container > div > p { + font-size: 20px; + font-weight: 600; + margin-left: 18px; + margin-bottom: 0; +} +.home-statistics-item{ + display: flex; + align-items: center; + +} +.home-statistics-item hr{ + height: 83px; + width: 0px; + border: 2px solid var(--primary-color);; + border-radius: 5px; + margin-right: 15px; + margin-top: 0; + margin-bottom: 0; +} +.home-statistics-item h4{ + font-size: 30px; + font-weight: 600; + line-height: 1.2; + margin: 0; +} +.home-statistics-item p{ + font-size: 18px; + font-weight: 400; + margin: 0; + color: #888; +} +.home-section > p { + font-size: 16px; + color: #888888; + margin-bottom: 9px; +} +.home-upload-benifits{ + display: flex; + flex-wrap: wrap; +} +.home-upload-benifits div{ + display: flex; + width: 455px; + align-items: flex-start; + margin-right: 57px; + margin-top: 15px +} + +.home-upload-benifits div p{ + margin-left: 17px; + font-size: 16px; + color: #888888; + margin-bottom: 0; +} +.home-upload-benifits div img{ + margin-top: 3px +} +.home-upload-ontology-button{ + margin-top: 30px; + text-decoration: none; + color: var(--primary-color);; + display: flex; + justify-content: space-between; + align-items: center; + width: 193px; + padding: 15px 25px; + border: 1px solid var(--primary-color);; + border-radius: 8px; + font-size: 15px; +} +.home-recommendations-and-annotations{ + font-size: 16px; + outline: none; + padding: 20px; + width: 100%; + resize: none; + border-radius: 14px; + border: none; + +} +.home-services-buttons{ + background-color: white; + border-radius: 8px; + padding: 20px; + display: flex; + justify-content: flex-end; + align-items: center; +} +.home-card{ + border-radius: 8px; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); +} +.home-get-annotations{ + cursor: pointer; + color: white; + background-color: var(--primary-color); + display: flex; + width: fit-content; + align-items: center; + padding: 15px 20px; + border-radius: 8px; + margin-left: 10px; +} +.home-get-annotations p{ + margin-right: 20px; + margin-bottom: 0; +} +.home-get-recommendations{ + cursor: pointer; + color: var(--primary-color); + display: flex; + width: fit-content; + height: fit-content; + align-items: center; + padding: 15px 20px; + border-radius: 8px; + border: 1px solid var(--primary-color); + +} +.home-get-recommendations p{ + margin-right: 20px; + margin-bottom: 0; +} +.hide{ + display: none; +} +.home-section-sub-sections-container{ + display: flex; + justify-content: space-between; +} +.home-sub-section-left{ + width: 533px; +} +.home-sub-section-right{ + width: 533px; +} +.home-sub-section-left h4, .home-sub-section-right h4{ + font-size: 20px; + margin-bottom: 5px; + font-weight: 700; +} +.home-fair-scores{ + height: 349px; + +} +.home-twitter-news{ + +} +.home-fair-scores a{ + text-decoration: none; + +} +.home-fair-scores div{ + display: flex; + justify-content: flex-end; + align-items: center; + margin-right: 20px; + color: var(--primary-color); +} +.home-fair-scores div p{ + margin-right: 10px; + margin-bottom: 0; +} +.home-logos{ + height: 138px; + display: flex; + align-items: center; + overflow: auto; + +} +.home-logos img{ + margin-left: 60px; +} + + +@keyframes scale-up { + from { transform: scale(0.1); } + to { transform: scale(1); } +} + +@keyframes scale-up-random { + from { transform: scale(0.1); } + to { transform: scale(1.06); } +} + +@keyframes slide-and-fade { + from { opacity: 0; transform: translateY(-100%); } + to { opacity: 1; transform: translateY(0); } +} + + + diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 2c7b8065c..9150589ea 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -49,8 +49,16 @@ def index @prop_count = 36286 @map_count = total_mapping_count @analytics = LinkedData::Client::Analytics.last_month - + @projects_count = LinkedData::Client::Models::Project.all.length + @users_count = LinkedData::Client::Models::User.all.length @ontology_names = @ontologies.map { |ont| ["#{ont.name} (#{ont.acronym})", ont.acronym] } + @upload_benifits = [ + "Discover new insights and connections by exploring other ontologies in the repository.", + "Contribute to the growth and development of your domain by adding new concepts and categories.", + "Use version control to manage the changes to your ontology over time and collaborate with other users.", + "Get feedback and suggestions from other users who can review and comment on your ontology.", + "Get the FAIR score and metrics for your ontology." + ] @anal_ont_names = {} @anal_ont_numbers = [] diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 222b3a746..fb07910b3 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -14,128 +14,153 @@ \   %a{:href => "#", :onclick => "close_message(); return false;", :style => "font-size: small; color: darkGray;"} [close] -%div.container.pb-4.pb-md-5 - %div.row - %div.col - %div.px-2.py-2.pt-md-5.border-bottom.text-center - %h2 - = t(".welcome", site: "#{$SITE}") - %small.text-muted - = t(".tagline") - %div.row.search.pt-4 - %div.col - %div.card-deck - -# Search for a class across ontologies - %div.card - %div.card-header Search for a class - %div.card-body - = form_tag("/search", method: "get") do - %div.input-group.mb-3 - - placeholder = t(".query_placeholder") - = text_field_tag("query", nil, class: "form-control", placeholder: placeholder) - %div.input-group-append - = button_tag(type: "submit", class: "btn btn-primary", aria: {label: "Search for a class"}) do - %i{class: "fas fa-search fa-lg", aria: {hidden: "true"}} - %a{:href => "/search?opt=advanced"} Advanced Search - -# Search for an ontology - %div.card - %div.card-header Find an ontology - %div.card-body - %input#find_ontology_id{:type => "hidden"} - %div.input-group.mb-3 - = text_field_tag("ontology", nil, id: "find_ontology", class: "form-control", data: {ontologynames: @ontology_names}, placeholder: t(".find_ontology_placeholder")) - %div.input-group-append - = button_tag(class: "btn btn-primary", onclick: "jumpToValueOntology()", aria: {label: "Find an ontology"}) do - %i{class: "fas fa-search fa-lg", aria: {hidden: "true"}} - %div.dropdown - = button_tag("Browse Ontologies", type: "button", id: "ontologyGroupsDropdown", class: "btn btn-info dropdown-toggle", data: {toggle: "dropdown", offset: "0,10"}, aria: {haspopup: "true", expanded: "false"}) - %div.dropdown-menu{"aria-labelledby": "ontologyGroupsDropdown"} - = link_to("All", ontologies_path(), class: "dropdown-item") - %div.dropdown-divider - %h6.dropdown-header Browse by group - - @groups.each do |group| - = link_to(group[:name], ontologies_path(filter: group[:acronym]), class: "dropdown-item") - %div.row.pt-3.statistics - %div.col - %div.card-deck - -# Ontology visits - %div.card - %div.card-header Ontology Visits #{"in full #{$SITE} " if at_slice?} (#{@analytics.date.strftime("%B %Y")}) - = content_tag(:div, nil, id: "ontology-visits-chart", class: "card-body", data: {ontnames: @anal_ont_names, ontnumbers: @anal_ont_numbers}) do - %canvas#myChart - = link_to("More", visits_path()) - -# Ontology statistics - %div.card - %div.card-header #{$SITE} Statistics #{"in full #{$SITE}" if at_slice?} - %ul.list-group.list-group-flush - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span Ontologies - %span= number_with_delimiter(@ont_count) - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span Classes - %span= number_with_delimiter(@cls_count, :delimiter => ",") - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span Individuals - %span= number_with_delimiter(@individuals_count, :delimiter => ",") - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span Projects - %span= LinkedData::Client::Models::Project.all.length - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span Users - %span= LinkedData::Client::Models::User.all.length - - if fairness_service_enabled? - %div#fair-home.row.mt-3 - = render partial: "fair_score_home" - %div.row.pt-3.extra - %div.col - %div.card-deck - -# Latest Notes - %div.card - %div.card-header Latest Notes - %ul.list-group.list-group-flush - - if @last_notes.nil? || @last_notes.empty? - %li.list-group-item - %span No recent notes have been submitted - - else - - for note in @last_notes - %li.list-group-item - - begin - = link_to "#{note[:subject]} (#{note[:ont_name]})", note_path(CGI.escape(note[:id])) - %br/ - %span{:style => "color: #AAAAAA"} - = "#{time_ago_in_words(note[:created])} ago" - by #{note[:author]} - - if note[:body] - %p - = truncate(strip_tags(note[:body]), :length => 100) - \  - - rescue - - if !$ENABLE_SLICES.nil? && $ENABLE_SLICES == true && !at_slice? - -# Slices - %div.card - %div.card-header Slices - %ul.list-group.list-group-flush - - LinkedData::Client::Models::Slice.all.each_with_index do |slice, index| - - break if index == 10 - - slice_name = "#{slice.name} (#{slice.acronym})" - - slice_link = "http://#{slice.acronym}.#{$UI_URL.sub("http://", "")}" - %li.list-group-item - = link_to slice_name, slice_link +.home-header-container + .home-header-background + .home-bubbles + .home-random-bubbles + %img{:src => asset_path("home-random-bubbles.svg")}/ + .home-bubble.home-bubble-one + %h5 + = @anal_ont_names.keys[0] + %p + = @anal_ont_numbers[0].to_s + " visits" + .home-bubble.home-bubble-two + %h5 + = @anal_ont_names.keys[1] + %p + = @anal_ont_numbers[1].to_s + " visits" + .home-bubble.home-bubble-three + %h5 + = @anal_ont_names.keys[2] + %p + = @anal_ont_numbers[2].to_s + " visits" + %a.home-bubble.home-bubble-four{:href => "/visits"} + %h5 ... + .home-header-title-container + .home-header-title + %h4 Welcome to AgroPortal + %p The home of vocabularies and ontologies in agronomy and related fields. + %input{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text"}/ +.home-body-container + .home-section + %h4 Wanna upload an ontology? + %hr.home-section-line/ + %p Uploading an ontology is a way of sharing your domain knowledge with others. + %p By uploading your ontology to agroportal, you can: + .home-upload-benifits + - @upload_benifits.each do |benifit| + %div + %img{:src => asset_path("check-outlined.svg")}/ + %p + = benifit + - if session[:user].nil? + %a.home-upload-ontology-button{:href => "/login?redirect=/ontologies/new"} + %svg{:fill => "none", :height => "14", :viewbox => "0 0 15 14", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M3.46242 4.17686L6.91776 0.23682C6.98312 0.162278 7.06302 0.102677 7.15225 0.0618794C7.24149 0.0210821 7.33808 0 7.43576 0C7.53344 0 7.63003 0.0210821 7.71927 0.0618794C7.80851 0.102677 7.8884 0.162278 7.95377 0.23682L11.4092 4.17686C11.533 4.31795 11.5971 4.50373 11.5874 4.69334C11.5777 4.88295 11.4951 5.06086 11.3577 5.18792C11.2204 5.31498 11.0395 5.38079 10.8548 5.37087C10.6702 5.36095 10.497 5.27612 10.3732 5.13503L8.13286 2.58055V10.4116C8.13286 10.6015 8.05942 10.7836 7.92869 10.9178C7.79796 11.0521 7.62065 11.1275 7.43576 11.1275C7.25088 11.1275 7.07357 11.0521 6.94284 10.9178C6.8121 10.7836 6.73866 10.6015 6.73866 10.4116V2.58058L4.49846 5.13512C4.43719 5.20498 4.36313 5.26177 4.28049 5.30223C4.19785 5.3427 4.10826 5.36605 4.01684 5.37096C3.92541 5.37587 3.83394 5.36223 3.74764 5.33084C3.66135 5.29944 3.58192 5.2509 3.51389 5.18798C3.44586 5.12506 3.39057 5.04899 3.35117 4.96413C3.31176 4.87926 3.28902 4.78726 3.28425 4.69337C3.27947 4.59948 3.29274 4.50554 3.32331 4.41692C3.35388 4.32829 3.40115 4.24672 3.46242 4.17686ZM14.1744 12.488H0.697103C0.51222 12.488 0.334909 12.5635 0.204177 12.6977C0.0734445 12.832 0 13.0141 0 13.2039C0 13.3938 0.0734445 13.5759 0.204177 13.7101C0.334909 13.8444 0.51222 13.9198 0.697103 13.9198H14.1744C14.3593 13.9198 14.5366 13.8444 14.6673 13.7101C14.7981 13.5759 14.8715 13.3938 14.8715 13.2039C14.8715 13.0141 14.7981 12.832 14.6673 12.6977C14.5366 12.5635 14.3593 12.488 14.1744 12.488Z", :fill => "#31B404"} + upload ontology + - else + %a.home-upload-ontology-button{:href => "/ontologies/new"} + %svg{:fill => "none", :height => "14", :viewbox => "0 0 15 14", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M3.46242 4.17686L6.91776 0.23682C6.98312 0.162278 7.06302 0.102677 7.15225 0.0618794C7.24149 0.0210821 7.33808 0 7.43576 0C7.53344 0 7.63003 0.0210821 7.71927 0.0618794C7.80851 0.102677 7.8884 0.162278 7.95377 0.23682L11.4092 4.17686C11.533 4.31795 11.5971 4.50373 11.5874 4.69334C11.5777 4.88295 11.4951 5.06086 11.3577 5.18792C11.2204 5.31498 11.0395 5.38079 10.8548 5.37087C10.6702 5.36095 10.497 5.27612 10.3732 5.13503L8.13286 2.58055V10.4116C8.13286 10.6015 8.05942 10.7836 7.92869 10.9178C7.79796 11.0521 7.62065 11.1275 7.43576 11.1275C7.25088 11.1275 7.07357 11.0521 6.94284 10.9178C6.8121 10.7836 6.73866 10.6015 6.73866 10.4116V2.58058L4.49846 5.13512C4.43719 5.20498 4.36313 5.26177 4.28049 5.30223C4.19785 5.3427 4.10826 5.36605 4.01684 5.37096C3.92541 5.37587 3.83394 5.36223 3.74764 5.33084C3.66135 5.29944 3.58192 5.2509 3.51389 5.18798C3.44586 5.12506 3.39057 5.04899 3.35117 4.96413C3.31176 4.87926 3.28902 4.78726 3.28425 4.69337C3.27947 4.59948 3.29274 4.50554 3.32331 4.41692C3.35388 4.32829 3.40115 4.24672 3.46242 4.17686ZM14.1744 12.488H0.697103C0.51222 12.488 0.334909 12.5635 0.204177 12.6977C0.0734445 12.832 0 13.0141 0 13.2039C0 13.3938 0.0734445 13.5759 0.204177 13.7101C0.334909 13.8444 0.51222 13.9198 0.697103 13.9198H14.1744C14.3593 13.9198 14.5366 13.8444 14.6673 13.7101C14.7981 13.5759 14.8715 13.3938 14.8715 13.2039C14.8715 13.0141 14.7981 12.832 14.6673 12.6977C14.5366 12.5635 14.3593 12.488 14.1744 12.488Z", :fill => "#31B404"} + upload ontology + .home-section + %h4 Agroportal services + %hr.home-section-line/ + .home-card + %textarea.home-recommendations-and-annotations{:rows => "6"} + %input.hide{:type => "submit"}/ + .home-services-buttons + .home-get-recommendations + %p Get recommendations + %svg{:fill => "none", :height => "16", :viewbox => "0 0 15 16", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M2.61197 15.6472C1.16948 16.4746 0 15.7968 0 14.1344V1.86672C0 0.202676 1.16948 -0.474289 2.61197 0.352365L13.3345 6.50169C14.7775 7.32941 14.7775 8.67046 13.3345 9.49799L2.61197 15.6472Z", :fill => "#31B404"} + .home-services-buttons + .home-get-annotations + %p Get annotations + %img{:src => asset_path("play-white.svg")}/ + .home-section + .home-section-sub-sections-container + .home-sub-section-left + %h4 FAIR scores + %hr.home-section-line/ + .home-card.home-fair-scores + = render partial: "shared/fair_score_bars", locals: {data: nil} + %a{:href => "#fairDetails"} + %div + %p See details + %svg{:fill => "none", :height => "12", :viewbox => "0 0 7 12", :width => "7", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M0.828447 0.982555C0.668147 0.979582 0.510886 1.02651 0.378427 1.11684C0.245967 1.20716 0.144858 1.33643 0.0890904 1.48675C0.0333229 1.63706 0.0256545 1.801 0.0671467 1.95586C0.108639 2.11073 0.19724 2.24887 0.32069 2.35117L5.04517 6.39572L0.317771 10.4403C0.231406 10.5032 0.15903 10.5834 0.105209 10.6757C0.0513877 10.7681 0.0172914 10.8706 0.00507139 10.9767C-0.00714863 11.0829 0.00277318 11.1905 0.0342104 11.2926C0.0656476 11.3948 0.117918 11.4893 0.187722 11.5702C0.257526 11.6512 0.343349 11.7168 0.439774 11.7628C0.536199 11.8089 0.641133 11.8346 0.747953 11.8381C0.854772 11.8416 0.961158 11.8229 1.0604 11.7832C1.15964 11.7435 1.24957 11.6837 1.32453 11.6075L6.72894 6.9881C6.81393 6.9155 6.88218 6.82534 6.92897 6.72383C6.97577 6.62232 7 6.51187 7 6.40009C7 6.28832 6.97577 6.17787 6.92897 6.07636C6.88218 5.97485 6.81393 5.88469 6.72894 5.81209L1.32453 1.17807C1.18758 1.05615 1.01176 0.986851 0.828447 0.982555Z", :fill => "#31B404"} + .home-sub-section-right + %h4 Twitter news + %hr.home-section-line/ + .home-card.home-twitter-news + %a.twitter-timeline{"data-height" => "349", "data-width" => "533", :href => "https://twitter.com/lagroportal?ref_src=twsrc%5Etfw"} Tweets by lagroportal + %script{:async => "", :charset => "utf-8", :src => "https://platform.twitter.com/widgets.js"} - - - $HOME_PAGE_LOGOS.to_a.each do |home_page_logos_row| - - unless home_page_logos_row[:links].to_a.empty? - %div.row.pt-3 - %div.col - %div.card-deck - %div.card - %div.card-header= home_page_logos_row[:title] - %div.logos - - home_page_logos_row[:links].to_a.each do |logo| - = link_to(image_tag(logo[:img_src]), logo[:url], target: logo[:target]) + .home-section + .home-statistics-container + .home-agroportal-figures + %svg{:fill => "none", :height => "26", :viewbox => "0 0 35 26", :width => "35", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M34.3828 6.44418C33.2599 4.04698 31.4332 2.31495 28.9364 1.29338C25.5484 -0.0996672 22.02 -0.272638 18.4279 0.325213C14.6484 0.954407 11.24 2.42988 8.13908 4.59143C7.52058 5.02327 6.92129 5.48066 6.31359 5.92179C6.28357 5.88812 6.25475 5.85446 6.22472 5.82195L9.85167 2.54597L9.7616 2.34513C9.43493 2.4264 9.05302 2.42872 8.79001 2.60053C5.93168 4.47882 3.58858 6.82611 1.9012 9.76312C0.682212 11.8782 -0.0587909 14.106 0.00365996 16.5542C0.0295292 18.387 0.756885 20.1455 2.04532 21.4903C2.93284 22.4364 4.01372 23.1387 5.14144 23.812C7.39327 25.1482 9.82525 25.8296 12.4374 25.9666C16.66 26.1895 20.6413 25.2921 24.3751 23.4127C25.6662 22.766 26.9022 22.0215 28.0717 21.1861C29.4879 20.1586 30.7312 18.9255 31.7575 17.5305C33.3188 15.4491 34.7191 13.3235 34.9461 10.65C35.0722 9.19545 35.0121 7.78847 34.3828 6.44418ZM31.3251 10.1009C31.1779 11.5537 30.748 12.9665 30.0581 14.265C28.1233 17.9275 24.9828 20.2655 21.1036 21.6946C18.2501 22.7487 15.2789 22.8798 12.3593 21.9268C10.4786 21.3115 8.9017 20.2098 7.83043 18.53C7.74095 18.3821 7.6306 18.2469 7.50256 18.1284C7.35925 18.0198 7.20702 17.9228 7.04739 17.8382C7.04739 18.0494 6.96092 18.3025 7.04739 18.4685C8.50538 21.2546 10.7428 23.0946 13.9518 23.7261C14.7106 23.8796 15.4788 23.9858 16.2517 24.0442C17.0251 24.0988 17.8057 24.057 18.6056 24.0895C17.9391 24.2172 17.2749 24.4296 16.6036 24.4563C14.7661 24.5283 12.9346 24.5051 11.1403 23.9711C8.87168 23.2966 7.07622 22.0904 5.91367 20.0438C4.97931 18.4012 4.66345 16.6692 5.04776 14.835C5.57513 12.2696 6.86135 9.90726 8.75038 8.03458C10.6532 6.11095 12.9173 4.55481 15.4218 3.44913C17.9919 2.30683 20.7061 1.89471 23.4756 2.40434C25.4992 2.78046 27.2779 3.69523 28.2795 5.58513C29.0001 6.93755 29.3315 8.3515 28.7755 9.85019C28.5089 10.5653 28.223 11.2734 27.966 11.992C27.9204 12.1197 27.966 12.2787 27.978 12.4238C28.1269 12.4169 28.2891 12.4436 28.42 12.3925C28.5665 12.3365 28.6921 12.239 28.7803 12.1127C29.5873 10.8358 30.3007 9.51121 30.3235 7.96493C30.3355 7.15231 30.2671 6.32577 30.2383 5.58049C31.0969 6.934 31.4782 8.52015 31.3251 10.1009Z", :fill => "#31B404"} + %p AgroPortal in figures: + .home-statistics + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@ont_count, :delimiter => ",") + %p Ontologies + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@cls_count, :delimiter => ",") + %p Classes + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@individuals_count, :delimiter => ",") + %p Individuals + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@prop_count, :delimiter => ",") + %p Properties + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@projects_count, :delimiter => ",") + %p Projects + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@map_count, :delimiter => ",") + %p Mappings + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@users_count, :delimiter => ",") + %p Users + .home-section + .home-section-sub-sections-container + .home-sub-section-left + %h4 Supported by + %hr.home-section-line/ + .home-card.home-logos + %img{:src => asset_path("logos/supports/numev.png")}/ + %img{:src => asset_path("logos/supports/anr.png")}/ + %img{:src => asset_path("logos/supports/eu.png")}/ + .home-sub-section-right + %h4 With the colaboration of + %hr.home-section-line/ + .home-card.home-logos + %img{:src => asset_path("logos/collaboration/d2kab.png")}/ + %img{:src => asset_path("logos/collaboration/lirmm.png")}/ + %img{:src => asset_path("logos/collaboration/stanford.png")}/ + %img{:src => asset_path("logos/collaboration/inrae.png")}/ \ No newline at end of file From 9c7920eaccbd60a140cd9df701618923df0c8610 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Wed, 19 Apr 2023 15:15:56 +0200 Subject: [PATCH 070/533] clean up pages ( search + ncbo anotator plus ) --- app/views/ncbo_annotatorplus/index.html.haml | 96 ++++++------ app/views/search/index.html.haml | 32 ++-- config/locales/fr.yml | 154 ++++++++++++++++--- 3 files changed, 197 insertions(+), 85 deletions(-) diff --git a/app/views/ncbo_annotatorplus/index.html.haml b/app/views/ncbo_annotatorplus/index.html.haml index ba1315f02..7b24e1126 100644 --- a/app/views/ncbo_annotatorplus/index.html.haml +++ b/app/views/ncbo_annotatorplus/index.html.haml @@ -1,4 +1,4 @@ -- @title = "NCBO Annotator +" +- @title = t('nbco_annotatosplus.index.title') %head = javascript_include_tag "bp_annotator" @@ -6,7 +6,7 @@ %div.container-fluid.annotator %div.row %div.col - %h2.mt-3 NCBO Annotator + + %h2.mt-3= t('nbco_annotatosplus.index.title') %p = t('nbco_annotatosplus.index.intro', organization: $ORG).html_safe = link_to(help_path(anchor: "Annotator_Tab"), id: "annotator-help", target: "_blank") do @@ -17,82 +17,82 @@ %form %div.form-group = hidden_field_tag :annotation_sample_text, t('nbco_annotatosplus.index.sample_text') - = text_area_tag("annotation_text", nil, rows: 10, class: "form-control", placeholder: "Enter or paste text to be annotated", "aria-describedby": "annotateTextHelpBlock") + = text_area_tag("annotation_text", nil, rows: 10, class: "form-control", placeholder: t('nbco_annotatosplus.enter_paste_text_to_annotate'), "aria-describedby": "annotateTextHelpBlock") %small#annotateTextHelpBlock.form-text - %a#insert_text_link{href: "javascript:void(0);"} insert sample text + %a#insert_text_link{href: "javascript:void(0);"}= t('nbco_annotatosplus.insert_sample_text') - %a#advancedOptionsLink{:href => "javascript:void(0);"} Show advanced options >> + %a#advancedOptionsLink{:href => "javascript:void(0);"}= t('nbco_annotatosplus.show_advanced_options') >> %div#advanced-options-container.mt-4 %div.form-group %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("longest_only", "all", false, class: "custom-control-input") - %label.custom-control-label{for: "longest_only"} Match longest only + %label.custom-control-label{for: "longest_only"}= t('nbco_annotatosplus.match_longest_only') %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("whole_word_only", "all", false, class: "custom-control-input") - %label.custom-control-label{for: "whole_word_only"} Match partial words + %label.custom-control-label{for: "whole_word_only"}= t('nbco_annotatosplus.match_partial_words') %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("mappings", "all", false, id: "mappings_all", class: "custom-control-input") - %label.custom-control-label{for: "mappings_all"} Include mappings + %label.custom-control-label{for: "mappings_all"}= t('nbco_annotatosplus.include_mappings') %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("exclude_numbers", "all", false, class: "custom-control-input") - %label.custom-control-label{for: "exclude_numbers"} Exclude numbers + %label.custom-control-label{for: "exclude_numbers"}= t('nbco_annotatosplus.exclude_numbers') %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("exclude_synonyms", "all", false, class: "custom-control-input") - %label.custom-control-label{for: "exclude_synonyms"} Exclude synonyms + %label.custom-control-label{for: "exclude_synonyms"}= t('nbco_annotatosplus.exclude_synonyms') %div.form-group - %label{for: "ontology_ontologyId"} Select ontologies + %label{for: "ontology_ontologyId"}= t('nbco_annotatosplus.select_ontologies_list') = select_tag "ontology_ontologyId", options_for_select(@ontologies_for_select), multiple: true, data: { placeholder: "Click here to select ontologies" }, class: "form-control", "aria-describedby": "selectOntologiesHelpBlock" - %small#selectOntologiesHelpBlock.form-text.text-muted Start typing to select ontologies or leave blank to use all + %small#selectOntologiesHelpBlock.form-text.text-muted= t('nbco_annotatosplus.select_ontologies') - if @sem_type_ont %div.form-group - %label{for: "semantic_types"} Select UMLS semantic types + %label{for: "semantic_types"}= t('nbco_annotatosplus.select', t('nbco_annotatosplus.umls.semantic_types')) = select_tag("semantic_types", options_for_select(@semantic_types_for_select), multiple: "true", class: "form-control", "aria-describedby": "selectSemanticTypesHelpBlock") - %small#selectSemanticTypesHelpBlock.form-text.text-muted Start typing to select UMLS semantic types or leave blank to use all + %small#selectSemanticTypesHelpBlock.form-text.text-muted= t('nbco_annotatosplus.start_typing_to_select', t('nbco_annotatosplus.umls.semantic_types')) %div.form-group - %label{for: "semantic_groups"} Select UMLS semantic groups + %label{for: "semantic_groups"}= t('nbco_annotatosplus.select', t('nbco_annotatosplus.umls.semantic_groups')) = select_tag("semantic_groups", options_for_select(@semantic_groups_for_select), multiple: "true", class: "form-control", "aria-describedby": "selectSemanticGroupsHelpBlock") - %small#selectSemanticGroupsHelpBlock.form-text.text-muted Start typing to select UMLS semantic groups or leave blank to use all + %small#selectSemanticGroupsHelpBlock.form-text.text-muted= t('nbco_annotatosplus.start_typing_to_select', t('nbco_annotatosplus.umls.semantic_groups')) %div.form-group - %label{for: "class_hierarchy_max_level"} Include ancestors up to level: + %label{for: "class_hierarchy_max_level"}= t('nbco_annotatosplus.include_ancestors_up_to_level') + ":" - options = [["none", 0], *(1..10).map {|i| [i, i]}, ["all", 999]] = select_tag("class_hierarchy_max_level", options_for_select(options, 0), class: "form-control") %div.form-group - %label{for: "score"} Include score: + %label{for: "score"}= t('nbco_annotatosplus.include_score') + ":" - options = [["none", ""], ["old", "old"], ["cvalue", "cvalue"], ["cvalueh", "cvalueh"]] = select_tag(:score, options_for_select(options, 0), class: "form-control", "aria-describedby": "includeScoreHelpBlock") - %small#includeScoreHelpBlock.form-text.text-muted Score annotations following the previous 2009 NCBO measure (old) or the C-Value measure (cvalue). If hierarchy expansion is used, then prefer cvalueh. + %small#includeScoreHelpBlock.form-text.text-muted= t('nbco_annotatosplus.score_help') %div.form-group - %label{for: "score_threshold"} Filter by score threshold: + %label{for: "score_threshold"}= t('nbco_annotatosplus.filters.score_threshold') + ":" = number_field_tag(:score_threshold, 0, id: "score_threshold", class: "form-control", "aria-describedby": "scoreThresholdHelpBlock") - %small#scoreThresholdHelpBlock.form-text.text-muted Specify the minimum score value for annotations + %small#scoreThresholdHelpBlock.form-text.text-muted= t('nbco_annotatosplus.filters.score_threshold_help') %div.form-group - %label{for: "confidence_threshold"} Filter confidence threshold: + %label{for: "confidence_threshold"}= t('nbco_annotatosplus.filters.confidence_threshold') + ":" = number_field_tag(:confidence_threshold, 0, min: 0, max: 100, id: "confidence_threshold", class: "form-control", "aria-describedby": "confidenceThresholdHelpBlock") - %small#confidenceThresholdHelpBlock.form-text.text-muted Specify the minimum position in the scoring distribution (between 1 and 100) + %small#confidenceThresholdHelpBlock.form-text.text-muted= t('nbco_annotatosplus.filters.confidence_threshold_help') - if @recognizers.length > 1 %div.form-group - %label{for: "recognizer"} Entity recognizer: + %label{for: "recognizer"}= t('nbco_annotatosplus.recognizer') + ":" - default_recognizer = @recognizers.include?("mgrep") ? "mgrep" : @recognizers.first = select_tag("recognizer", options_for_select(@recognizers.map {|r| [r, r]}, default_recognizer), class: "form-control") %div.form-group %div.custom-control.custom-checkbox = check_box_tag("fast_context", :all, false, class: "custom-control-input") - %label.custom-control-label{for: "fast_context"} FastContext - %small#fast_contextnHelp.form-text.text-muted Enable FastContext to detect : if a concept has been negated (affirmed, negated), who experienced the found concept (patient, other), when the annotated concept occurred (recent, historical, hypothetical), and/or if the annotated concept is uncertain (certain, uncertain). + %label.custom-control-label{for: "fast_context"}= t('nbco_annotatosplus.fast_context.title') + %small#fast_contextnHelp.form-text.text-muted= t('nbco_annotatosplus.fast_context.help') %div.my-4 = button_tag("Get annotations", type: "button", id: "annotator_button", class: "btn btn-primary btn-lg") @@ -104,9 +104,9 @@ %div.col #annotations_container #result_counts - %h4 Annotations + %h4= t('nbco_annotatosplus.annotations') #filter_list{:style => "font-size: 9pt; color: gray; display: none; clear: both; margin: -15px 0 5px"} - %span#filter_title> Results are filtered by: + %span#filter_title> #{t('nbco_annotatosplus.filters.by.title') + " :"}:  \  %span#filter_names #results_error{:style => "color: red; margin-bottom: 7px;"} @@ -114,45 +114,45 @@ %thead %tr %th - Class + = t('nbco_annotatosplus.filters.by.class') %span.popup_container %span.bp_popup_link_container - %a#filter_classes.bp_popup_link{:href => "javascript:void(0);"} filter + %a#filter_classes.bp_popup_link{:href => "javascript:void(0);"}= t('nbco_annotatosplus.filters.by.filter') %div#classes_filter_list.bp_popup_list %th - Ontology + = t('nbco_annotatosplus.filters.by.ontology') %span.popup_container %span.bp_popup_link_container - %a#filter_ontologies.bp_popup_link{:href => "javascript:void(0);"} filter + %a#filter_ontologies.bp_popup_link{:href => "javascript:void(0);"}= t('nbco_annotatosplus.filters.by.filter') %div#ontology_filter_list.bp_popup_list %th{class: "match_type"} - Type + = t('nbco_annotatosplus.filters.by.match_type') %span.popup_container %span.bp_popup_link_container - %a#filter_match_type.bp_popup_link{:href => "javascript:void(0);"} filter + %a#filter_match_type.bp_popup_link{:href => "javascript:void(0);"}= t('nbco_annotatosplus.filters.by.filter') %div#match_type_filter_list.bp_popup_list - %th UMLS Sem Type - %th{class: "match_context"} Context + %th= t('nbco_annotatosplus.filters.by.umls_sem_type') + %th{class: "match_context"}= t('nbco_annotatosplus.filters.by.match_context') %th - Matched Class + = t('nbco_annotatosplus.filters.by.matched_class') %span.popup_container %span.bp_popup_link_container - %a#filter_matched_classes.bp_popup_link{:href => "javascript:void(0);"} filter + %a#filter_matched_classes.bp_popup_link{:href => "javascript:void(0);"}= t('nbco_annotatosplus.filters.by.filter') %div#matched_classes_filter_list.bp_popup_list %th - Matched Ontology + = t('nbco_annotatosplus.filters.by.matched_ontology') %span.popup_container %span.bp_popup_link_container - %a#filter_matched_ontologies.bp_popup_link{:href => "javascript:void(0);"} filter + %a#filter_matched_ontologies.bp_popup_link{:href => "javascript:void(0);"}= t('nbco_annotatosplus.filters.by.filter') %div#matched_ontology_filter_list.bp_popup_list - %th Score - %th Negation - %th Experiencer - %th Temporality - %th Certainty + %th= t('nbco_annotatosplus.filters.by.score') + %th= t('nbco_annotatosplus.filters.by.negation') + %th= t('nbco_annotatosplus.filters.by.experiencer') + %th= t('nbco_annotatosplus.filters.by.temporality') + %th= t('nbco_annotatosplus.filters.by.certainty') %tbody %div.my-3 - %b Format results as: + %b= t('nbco_annotatosplus.filters.format_results_as') + ":" %div.my-3 %span#download_links_tabdelimited.link_button.ui_button %span#download_links_json.link_button.ui_button @@ -160,8 +160,8 @@ %span#download_links_text.link_button.ui_button -# %span#download_links_xml.link_button.ui_button %div.mt-3 - Reproduce these results using the + =t('nbco_annotatosplus.filters.reproduce_results_using') %span#annotator_parameters %div.mb-4 - Additional parameters explained at + =t('nbco_annotatosplus.filters.additional_parameters_explained_at') = link_to('Annotator API documentation', "#{$REST_URL}/documentation#nav_annotator", target: "_blank") diff --git a/app/views/search/index.html.haml b/app/views/search/index.html.haml index de4227627..653cc05dc 100644 --- a/app/views/search/index.html.haml +++ b/app/views/search/index.html.haml @@ -1,49 +1,49 @@ -- @title = t("search_page.title") +- @title = t("search.title") %div.container.mt-5 %h1.display-4 - = t("search_page.class_search") + = t("search.class_search") = form_tag("/search", method: "post") do %div.form-group = text_field_tag("search_keywords", nil, class: "form-control", aria: {describedby: "classSearchHelpBlock"}) %small#classSearchHelpBlock.form-text.text-muted - = t(".search_keywords_placeholder") + = t("search.index.search_keywords_placeholder") = link_to(t('help'), Rails.configuration.settings.links[:help_search], id: "search-help", - aria: {label: t('search_page.view_search_documentation')}, class: "float-right") + aria: {label: t('search.view_search_documentation')}, class: "float-right") %div.form-group - = link_to(t('search_page.show_advanced_options'), "javascript:void(0)", id: "advanced_options", data: {text_swap: t('search_page.hide_advanced_options')}, class: "form-text") + = link_to(t('search.show_advanced_options'), "javascript:void(0)", id: "advanced_options", data: {text_swap: t('search.hide_advanced_options')}, class: "form-text") -# Advanced search options %div#search_options{style: "display: none;"} %div.form-group.row - %div.col-sm-2= t("search_page.include_in_search") + ":" + %div.col-sm-2= t("search.include_in_search") + ":" %div.col-sm-10 %div.form-check = check_box(:search, :include_properties, class: "form-check-input") - = label(:search, :include_properties, "Property values", class: "form-check-label definition", title: t(".property_definition")) + = label(:search, :include_properties, t('search.property_values'), class: "form-check-label definition", title: t(".property_definition")) %div.form-check = check_box(:search, :include_obsolete, class: "form-check-input") - = label(:search, :include_obsolete, "Obsolete classes", class: "form-check-label definition", title: t(".obsolete_definition")) + = label(:search, :include_obsolete,t('search.obsolete_classes'), class: "form-check-label definition", title: t(".obsolete_definition")) %div.form-check = check_box(:search, :include_views, class: "form-check-input") - = label(:search, :include_views, "Ontology views", class: "form-check-label") + = label(:search, :include_views, t('search.ontology_views'), class: "form-check-label") %div.form-group.row - %div.col-sm-2= t("search_page.narrow_search_to") + ":" + %div.col-sm-2= t("search.narrow_search_to") + ":" %div.col-sm-10 %div.form-check = check_box(:search, :exact_match, class: "form-check-input") - = label(:search, :exact_match, "Exact matches", class: "form-check-label") + = label(:search, :exact_match, t("exact_matches"), class: "form-check-label") %div.form-check = check_box(:search, :require_definition, class: "form-check-input") - = label(:search, :require_definition, "Classes with definitions", class: "form-check-label") + = label(:search, :require_definition, t("search.classes_with_definitions"), class: "form-check-label") %div.form-group - %h6{style: "font-size: 10pt !important"}= t("search_page.categories") - = select(:search, :categories, options_for_select(categories_for_select), {}, style: "width: 432px", multiple: "true", data: {placeholder: t(".categories_placeholder")}) + %h6{style: "font-size: 10pt !important"}= t("search.categories") + = select(:search, :categories, options_for_select(categories_for_select), {}, style: "width: 432px", multiple: "true", data: {placeholder: t("search.index.categories_placeholder")}) %div.form-group.mb-5{style: "width:432px"} - = render :partial => "shared/ontology_picker", locals: {sel_text: "Ontologies"} + = render :partial => "shared/ontology_picker", locals: {sel_text: t("search.ontologies")} - = button_tag(t('search_page.title'), id: "search_button", class: "btn btn-primary") + = button_tag(t('search.title'), id: "search_button", class: "btn btn-primary") = content_tag(:span, id: "search_spinner") do %img{src: asset_path('spinners/spinner_000000_16px.gif'), style: "vertical-align: middle;"} diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 43153f0ea..bc1d2ad40 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,5 +1,122 @@ fr: + + + ######################################################## NCBO ANNOTAROR PLUS ####################################################### + #################################################################################################################################### + + nbco_annotatosplus: + + score_help: "Annotations de score suivant la mesure NCBO 2009 précédente (ancienne) ou Annotations de score suivant la mesure C-Value (cvalue) ou Annotations de score suivant la mesure C-Value avec expansion de la hiérarchie (cvalueh)" + start_typing_to_select: "Commencez à taper pour sélectionner %{type} ou laissez vide pour tout utiliser" + include_ancestors_up_to_level: "Inclure les ancêtres jusqu'au niveau" + include_score: "Inclure le score" + + recognizer: "Reconnaissance d'entité" + + enter_paste_text_to_annotate: "Entrez ou collez le texte à annoter :" + + show_advanced_options : "Afficher les options avancées" + insert_sample_text : "Insérer un exemple de texte" + match_longest_only: "Correspondance la plus longue seulement" + match_partial_words: "Correspondance de mots partiels" + include_mappings: "Inclure les correspondances" + exclude_numbers: "Exclure les nombres" + exclude_synonyms: "Exclure les synonymes" + select_ontologies: "Commencez à taper pour sélectionner des ontologies ou laissez vide pour utiliser toutes les ontologies" + select_ontologies_list: "Sélectionnez les ontologies" + + umls: + semantic : "sémantique UMLS" + semantic_types: "Types sémantiques UMLS" + semantic_groups: "Groupes sémantiques UMLS" + + select: "Sélectionnez %{name}" + + fast_context: + title: "FastContext" + help: "Activer FastContext pour détecter : si un concept a été nié (affirmé, nié), qui a vécu le concept trouvé (patient, autre), quand le concept annoté s'est produit (récent, historique, hypothétique), et/ou si le concept annoté est incertain (certain, incertain)." + + annotations: "Annotations" + + filters: + by: + filter: "Filtrer" + title: "Les résultats sont filtrés par" + class: "Classe" + ontology: "Ontologie" + match_type: "Type" + match_context: "Contexte" + matched_class: "Classe associée" + matched_ontology: "Ontologie associée" + umls_sem_type: "Type sémantique UMLS" + + score: "Score" + negation: "Négation" + experiencer: "Expérience" + temporality: "Temporalité" + certainty: "Certitude" + + additional_parameters_explained_at: "Des paramètres supplémentaires sont expliqués à la page :" + format_results_as: "Formater les résultats en tant que :" + reproduce_results_using: "Reproduire ces résultats en utilisant le" + match_longest_only: "Correspond le plus long uniquement" + match_partial_words: "Reconnaître des mots partiels" + include_mappings: "Inclure les mappages" + exclude_numbers: "Exclure des numéros" + exclude_synonyms: "Exclure les synonymes" + max_hierarchy_level: "Inclure les ancêtres jusqu'au niveau" + score: "Inclure le score" + score_help: "Annotations de score suivant la mesure NCBO 2009 précédente (ancienne) ou Annotations de score suivant la mesure C-Value (cvalue) ou Annotations de score suivant la mesure C-Value avec expansion de la hiérarchie (cvalueh)" + score_threshold: "Filtrer par seuil de score" + score_threshold_help: "Spécifier la valeur de score minimum pour les annotations" + confidence_threshold: "Seuil de confiance du filtre" + confidence_threshold_help: "Spécifiez la position minimale dans la distribution des scores (entre 1 et 100)" + recognizer de reconnaissance : "outil de reconnaissance d'entité" + + index: + title: "NCBO Annotator +" + intro: > + Le NCBO Annotator+ est un proxy appelant le service Web NCBO Annotator sur le NCBO BioPortal. +

    + Tchechmedjiev, A., Abdaoui, A., Emonet, V., Melzi, S., Jonnagaddala, J., & Jonquet, C. (2018).
    Fonctionnalités améliorées pour annoter et indexer le texte clinique avec NCBO Annotator+. Bioinformatique, 34(11), 1962-1965. +

    + Si vous utilisez l'API, veuillez fournir une clé API NCBO BioPortal valide et accéder au service sur http://services.bioportal.lirmm.fr/ncbo_annotatorplus
    + Le texte soumis au NCBO Annotator+ doit être en anglais. + sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. + + #################################################################################################################################### + + ######################################################## SEARCH #################################################################### + #################################################################################################################################### + + search: + title: "Rechercher" + class_search: "Recherche de classe" + show_advanced_options: "Afficher les options avancées" + hide_advanced_options: "Masquer les options avancées" + view_search_documentation: "Voir la documentation de recherche" + include_in_search: "Inclure dans la recherche" + narrow_search_to: "Réduire la recherche à" + categories: "Catégories" + property_values: "Valeurs de propriété" + obsolete_classes: "Classes obsolètes" + ontology_views: "Vues d'ontologie" + exact_matches: " Correspondances Exactes" + classes_with_definitions: "Classes avec Définitions" + ontologies: "Ontologies" + index: + intro: Rechercher une classe dans plusieurs ontologies + search_keywords_placeholder: Entrez une classe, par ex. Mélanome + categories_placeholder: Commencez à taper pour sélectionner des catégories ou laissez vide pour tout utiliser + property_definition: Association nommée entre deux entités. Les exemples sont "définition" (une relation entre une classe et du texte) et "partie de" (une relation entre deux classes). + obsolete_definition: > + Une classe que les auteurs de l'ontologie ont signalée comme étant obsolète et qu'ils recommandent de ne pas utiliser. Ces cours + sont souvent laissés dans des ontologies (plutôt que de les supprimer entièrement) afin que les systèmes existants qui en dépendent continuent à fonctionner. + + #################################################################################################################################### + + all : "Tout" see_details: "Voir les détails" view_fair_scores_definitions: "View fair scores definitions" @@ -15,6 +132,7 @@ fr: median: "Médiane" slices: "Tranches" help: "Aide" + or: "Ou" class: "Classe" filter : "Filtre" @@ -53,6 +171,7 @@ fr: get_recommendations: "Obtenir des recommandations" select_ontologies_list: "Sélectionnez les ontologies" + header: browse: "Parcourir" search: "Rechercher" @@ -94,6 +213,11 @@ fr: shared: show_advanced_options : "Afficher les options avancées" insert_sample_text : "Insérer un exemple de texte" + match_longest_only: "Correspondance la plus longue seulement" + match_partial_words: "Correspondance de mots partiels" + include_mappings: "Inclure les correspondances" + exclude_numbers: "Exclure les nombres" + select_ontologies: "Commencez à taper pour sélectionner des ontologies ou laissez vide pour utiliser toutes les ontologies" umls_semantic : "sémantique UMLS" @@ -259,29 +383,10 @@ fr: tooltip: "Activez Lemmatize pour lemmatiser le texte soumis et utiliser un dictionnaire lemmatisé pour les annotations" sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. - nbco_annotatosplus: - index: - intro: > - Le NCBO Annotator+ est un proxy appelant le service Web NCBO Annotator sur le NCBO BioPortal. -

    - Tchechmedjiev, A., Abdaoui, A., Emonet, V., Melzi, S., Jonnagaddala, J., & Jonquet, C. (2018). Fonctionnalités améliorées pour annoter et indexer le texte clinique avec NCBO Annotator+. Bioinformatique, 34(11), 1962-1965. -

    - Si vous utilisez l'API, veuillez fournir une clé API NCBO BioPortal valide et accéder au service sur http://services.bioportal.lirmm.fr/ncbo_annotatorplus
    - Le texte soumis au NCBO Annotator+ doit être en anglais. - sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. - recommender: intro: Obtenez des recommandations pour les ontologies les plus pertinentes à partir d'un extrait d'un texte biomédical ou d'une liste de mots-clés - search: - index: - intro: Rechercher une classe dans plusieurs ontologies - search_keywords_placeholder: Entrez une classe, par ex. Mélanome - categories_placeholder: Commencez à taper pour sélectionner des catégories ou laissez vide pour tout utiliser - property_definition: Association nommée entre deux entités. Les exemples sont "définition" (une relation entre une classe et du texte) et "partie de" (une relation entre deux classes). - obsolete_definition: > - Une classe que les auteurs de l'ontologie ont signalée comme étant obsolète et qu'ils recommandent de ne pas utiliser. Ces cours - sont souvent laissés dans des ontologies (plutôt que de les supprimer entièrement) afin que les systèmes existants qui en dépendent continuent à fonctionner. + projects: index: @@ -320,4 +425,11 @@ fr: loading_mappings: "Chargement des correspondances en cours..." find_mappings: "Trouver les correspondances d'une classe / concept" view_mappings_help: "View mappings help" - select_class: "Commencez à taper pour sélectionner une classe" \ No newline at end of file + select_class: "Commencez à taper pour sélectionner une classe" + select_ontologies: "Commencez à taper pour sélectionner des ontologies ou laissez vide pour utiliser toutes les ontologies" + select_semantic_types: "Sélectionnez les types sémantiques UMLS" + select_semantic_types_help: "Commencez à taper pour sélectionner les types sémantiques UMLS ou laissez vide pour utiliser tous les types" + select_semantic_groups: "Sélectionnez les groupes sémantiques UMLS" + select_semantic_groups_help: "Commencez à taper pour sélectionner les groupes sémantiques UMLS ou laissez vide pour utiliser tous les groupes" + include_ancestors_up_to_level: "Inclure les ancêtres jusqu'au niveau" + include_score: "Inclure le score" \ No newline at end of file From 565098acd18d983b98431f146a3b3c3740c33730 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Wed, 19 Apr 2023 15:31:49 +0200 Subject: [PATCH 071/533] translate projects page --- app/views/projects/index.html.haml | 36 +++++++++++------------ config/locales/fr.yml | 46 +++++++++++++++++++++--------- 2 files changed, 50 insertions(+), 32 deletions(-) diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml index 8d89ca399..71f480225 100644 --- a/app/views/projects/index.html.haml +++ b/app/views/projects/index.html.haml @@ -1,32 +1,32 @@ -- @title = "Project Listing" +- @title = t("projects.title") -#DescriptionDialog{:style => "display: none", :title => "project description"} - %p Description text -%h1.tab_header Projects +#DescriptionDialog{:style => "display: none", :title => t("projects.project_description")} + %p= t("projects.description_text") +%h1.tab_header= t("projects.self") %p.tab_description - = t(".intro", site: "#{$SITE}") - = link_to(help_path(anchor: "Projects_Tab"), id: "projects-help", aria: {label: "View projects help"}) do + = t("projects.index.intro", site: "#{$SITE}") + = link_to(help_path(anchor: "Projects_Tab"), id: "projects-help", aria: {label: t("projects.view_projects_help")}) do %i.fas.fa-question-circle.fa-lg{aria: {hidden: "true"}, style: "margin-left: .25em"} %div{:style => "padding:10px;"} %span - if session[:user].nil? - = button_to "Create New Project", "/login", :method => :get + = button_to t("projects.create_new_project"), "/login", :method => :get - else - = button_to "Create New Project", new_project_path, :method => :get + = button_to t("projects.create_new_project"), new_project_path, :method => :get %br/ %br/ %table#projects.zebra{:cellpadding => "0", :cellspacing => "0"} %thead %tr - %th Project - %th Description - %th Contacts - %th Institutions - %th Ontologies + %th= t("projects.self") + %th= t("projects.description") + %th= t("projects.contacts") + %th= t("projects.institutions") + %th= t("projects.ontologies") - if current_user_admin? - %th User - %th Created + %th= t("projects.creator") + %th= t("projects.created") %tbody - for project in @projects %tr @@ -35,15 +35,15 @@ %strong= link_to(project.name, project_path(project.acronym)) %br/ %span{:style => "font-size:75%; vertical-align:bottom;"} - = link_to("Home Page", project.homePage, target: "_blank", rel: "nofollow") + = link_to(t('projects.home_page'), project.homePage, target: "_blank", rel: "nofollow") %span.ui-icon.ui-icon-extlink{:style => "display: inline-block; vertical-align: text-bottom;"} \   - if session[:user] && (project.creator == session[:user].id || session[:user].admin?) - = link_to("Edit", edit_project_path(project.acronym)) + = link_to(t("projects.edit"), edit_project_path(project.acronym)) / TODO_REV: Enable delete project for admins - if current_user_admin?    - = link_to("Delete (admin only)", project_path(project.acronym), :method => :delete, :confirm => "Are you sure?") + = link_to(t("projects.delete_admin_only"), project_path(project.acronym), :method => :delete, :confirm => t("projects.are_you_sure")) / Project description (may be truncated with a dialog) %td{:style => "vertical-align:top;", :width => "50%"} - if ! project.description.nil? diff --git a/config/locales/fr.yml b/config/locales/fr.yml index bc1d2ad40..f2ecf85ee 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -116,6 +116,37 @@ fr: #################################################################################################################################### + ######################################################## PROJECTS ################################################################## + #################################################################################################################################### + + projects: + + title: "Liste de projets" + project_description: "Description du projet" + description_text: "Texte de description" + view_projects_help: "Aide à la visualisation des projets" + create_new_project: Créer un nouveau projet + + self: Projets + description: Description + contacts: Contacts + institutions: Institutions + ontologies: "Ontologies" + creator: "Utilisateur" + created: "Créé" + home_page: Page d'accueil + edit: Modifier + delete_admin_only: Supprimer (administrateur seulement) + delete_confirm: Êtes-vous sûr(e) ? + + index: + intro: Parcourez une sélection de projets qui utilisent les ressources %{site} + + #################################################################################################################################### + + + + all : "Tout" see_details: "Voir les détails" @@ -221,16 +252,6 @@ fr: umls_semantic : "sémantique UMLS" - search_page: - title: "Rechercher" - class_search: "Recherche de classe" - show_advanced_options: "Afficher les options avancées" - hide_advanced_options: "Masquer les options avancées" - view_search_documentation: "Voir la documentation de recherche" - include_in_search: "Inclure dans la recherche" - narrow_search_to: "Réduire la recherche à" - categories: "Catégories" - annotator_page: title: "Annotateur" get_annotator: "Obtenir les annotations" @@ -388,10 +409,7 @@ fr: - projects: - index: - intro: Parcourez une sélection de projets qui utilisent les ressources %{site} - + ontologies: self: "Ontologies" intro: Parcourir la bibliothèque d'ontologies From 0fb03cd68e494853cd96714c701a0e61342107ce Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Wed, 19 Apr 2023 15:32:51 +0200 Subject: [PATCH 072/533] Update index.html.haml --- app/views/projects/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml index 71f480225..50668c87a 100644 --- a/app/views/projects/index.html.haml +++ b/app/views/projects/index.html.haml @@ -43,7 +43,7 @@ / TODO_REV: Enable delete project for admins - if current_user_admin?    - = link_to(t("projects.delete_admin_only"), project_path(project.acronym), :method => :delete, :confirm => t("projects.are_you_sure")) + = link_to(t("projects.delete_admin_only"), project_path(project.acronym), :method => :delete, :confirm => t("projects.delete_confirm")) / Project description (may be truncated with a dialog) %td{:style => "vertical-align:top;", :width => "50%"} - if ! project.description.nil? From 4f262c399ad6cab8d92e6887cef54e51013adbb3 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Wed, 19 Apr 2023 16:05:26 +0200 Subject: [PATCH 073/533] tramslate landscape --- app/views/landscape/index.html.haml | 78 ++++++++++++++--------------- config/locales/fr.yml | 58 +++++++++++++++++++++ 2 files changed, 96 insertions(+), 40 deletions(-) diff --git a/app/views/landscape/index.html.haml b/app/views/landscape/index.html.haml index 0a059e9c7..a9b105e24 100644 --- a/app/views/landscape/index.html.haml +++ b/app/views/landscape/index.html.haml @@ -6,87 +6,86 @@ - @title = "Landscape" %div{:class => "container theme-showcase", :role => "main", :style => "width: 80%; display: block;", :align => "center"} %h1{:style => "font-size: 45px;"} - = $SITE - Landscape - %p Visualize data retrieved from the ontologies stored in the portal + = t("landscape.title", site: $SITE) + %p= t("landscape.intro") %div{:class => "panel panel-success", :style => "margin-top: 2em;"} %div{:class => "panel-heading"} - %h3{:class => "panel-title"} Groups and categories + %h3{:class => "panel-title"}= t("landscape.groups_and_categories") %div{:class => "panel-body"} %div{:class => "row", :style => "width: 80%;"} %div{:class => "col-md-6"} - %h2 Ontologies by group + %h2= t("landscape.ontologies_by", type: t("landscape.group")) %canvas#groupsCanvas %div{:class => "col-md-6"} - %h2 Ontologies by category + %h2= t("landscape.ontologies_by", type: t("landscape.category")) %canvas#domainCanvas %div{:class => "row", :style => "width: 80%; margin-top: 3em;"} %div{:class => "col-md-7"} - %h2 Ontologies count in each data catalog + %h2= t("landscape.ontologies_count_by_catalog") %canvas#dataCatalogCanvas %div{:class => "col-md-5"} - %h2 Ontologies by size + %h2= t("landscape.ontologies_by", type: t("landscape.size")) %canvas#sizeSlicesCanvas %hr{:style => "margin-top: 5em; margin-bottom: 5em;"} - %h1 Properties use - %p The proportion of properties usage among stored ontologies. + %h1= t("landscape.properties_use") + %p= t("landscape.properties_usage_proportion") %div#pieChartDiv %div{:class => "row"} %div{:class => "col-md-4"} - %h2 Ontologies natural languages + %h2= t("landscape.ontologies_languages") %div#naturalLanguagePieChartDiv %div{:class => "col-md-4"} - %h2 Licenses used by the ontologies + %h2= t("landscape.ontologies_licenses") %div#licensePieChartDiv %div{:class => "col-md-4"} - %h2 Most used tools to build ontologies + %h2= t("landscape.ontology_tools") %div#toolCloudChart{:style => "width: 100%; height: 500px;"} %div#chartTooltip{:style => "width: auto; display: none;"} - %span#chartTooltipValue none + %span#chartTooltipValue= t("none") - %button#propertiesBtn{:style => "margin-top: 1em;", :type => "button", :class => "btn btn-success", :onclick => "toggleDiv('properties')"} More properties charts + %button#propertiesBtn{:style => "margin-top: 1em;", :type => "button", :class => "btn btn-success", :onclick => "toggleDiv('properties')"}= t("landscape.more_properties_charts") %div#propertiesDiv{:class => "panel panel-info", :style => "margin-top: 2em;"} %div{:class => "panel-heading"} - %h3{:class => "panel-title"} Pie charts for properties used for the ontologies + %h3{:class => "panel-title"}= t("landscape.ontology_properties_pie_charts") %div{:class => "panel-body"} %div{:class => "row"} %div{:class => "col-md-3"} - %h2 prefLabel property URIs used for OWL ontologies + %h2= t("landscape.owl_ontology_preflabel_uris") %div#prefLabelPropertyPieChartDiv %div{:class => "col-md-3"} - %h2 synonym property URIs used for OWL ontologies + %h2= t("landscape.owl_ontology_synonym_uris") %div#synonymPropertyPieChartDiv %div{:class => "col-md-3"} - %h2 definition property URIs used for OWL ontologies + %h2= t("landscape.owl_ontology_definition_uris") %div#definitionPropertyPieChartDiv %div{:class => "col-md-3"} - %h2 author property URIs used for OWL ontologies + %h2= t("landscape.owl_ontology_author_uris") %div#authorPropertyPieChartDiv %hr{:style => "margin-top: 5em; margin-bottom: 5em;"} %div{:class => "panel panel-success", :style => "margin-top: 2em;"} %div{:class => "panel-heading"} - %h3{:class => "panel-title"} Ontologies types + %h3{:class => "panel-title"}= t("landscape.ontologies_properties") %div{:class => "panel-body"} %div{:class => "row"} %div{:class => "col-md-4"} - %h2 Format used + %h2= t("landscape.ontologies_formats") %canvas#formatCanvas %div{:class => "col-md-4"} - %h2 Ontology types + %h2= t("landscape.ontologies_properties") %canvas#isOfTypeCanvas %div{:class => "col-md-4"} - %h2 Ontology formality levels + %h2= t("landscape.ontology_formality_levels") %canvas#formalityLevelCanvas @@ -94,16 +93,16 @@ %div{:class => "panel panel-success", :style => "margin-top: 2em;"} %div{:class => "panel-heading"} - %h3{:class => "panel-title"} Contributors to ontologies development + %h3{:class => "panel-title"}= t("landscape.ontologies_contributors") %div{:class => "panel-body"} %div{:class => "row"} %div{:class => "col-md-6"} - %h1 Most active people - %p Most mentioned people as contact, creator, contributor, curator. + %h1= t("landscape.most_active_people") + %p= t("landscape.most_mentioned_people") %div#peopleCloudChart{:style => "width: 100%; height: 350px; margin-top: 2em; border-right: 1px solid #ccc;"} %div{:class => "col-md-6"} - %h1 Most active organizations - %p Organizations that fund and endorse the greatest number of ontologies. + %h1= t("landscape.most_active_organizations") + %p= t("landscape.funding_endorsing_organizations") %div#orgCloudChart{:style => "width: 100%; height: 350px; margin-top: 2em;"} %hr{:style => "margin-top: 4em; margin-bottom: 4em;"} @@ -111,23 +110,22 @@ %div{:class => "panel panel-success", :style => "margin-top: 2em;"} %div{:class => "panel-heading"} %h3{:class => "panel-title"} - Ontologies activity on - = $SITE + = t("landscape.ontologies_activity_on", site: $SITE) %div{:class => "panel-body"} %div{:class => "row"} %div{:class => "col-md-6"} - %h1 Most active people as reviewer - %p People that posted notes, review and projects + %h1= t("landscape.most_active_people_as_reviewer") + %p= t("landscape.most_mentioned_people_as_reviewer") %div#notesPeopleCloudChart{:style => "width: 100%; height: 350px; margin-top: 2em; border-right: 1px solid #ccc;"} %div{:class => "col-md-6"} - %h1 Most active ontologies - %p Ontologies that have notes, review and projects + %h1= t("landscape.most_active_ontologies") + %p= t("landscape.ontologies_with_notes_reviews_projects") %div#notesOntologiesCloudChart{:style => "width: 100%; height: 350px; margin-top: 2em;"} %hr{:style => "margin-top: 5em; margin-bottom: 5em;"} - %h1 Ontology relations network - %p{:style => "margin-bottom: 1em;"} Relations between ontologies stored in the portal + %h1= t("landscape.ontology_relations_network") + %p{:style => "margin-bottom: 1em;"}= t("landscape.relations_between_stored_ontologies") %div{:style => "display: flex;"} %div{:style => "text-align: left; width: 23em;"} @@ -135,7 +133,7 @@ = check_box_tag "selectedRelations[]", relation, true, :id => relation = label_tag relation, relation %br - %button{:type => "button", :class => "btn btn-success", :onclick => "buildNetwork(ontologyRelationsArray)", :style => "margin-bottom: 1em;"} Filter Network + %button{:type => "button", :class => "btn btn-success", :onclick => "buildNetwork(ontologyRelationsArray)", :style => "margin-bottom: 1em;"}= t("landscape.filter_network") %div{:style => "width: 100%;"} %div#networkContainer{:style => "height: 80vh; width: 100%; border:1px solid #cecece;"} @@ -144,13 +142,13 @@ -if fairness_service_enabled? %hr{:style => "margin-top: 5em; margin-bottom: 5em;"} %h1 - Ontology FAIRness Evaluator (O’FAIRe) + = t("landscape.ontology_fairness_evaluator") %div#fairness_assessment.p-2 = render partial: "fair_score_landscape" %hr{:style => "margin-top: 5em; margin-bottom: 5em;"} %div - %h1 Average metrics + %h1= t("landscape.average_metrics") %table.minimal.align-right{width: "30%", style: "margin-bottom: 3em;"} %tbody - for metric in @metrics_average diff --git a/config/locales/fr.yml b/config/locales/fr.yml index f2ecf85ee..1c08787dc 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -145,10 +145,68 @@ fr: #################################################################################################################################### + ####################################################### LANDSCAPE ################################################################## + #################################################################################################################################### + + landscape: + + title: "%{site} Paysage" + intro: Visualiser les données récupérées à partir des ontologies stockées dans le portail + groups_and_categories: Groupes et catégories + ontologies_by : "Ontologies par %{type}" + ontologies_count_by_catalog: Nombre d'ontologies dans chaque catalogue de données + properties_use: Utilisation des propriétés + properties_usage_proportion: The proportion of properties usage among stored ontologies + ontologies_languages: Langues naturelles des ontologies + ontologies_licenses: Licences utilisées par les ontologies + ontology_tools: Outils les plus utilisés pour construire des ontologies + + more_properties_charts: Plus de graphiques de propriétés + ontology_properties_pie_charts: Graphiques circulaires pour les propriétés utilisées dans les ontologies + owl_ontology_preflabel_uris: URIs de propriétés prefLabel utilisées pour les ontologies OWL + owl_ontology_synonym_uris: URIs de propriétés synonymes utilisées pour les ontologies OWL + owl_ontology_definition_uris: URIs de propriétés de définition utilisées pour les ontologies OWL + owl_ontology_author_uris: URIs de propriétés d'auteur utilisées pour les ontologies OWL + + ontology_types: Types d'ontologie + ontology_formality_levels: Niveaux de formalité des ontologies + ontologies_formats: Format utilisé + + ontologies_contributors: Contributeurs au développement d'ontologies + + most_active_people: Les personnes les plus actives + most_mentioned_people: Les personnes les plus mentionnées en tant que contact, créateur, contributeur ou conservateur + + most_active_organizations: Les organisations les plus actives + funding_endorsing_organizations: Les organisations qui financent et soutiennent le plus grand nombre d'ontologies + + ontologies_activity_on: "Activité des ontologies sur %{site}" + most_active_people_as_reviewer: "Les personnes les plus actives en tant que relecteurs" + most_mentioned_people_as_reviewer: Personnes ayant publié des notes, des avis et des projets + most_active_ontologies: "Ontologies les plus actives" + ontologies_with_notes_reviews_projects: "Ontologies avec des notes, des critiques et des projets" + + + ontology_relations_network: "Réseau de relations ontologiques" + relations_between_stored_ontologies: "Relations entre les ontologies stockées sur le portail" + + filter_network: "Filtrer le réseau" + + ontology_fairness_evaluator: "Évaluateur de conformité FAIR des ontologies (O’FAIRe)" + average_metrics: "Métriques moyennes" + + + group: Groupe + category: Catégorie + size: Taille + + ################################################################################################################################### + all : "Tout" + none: "aucune" see_details: "Voir les détails" view_fair_scores_definitions: "View fair scores definitions" get_json_version: "Get the json version" From d94738cd850e57fdb653f11513e4cec9f191e2b5 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 19 Apr 2023 12:03:26 +0200 Subject: [PATCH 074/533] Upload home page assets --- app/assets/images/check-outlined.svg | 4 + app/assets/images/home-random-bubbles.svg | 82 ++++++++++++++++++ .../images/logos/collaboration/cnrs_logo.jpg | Bin 185446 -> 0 bytes .../images/logos/collaboration/d2kab.png | Bin 0 -> 5232 bytes .../images/logos/collaboration/d2kab_logo.png | Bin 12217 -> 0 bytes .../images/logos/collaboration/inrae.png | Bin 0 -> 4793 bytes .../images/logos/collaboration/inrae_logo.jpg | Bin 9230 -> 0 bytes .../images/logos/collaboration/lirmm.png | Bin 0 -> 5146 bytes .../images/logos/collaboration/lirmm_logo.png | Bin 86558 -> 0 bytes .../images/logos/collaboration/sifr_logo.jpg | Bin 6344 -> 0 bytes .../stanford-university_logo.png | Bin 121975 -> 0 bytes .../images/logos/collaboration/stanford.png | Bin 0 -> 15057 bytes .../images/logos/collaboration/um_logo.png | Bin 33687 -> 0 bytes .../supports/agropolisfondation_logo.png | Bin 29060 -> 0 bytes app/assets/images/logos/supports/anr.png | Bin 0 -> 9952 bytes app/assets/images/logos/supports/anr_logo.png | Bin 9198 -> 0 bytes app/assets/images/logos/supports/eu.png | Bin 0 -> 3469 bytes app/assets/images/logos/supports/ibc_logo.jpg | Bin 10343 -> 0 bytes .../images/logos/supports/msca_eu_logo.jpg | Bin 44126 -> 0 bytes app/assets/images/logos/supports/numev.png | Bin 0 -> 4328 bytes .../images/logos/supports/numev_logo.png | Bin 10345 -> 0 bytes app/assets/images/play-white.svg | 3 + 22 files changed, 89 insertions(+) create mode 100644 app/assets/images/check-outlined.svg create mode 100644 app/assets/images/home-random-bubbles.svg delete mode 100644 app/assets/images/logos/collaboration/cnrs_logo.jpg create mode 100644 app/assets/images/logos/collaboration/d2kab.png delete mode 100644 app/assets/images/logos/collaboration/d2kab_logo.png create mode 100644 app/assets/images/logos/collaboration/inrae.png delete mode 100644 app/assets/images/logos/collaboration/inrae_logo.jpg create mode 100644 app/assets/images/logos/collaboration/lirmm.png delete mode 100644 app/assets/images/logos/collaboration/lirmm_logo.png delete mode 100644 app/assets/images/logos/collaboration/sifr_logo.jpg delete mode 100644 app/assets/images/logos/collaboration/stanford-university_logo.png create mode 100644 app/assets/images/logos/collaboration/stanford.png delete mode 100644 app/assets/images/logos/collaboration/um_logo.png delete mode 100644 app/assets/images/logos/supports/agropolisfondation_logo.png create mode 100644 app/assets/images/logos/supports/anr.png delete mode 100644 app/assets/images/logos/supports/anr_logo.png create mode 100644 app/assets/images/logos/supports/eu.png delete mode 100644 app/assets/images/logos/supports/ibc_logo.jpg delete mode 100644 app/assets/images/logos/supports/msca_eu_logo.jpg create mode 100644 app/assets/images/logos/supports/numev.png delete mode 100644 app/assets/images/logos/supports/numev_logo.png create mode 100644 app/assets/images/play-white.svg diff --git a/app/assets/images/check-outlined.svg b/app/assets/images/check-outlined.svg new file mode 100644 index 000000000..db2866523 --- /dev/null +++ b/app/assets/images/check-outlined.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/assets/images/home-random-bubbles.svg b/app/assets/images/home-random-bubbles.svg new file mode 100644 index 000000000..52eee7a98 --- /dev/null +++ b/app/assets/images/home-random-bubbles.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/logos/collaboration/cnrs_logo.jpg b/app/assets/images/logos/collaboration/cnrs_logo.jpg deleted file mode 100644 index a3aeb1d7452c231c402a3be58a87ac921e232c7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185446 zcmeEv2V4`))9?Wb78J2y#UNk@fzT0%ND~!7x>PX)L`r~A1ccbJA!0*Rh>C!Sh@cR9 zRD`Ig^j@O$-a`o~-(FBGkB@);-}}7fdq0lfUAD~5&dklu&feY}tSZ)LXwhyh9W981 zlY>KyLkxmgUsmqbJnCoO0Dln2Drh!44MB%ER!^mmaBTVt z!wF!dAaI4&g42To$xbf?=_^5w(5$a*AA;W^NId@~1Z`aO?N`kXdk7<>e;DhD#T~}F z38@<*g>-Gvj;?SXLP|<1C`m~vNl6PyNh%?cO45=L#C4BjvR@Vpg6?sC!_S#_kL!CH z^aUT>99&;%<^R~l6EbIn?}SZcP~e%mF&?kAAkOGED`?GzDRX7K8ew2a5eVs)PNR}K5W z44`qc0uPc;ZP2)8WT*K$%2RH6iE$%l@cHT7Qm>{Vt&P_oo_TTOO2cMv@SR%QyZImD4%XwlNr%3pF3O0TxfmH+X zaoSkzD1eup#T(7h2v!RVs zeeNrkQGDNha1C0rV!jv;b6H8vVHT8VPEOoTD`q17hzBI{JMtLvvEhqKR|?E!K?`tv z?G`ME>vG>%L67B8XbvaOal_o%UE<0s9BwTTiLayT4Wv{K5~X8`_4YmK9}SEwX2f=r zv5cf6t;x(60hkZCh|qG6`plcjl}3dVPOFRKnI}K!>|MwIjCZ4Gh>3}XORQI_D*0%3 z9=XrgV{dZJr_P4X!i#In14phrxav{6?J}xD?}^#NHGy%rUN)@4`q#1`mzu7vEa)DQ zh94`Vm0#HL-b+yJT4KCe!ocTRsQ@Jw^yxt!`QdHbC28}|>MTrrI!qXNUWEJ-u{+)m z6BM?6xNJP|c4#NQHjOIfZI*sC{JOlz!p^}>_~O)9o@eCV>@y#26t-H)Kla*oEp#L@ z{F?pxe0ink9K|)A5gGA!SdgGanZZkxMyVK%**}4JP-5*u^{2a3^rW#Mv$)|9ge!U0 z^QJ)goEjin?F1II#9(-@kGC4#v!cI%UNU)9+V zts{DMH=b1lZm5wG#r$Qvm0UwqB;!S8lzF}ND514Inm}+N(5@C1i#|k|F_S%6P<*y> zt9>ReqK8a&#-^~KbQ|WS=k!$r5>F6jeqj}B`cl1k-r8OATdf+QtDG9c9BLXS;uWz} z6{Rvi7G(XYi=o3%m&pxDy{&e$+@`gZ-CX>lqB%Jv$Z$wD*$!Fc{P3#I?l<59bPS{b zjRseBM6X9j7v&^TL*mD|nc?`DHTHEr6LHU(a^cuay|(z_J{ENPK%CGH;R|X)RRNiu zv6T%ss25$O7p&&_mOAXHzbJyyUC# zLTPz1pmhFLRxx#_x*F~hN8HBa%Yy=r(kfWclK`XJmU#O^i$BO|xc1mvwAE*@pnjY7 z0TvX7Dac|$t0DsGQ4fgGMeT1p@7x+xblr~bL5+;i06=4Rx-TbT7HSt`g|yzVcDc^^ z1&bS@0VVN;LB%+~HpBRsFMK5y+X7B6uIa)Kh1DW%eWXweRFp_6{_;C%H>f`M^edCk zT3vmW@uB;;pxyaxI7=2}FO3S-i>0TC4$kRFKfr5m-i?^k@HV`ZOl){KM_4Viae0v} z!-1CKmAfh@J_wVz-NFL@NHG zGIQNiJ~2#!YbRq@Rf|HI*^%bAQddM5CWeQ}tPth; zQZLkc4LYff>Bu4OXm@d0J&@sfTwO+hf1;4)%g4-qbhEg`?~~lbYOMesHK$$fJmd1^ zG;?QWiEJZz^l}zY&?rG-_m1WS{1Y2fO7Y-|&bltQ#Er!%6rHE5GA>5ZMJ#$TgfHQY zlnzAWL?;W{`JNVi>c)-Iq-5kasuhN4P_VX9JT-Nq+bN<4y{ddo+e@*_FRI^g>t4Qr z4GEK(E6UMmAaNMF2KDbdPOnUFWSG&SsP2_ii!O5Xh4W*gOhI9QLXW(W6O}9AE}}%6o0Q zSR%5vcA$S3=ca=TguHJbcJ#-m#&G6!mqs2GMK7|~b|}cby_a)tfA8Jn8iH!g68lg| zN-YbSA!SFfCE_PX^ag963y09=pQODi>FiK3_@Lw>SFx&gb;kTEL}HXD{B#SrIi`mayzN1(l3W(FB4RHUk&u3RyO)`T`<4=s($$G9s5%~NS(8+TTxhz# z;Jwn_OBY=>GLhtJ78Gb)UUlKz+69VtLRBT6u%HX7SKcehG7j`G|y z(OfLVKZ{d&y95}V%LM&JP%(C%S+RG-I-(KJ&dVTKEo;c7=ALKP($X{;I zsiM*s$ZcE|@{BvXEbCd?0`p22gXW+`F=Dtcax}iN*B#waU5RR)yd1Hz-I&n&su9yZ z9|m^)CBV=FYS!p*!;Kqv%(!c6W*a_g7?pcm_k|vWDzlX1+25(6o;X|}J@~Z1A9=({ z5LZy3=C9)NjH={2PSehZ)M%jdP#=&o$t6?xe4ej-h8WpM^-KkZc+lYFkV zIt*un>&b53N5N4rq3F8N^xD7>CU;a3EumiGQTeq4!o>6^?-QSQZFH*XYpERW^yzzg zif)2$%puXmeV7+4Px<35nDpbS54IaBKTzPIK3QIp^Wsoy?-_!{y^OPdA5{4s_7a9v zwD2yTlty5Z`Bmh<_%QM52N||3=&D~Vb9v_AvTUX}X<$idpa2VM>$;{$xbFL8EU<)W zlQAAv*-N}u&P;Aeu0%W^p0K$XtfN{%(=N#=qC|Dt;1GQ*NV~(7xd8X!i3NJghS?!b za|hjdQPkZmr~*abPsP(wH&_rM;Xo@|o#)CiKD#kUcx&?bwftigqt38Qp4e79{UX8h zd+PU~cbL_u_~X4(TI|w4;Tjr8v%*w*k!=c{ZP}E&Z4&w&_3Epic(%4cm8m1Q2ji4_ zd{=vHdWPQ;Kp+{kD8-gts=dTYpyQy^d0y8+cjTRG-h$gwWyW$!~%|@4JH>dZxum9v;Ug#fEg1c62b-kw3 z75zAcu$y?YlCMjuzh&v_E!Jn4o0O6g<>jN4CnOFQ+*>T9a>wy4*SJYVC#vU6Tf9T3 zJ^EQrs%L!d)9$lHfh(a#e0%eUlZ`v+_Av-n>Cm9it7g%oTPlsCy6a81BN*JqR2CHO z1jbr`vGJEjj{F*z3yV<3dl_c!%|5U4fd&~Tauqm*hg~5DY^XnsS~QyI!h)8E6P#!f zrIvd$Zf+OMeOc0`PoXck2{ACENQG+O31j@QYt{YShs`U8oFMfp zSNA-i-Jz;b%v}o-d$bqaa!JT*OtQBKsaw%z)2QA-y{M${bZfOzUleNzX@$YinkOYk3?Mn3*N% zHkGj~NHuB2l|#D@eq6Gq>QyhQL(!)3IT*Qs<1bF6VT0z?wKU3TOC_)?g>+N!bLJ`V z8unblV!QB^YdnP#Le*hIZbK4r0h8KF*Q8uY=o$T%V&YlSkOBaLl!i@ zetcd73lgA=o$nyc#}858Wfi_xuF65YAPCXOu;~JZE@+T6M2%ND9Drs)c?eS$lsj%S zPAiWjAg=o&^;*Niorjsx5v39nTFYW$Z}B<1qF>Sr9{Z$%`w+j}qBJM#b3JdT@tW=1 z>n*Ewn9uP9z$1_4Zk?BpM#iQbIhnM)sAa1-hhcuf+mOANfM{VVjM%=?Zc8301VUjg2jOg$w2* zflKb$xWm87fq}voFTY3gkoR+%J3t^5&DT?CeEWe<^|}AT z;9&|;n=URqNRW0~hd`P<`1pRKn}U*}3$d9^h&Z z%O@Jq!l_mSlMKCT%aQtU|7^?5+v}p6xl=RRDD5Tr-HCWQww+;haXDBpfcv{2h558G zw-jiJpWIVy*YdH_&Vb!vjh>J7bnkyo84YuNi_@dYOAj9SUh>yo#;uSz=2FmN@+_g`0>zaLMFp@%RtwD9oYpdj=@5A7&33OWCtKsgmwr!0q ziqRkPGcxC|zAuhGbW;Yo)ND}C7BC|%l6Jgz# z6q6GkGIGdsLi3I4t2Qff#(Y5r{(wg>E^<_*SHk}tnC14|ZHkW^-QJ=2&SuB0om$6m zl!rSDzzibtTs776_Uf3rn{|Opc`z)f{l=xt!U6SCU50~noC4EWD z@O6iy3JIsj1C{()GZn@O?{BI4`f45{-3co9 zysD#e2wt8}tye`MouUQ1NBIW)i>->8PteGUo6W8JtanJSt2oh7p`LT`G1)~no7Ay9 zjG;}-0E=Rqn2Rej=L;aEb=H>T6N;M%9~t%(`@-S18KcHF%BdkWRj&jUGD)los&NaV z3Eer6UznJvPbsp`Q`|pJl+l#KG1uPo!)tdGvmoAVE2GYA=_T>Q-Iwp&D(OCUQ$ST% zyA7GY%e!{VQ5WF5yxzFe5;@zs>CK!#FCD8c6%pwN)U7mEr$e0!L+G_D@VDP4jtdZ( zwM?guiny)EPm0OT5h^y&5xuY!a2X4xv%g9MENcHMxVTeoVb@Iy#?yRnl<0_3FMM0Z zKkUZbR7t5IA3)cwv~r&P33t~!IaQXV)8~^C7Z%NeF7m|{cQEWaWv}dtytC)UNSb!7 zb>Wy63({mkrx>WQ-QGwXzd*(!r0htxX&E72jFw&;u6ZJMyU@kw&QJhS zfdj*%ufO1)&U*c;x;H;B-GpLQvL9S2lPVMAr~&Ag0!=UEA2)KkJ8$5sEf{b?wFBpz zyRTm!Uzx49G&yri64jh+>atHPnRpIoS(-x4j&09=YNPX1x~r{h3$07AjCRn)$~rao zcEFQ&PTHyQR^#Ek*x_R#v^-$JhP%mO0{a9PemLMha73Q(^21m!`Te-|9HOz;KJnz( zla;c$Hvz&&TXiw8`gM`=9GF{y#e7|fZ;yVvP}O1Z=})%rcvCBW%fa!MmSuxX*R`1M zYIkihboJoEt|DeM{-Q59=K_L8hgLHe-ef^_Hf`c8CNGs zVY`ZgxMwcO@vGL5`Re@<;vQF5?)9t_ix=k3NMshj*fDY>GE3+?l5(2kHD_kr>*ee4dE<_~l@FdnF#nr4amf7g?kz>q2om!IVa_CKY!a?M>qn zunu@p3GANl$Y_0sbQy^`*AJ`Bf|fFPcvBmqF%kQUpH>E5h_nk#w75tC&(+`uf1fKI zv{Y7a6Dwy(9J#+611!sciv6*N|1s>QQ$6zMmnzO%hVr zsiQj!-UWdmp*3KagcIUi!#NvTs=m*_(B9G6*3knazS9wX*aIuRpAEa74ZFx>(BnXQ zPOti+Ane}L=JU71bzGfronVYI>ZpsekT=Ey=ZJMx5tiB}DJ+C>MPuz8T^&?}jg7R# z6@*c$^OVkNa z^!Mr*8VLbp5)zvGgoT6;dwRMlNl5tk_-wODNvb3}Wp&YP?3gz;4cD83?d^8njC+w^T6Fj`m-7h90j-G%jV^uxM( z+BzFxaLN)eJZSc{`S06%I-;F0p4-qK7+X)Q$G0|fm2sW`y~D5Ffg%@MSI{MZ{0cE| z?jI35dSYDEJUncDzoWK=vw$$r@Ed7=gX3Q_2O|NbJFChgl_l5-81Ek`LOVNRTs^1A z0l@zbuYbnvg0<7I^~C&$+z#Yb;hi{fDJgL&X(LHRcqdLu(p*`BUG*>N#d!h@TF$l( zKVk*99s}-zs-&{Sw_R z_2irIq<)s;i~`O5zfvGWw5>C+5&zqi=NGo7j1JJ68Jja@U;gh@#stiRjzDex7tUC} zVQorvX6CDZV7~e$;9th)|CTxHZ`hmCp&9c7i{hJmGi~#O^EzZS>GitV0x#Ug(bXPn zGwI1pZ{qsNEmgBS;)V0X*ujMc81#3?a!L#T>`eUPc>kN;=%2i@zq;OYmA^TKu;9MA zig5a0E-n6+O}Of9~N=Hc?t!QeIqA%1BCHNk&mgTJEQ3AAgkSpKan_R_*^$y)t&S z{jZtM{|6}8A9(#6yErqa|L)n{e?Wi#p*j7#(fIM6g3|xQN&SDA0{_bF-)QjPOyPf1 zJTtR{oq<1F;D1j?Eutc(s|?{U4d#zdC+u`a0lg3cTC*ZHYhS07*)2 zLjpDa?n?d1fdrdw-e94(7mIfKj>z8D8HbU8ceMW0)YI4P2Y2;rcfWdHY{wRMa*fze zD1IPo>N&@s`uHoG-#o@&x%?BB-!Q2>#p9nE{>b9Dj{nNxw++i*S^UPKvIKh@RCOME z$F_sLn|qWUhsKT(12I*6oD!^FRxg(Vry7^TY=5rL?1;IqwVYL)o7hoicAzDQb>m`3 z;^A2!4ac5M9f#*YD><&PvqDpae@U=u=wTNxf}{Na4$g1C?A_)K?7D^D8={UwlY7<+ z*k$m}^;$OM%AfOGL+t!q_7z+>CR@#8=K-Z~8xZLSAM>Ut=Va4EWtZ-PB<$@$jWf7{ z_&jiMd@Z>jetW6}$u2hs*KaVg>=N{o5+mf258rnK>|S z2<8>=&ADUp{3=B_CK6&t6;8@$6`bXA0+&gC;4H+MH+e#(w5Jrvv0rX50^ys^SXT#-XCHep_MSiHcY0!7Ci5^U z5MkP$F$UxDXM0>dS6jgE_h5cv7e z=AX;U!`VpF%m{S#Rk*P5e=gC*IbeP&;kI@5G_rO0scaz{1KMGZdg|bI8R_mlgvC0; z2?LCtmk@S-SoUXahM+!XPz@qq`#E%9>RJ8h5AeR zd~k~o{|e3?qnqH4AYO2Cp!(VA$?*usDNm{}2OAECfL2Ue9S~p)GT`L+46%(Shy-2% z;&^8wf59v=6Ztz6`8yN&I}`ak6Ztz6`8yN&I}`ak6Ztz6`8yN&I}`ak6Ztz6`8yN& zI}`ak6Ztz6`8yN&3&%mvME=f1{?0`H{%?=`W$zxW1N#LKWDHIYc-MswQUe=wSm+Sg z!V`k@!S)>%@&qT2odTPc(2{=vAp|xA4WY^H2zC#XyM{dAE3NE4SYNiAe2vp}#ci{N zzo*I$(>-eICILtCLLgMw%@&T46*`0gyI(58eVHU-AxAqEVN+RMNnJN}%wfk}ejXS@ zzkNn%KPR-J9XoRPsM1jvHy4bjtq_PbcEu?jRS{+*R|09cSVCBc4dUsfA}qa4Y8!|R zl|q6LU?CwPWe+=hB?AquuPs4N<;PHBAL(sa4+jY;MMXskNu&f4DGngSalRmM^QgEh zPGl0vH#`~`9Qz$s@aBUMjMo9i;NL~2JXM8(gO9%k8%v5K z!3(!?O45p3C6P*!;0>2wz!!>k}Br7o$iCWVxelG4ynL`uu=l-dan85s>Vb#?ab`MKTC z!Uc6YuHa=nS2X4uPNcN7y6jF##hpkkEf}YQl!k($q`H*6tcIi(QbFw-&L7(S1*ZlE zywQZQ)AGQ&u+`hm)&qxu8B`Je#^H}z3p2MpjA=X={g(gbKeYRf_L~rXV03DHvyH|N1AM9iHYPum|Eq!T_U!}QzgM}bYW9rs zqd1kPs+8Cp`e0~bR6!`z?}~q5>3j7q@Bs;|hc9^fY|?PTLi}EHd@f--_}i90)co3#JrE6n&xcVJ2inKR_CwjP;6DjXT24VuModOhQBIP51vg3_ z7<~2>$u60^N`n$vsYw_aF}RgH`wDI_O0m;0HbpizMMbzr zMK(@Fm=dIC9+_^0DT8T18Dqq4M|x|X?ZyTXlYKLP zx?_J-^GW3gt~mGzkHnNm|AVcaGP?hK;=7*x^SGxl&U7**is>X~#5El$O~K5FYf2Q; zNz90AI#QZ~nGx5ND5jH`5!ZC2GzBvwt|?JWCovF?RiDEj58F5WVN>ea1;+hi0bP_Y-nvRsFU}nTMC5q`JX2dle zDNVu5h-*p|(@D&TYdTVzf|(K5lqjZ?m=V`>q%;LHBd#e?OeZlTuIWf=3T8%JQ=*to zVn$rkkreJ2o zH6@DaBxb}l9Vt!0%!q4B6w^t}h-*4hnu3`T*OVxxlb8|Lbfh!|Gb64kQA{WCM{&*j z9wUo!1%a_XAOe=v$hiZ=71`(;=xOQf)nteBa!RUc?9}80AINoa_4I&ak<1R53-J_! zFZsgXXagyH0-86i$9SKuGXN#pL&0OT}Sa-zuj0I}h#V0e^>;4o;*U zh>Qgxz>*;CaM}}mPZs<_>R2~l_7_%#KnR4Q&}7J`p)dIVVJ0P0 zzNtG&AKVJ!p9K6Ky~Qs52QTn_m_#?UpDkYwfe+uyzITN7^6>tez0g87-;mu7&?g707CH^oXxazo z_XB(b{Oj>UYferMPR?)T)Ba_>g!t!h=5gk6aqvT&{2W~T9ISfq1?K~-HyjTDncSRQ zaNzpagJ%x+>{)ZU=5caB^Fc8;7wG?69R#YlcsS>9%!TI7Uj)7?&NYjJiwmZRlY6cg z2lzfL|Ln!w>v)z3Lvy5-sv$*|&E3CKz*baxxq zml@nYBp^LEN%U2*x<~)=FDGTzUo~8T));t@yg_!Qk({R8#(B6?*R(ugdW|t&Ci17x zun8X8yz2VH7jMd%hi^ouY6A#}suAIQpIsk4t}7-7&sJX}9?izYDh?XS}cJq_JusUT}Lj`MLNZ6hvvFWQ__%bQwWIMO-y|rov|PtWp1vt} z+|Y|BGBPL|m;Ek0=B8O|t|!^b^y1ItG*{Ae?Mec4cj^!MKJcNMf5*q67mbIc(jhmbw@ODOszEXxqzzW_LDpNXXgs4_b`jDOIzx#8-DzVxyPoh*s`wc*qfsQp~7^k z6jKxb(oe*{iMezmy^dIBycBmV@o`O6=lQk!HIp(DW4yCov;^xL#eORC8Xb*MXu1%! z!_ZodKT5XQ%C2OaUQ7EqRA#RHaCqUMxL!-~v8?j!T}OypP8AzFvY=J7SP*J(*gzgN zw3CUh&FnQ)9D3ezr?f&-d6}nK1HC(ebUE(igV`~UVhJmWqiZD);$lUd2`kUt&$P6< z-8whPIjJb79J`+d%{Rb1F6-dUZ0(aLrxh^EI#|%<(g*cvnG@Ng{$)Cu{?AiK_mt-f z${O}=d)uH$j612ic;4A}tw;72<>Plt3E}meu9j3N&FMkwt1RW~UwAEo>~^G+bc^wn z($SdQ@3u*=w+X&#T)ef&#Hd8(@e1U_ zU_DVx8RFiC%29*Il*Ok?LqCccOYMHIcVC3gb6>=Dw9>bGB>I}8kG8Xm<0gZ{?GI}s zE@t)zYYXmh*T0@{>4TvR|ECQuYGSMRXZHpqkK9Z)(s5aBTCT=|Htt^TMpCN{kmM?^ zr88DAQs|#Zwo(D>gM5v~HpoaI7 z>T7XIZi=`E~8sE_1V%d3&1diNU*;S3XI0-C1oXdqJmZVg)}?Gy^$C!H!~sk8@;=vqQ>VB3_popIC8JB)(Iu&%R}2tmA>x9@)I+SB``pVhCMr z3YD)?lbREaDE32)RqdzKWKZ25aokb4HJ|(r4D~Z!d~GAt!x7T-Pxvs>+u2e39*v(b zvN$CYdUeGk?*_eR&oU)^jdc|FFIG<){ZQ+4bbDr+fhsv@o!+C`>II+jvdm38<*JXb zwcW!v8vTeFutqJ-%<{HHgGNvLiX{_UtwZ*Dh(5Zi)g|h&CCl~FO2IYUCML7ans9%< zJZHqXnDFuWDc$Ok9qKWObyXF+p%u~l2N+xDe&j;{yG)e=8(>FmbF<$1f+W*Lh~ zW%f1OH$J*sUh>4xw3qfgAz4Q2vbthUbp0T0_Jy<9U9SsjUun9K-DHQ%$aH#n;sjak zVvg6PBNkhcWSMP;x3<)5*~NmKmG0|ZK@=j!9~`?h@m{5Pka(=yiex-GM~<}XDJmwZ z$iV32Mskkn!ICe;KRyzg1^;)gdx`7wm8&L&1uJ?(v+R2&#+G zV`R#>g9n~mO?&X*j4?+5H;=~EJ))ni53Ia9epQDN8&k|A4=_m+h>?b#(g6Pu@&sj= zd5VDr9*3u18>5Yp(lZXbA*4o97d~jB5LVV<78J^Ya+(RSTf!KnQ3m8-5d0Sww1oMZ z@)--X`Dq%lbfAz*vtWe4O_&r0iEh||?}q`?No@@GaU!Z)1@>*m?(lW7pw)0iBJ*_{ zU9*oWLJJ50Rg{UoeiB_9w9mqm8SJK(wTwfvNfoF8J<)YP+R)H@|>7*X8$lr{C@1-Q{Uy zSRhz_G;M9MWlzO&La)_z1AL6WUbEx=;xjpIX*Gr&eRjrcxF47@n#=Ipo?6^zL0|T< zpbwO|oQ9BR&m(jPr5Ern9mZ_m^R)fhfw9ewS+>>}-MwT@t-?KYmzuAN-KcxbQC9kG z;=0OiS)aGHf_Zy4i;6S2A2CAW5$p7-i(7~auI`RYo_HiiXx&8JF2d*Qnc@eAn9HIE z@ILdDvF}hJf{CRoH_u+CeCO2DCP?U&N@F^eBmK4^(e#S z&V$))#LD9GCy64V0V|fGwjA5R^lVpm`ebqJ#d7^D-L3(N9zn`LWa71^kRiFT`GcP< zF$i_~qfRSI+Vdr^bS_q}6dS0j54JJg|436;vvNC=;EcV{v4@j*@}#EtOXZ7aB)nB9 z*fQ5{QKL0x3-&OFQ}&NXo;Jx04sPeJ=vh;GT#;VZ9Egsp?~aYm{;zjhr{OEJivJ5u znr3CQLjgV*!9Q}X4}UeFx{{%Gy#J%@oci#$wuP>I#KRSS0nslu<=OW%c=eBS$;xdw zn|fbgU~{zDnVS{?BTXC6V2%u;-X08yJx+hyaq(ij)2Bk%6WavS0({0E6K z6H^J_Oj6S^KZ(|?c_{eVJgM?X6XI{hVi_1-Q?Jw*-YwB9A zLD$*!(kw)-4;vGJbPcoR>DRtCp7auR&~~U@#Q&3bQsvzzTt9QqTFFmAm=bev~Im4u}uvfwQ-0!7LoujiGaySr6Wc&-I=Oj4((peP$l${ z8gtN1*~F~924f+Ywo5SAScJr`fh#>#N!|F$Hc(UxyicpzJHQgs@gXo3 zT?|qiXgX2NMp+erPi$jugn8^|>O;W>&A*G8 zORK}@5Mh(af|iMN;+rgCKOu4K8g_s_fMddx_YL96r5*ULLN@6dA@3STn`k&@b{+%B zrBT9mj0GKq$w?}_g#Sn!KYvWi*=6}YdQ|tBnp-a}+$205?bX??{q#Or^y~qts`}_E zsopjAwXu&5dA&QgbeVDlGOn#!d{n}@_Hs=6GrdL3^*u)z@jLNKmoFzMp7MS!qFIYH z{Sx?P#6c+Fv{w=;k2Ge|>l(S&etxS%zBzA%v@WkPBXocwE+>}}8M@A_#y2Ao-`o|4 zOey)GeD&SJHu4(|VI}w16FfE(e&H^uW2flIc`PXZ`aHgo*q(Mhhfj}cOqfNd=(~=f z8usk~GpSxd!i~T!c)7%ufgy=*DaPhOL$prz)|v||Xa#tqj}-w|#^)97Y?8WT=ubZL zxc)Pn<(!PlZqwd^_c-!E|6jNbFe(r`%9Wj`rw=`L4Z67q}B&db!RH z^YpIh489uGvybo4p@-MDE|~2({E^dc5P=T5d`RHP+nk(_sUNR-)Dv`XByF}#f6bS2 z8MV%Euwz+o6Nb1UGxN;u{xxQd3&_A4ec#dq#Xt`h^g1SR_XrCbh`7<8iz%ibsWQG| zq`xq?ZlIA!@M-Rdk=CGk&fj9(ZJl%EwxZ0fj?W)VOWx<0AG?l?-5ZkPAsC!`-e>dP zA^e<2Y9q`I^me}6!`yX>?|rwft>-&ScvB`m&ie=qwLmMUB~|s|RrRFIZ<~=XMo_w(H>~d-~+E%kP=Q{U$XhiYs9G56FmoG-=+~z@C zgMza*rbl+F%f9(Ah(J1xA3N(NsiFk@$1HpvKDVQg=!Z^RghzysE18>NLlFWjPaESz zIz0T3Q5ek(d^9P46waBjpa5*_1Q{NdqZ95g(^!x#a};jFf+ztf3LhB!UWF5DQ4I-X z_7G?E4N(CfuwPTh2U4~8RC)m0T^g-pLDr}S3D7t(fCso@ek=$9H)n1P$s228yIYw} zU7!LHJMoJ4wGpL{RK<3Z04|hXH1jTORY=hQNN+3_!8UqKO=dPJmk|VPPlgEa*7U~M zriapH(N#Ex&u(C{X(zXJIpHlBFe$x9fsrI;lgNZbnC4Mh8-plMM8HWfDT( zGIKypH!!Voh@M24Us4s`hC0?tukCO-C7Oc55Ol-MfKUvwx*(1$YKGgNsiG4-tKqu%@S zhr5l*2GTNSmv($Aizt8Y9+;YC#v8Lq$`wma79`*Fb}2B_wHH8-m8QgZI-UgnY9rv(*1qRWtag%GU`+h_Ex=Bdd~LV^EX!=`IKKh*QPpK zTXrY;$fe-GEf;S1Z*?>*`?TZ2&3S_PBG#D4kWJNmkLJ}?UOK6DV#Q!e^Cnf>oXM$4 ztS)*@zANS`6J6)R8&ue6Q!`sL&`GV;uR1K+fAk?!tNVT6>vq?QDwXWyPSITpzjQGQ z&)1d7+z8QIX49WV?0+8~^SaeG_L0`j3kgDxPw6k#imejvEa`l2xS&3hED^yJ*5 z6uTiZH{`8R3h=9zm4!aM+9j)SC@gbA&Xo; zSFzUKdjF7h`)}5*zT?pnKa@^yHA(t#!&fW^y-~$PeZ7_8x~!`OB5&Ue284(N3u|5$ zoxkb=G#grb+)a?P<)%)vBj(DB*z+46G6N(jj7~Z}FMtxmf^sWKO*Y-A2K=P`Imkm5 zU_q`5bQbgsHd+pJ)hrtt+snac2cmLAKEe(LMGj~)J`vkNZf$@^eQ5{tB|d>kg@e`+%jx$D(@1(hxQ5J+ zZ)|8h3GNzSK`CMcM#79E`f|cVLg7BM@C`2G^bjh!6t->wip*3LVe|ydkT(`f9%i%C z0GceN`D9ImH8l)A=vKYdBRE=?*?7WSDWI^jmLQ&z{83LhSy$6=|M~c6*|C~O5m%2K zc=KW?|3k9KW}(>hl+>(Cxn7(){DTMQFarZNr(~r+zm}I0aaAw0Y2@-OhZ8&r_i~m2 z4SW)~!>cBwR4 zclHMdjgkyj%ugR&aJS}RO{?TPy10qnGsL-ohs5flTx^@7;a>miO5}kUzSbr1DT{m)5c%I1GO7AKE9Pcx;iSrPEq1BKxW z(=M#m+vE4&@EDC%_KzDi&yR$<6@t+xKez^$-+kkf@SNzLQl0QBjmW+G;{21ZY?EFL zn%H?%U&_%sVi_pCG9>DJbmRla#hao`><``}cx(7tp@aAA%0JFwpfd=$Z%kMWiRnUJ z27Ij+z&xI;62xx!(#hA-bMehc%*cty1HP!x)lV-wW{|K(k8a-d^=or37)gmZ9~ynL zhkN&n($5vUikpJA>TO&s@b2w%-3M()4~4q(hn!{ z6(El9V4x~kkPRh+s?^6Att519TgVLLQBffzuP z4vmwV;r>bFQbte{T{ENz2&{|Jr_PjTbCJNDphYUe7A%KIw>VMAe)^WdB=qDEX>7K63qG7;`)ST3*Yvb)yPC1Fy%XUEK;2(yXoxh zyC22w_^-RM`|yR^r{)WC%GLYgylS>o%Fz;l=f9<3{I)T^mSZqcJ%Mzzc2pLjD><ac0!V5qnbsDg$4< zdS}dK(sQ4zt9xX{*IS??Z5Ec*Y)GCvYdkCbWUxWx;f_3G^Jvjn3)NhF_HKb1r5y`a zsrM(2e?-kGoLA)Vpoi@Byrywr+rwUwd8!*Gc*b=hYFFD0`didp?E<}4%`_*e+6gz3 z<*>?z{qb@H^2dvz39;4Jb-3>5H~SsbT4-64}}7=j|TwzvXRh zSvz9Hy|mI>%g(lbsFW_!tZKaRQK5J1{EubHNBVn|udGFNgfybIA-1$VzQ=;hDK=nu zCyX(3-Uu%8>bnm+KXmO0*fa9Mg56Z%wO~|sQf$V+1NW#QJY38~3_P7&40@ufSkPP2 z%b{U-2&E&s@W)%5fh}Q@y1orx@SF)aNARFeYw94csqJ7QF5+Nk;wTtWa;SkdUkybU zK8L*u0|sD}^7YYIVO!@>=1s(&NsuPyRy=TxTwq)Y01N&Z3xc2FCz`XMYrvkIBTjU& z2fqzin*}gXiLhzwqob+@fu{#s(xbKTdNaTkwzqv<%n9aZ*raB(bpoexa&0)#1Y{xi znZV`}pa(SaGZEJ82BUS%+1V3`0TKQT64>IcU>j$@QQ%rlG{IEhZARGp3))Ok7NmwA zBd%eKppe!8$mk*fhb5$N0>L&R%vwh8Xd`7GjF$oyt?<%WfLICJ?!XlYpMh-BKQ6_rf_I;x{c;Jq5!1QFal9?ieQPTKw;7&d-H8$2SE3GIt($g{3 zQ8qS8@l4KEu@X00m|R*`TF9?s8yRWDd-F%vURVW*D}ion_}IWO1ttWK9&{xXf=?#!jHf9eo=(kGP+7_y%veP zG3Nd5;ygjH_wUZ}aCPRONp+yPliq;;HM+<%!tFzZo?TR-VewkU)WI@Q(}Jd*%3Td8 zRNgqywB;7WV=I}C1YXoFt;KUQxKcK;AW~72sYsfi=`m3YJ)&I6Y@f%{J${eFKi9oj z%3)L(`pT%q{mMB1+WU4cYnv8S+SZMDqfA|ottwJ#;cIIdk>qJ9qUCxf)m^iC_?aN9 zU^@~rc*$?=lRee)T7v)i8wIS2f5d*dUDY_hR!30evaEwo=t*JWi_f>OU1k)Z!=4=t zC0fbA&(g1oSW_EvKM-n`YdhjSyujvc9b-aFruJ04Qe*n8>&cqW99wmg1fw(BTa`+Z zvL;-^i#b+`8@%E@RY1QXUU4zIPR4soSe2L3kyUmqM`Ac@m%3l;EoW-28UOmCSIWlt zc9FpqJm+5t9*(QF3a<(%$ningdq1VtWuK{9ox6UU1rEEQHtfkqhv%|`9X8@t0iIVs zz2n`Tl)FfH6IdL|8X523qCQKmSX5FYZXUc&>{Luki|jOsY&00Wb`@WKqFs{bO2>j> zx;uFSPtDFQ74*W70P{7DD8lQ(BNz;Ju&+m>^nhUtEL%F0(1(KEm4*QD1bc$fMu!JN z5m=!$F}hBS!2>C%jR5w|F4%N2VQ1m#82ho6EjD%x9?DS+JOyu)I6V3kn7Zsd7SxEM zApGG)AHIt@R%OF((#IqsY(^>UJ;TZ-=4OC`WAfQOVqhO1qLe)@Sx^-Ltj&OZimxP* z8TkG+u*LBLH1$%t@a$DBzLcrWB(X;=K9PygBTv-#v8@ak&H*fFF%Rs%0Q(0XzY{0$ zaO*<49+jEp-e={Mh|i&416!F*4K#`s6A*oz?cgNz0IvyVUBG@b)YsTlmwse%P!z5G!`^2U&hw$Ysv6(Q!gli_8 z0$uSqT(zIyD_ zF=8nrjmX8o!_H`8fG=Q^+Q@<;`PiL?f?1*IvI_9s`c8am^Gg>{~y}k1FWg+>la2*act<= zMn&R?iVd-Y3Pi`zfGsMDg_2QJ1O-HTNsb*W5wN4gh7km!A|N#?U_?ba0Ruz`(gK74 zA^mXIKJov3&+~r&d++>-`mMEo>$f+~DQThRgG6zw?itZH@8~Le zvTs*%;pO@m^2{4qOpm6`e>MF6`rhmZ+Y3j2nX+%xfw!Kw1&2OP69iCtY$(m_(;B9r zq`#``d;jcvRfmI$*|$GM%+N%HEH^Icd-DHZt6_lue~NZ~Q{;vx{R4S;THS-Zx@jVP zzO~ycX}DQtAme9(dW*}V8$}b%tp3>;Rk`QT(ut|#%6IN4r>t=HbSiy65vsjbtd=C@-bcR>N`F;42xOqa2Nbqf zFp+|QH{lJ*RYX%#0uHC4@S%c3x6*oR z$wDj#eS!~lN^ZKS*XLIXh6zb>R8;wkSv)mwhL-&9S6(QQGy8eOy}0#e1rmknzwif> z7-4Bf1A58CC}rttLwO#`pfEs4#~yPf>W!kB7kU>}T(~a1nHafP%Pfbk>`XH8G$>Gu z%T-u5MuVaI^Aytnav*G6Mngn!l|!d0erZFr<~X^$4e&e&;ZzvpQt}A0fOvZe-2P*3 zE?R{MtdXjrnzo`>kwA>72T6#I8pK!N>2RG6JMYsmp<^5IieegIwPqEm6D~%ds(~h{ zy4RbSmmH`(Pva&k0TEjU^w^{dErUfw1wAty?nV{Mh;`Ls^*o*0#9vG1NxeDn62x)@ zf-VPEO-o1P>E~&s$S7=Jr0@luH(1C*&pH1sN|M~75L8=6RJMA3sngn5TdwqeRjamG zVt*;wBiKxCS$l5Bk|$peytr{R{!wB?$m-`^QTgq*{rB3-zV}Z`&pLhRoN_TovqO1# z+|RNXj$dNtSsmMVca}0(`{Xof=5Vne^XGd=IU;L9ixs3@1A0qFjh^h{6`*zsAUAov z&#(OQ(s$|X<(7?q~yL; zD2|7Qs~mn%3R5B$`alFf)+`S0%X@p;i2Kn-zhBAeH9EOkknZlKWpmT2CI@$HElm$h zF0Os6SSkqg?_5~5%%?LEpZ}tAYxIYf6S5U|vY**J@^ZcR+o5Z`5|&SGWZ}p+CqI6f ze{bx%A*8>?P}a`|MYY3F+xJr@v{AYqc>iAq#Q#J6TB(IHr#D5!?a{O)hWmz{uX}Ov zq3^!+DJuia4kQb$Z)U{D8^1P7dVON+@?n{|8%8$A-~GWWNxU+9SNF&D=9DzQnXBUe`P%$+-ezsDP_}$$X62FjjSjTsuXf~7HUW&x zDT@B*b@;gu&TVdnxZK4BwNgOn95&)GrsU4iaLD;>9oZpY54SWT9OOOFi`fv1l5 zW|KP%Q|d3Rma7e+vLk9qZq=lg9`Ylu`V)~fJR}42(_9KKvJS*s-ey_M!2A{VeP<4 z5!7-3m25S-Z#=5Kr8F^mqVXyXOWL9hN6HIl!02wQT1$u{{unzzWfy{E+hRj72O*iN8@QC2nr6(Py?RFMEPNk66ZER zHal98t`?&2z5A`09F<(82_`@m64?R0aQH>G4OfC@3@ttf1u-97D&yL~>$JnI!72=s z-lh`^U>#tnmh@{FC=4cZc^aGhIGGK1fMhvjKra-S35cVRvx~(%LME80!LdB8NJ_8* zLVYb0(rEN-2h~Uv3sS?&#f87#Cv25zE2b0gv}i+N9;T5t4}!xejWRl7`r3U{%HpS&=Wpro$y**J zii%ybCO?$Fz-!GC_f3j4+Q%p1DxWB>*Pd{HpNi;IN!pr+Bd4`yJlpXWciCd|mAQB| ztoVWCi2u97-~Ya-ZTET2w*kF-ZlJbanEP}M8{54hD=R$E_4Rso2zB!QNU!OgH{xh| zpO2W@wv#i}BPZ{hIie%66-ynx(0}6W1EyJ%@&a?6j-GQ*v#)PC!(7+S`@}eM_Hj{p zK-%}DuPLdAR+K%tLh2dRylp7m)}YzDcUdzF3zK%$%0o2g>dL*Q7ep>C=`7-I^q3bA z=rkICb3~Z4EUvWvKC44f|4WPwR6mmu#=a1nR}DTn^&3LP##&x~?B> ztvN1)3}p}jTe&RgJaWaT$Qwhh-vFr%WC&`ZqnHb52H-}!f)o7M+X217z*95GI>{?D ziOW&@5WbU-y(GmTx8^8Vat>QYutqsCHC2S-qp^0g9p z4P6VyyDwcgxqvZ3I#i01FUh%FF~c%Pk&34iuZy3J?1Q|FL@<4fAhN{Z3f)tIMka;6 zM#m~(A2p~<4b_Glz$o*t;B*)#JcX&Dv=Bvio(i72&5Y0iiqC!mUXOHz$jXFpeYqI& zWCbcr{Urcq&}H#ds?gjfbMsLVtO3C?j<8z}Wrf?D@}8 z&6YzRg@4wLm=nC!^Jv7>rGtg5W`37Af2*|h3c8^g-H#1YuVMU^+IsAb@A1f^>2-sG zG*3xm2lTd($0{QveRbYjOX=Ej@|+NXzM#&aW*Y5{O60?PF(q?lQea*AEb*v`6D<>y zjN*q;y}L$*?D{xgnlXIdvDUgX)KT7T@`-i(>h^x?m!Ej!3+k#5Ru^sl-bFI0I6bP= zX=BQ|nb}+4o!uVthxM~IXw8G&qXnx+D+p8i-}nLdzo)XZ=k^}My&qU>UakHJ zS3+YFJ3151M5%8s&Kj}UKtYYSvRh@!+_BebD|s&JE`qZ`CRwe9XL1#&JR|5g81YodGzA)>nMspm z;M~m!r$NoDfyz znBfL2lo-KP{y3>zo31Y|;G!fFKo39#p8SengCASAKzM=Ma13;_V+a(eBW@arAv}}f z(s$6#We}OQ6d3pL3hd*1V(Pg4Bq}g{gf=BZ#8NO(ajZ+wnCc?nHHmnlfgFyQv|2|{ z3l?go33X2i#_vP!iE=T2?>Ly83jG1Su|(E~u@t}=pxBYhtp?E6L=!+O(PHw`ki`;h z9ndhVc`%6=xjFvH*=7Kz7d4I%6k~anO46%@$<-0K+?DVp2D6|W7Od>?b(2-sHxNOj z4Mi#7H;FwR+$vJJhWs1_3klNpd14P$JqVBaE%*j+DOZ6OPAG8#S@v5C1fqm~CYQy> z=WpOzA)`nE`c{IQ=-!Tw7Fbtw%bAJ@te$u?idGDQXf$jDvX~>V0kHT)CY%Xeu9D0W zd-E#bW(}oziUYmeCjL7{XjYjv`bzoB3&s@bJehqycB*?u#MQLUvfkr2>^%Q0 zZDu!kzX{QNq$I6YjTz8ez-@Uiy{$Z7a8_(qUGZRK&#nEo2UrR6IXh+voKIiBH09X* z%(DR%Nz3>3-*2BD%a}?T03oUPl(_kD zU0vOGmWkRvB+xCud&|cGy^e41zHW}GRkJMSTW@vVoUneYo!!HhEezYm$9hrO63oz-;zzU=opXKJX`ZHuLoZf0u@ z9`@;felXMlaxhShFlGHup4Rz+Lav{$VGyEQLq#lnTZkq&_w1GNkQMnVjF6pHX;>Uo z|AnJ!Fk2-B6TCbU_r_7Cn8(4+bDL-#8_=3SH3z7n9)r99wMz*BN+y}gQ}NK!sc2fc z!m$l`7UX<+EU^}AOhb?3vZ0b~)Jb%66rd}+k7Mu9lOIz6tvpX+^+f6i6eYQdfifr% zz9|3#s?jyIfJ^{B!c4vkiTZpcI9hHFB%|qktXwNiSMi9RjYM9Ra~|csvG8#*a0I`T zSCS>OP!SB^=7_y|%LOMRP>1u-3QAp|=a@u)BMdjg)hr^%p_NNvmj+KCeF)?yx*iGi zBwzq&AbI!-(p;@_u%44VW}yMcXl z>R5C?`gk9$cW`3u^jDQfEACt+eX{-iIRE(Z5i8bhrQ+9*mRTfsI%jQpKh>kV#pnIl zo7F#^c!PO@0liu4eUl|eM^5LBCk^rL#xPc?6;mIc(m~TkXTpkV&DX} zEc@`VNtP|y6Toql2fPjPSb@$cCLPVUxx;F9tjP-b9avYU&9}f+IwVE{%FOFB0pc6wQcIki9@EI zv2h-5Q`4^fZ$c>TzoZDPT#s2m!?+UrV*2dJUAH`md9?M}@MM>$_IZaqSPQ?$J+=<7 z9=l_AnM31h!63(J^Jdz5_^$AoI)CNV`Rzx~Ic0t6mE5)(QT<4QDP{D%1A2c(H~qFz zn)UvTV2V*yL+;RC)0S3)yP69j%4>mvfdQOPcxC;An!3>PCDqgKR!_O)8_M!K@^er8 zi+Dd<_xO494%j~Tu{^$Y!jiI*?K^p+rw=t+QeMt8TJrd}k5%7CE(l8UeEi$s5qjjx zsGz8m+k#}{bhtU$Ji&q7u3s`n&u;<~HcOGK!JTE{snh3xIM)beeNK=b_9MMqxmJdJ zvNP(c$yWy z3Vv&V%v^+aN_g|st_0~1@(VIaq-9*F2LzKPA*~qxL8F)DRIpi6Oi8K|HlT6_ zONQ(;Tz%{WdQhnmfJ+a?&&h#r8UUIMr7#X!Kam#k;XRVz{!YFGRf_>y1KOO@Fmy#M zrwv+DDlDH)j99a$S4Sy8Y*95`VbIk{Q0$)q)-}yWTcv{D4OzkkHczq$aJOS9m!sJZ zYXR3dTj)Yq(@+gnEi{J700OZS#^(yl z6V!+kv(vAymA9w}2*rDg$qjuP7zvRfa$KFEWL(JGN7<2-fjPt>*Ao_9@L^#PxZ_ys}#UO$b zi?)_w37V>WAA&=cXuWwNNP?MY^ja*5b1ViUAehURHP?1Sv`40@WpLL)I73Sz?ggY=O!12w1-%sL7SOHt4(RnraCh=N@+~0T@NU14KXGgR zl+Oy&j%^WjsVjEV{d3wX3XEj#8^+Z0G5=YvDPt_gmPX`2 zSZ$`K4d@;IvBWQxe!Da#IU#CHUbXL=>t(yDo{oJR?%xr=blJ?EZgY2)Z%X<5<~)i+ zv7OP9><$aTtnZ6& zU;aDQ_Mn9dODjA3^@i`xGqwVYor?tYsMg zIDh=q*b%wM=>}gal!l-DdzzHyJ$v5b&Ve?4l3YbyWoYrMz#Oc$X~7ZNur(8zr~Y{5 z=)-qMNC|hg>xG_Ocjx zX;Ct5S9rgk{uU zPVRl9@cs739z^{eXsT zG7^w&|??Uib*|WbRV+OS?GYP5IVY$ z>~SdKL7oCF4+H=iWa+REBB{4b3*IIqOV-1-TH@uoCLp?QCDL3BYEvPJ$T+V7%+O*0 z>1_yP02iDHg*DO6b-{19FgfaR_ylk^cLK~>05O2ugKL7YY#b9Z7_o4HSeveZ=XDvt zaI-)_gc@T+dxy&|!NL_dSuhAakSlNzQh_Lj%niMNhF&+d2}|Mugd%VZsrBU#nXUaKf z!azdBk_#bXafr#N_rxbzVL3#olECUgf9n-6*(h)2%4>me7ZINO4`17$Ae|&o@x%*);JHBS;?kxj)b>IPH=GJZXu@0Lu{EDvL zqb(>Y$`Fl4xjThFz-uY?lD?(Hl;Y} zI{l35_y20$KJcFrGftqz2$zSr{h;uY8hWN>_I!vLdHSj-Ag$)0OIg?q2g=YQ(i;yQ84h#Gd{b94J03+}df2+RVmSax(eTwY3zv4|nvWjDn+#GKnBv!yDaDZ*h zgj7gCCljYjLDicpQfbXXk@J0kegYh50(;kxR~bnalUg)n6BUVw^khjc7qu%~(KFs6 zkS)TwOb#FUb7(h%OMOTJdnY>7we+prdTygF0coHPlGlQ-6UGjP4HprOa0%%Dsz4v! z$rWJd6M;8Kl1W;rYH_bj(`}7Vk*|f!m&lE?v5)Y;Q1mrTV&tg7>IqU&{)3M4YzDd- z?wW%#P#rwL!72)-7>ZcpGfq;-EUz&vRR~i!besFVGH~q@l>fN^AiW|11WZOZ$0V3^ zGWiD;y*&T`+OOeFyj?Kly1w2VSQY}@2J|4P*z+(UlfH8JjAgV{fB@O6>OoN z1hb`!X==zyak##{7K5_ayIU8vSTe4Fi7v>3krMwBW6A)qKifxkWS9}JzZMcP5NnO* zp(u3QrBRMQC0<#mhL_IG$w0Uy)}SHsG;7h6XTeJ)VKCKIFxzNdt6HSImMbW5Iy-h- zs<0fK{Of(mQj*jPU4nKcwi{OXN}NNJi~CZceaBL;k*zdC%)m`>lWsa%6BXRm5CANg z$m@j?T1*VGP=afA!d|Kdc|+0*ZzM_Q(2v8GzX832s1=l>SjlZ+6|2Xfn?MhaO#)dv zF}0vo6`YlE31c;q;yIwSMeif8pp$uLk)>(j6MPcC4JUVUIedaGfZ2*fsN0JZMkSOa zLBfDi<&^SWl}LfUqk>A=XSZYY?%B=@%huU%wx`bgGIWELbm`_HC7(}6R$SP)eH}Mv z>ezLEh&{e0CSF~C^^DcU-sxT<%?+&K?{RMAOw#WIdUqB{BUnqftvN0u7itUlJU050 zvg6>(&}Eq~wpwo5k|fx&CNp8jMB8-f5xaADe-n*yYwEO_(~!awL`eXgIX&c9XqFPoW{(jRyD?_n=i#XN&8dl#Ny66#C#^RK&2J{w#ZVf)m>!`Awn zU>I*$;gOl!N0*mCa+6Oth`rfEa&M&Wn54|M%W|sNwSTssxkkfqQ;rI$g0#%22Ll@p z>Zg~IT<}{t+(rW;F$@vXK zDMh>%*w2N+Gs6IiCK6$3?HXyZdR!m5Lr3k$lcdm^C`Rsq8|Pr4&LPK1kR5V4L+E6| z_=0c|QMb{c(&w@(dXW)_2qn2sB5}fQ%W>0aoY=V0&d0N{9eA$}0J!Q>5CairP8MV5 z!*!ONgR6vMts&AP*9BtF0qT(%XOkPlwT<=24XQ+1AJASS>`Z2G#fJT)omd|7V!TB*dl@8h<1e#A`LfPeFS6r?;4x-fn#P&%zP^bi(D1 z2;zAt_QFcyE4(aqCyMbEh^AJtbe2{w#oDO~2F960uo!|X$|;b}h15rQMtAd@tD0j> z%92*B6to*Fius#uHnX4H;B5`BnSR=F`=K!A?hj4t*F{BY)Sgog+{m4G5T9b~OPx28 zGx?<8_uEb`OWteu(Wg}~%=>C7VL4yptQL$ePzNnwnXeU^Z|wQu6Px}yF5y}7Gj`JB z=Vy{5l7}a_&u@EX*Om~^-f(Ng<=}=Rmpy_X|MRJR)9dT&AGIA zi@4=C4Ni{ffRi@VF4PF^xVQ5u`QKt{mksZ^VgJUjuA#cR`0c}ZVdY5U$dzB-PdV~T z@bcB+*p<;U@q{~n#@$s?Ze#wASH8R%&B<;b-U$i>?X8Hvv>7qX&Wma zr>MrxQ*KAD>M=<21v{q|s~O%{TZdZ-1x$`ZYQWXe2uA#6APDK?LO+8zDgcvG!GeBe zIuOyR{TATJgaMc1CT+MtgWLmxsqA0JLfLEOs1?J{n1pghj9{7^AenH~hO25FS!`7M zx!_N+k6b?VnR7ybue6b)ijE5{iDWWc5ekOO(>B&3LhN)w4%}X-7OsRX9mqSN5|~Ji z#)rKNg#`k@p~FddOpu9$^n)_aF&cW9Ejk0HiFqd4Mrd6jY|8O2Ru3wIl=OfSS#WzE zbO7`uX+=#|s2e0T2TaGoTcg>jw%%uUmHH}G#8|juLKE4t%8^Tw8-oZn?Y;OJP z&wyZ1BOua{TncpCB?{z(khTRw#v+2VXwZ}f@?>N&FoNjOkgAD5*jP_|Nmc8EV1t9O zG_A#b8e}C|I2o|gQFmq`_Z>!4)ci_(X)M`k_)_J|Ba+tuSb0!{1|qwpiFj(hLZH%- zF~FjBA;{*V{#F{dycZdqk66fp0OY9+#)*#ATNO*e0qsCGk-G04(A%abQb7<$L&^gA z)FPN4xiK;N8^O4F|o_wCQ&%!!$wez4o>l9jB60e;+S&;AlB`kkCFP)a-`XeGNXJW3) zTIC7L2CmV+j!d0dIPJ->jTF5X3kI)WpnrlgB=l0q^~@HuxM=)@l_K}~k3Zo4uXK=A zu~>JUVRKVm=;m)WbuKSzInII)7gKIcFoxt{j%r@mIsq6}rF@c_d-VWN3oalLfkC zmiS^Q3tK&lp)}1RK{7uMtmORNOT(Vdw95!-7kw=oSrL*!e~ zeSMo=eik(qXoRuJ!FqMw82KaZs??11a$W5w;gTeT3>jJzR)*|yt&YBemxU}~Kg5Fkl9VgdwWH#u%wZ4#F#c_>dpo&B*N7Rvk z(Sm=y5*G#~M8;X%Sc?@{BOg}Rzy?CCIhtaa5a|A@ggXt0c#{sqJu1$1O$x4p1Ptk~ z?KU5o1}vTqkomE{!J$2#x^4xr>4@Oez?%AA609A_6|^u9(dY?={rzNSJE{y&+Qz}w zlB>9V>3l6g2BMQ0t^qgNNsK*7!JPxc22GI)O=uv{uSlUI*9j)U1~~*j30r@lg49r& zV4l$F8XqAL|B@BJsjJ7}$>9iWuV87A6w;M&NAxZB3RZbtaUa*}6q*EyJel0MbwDpp zfxs@2%&roiRuE_@j8^^-it!xXCaEl_T?se@ohUHi21Mzah4$`%3!vL_@Vv8-A6^rJ zLpTGCD4|6YM;{`fq)J7tSbZ|GVButatq6y6!-;33RL~!X(4BakjAD{wEcPK7d+?;e zv1Np&xjWa> z3$$bYH}&lQOo+I9nWh1@d|&vE@5d(fgbGND%*};4w@yy85aFMbqoz1;d@mmrnC14~ z>37{>QzTB9|GZti{L!Y&nxoIBG^k6h4vulEA%$}H-g{iS%p@%PMwsAK-$a{Tt?b}B zlkbV&UDq%9VE!TuUw=t^-&XuHK1&|ZB2;rudOzr7eeQZ7%J$9JT9g^M=;Z6L3vOgq zQB_gom!Ca1D@T>X&c6i-#`~PF)!bqE=KDO|@pQ+Gz3?|ke(1f^e;(p~ICkHhyRuCm zpT^E&$r#RHXuPPkDuGrk?b5E`1Fe;$C36T*$%g-<^3L@ju~<--g8HVGAc}CT8g$jj zzk>);n6B#y@LO1l2y;9gxfw1iR#$6qqA75a!R^43cKkBzfOM9&{)dp9HNAfY9eux82glnEU1BpaxL)A@hBGZbJK8^iw##oa6^G2 z+(Zi<&N3WDPz^R5{2^ji{Z2a zI9Mk=N0ys|bTs6~Tg3c{!bSq|N&pHIg4PQJtsJqIq8@XcOr+8naAmnDih#r$z(&sG zSivsv@Id-$nhwg7ZCK?jsFR5rTgKzJg#wF7pe+}5iODpg_fwL=6+znm z>X%+83GY4D4PZ_XYTSBrVlQ?k-vu~3q4t!fS4)TE#w4;_t|%0C>kzeNj26?6A%rd= zLI5qHp#n`)s93=z#}IS?U*QACM(Ac3Fq5tniHobys!CXLNaE1MX{`OWa)mzlWTJlH z#=TWl)6I$eEyB-?U3v8{Vun#}&w`&A!d+?e zesx-NSrTls*0XpLVUa$?fG_nJQF=K-z8x*CTAv5j7SyFohE5JXclO!Ch z5TSl%YPgz#HIj7{H%*LJOT9noxJPJLcaue7gmX*!Nn#X2s4yx1aD?(0n=}&^f%J0C z20(*fq|$irq)y(Xe{Hr?cVPy)ea3Pj03%9N{c&ML@GlTzAoPTjYS90GX;6S@gA-`f z-UPCO%1KU!4Jw4Y3eh@hu_}b2%sw)U-KUWf2~eO4#3WceoD_z`eLzt{;sb&qyx>E3 z$^imIuP#}KV|zH=Dzu$jk`8kK!2#k+7=no|XmH6g03DEr`{O*=$HTC-fxAiY1+WGR zor<&FGQGJfy+wDx7ah?DbngPSpUBGqXo6M(V7I|% zh+vEgQJ~@kzupagJf6s^DPl}fmqFaK14TcArp<&!m1hxR$Ux#5=)@2Rrc9JY!a~tnl=iz5djo?34xK*mobD1GZct_fJ(fZ3oe7c4eeEG=!nE1(2_kF zt_;^4BZ!r~xS?jJkdXUxKm48ft)5n#U{PPv@hzivpY;>& z$}ysRucAj8-Ic>)OwZO@uC6|5nfSmcVfa4xgoh3(!zhy-Mm;@K`?A1i!u2huAD>uf zaN1yqaqO93&u0;hlgsB%JwvWk(J|UKr2cn$#-lKt5f|_y zo^R#T4SSl~IzI^C1;lML3Dn&Gd@w=y{%+mudCMH9#Wx>)5;5<2f1=?q@41iniK1s) zPuMb(MOwW)?o*cWxiv+f17FUZ5f(lSD?X*%Qy9M1#;fl6uuA==lEQwUkxD7~cBHj? zN--3);i!@KQa(#Yl6850B8hMX^4i_KE0-O0=Lh>j$qQ z9Ey%Tg5*rCYolr~J{TmVyF|VPjYlMz4oBVTW4%gXwEM`SV`?EWJhhnDa*Bcs65b}v zK;up1G^~D-l-%L1OIDxp;cyvnUc%J1Ei5^+ThvCR5CzahAV7rBaYOke!qZiJ0{=0o zC>ENC*Rw2c_#Ah*aa? zEsZhaWa-ct03lE@1L~n)V)^JLgAjU%rHnxufhL#$z(`n4zOD*aLj0gA&@}jaw^B*e zew`E)M4TdRc$H3BD1q%Z#eJj>gsOZHYA?`L+Mvy6@mh4N({_vwZ;VC+v?KOVgHsiR zZ8^d=9E{^-M=V-37^@-itUx3#%_WdaD5Y^oM6pjy1qtNwLvO4BO*5q(qcRn z_OX+ArvfnSp3%fI0>hak(VB+}k&zD@(5rCNW~6co2vdUTqoXR{kvM&vgMCtfWn)Ri z=a?EVMDuc52tJfS=81W#S{I$VCB@}F!Ckb001zXq>1oNJa5u4m$X?#Kb z4s`(PBLPn(CRisvRXJIez)qvh@x6fN6d&VD}`ZaCLtzCi#FJ2x@4w<^BP&_Kmd11_L zkBZL@`-7IwfAgy9V0&D|uE(Ft%D)xPH2L^*&A0L~(gSAq-;6q$q*-W5>KSW!IpSK{ zwX&@V(nXV=nS|4J59kf0j8j`0=O#Ow)M|ZuOygI}vqP9ZWnH=H9i6Wt>O!fjZ0$Ad z>DMD9n;rFzM3e63JIs3H-*<9<$o%TrXLj#%Jv??|Wn$Hy@%wB4-1p?*@BzI&k&T9T zitQ)tvP9SZjIcbo_SJK} zLGK2gA}@M$DK0Ab&^2rcpaoC+@;qB$ecOmtdXe}W`>ud>%ZLRm;d5|^avz>eN93D?RG;q(#jBNk1JC`ThNo zCq+LiHx#b-TsSIMuJ3)}h3oNNi}(&&i^G84)rj-A?%zJ4+TY)~J!Ec$d;dK>Y)-p4 z1jBzX(xe59aP?SYVj`R_jy&D=^RseSmXDB)*%@vQBbVQhyax$gx=%jCUhi6}$k<~sg`d;uE>J{JU zo)KJW<@70Y3g66l+*wlI{18$Pm+&y}o&wxakud)_-Qu11g|hc{q|5V`(xzsHE^}%h zowuv0cbZMsY)4aavil)S+J7^>sO^#~XcSboBBlPe``Yr<0lm^RA@0LgX0G${ZqjNv zayO}ABWozW3OLX4w^k*Pvz+NyYZ#^xd!OxK;w@Ll=KsBa#*}$hb3g5~o&R-Y{MXP9 zzw*ql?(N^XqDoFnRYYm3@tWf#$w=JmGV?H;VeP}c!97q~Jjq;yH@4T_@A_KP^`^7_ z+mpmAPLFrKQ9KZ4q~9t%zw6faVawe&rkC2=oil3tIyP3EdOc*RxnixoMrCJi*75qm z#!m~dzh4jN&2ZObzOaEr@Z42@#zv!9ipb!Lb?=*Y5&QRp{p{e*QInL9l9E!N#w7^X zOgKJ2d$zu9LDcSdhvKeHSg`P^a*&Mu*7poFyuBTakE~oUpf|-65GZ8&c&DD-F9v%q zs{4bLuRkKh)lSond4=%VKY2Z-_#v)g+iP{WpC6s#>0f2Ed+Y8R`p`XOH&0MZofwhu zHI3@MqogEYV{Kk(xpPZm;g9ESGe_iqiL>ipEXa6qxc2hXKo=ukcj5PAt%e_{pO%mp zowdkL$*dXXV|Zn3?-sl=kN#$e;eLN=7js&sZ8CGpp`f}=nX6-#zK&U%`O?DRI{o6? zviqxN%!r?Hd9gU0uNj?$!*QN?c)bd7)t6uooQ{FTVJ8HWh;5;5|B!`_+780gA&|pg z#xZQejo{n1a>EN>y%r{uho(#SE$s3&+cSFD0>cXr6AFKx++8_l=9w#`h)0(_K7WsY z>N(Ho=(n#yL)6_vuIt5%x3x`u6Sa8P;HS}R4U(v1m=1n?hy7F?5svRj=Svmj?IJaclX{j z!YE)HXSBv`&;#lApYBy0l7)17%FUvKhtwCRIo!OTsr^Hrmv(pG=s&jidAkLBVk2tz z+a>>QJM7#E(V0QG^H4X?7A7&(V{CF|Wyx3FHiT_aj_%o%;jTKHXffvJL%XXJW9|ht zd^p|_IwxhOL)X{ZH-F4}e$CajzimxL?t^*La&FX_1S8*e^ktSHP@( z%z0wb=tjfjbOKDa(uqE-@V^vms$VJ{PFDal$+b4hD|zD5p+cV z<^uPK7VQK5F6Gam4j(^7Yqq(AHSY%oH=LqAjLkJX8@lN}<%YPksCuI9!$p)3Z*7UG z!TOCINBhrvmFC$xS!;Jao%d?{aO1j3Qo}s^(owZ_IiEeE6J1MpU@e^#C0-xyg!L#C zd#*;UhIloWM5Y3rfVjep_i4?FfAi|)cFxN1i+zFl7l3zzXt zWZvYCkBM1^eYx_ZKWs5a@$+TFm`hXe;Wc%shp$~(bT)md;)&7um|K&M7%iC*D!sf+ zVX%jJNB)-Q)!5Sc1mm4!Fs&ebECMmxJUOqz`vm1{p!7JyJBimE5(v^S8@z0l2 z7LWZEiE!w?X`}5;ya@ zWIt-f%MX>yeJ9LW)yN<9;`0(C^|sHSkG?xw@_OWz(C7J8y$e2uRh%K;W_@|;rj|g3 zoTvQ}%BMmb8MgR5)Ect;hSZ+#~fr+zw+l|2}10BNb$b$8nQGOimXz>1q8eEen9 z)B{#iE^cQOFSYr{{s|l0>?@obtS@WFlK_^BJgS9SXRY-u%vp)yJ4xCGZc%BtY)t@e ziPbZ;`uuRs95>}ltoUVn>44tN7YDUi?;EvTCcF*V=AS@#Pt(AWNe{9xBeH~opKcwY zG}m0>-of&dnL_TLYW9KSqb&Byauyk<`yV=?je8>>w&|WxmnhHE$tNz~)gvw`$$ifBL4*&8Xm?!nOgqy z`)W1~ScJ)%X<)zVaemWUZQGMsos7QvpsuX8h`051@wq*X4m?j|u3*(Q{@eKn*tFSO zH;ER%xp{Nm2D`C*tF9NLmYn(aIo+n_ZANw}QE9!GT zu6HU6$`ALc+*N)vAnJPCt`iOo#aW&i^IS)M!?}YQWh+SXdts_cH75^OoOV(9{DDvG z@_xxWM@re=j%TjN$B)#!RAo-xmo;*bfcs}p{HTr3yuNf~$JXW1dmi-^uRGs9cXjj8 z_)*z$*3Qn1$isorQGe}m>dmF@7)cp1ptr#TTdLw-pFX@(xyS9)= zB~lIz=*=_y8OiVKv^%3Pl}2Swx|&Z5_1{+A@%h0V`$cg{9U<2Iy;0(0$HtH-Y==m8 z&GPKL+$|pJM3HvEMD)jspRD-4GVYz=AFyD1d|XNNZcQfncERyoH)Px)jA;(*)=#-` zVJhdU_3Ry^jaDCI=53xJm|k|z+{kwMv&ch(YYmT&ZV4I^nOO^IY90+g)5aI1DF?r( z{%iNfK^vBn7P>wz050wmSGhgloWJX;ZqSo1tH_%_+s)~aoa10eS&;JS=JGdnftf46 zEjhxzDVv|OCjYN&k2bd~m}dh_#?XR9+W({sN6(P4h9qcCBRA%*!Yso?!f`H>OlFD@zE zVZG5~*AUBVpId!Kv))=f|4X=!GE?*2b!=Cb2p9-8Pw(I`Hg?V zvrA7lEG| zHc2h7+lD3ftmG~*xixpe{1eqJe{9)Y>^k1fV&Z{k@BTS>{Um3f{Rq~3`C$rn{#e=O zFX}Zzq~?ouOm05Oc%P52m3if?(_B%9p2)L{?24`Y?(DmD>B6#3Z5%URm=!T&)`*JT zm9Hy0>vEXS4-Gx{rgDlUzx@5|GtV7&GUiMl(xt5bwmRv-i_i4Et)$z(V~e@B9cI7e zMz!RbCCs1~+to~uvAjCsT-}=QPe!g^p0@hlA1g;2mnNN=f&F#w?i5O8OuNe@>6jTT zSy-ka^_ydU>bO51lS=oq6r~3=+(lP&$1D9bChz_(*&cR6+zaZ=ZQ-f36kZyHm63=m_FNX`dWvS9Ei@(>Z9yNMV)Mo+TinHId*y4QRdCnOV8d9yo0?t z+5|he-+)`Xw`ZuC%E|q?!pm&aQtgYhHIrg3zaJ8W@<=NSYL9QZH|Yu~>dX`C^w-gC zDO2VjDxe&@;xzBb{tA4UHfQ*8Wqs9Ollm(~HVOXBH&@5nysNVpdiha&{1%0E#tOwr z#V=n!{WNdm$ zQ{L_y-*nQZG@pJ>zhv`23~od)&h0VhW%j*DmOy_I2%Y#}v2Z-W&Vc+tV*`{DP#U2c z%a%6W3ZoLeN{ONdRlOp_fWV0nAZ|`q5WJ0v#vBD)R3<|l6(7eGTUfno7`HkD6o$2H zE*z+=YkBLC_4wqJDV5LrDSl0QXV`A*XI=Tp{t)ne){gT0SxeTxopEl%@MzQB=5OK1 z<(1|M>DtcYEYUdgcFfM20RR=jFBubV^du|jim_uC%&J^@(yLgVe%$fW&f9?#T-zsin|G{cel6*4H*YTb z(k@{{t<(

    CX`LbSfx!R_BE9f$@SSEwEv)uyr;$-Y`cXLM9_MB}aDzM4vvZpE%^J zPkiYIzRr}GzT0ZxD_hR`5-t8NvXIpO!e?8g&yTc#B7rigCM$5G%US)jv|K^K9yg0&4c`uXJb6^m@bc~P;}chndbVfwzSRXo zt;S`){`@&1?xLI$Ig=7afj_AgwN+35(yVTh_cn@AwC$_Eua@1{8)~P0;N`4&&23oJ z8TIs?+@SZ*#N>yUT`4#6!e})xsi}!ktX;mtL&F(A5=L(r9)D$LVYr}j$*%mwYjd{E z`}@s{Y2No`Pjk{f51RS#a~^KV)|fF{BV)q_)VVXyvHVsrZ2qt$wOthT>r-R)Bz;t! zjmwOFxN?zcV&>+gG}`Xtqaa0l+sS?v(7(*YRIp#sjB zX`0#`MVWoo+t=SGcmdUajop&Qy-|$f>wQKBx7PxM+ zLAM*jF|SrlYq+QI@(mGj@ddJdHaZ4++s#|2I0tS_&F3bwWR3Xu%E;KUr=5s6(~mq^ z+$Ukmlc&=@DoHi3Ysw$q>SA<*ybDA~Y?&i@mBQ2HM=fhcEV-{?oqeP)LU}3tGYB4A zzdU3o8eHvpba^USW+4fzMn*9G+>e0(6F5M-nBHHBxzyX>7NrB(bTrgal@jV_;fPKC zP56|r5P!L<(2x^m>bRGa5M@_RVXee;I9HGG#YwVk58K;U3tDB}y<+5<_4ahM8k<#4 z=&fWq86;_HL+^at(Vr^cYXTN*(GjhgOpI^290An91DH@CcVl3i8w6(K`oU0Ec<(Noy1bZyjaPeU$+N8e5TJKG-yJ;t*>Hn~T3 zy(u5dueW405ej0uRfqhWrr+eFzGVqsp-rw-Ay>Z{2bCv2S(3_E`Luv#FO@EHvTZfw z{wQC=Rh0KV-~Dwq7S49{-jXf4uAzSQE2VW) zUK*~t%M6~u(r5pPJ)9W@fbclLo5KK$18}BHQ~`MfU_s){(14b*n+KG1fZaHX!a$c9 zf&T*5c!76S;oXvEgsi?s{3w~@aNU|!dQ{lWh#RfuIT?x^*cHlvP(%E8OEwlE4OO|D zGN(@7Kb!e5=f?*@83P-*xB0ciUN3b86XuriLji9|>v%(S5~>YaD8mykHf+i)X;E68 z8pO6?_Tp5i@6>=u7&scUOJa5fN#r6HEL z`Ic+3hu4iAe(}^uGp>nkvF>WNBtm#~9%UC$oe?uIRCnq4iM<6t7e-7JP@!^kFb2Jy zkASSx7bBe+2xcZw`rNrEa@Vyl0Ud!8QMl!y;+OAtlJU8Bw~lB1WL|pTj)ypK6Ox;#6? z)=%gEZt0c5ND*2}vOZO{W}UB`V)i5Y_C$Zb8_&<1I*vmNGCxd0^<+d7@3T9Om7<;b zoCNs#e40jJZm`L}u8OguF*z%|?FW_E$|n1)HZX zkYi-Ri+Yo69apeJ9P!L0UMdsqt91jF4!mD}{Jx>9Gjr4Tc;?|+kFEZe4OS4164`Q$ z#lCAf>sw>niPH?(OVJNl&dBvus>SF=*)q=43N}28ynjMwN-Caj4Rx+>jC^wz-dxNH z&LmFgO^zm@@0Pj}P7Q=63U+LJXiMeCbBK#;)jr#naJ~JwT=wZT%T}r5{p#{KwiQJ#SrmF7w-cNOyyOF}q3vwdFaceK^o zDjj2Co|*BsWu_+LOU+r33{l9ya**pldZOWYda{bI=2>+r;kz@c z@ib*uI^kh%0xaC=#R(FjCE?soMmaoIe=NHV*=ljSEPH1k^24I%8!DI^|1C z-dB9is%m+YZUW3>|FwpPKlOTPd~Fre~G@L)Ag3L5=7aNuhP5%IGp zdQAHMlO?y?^&eYw6_lP^2wYZ4_ANhRl&YFL_DlJA(Z#l?;d80KGz|FO{qr?$B-R$} z3KF`r|8?L4Jm_8Ch?P{6g(4gZzBcd~7n4 z`Fn(KDPJ<=iR0I1d-BiMCrH~}Uz?PpC zx-0_fhx{ruc{LEVyq{fAd*?S~4FW6^TvF(zTFt)tA2h#oP2Q53LVXP@OgW}mUw69r z$w;+5#p`aUuU+mnhpf5q)TrXPjH~L|OLjTD2C8@2xD<~}Pb3^Utd_-_D^x5~Eyncq zH2i1_G!nmLL5YJVr1NjG>^hZuhtIb5KEQo`>`HaOB@B(kvFFtFDBWQ?SJ(%6#KTgV z-~Ll4@wfIxyJ&t^xbSi9INI+(>*4UuDs@i#z^F$H-7V{|vPTMS=P=nw%dvQm!caHW z53(kHH#W)4XNZ*Q3Z(f&*xr9@rF|aTpZ`&(4gl8x8RRD*|9MS0v2y+AsPE68JCJ8e zw2(bnj1VR|1LxlrmCs%`9DbuMx&aDvy6^bLnQch?pZf4P0nvFqb4Fn&SY3tfWzW1~ zZ*)fN26QouaY!>$*?8i&T1*HnP(4f zm2f>Y3~S|!f_IxpGo?hS^F>Evfx2K3aAANVs=f@1J`bvBI!WRweK1E@2hRfzh5i*B z0mUG&gL_S-e*)aBjqle<|EBQZfY=;#?w+fF)dayC|FzjcPs3Kw(`H~gf5s1)Mdq*f z7qanWeC)W~MO*$%P0aZ2B%k>rll&>pfLEKVJ3CRvUWQ%J!!NYD`W;VtT6(DZe3Z0> z_em2IMY}`s7jC|KeOO%qw)C6v>~opGkqL*Y-ih%O51U^wZ|oiT89j^b^(QI(VYs4@ zN;8p_IyXe#h-Mr{-S9roK3Y=D2SVk}4ED@qTZix#`@I_M!|1&KVkCq4+A=4Ofqi6e zSksp26&C6U=ytEW|Lg93r|**iqdh2WKhwdLZtdpwBI6aYBjWypT-`L~El3A2Yc)d_ z7O2+w(^5^gS{&hsi(W1A zy{{#%C%(bV(WIvoficj*=%^ZM@JV>+xvI*YRTZ~gqLy_K-BsP41k``^pZSR>T4Fld zuvqmh+;)QPvAE+k5S_D(pZiFeMMQT2s-j`t=OYUvZnHbMpR4VigF4$T=6XEc@gs)% z;r4$RwoHd_YAdlyC@f)qH4_xgvRSYDg)%0yhWa=N2v~O+&q;e%9#{Lv`KT-itYMFz zU6Rgj$Vw5j227lK?B&GcW$!t;uV}8J;!`$%yEjLL0Ob-0(0~zXO#)(SEG>amLF0T>P@A`D#8Ev*PGz z8dfJ(>8LO{-Ye8UyHvQ#?yB+rr;e^}>!oH39zAA0@l?L7SiM=Mme+7aqdxg-{<$F) zp*`u)N3SC4_2e`=sI_vH$*%yRj0l=x<8V0nE7hCENP&V1JPI)Zh+hP=YC1s?N*DL} z(6tcR|8NC6+jHy}14K^P~xQD#do(I34xs+(3#0%u6f>lOc0QpZ(UAGs7(=Q65t`cMbd zkF(|OT*ox^+(Fyb@EpkahG~}bRm@Ri6*_puUj55}fg(x_PwU>R+>)QIx3TT;51hX8 zOj=dWpyvsxAOafFT_KcrxjKm>=-82+L#Gj${ciH9ODgzO#3%yE2{dH;d_sE27ku~c zIlMqY2;#`Tu znl^S(@P4qy<0zdj^J9W?jtgB4a)Z6^@@53C9eMRMH0Tub&?6t@^_;f+bW=r`=6vsj zbT6OU^u2KD0gJFRcT;&7SXu8J&{JgyWGt_)Fxfw^{%8xv`tG@Yl5-i>#j5rCk2-8!CB-C7(Wh{IyW(?$vqDbEwOMvg>1h3Xn)^>$7lVhspMRFrjz970$kIef zLu>LlIrUqgmUix2yK9S6D#>V(xI9m>>Gg{__k43~oX<)~o@~+!>oFV>Twe%XT|L2J zcRk-kSWp_+$T4ecT!T)5RIo{C!}Y>l*U~etkNZ}Wv0c-XA^t=?tDAXnLqtV#nu}A` z4D9MT+Xll&`4I=_aw7GOLcE^D@k&oUX;u(5OFe~$S4~_Y$cV5Izf2MkGeG(-akszVDK_ZnE?>Nu4 z*Fo-ijrMpN1oXB;-$Rtj+zpS$9~-)LP}3ka?OVmkBFpjV5B*@0+#gvC?~^Jd+* zGcp@?f#R&NK9QMkRJmiZYYo6-p2+xiN{S^n!-8_ zfc$i5t);k8{ANxo%dd7e%Qyk8U?G9aFLw?`C@Zopnc$`9)J6L1rGuXTyCA)bk;c-r zX`~s2kmXx2%}WSJ=h7}&)zZWT70D8)+xsIzaoSdx^4vTPbPGYD_BVY}y-6pZRQJv&U9eb6o~zRgcqVnUrCi#T(E>TGFhYF_&- zF@^)J3fnL*_vCHAheRI1eA<3iCLCD|_gXelhB&{c83fjYY zfr{_YHke(B^lEn%Z&9dL9P?S^^gynaNuwgT9G#ZgentO()D&5Iq~j;`SRXwQFjfu2 zJZ`+A;e59~gZ;kXeV>@xSXMo~Q>^lGX9|Ru8w@t!D~iupb>kFF{a^cul0*|=XPW2dcdyZUi46?|6iyf=pL`=(r1v$gAS2Xr`w}su zYs3FUmh%eg;d+_kABLj}Up}0fld+yU>ii{Y!sFDr&@;4r#*Q-)?$|a6DJbB|GIEx* z5nrSr!3^K{0JGgJPLWgUsNIf zr>K&g2lQhC1)jZd4mjsK0rsYAH+b8Ct3SO)IZq*D=Lf5S$OC}#yc-C*8CD%_4KW2^ zP8c02!-Malxey4_J_!n-r=8@BY~W}Yj>Me39A(I770wsNQd1ix8GG;E1wJYx8ve;| zsFPv3$9e)SUVn9ahVY;!P-$D_l;chHle=vq^KZx4j113AtK6@BG=UO|PL)ZA%sX~Fz-W>y1_jj#CWg%3zEI6X6!Kq zyLT4uQZ_MwO^wQ<)$jBM)`3Eoo}Cp&ANqLHh>Y84isGI>{UU3HY8H_3&z%TxaAMaY zihyE-f1S`+;Q38-GhkOh1It#8ilOSgyW#j5mk@p(`~9&FuxxZPosR#Mr?8e0e({I) zQz=h}w@b0hg;q1#Y_IKAj|(Ma8?sn*XWxqPZgdNFs6t>BhXRIGC&{|cGg$%KJ&_Ms zHPoRNyUDH&{_4MQ`54F~Xwm3u5qKR0Icp5KX~Mf~z!A+3;0IV*paR1>O_HdEMzo#- zwOg_;bUHIF9ONxUb>V0zN=QN8e69bI<^Ove5DJFJYr7WfL4F?)h=An9M+IHIZ@HZ^ zD=UbHTq3#dS=(Mkn*SQmCkQOggm%u{KY!<u$d2}(QTO%=o|$NSa33aVJ1Rlocz$E5C(9O1Om3PCa;Vu=R>T()Y-;TavN-!vdjN{6QAx5_TDH%C<7uDb+W#(iK}hRnB@sQnhdq6LIy%jp{kpo3@SLX=S?qfsh!;!i=^ajpV5lOB zq{ttB$Do^dU~m@J?lO7g))Y)v@zc1t_~uUhvuRuW&YXH^_tg>1eeDts>~3r6t2Zd7 z`}N9G!ezdfFeVX=55BZreC2@p0PqB<#~`MVpiw=3amr==Vrwt-?b`J~T%*~+ma~4v znmbrvgiroX+))H291hhK(htrYpo9WO^#q790>u8%>m#68pfT=&E4v)jN4*Gl=emO8 zB39WDU+0HRz2AElSbaO&KVqI1v1BM^h-pQ)>1y{V=2fzf!6tHUYBCkDXm?CWTi8U9 z7}Tl3$a`pSKzVfu=D3=X^Zv@l3CEeGMbB)ct@)1EZbnwDMby3Uc%f2BqQfcC7>xPl z?9*>}bzZ1ev!ya#2WdV`;pVe>8&BCBFAC6jay47uLfgMo(6~8%qbWP&@@X2i8JrJz zmul)gXcGlVs@9`wO#nI)7jyzkp&mDek&*&f$G0E%OwsPH?2D|()Zp7??g^cZA&K{nnn}Ao$w_RxZ5d{%eYfh;nU#jf$9`Ai*qm^U z$ye1GqyJ%E7MB-b230CEpy#eD?DWC?Y5X)PD!m@1A9Ln(M+hc*(2CI_(#_y^k*vRb z?D*N9#`2;BlME$SjmWo}$dJRzO7bdZM!W2{U-i3APq_=SJZ(8zv_rW5Da`b17|)?L zwSPW2nCQ%#aRqD%of6U;sAF+cRT;Qd#^-L*$t4i^;n-#7D>F|@-^^A)bhe3_gLiyw z!em0}I)`^NaOQ0}dNEn(0)jmMlVuE?#%7Eu2mWd|2nFQf8D=76U%e9C4Ql2v<79aN z%wQo&2Y}if{3tc_g1R@Fb}nqQo0^0SPMAoYFhtg`!rnm|WGbFhJ4W!Eb>Wkx8 z{*?^$`4g;KFFwV``SLfge@xOdnqZmN$lM8BaDE0`cL*&cNlimamw*~Y^Ll!|;TYP- zsU=Fn`EqJSHsp0>bYzg`dB(g~^1*v&{>6r1|FI}h=AUgq^+626hP&%fw<}9yFzp;MKgtF$)d%x-*mJa5ksnUn` zuC+s26`?NbF8NVyy;G~2uUSx~B<7A^@XUgU!RfKvb)%K;H3jaLOPj_>_c=HJ5a`E( z=x)>a&beHhRx3Bp=;xNX1^L-ghU^oWZt$7AJk9UfMb6w|@H_C`^Jpt?J6}}GK;%#q zT)h=qA%7FKQ)EuV-~n;R#e1>723&XGPH6&?Z#wK%1a@RSKn&>*2{-KkGOaj)h&dL) zi?7!QoDq|ddla+IXG>lyM;=9~i}{0Z$9B2h>4RP}q_m*fv+T_K+mRnyj($sG<-mx@ z-)p!-!Ph07xNPpcRrAUElfJ?s%KHG`*{s2|lz0Irn2y`%tJXa+?hz829SrK($ZEVV z@e3)doJ;rrk1H?r_2#X4)n>#?E>ls5fSBd`B55CT*p5oZ4W=r$5opaF(_g~vyl6j0 zp0{&(xz!ov97^`OVNvvl!IdSpO#GKr%*B-?Jt6_xH+XL7QRBP!E7Q)VE1Z8Rbd6g@F*^Hr6gkGLUU}5%pVmsTN>txv#-SscWD6w< zZ^)ffji0X13CEpzn?~ck3yvTy;$sTZXv3=@z#HK=XEg@Lj&Xe+^-U| zm<-Js5e#dMZfQMan|0>Q@l>AIk68{ZTO3Z$%Xw8+q1M-){{0aBnT0QQtRLFwVNqN*>RB7o)omZ(aK0Aj5*>YQ z^-~YeW^=MURov0e`JQ|2(%#mLoBBD%P!)siL&0Pfze>VeSa$^}f}-9sZD&wj{F#c4 zX^uKxUqL!$5WQ^A|0VrHpOVI_3D50y;#DkJM!!dcm0QpD^s9~Dj>sJUQ>${B#jD3L zi?41$nz&eK7L(9~f({RaMJGr4N4+Q*`{fyuI7y0~S_ZjZ@s(zX>(ZRUZeDLxxM1C_ zH^4=DlfpWh_NAg(KPc@vyRF@zUk46mlbx3Gb=fIbWwQ7FTY>DGEUEIIF)T%`2isW* zpUM!$lG%*!Y<<+e^evlz<|iWWYWPKz=goC{-8FZ*bzm&yEeWZ$3Hi*dKff&BgZ?j0 zwtq%AL<4>0!`*`qHc*qVZCadSUxsH^)A)3(ygNL_b*FceXBO2X`By~B9c0 zij!}>Z+#P9Y~k?ir4shRH=9=Ds=~3?p9*L~uF51v3jgM=W}dQ-2ge+|6t+ST6mhMcb%n~+dAO&XSHV_cYbue>d zNB%Ha2jVt8+1$IyD4RbF;)wa_fw?h6Aq_RXq8WcDxf&odG$8zP9{6WlL2boR8 zI>ii!e^1AF@Kr`5R=S~}5)e_4owX9)Gv@p4VIQ?gp$jumf5O6|MTbR5xwPnN{7I{z zgVU_%R3%J8)uRlot*<2;Al{*`e>LXHbQz5~@xaP}#v2E9;G~(zGb*Q10F=ZGE<`Nt z6**Hy-UB+i0masZK=CiZk(DW|Z!8kjqHR_9QSJ?gkP=U~a#WLk|8%jqyXazEVtJIB zz1@t?meo`2&TlmdMtQqf6Bf_Inx|D{%0N~AhoS4>jHZUZ#oFf@11+3!ULDznVN++zp<=n)Eh{%l38}6I{%qHhiMlL2a0S$Ztl2>}U ztI=d^?>q%Mu@AHEfDl>^fFFW39CSoiyqnubO_3!P3XKy_DsTB4_&nW^^?v>=NBzv8 z#m&-U?SXs6DeBqtPi90oTlAk;9$!$(QrNn4Dfs)=@;P-Uaf8$KAGKaG&OrxA+o>U~ z6K}gH_5_6=iyhONTGakdwHv;6(`sD^drQ`v959(f_rCMBnhToy_8fa+9}o%Ab(D{7 zc_Ss%KUt2uI&0zL3z;@Ss$AsVkjTtR*<3hC&k61&(kHe=+G6i261(vY+*q-cQ(&}O zx`61WQs8J8D~=sXq?8M3KAI-uCq4Uzfh0VH0L1jmc)T}(d+(#n|1s&K0}(t3c|<~H zGh()H0I?`K!?f(P;p_P=13ytX>Yx#|9N6BWt%8(b!Zx&PX>jVYDCkO5$qd^SmGay( zv_7YCNIP*wR)V_-rLsGY1h%y5szh+xYe?$tE+jdG^$&?w?tjIM6Ky#LR5#k z9GR7Yf#IYFoAvdM4)tgD>QkE8q-{{P0OOOrF~m1{Le4gpe1^78MPUD4{wc;*I|ZKG zUB7T#a4fZI*qGm(=*(k^9;y+wCxo@W9P!7Wkcm_f^;%iBew1_$m6~|f(lRIXagW*p zoN1|bwzND^EhBN9-BLnd@R-ihDM9Gx6+D*07%pu?xwyR`2nea5 zR57Lk@mku~IunBp=iLU4F)l*Hs_8(OguhVg8z}$#&{WZlhXq!aBNpYnSGK4>oD%H~ zH(b6%pEB{VYJMkPoCNgs7T*yeUyxF()?H1GQ!azaU-n)>E|3Q=%t`oemm82*p_yce z!(J#j4MDsXz4}Cwnej9tVhA`t5dYTJaH>K*SUD-(pI}`atXSWNSUrl-Lxq*`%0&k; zUmCVmiCf3^x6m`JhB$}d3w7dX3BQs~E~Pq6Uw~UIRc2u<=7Gp}qnzUv1rZCL#cuD% z1Wlb|pJ*KYVE&dCNx8JgL`aMrtRDY7CZ9ge5oFpoQbYD2jLp0r5R$rTmU}72RkkGY zp(#ta*skAU?<;nTJZ}zF^#;*;N=gz-&iX|-<%u{>pE3Gggjq<9CBrp4`nNb>NZ>PD z(z54D+A)ivPrIc5qr+YWBG92g&3U?$Li!&DQ?E=b&+~y?Jp*Kd$FdwnIAk{t+kt&{ zH7gAAI3qti%Jz55uNLL6nOW+WV$}`q9^)o{YqS5R`p{%#)KqoSHvcz3nz*eMS@=IIi*s#F0nj{B{Q{pFtZXU%2I&pfaTr_txsq^CD3y0nJAV zeET@Z@MD7D>wjhwl0jA`kWFjG8})$uQFG4X-7=>aVpdo2H1lD zs6eoP!Hjy@7tERFH}?M?*u3H%Y3>_TfFL|zIY`?j1C1oXaiwE*W6U36>*T26?C;0%>2@Fi zH~Ml(`(j3JdOTF;io}5=lfq}&*>>$We`HR`6J(=TYhpX`(dmhy@+{`6%dMoSfW0J1 zviRuo$_nrA_t8r}(WJ!Wa9nYH+`ql7-ZrHbo#3s75J89E?!qtIox5G*hVZTM^Uht& z<;m>wa(P;IsEp-e);p2wQV!3Il~r7XQu?@*_w?b$i6jo? zd>_fKwo!EhJ%bO!vKNkQ_A6F+Ww7P)t@WkY09ZOJE6N_^+NoomNAo0WbW2O$3R@s^ zAyXD}z~q*JDV3}7dDU2^-Ktq;i|@6qgMAbQ_<09rx_d(tJb#gqz7ObzHv7r5yI^+! zE(47Ye(z9pL3STv|3KH@4<|71hOE%h^f;>1uWnhm>+PtTrg`k^IPh-jM%g|0oJrANx|>IF8(Lm+S-2JkT_(q$>skx|0Ve%%`Z=!fycdG`SmouMBmC!>LyY~y|wyCi?2y)zv zWjj>@3+r|)siQm!HrO)tX@?{oeX7Tk61-lW5li zGrou50m8qF7pj_&l+GnYCXFrOz!tF{OTI-*`VZxV{4eE%3h;!wKn0X$L7AN2p>5zF zNO3~!dzSzcY3L|i)TMwv)1;w~H1D8+4GbzU(`+dSok-X`-{N@N4RLV~;;L)moz!#^ zo{N4iv2xgXFe5vpo!b1}K<7&$>bbs7OO&NxN~~qdhfq%!+0Ne@a!rEo)_p0}+-?=3 z!js;z3wY+=O1tQaHEY7yRwdebMv({0i}YulP$Q8u?7PjhB3k!iP&Bxa-H#ci^9XqVCG1g zN?LmgeiN8v(M@^~-iyp&E0zPSi3XY6-dP5dDS$4#1@?9hKr0dm_s=;_^EEwq-onDO zyM-dby5TR&SLa%16Ur}oeQ@mTz>H)WT<7q*s>Z9a_geRl$t0V!F+b*xiC2F?vp_0! zsiS)&n#Wd#rj3A#>Ecs`9wl1;_O~5Q6cJpCAPOO{$CGy}5FKj+?I`$de*OEVPySf9-q7RJ9Gw9nj|=Zz(ZNn-QA_S4(#(?lFCa_bvp4Xw?>8{B zNbi9DRq7~?O0BV%dPEx6c{}+=Ohj^g#Mm#{5XD>~Y0Wm5EO);Ddy}k)yi7?=jk?^1 zhK_ijx||ako0^N9* z6+KOX=YaJTYEIbep(6uareOU)ZB^OSMLz$28(9RxJPtMzXr&z zp!*(8<1muNR;|3q8ZLVwJ?*|z!_bqt6?o4zsi=$^xTmM2)u6^D!D{BD#kYnqxW-QBh z1qmrxw7;Za|1f;z9lL!m_w92RQsqUs>;x01OnL9F%QN{ZSsI7PruXXeiGSce9CDs~ z;RP)=0Gsy=uv4ayz|2HG1;C3q!b{+PR<5u;SWQ@`LU9O93~<~8Hsa&JA_e%N(aSa( z1CoeahXiBlJoD?iA&(G4Am`kSMvvm&_arhze2317)Ccme3W}su&$kkoUUpi#d>*k@ z$!>LA6ygJF?Xl5wt5&)hS>dW11JmzCM0~I`doR}Glv@{DPOW)x;;Q^kjY!4`UfI3q za&_wzjll<*fKjo>ebbU754+Y+VrQY1NB0aJY2FSTP91WAA~!#LQ^uog}=Y@ zYWQJCE}vTytC^Cb;a!~)Wsy0QfhB^uV6V1Xbavv&d1X=W!$;NvgdX1wSbuEX`zE+8 zlP8LrzF>njF`=g*O)>WEGg{8jaC=k{u!89AkvC*z7wo!v3jN?38>Jwi>$%4ClJo>} zrx85JTKcTjhlXg}V^ZCtH{1m3G@b^;9s6$@K#^foEz|%B6<%oGVWnZteWJmcB zXo>D*p2hanwg+(KZ@{jkrGSoJqFcMXug`Z@$?Q!Cp+E(O`R+^?&>tW0|qCH@$aCvX@PJP z#=?0ODt+I>{$p4P6Lgt(+IT|ApjpGNNtH1v;)&rc6HdMU%*t*vVvFT_UaZ5cdPDc$ zj!#O%d#cwz%8e=9`tm912G!u!yzmq15sbwdmdJQxUn_D};M3FScrE6erc^V6hhmP3 z2Q#r2F>Qpto`YNmxdV@Urm1gczT0sVJ9{ax9{ z))^X(N<<;UWNW0M0e_iEf_dO@$7Dw>ERXoHag$_+b~w%in^Y zgM_R&HH8|1oXyYWnJXQ^x(&jmtX#;5IE||QgyzI!lYS<#Ol}#uuDxRYAIJdBJgLa& zUOv5LeCvCddOimbu|8<(9)8qEOG>f1W_Tj3Dc@M&IF?#sj)+SmzQp!Aj0yFp{7bHt zur84ft9aAC%GD5^^5ge&={8E2%dME4Hz92Aeoie~=C@jIu*RN@*@_Vte=b*Ye>t1e z*6=L@%1hVA^PaXzBEwB}IYy(aFQOX@VhuL^Xy)Yiq_6<=1Xq$KECQMCB}Y0HyuRr; zAlzRxEraKZh*z2W*4(0&G0yec0J3iK?z#0l%b*V}>sm^7gm^EH;qrwqm*5Y))!qrc_;d(7DYLEi=Gdi%!#j!w&lyU;%qO}#x$-wFr8Lj!zS zN>RP@Ds+~*DViOqIGt0hQDR%%v!XCPIy4sxN*cIg)sjF~MY8xWjNF+SH|ZQpr0Dx_ z)iWQOB_or1zn%@-bkM*#RhC@xd8Nmkh78$|V{SrQ|Z{M}y+vQtyUCMk%HaIEp zN#`XVFJG~_Yl;o};T%>GliKAp-ukwAevR#$)jdz2<@$4Cs!U3(F<)}tB?=~TzCL`< zU707Ufa3`F`gYH>cUXUjwj$$O-b0=@gN`2J57R4+J)f5jT+TR0Kkm%gLM5 zjIE!ngwHgNe0HjqL3z|&fre1KJr&&IpFiF3HH;HC#Ft2OxB5LXDQU4=OF60+CMrbs z_s#F!YkK$1nG+s+Pj z&Lao754zN(H_56;=DfNoUaG5eSWr!2G;-^*i$a*BQ{`&Xhw~rTT5}=FY*4Gf({MGs zO2D9lP}Qy5rj5xh19P`Nj>S4#h{Y9rUUDe*HHm##=6igv?cK2`zntpqL{%@o5-}*u z%CbMoXIqMg&$g)f3(pINiwq|jpq+iNehy>c5ok=OBD)m8ov6~_2bS7HAnCX7elZ0n z{iSS!_7+$w(-B-B#Dg=`+o0A4ohyFKm;$29UDD}DZx4D4O@=J)ui*hOvjfDN7*9Cc zhA3q4MNUoI}42>>{)UBaH(P&A=l5#u6VMy^Ey#-7$ifS`8Nd9Rwg$ z1J0*^>g2{wZeLZsm^acGUZOYX%v3#g_UU3@T(rm2#qjA7MEG6j01e(V+n3I)=2u6? z_j_2Cn!>r~EnJNbM;K5A8WGLvc%>v@<8qaeRTxPG22M}8WT1eQMJ+iY6U(Ny;jFL_g9(!&dme6hwZ6}=c^zisxgtj2t zC+5ghZI0%$Q551b_{F+Ierl=ZoMdjFze1O23}Z;I+*_IYByTE${uj_vM08<;3C9n+e7Jt1AN)x~%@T`pk^^7{!w%Qa?hCiO09MIGZi9o)0YtLM~{q zGD)#2sfS^DzNbG;OGycmvA=JtyvmcA`A$o93uZlj=V8ZkNAoug&Cz}WkqAKoz!W$L z=4=x%6xA&>7!xHG51Ry@xDeeryEOIX=VZ}#m1DZ&>?`pn%bs$vv1RVIOaPp>{W$V{ zt)4m%X{4&FXux-Xn9OB+c|txnX_YpyY&J5c{cu>GTyt~uMWcA080J@hfAQqnubNg~ zc*Y54R(Z}7ZfB3ODi(6LnZCazRiM)p_RUK_j#v~v^ozNagepyp-sJyMu)YgfK82o= z$EM4J*i$lyD4+$?OA{RM_g(-L{!IG%oCfZSuul3W0Z1DW2juGe-roo_Rk}t3d`N!= zv^8*1jG`JqM+25|0bI3j5AhB7gwppJnh5C+gwD_*CA#=woik9BMxTclz`?SwMLgdB z7l?WqXovO_9ML#L1vr`LF9a?vXN)J&L))0?$LeDDH0TabFoRYVT;X(^_@cl5i@*SV z?{5Ks&!>|sB2j-sAMl&q4B&r810@Ie?jsLqXUjHv_R{9`DZ3TP1!7K`F~;2X;}r+L zJ}e?)w6tb-R4xhk7PAXF0^n}-+U$DNfQ0Urn%=kcJDo};+ zrw28c$8505^VfWKa&o@@L|5elu23I^f^k<@SLf_iC+;o1%fUO?U(L zoXg5eHn@_WXlDwB7foT^3L7`T^y0Bjmc+-;ABUo5`cXQVEbuf+fVs8YroTT<4_{C) zp9Jn|BJW=p%>9IdNYpl(PBf{$1S$Bv4j`i^Fe?3|DhLEu2AuYtUey9;R6;lJ=Dure z9atyyD85FTxIFmd7O2@?RRlOb`bsk!b|$o0JPmfEq^^iGR4o=WAZt9|jTLjV1kAS#j-JK?SojiG z*?C#fQN68VMIOA#m?5XxSk{|+wsT*)_1xGl40T6IHuzUlP2N9odQ(u=c{i}5VkGSg zRvbq?KhndiZ5JMi&s;|hBjZxAU1xFABu45Eq#ul%LuKeA5fFDz-w!Py@?pQ|1QC}u z6a-@jxa;i{l*1J<|ncaSc;2QI9CQ~W3{AWQx)AHHJGn1aB$(!azV9BrWD2df<} zhM1JXU0b55AVj!A%65*Z%}9kbhxL43koy|Ts$fqdHZvu0RryV2r&!E{a48l`NnBX-z|qb07sV5^k>?}3QWY0<-q0+x{xE3t*R&g;3`>odB%*G80gRDJ;EKkB zmZ5%zAqwMF_sf0yA|5P5uVt_1nXXXEZ`5oYKO9$)5qNida1q7Bd&FM&$YPUoesw{{ z&GYO6LM2HB=eroLqz8$9S7;s!fxfPjyEmowL}%`(%gliVvCd!byu2gU!v@fH08fB= zZhqQx-=e@7`H}9TS_a1VfObHX6!EzWK_Dp7aO96KAZ84E{xApXM>3*C=0nvqwX5V0 zLn3r@eQ8r3uznu_n+-H>AGRhCafEM(!Tm1F_z%N;<4CNwji2b(MSH98P~^E!D-TyL zM%GHi8p^bK#r5Yzo&LvH>=z((@0@u<^~h*g(S zy@KJvI)vs9ZY5-kh)mfr1Jr<*^e&7zM{m}az<3BSV{Ht3i8Vd$cSa?AFBxs$`6w^d={!rluC>U$h8I zR(v*&^(Y$=VP9Pde__keF1Dey*+61AI?$e+`0F(p=E^BlH|6Q3_C78j7{M1&9 z9P6|ei=4$=TL*#hwB)$rILoYz>>%a2+h0B&6ySVwVP_JOxgV}QRrazh zBHb^oG`?vTNA)kQ&@*{1#HU;Ju=#9giHH(VlLj{O^ZlZ#RXg(-<>WhqlzX0xr@+WvHAZRX}S#A^4H?gOV1>l+=B@j9^f|=OEnIh`kNznaZvHHNz z?WN5Pt4!FTdMNXbXtDQT-@5IS4%qm3PfX)(t)1|~ONF*Urr*Zfkb>fP2H9)Bk1hF^ zBrS=EI3L@c)~Dt$t2C1IpCE3cU!q`SA-bXrMzdA`UeH%@=$Uslh;BL5df%_$cpxP! z0T)}R<_33tMc_Ii`+tNCf`1sKWjpI{1;~QGRA>uy<}Ibl0^67-jxp zP^gEpf?w{PI(p(|5)wCCwRAvAb*H@Yy^dZD@jkUqzCI1!^VZKEi19@ec)lMz81mRb z%*`+%?rJ8uAU5$AK*#I^ejC#xRLlT{mAZt373`n%u=O+=21PFsK*>dCkPMCP+g*Di z@VgaQ3Svr={wYeJCK*G~0SiLKebQ7;0wG#|10&u49w%?`_{({n*|doS`^t-Fp54{_ zCraVf32ylb(G{JQg&H3|Ct1{g)Oaqgh)jB~NFqA)b71p;TgViS?yIu`@(V4x>6346 z>O8hu7$$KmR@Qw=s?{VicudNvOdaz9)%x-e1HTavAk@?AN1|T;B#?O<(}ckH{u@sMh&}*<*uVV{ z7!VB#z`tw-dRarJD~tENy0_67Y8_BG(F-3?D`9BLwD0sk=c~^niBfe0pt%SC9%;G; z&BTKLOtbqhQh^=?H9KMJuk$*fUAwt#6{7dyAbOr1z=eTAlU@M@gZKFz1fY|JbQdQ8 zG7?|}G(WvmLWIoW)-~6-!OI~~T)>y@2i_|oiE?yb;{BZaVn*Qa^n-qE?fh~FS2?)B z1L&7Dmds4|DuV}#f|r&8l26^85#gT~`^LA6$4>S1jYpQ$TsXl|A|mgp-`n+T4)Gd$ z$m-^_+gh)Lh_2;gT(XT)gF>H~v8u0~yPaqQ4=WI-Bd*5|jg@_#E$ekvWnAI5*kpyE zV9&U#a5Xk%e&lCffo*`#RpQTUy%I()El%cT2G*jrH%etg4w^l)$hl=0+R}72dTW5d znfZEUF7DW2J{7^hU$zL8j-O0*Zc0wXQ8F`AT;RykIO5MhEp%5`%By`4)-G9)pXHDi ze0k$S)!uymQZ~y=LxrJ{O-p|pQJn)~CFyd8PA|hUKgUKC>mTj<8X5a0;Jw2%;h9_I zo2xDzMCKU`5zxxoUmocev`gu2f9awa8h|r@j?m~2 z3xsXBWI~q%>%j-DEVpzYaLLPQYwF0oJ9(p#qg8xU?T2(~sQAf^2fT&HbB+l+%I`)9 zs$+~9ijIGYyBfm{hlkL(J*=S3h)^__-w}5E`}W~!i~03K!@+m;vU8;*&pA$KS6CaG zvPG%i@=wqkRBQ97Eh%9-x)W|3+f$FOt;zlxRl;2OiMi#mr;O3}^1(r3`&x4-x=<&L zcZFH=UqAyUj@s4sZpDHnJZD@-yeh;e`#J_wH{F^N zSM`u=i&omn7tgiC24&RcLL45CJ%L1bx&wLO_tVWI2)-Q?Zz7Tma^gkHlZx^|SI2=UxY zM&tJpe;~>Z&n&|`R#04fuRx;tsM4LDN`8z*#V4ih9`$toISUM-N% zzmk+^EPwm4BxBb!`@N}tvw99&I{lNgbL59*arqXvVdDL_opa8P3C_8mHgjmzjsJ?k}S1e*?*;5{)pKF)-L`ue)Og{$EC|F=4txz z?@3IfPD#IvGz%Kh$0Jhb2!W+4o0*XW#+^0feZ^_>#>$Ux&P0kbW-g1ootT(dm+0y` zm@_f)rpd2=nYVAnnu?nkUmANqHSzQ`nOT#8>#ae74jOgXqbT}e$|rG8VrI_qW4Q!Hew>rkgHwTo{RGwN;*HK`1l z88&^iE}&0`ZG)8kT(!=yhPnRdsUn70LE`29ooe~wks!pV6fdeKncz2?4uj;@5(<#_aAO#$<){Sl?^u+vV5ojvu*L|E0mV zhk9(Cs`OpRE{7C+n{Tk?w|TuitPN(fyO9l-@d9x{6iHxwT|e5IO5$NB21vnHtV|Z& zrb3$=yy{>A7JecVMUkH6xPYD)){8~^KRvzznr8NOEeL~76gDhmsZ1=SOJm$#g&6ZJC zE1o<`E6;GQy>az^-nzvXe)U{=;^_G@_QB9QJX`a#hfdp#EcQMB>F74W=Xf_=z%8Lc z#xAsg@x;|{vu?nmDHbRN0S8e|zZ(nguGc0;0_|2r^|;iZGOf-MdlAOHu}m2WgBUol z^Bm#_wGm%K`;_&j`u>Ibt{tfGxy!-v&{fGQ(B?N8U+AYc(V$r#!s&B}wui_r;txRs zMFx7+lL8)?3W7ns;`pGSae|CeSXfiXqHO`uswaa$E@@`0cm!}uEl62-S3CrWDSSc$ zy@eE3`oa2-hOS-e0s#X`0Y`)4rB<9xE_Q zPXFLBN+l707>-XT>}!E)=_<0g$v6>_?pUrj6hFwWUJVEcwe zF_Uw6q1TrTir7BD>`4t_|K~$Pa8%F^MPqvSp6ky77ExkIZO>kA)RV{cnBsfc??jE) z$c#x(=hp}q6&Fm#t9-&f$7EhTKBU$4oFQYHhmB9c7+udNfH-urFT2|Q zA&|YyX3}GA%xXOC7rwTYj4{cq@TL^ax!#$l$iMKys@=JiA(oRr(!^HL(V0!y;n{6$ z@G&89Oadymf$H#9dZLyPxDo*k1!e(Og*q-7ihKtUVz~dCKtTQiecSYq2f z{QS6McHGz8n@#sQ}5cM~Vbz?(BO2vY?ODZN1#`t zBOy3MYCe<%*%*e`JVM)Q3Y&e=&&pEuv0#8YRA~gFMyZH6DU(@5iSTEC%i@ znghFzzbSAZc){hY2{S6r zOx4v7XHyDgGdXdeJ<=~4h|A5ama>I*_aznOBjev&b1l3-?i}Cn=&{STVUte;Y@a=Y zlWcjgol`EooVnaNg`eeqpIgn|}7EP1nCne`lB9r>^^(m-mNQth;{Z z$aNF{<)7{r7bkDPYw>E>E!EZ(Qe>5U8;fKZ^HzOh@L>cGX^pq+=uXjH9a6T=ln!{* zKLQ>fqSgeFtO~^y5m51JU4|_JZQB4lkSc>AdrA)BLt-iQ&(l0C%PN-XMBhz5`}wv3 z0B4SQLOZ$rP)L#<83fJvlzY{y!Eah(4N{}MD~|!Iv?932LzqQ;TCraxXHVF^%t)(Xa=8c&CQyG)OD`TdWM{(((5Yub9+_M|`4EzieMfji)rmPx1S0yn1SK$&u-%HWiJfANxmZiLb?7pMvt<*3Gvfh`$ zVe^ux6=IMVtg#|stCS~@8}Tt3J$V>cAi>^P{* zRO`iFkof2DVdqtwqRRWitQgBPE>0Ga!{%8;u3uJd<2iNsou5bk;e1NpA4;Pi?j#SS zwuOcignH}D%46I%I=Xi689vkXdbw-q=xZ~Fo6cTm?)>`V&KH0_ z1!44z5rxr#s1X(O`!9YpWHAq zn_eFV`}1JEaSH_!tJHU(NW0x0-dU{A1)2`U;Hi-;x2P$indpkXnlLHM<3dHIgOIi> zS#)M8oNBa;sxy&bW2hCzJ$WTB1`qWK*iqd)GH2qBi6Z|1^Dj}oJkP#a#F^o`T`k}4 z>}pebcJ6-e8ICCSOU2)jG(jySY*;hcY4%^ zoYtSu`YxWpXuY5F`T>AT@BJUDOI>o71&1W)JyQJg#$GlK+UOi(=953<+V;pXrIF1O z>WYWGiStUf4WH?JgZEqb<|EJFU6{|vtA`DAsv-WzZ)rFa4@6Gnf0K5!Dp&%Il-U@> zC@v>%3cWDp5F=@-mn-NZDulfo%pmBDjA}v(lCsv{)Ya)n+~$+7)5@du!GfD_43l2+kNjV%)d3+KH7T0HSXl&ZEgX_ z2Txh!HTR{Pdhuv?=ZPaPb$f7gw0U6k%ddvx$-N`MY7Xl|{c7JcXyNE_EhEm}U74%1 z#=ZMPQJlDL0UXV%Acgg0-@+Ns+d`nkH~!^2XSgF9pjz0>KAOi`_E6vA-{%zQ7Ogq%yr^T;5o00C ziVfTI8kD1KPuObofT(FIk%Uz;w8udCa1e>Z42U~qA_FoQSrnh&Mm;lYMG~aZwz0K5 z0o^)ms^>WHp#)^4Pg6J4(84hYb_(!R8>58RN)b$WP#_zK_Qa61Y&h_bdPbob?Kws0 zAWUf1a$revF^|3)N+|9Mz+tJZ8C}TKfSm&0a+uyx3YQiPmD4o1n@x1W2#GK46y>0G z*``$6RWmhoI)<7;qK7bm?x`1E%Z!<3O<@FtNWS40i}$hD6GXR^!T!@UoGcZUYH+M+>cqyOO#bCImn zK}lXk5j>P0B)=kRMzcC>a`u6>w`q`)4H}`=5Mloc+KbZ*b@4C&3o>~|Z6%clRUArq zTQj&5Q`AbHVX~GgJ2KFm-EL-l*2psqH~g=zkYvLaN(IT0-mL=nI2;Z~Xz+#e50Hvs zORq?e1l5C&Pbf45Y8K#M*9n12mIQfFb@nw6@ynH9W5VM7uM>6II8{s~$E~-fM5IPV zxQry`N7Gq&eoq4#M{Zh`13JnV0Xe8HP-7d=KcIFhpwY9b5nZ{nR$7Fo z)AFNXG(W)0znd%!q7!b=bgXR!jwVrv*TYfdoq%scdwV6Mbq0jH1F!C;oYZ`hEDQO)h_Q$JVBuaXu}4 zJlA8>o>2YCc@ghEvxlBuZjqj5V9eEZk2hx7Ghojo$gd&rw!_Fk(g!tNd(^YN@nD7L zK^$Zk2Bc6}EXR=CxiBZ#IHE#2Gx%H2xsAK$6z*#(Pui0u4|485t9tn*x5SF4H(rcL zTh|==F7?*b-*?AP{JCUtid~7SPeH%PU2`Kwnm5g_jJAJaIpj&ODNCor?_yhipY>wc z0kvS=p{dK1`$V2lD15t*lpeeKdSiJ0t6MuyJ++)SV*A0V*4@4Pd)!R3-#+=`x>d39 zRbh|H)~{RoMF#@X}kO`ul_Kw@_<*0yet}r7|duUQ1vED zMrIhHlxIcjC&aMj9VlEx7Ai!~MKun338J*Q8R#DLqKE*|Ct8!xlMegCZf8fZB0P9h z_WMFurg@RX1@I!7p_?4I_u$Zu#ah2?%lMQ0;r!<7eeb=Wy-r&nHMHugF>IaFI*$n# z#vbJlb$zz=LHo?#YWHjp%u4tr>{>Ecu(k5`y$wq@1((i;aPm5rV}77nRLmZ-&;5*i z0c3H1VbxDmDqqb{0n-A$7u{#dyJbVU?Y*gd>4Bh}ntJXMb>9NFXO1iF*%$1CoPVtu zhUX`!A1(229A@vf*N|tviTAQxeJ}2J7s%oIu)a2q{PxEX&qne{e3_}??FlUPOn`?} z$^DQu7P!qkgEAQ*egZo0RH496A@#y!_>ZO8uOYZ538Hnb{H3G%c$##o15;Vkr$&MeuRnDBG9$J3T6RQX#m0=AKizeI zWVI^$z;cVFcHBoj&d$PH23?Xo*xIpMLA9U7h2Buuz>Vf@o|&-5W%-0rf++*>lm;pxnZ9)oJeowD01 zOs)x;k$3Cks_4JoPOsarIJ!Oaj|i(R#wdzgKkq#|Zd)efRURh$6Gl1-qFJ9bz!kzD z>iPa|YiuAn%66{?_oqOpE(FtbLY;$E6J?Mrpd%?XI$~`C8exKjVGF%XeG84mXXi0^ z^;jK_WGzq!N9aeT3248n?+_Untqdl8bSY+rTC5yrp`SoV$WaXitB$-fOzjY0unn06 zaTgoiVzF92Ew(^Bqn+X@fKHGD!aNX5{}@eGLJyz_Ixa=+G>C8T9<(&5kv%HLepj7DFt~30|9=Wivg)Rg^Ia^8O0(1sn zS=b+H{Ko;>m+HVtos!0}VK20U#`tfq*{P&{D$+z!)`d+x3ReVUeyl}QjGOTie!P1N17mx)7lgRHM?G;WSun07Zk{ z;rdXTP8*EgJAKgXs|{PrrjCLYe!mXkczc@mG6X91b~bqdPkN{7+u>%60<^XQFMZPZ z8qZb0W7QbHP#A0$AY-?I{69ok3SNuBVibmQ2s)|Lgbm)5nzIV8JN--G_>7M8pZ!S9iQ=JKk*x(c)t}JetBjIaI?u%nR_<{vR_&)-*1mnJQ%( z-B(4bt?Hz@jdPT`%df9!c`fC5RglGswE1ZXmKB0^c78>&5S#wLB=F+K?cN&E?b*X$;}>|Y zWqL9f^%SJkxIX@?`j0Qcrv4G-z7IZ8V;`i3dfhW)XfE>4Pv%x7qDCWzsJNo#b~U|M z8#Se)Hx%bQGmA6qMfGL?BL(;>+Qc(L6w)c-qC9@M{n+-4yJHe6hdV^in6MWAGXFYk zA9{8ud1c;$B+1j0~Srb zao(l%{(?pZcqpDG8ttjxDHw=6U2y|jjY{YcFP#bZAbqhoI;qS7_nU`ebFmiOD@7C^ z>0-E_OD;44N6hfTYwb}?3F;DxJ*Vi=rUFWfoI@@ID1v|@$dMo=hC1WFSQ2OO*K7)< z3av7QuPH>LP^RnRIRaG@&t}o77&1^e+Nn+(PfCpgp#XghDJ(!F;lHKuNNc>IkWQiF z-lt{Eh+g5>Op1@i8&;N;zpoYcHGijy&^n=UvEWXhbgt0wv+hy-9*3m zqj3?lLaN2geH^f6_v*HS`a1aVHwBH_YKAn;l-TTRY;%H? znCP&QohXjK@Hja1NQ>v^^{R+RrP-@$n|$)G#WdbMJJD(Nr!t0x^|9H_N{c3oe&rh% zPFQlnv}v{N@xYm$1^d|+z@3qO?h8U2p=$WO;HefVlbUEZ^0s@*^ zI&NjPL3@IM4PGT!PKLq0ZzG$=8z9Pp-f_r8=$^uyV|q#Ccawe?idKYx9USM@+;qqI zk`td|8t=tx^H1KtRQzU7!tO8OIY~(aCf@FSnz>2UZ|J#Y>-QYoksY*;SC9`FPNJ9rWB{1 z@ga;XlT77DU@{)XeKG*#L@kfN#e|;vnsdhiq^F;$kq1+QLDN~QFcHZv970Em;ClyB zQbng+Pm3HxY-L~(z!$=|9~q*j%nTuTD*ab1&84>Z$td-!=dv(ENT0m-Gj?&?>e@6q-HkMW_u1D%3qckEw6m4WYxSf!2 zNT%RgX$Stqk)Hk8t5T|sf)ka*Tswj~Tj%_X`d9dG>L2z-4I?{CI(sOj3NAo30%fVf z6EGyKiLIkmC64IeK~rN*HACyI0uLfSGh7HYjNPD@6Y@y7_SdfhxUpyClyt`Fs6{F)SZiU4wrxd_f z0}n)rjx?pPniksn{(t$`Bhk+i`jK(NKp(z84Sc=BtMd{q-~ zQ1BYH$iw4Y@*UtRHtw1+SDzT%IIMBrz57YGlkZ-(x|et_{`7?n6DP=*91IwJ`BFb$ zd;OES^AzuH9h+q0a#nXHAQNx@s(XD(7g&0}R%0Dt%?N7h*>lgT7cUbXm-}}v^S*bh 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 iXp3WmUoAU!4zQ~^p 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 diff --git a/app/assets/images/logos/collaboration/inrae.png b/app/assets/images/logos/collaboration/inrae.png new file mode 100644 index 0000000000000000000000000000000000000000..150cf377330d31ee175c14750c21168ec53806fd GIT binary patch literal 4793 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 Tj(zkm00000NkvXXu0mjfO8Gy= literal 0 HcmV?d00001 diff --git a/app/assets/images/logos/collaboration/inrae_logo.jpg b/app/assets/images/logos/collaboration/inrae_logo.jpg deleted file mode 100644 index 2bbf48ea433dba8360f84cb0bb52a1ad2b41689c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9230 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 diff --git a/app/assets/images/logos/collaboration/lirmm.png b/app/assets/images/logos/collaboration/lirmm.png new file mode 100644 index 0000000000000000000000000000000000000000..ea972bbd59ea326b4ebdbc2dbc0807c960229eec GIT binary patch literal 5146 zcmV+#6y@uQP)4`;I~cWZ$MmkwriTnVv=(r^lm%3WtMpY@I&Go&qAXzv36KEUx2iYyyDzu$QdGUF%0|yQ{8}fZ-o5wT``v%P z|BYq{!fk?%+a&2W5S4VxfKU=yTwILY++5sh33cKY5Ep&*>Q#LH`R9m@jg_CAoE!`u zJQ!(dY0xwc4NY1@DoeiV!i5VseE6{Bgb5QSAU-}`KJ$9L*t2I3PMtc1yY9LRUAuOL zt~VUR);kbt_$ybgVE69b^7oM=N1{=qMnQMJu&@vZ4jjO_bLTL0=uot2)22ZHZQC|D91isF z-ybO{DfJ3Sy#c{tckI|9If1O+p+g7B>gsi;PoKuS@4hQVfnw3Td2>Ac@WV(?Pxmia z>5^~0`35mDF%rnc#6;8w)e8^@4<5wPqepS~-FKr)moC+0Ju52<>(;Hq_U+r{@78CW zN~cbp@aUtDqJ8`J{_jWxbi;-XXxp|e#*7(L=lY}0fZ#A^&YY3*-Kte9+;h)8)h0_5 zxpU`EeDu*rsHmt2IgStv#5i;e9yS7#CQTF~ku1J+2s>|b(+@xVAeCzG-o4ScZ{Iot zq*g$%D?dsRy4`M!9z9yJv3kx$(@MPa&O4ILBa?FjUc-x~&D-ILC!Rp}G@&ppE)R7I z$2@uRB!&$eCKW2*RU1%h3U{vyB}HoCLYS;F3k( zTu*nLi|>u!{(WCeAKX^J;JB#|73${An5YSk*~FhxV<&c?_{=!a~#ur5BqA-Wfg0G7_^ zjOpp^#7ynkUg@aMKKl%#Mvan6IvR=y2sXKX{kl|yWXG{%$HM8XVkW~^fy|5_@rT#` zgp6~U=I&{R%}aIo;H_-u#>K>*I3L$td{>?QbxcAe*OF}3EEDeEp!@uVwV$*a!k471Qzz(gW)YM!sXzC$mHcHj%kJy zNu%WFno}rPAs$>RfieLz0#_x00HU`9oGZCtz<>cVvJFQOS&c~Tv%}|vR};G~WIZ{y z0MpVAV`QuISaYr?wp5Hqmb)V=2#QZYqm@dXVDT$&elNeOFidq*i!ej^HFgwsh01A) zgbdA)tPi=*!t(nZNOfPw-*w2qg}6@e=`kh;5DdfQqAK!9QK0T%leQ&S@a&O4W61m& zxcs00g_5h;@R94pTzs;1O7d3j{fVTDVS$lech~ zQE6(OJ}*XJI*fTgY(cxc9B|(aEk@`aY8c_FpF0chbN`0owd>${>T$S*C#gBONhVX< zK|&zN5z6xoMiBuK&OMHbIE-KBHK9{9bk9GJr@mj0J~?N_vvRR`^)B7toO(w(n1>Id z__2RM$+*!-T=+O*Q`^Adw4YlfqG78e=$u#`r`nL;1p1V}05ozt@VoolVfBN}Fu+kP z#HT`vko`aoXvHNkHf%)Rm?_A9bp?FoWwu?YEX&KwZQIxa!GsBcs0(f|HNRAcXe4av zwDeZk{%kttj_Qn*`zNC5whs}%U_QJFi2}58p-2s>eEkzO%#Z0;RI*g50B`yK;Oh7X zac$ivC>LHY!!`(i#VUT}2ztbJWD5kn$~sMe_;jSFCE|~ByNej28*oM&G^$))pRBh5YpBAg2lmLqDbBgo2~n#E$>f}t4Nr8%6sQ~DBt;wFtprK#qB zaeaEB+3L3t^Y~zR<9z~9mz=B-L`+RV(In`xWj++G{}>-FeolPrl@h`+xv6#(cDrlK z5wr>pv865nXryCtt%Qs2S4?jW?q6mDL&PUem{OlZ>Ilv6iJCe?qoXDIeV3Yy7khTW zz9vm2*Ab#f-rE2tU4oT;&gebl%3KUNz!#&zIZ)&`(nQ{3e;kYxZV9jBi?IrS5?N$j&8}3U-V>Vsf?s@xW*L2+szGacOptJ#UfuMqjt0q z7N})oAqcwsuO?&*gij{mRFdj(*0RtcSJj

    y=JU{wbk!i;$(dm5EJ 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 IM6N<$g06@4RR910 literal 0 HcmV?d00001 diff --git a/app/assets/images/logos/collaboration/lirmm_logo.png b/app/assets/images/logos/collaboration/lirmm_logo.png deleted file mode 100644 index a177adc5a142f23a83a28cae03a217e8bd1352ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86558 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 XZ#~CGT={1N{4+JSGHNn#i~IioR}~xX diff --git a/app/assets/images/logos/collaboration/sifr_logo.jpg b/app/assets/images/logos/collaboration/sifr_logo.jpg deleted file mode 100644 index 88cdd39e35d4027490b85b1bbab5078364703462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6344 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 Ten13Xy$ZWvCIt?}9Zvrncs#GA diff --git a/app/assets/images/logos/collaboration/stanford-university_logo.png b/app/assets/images/logos/collaboration/stanford-university_logo.png deleted file mode 100644 index b9abb4b7f6e1561083797a7206a836b3795b48c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121975 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 z 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 diff --git a/app/assets/images/logos/collaboration/stanford.png b/app/assets/images/logos/collaboration/stanford.png new file mode 100644 index 0000000000000000000000000000000000000000..e53d39f254cad05dc3e3727496ae927e72f50d00 GIT binary patch literal 15057 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

    OeK9O*<3LcYvir8K}qW4%T~;}i2&OJS&QEVbD? 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/logos/collaboration/um_logo.png b/app/assets/images/logos/collaboration/um_logo.png deleted file mode 100644 index a1307507344d78c598f63b4e524760396a791147..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33687 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 IM6N<$f*y9qz5oCK diff --git a/app/assets/images/logos/supports/agropolisfondation_logo.png b/app/assets/images/logos/supports/agropolisfondation_logo.png deleted file mode 100644 index 35ec92829e02fb68be4fe22d5a6c87fe0124ab6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29060 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 diff --git a/app/assets/images/logos/supports/anr.png b/app/assets/images/logos/supports/anr.png new file mode 100644 index 0000000000000000000000000000000000000000..ebf81e5cb16a974b8b4457e97a115336ec966e15 GIT binary patch literal 9952 zcmV<6CLh^}P)Rb!4-pfd5m8hQFruDsKl#~fsAA{2*N-uCPVo*Vu~O|4&NaEU1&E_le#8q(a=QA8%-6mr^$+BLJ#*)1$|dLt7r)c*qp|FJbnlNSahGg{O))3xX2(aE(< zR5g??rTA;*Us0O&bCA|-iBYH1%=GWeY*f2iRo$;*I{FNb&)4HuX!_z1{mPQnyuOKg zcePXP>P9*;N(?<+DkBkA9sD~}`Z3d`8zVI9w-D{zuh2ETuvc`-Bjb?{qXIhW3=Z;S zU;4~PrG7!zou5bTPqC0a4->DvKHRoXp~kgUE-Y9brVGxr@>VA*<7=+o6s5MOn5n># zyw-=`1?Yk^taNGveJS+^1x;QMpc%i0c?Vgk_r(q}9|cAqm9@i~mH8CCrVFF@UUT2 z=-#(H6pabi<1xBxbeYt}YqmxxU3Ajr$YC?ko!uQY^}p3v(v5WcE2Z?sPeBUtcdJt7 zs+_?X9CY4)#(5~8Co%G_d^(?{sUl%5^9uT8Ua_O%tWsvr?ZnUiGgTplSRFk6p;vCrH<+>c_SE%Ds08)*c9zf=Cj01_TU}JMz$m>4 zd>?L=KP0F#dlEnV9-@od=27(m1KrxqK_ghzv}|Z54>R+CTgdN$+B7lCOE3B(EG4rZ zyJu~hCZ`6*J~-A(H42DMZ)~PJE_IN}NNHNCn#)K7FLzL{E($&Osh8^2Fv*28n~u!u zr~(OArDEZlFx~v3n+EoD&|UnK&RmuG(3x|Vg=uk7gz8jN-+ySFnCKsbDZvg_HDx~d!9|u-R%^K z3QAQ8`^yw+P|HBC4=A9z>^;n2V@s5&G*qh1;~IT;0iDy*LN`2LMnyZKbR=}d492c| zXO>?w_|stp?BHh`mL(g)^zsxx{mEPSoYO39SVFA#h`k9jJ=Dudb5?|DU#Y^XLH!+5 z4ANh{`wE9#ka{(YtXGN7Zf>DLS3AhbQhIaOJevMXP%eTx4ukyeo)U#Rwy^R7B&Rlk z)sJ9N#Tb|W$%|XvKngF&i@YNitO+M(La8jjxSf?=9gt7sz6sFOUxIYlB#wZ*0Ywac z&n;&C7S#RBkH3e+e?RhwQg5vMwV~tPV%^q=Sh^uB-ka?gJXtaM$AIYZc(GWsB`jE% z%Fpr3VsA-QL|HuXnerD?C>&8=Q1}BstqqG$zW0k!(|p3?SML|)OAQ|97JG`LV&<;_ zF?V@L1cHiq_J1Dn2#=ka9{;`&F(rHaxc*C@`^1RPydoA8In!Y?c=y4WxcAL6v3`4` z!q4$`6?eW?DmL$qi03}_h(DOI2i;Ne;Mg*rkRt9G<1YVfSYApIl_TX4f2*{&BqqLI zk`w?R3&ns@Wn$_2u=sF}U;MR89shUBgW{T}ip8>xVa@CO?}vc6?=3ekTxG|n(qS?9 zfIB8`8BxYei>AHKa>mSyi8sIUrM*6HMTkFNDoRqM_?@qP!WWG3E;tOaI81_+J~-Ab zCbE^nI;F zY~L5ndT;ZdsOZg%T(%)a3KUg}?;7Ri-^tZi|DB68D1!Z4v9B~Hch7;cn7pohN2&aE zLUEN6V|_5_ZMXdHQxiPmwpYr;_Pr7D7O5c%E&_p*ByYBp6ZBm>GV$v^`@9rzRbE_@He4S(=FYUTSCe zic|-l>G6-fbo~W+5-QZAgKmYRrYNIof|}Nat-wt=4_P@j}*2YF*deAv1Eg`mjD+nnzCuW zSsE0Nj`v7U2L!!ev^`sr$IkMJuPbm<56NIK;w9elnFJ#PuVKrch`9RcQt<-&iBKcE z4o1b?mHIb??>lu-fW3`l!Ps=d9pMkd<=VMFmi1nO;MP6%p(oAn*-@D!qf>^GH4R^hB@NUz&Zh5>HfoxyUaE zTJ@CsVtvgL3Px(_&@JpK4f~)h%Y}rL?>Z1I4{j2K`SxR%4<1Q8>?wb*LLK}B>(Sm_ zZ4w~SqL~a_|GX|tL#}htx*ZYL$3c3cw~OQbbj!MBPmI$z5$b++9@(rpfG0dOFGs1n zi(`y*an6o$iBMDx&w+y3*&!)#7$t52aK@3B8!!V8Vi^PQom*KY29Zh|c1CFGq7V(c z$whlhkSqvF>;s|uxCaa9lzQo2)J(=VcJlS^y28#HJUI?s1~2*}!q`BB9$`eOBHFf( zUAKu|dhekETuuVvNdhh#rCkRV`X@8DveVzqpI@{tL>m}3++RkF|0>de>XDh}>a-g; z$!Vf?%}vyv4Qq{p%E2sfFQ;-k38-D|!u0R3q|##_`6c$;vy+wD@O5W0j`H-aPSV0( z?|<7(!)|m^{hCSUYce>>e&N0R;kWP2XRjdX4*~_7yf92IHnb1_%SkozRnTPU2R<6n z&zY4_WFyC(f}l&zs>t_M{Y(J#K-Iop8m0rK>X0xp>F=^X9Et+YlBS}?8|OXV3FyA}L+YNAIj@~|76RNyo+ z;wPm4T+Nxh_CA*Mk<B@8S=oeOZz@?kiNta~okQNOs3_S{Fu7O>; zh{Uq5>TG2U*Kxu1*v z%R2fMP6cHWBAo)>vK^XN%v|VY=(%k?Dct)2`=NXJ2lWxySS+->O(7`??-brGF*TW) zm=MN-NgEjyx0+%Uiy8U5F{z)cISdl!#3$aL9iaKE7*A%bxPA?N)zO8cOxTfpR_--3 zR7^w0lbhDDuwePA(Md)+wZ4(AJSUGb7kucAF1n9*|Anos(swpJ#gxKB`g}o<{@LD2 zjq8{*_-l}f#Sx$TWqpB_C$(r@LS{l_h)9A1KbStN$8nJ`}d%m>2jg~UL4C88#8*ePGhsO=u z)Pl1wX*w8_d0?!E#tte-yXn+LLE6l!;7*nRe0mh?8ANZlbB3X1Ln9?t5#OK9R`%-7 zR?{d>*O0Rv}wLS_L;%n1OTNZbrJi zLvm~Xwm!@*n8LX#D+4`VnRd}56nAuOV`aBVdm9FL;4kwIfZhh9*Z&=r08og30M^8+ zF4rgtGc)r>EM%jE+#2*}E6%u>Sr;R-GN7lO^wctdtyLO3aW}u-b#Mt?+u26{VGj$S z5*CEDSBje`=q1kJpynct!2?H?vGf*}-xO~>I^IW*-|UcL|Ij-gYF1wz;FG*MR&%oM zYZEgK+wiPYw0&k2p1kr!fOhcKakJZ1v?C^6Brl{kcyw!DpfZpQg+zl1r!_FkE!~Nk zd>1oW4|V&2RmGXCGHRvhW0Ygm?WceDaFj1X16DOK zx_6CsQyn&#Hs0)G?=PT-8S2DbtZ|Mus%@fvm)Vm^&riM&$_kfMa`T`Xu+u#L;d~l= zy@Q@+74a2EG)jiR&E=$J&vR^g)1xmI207q}N#pj{ZWZS(^$Ho49UD>y47CK~8DMo( zv^^sI*l(AIrJ>RyFcqE!Bs7(vaz?NhHI#X>jInP>EBtjB)l_QCOqTpcm7||C*{9S` zZf{s;#uca*>lhbrt^2OB)A?uQ$?cK4*wUgKNJ@eh6>%zl&hm&Hz&ch7u=b_C7)7JU zx{y?5GnmW{ADla>)>^R2n=m)Tp>Mh>NKmWBCi?OxH3&&ib(c|AA`PG5rJFCZ$qJ_P z*)6N5;R4E6R{a%CNw=%3z+g37+dK~a9Fp1CU2wP?)J%7AzFiigHaa*if{2N{Gq5#x za`+1)hf=5LF_YYMk_*c72!vF(?w}_o1qOKcgt-At?*#!=vwB8iAS>Rz!UW zQg#&!Sv>gT>WCBqEvi@3AghdWC9|9~|KFYg^&yJ6fc44+tu0c2uG$=vTRgQ)6gNEg zG;Q^;Xlaa74WqU{cVEzalB$OkU;mMiz;p- zu{G%n-u@T1QT3+29aWDNfT}sO?MYNofqwY>P&ZmC4adshapgir1P>MIN4+dSb*J{{ z_Y|v+dmyYvh>@87#jpQ|je#UrTu##OgV4R-8*Z5=`(#J~$M)$=`I3Qpz=lYo_I z+bKE=j_|t`1JcL{pVP`hT7yQd*(Odn+8DQm;mUWU>rOBP@S(R79tzMjxL7d2z)mtL z90&2k5recDejVc;%h6aHGZz{uYLqh-ZI9BQf5#*^Q{%46t8VVvxhQg`$0ij&#^#S?h z4=d8xX$1@-{t{FhaB01u$j$)11Yasi=FCHQNKtRyr%1H^>dtvGos-8Z5a%uu1Xm@` zte3G+2NsDdLnTZ9s0U%rJKZAFPwiR1-pnplZB9<^D-)W5Cz6OyeB_~5`W5iRiH3jT zEq_mXC7hYfGcR1fF2veHeg z8{6^3al8rHjm*yg=F>YJnUGkasF;R9V>BodLD?q?IX<2jWE9K9_pxPtGIfd{F&Ojy z96u*6ZE{@YpAkk)mG~3q-|imcrlB8rI6zS7G=>5$X{W7<(#9YEtyhO(HRr%xf)3WP za4k6anD%psw{eh8KRMlvgY@d@)&%2?<*B;t>jQy;q+=mFHn+$quPaNODPz%6rxJ}B zXvlc4gg;;F@8XPg#V61r5mgF*=MeuL#!;ZhpX`$_Q%Dt2LYDMSeMXfWy$B3ki*CNi zF53bOCaZo@$q?sDnpWe5d3utM z@e~X7zsw;^27o!Fk}1BnW{aAUE_7%!GLR#tV$3u`c`Px|zewr zscU2x%^a^gOA^vF2s9Fs3O~15U9(JJg1WWKlM$dJg;CE>_RG=&d~WivLaJNcKq4NV z;GW1d!-&<&C+Rt55`;17i&xGeHg&)8@u!f@NEBi0Emh=+^+DG-*+4|;nK0B4y|{gWA^KYAU#QCBxMd}yKphF}pO>8XVKfH_MyMrBUyU+3A_j~BFz!6xMYfE~aG-ndi!9z26@ zmWBub7wYCN=0#Y(5r=a~;wm*<>JN5syHm0uOI#bsAh6-e`f7%EX88q-SfZ*BjyATn z(TH=v23pVh62>I6L&&Pl5o%P+q**44y5Xrmg=8LX+y0mg1|rcML!e_wwmgHZGj7F3 z9SlZ63F;v-3DuFzmO#(#(NXiT^!w{ z#$gd6GYcCF>{1xOb5ApC1{2WL*oC>aH!z}#P_0@_Zee%=sLcXkzJgQww7 zEf?Em>g4TNepErL-)`A~IM6ZpY>5PX~{OokjsyaMi7 zYtE22tE;U7P+i)tS?&y$Vp)r~H1sJX7Yu;Af(AyY*oGA@-xTS9D>dXy>@uCQBVY~P z+5s_RZ-cF_o6|7`Y^h=Jjwh27Q-FV(?=VUIdvZ;6mvz^`UF3J-30_;<+--?muFE>w zq*p+c)=Z{8QP+OHc){e4$Cr{c9EG<~<~+ygqou=RUge!aQnPH@S*H^#LA1>gKEn(d;ES*ka@~ zk2B4hLi%g70muwS67=KhFin^nlo27?9-^ueAU<%8Vi){)EAssJ+twVbv{em)7Nl{ zXvVKeqzlZzSq9Vs^kbM0ZL=VKH+M~*4NDLzzl*&>w=e?|^gu6%jPv28v~FyoYAnSL z2G9_0o6S|rWfA{@{;$ay6YQ2ce4jHpvjMd4k`5LIhHSc-nKfG?vMW|Kmw{4+N#tlf z(#~igzxAJYy$t8M;!EtA+r?4KJ}!LMBrpOlOl6_T1-s4 zUi^K7QT5?bQUEv=j0SelpoV(p4I%tJSK4JYyWW*x)FC9jx@1c?PIunUaB5M!iOBUA z*yvD{btg1@>-(ykdUmpLEabEXczTidc~O6)9O^AbzMo$Cfvnz(iG6Y@AxJ#(+Bx zW!o)kljjaC&2+;*@?@~1N7y~U!Qm5wxe3n$gk!cl_C@8je&HRxt5{(*0u0;4s>ZHA zSFOX~v)Lm!$dl}IQSysuTd<6A*FG$xc*nahGkQv zWW~OEA5@Aum=$X|_5UH`G61rWK&=dEG8ix2^OlF6@0%}y=>)+&1ICL4C3Gw#?RJ*- zTI{foxhr3~L5E8y5=5?U?(&G-g6cUAwKpXyAHxYrjtO}z%fQkLHw*ezW=~AXRtk{d z_NST{P`60$=uoHavB-#20q~-#B9QUL0hY&aa%LA;^UrF|c8r|rqtSQgOVkazQ=Y^*l)|h8;mk1(Dq=x#P#i%C z%A~YL3Q2{&ufh5iVK2(CP)Kd9WbbzvS#)jf*(v*IZ7^P+25$=0q)&X}rTeb1%f1mf zgb4kfP$5{P```A^EB#$*eKRZUc=94Eb+iHKc2>GIMN`h-;=R$zgM}(!tQKK-P!+N( zYe22#g;YcT+Bw`UbQ$Dv){3k2wJuDwf>jezWZm0aG!G(vw>-poJRe=c^M?vTitC#t zVc8oa^C$sYKmZEpc}_;-5m5o52Mzi)rZ)Bjp*K$`lHKg)*P^g^`EzepPn#2s&}Zn| zWkJC^M6)4ig3!-r(tN*oW|Bt~dtzeS-l&}8h8^jBhuCM9jYcCH7dvFvsiN%>@$fje zY(-cR{kbb5`n*&s7On}2;S)UKL}GDbEbM2C6@NvTX#v^MRga#Y=n)@%=Pz%HG<#`K z40+$9DO3!@ih-ltBB&!&m1<0fo;E1>(>sd{eLZlrn{H*G{+5ev5?jVOGQKl7A-X3nzUA$vR?FWM@5q`9RkOr@tMd1aqr^cz;yWBLRpF9?V?GAe;j_^hVPeIw|CzTLdzrau)jyyeflS>*GJSpJ8UTV4H_WgE+ni*~!7)0bXBpv(cz6g(Me&dityRU5sd+0S^6?C4J&4d2y~S3e zK+vy3eq(3)Wp7_#&yaS2E$BOp_F*`#P?<-bK|*nV^j?E!0}Nuy!XWt=qb^~5_n~W@ z5;W@lQmJghaenJO`S^+ZuXf5x$^oO@vNuNNIc1cQq3;^Jk6R@)n_I|wMEMZh2E7_l z@B8E@J{r)&PK`58jiOL)Ko9jc2ys!F2#LXVO-MDK>Vi;r!J3FnsG=z{)X9Q13NKDb zCMa9*PPnpjqHaOZn=JjPphp4~Rh4KI-M@!}=Kmg&?YqF>>*Gx_9vSB;UjRUnsP63A z#=^Ue1$r+a13UbsoaKJb+H9L9g2 z_}C+#m4UEzIRAS!Tm3Q9eQf!?<k$zgM*8T2b1Ph5#05M2f#^Qx=$Z?=P1A!0PYPCDnOlLMV%V!ut#blnL#l?G^k;sGa9LS5RqZNLsbc2ZhK2Fn;Fw!ZR&012K6)NY=_B5q6Qxy2NBxP2xcv9LmH+o+NEV>jrHbnzQty|^Z26!+_KN{TK}|t7!`m<%#m503m#5OAndU^!0H6f{`t`!&63kInyZSA zGlSC!p)Jz&sGz}-Ej+^$^#=gTQL8MAQQ|GfQDlN*!hE}0L62f_9EWJgfejik!!s## eR*@Ha1oVHjsPvKR6FU0<0000SOR06*sdOX#V%^j?bb03YQ5LFWKQ=pbP106pgb8s+!- z{ehYA06FFWFy;yjNlk%Xr^?IK2w^UH<001BWNkl4H(+ldZgam^XU-%+gs!gY+Pb=`RC+xO%|-aN zpC8Unt*t=lwg;8f=y(#=p7s|8@FLLM<=pRzl4Lb2hq=663VH}Y7nb{DFm;sZBei*! zb{OSwrfDD^c|I=RE9ja92|Q_%PLQFqQ++I{q(ks8E;u z@cECO?8c%$d;W880b@TF=MT@Z(C0m3xNM3|;n8Q`586&tw!ItfPiZ{FFRyJk;|nui zRKD&S+QVS%#8$DXU3Ag#-QP%CEZer^UyPG|ju!XMqO!byjQ7G&7Q0t)^ODcKeix!O zkxcMoE-uYUfC%Q*10i1^P0nKDZ}aDu)xSEWBPm`^n|{j&KTUXHVnbmOw88&^B0HAd z4D#fM=Zm$!DPLxFai2YyWEDBJ4*Eq?bqm~YNPq{w`taiBH=x-ZpuN%O`BHaQ7N_Q8 zLoN*3**@eLl0iBCMP2j}OBv!K1dKQo0SR_KcJn|k_D(@j3*Px4Y{hb}G4G<)RWj|N zZXt0T}UhL=YZQsoJsMqf!s_Y#2<5Z0>w&Ca-5x%CnFV(@s zIM|XE6tOk>axa4prJgqz>wE(t5@j#2ic;8=RjzQ>;b>Nadd)1QtT~!T{{;}!!3o@C zd!2pqM-20+7RtVO(b&@!_&>1t>}gh{!;t&Q6JRNJ_|l{W8BiZ<6?I)oShF0d3{y}q z%owyC@Y6@!dfG+*IY?BbBi1Cewz^sB=1Xn8#)BW8ZH^ikLb8Ye>z){vj<%ezrnT}# zsW$CLWLP1D$_n_YOTbK-NC0hGsGPd!=O9zzY|1&x=zf@VyPU|*ms$geDe#S}bF^?o zf4BgwXO2Q)JE41Ub*xo{N0rPz46Kpm}WOW$~GoXRoTVnsjJYE`RLm;Qtkrc%|*wGE2dc`34V$o)ENRQpB^PLB=y`gVJu7 z@vVcD^~vpEHrgiVvY=ihs0oE#s3J-3`gaL7LA@}))`*N$KUNh6Gq-zbde0j;u&^q8 zB~ydKLa@MGuOi(Y8IlhLdzwM|>!uGzAFt|YT`;5yt@2ZLAwubp@yX2gO6ztXVzjUU zd!7A^TMNM?U7`yMthk|#SavN5 zzE$VWim%?eB9`=;n@G`H;asi1eelt#yR#o zdR@M4i-WnX9E75}&pX8~0|#a%_&*@uNZ#D5cW?HHHtLA@yVv#;l5M1X|54j^f*Tiu zAxu~6?2r99{@4CDDM>ViBTe&P*R7C$H?Zjw>>NQgJFo5%W5%+&%aSt+zDBk-?fz`6 z>)b?uLrN%v#azOj{?FYx~od5#EpFgu)9$j)` z;e$w0k2w2ZW>(Gum=#=)djnf)r7~tcrXIuSJscK)em-%;-adc6zt6uAe1As^?+rsS zLh#GXd0NOCS%$UrY@XpPt68kj#n+@~?tFfF$H;ft?TLj|Pt=7;(6*Z)SoVaft3z})4opb+Qb=8};ckk?xP2tJ zy}y5c`<)1r3J)R_JHNg^5)40np&IRyK00n>E6aM@+3%wboh#iQ7dA8@CNNRzF#IaaRiLg>O zQu>{3gS>N?DNz3XiE;bC5zz9zjrHmoKIP6Fv!tTL3ijtKYumg2@G8iQbhU*$U?Uq;|>M0$KvdjxoBUSn=N zF!9ZRjd-3U2fSxUCSLFP=1lL;Cz2)K32p^YixG@jwCaDpBk7W{``$6}zvgh3HMF3- zHZ~<2iSm3+mYP5vNWprk5aMdacjruGO1^*k2)C+J5H*~D)y^-ZA3p!^XOI(fK7uew zFR-UL=Cs+kBP7RiB%_=4ve+QlUE}KlH|EOkm<%`JhT~U3;`8GluHc$59!wA9csz;CVBGmm>+yj5U&#tfy zFXn;-%F~cb&|5*~{N%{69-EPBoEqxLiwsOm(9TosA$PG`ds{`7drMB_v%-VKazCCMKJJ70p9U8WD^7#1ScfAacK+j9h{ql$<{tXYI@)F$TOgu{rCMuv0W4 zInW-K@vOZeC%ruUO!eGzk&DrT()fpy$-@N6f_{Hd^2!`C5z0=t6(vnn!F8R?`aN*b zMHUJ`?pbRt0c3VU$--HB0i`OwYM;}Rcydu&pqU1j1M`%ihn+UZP|IAw4~9i zLYwoGjYeps&E$feaC6Ny-S9(@GW2%#EQR+h>7W`%66G0sj)qPuS$<6B-3R=VX=SB0 zgCGlbCrWD2S@FoOIt}vW_p6XAmoH0?<;@KqWbt#tk8=I;yC*{J8887)fwf$KynO$J zGyD?dpk%4~kT+SmiD#7PW;S+Z%sn_Fw}?%7WJ$O9N%`{miw*%?dPwUrub&l40Vrt_ zhKgg=PMgwfOy9I%Q%v7KUdxvNpfm<5^^;{C-uWjMLKXkZle?1BVHlG=#5;ovqWU_% z1TeVBO~&5b7Rn+F=n%GdY*|!+lOekY^O5TDSMenPClM^HR?xELBnAx*122w>gzxCG zG6j+js=C+lWf{dHkYM>?h{riF#{jYHa0CO48QBN@liHWBBppsXCLpO7$m&~**VBXy zCYs{?9nwVxXG**eW>^LC!sG%;w*oV7r_V%SJ~sLq1?(Lc;xRmSzD^f1$uVo3rFK_vEzjn;`MHo{)Am zh083E7w0k&2k0CCGv&cm=Ld;#K6G_KSex++2RQu_W15vK+&xwtX3}-$mFWq9e% zxcQm%E}gi?0ot4!X6u8-M(g5#*JC#L!t`@(l)iE}uko;3aj=66?~_)%T7L4YPRmCY zG}=_#B+HJ`2enAOP6^_*8yzU<=JgACYmL^*1Sr=VwLvy^*o44^2gJ%dJ-Ga{``ha_ zG(&yh+P$BvoQw^yg!DFft)@WqNTi!iBsP?ozI@I!adRxSq-iOV?{#=8r zU{2ZiWpwO@phdZ1mi{y|uxr2<5>p2j9@wsAyr83*H}uu@LwR#rApnv2*5UXEtp&K% zZBduIB?B;&i_4qVBvscmb~UJ?Nd|XfFNhJE+uTAY)9VG07~-dv3XRY+p^f5{P9wgQZ9Xn!{4FLs?UeQ)&4=98mj>wF(Ff7Vb`7xVOnTlxaS(PprO{|~9gv-7jv8eeVoQ^8@g}(|3$rQ1^?E%U9A~R)(T2W^|x- zpNHKf1G^fOmY_(2K}t=8T@9+eL~t_LX{Kq$7TPo$JH|^eb7ejsJ2?+KFA4UM*fsa1 zT`l(3M#T6KcI7&JsLS6t7ay4<@j6WbCm{f^|J8Cy0fb~z0xHXny7dc4a0ZuIwyD~a}HDiQkmQ>l~mabu{ zSy#pL)F$?h7>)45(+G9q9uJo*7wpPqVE1V4Z0ykK9BSc~@6`xw8FYQVqw?aZ8#JD+ z(ma+nK&3ZuVSJ(&DmW3w*?o8@CARXX? z+#!ja@{552tugATI?hr4WiJ8$HazpslewsUccmwuWws9g1h}Q|#)0SQ zYlifmIU9MX&56i33_x7|9uV=ZXsBrFval=1Ra@~mT4v;dsg*zg6E$i=+T#b>7PR1D zqeiU-5e9+d4bqK)3Kd3Zu1M@4J(k$_<4ly`aw$>fOlm-WScr-Et)PglWBkp;3^z=m zy-J$CQ0{pN@qleME#uHW;@F`*AQz*3a+Dx_<{;jnWFvn0F)=z?yX-?TQ^N)A)o85} zSy&1_d< zM`b5A9tUIQhm5p0+Caz$N+b15yAEKW;Yx{wNei7IKDJu8Y1~~P?40wZFTyhLFX$sQ zhKDYEXeUc#&hj_#h+PsvtxZZDMGi#56l3HPu}gAE9*h|Y+YEQxgLI(`@s(9>Yv6Xe zVxF7I*0ztHG67yy&MwK7+P~Ni*BK=Y?>kd+Ms#|{7Kt4V7TzG;@`y!8Z8b_@RZBk| z1%y*ttE?+Pcg%6v;ae=N!A@`|T3FB9;mQ}8#O~xYW4nm4!wq8LF}Ws0`bkzUN)3{! z)+B(urP*$`TJ3V)?&P(!fFP&LR08}hu4nBmUx#Yu&hoYTCu~-LG20$V+msP2ANSKcGh>HUIlo@{<<$oVwH2Ci9Pl7ksh}AuQK)vl@APw;wc+` z$|GA07@f9w;VB>h*l7!9ZE$G7fvl8$0yeChh)&A9mNz@8cX01X8RC>vW>q%UEclO4 zIjyh9nIYgO)aF?(L&$o;@I>!_c0$cBSj7=PU5J?|vlW3U%LwMHPZt7J2Sp0!{PD?4)vP*mOc2Qzs_03K(L^o z``ri2a&71@lU;$MrL8`h|~1iG7U8KWMVPr zpQe8@_3}^CZ;F#HqsyEjTPl$=zU27%cqN2qQtwJ7gy}6kl{i%_w4>TzQi`5e#o`02 zV(~QW26z<z_tfATj4E+*aF>mBct(@FrGXrJ7mL?nb~1tZ*xk+=N_dPejJd zK&s7QU_~QB?xm^8el@8cQ+Y}Cn721h^6b}*o&8LV1&xDR3*)}Cr8(iZYCNYSsr>Ua z^l;>Om46Igy_8(Qt2VWv86d#jW$iaXyc4gQSX^)GuT^b2Uu}{^Lx`(9w5NxvHc?s8 z4)18n3o34XXII<`?`S5CS4%_NXJ1UgfCx;kLrhmoyBk5GS{ffY<3^DJ0k3q2He`Dy z_df29SyJh)`dFnqR4TONf1qkx+;SZ3SR>?CFTcX%s&f~9gIJneDonm}51)BttWKK`Mul3*5Y<6<@X?zA zs0!CRkTrQdei(7{r0Sq=H&h4J`kj-XQ3;cR5uMzzmtr1olc{DI$`q^Y8k6DX%C4Pj zm0hWFz!fmjyXyzFN^Di$QCe<)U$Ds)uPSeLx#0`hVq&LNc|Sffxa~k1)Tqp&#;cIV z!icE7?_Qc<9E*0vO)DyY(iN4jp%&eDy`u7-G^jPilb*`GnFg{N_CAe*8U2FcrxIBW zJFRtHtQz+FwQAS`6-ucf`8MtM+x|%2UUQ1(xGgQG4q_PDWO7mK$NZC2X$O_eF9^bd z<(ER{_$PQJ^N;LG=4(1!x3vZvAm3emJ73kV@)uEs9&3jX&B~})Ge!Vd75blZrIS%# zA4APg%k1Y>p`WqCH!IR!6AQPrAvy?@$$;Mt9jPxJ1m0i=feZ|*Ob3CS4hb{L1T>&$ zv{c6hayAmc8z*S({`t~vXn4KxDF*BJw6R4r_Mh)x5sDEiobC_FZTYw{$d#rwNC<7J z79SVcxkK2==?b6s)tkB+aXWX!jXQp=zP}^sgLNml*11Dxbdpw6kSNgAIw^*7N~igJ z3*6{fu3k*9q+n8ASKhG3E5y|ZH95cQ%89rAKNS&U87q5^ecR0G_{r~><0+uG@?5#K zq2vT~%*kt*6DjV`pFiOhVIJ_u8zjv&LwpNo%2wRJfXwN3BuHrKUOz?3g1O#)a=RV9 z74CLa$yyR8n_Y9Eom&lu?Nl{q8l2w1l<25!ub;nr zLU$Q69P2sV?F@6WaA)iFZC%C$b|`WM3Y(k{!FrIB^nB)Zq~CIi z#c*Jn*`3m94@;HyEjuuGf;r__SYbPjGVE-I!4~W#E*NY#TLiuW5L?~TE&V3w&AB_r z>;5=xxwo~cjUY}7-V9jqn;9QswC3WKO!>!PxbI}BaH0dxR=HiZ^U8P#wVGqwU$oN|Lh{x9siS0Os7! zQCS-BVJ1_Hsftq4=}uJnKy_~iF#CF3h0X`^{VD}`LVQs7X z0%}Iw!)e!R-@Y;A+F1oKw8Y&XX2gu23C02UQTA<>ednNkM~iMfqse{AN!TJ#Z*^#I zAB0NmX_=hn21pCv3`?84Ww00H_pR;7c6jLmG<}*>QzoVMY~8%ojNrs;DZNQ>Hpajt z-#6G>o(9!E&2wvsBGgJPw8zB*nSUK^_Qc`I)AaV)mcbOQ`6z?B=dJIG`X-+GvD zmbBgr?L)ZiLLCEk#Rh%s@80@P2Tk>NJu*k;@-bQ5g_)( z(~$+B7oj#jK=xaJfU-HaeKb=+S359flVBG*DO2p#9bU|K0nf1s7NTKfG{MP)&Gd%T zYbV`l2*$_FDqaGel{vDfi&6lCTth`-GK}W-J#qi+mvbIBfE+XvOH-I)TtTzB0M^99 z@W zw%XqEU`ve+ZY7dC8LOC06AiX1ftLvuV+Pet_KTcDbrk>$jkzev0b_?SMd^ z#*x;D7M4>}ZLC%Eeixh_2UL#;#(-1;mQJ&ZUH)~PslBl|G}_y*2zw0A5^pzX7&m=v z$4=iEAaXeht%2CD_H_vjDAWB`+0voy0008rNkleV{ZjhVwmVJY$&5hI1Ph$F%9?8fAhCGVkM_0+bHTVK|8zy^qZC*)Pan!1>w%XGDD z@;`YTHf5F58V?R+9$Oewz+6JVaabbbVvSBO_QXUP`^fZx8BA+?;)(cjJ|x=|UG9d5 zvC0e>JOyN4S7QJw8jcGMjnT@L9SNolF430SP)$g*LQL0zvE*I*NJQ6C_if3;P9L{k z8YhmJZXogk5{BFm1J~41#1jgUp$kSTqZD)_rCqQpnG<(}QZh=NG06;8_M$R<>7|52 zuocVP8FT~H79mCO>JcL(+%GF}uSmA7s_FQf&w(9R)C=BDw-b+ut_`Jg~-e8okM_M?i#8*B@Ha!>F=#uHshvsyU{6mJ)n-S*a+qAz zU4;5vigy>yZEhfWGP280wwQ}TgrAZ>xCl%yTb`FJhq}-|WU*QJ8*pEfF zOhPUU3kUu6vgAJ}73h8t>XLuc)?hK%$YU}1%d&(E?n>$(pE{79(2-i(zo`TAK-)H@ z8rf&`ei*I~q8j`MVloH3qaqDX4^z+x50*65|C_DdTv!~tk}_Z4u~is@x2=lmRQO-v zNCqaSjwm_u?DjaSw>*rc?tJ|}NHrXc*>NC=?O^E^MR60#6-(+LmUnJ5{%z>F+m#}U z{poHw+hjAExzP8cnkZS$PXB*`SqhrFocmodGEJJ5!%p5V1w90y3(Ng6m^uphXmHqv z|KAY9U}!GFul@XRc4}?d(naaE2mWew-0HK*OS1+44|79`vf}k=p#T5?07*qoM6N<$ Eg7E6ViU0rr diff --git a/app/assets/images/logos/supports/eu.png b/app/assets/images/logos/supports/eu.png new file mode 100644 index 0000000000000000000000000000000000000000..bda2c51f037bce0b2ff3329227e9b2a70e596156 GIT binary patch literal 3469 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 aNgJq1h?WTetN}>jAo$>XCdZ?f`Tqd`;+Fvc diff --git a/app/assets/images/logos/supports/msca_eu_logo.jpg b/app/assets/images/logos/supports/msca_eu_logo.jpg deleted file mode 100644 index 94265988862ceda7f2280e8f0a78b209eed9f82b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44126 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 diff --git a/app/assets/images/logos/supports/numev.png b/app/assets/images/logos/supports/numev.png new file mode 100644 index 0000000000000000000000000000000000000000..8f3e33df266723eddf0ed9214e6d43e6f60a4c2b GIT binary patch literal 4328 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 + + From 1cd1df6cb1672f0f1fc02e353808d873c53935e5 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 19 Apr 2023 12:04:07 +0200 Subject: [PATCH 075/533] Update home page design according to the one on figma --- app/assets/stylesheets/home.scss | 357 +++++++++++++++++++++++++++++ app/controllers/home_controller.rb | 10 +- app/views/home/index.html.haml | 271 ++++++++++++---------- 3 files changed, 514 insertions(+), 124 deletions(-) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index f26409b71..7620202b1 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -2,3 +2,360 @@ i.fa.fa-caret-square-o-down { vertical-align: middle; margin-left: 2px; } + +.container-fluid{ + padding: 0 !important; +} + +.home-header-container{ + height: 310px; +} + +.home-header-background{ + background-color: var(--primary-color);; + width: 100%; + height: 309px; + position: absolute; + z-index: 0; +} + +.home-bubbles{ + display: flex; + justify-content: center; +} +.home-bubble{ + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + background-color: rgba(255, 255, 255, 0.4); + position: absolute; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.05); + transform: scale(0.1); + animation: scale-up 1s ease forwards; +} +.home-bubble-one{ + width: 232px; + height: 232px; + border-radius: 116px; + z-index: 1; + margin-left: 622px; +} +.home-bubble-two{ + width: 194px; + height: 194px; + border-radius: 97px; + z-index: 2; + margin-left: 387px; + margin-top: 161px; +} +.home-bubble-three{ + width: 130px; + height: 130px; + border-radius: 65px; + z-index: 3; + margin-left: 656px; + margin-top: 192px; +} +.home-bubble-four{ + width: 70px; + height: 70px; + border-radius: 35px; + z-index: 4; + margin-left: 815px; + margin-top: 189px; + transform: scale(1); + +} + +.home-bubble h5{ + color: white; + font-size: 18px; + margin: 0; + font-weight: 600; +} +.home-bubble p{ + color: white; + font-size: 15px; + margin: 0; +} +.home-random-bubbles{ + position: absolute; + transform: scale(0.1); + animation: scale-up-random 1s ease forwards; +} +.home-header-title-container{ + display: flex; + justify-content: center; +} +.home-header-title{ + position: absolute; + z-index: 4; + width: 481px; + margin-right: 664px; + margin-top: 123px; + opacity: 0; + transform: translateY(-100%); + animation: slide-and-fade 1s ease forwards; +} +.home-header-title h4{ + font-size: 40px; + font-weight: 800; + color: white; +} + +.home-header-title p{ + font-size: 20px; + font-weight: 400; + color: white; +} + +.home-header-title input{ + font-size: 16px; + outline: none; + padding: 20px; + width: 100%; + margin-top: 20px; + border-radius: 14px; + border: none; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); +} +.home-header-title input:focus{ + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.15); +} + + +.home-body-container{ + display: flex; + flex-direction: column; + align-items: center; +} +.home-section{ + margin-top: 70px; + width: 1138px; +} +.home-section > h4{ + font-size: 20px; + margin-bottom: 5px; + font-weight: 700; +} + +.home-section-line{ + width: 60px; + margin-top: 3px; + border: 0.5px solid var(--primary-color);; + border-radius: 5px; + margin-bottom: 20px; +} +.home-statistics{ + display: flex; + justify-content: space-between; +} +.home-statistics-container{ + border-radius: 8px; + box-shadow: 2px 0px 60px rgba(0, 0, 0, 0.10); + padding: 30px 40px; + +} +.home-statistics-container > div { + display: flex; + align-items: center; + +} +.home-agroportal-figures{ + margin-bottom: 20px; +} + +.home-statistics-container > div > p { + font-size: 20px; + font-weight: 600; + margin-left: 18px; + margin-bottom: 0; +} +.home-statistics-item{ + display: flex; + align-items: center; + +} +.home-statistics-item hr{ + height: 83px; + width: 0px; + border: 2px solid var(--primary-color);; + border-radius: 5px; + margin-right: 15px; + margin-top: 0; + margin-bottom: 0; +} +.home-statistics-item h4{ + font-size: 30px; + font-weight: 600; + line-height: 1.2; + margin: 0; +} +.home-statistics-item p{ + font-size: 18px; + font-weight: 400; + margin: 0; + color: #888; +} +.home-section > p { + font-size: 16px; + color: #888888; + margin-bottom: 9px; +} +.home-upload-benifits{ + display: flex; + flex-wrap: wrap; +} +.home-upload-benifits div{ + display: flex; + width: 455px; + align-items: flex-start; + margin-right: 57px; + margin-top: 15px +} + +.home-upload-benifits div p{ + margin-left: 17px; + font-size: 16px; + color: #888888; + margin-bottom: 0; +} +.home-upload-benifits div img{ + margin-top: 3px +} +.home-upload-ontology-button{ + margin-top: 30px; + text-decoration: none; + color: var(--primary-color);; + display: flex; + justify-content: space-between; + align-items: center; + width: 193px; + padding: 15px 25px; + border: 1px solid var(--primary-color);; + border-radius: 8px; + font-size: 15px; +} +.home-recommendations-and-annotations{ + font-size: 16px; + outline: none; + padding: 20px; + width: 100%; + resize: none; + border-radius: 14px; + border: none; + +} +.home-services-buttons{ + background-color: white; + border-radius: 8px; + padding: 20px; + display: flex; + justify-content: flex-end; + align-items: center; +} +.home-card{ + border-radius: 8px; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); +} +.home-get-annotations{ + cursor: pointer; + color: white; + background-color: var(--primary-color); + display: flex; + width: fit-content; + align-items: center; + padding: 15px 20px; + border-radius: 8px; + margin-left: 10px; +} +.home-get-annotations p{ + margin-right: 20px; + margin-bottom: 0; +} +.home-get-recommendations{ + cursor: pointer; + color: var(--primary-color); + display: flex; + width: fit-content; + height: fit-content; + align-items: center; + padding: 15px 20px; + border-radius: 8px; + border: 1px solid var(--primary-color); + +} +.home-get-recommendations p{ + margin-right: 20px; + margin-bottom: 0; +} +.hide{ + display: none; +} +.home-section-sub-sections-container{ + display: flex; + justify-content: space-between; +} +.home-sub-section-left{ + width: 533px; +} +.home-sub-section-right{ + width: 533px; +} +.home-sub-section-left h4, .home-sub-section-right h4{ + font-size: 20px; + margin-bottom: 5px; + font-weight: 700; +} +.home-fair-scores{ + height: 349px; + +} +.home-twitter-news{ + +} +.home-fair-scores a{ + text-decoration: none; + +} +.home-fair-scores div{ + display: flex; + justify-content: flex-end; + align-items: center; + margin-right: 20px; + color: var(--primary-color); +} +.home-fair-scores div p{ + margin-right: 10px; + margin-bottom: 0; +} +.home-logos{ + height: 138px; + display: flex; + align-items: center; + overflow: auto; + +} +.home-logos img{ + margin-left: 60px; +} + + +@keyframes scale-up { + from { transform: scale(0.1); } + to { transform: scale(1); } +} + +@keyframes scale-up-random { + from { transform: scale(0.1); } + to { transform: scale(1.06); } +} + +@keyframes slide-and-fade { + from { opacity: 0; transform: translateY(-100%); } + to { opacity: 1; transform: translateY(0); } +} + + + diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 2c7b8065c..9150589ea 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -49,8 +49,16 @@ def index @prop_count = 36286 @map_count = total_mapping_count @analytics = LinkedData::Client::Analytics.last_month - + @projects_count = LinkedData::Client::Models::Project.all.length + @users_count = LinkedData::Client::Models::User.all.length @ontology_names = @ontologies.map { |ont| ["#{ont.name} (#{ont.acronym})", ont.acronym] } + @upload_benifits = [ + "Discover new insights and connections by exploring other ontologies in the repository.", + "Contribute to the growth and development of your domain by adding new concepts and categories.", + "Use version control to manage the changes to your ontology over time and collaborate with other users.", + "Get feedback and suggestions from other users who can review and comment on your ontology.", + "Get the FAIR score and metrics for your ontology." + ] @anal_ont_names = {} @anal_ont_numbers = [] diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 222b3a746..fb07910b3 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -14,128 +14,153 @@ \   %a{:href => "#", :onclick => "close_message(); return false;", :style => "font-size: small; color: darkGray;"} [close] -%div.container.pb-4.pb-md-5 - %div.row - %div.col - %div.px-2.py-2.pt-md-5.border-bottom.text-center - %h2 - = t(".welcome", site: "#{$SITE}") - %small.text-muted - = t(".tagline") - %div.row.search.pt-4 - %div.col - %div.card-deck - -# Search for a class across ontologies - %div.card - %div.card-header Search for a class - %div.card-body - = form_tag("/search", method: "get") do - %div.input-group.mb-3 - - placeholder = t(".query_placeholder") - = text_field_tag("query", nil, class: "form-control", placeholder: placeholder) - %div.input-group-append - = button_tag(type: "submit", class: "btn btn-primary", aria: {label: "Search for a class"}) do - %i{class: "fas fa-search fa-lg", aria: {hidden: "true"}} - %a{:href => "/search?opt=advanced"} Advanced Search - -# Search for an ontology - %div.card - %div.card-header Find an ontology - %div.card-body - %input#find_ontology_id{:type => "hidden"} - %div.input-group.mb-3 - = text_field_tag("ontology", nil, id: "find_ontology", class: "form-control", data: {ontologynames: @ontology_names}, placeholder: t(".find_ontology_placeholder")) - %div.input-group-append - = button_tag(class: "btn btn-primary", onclick: "jumpToValueOntology()", aria: {label: "Find an ontology"}) do - %i{class: "fas fa-search fa-lg", aria: {hidden: "true"}} - %div.dropdown - = button_tag("Browse Ontologies", type: "button", id: "ontologyGroupsDropdown", class: "btn btn-info dropdown-toggle", data: {toggle: "dropdown", offset: "0,10"}, aria: {haspopup: "true", expanded: "false"}) - %div.dropdown-menu{"aria-labelledby": "ontologyGroupsDropdown"} - = link_to("All", ontologies_path(), class: "dropdown-item") - %div.dropdown-divider - %h6.dropdown-header Browse by group - - @groups.each do |group| - = link_to(group[:name], ontologies_path(filter: group[:acronym]), class: "dropdown-item") - %div.row.pt-3.statistics - %div.col - %div.card-deck - -# Ontology visits - %div.card - %div.card-header Ontology Visits #{"in full #{$SITE} " if at_slice?} (#{@analytics.date.strftime("%B %Y")}) - = content_tag(:div, nil, id: "ontology-visits-chart", class: "card-body", data: {ontnames: @anal_ont_names, ontnumbers: @anal_ont_numbers}) do - %canvas#myChart - = link_to("More", visits_path()) - -# Ontology statistics - %div.card - %div.card-header #{$SITE} Statistics #{"in full #{$SITE}" if at_slice?} - %ul.list-group.list-group-flush - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span Ontologies - %span= number_with_delimiter(@ont_count) - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span Classes - %span= number_with_delimiter(@cls_count, :delimiter => ",") - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span Individuals - %span= number_with_delimiter(@individuals_count, :delimiter => ",") - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span Projects - %span= LinkedData::Client::Models::Project.all.length - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span Users - %span= LinkedData::Client::Models::User.all.length - - if fairness_service_enabled? - %div#fair-home.row.mt-3 - = render partial: "fair_score_home" - %div.row.pt-3.extra - %div.col - %div.card-deck - -# Latest Notes - %div.card - %div.card-header Latest Notes - %ul.list-group.list-group-flush - - if @last_notes.nil? || @last_notes.empty? - %li.list-group-item - %span No recent notes have been submitted - - else - - for note in @last_notes - %li.list-group-item - - begin - = link_to "#{note[:subject]} (#{note[:ont_name]})", note_path(CGI.escape(note[:id])) - %br/ - %span{:style => "color: #AAAAAA"} - = "#{time_ago_in_words(note[:created])} ago" - by #{note[:author]} - - if note[:body] - %p - = truncate(strip_tags(note[:body]), :length => 100) - \  - - rescue - - if !$ENABLE_SLICES.nil? && $ENABLE_SLICES == true && !at_slice? - -# Slices - %div.card - %div.card-header Slices - %ul.list-group.list-group-flush - - LinkedData::Client::Models::Slice.all.each_with_index do |slice, index| - - break if index == 10 - - slice_name = "#{slice.name} (#{slice.acronym})" - - slice_link = "http://#{slice.acronym}.#{$UI_URL.sub("http://", "")}" - %li.list-group-item - = link_to slice_name, slice_link +.home-header-container + .home-header-background + .home-bubbles + .home-random-bubbles + %img{:src => asset_path("home-random-bubbles.svg")}/ + .home-bubble.home-bubble-one + %h5 + = @anal_ont_names.keys[0] + %p + = @anal_ont_numbers[0].to_s + " visits" + .home-bubble.home-bubble-two + %h5 + = @anal_ont_names.keys[1] + %p + = @anal_ont_numbers[1].to_s + " visits" + .home-bubble.home-bubble-three + %h5 + = @anal_ont_names.keys[2] + %p + = @anal_ont_numbers[2].to_s + " visits" + %a.home-bubble.home-bubble-four{:href => "/visits"} + %h5 ... + .home-header-title-container + .home-header-title + %h4 Welcome to AgroPortal + %p The home of vocabularies and ontologies in agronomy and related fields. + %input{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text"}/ +.home-body-container + .home-section + %h4 Wanna upload an ontology? + %hr.home-section-line/ + %p Uploading an ontology is a way of sharing your domain knowledge with others. + %p By uploading your ontology to agroportal, you can: + .home-upload-benifits + - @upload_benifits.each do |benifit| + %div + %img{:src => asset_path("check-outlined.svg")}/ + %p + = benifit + - if session[:user].nil? + %a.home-upload-ontology-button{:href => "/login?redirect=/ontologies/new"} + %svg{:fill => "none", :height => "14", :viewbox => "0 0 15 14", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M3.46242 4.17686L6.91776 0.23682C6.98312 0.162278 7.06302 0.102677 7.15225 0.0618794C7.24149 0.0210821 7.33808 0 7.43576 0C7.53344 0 7.63003 0.0210821 7.71927 0.0618794C7.80851 0.102677 7.8884 0.162278 7.95377 0.23682L11.4092 4.17686C11.533 4.31795 11.5971 4.50373 11.5874 4.69334C11.5777 4.88295 11.4951 5.06086 11.3577 5.18792C11.2204 5.31498 11.0395 5.38079 10.8548 5.37087C10.6702 5.36095 10.497 5.27612 10.3732 5.13503L8.13286 2.58055V10.4116C8.13286 10.6015 8.05942 10.7836 7.92869 10.9178C7.79796 11.0521 7.62065 11.1275 7.43576 11.1275C7.25088 11.1275 7.07357 11.0521 6.94284 10.9178C6.8121 10.7836 6.73866 10.6015 6.73866 10.4116V2.58058L4.49846 5.13512C4.43719 5.20498 4.36313 5.26177 4.28049 5.30223C4.19785 5.3427 4.10826 5.36605 4.01684 5.37096C3.92541 5.37587 3.83394 5.36223 3.74764 5.33084C3.66135 5.29944 3.58192 5.2509 3.51389 5.18798C3.44586 5.12506 3.39057 5.04899 3.35117 4.96413C3.31176 4.87926 3.28902 4.78726 3.28425 4.69337C3.27947 4.59948 3.29274 4.50554 3.32331 4.41692C3.35388 4.32829 3.40115 4.24672 3.46242 4.17686ZM14.1744 12.488H0.697103C0.51222 12.488 0.334909 12.5635 0.204177 12.6977C0.0734445 12.832 0 13.0141 0 13.2039C0 13.3938 0.0734445 13.5759 0.204177 13.7101C0.334909 13.8444 0.51222 13.9198 0.697103 13.9198H14.1744C14.3593 13.9198 14.5366 13.8444 14.6673 13.7101C14.7981 13.5759 14.8715 13.3938 14.8715 13.2039C14.8715 13.0141 14.7981 12.832 14.6673 12.6977C14.5366 12.5635 14.3593 12.488 14.1744 12.488Z", :fill => "#31B404"} + upload ontology + - else + %a.home-upload-ontology-button{:href => "/ontologies/new"} + %svg{:fill => "none", :height => "14", :viewbox => "0 0 15 14", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M3.46242 4.17686L6.91776 0.23682C6.98312 0.162278 7.06302 0.102677 7.15225 0.0618794C7.24149 0.0210821 7.33808 0 7.43576 0C7.53344 0 7.63003 0.0210821 7.71927 0.0618794C7.80851 0.102677 7.8884 0.162278 7.95377 0.23682L11.4092 4.17686C11.533 4.31795 11.5971 4.50373 11.5874 4.69334C11.5777 4.88295 11.4951 5.06086 11.3577 5.18792C11.2204 5.31498 11.0395 5.38079 10.8548 5.37087C10.6702 5.36095 10.497 5.27612 10.3732 5.13503L8.13286 2.58055V10.4116C8.13286 10.6015 8.05942 10.7836 7.92869 10.9178C7.79796 11.0521 7.62065 11.1275 7.43576 11.1275C7.25088 11.1275 7.07357 11.0521 6.94284 10.9178C6.8121 10.7836 6.73866 10.6015 6.73866 10.4116V2.58058L4.49846 5.13512C4.43719 5.20498 4.36313 5.26177 4.28049 5.30223C4.19785 5.3427 4.10826 5.36605 4.01684 5.37096C3.92541 5.37587 3.83394 5.36223 3.74764 5.33084C3.66135 5.29944 3.58192 5.2509 3.51389 5.18798C3.44586 5.12506 3.39057 5.04899 3.35117 4.96413C3.31176 4.87926 3.28902 4.78726 3.28425 4.69337C3.27947 4.59948 3.29274 4.50554 3.32331 4.41692C3.35388 4.32829 3.40115 4.24672 3.46242 4.17686ZM14.1744 12.488H0.697103C0.51222 12.488 0.334909 12.5635 0.204177 12.6977C0.0734445 12.832 0 13.0141 0 13.2039C0 13.3938 0.0734445 13.5759 0.204177 13.7101C0.334909 13.8444 0.51222 13.9198 0.697103 13.9198H14.1744C14.3593 13.9198 14.5366 13.8444 14.6673 13.7101C14.7981 13.5759 14.8715 13.3938 14.8715 13.2039C14.8715 13.0141 14.7981 12.832 14.6673 12.6977C14.5366 12.5635 14.3593 12.488 14.1744 12.488Z", :fill => "#31B404"} + upload ontology + .home-section + %h4 Agroportal services + %hr.home-section-line/ + .home-card + %textarea.home-recommendations-and-annotations{:rows => "6"} + %input.hide{:type => "submit"}/ + .home-services-buttons + .home-get-recommendations + %p Get recommendations + %svg{:fill => "none", :height => "16", :viewbox => "0 0 15 16", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M2.61197 15.6472C1.16948 16.4746 0 15.7968 0 14.1344V1.86672C0 0.202676 1.16948 -0.474289 2.61197 0.352365L13.3345 6.50169C14.7775 7.32941 14.7775 8.67046 13.3345 9.49799L2.61197 15.6472Z", :fill => "#31B404"} + .home-services-buttons + .home-get-annotations + %p Get annotations + %img{:src => asset_path("play-white.svg")}/ + .home-section + .home-section-sub-sections-container + .home-sub-section-left + %h4 FAIR scores + %hr.home-section-line/ + .home-card.home-fair-scores + = render partial: "shared/fair_score_bars", locals: {data: nil} + %a{:href => "#fairDetails"} + %div + %p See details + %svg{:fill => "none", :height => "12", :viewbox => "0 0 7 12", :width => "7", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M0.828447 0.982555C0.668147 0.979582 0.510886 1.02651 0.378427 1.11684C0.245967 1.20716 0.144858 1.33643 0.0890904 1.48675C0.0333229 1.63706 0.0256545 1.801 0.0671467 1.95586C0.108639 2.11073 0.19724 2.24887 0.32069 2.35117L5.04517 6.39572L0.317771 10.4403C0.231406 10.5032 0.15903 10.5834 0.105209 10.6757C0.0513877 10.7681 0.0172914 10.8706 0.00507139 10.9767C-0.00714863 11.0829 0.00277318 11.1905 0.0342104 11.2926C0.0656476 11.3948 0.117918 11.4893 0.187722 11.5702C0.257526 11.6512 0.343349 11.7168 0.439774 11.7628C0.536199 11.8089 0.641133 11.8346 0.747953 11.8381C0.854772 11.8416 0.961158 11.8229 1.0604 11.7832C1.15964 11.7435 1.24957 11.6837 1.32453 11.6075L6.72894 6.9881C6.81393 6.9155 6.88218 6.82534 6.92897 6.72383C6.97577 6.62232 7 6.51187 7 6.40009C7 6.28832 6.97577 6.17787 6.92897 6.07636C6.88218 5.97485 6.81393 5.88469 6.72894 5.81209L1.32453 1.17807C1.18758 1.05615 1.01176 0.986851 0.828447 0.982555Z", :fill => "#31B404"} + .home-sub-section-right + %h4 Twitter news + %hr.home-section-line/ + .home-card.home-twitter-news + %a.twitter-timeline{"data-height" => "349", "data-width" => "533", :href => "https://twitter.com/lagroportal?ref_src=twsrc%5Etfw"} Tweets by lagroportal + %script{:async => "", :charset => "utf-8", :src => "https://platform.twitter.com/widgets.js"} - - - $HOME_PAGE_LOGOS.to_a.each do |home_page_logos_row| - - unless home_page_logos_row[:links].to_a.empty? - %div.row.pt-3 - %div.col - %div.card-deck - %div.card - %div.card-header= home_page_logos_row[:title] - %div.logos - - home_page_logos_row[:links].to_a.each do |logo| - = link_to(image_tag(logo[:img_src]), logo[:url], target: logo[:target]) + .home-section + .home-statistics-container + .home-agroportal-figures + %svg{:fill => "none", :height => "26", :viewbox => "0 0 35 26", :width => "35", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M34.3828 6.44418C33.2599 4.04698 31.4332 2.31495 28.9364 1.29338C25.5484 -0.0996672 22.02 -0.272638 18.4279 0.325213C14.6484 0.954407 11.24 2.42988 8.13908 4.59143C7.52058 5.02327 6.92129 5.48066 6.31359 5.92179C6.28357 5.88812 6.25475 5.85446 6.22472 5.82195L9.85167 2.54597L9.7616 2.34513C9.43493 2.4264 9.05302 2.42872 8.79001 2.60053C5.93168 4.47882 3.58858 6.82611 1.9012 9.76312C0.682212 11.8782 -0.0587909 14.106 0.00365996 16.5542C0.0295292 18.387 0.756885 20.1455 2.04532 21.4903C2.93284 22.4364 4.01372 23.1387 5.14144 23.812C7.39327 25.1482 9.82525 25.8296 12.4374 25.9666C16.66 26.1895 20.6413 25.2921 24.3751 23.4127C25.6662 22.766 26.9022 22.0215 28.0717 21.1861C29.4879 20.1586 30.7312 18.9255 31.7575 17.5305C33.3188 15.4491 34.7191 13.3235 34.9461 10.65C35.0722 9.19545 35.0121 7.78847 34.3828 6.44418ZM31.3251 10.1009C31.1779 11.5537 30.748 12.9665 30.0581 14.265C28.1233 17.9275 24.9828 20.2655 21.1036 21.6946C18.2501 22.7487 15.2789 22.8798 12.3593 21.9268C10.4786 21.3115 8.9017 20.2098 7.83043 18.53C7.74095 18.3821 7.6306 18.2469 7.50256 18.1284C7.35925 18.0198 7.20702 17.9228 7.04739 17.8382C7.04739 18.0494 6.96092 18.3025 7.04739 18.4685C8.50538 21.2546 10.7428 23.0946 13.9518 23.7261C14.7106 23.8796 15.4788 23.9858 16.2517 24.0442C17.0251 24.0988 17.8057 24.057 18.6056 24.0895C17.9391 24.2172 17.2749 24.4296 16.6036 24.4563C14.7661 24.5283 12.9346 24.5051 11.1403 23.9711C8.87168 23.2966 7.07622 22.0904 5.91367 20.0438C4.97931 18.4012 4.66345 16.6692 5.04776 14.835C5.57513 12.2696 6.86135 9.90726 8.75038 8.03458C10.6532 6.11095 12.9173 4.55481 15.4218 3.44913C17.9919 2.30683 20.7061 1.89471 23.4756 2.40434C25.4992 2.78046 27.2779 3.69523 28.2795 5.58513C29.0001 6.93755 29.3315 8.3515 28.7755 9.85019C28.5089 10.5653 28.223 11.2734 27.966 11.992C27.9204 12.1197 27.966 12.2787 27.978 12.4238C28.1269 12.4169 28.2891 12.4436 28.42 12.3925C28.5665 12.3365 28.6921 12.239 28.7803 12.1127C29.5873 10.8358 30.3007 9.51121 30.3235 7.96493C30.3355 7.15231 30.2671 6.32577 30.2383 5.58049C31.0969 6.934 31.4782 8.52015 31.3251 10.1009Z", :fill => "#31B404"} + %p AgroPortal in figures: + .home-statistics + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@ont_count, :delimiter => ",") + %p Ontologies + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@cls_count, :delimiter => ",") + %p Classes + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@individuals_count, :delimiter => ",") + %p Individuals + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@prop_count, :delimiter => ",") + %p Properties + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@projects_count, :delimiter => ",") + %p Projects + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@map_count, :delimiter => ",") + %p Mappings + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@users_count, :delimiter => ",") + %p Users + .home-section + .home-section-sub-sections-container + .home-sub-section-left + %h4 Supported by + %hr.home-section-line/ + .home-card.home-logos + %img{:src => asset_path("logos/supports/numev.png")}/ + %img{:src => asset_path("logos/supports/anr.png")}/ + %img{:src => asset_path("logos/supports/eu.png")}/ + .home-sub-section-right + %h4 With the colaboration of + %hr.home-section-line/ + .home-card.home-logos + %img{:src => asset_path("logos/collaboration/d2kab.png")}/ + %img{:src => asset_path("logos/collaboration/lirmm.png")}/ + %img{:src => asset_path("logos/collaboration/stanford.png")}/ + %img{:src => asset_path("logos/collaboration/inrae.png")}/ \ No newline at end of file From 1e09473bad22295b85abb7362bb4d624455de2b9 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 20 Apr 2023 11:24:12 +0200 Subject: [PATCH 076/533] tmp1 --- .../stylesheets/application.css.scss.erb | 1 + app/assets/stylesheets/nav_bar.scss | 79 +++++++++++++++++++ app/views/layouts/_topnav.html.haml | 76 +++++------------- 3 files changed, 100 insertions(+), 56 deletions(-) create mode 100644 app/assets/stylesheets/nav_bar.scss diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index 1b70724a0..b7a1cd3ba 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -49,6 +49,7 @@ @import "login"; @import "components/index"; @import "account"; +@import "nav_bar"; /* Bootstrap and Font Awesome */ @import "bootstrap"; diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss new file mode 100644 index 000000000..5ef243852 --- /dev/null +++ b/app/assets/stylesheets/nav_bar.scss @@ -0,0 +1,79 @@ +.nav-container{ + display: flex; + justify-content: center; + background-color: var(--primary-color); +} +nav{ + display: flex !important; + justify-content: space-between; + background-color: var(--primary-color); + align-items: center; + height: 62px; + padding: 8px 50px; + width: 1280px; +} +.nav-logo{ + display: flex; + align-items: center; +} +.nav-logo p{ + margin-left: 10px; + color: white; + font-size: 15px; + font-weight: 700; +} +nav > ul { + display: flex; + list-style: none; + margin-bottom: 0; +} + +nav > ul > li { + margin-left: 20px; +} + +nav > ul > li > a { + color: white !important; + + font-size: 14px; + opacity: 60%; + font-weight: 300; +} +nav > ul > li > a.active{ + opacity: 100%; + font-weight: 500; +} +nav > input { + height: 33px; + width: 228px; + outline: none; + opacity: 60%; + border: 1px solid white; + background-color: var(--primary-color); + color: white; + border-radius: 5px; + font-size: 14px; + padding: 0 10px; +} +nav > input:focus{ + opacity: 100%; +} +.nav-language{ + background-color: #47BD1F; + height: 33px; + width: 79px; + border-radius: 5px; +} +nav > a{ + text-decoration: none; + padding: 3px 34px; + border: 1px solid white; + border-radius: 5px; + color: white; +} +.nav-support{ + background-color: #47BD1F; + height: 33px; + width: 65px; + border-radius: 5px; +} \ No newline at end of file diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 8c3e73e76..3b62bd33e 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -1,56 +1,20 @@ -%nav.navbar.navbar-expand-lg.navbar-dark.navbar-custom - = link_to(image_tag("logos/ontoportal-logo.png") + content_tag(:span, $SITE, class: 'site-name'), root_path(), class: "navbar-brand") - = button_tag(type: "button", class: "navbar-toggler", data: {toggle: "collapse", target: "#topNavigationToggler"}, aria: {controls: "topNavigationToggler", expanded: "false", label: "Toggle navigation"}) do - %span.navbar-toggler-icon - - %div#topNavigationToggler.navbar-collapse.collapse.justify-content-between - %ul.navbar-nav - %li.nav-item - = link_to("Browse", ontologies_path(), class: "nav-link") - %li.nav-item - = link_to("Search", "/search", class: "nav-link") - %li.nav-item - = link_to("Mappings", mappings_path(), class: "nav-link") - %li.nav-item - = link_to("Recommender", recommender_index_path, class: "nav-link") - %li.nav-item - = link_to("Annotator", annotator_index_path(), class: "nav-link") - - if $NCBO_ANNOTATORPLUS_ENABLED == true - %li.nav-item - = link_to("NCBO Annotator+", '/ncbo_annotatorplus', class: "nav-link") - %li.nav-item - = link_to("Projects", projects_path(), class: "nav-link") - %li.nav-item - = link_to("Landscape", '/landscape', class: "nav-link") - -if (!session[:user].nil? && session[:user].admin?) - %li.nav-item - = link_to("Admin", admin_index_path, class: "nav-link") - %ul.navbar-nav - - if session[:user].nil? - %li.nav-item - = link_to("Login", login_index_path(redirect: request.original_url), class: "btn btn-bp-login mr-md-2") - - else - -# Account menu - %li.nav-item.dropdown - = link_to("#", id: "accountMenuDropdownLink", class: "nav-link dropdown-toggle", role: "button", data: {toggle: "dropdown"}, aria: {haspopup: "true", expanded: "false"}) do - = session[:user].username - %div.dropdown-menu.dropdown-menu-right{aria: {labelledby: "accountMenuDropdownLink"}} - = link_to("Account Settings", "/account", class: "dropdown-item") - - unless session[:ontologies].nil? - %div.dropdown-divider - %h6.dropdown-header Recently Viewed - - for ont in session[:ontologies] - = link_to(ont.ontology_name, "/ontologies/#{ont.ontology_acronym}/?p=classes&conceptid=#{CGI.escape(ont.concept)}", class: "dropdown-item") - %div.dropdown-divider - = link_to("Logout", logout_path, class: "dropdown-item") - -# Support menu - %li.nav-item.dropdown - = link_to("#", id: "supportMenuDropdownLink", class: "nav-link dropdown-toggle", role: "button", data: {toggle: "dropdown"}, aria: {haspopup: "true", expanded: "false"}) do - Support - %div.dropdown-menu.dropdown-menu-right{aria: {labelledby: "supportMenuDropdownLink"}} - = link_to("Submit Feedback", feedback_path(location: encode_param(request.url)), id: "submitFeedbackMenuItem", class: "dropdown-item pop_window") - %div.dropdown-divider - %h6.dropdown-header Documentation - = link_to("Help", "#{$WIKI_HELP_PAGE}", target: "_blank", class: "dropdown-item") - = link_to("Release Notes", "#{$RELEASE_NOTES}", target: "_blank", class: "dropdown-item") - = link_to("Publications", $PUBLICATIONS_URL, target: "_blank", class: "dropdown-item") +.nav-container + %nav + .nav-logo + %img{:src => "logo-white.svg"}/ + %p AgroPortal + %ul + %li + %a.active{:href => ""} Browse + %li + %a{:href => ""} Mappings + %li + %a{:href => ""} Recommender + %li + %a{:href => ""} Annotator + %li + %a{:href => ""} Landscape + %input{:placeholder => "Search AgroPortal ...", :type => "text"}/ + .nav-language + %a{:href => "#login"} Login + .nav-support From 19d685efdace2845ac872964efcbf552cb849b07 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Thu, 20 Apr 2023 15:44:24 +0200 Subject: [PATCH 077/533] clean up --- app/views/annotator/index.html.haml | 54 +-- app/views/home/index.html.haml | 34 +- app/views/layouts/_footer.html.haml | 2 +- app/views/layouts/_topnav.html.haml | 18 +- app/views/recommender/index.html.haml | 26 +- config/locales/fr.yml | 452 +++++++++++++------------- 6 files changed, 289 insertions(+), 297 deletions(-) diff --git a/app/views/annotator/index.html.haml b/app/views/annotator/index.html.haml index d6d8cf691..7b65537d2 100644 --- a/app/views/annotator/index.html.haml +++ b/app/views/annotator/index.html.haml @@ -1,4 +1,4 @@ -- @title= t('annotator_page.title') +- @title= t('annotator.title') %head = javascript_include_tag "bp_annotator" @@ -6,7 +6,7 @@ %div.container-fluid %div.row %div.col - %h2.mt-3= t('annotator_page.title') + %h2.mt-3= t('annotator.title') %p = t('annotator.index.intro', site: $SITE).html_safe = link_to(help_path(anchor: "Annotator_Tab"), id: "annotator-help", target: "_blank") do @@ -17,7 +17,7 @@ %form %div.form-group = hidden_field_tag :annotation_sample_text, t('annotator.index.sample_text') - = text_area_tag("annotation_text", nil, rows: 10, class: "form-control", placeholder: t('annotator_page.enter_or_paste_text'), "aria-describedby": "annotateTextHelpBlock") + = text_area_tag("annotation_text", nil, rows: 10, class: "form-control", placeholder: t('annotator.enter_or_paste_text'), "aria-describedby": "annotateTextHelpBlock") %small#annotateTextHelpBlock.form-text %a#insert_text_link{href: "javascript:void(0);"}= t('shared.insert_sample_text') @@ -27,80 +27,80 @@ %div.form-group %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("longest_only", "all", false, class: "custom-control-input") - %label.custom-control-label{for: "longest_only"}= t('annotator_page.filters.match_longest_only') + %label.custom-control-label{for: "longest_only"}= t('annotator.filters.match_longest_only') %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("whole_word_only", "all", false, class: "custom-control-input") - %label.custom-control-label{for: "whole_word_only"}= t('annotator_page.filters.match_partial_words') + %label.custom-control-label{for: "whole_word_only"}= t('annotator.filters.match_partial_words') %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("mappings", "all", false, id: "mappings_all", class: "custom-control-input") - %label.custom-control-label{for: "mappings_all"}= t('annotator_page.filters.include_mappings') + %label.custom-control-label{for: "mappings_all"}= t('annotator.filters.include_mappings') %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("exclude_numbers", "all", false, class: "custom-control-input") - %label.custom-control-label{for: "exclude_numbers"}= t('annotator_page.filters.exclude_numbers') + %label.custom-control-label{for: "exclude_numbers"}= t('annotator.filters.exclude_numbers') %div.custom-control.custom-checkbox.custom-control-inline = check_box_tag("exclude_synonyms", "all", false, class: "custom-control-input") - %label.custom-control-label{for: "exclude_synonyms"}= t('annotator_page.filters.exclude_synonyms') + %label.custom-control-label{for: "exclude_synonyms"}= t('annotator.filters.exclude_synonyms') %div.form-group - %label{for: "ontology_ontologyId"}= t('annotator_page.select', name: t('ontology')) + %label{for: "ontology_ontologyId"}= t('annotator.select', name: t('ontology')) = select_tag("ontology_ontologyId", options_from_collection_for_select(@annotator_ontologies, :acronym, lambda { |ont| "#{ont.name} (#{ont.acronym})" }), | multiple: true, class: "form-control", "aria-describedby": "selectOntologiesHelpBlock") | - %small#selectOntologiesHelpBlock.form-text.text-muted= t('annotator_page.start_typing_to_select', type: t('ontology')) + %small#selectOntologiesHelpBlock.form-text.text-muted= t('annotator.start_typing_to_select', type: t('ontology')) - if @sem_type_ont %div.form-group - %label{for: "semantic_types"}= t('annotator_page.select', name: t('annotator_page.umls.semantic_types')) + %label{for: "semantic_types"}= t('annotator.select', name: t('annotator.umls.semantic_types')) = select_tag("semantic_types", options_for_select(@semantic_types_for_select), multiple: "true", class: "form-control", "aria-describedby": "selectSemanticTypesHelpBlock") - %small#selectSemanticTypesHelpBlock.form-text.text-muted= t('annotator_page.start_typing_to_select', type: t('annotator_page.umls.semantic_types')) + %small#selectSemanticTypesHelpBlock.form-text.text-muted= t('annotator.start_typing_to_select', type: t('annotator.umls.semantic_types')) %div.form-group - %label{for: "semantic_groups"}= t('annotator_page.select', name: t('annotator_page.umls.semantic_groups')) + %label{for: "semantic_groups"}= t('annotator.select', name: t('annotator.umls.semantic_groups')) = select_tag("semantic_groups", options_for_select(@semantic_groups_for_select), multiple: "true", class: "form-control", "aria-describedby": "selectSemanticGroupsHelpBlock") - %small#selectSemanticGroupsHelpBlock.form-text.text-muted= t('annotator_page.start_typing_to_select', type: t('annotator_page.umls.semantic_groups')) + %small#selectSemanticGroupsHelpBlock.form-text.text-muted= t('annotator.start_typing_to_select', type: t('annotator.umls.semantic_groups')) %div.form-group - %label{for: "class_hierarchy_max_level"}= t('annotator_page.filters.max_hierarchy_level') + %label{for: "class_hierarchy_max_level"}= t('annotator.filters.max_hierarchy_level') - options = [["none", 0], *(1..10).map {|i| [i, i]}, ["all", 999]] = select_tag("class_hierarchy_max_level", options_for_select(options, 0), class: "form-control") %div.form-group - %label{for: "score"}= t('annotator_page.filters.score') + %label{for: "score"}= t('annotator.filters.score') - options = [["none", ""], ["old", "old"], ["cvalue", "cvalue"], ["cvalueh", "cvalueh"]] = select_tag(:score, options_for_select(options, 0), class: "form-control", "aria-describedby": "includeScoreHelpBlock") - %small#includeScoreHelpBlock.form-text.text-muted= t('annotator_page.filters.score_help') + %small#includeScoreHelpBlock.form-text.text-muted= t('annotator.filters.score_help') %div.form-group - %label{for: "score_threshold"}= t('annotator_page.filters.score_threshold') + %label{for: "score_threshold"}= t('annotator.filters.score_threshold') = number_field_tag(:score_threshold, 0, id: "score_threshold", class: "form-control", "aria-describedby": "scoreThresholdHelpBlock") - %small#scoreThresholdHelpBlock.form-text.text-muted= t('annotator_page.filters.score_threshold_help') + %small#scoreThresholdHelpBlock.form-text.text-muted= t('annotator.filters.score_threshold_help') %div.form-group - %label{for: "confidence_threshold"}= t('annotator_page.filters.confidence_threshold') + %label{for: "confidence_threshold"}= t('annotator.filters.confidence_threshold') = number_field_tag(:confidence_threshold, 0, min: 0, max: 100, id: "confidence_threshold", class: "form-control", "aria-describedby": "confidenceThresholdHelpBlock") - %small#confidenceThresholdHelpBlock.form-text.text-muted= t('annotator_page.filters.confidence_threshold_help') + %small#confidenceThresholdHelpBlock.form-text.text-muted= t('annotator.filters.confidence_threshold_help') - if @recognizers.length > 1 %div.form-group - %label{for: "recognizer"}= t('annotator_page.filters.recognizer') + %label{for: "recognizer"}= t('annotator.filters.recognizer') - default_recognizer = @recognizers.include?("mgrep") ? "mgrep" : @recognizers.first = select_tag("recognizer", options_for_select(@recognizers.map {|r| [r, r]}, default_recognizer), class: "form-control") %div.form-group %div.custom-control.custom-checkbox = check_box_tag("fast_context", :all, false, class: "custom-control-input") - %label.custom-control-label{for: "fast_context"}= t('annotator_page.fast_context') + %label.custom-control-label{for: "fast_context"}= t('annotator.fast_context') %small#fast_contextnHelp.form-text.text-muted= t('annotator.index.fast_context.tooltip') %div.form-group %div.custom-control.custom-checkbox = check_box_tag("lemmatize", false, false, class: "custom-control-input") - %label.custom-control-label{for: "lemmatize"}= t('annotator_page.lemmatize') + %label.custom-control-label{for: "lemmatize"}= t('annotator.lemmatize') %small#lemmatize.form-text.text-muted= t('annotator.index.lemmatize.tooltip') %div.my-4 - = button_tag(t('annotator_page.get_annotator'), type: "button", id: "annotator_button", class: "btn btn-primary btn-lg") + = button_tag(t('annotator.get_annotator'), type: "button", id: "annotator_button", class: "btn btn-primary btn-lg") %span.annotator_spinner %img{src: asset_path('spinners/spinner_000000_16px.gif')}/ %span#annotator_error.annotator_error @@ -109,9 +109,9 @@ %div.col #annotations_container #result_counts - %h4= t('annotator_page.annotations_result') + %h4= t('annotator.annotations_result') #filter_list{:style => "font-size: 9pt; color: gray; display: none; clear: both; margin: -15px 0 5px"} - %span#filter_title> #{t('annotator_page.results_filtered_by')}:  + %span#filter_title> #{t('annotator.results_filtered_by')}:  \  %span#filter_names #results_error{:style => "color: red; margin-bottom: 7px;"} diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 5ab86c1e5..cd0867bab 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -1,4 +1,4 @@ -- @title = t(".title", organization: "#{$ORG_SITE}") +- @title = t("home.index.title", organization: "#{$ORG_SITE}") - unless $FRONT_NOTICE.nil? || $FRONT_NOTICE.empty? || cookies[:front_page_notice_closed].eql?("true") :javascript @@ -19,27 +19,27 @@ %div.col %div.px-2.py-2.pt-md-5.border-bottom.text-center %h2 - = t(".welcome", site: "#{$SITE}") + = t("home.index.welcome", site: "#{$SITE}") %small.text-muted - = t(".tagline") + = t("home.index.tagline") %div.row.search.pt-4 %div.col %div.card-deck -# Search for a class across ontologies %div.card - %div.card-header= t('main.search_class') + %div.card-header= t('home.search_class') %div.card-body = form_tag("/search", method: "get") do %div.input-group.mb-3 - - placeholder = t(".query_placeholder") + - placeholder = t("home.index.query_placeholder") = text_field_tag("query", nil, class: "form-control", placeholder: placeholder) %div.input-group-append = button_tag(type: "submit", class: "btn btn-primary", aria: {label: "Search for a class"}) do %i{class: "fas fa-search fa-lg", aria: {hidden: "true"}} - %a{:href => "/search?opt=advanced"}= t("main.advanced_search") + %a{:href => "/search?opt=advanced"}= t("home.advanced_search") -# Search for an ontology %div.card - %div.card-header= t('main.find_ontology') + %div.card-header= t('home.find_ontology') %div.card-body %input#find_ontology_id{:type => "hidden"} %div.input-group.mb-3 @@ -48,11 +48,11 @@ = button_tag(class: "btn btn-primary", onclick: "jumpToValueOntology()", aria: {label: "Find an ontology"}) do %i{class: "fas fa-search fa-lg", aria: {hidden: "true"}} %div.dropdown - = button_tag(t('main.browse_ontologies'), type: "button", id: "ontologyGroupsDropdown", class: "btn btn-info dropdown-toggle", data: {toggle: "dropdown", offset: "0,10"}, aria: {haspopup: "true", expanded: "false"}) + = button_tag(t('home.browse_ontologies'), type: "button", id: "ontologyGroupsDropdown", class: "btn btn-info dropdown-toggle", data: {toggle: "dropdown", offset: "0,10"}, aria: {haspopup: "true", expanded: "false"}) %div.dropdown-menu{"aria-labelledby": "ontologyGroupsDropdown"} = link_to(t('all'), ontologies_path(), class: "dropdown-item") %div.dropdown-divider - %h6.dropdown-header= t("main.browse_by_group") + %h6.dropdown-header= t("home.browse_by_group") - @groups.each do |group| = link_to(group[:name], ontologies_path(filter: group[:acronym]), class: "dropdown-item") %div.row.pt-3.statistics @@ -60,7 +60,7 @@ %div.card-deck -# Ontology visits %div.card - %div.card-header #{t('main.ontology_visits')} #{"in full #{$SITE} " if at_slice?} (#{@analytics.date.strftime("%B %Y")}) + %div.card-header #{t('home.ontology_visits')} #{"in full #{$SITE} " if at_slice?} (#{@analytics.date.strftime("%B %Y")}) = content_tag(:div, nil, id: "ontology-visits-chart", class: "card-body", data: {ontnames: @anal_ont_names, ontnumbers: @anal_ont_numbers}) do %canvas#myChart = link_to(t('more'), visits_path()) @@ -70,23 +70,23 @@ %ul.list-group.list-group-flush %li.list-group-item %div.d-flex.justify-content-between.align-items-center - %span= t('main.ontologies') + %span= t('home.ontologies') %span= number_with_delimiter(@ont_count) %li.list-group-item %div.d-flex.justify-content-between.align-items-center - %span= t('main.classes') + %span= t('home.classes') %span= number_with_delimiter(@cls_count, :delimiter => ",") %li.list-group-item %div.d-flex.justify-content-between.align-items-center - %span= t('main.individuals') + %span= t('home.individuals') %span= number_with_delimiter(@individuals_count, :delimiter => ",") %li.list-group-item %div.d-flex.justify-content-between.align-items-center - %span= t('main.projects') + %span= t('home.projects') %span= LinkedData::Client::Models::Project.all.length %li.list-group-item %div.d-flex.justify-content-between.align-items-center - %span= t('main.users') + %span= t('home.users') %span= LinkedData::Client::Models::User.all.length - if fairness_service_enabled? %div#fair-home.row.mt-3 @@ -96,11 +96,11 @@ %div.card-deck -# Latest Notes %div.card - %div.card-header= t('main.latest_notes') + %div.card-header= t('home.latest_notes') %ul.list-group.list-group-flush - if @last_notes.nil? || @last_notes.empty? %li.list-group-item - %span= t('main.no_recent_notes') + %span= t('home.no_recent_notes') - else - for note in @last_notes %li.list-group-item diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index 6a3b0f44c..9aee7a2b7 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -14,7 +14,7 @@ = render_footer_link footer_link %div.row.legal-text %div.col - = t('.grant_html', site: $SITE) + = t('layouts.footer.grant_html', site: $SITE) %div.row.pt-2 - $FOOTER_LINKS.to_h[:bottom].to_a.each do |footer_links_block| %div.col-6.col-md diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 4bcd46c7a..4ae87baeb 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -6,25 +6,25 @@ %div#topNavigationToggler.navbar-collapse.collapse.justify-content-between %ul.navbar-nav %li.nav-item - = link_to(t('header.browse'), ontologies_path(), class: "nav-link") + = link_to(t('layout.header.browse'), ontologies_path(), class: "nav-link") %li.nav-item - = link_to(t('header.search'), "/search", class: "nav-link") + = link_to(t('layout.header.search'), "/search", class: "nav-link") %li.nav-item - = link_to(t('header.mappings'), mappings_path(), class: "nav-link") + = link_to(t('layout.header.mappings'), mappings_path(), class: "nav-link") %li.nav-item - = link_to(t('header.recommender'), recommender_index_path, class: "nav-link") + = link_to(t('layout.header.recommender'), recommender_index_path, class: "nav-link") %li.nav-item - = link_to(t('header.annotator'), annotator_index_path(), class: "nav-link") + = link_to(t('layout.header.annotator'), annotator_index_path(), class: "nav-link") - if $NCBO_ANNOTATORPLUS_ENABLED == true %li.nav-item - = link_to(t('header.ncbo_annotator_plus'), '/ncbo_annotatorplus', class: "nav-link") + = link_to(t('layout.header.ncbo_annotator_plus'), '/ncbo_annotatorplus', class: "nav-link") %li.nav-item - = link_to(t('header.projects'), projects_path(), class: "nav-link") + = link_to(t('layout.header.projects'), projects_path(), class: "nav-link") %li.nav-item - = link_to(t('header.landscape'), '/landscape', class: "nav-link") + = link_to(t('layout.header.landscape'), '/landscape', class: "nav-link") -if (!session[:user].nil? && session[:user].admin?) %li.nav-item - = link_to(t('header.admin'), admin_index_path, class: "nav-link") + = link_to(t('layout.header.admin'), admin_index_path, class: "nav-link") %ul.navbar-nav %li.nav-item{ style: "margin-right: 10px;" } %select#language-select.form-control{ data: { controller: "platform-language", action: "change->platform-language#handleLangChanged" } } diff --git a/app/views/recommender/index.html.haml b/app/views/recommender/index.html.haml index 16bb8f83e..8dddc3846 100644 --- a/app/views/recommender/index.html.haml +++ b/app/views/recommender/index.html.haml @@ -1,6 +1,6 @@ -- @title= t('recommender_page.title') +- @title= t('recommender.title') -%h2.mt-5= t('recommender_page.ontology_recommender') +%h2.mt-5= t('recommender.ontology_recommender') %p = t('recommender.intro').html_safe = link_to(Rails.configuration.settings.links[:help_recommender], id: "recommender-help", @@ -37,7 +37,7 @@ %small#inputTextHelpBlock.form-text %a#insertInputLink{href: "javascript:void(0);"}= t('insert_sample_text') - %a#advancedOptionsLink{:href => "javascript:void(0);"}= t('shared.show_advanced_options') + " >>" + %a#advancedOptionsLink{:href => "javascript:void(0);"}= t('show_advanced_options') + " >>" -# Advanced options %div#advancedOptions.optionsBox @@ -74,34 +74,34 @@ %div.row#recommenderErrorsDisplay.mb-4 %div.col %span.notTextError - = t('recommender_page.ontology_recommendation_input') + = t('recommender.ontology_recommendation_input') %br/ %span.sumWeightsError - = t('recommender_page.weight_sum_greater_than_zero') + = t('recommender.weight_sum_greater_than_zero') %br/ %span.rangeWeightsError - = t('recommender_page.weights_greater_than_zero') + = t('recommender.weights_greater_than_zero') %br/ %span.invalidWeightsError - = t('recommender_page.valid_numeric_weights') + = t('recommender.valid_numeric_weights') %br/ %span.invalidMaxOntError - = t('recommender_page.valid_integer_max_ontologies_per_set') + = t('recommender.valid_integer_max_ontologies_per_set') %br/ %span.maxOntologiesError - = t('recommender_page.valid_max_ontologies_per_set_range') + = t('recommender.valid_max_ontologies_per_set_range') %br/ %span.generalError - = t('recommender_page.recommendation_error') + = t('recommender.recommendation_error') %br/ %span#noResults - = t('recommender_page.no_recommendations') + = t('recommender.no_recommendations') %br/ %span#noResultsSets - = t('recommender_page.no_sets_recommended') + = t('recommender.no_sets_recommended') %br/ %span.inputSizeError - = t('recommender_page.text_length_limit') + = t('recommender.text_length_limit') %div.row#resultsDisplay %div.col diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 1c08787dc..d7b1cbc9a 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,23 +1,21 @@ fr: - - + ######################################################## NCBO ANNOTAROR PLUS ####################################################### #################################################################################################################################### nbco_annotatosplus: - score_help: "Annotations de score suivant la mesure NCBO 2009 précédente (ancienne) ou Annotations de score suivant la mesure C-Value (cvalue) ou Annotations de score suivant la mesure C-Value avec expansion de la hiérarchie (cvalueh)" start_typing_to_select: "Commencez à taper pour sélectionner %{type} ou laissez vide pour tout utiliser" include_ancestors_up_to_level: "Inclure les ancêtres jusqu'au niveau" include_score: "Inclure le score" - + recognizer: "Reconnaissance d'entité" - + enter_paste_text_to_annotate: "Entrez ou collez le texte à annoter :" - show_advanced_options : "Afficher les options avancées" - insert_sample_text : "Insérer un exemple de texte" + show_advanced_options: "Afficher les options avancées" + insert_sample_text: "Insérer un exemple de texte" match_longest_only: "Correspondance la plus longue seulement" match_partial_words: "Correspondance de mots partiels" include_mappings: "Inclure les correspondances" @@ -25,22 +23,22 @@ fr: exclude_synonyms: "Exclure les synonymes" select_ontologies: "Commencez à taper pour sélectionner des ontologies ou laissez vide pour utiliser toutes les ontologies" select_ontologies_list: "Sélectionnez les ontologies" - + umls: - semantic : "sémantique UMLS" + semantic: "sémantique UMLS" semantic_types: "Types sémantiques UMLS" semantic_groups: "Groupes sémantiques UMLS" select: "Sélectionnez %{name}" fast_context: - title: "FastContext" - help: "Activer FastContext pour détecter : si un concept a été nié (affirmé, nié), qui a vécu le concept trouvé (patient, autre), quand le concept annoté s'est produit (récent, historique, hypothétique), et/ou si le concept annoté est incertain (certain, incertain)." - + title: "FastContext" + help: "Activer FastContext pour détecter : si un concept a été nié (affirmé, nié), qui a vécu le concept trouvé (patient, autre), quand le concept annoté s'est produit (récent, historique, hypothétique), et/ou si le concept annoté est incertain (certain, incertain)." + annotations: "Annotations" - + filters: - by: + by: filter: "Filtrer" title: "Les résultats sont filtrés par" class: "Classe" @@ -72,24 +70,24 @@ fr: score_threshold_help: "Spécifier la valeur de score minimum pour les annotations" confidence_threshold: "Seuil de confiance du filtre" confidence_threshold_help: "Spécifiez la position minimale dans la distribution des scores (entre 1 et 100)" - recognizer de reconnaissance : "outil de reconnaissance d'entité" - + recognizer de reconnaissance: "outil de reconnaissance d'entité" + index: title: "NCBO Annotator +" intro: > - Le NCBO Annotator+ est un proxy appelant le service Web NCBO Annotator sur le NCBO BioPortal. -

    - Tchechmedjiev, A., Abdaoui, A., Emonet, V., Melzi, S., Jonnagaddala, J., & Jonquet, C. (2018).
    Fonctionnalités améliorées pour annoter et indexer le texte clinique avec NCBO Annotator+. Bioinformatique, 34(11), 1962-1965. -

    - Si vous utilisez l'API, veuillez fournir une clé API NCBO BioPortal valide et accéder au service sur http://services.bioportal.lirmm.fr/ncbo_annotatorplus
    - Le texte soumis au NCBO Annotator+ doit être en anglais. + Le NCBO Annotator+ est un proxy appelant le service Web NCBO Annotator sur le NCBO BioPortal. +

    + Tchechmedjiev, A., Abdaoui, A., Emonet, V., Melzi, S., Jonnagaddala, J., & Jonquet, C. (2018). Fonctionnalités améliorées pour annoter et indexer le texte clinique avec NCBO Annotator+. Bioinformatique, 34(11), 1962-1965. +

    + Si vous utilisez l'API, veuillez fournir une clé API NCBO BioPortal valide et accéder au service sur http://services.bioportal.lirmm.fr/ncbo_annotatorplus
    + Le texte soumis au NCBO Annotator+ doit être en anglais. sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. #################################################################################################################################### ######################################################## SEARCH #################################################################### #################################################################################################################################### - + search: title: "Rechercher" class_search: "Recherche de classe" @@ -111,17 +109,16 @@ fr: categories_placeholder: Commencez à taper pour sélectionner des catégories ou laissez vide pour tout utiliser property_definition: Association nommée entre deux entités. Les exemples sont "définition" (une relation entre une classe et du texte) et "partie de" (une relation entre deux classes). obsolete_definition: > - Une classe que les auteurs de l'ontologie ont signalée comme étant obsolète et qu'ils recommandent de ne pas utiliser. Ces cours - sont souvent laissés dans des ontologies (plutôt que de les supprimer entièrement) afin que les systèmes existants qui en dépendent continuent à fonctionner. - + Une classe que les auteurs de l'ontologie ont signalée comme étant obsolète et qu'ils recommandent de ne pas utiliser. Ces cours + sont souvent laissés dans des ontologies (plutôt que de les supprimer entièrement) afin que les systèmes existants qui en dépendent continuent à fonctionner. + #################################################################################################################################### ######################################################## PROJECTS ################################################################## #################################################################################################################################### - + projects: - - title: "Liste de projets" + title: "Liste de projets" project_description: "Description du projet" description_text: "Texte de description" view_projects_help: "Aide à la visualisation des projets" @@ -144,30 +141,28 @@ fr: #################################################################################################################################### - ####################################################### LANDSCAPE ################################################################## #################################################################################################################################### - + landscape: - - title: "%{site} Paysage" + title: "%{site} Paysage" intro: Visualiser les données récupérées à partir des ontologies stockées dans le portail groups_and_categories: Groupes et catégories - ontologies_by : "Ontologies par %{type}" + ontologies_by: "Ontologies par %{type}" ontologies_count_by_catalog: Nombre d'ontologies dans chaque catalogue de données properties_use: Utilisation des propriétés properties_usage_proportion: The proportion of properties usage among stored ontologies ontologies_languages: Langues naturelles des ontologies ontologies_licenses: Licences utilisées par les ontologies ontology_tools: Outils les plus utilisés pour construire des ontologies - + more_properties_charts: Plus de graphiques de propriétés ontology_properties_pie_charts: Graphiques circulaires pour les propriétés utilisées dans les ontologies owl_ontology_preflabel_uris: URIs de propriétés prefLabel utilisées pour les ontologies OWL owl_ontology_synonym_uris: URIs de propriétés synonymes utilisées pour les ontologies OWL owl_ontology_definition_uris: URIs de propriétés de définition utilisées pour les ontologies OWL owl_ontology_author_uris: URIs de propriétés d'auteur utilisées pour les ontologies OWL - + ontology_types: Types d'ontologie ontology_formality_levels: Niveaux de formalité des ontologies ontologies_formats: Format utilisé @@ -186,7 +181,6 @@ fr: most_active_ontologies: "Ontologies les plus actives" ontologies_with_notes_reviews_projects: "Ontologies avec des notes, des critiques et des projets" - ontology_relations_network: "Réseau de relations ontologiques" relations_between_stored_ontologies: "Relations entre les ontologies stockées sur le portail" @@ -195,92 +189,16 @@ fr: ontology_fairness_evaluator: "Évaluateur de conformité FAIR des ontologies (O’FAIRe)" average_metrics: "Métriques moyennes" - group: Groupe category: Catégorie size: Taille ################################################################################################################################### + ####################################################### HOME ####################################################################### + #################################################################################################################################### - - - all : "Tout" - none: "aucune" - see_details: "Voir les détails" - view_fair_scores_definitions: "View fair scores definitions" - get_json_version: "Get the json version" - select_ontologies: "Commencez à taper pour sélectionner des ontologies ou laissez vide pour toutes les utiliser" - clear_selection: "Effacer la sélection" - select_from_list: "Sélectionner dans la liste" - more: "Plus" - statistics: "Statistiques" - average: "Moyenne" - min: "Min" - max: "Max" - median: "Médiane" - slices: "Tranches" - help: "Aide" - or: "Ou" - - class: "Classe" - filter : "Filtre" - ontology: "Ontologie" - - - type: "Type" - context: "Contexte" - umls_sem_type: "Type Sem UMLS" - matched_ontology: "ontologie correspondante" - matched_class: "Classe correspondante" - score: "Score" - negation: "négation" - experiencer: "Experiencer" - temporality : "Temporalité" - certainty : "Certitude" - format_results: "Formater les résultats en " - reproduce_results : "Reproduisez ces résultats en utilisant le " - additional_parameters: "Paramètres supplémentaires expliqués à " - - - input: "Entrée" - text: "Texte" - keywords: "Mots-clés" - keywords_separated_by_commas: "Mots-clés séparés par des virgules" - output: "Sortie" - ontology_sets: "Ensembles d'ontologies" - insert_sample_input: "Insérer une entrée d'exemple" - weights_configuration: "Configuration des poids" - coverage: "Couverture" - acceptance: "Acceptation" - knowledge_detail: "Détail de la connaissance" - specialization: "Spécialisation" - max_ontologies_per_set: "Nombre maximum d'ontologies par ensemble" - paste_input_text: "Collez un paragraphe de texte ou des mots-clés à utiliser dans le calcul des recommandations d'ontologie" - get_recommendations: "Obtenir des recommandations" - select_ontologies_list: "Sélectionnez les ontologies" - - - header: - browse: "Parcourir" - search: "Rechercher" - mappings: "Mappings" - recommender: "Recommender" - annotator: "Annotateur" - ncbo_annotator_plus: "NCBO Annotator+" - projects: "Projets" - landscape: "Paysage" - login: "Se connecter" - account_setting: "Paramètres du compte" - submit_feedback: "Envoyer un commentaire" - help: "Aide" - release_notes: "Notes de version" - publications: "Publications" - - footer: - products: "Produits" - - main: + home: find_ontology: "Trouver une ontologie" search_class: "Rechercher une classe" browse_by_group: "Parcourir par groupe" @@ -297,20 +215,74 @@ fr: projects: "Projets" users: "Utilisateurs" no_recent_notes: "Aucune note récente n'a été soumise" - - - shared: - show_advanced_options : "Afficher les options avancées" - insert_sample_text : "Insérer un exemple de texte" - match_longest_only: "Correspondance la plus longue seulement" - match_partial_words: "Correspondance de mots partiels" - include_mappings: "Inclure les correspondances" - exclude_numbers: "Exclure les nombres" + + index: + find_ontology_placeholder: Commencez à taper le nom de l'ontologie, puis choisissez dans + query_placeholder: Entrez une classe, par exemple Melanoma + tagline: le référentiel d'ontologies biomédicales le plus complet au monde + title: Bienvenue à la %{organization} + welcome: Bienvenue à la %{site}, + help: + welcome: Bienvenue à la le %{site} du Centre national d'ontologie biomédicale. %{site} est une application Web permettant d'accéder et de partager des ontologies biomédicales. + getting_started: > + %{site} permet aux utilisateurs de parcourir, charger, télécharger, rechercher, commenter et créer des mappages pour les ontologies. + browse: > + Les utilisateurs peuvent parcourir et explorer des ontologies individuelles en naviguant soit dans une structure arborescente, soit dans une vue graphique animée. Les utilisateurs peuvent également afficher les mappages et + métadonnées d'ontologie et téléchargement d'ontologies. De plus, les utilisateurs connectés peuvent soumettre une nouvelle ontologie à la bibliothèque. + rest_examples_html: affichez la documentation et des exemples de l'%{site} API REST. + announce_list_html: > + Pour recevoir des avis de nouvelles versions ou de pannes de site, veuillez vous abonner au + liste de support bioontologie. + + ################################################################################################################################### + + ####################################################### RECOMMENDER ################################################################ + #################################################################################################################################### + + recommender: + intro: Obtenez des recommandations pour les ontologies les plus pertinentes à partir d'un extrait d'un texte biomédical ou d'une liste de mots-clés + title: "recommandeur" + ontology_recommender: "Recommandeur d'ontologie" + ontology_recommendation_input: "Veuillez coller un paragraphe de texte ou quelques mots-clés pour calculer les recommandations d'ontologie." + weight_sum_greater_than_zero: "La somme des poids doit être supérieure à zéro" + weights_greater_than_zero: "Tous les poids doivent être supérieurs ou égaux à zéro" + valid_numeric_weights: "Tous les poids doivent être des valeurs numériques valides" + valid_integer_max_ontologies_per_set: "Le nombre maximum d'ontologies par ensemble doit être une valeur entière valide" + valid_max_ontologies_per_set_range: "Le nombre maximum d'ontologies par ensemble doit être un nombre entre 2 et 4" + recommendation_error: "Problème lors de la récupération des recommandations, veuillez réessayer" + no_recommendations: "Aucune recommandation trouvée" + no_sets_recommended: "Il n'y a pas d'ensembles d'ontologies recommandés pour l'entrée fournie. Veuillez essayer la sortie 'Ontologies'." + text_length_limit: "Veuillez utiliser moins de 500 mots. Si vous devez annoter de plus grands morceaux de texte, vous pouvez utiliser le service web de recommandation." + + ################################################################################################################################### + + ####################################################### MAPPINGS ################################################################ + #################################################################################################################################### + + mappings: + title: "Correspondances" + upload_mappings: "Télécharger les correspondances" + mappings_bulk_load: "Chargement en masse des correspondances" + intro: "Parcourir les correspondances entre les classes de différentes ontologies" + no_mappings_available: "Aucune correspondance disponible" + loading_mappings: "Chargement des correspondances en cours..." + find_mappings: "Trouver les correspondances d'une classe / concept" + view_mappings_help: "View mappings help" + select_class: "Commencez à taper pour sélectionner une classe" select_ontologies: "Commencez à taper pour sélectionner des ontologies ou laissez vide pour utiliser toutes les ontologies" - umls_semantic : "sémantique UMLS" + select_semantic_types: "Sélectionnez les types sémantiques UMLS" + select_semantic_types_help: "Commencez à taper pour sélectionner les types sémantiques UMLS ou laissez vide pour utiliser tous les types" + select_semantic_groups: "Sélectionnez les groupes sémantiques UMLS" + select_semantic_groups_help: "Commencez à taper pour sélectionner les groupes sémantiques UMLS ou laissez vide pour utiliser tous les groupes" + include_ancestors_up_to_level: "Inclure les ancêtres jusqu'au niveau" + include_score: "Inclure le score" + ################################################################################################################################### + + ####################################################### ANNOTATOR ################################################################ + #################################################################################################################################### - annotator_page: + annotator: title: "Annotateur" get_annotator: "Obtenir les annotations" filters: @@ -326,7 +298,7 @@ fr: score_threshold_help: "Spécifier la valeur de score minimum pour les annotations" confidence_threshold: "Seuil de confiance du filtre" confidence_threshold_help: "Spécifiez la position minimale dans la distribution des scores (entre 1 et 100)" - recognizer de reconnaissance : "outil de reconnaissance d'entité" + recognizer de reconnaissance: "outil de reconnaissance d'entité" start_typing_to_select: "Commencez à taper pour sélectionner %{type} ou laissez vide pour tout utiliser" select: "Sélectionnez %{name}" enter_or_paste_text: "Entrer ou coller le texte à annoter" @@ -334,26 +306,116 @@ fr: lemmatize: "Lemmatiser" annotations_result: "Annotations" results_filtered_by: "Les résultats sont filtrés par" - umls: semantic_types: "Types sémantiques UMLS" semantic_groups: "Groupes sémantiques UMLS" + index: + intro: Obtenez des annotations pour le texte biomédical avec des classes des ontologies + annotatorplus_html: Consultez la version bêta d'AnnotatorPlus ; une nouvelle version de l'Annotator avec un support supplémentaire pour la négation, et plus encore ! + fast_context: + tooltip: "Activer FastContext pour détecter : si un concept a été nié (affirmé, nié), qui a vécu le concept trouvé (patient, autre), quand le concept annoté s'est produit (récent, historique, hypothétique), et/ou si le concept annoté est incertain (certain, incertain)." + lemmatize: + tooltip: "Activez Lemmatize pour lemmatiser le texte soumis et utiliser un dictionnaire lemmatisé pour les annotations" + sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. + ################################################################################################################################### - recommender_page: - title: "recommandeur" - ontology_recommender: "Recommandeur d'ontologie" - ontology_recommendation_input: "Veuillez coller un paragraphe de texte ou quelques mots-clés pour calculer les recommandations d'ontologie." - weight_sum_greater_than_zero: "La somme des poids doit être supérieure à zéro" - weights_greater_than_zero: "Tous les poids doivent être supérieurs ou égaux à zéro" - valid_numeric_weights: "Tous les poids doivent être des valeurs numériques valides" - valid_integer_max_ontologies_per_set: "Le nombre maximum d'ontologies par ensemble doit être une valeur entière valide" - valid_max_ontologies_per_set_range: "Le nombre maximum d'ontologies par ensemble doit être un nombre entre 2 et 4" - recommendation_error: "Problème lors de la récupération des recommandations, veuillez réessayer" - no_recommendations: "Aucune recommandation trouvée" - no_sets_recommended: "Il n'y a pas d'ensembles d'ontologies recommandés pour l'entrée fournie. Veuillez essayer la sortie 'Ontologies'." - text_length_limit: "Veuillez utiliser moins de 500 mots. Si vous devez annoter de plus grands morceaux de texte, vous pouvez utiliser le service web de recommandation." + ####################################################### LAYOUT ################################################################ + #################################################################################################################################### + + layout: + header: + browse: "Parcourir" + search: "Rechercher" + mappings: "Mappings" + recommender: "Recommender" + annotator: "Annotateur" + ncbo_annotator_plus: "NCBO Annotator+" + projects: "Projets" + landscape: "Paysage" + login: "Se connecter" + account_setting: "Paramètres du compte" + submit_feedback: "Envoyer un commentaire" + help: "Aide" + release_notes: "Notes de version" + publications: "Publications" + footer: + products: "Produits" + copyright_html: Droit d'auteur &copie; 2005‑2022, Conseil d'administration de l'Université Leland Stanford Junior. Tous les droits sont réservés. + grant_html: > + %{site} est actuellement développé dans le cadre du projet ANR D2KAB (ANR-18-CE23-0017). Il reçoit ou a également reçu le soutien du projet ANR SIFR (ANR-12-JS02-0010), Union Européenne Projet H2020-MSCA SIFRm ( N° 701771), le Labex NUMEV (ANR-10-LABX-20), le projet IBC de Montpellier (ANR-11-BINF0002) , l'Agro Labex (ANR-10-LABX-0001) ainsi que de l'Université de Montpellier et du CNRS. + notices: + license_contact: > + Pour plus d'informations, envoyez un e-mail à support@ontoportal.org ou + visitez https://ontoportal.org/licensing. + license_obtain: > + Si vous êtes le propriétaire de cette installation OntoPortal, vous pouvez visiter + https://license.ontoportal.org pour obtenir une licence. + license_expired: > + Nous sommes désolés, mais la licence pour cette installation d'OntoPortal a expiré. Si vous êtes le propriétaire de cette installation OntoPortal, + veuillez visiter https://license.ontoportal.org pour renouveler votre licence. + license_trial: + one: Cette installation de l'appliance OntoPortal est une licence d'essai, qui expirera dans 1 jour. + other: Cette installation de l'appliance OntoPortal est une licence d'essai, qui expirera dans %{count} jours. + + ################################################################################################################################### + + + + all: "Tout" + none: "aucune" + keywords: "Mots-clés" + keywords_separated_by_commas: "Mots-clés séparés par des virgules" + see_details: "Voir les détails" + view_fair_scores_definitions: "View fair scores definitions" + get_json_version: "Get the json version" + select_ontologies: "Commencez à taper pour sélectionner des ontologies ou laissez vide pour toutes les utiliser" + clear_selection: "Effacer la sélection" + select_from_list: "Sélectionner dans la liste" + more: "Plus" + statistics: "Statistiques" + average: "Moyenne" + min: "Min" + max: "Max" + median: "Médiane" + slices: "Tranches" + help: "Aide" + or: "Ou" + show_advanced_options: "Afficher les options avancées" + insert_sample_text: "Insérer un exemple de texte" + class: "Classe" + filter: "Filtre" + ontology: "Ontologie" + type: "Type" + context: "Contexte" + umls_sem_type: "Type Sem UMLS" + matched_ontology: "ontologie correspondante" + matched_class: "Classe correspondante" + score: "Score" + negation: "négation" + experiencer: "Experiencer" + temporality: "Temporalité" + certainty: "Certitude" + format_results: "Formater les résultats en " + reproduce_results: "Reproduisez ces résultats en utilisant le " + additional_parameters: "Paramètres supplémentaires expliqués à " + input: "Entrée" + text: "Texte" + output: "Sortie" + ontology_sets: "Ensembles d'ontologies" + insert_sample_input: "Insérer une entrée d'exemple" + weights_configuration: "Configuration des poids" + coverage: "Couverture" + acceptance: "Acceptation" + knowledge_detail: "Détail de la connaissance" + specialization: "Spécialisation" + max_ontologies_per_set: "Nombre maximum d'ontologies par ensemble" + paste_input_text: "Collez un paragraphe de texte ou des mots-clés à utiliser dans le calcul des recommandations d'ontologie" + get_recommendations: "Obtenir des recommandations" + select_ontologies_list: "Sélectionnez les ontologies" + + # OTHER about: >

    @@ -413,60 +475,6 @@ fr: year_month_day_concise: "%Y-%m-%d" # 2017-03-01 month_day_year: "%b %-d, %Y" # Mar 1, 2017 monthfull_day_year: "%B %-d, %Y" # March 1, 2017 - - layouts: - footer: - copyright_html: Droit d'auteur &copie; 2005‑2022, Conseil d'administration de l'Université Leland Stanford Junior. Tous les droits sont réservés. - grant_html: > - %{site} est actuellement développé dans le cadre du projet ANR D2KAB (ANR-18-CE23-0017). Il reçoit ou a également reçu le soutien du projet ANR SIFR (ANR-12-JS02-0010), Union Européenne Projet H2020-MSCA SIFRm ( N° 701771), le Labex NUMEV (ANR-10-LABX-20), le projet IBC de Montpellier (ANR-11-BINF0002) , l'Agro Labex (ANR-10-LABX-0001) ainsi que de l'Université de Montpellier et du CNRS. - notices: - license_contact: > - Pour plus d'informations, envoyez un e-mail à support@ontoportal.org ou - visitez https://ontoportal.org/licensing. - license_obtain: > - Si vous êtes le propriétaire de cette installation OntoPortal, vous pouvez visiter - https://license.ontoportal.org pour obtenir une licence. - license_expired: > - Nous sommes désolés, mais la licence pour cette installation d'OntoPortal a expiré. Si vous êtes le propriétaire de cette installation OntoPortal, - veuillez visiter https://license.ontoportal.org pour renouveler votre licence. - license_trial: - one: Cette installation de l'appliance OntoPortal est une licence d'essai, qui expirera dans 1 jour. - other: Cette installation de l'appliance OntoPortal est une licence d'essai, qui expirera dans %{count} jours. - - home: - index: - find_ontology_placeholder: Commencez à taper le nom de l'ontologie, puis choisissez dans - query_placeholder: Entrez une classe, par exemple Melanoma - tagline: le référentiel d'ontologies biomédicales le plus complet au monde - title: Bienvenue à la %{organization} - welcome: Bienvenue à la %{site}, - help: - welcome: Bienvenue à la le %{site} du Centre national d'ontologie biomédicale. %{site} est une application Web permettant d'accéder et de partager des ontologies biomédicales. - getting_started: > - %{site} permet aux utilisateurs de parcourir, charger, télécharger, rechercher, commenter et créer des mappages pour les ontologies. - browse: > - Les utilisateurs peuvent parcourir et explorer des ontologies individuelles en naviguant soit dans une structure arborescente, soit dans une vue graphique animée. Les utilisateurs peuvent également afficher les mappages et - métadonnées d'ontologie et téléchargement d'ontologies. De plus, les utilisateurs connectés peuvent soumettre une nouvelle ontologie à la bibliothèque. - rest_examples_html : affichez la documentation et des exemples de l'%{site} API REST. - announce_list_html: > - Pour recevoir des avis de nouvelles versions ou de pannes de site, veuillez vous abonner au - liste de support bioontologie. - - annotator: - index: - intro: Obtenez des annotations pour le texte biomédical avec des classes des ontologies - annotatorplus_html: Consultez la version bêta d'AnnotatorPlus ; une nouvelle version de l'Annotator avec un support supplémentaire pour la négation, et plus encore ! - fast_context: - tooltip: "Activer FastContext pour détecter : si un concept a été nié (affirmé, nié), qui a vécu le concept trouvé (patient, autre), quand le concept annoté s'est produit (récent, historique, hypothétique), et/ou si le concept annoté est incertain (certain, incertain)." - lemmatize: - tooltip: "Activez Lemmatize pour lemmatiser le texte soumis et utiliser un dictionnaire lemmatisé pour les annotations" - sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. - - recommender: - intro: Obtenez des recommandations pour les ontologies les plus pertinentes à partir d'un extrait d'un texte biomédical ou d'une liste de mots-clés - - - ontologies: self: "Ontologies" @@ -475,37 +483,21 @@ fr: concepts: request_term: new_term_instructions: > -

    Cette ontologie s'intègre à OntoloBridge, permettant aux utilisateurs de la communauté de suggérer des ajouts à l'ontologie publique. Remplissez le modèle ci-dessous pour soumettre une demande de terme directement au responsable de l'ontologie.

    -
    -

    Libellé du terme (obligatoire)
    Nom du terme suggéré. Si un terme peut être décrit avec plusieurs synonymes, n'indiquez ici que le nom préféré.

    -
    -
    -

    Description du terme (obligatoire)
    Une brève définition, description ou utilisation du terme suggéré. Des synonymes de termes supplémentaires peuvent être répertoriés dans cette section.

    -
    -
    -

    Superclasse (obligatoire)
    Le terme parent du terme suggéré. Le terme parent doit être une entrée existante de l'ontologie actuelle. La superclasse peut être sélectionnée directement à partir de l'arborescence des classes de Bioportal.

    -
    -
    -

    Références (facultatif)
    Fournissez des preuves de l'existence du terme demandé, telles que les identifiants Pubmed des articles ou des liens vers d'autres ressources décrivant le terme.

    -
    -
    -

    Justification (facultatif)
    Fournissez ici toute information supplémentaire sur le terme demandé.

    -
    - - mappings: - title: "Correspondances" - upload_mappings: "Télécharger les correspondances" - mappings_bulk_load: "Chargement en masse des correspondances" - intro: "Parcourir les correspondances entre les classes de différentes ontologies" - no_mappings_available: "Aucune correspondance disponible" - loading_mappings: "Chargement des correspondances en cours..." - find_mappings: "Trouver les correspondances d'une classe / concept" - view_mappings_help: "View mappings help" - select_class: "Commencez à taper pour sélectionner une classe" - select_ontologies: "Commencez à taper pour sélectionner des ontologies ou laissez vide pour utiliser toutes les ontologies" - select_semantic_types: "Sélectionnez les types sémantiques UMLS" - select_semantic_types_help: "Commencez à taper pour sélectionner les types sémantiques UMLS ou laissez vide pour utiliser tous les types" - select_semantic_groups: "Sélectionnez les groupes sémantiques UMLS" - select_semantic_groups_help: "Commencez à taper pour sélectionner les groupes sémantiques UMLS ou laissez vide pour utiliser tous les groupes" - include_ancestors_up_to_level: "Inclure les ancêtres jusqu'au niveau" - include_score: "Inclure le score" \ No newline at end of file +

    Cette ontologie s'intègre à OntoloBridge, permettant aux utilisateurs de la communauté de suggérer des ajouts à l'ontologie publique. Remplissez le modèle ci-dessous pour soumettre une demande de terme directement au responsable de l'ontologie.

    +
    +

    Libellé du terme (obligatoire)
    Nom du terme suggéré. Si un terme peut être décrit avec plusieurs synonymes, n'indiquez ici que le nom préféré.

    +
    +
    +

    Description du terme (obligatoire)
    Une brève définition, description ou utilisation du terme suggéré. Des synonymes de termes supplémentaires peuvent être répertoriés dans cette section.

    +
    +
    +

    Superclasse (obligatoire)
    Le terme parent du terme suggéré. Le terme parent doit être une entrée existante de l'ontologie actuelle. La superclasse peut être sélectionnée directement à partir de l'arborescence des classes de Bioportal.

    +
    +
    +

    Références (facultatif)
    Fournissez des preuves de l'existence du terme demandé, telles que les identifiants Pubmed des articles ou des liens vers d'autres ressources décrivant le terme.

    +
    +
    +

    Justification (facultatif)
    Fournissez ici toute information supplémentaire sur le terme demandé.

    +
    + + \ No newline at end of file From 9b5ac8c13c655cd69f016459744b64ed83b30159 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Thu, 20 Apr 2023 16:45:48 +0200 Subject: [PATCH 078/533] translate ontology page --- app/views/ontologies/browse.html.erb | 100 +++++++------- config/locales/fr.yml | 200 +++++++++++++-------------- 2 files changed, 149 insertions(+), 151 deletions(-) diff --git a/app/views/ontologies/browse.html.erb b/app/views/ontologies/browse.html.erb index c35fdd01c..69d99663a 100644 --- a/app/views/ontologies/browse.html.erb +++ b/app/views/ontologies/browse.html.erb @@ -3,12 +3,12 @@
    -
    Ontologies loading
    -

    please wait...

    +
    <%= t('ontologies.loading') %>
    +

    <%= t('ontologies.please_wait') %>

    -

    Browse

    +

    <%= t('browse') %>

    <%= t('ontologies.intro').html_safe %> <%= link_to(Rails.configuration.settings.links[:help_ontology_browse], id: 'ontology-browse-help', @@ -19,27 +19,27 @@

    - Welcome admin
    This coloring indicates admin-only features + <%= t('ontologies.welcome_admin') %>
    <%= t('ontologies.admin_help') %>
    -

    Debug Info

    - types: {{facets.types.active}}
    - artifacts: {{facets.artifacts.active}}
    - formats: {{facets.formats.active}}
    - groups: {{facets.groups.active}}
    - categories: {{facets.categories.active}}
    - Selected ontologies: {{visible_ont_count}} +

    <%= t('ontologies.debug_info') %>

    + <%= t('types') %>: {{facets.types.active}}
    + <%= t('artifacts') %>: {{facets.artifacts.active}}
    + <%= t('formats') %>: {{facets.formats.active}}
    + <%= t('groups') %>: {{facets.groups.active}}
    + <%= t('categories') %>: {{facets.categories.active}}
    + <%= t('selected_ontologies') %>: {{visible_ont_count}}
    <%if session[:user].nil?%> - Submit New Ontology + <%= t('ontologies.submit_new_ontology') %> <%else%> - Submit New Ontology + <%= t('ontologies.submit_new_ontology') %> <%end%> @@ -47,7 +47,7 @@ Retrieve the attr value in browse_attributes and set it in the @ontologies in app/controllers/ontologies_controller.rb Define possibles values for the attr in config/enforced_attribute_values.rb-->
    -

    Entry Type

    +

    <%= t('ontologies.entry_type') %>

    @@ -61,7 +61,7 @@
    -

    Uploaded in the Last

    +

    <%= t('ontologies.uploaded_in_the_last') %>

    @@ -84,7 +84,7 @@
    -

    Group

    +

    <%= t('group') %>

    @@ -96,7 +96,7 @@
    -

    Format

    +

    <%= t('format') %>

    @@ -108,7 +108,7 @@
    -

    Ontology Content

    +

    <%= t('ontology_content') %>

    @@ -120,7 +120,7 @@
    -

    Natural Language

    +

    <%= t('natural_language') %>

    -

    Formality Levels

    +

    <%= t('formality_levels') %>

    -

    Is of Type

    +

    <%= t('is_of_type') %>

    -

    Missing Status

    +

    <%= t('missing_status') %>

    - - - - - - + + + + + + - - - - + + + +
    -

    No matches!

    +

    <%= t('no_matches') %>

    -
    VIEW
    +
    <%= t('view') %>

    {{$index}} @@ -215,37 +215,37 @@

    {{ontology.description | descriptionToText}}

    - Uploaded: {{ontology.creationDate | date:'shortDate'}} + <%= t('uploaded') %>: {{ontology.creationDate | date:'shortDate'}} - Format: {{ontology.format}} + <%= t('format') %>: {{ontology.format}} - View of:
    {{ontology.viewOfOnt.acronym}} + <%= t('view_of') %>: {{ontology.viewOfOnt.acronym}} - Summary Only + <%= t('summary_only') %> - Groups: {{groupAcronyms(ontology.groups).join(', ')}} + <%= t('groups') %>: {{groupAcronyms(ontology.groups).join(', ')}} - Categories: {{categoryNames(ontology.categories).join(', ')}} + <%= t('categories') %>: {{categoryNames(ontology.categories).join(', ')}} - Admins: {{adminUsernames(ontology.administeredBy).join(', ')}} + <%= t('admins') %>: {{adminUsernames(ontology.administeredBy).join(', ')}} Pull URL - Status: {{ontology.submissionStatusFormatted}} + <%= t('status') %>: {{ontology.submissionStatusFormatted}}
    - No submissions available + <%= t('no_submissions_available') %>

    @@ -255,7 +255,7 @@
    -
    FAIR score
    +
    <%= t('fair_score') %>
    {{ontology.fairScore}}
    @@ -264,7 +264,7 @@
    -
    classes
    +
    <%= t('classes') %>
    {{ontology.class_count_formatted}}
    @@ -282,7 +282,7 @@
    -
    projects
    +
    <%= t('projects') %>
    {{ontology.projects.length}}
    @@ -291,7 +291,7 @@
    -
    notes
    +
    <%= t('notes') %>
    {{ontology.notes.length}}
    diff --git a/config/locales/fr.yml b/config/locales/fr.yml index d7b1cbc9a..4e60754ee 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,9 +1,5 @@ fr: - - ######################################################## NCBO ANNOTAROR PLUS ####################################################### - #################################################################################################################################### - nbco_annotatosplus: score_help: "Annotations de score suivant la mesure NCBO 2009 précédente (ancienne) ou Annotations de score suivant la mesure C-Value (cvalue) ou Annotations de score suivant la mesure C-Value avec expansion de la hiérarchie (cvalueh)" start_typing_to_select: "Commencez à taper pour sélectionner %{type} ou laissez vide pour tout utiliser" @@ -83,11 +79,6 @@ fr: Le texte soumis au NCBO Annotator+ doit être en anglais. sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. - #################################################################################################################################### - - ######################################################## SEARCH #################################################################### - #################################################################################################################################### - search: title: "Rechercher" class_search: "Recherche de classe" @@ -112,11 +103,6 @@ fr: Une classe que les auteurs de l'ontologie ont signalée comme étant obsolète et qu'ils recommandent de ne pas utiliser. Ces cours sont souvent laissés dans des ontologies (plutôt que de les supprimer entièrement) afin que les systèmes existants qui en dépendent continuent à fonctionner. - #################################################################################################################################### - - ######################################################## PROJECTS ################################################################## - #################################################################################################################################### - projects: title: "Liste de projets" project_description: "Description du projet" @@ -139,11 +125,6 @@ fr: index: intro: Parcourez une sélection de projets qui utilisent les ressources %{site} - #################################################################################################################################### - - ####################################################### LANDSCAPE ################################################################## - #################################################################################################################################### - landscape: title: "%{site} Paysage" intro: Visualiser les données récupérées à partir des ontologies stockées dans le portail @@ -193,11 +174,6 @@ fr: category: Catégorie size: Taille - ################################################################################################################################### - - ####################################################### HOME ####################################################################### - #################################################################################################################################### - home: find_ontology: "Trouver une ontologie" search_class: "Rechercher une classe" @@ -234,11 +210,6 @@ fr: Pour recevoir des avis de nouvelles versions ou de pannes de site, veuillez vous abonner au
    liste de support bioontologie. - ################################################################################################################################### - - ####################################################### RECOMMENDER ################################################################ - #################################################################################################################################### - recommender: intro: Obtenez des recommandations pour les ontologies les plus pertinentes à partir d'un extrait d'un texte biomédical ou d'une liste de mots-clés title: "recommandeur" @@ -254,11 +225,6 @@ fr: no_sets_recommended: "Il n'y a pas d'ensembles d'ontologies recommandés pour l'entrée fournie. Veuillez essayer la sortie 'Ontologies'." text_length_limit: "Veuillez utiliser moins de 500 mots. Si vous devez annoter de plus grands morceaux de texte, vous pouvez utiliser le service web de recommandation." - ################################################################################################################################### - - ####################################################### MAPPINGS ################################################################ - #################################################################################################################################### - mappings: title: "Correspondances" upload_mappings: "Télécharger les correspondances" @@ -277,11 +243,6 @@ fr: include_ancestors_up_to_level: "Inclure les ancêtres jusqu'au niveau" include_score: "Inclure le score" - ################################################################################################################################### - - ####################################################### ANNOTATOR ################################################################ - #################################################################################################################################### - annotator: title: "Annotateur" get_annotator: "Obtenir les annotations" @@ -319,11 +280,6 @@ fr: tooltip: "Activez Lemmatize pour lemmatiser le texte soumis et utiliser un dictionnaire lemmatisé pour les annotations" sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. - ################################################################################################################################### - - ####################################################### LAYOUT ################################################################ - #################################################################################################################################### - layout: header: browse: "Parcourir" @@ -359,63 +315,7 @@ fr: one: Cette installation de l'appliance OntoPortal est une licence d'essai, qui expirera dans 1 jour. other: Cette installation de l'appliance OntoPortal est une licence d'essai, qui expirera dans %{count} jours. - ################################################################################################################################### - - - - all: "Tout" - none: "aucune" - keywords: "Mots-clés" - keywords_separated_by_commas: "Mots-clés séparés par des virgules" - see_details: "Voir les détails" - view_fair_scores_definitions: "View fair scores definitions" - get_json_version: "Get the json version" - select_ontologies: "Commencez à taper pour sélectionner des ontologies ou laissez vide pour toutes les utiliser" - clear_selection: "Effacer la sélection" - select_from_list: "Sélectionner dans la liste" - more: "Plus" - statistics: "Statistiques" - average: "Moyenne" - min: "Min" - max: "Max" - median: "Médiane" - slices: "Tranches" - help: "Aide" - or: "Ou" - show_advanced_options: "Afficher les options avancées" - insert_sample_text: "Insérer un exemple de texte" - class: "Classe" - filter: "Filtre" - ontology: "Ontologie" - type: "Type" - context: "Contexte" - umls_sem_type: "Type Sem UMLS" - matched_ontology: "ontologie correspondante" - matched_class: "Classe correspondante" - score: "Score" - negation: "négation" - experiencer: "Experiencer" - temporality: "Temporalité" - certainty: "Certitude" - format_results: "Formater les résultats en " - reproduce_results: "Reproduisez ces résultats en utilisant le " - additional_parameters: "Paramètres supplémentaires expliqués à " - input: "Entrée" - text: "Texte" - output: "Sortie" - ontology_sets: "Ensembles d'ontologies" - insert_sample_input: "Insérer une entrée d'exemple" - weights_configuration: "Configuration des poids" - coverage: "Couverture" - acceptance: "Acceptation" - knowledge_detail: "Détail de la connaissance" - specialization: "Spécialisation" - max_ontologies_per_set: "Nombre maximum d'ontologies par ensemble" - paste_input_text: "Collez un paragraphe de texte ou des mots-clés à utiliser dans le calcul des recommandations d'ontologie" - get_recommendations: "Obtenir des recommandations" - select_ontologies_list: "Sélectionnez les ontologies" - - # OTHER + # Other about: >
    @@ -478,7 +378,16 @@ fr: ontologies: self: "Ontologies" + loading: Chargement des ontologies intro: Parcourir la bibliothèque d'ontologies + please_wait: S'il vous plaît, attendez.. + browse: Explorer + welcome_admin: Bienvenue admin + admin_help: Cette couleur indique les fonctionnalités réservées aux administrateurs + debug_info: Informations de débogage + submit_new_ontology: Soumettre une nouvelle ontologie + entry_type: Type d'entrée + uploaded_in_the_last: Téléchargé dans les derniers concepts: request_term: @@ -500,4 +409,93 @@ fr:

    Justification (facultatif)
    Fournissez ici toute information supplémentaire sur le terme demandé.

    + # Generale + showing: Affichage + of: de + sort: Trier + popular: Populaire + name: Nom + classes_count: Nombre de classes + instances_concepts_count: Nombre d'instances/concepts + notes: Notes + upload_date: Date de téléchargement + release_date: Date de publication + fair_score: Score FAIR + search_rank: Classement de recherche + no_matches: Aucune correspondance ! + uploaded: Téléchargé + view_of: Vue de + view: Vue + summary_only: Résumé seulement + groups: Groupes + categories: Catégories + admins: Administrateurs + status: Statut + no_submissions_available: Aucune soumission disponible + classes: classes + + category: Catégorie + group: Groupe + format: Format + ontology_content: Contenu de l'ontologie + natural_language: Langage naturel + formality_levels: Niveaux de formalité + is_of_type: Est du type + missing_status: Statut manquant + types: Types + artifacts: Artéfacts + formats: Formats + selected_ontologies: Ontologies sélectionnées + all: "Tout" + none: "aucune" + keywords: "Mots-clés" + keywords_separated_by_commas: "Mots-clés séparés par des virgules" + see_details: "Voir les détails" + view_fair_scores_definitions: "View fair scores definitions" + get_json_version: "Get the json version" + select_ontologies: "Commencez à taper pour sélectionner des ontologies ou laissez vide pour toutes les utiliser" + clear_selection: "Effacer la sélection" + select_from_list: "Sélectionner dans la liste" + more: "Plus" + statistics: "Statistiques" + average: "Moyenne" + min: "Min" + max: "Max" + median: "Médiane" + slices: "Tranches" + help: "Aide" + or: "Ou" + show_advanced_options: "Afficher les options avancées" + insert_sample_text: "Insérer un exemple de texte" + class: "Classe" + filter: "Filtre" + ontology: "Ontologie" + type: "Type" + context: "Contexte" + umls_sem_type: "Type Sem UMLS" + matched_ontology: "ontologie correspondante" + matched_class: "Classe correspondante" + score: "Score" + negation: "négation" + experiencer: "Experiencer" + temporality: "Temporalité" + certainty: "Certitude" + format_results: "Formater les résultats en " + reproduce_results: "Reproduisez ces résultats en utilisant le " + additional_parameters: "Paramètres supplémentaires expliqués à " + input: "Entrée" + text: "Texte" + output: "Sortie" + ontology_sets: "Ensembles d'ontologies" + insert_sample_input: "Insérer une entrée d'exemple" + weights_configuration: "Configuration des poids" + coverage: "Couverture" + acceptance: "Acceptation" + knowledge_detail: "Détail de la connaissance" + specialization: "Spécialisation" + max_ontologies_per_set: "Nombre maximum d'ontologies par ensemble" + paste_input_text: "Collez un paragraphe de texte ou des mots-clés à utiliser dans le calcul des recommandations d'ontologie" + get_recommendations: "Obtenir des recommandations" + select_ontologies_list: "Sélectionnez les ontologies" + \ No newline at end of file From c2d7acc9cc1d2be6f4c13bb5ba44ce5b0be12c58 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 20 Apr 2023 16:53:26 +0200 Subject: [PATCH 079/533] Change the structure of the $FOOTER_LINKS variable so Everything related to internationalization must be done and centralized in the local's files (e.gen.ymland fr.yml) --- app/views/layouts/_footer.html.haml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index 3521d8ff8..3aa986ae0 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -5,7 +5,6 @@ %br/ .footer-container %footer - - footerlinks = $FOOTER_LINKS[I18n.locale] || $FOOTER_LINKS[:en] .footer-header .footer-logo %img{:src => "#{asset_path("logos/ontoportal.svg")}"} @@ -14,18 +13,18 @@ %p = logo .footer-social-media-links - - footerlinks[:social].each do |link| + - $FOOTER_LINKS[:social].each do |link| %a{:href => link[:link], :target => "_blank"} %img{:src => "#{asset_path(link[:logo])}"}/ .footer-nav-links - - footerlinks[:links].each do |footerlink| + - $FOOTER_LINKS[:sections].keys.each do |section| %div %h2 - = footerlink[:title] + = t("layout.footer."+section) %div - - footerlink[:items].each do |item| - %a{:href => item[:link], :target => "_blank"} - = item[:title] + - $FOOTER_LINKS[:sections][section].keys.each do |item| + %a{:href => $FOOTER_LINKS[:sections][section][item], :target => "_blank"} + = t("layout.footer."+section) From 850121ef3e950f7f9dd51903e02b294c8d09636c Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Thu, 20 Apr 2023 17:06:14 +0200 Subject: [PATCH 080/533] Update en.yml --- config/locales/en.yml | 734 ++++++++++++++++++++++++++---------------- 1 file changed, 448 insertions(+), 286 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 022be952a..254fa1fd6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,327 +1,489 @@ en: - all : "All" - see_details: "See details" - view_fair_scores_definitions: "View fair scores definitions" - get_json_version: "Get the json version" - select_ontologies: "Start typing to select ontologies or leave blank to use all" - clear_selection: "Clear selection" - select_from_list: "Select from list" - more: "More" - statistics: "Statistics" - average: "Average" - min: "Min" - max: "Max" - median: "Median" - slices: "Slices" - help: "Help" + nbco_annotatosplus: + score_help: "Score annotations following previous NCBO 2009 measure (old) or Score annotations following C-Value measure (cvalue) or Score annotations following C-Value measure with hierarchy expansion (cvalueh)" + start_typing_to_select: "Start typing to select %{type} or leave blank to use all" + include_ancestors_up_to_level: "Include ancestors up to level" + include_score: "Include score" - class: "Class" - filter: "Filter" - ontology: "Ontology" + recognizer: "Entity recognition" - type: "Type" - context: "Context" - umls_sem_type: "UMLS Sem Type" - matched_class: "Matched Class" - matched_ontology: "Matched Ontology" - score: "Score" - negation: "Negation" - experiencer: "Experiencer" - temporality: "Temporality" - certainty: "Certainty" - format_results: "Format results as " - reproduce_results : "Reproduce these results using the " - additional_parameters: "Additional parameters explained at " + enter_paste_text_to_annotate: "Enter or paste the text to annotate:" - input: "Input" - text: "Text" - keywords: "Keywords" - keywords_separated_by_commas: "Keywords separated by commas" - output: "Output" - ontology_sets: "Ontology sets" - insert_sample_input: "Insert sample input" - weights_configuration: "Weights configuration" - coverage: "Coverage" - acceptance: "Acceptance" - knowledge_detail: "Knowledge detail" - specialization: "Specialization" - max_ontologies_per_set: "Maximum ontologies per set" - paste_input_text: "Paste a paragraph of text or some keywords to use in calculating ontology recommendations" - get_recommendations: "Get Recommendations" - select_ontologies_list: "Select Ontologies" + show_advanced_options: "Show advanced options" + insert_sample_text: "Insert sample text" + match_longest_only: "Match longest only" + match_partial_words: "Match partial words" + include_mappings: "Include mappings" + exclude_numbers: "Exclude numbers" + exclude_synonyms: "Exclude synonyms" + select_ontologies: "Start typing to select ontologies or leave blank to use all ontologies" + select_ontologies_list: "Select ontologies" - header: - browse: "Browse" - search: "Search" - mappings: "Mappings" - recommender: "Recommender" - annotator: "Annotator" - ncbo_annotator_plus: "NCBO Annotator+" - projects: "Projects" - landscape: "Landscape" - login: "Login" - account_setting: "Account Settings" - submit_feedback: "Submit Feedback" - help: "Help" - release_notes: "Release Notes" - publications: "Publications" + umls: + semantic: "UMLS Semantic" + semantic_types: "UMLS Semantic Types" + semantic_groups: "UMLS Semantic Groups" - footer: - products: "Products" + select: "Select %{name}" - main: - find_ontology: "Find an ontology" - search_class: "Search for a class" - browse_by_group: "Browse by group" - browse_ontologies: "Browse Ontologies" - comprehensive_repository: "the world's most comprehensive repository of biomedical ontologies" - advanced_search: "Advanced Search" - ontology_visits: "Ontology Visits" - fair_scores: "FAIR Scores" - clear_selection: "Clear Selection" - latest_notes: "Latest Notes" - ontologies: "Ontologies" - classes: "Classes" - individuals: "Individuals" - projects: "Projects" - users: "Users" - no_recent_notes: "No recent notes have been submitted" - - shared: - show_advanced_options: "Show advanced options" - insert_sample_text: "Insert sample text" - umls_semantic: "UMLS semantic" - + fast_context: + title: "FastContext" + help: "Activate FastContext to detect: if a concept has been negated (affirmed, negated), who experienced the concept found (patient, other), when the annotated concept occurred (recent, historical, hypothetical), and/or if the annotated concept is uncertain (certain, uncertain)." - search_page: - title: "Search" - class_search: "Class Search" - show_advanced_options: "Show advanced options" - hide_advanced_options: "Hide advanced options" - view_search_documentation: "View search documentation" - include_in_search: "Include in search" - narrow_search_to: "Narrow search to" - categories: "Categories" + annotations: "Annotations" - annotator_page: - title: "Annotator" - get_annotator: "Get Annotations" filters: + by: + filter: "Filter" + title: "Results are filtered by" + class: "Class" + ontology: "Ontology" + match_type: "Type" + match_context: "Context" + matched_class: "Associated Class" + matched_ontology: "Associated Ontology" + umls_sem_type: "UMLS Semantic Type" + score: "Score" + negation: "Negation" + experiencer: "Experiencer" + temporality: "Temporality" + certainty: "Certainty" + + additional_parameters_explained_at: "Additional parameters are explained on the page:" + format_results_as: "Format results as:" + reproduce_results_using: "Reproduce these results using the" match_longest_only: "Match longest only" - match_partial_words: "Match partial words" + match_partial_words: "Recognize partial words" include_mappings: "Include mappings" exclude_numbers: "Exclude numbers" exclude_synonyms: "Exclude synonyms" max_hierarchy_level: "Include ancestors up to level" score: "Include score" - score_help: "Score annotations following the previous 2009 NCBO measure (old) or Score annotations following the C-Value measure (cvalue) or Score annotations following the C-Value measure with hierarchy expansion (cvalueh)" + score_help: "Score annotations according to the previous NCBO 2009 measure (old) or score annotations using the C-Value measure (cvalue) or score annotations using the C-Value measure with hierarchy expansion (cvalueh)" score_threshold: "Filter by score threshold" - score_threshold_help: "Specify the minimum score value for annotations " + score_threshold_help: "Specify the minimum score value for annotations" confidence_threshold: "Filter confidence threshold" - confidence_threshold_help: "Specify the minimum position in the scoring distribution (between 1 and 100)" - recognizer: "Entity recognizer" - start_typing_to_select: "Start typing to select %{type} or leave blank to use all" - select: "Select %{name}" - enter_or_paste_text: "Enter or paste text to be annotated" - fast_context: "FastContext" - lemmatize: "Lemmatize" - annotations_result: "Annotations" - results_filtered_by: "Results are filtered by" - + confidence_threshold_help: "Specify the minimum position in the scores distribution (between 1 and 100)" + entity_recognizer: "entity recognition tool" - umls: - semantic_types: "UMLS semantic types" - semantic_groups: "UMLS semantic groups" + index: + title: "NCBO Annotator +" + intro: > + The NCBO Annotator+ is a proxy calling the NCBO Annotator web service on the NCBO BioPortal. +

    + Tchechmedjiev, A., Abdaoui, A., Emonet, V., Melzi, S., Jonnagaddala, J., & Jonquet, C. (2018). Enhanced features for annotating and indexing clinical text with NCBO Annotator+. Bioinformatics, 34(11), 1962-1965. +

    + If you are using the API, please provide a valid NCBO BioPortal API key and access the service at http://services.bioportal.lirmm. en/ncbo_annotatorplus
    + Text submitted to NCBO Annotator+ must be in English. + sample_text: Melanoma is a malignant tumor of melanocytes found mainly in the skin but also in the intestine and the eye. + search: + title: "Search" + class_search: "Class Search" + show_advanced_options: "Show Advanced Options" + hide_advanced_options: "Hide Advanced Options" + view_search_documentation: "View Search Documentation" + include_in_search: "Include in Search" + narrow_search_to: "Narrow Search to" + categories: "Categories" + property_values: "Property Values" + obsolete_classes: "Obsolete Classes" + ontology_views: "Ontology Views" + exact_matches: "Exact Matches" + classes_with_definitions: "Classes with Definitions" + ontologies: "Ontologies" + index: + intro: "Search for a class across multiple ontologies" + search_keywords_placeholder: "Enter a class, e.g. Melanoma" + categories_placeholder: "Start typing to select categories or leave blank to use all" + property_definition: "A named association between two entities. Examples are 'definition' (a relationship between a class and text) and 'part of' (a relationship between two classes)." + obsolete_definition: > + A class that the ontology authors have flagged as obsolete and recommend not to use. These classes are often left in ontologies (rather than being deleted entirely) so that existing systems that depend on them continue to function." - recommender_page: - title: "recommender" - ontology_recommender: "Ontology Recommender" - ontology_recommendation_input: "Please paste a paragraph of text or some keywords to use in calculating ontology recommendations." - weight_sum_greater_than_zero: "The sum of the weights must be greater than zero" - weights_greater_than_zero: "All the weights must be greater or equal to zero" - valid_numeric_weights: "All the weights must be valid numeric values" - valid_integer_max_ontologies_per_set: "The maximum ontologies per set must be a valid integer value" - valid_max_ontologies_per_set_range: "The maximum ontologies per set must be a number between 2 and 4" - recommendation_error: "Problem getting recommendations, please try again" - no_recommendations: "No recommendations found" - no_sets_recommended: "There are no ontology sets recommended for the input provided. Please try the 'Ontologies' output." - text_length_limit: "Please use less than 500 words. If you need to annotate larger pieces of text you can use the Recommender Web Service" + projects: + projects: + title: "Projects List" + project_description: "Project Description" + description_text: "Description Text" + view_projects_help: "View Projects Help" + create_new_project: "Create New Project" - + self: "Projects" + description: "Description" + contacts: "Contacts" + institutions: "Institutions" + ontologies: "Ontologies" + creator: "User" + created: "Created" + home_page: "Home Page" + edit: "Edit" + delete_admin_only: "Delete (admin only)" + delete_confirm: "Are you sure?" - about: > -
    -

    Abstract

    -

    - Many vocabularies and ontologies are produced to represent and annotate agronomic data. Therefore, there is a need of - a common platform to identify, host and use them in agro-informatics application. The AgroPortal project aims to offer - a reference ontology repository for agronomy, reusing the NCBO BioPortal technology. The scientific outcomes and the - experience of the biomedical domain are thus exploited and transposed in the agronomy domain, including plants, food, - environment and possibly animal sciences. We offer an ontology portal which features ontology hosting, search, versioning, - visualization, comment, recommendation, enables semantic annotation, as well as storing and exploiting ontology alignments. - All of these within a fully semantic web compliant infrastructure. The AgroPortal specifically pays attention to respect the - requirements of the agronomic community in terms of ontology formats (e.g., SKOS, trait dictionaries) or supported features. - AgroPortal project is based on five driving agronomic use cases which participate in the design and orientation of the platform. - AgroPortal already offers a robust and stable reference repository highly valuable for the agronomic domain. -

    -

    Use cases

    - -
    -

    New features

    -

    - See the release notes -

    -
    -

    Partners

    -

    The National Center For Biomedical Ontology (NCBO), Institut de Recherche pour le Développement (IRD), Research Data Alliance (RDA), - Bioversity International, Food & Agriculture Organization (FAO), Global Open Data for Agriculture & Nutrition (Godan Action), Institut National de la Recherche Agronomique (INRA)

    -

    Acknowledgments

    -

    The AgroPortal is partly achieved within the Semantic Indexing of French biomedical Resources (SIFR) project - that received funding from the EU H2020 research and innovation programme under the Marie Sklodowska-Curie (grant 701771) - and the French National Research Agency (grant ANR-12-JS02-01001), the NUMEV Labex (grant ANR-10-LABX-20), - the Computational Biology Institute of Montpellier (grant ANR-11-BINF-0002) as well as by University of Montpellier and the CNRS. - We also thank the National Center for Biomedical Ontologies for help and time spent with us in deploying the AgroPortal.

    -

    Team

    - To contact us: firstname.lastname@lirmm.fr -
      -
    • Clément Jonquet, researcher at LIRMM (Univ. of Montpellier, France), main investigator of the AgroPortal project
    • -
    • Anne Toulet, researcher at LIRMM (Univ. of Montpellier, France)
    • -
    • Vincent Emonet, engineer at LIRMM (Univ. of Montpellier, France)
    • -
    -
    + index: + intro: "Browse a selection of projects that use %{site} resources" - activerecord: - errors: - models: - license: - attributes: - encrypted_key: - invalid_license_key: is an invalid license key - no_appliance_id_for_comparison: couldn't be validated. Unable to retrieve virtual appliance ID. - appliance_id_mismatch: is an appliance ID mismatch - admin: - licenses: - create: - success: License successfully renewed! + landscape: + title: "%{site} Landscape" + intro: Visualize data retrieved from ontologies stored in the portal + groups_and_categories: Groups and Categories + ontologies_by: "Ontologies by %{type}" + ontologies_count_by_catalog: Number of ontologies in each data catalog + properties_use: Property Usage + properties_usage_proportion: The proportion of properties usage among stored ontologies + ontologies_languages: Natural languages of ontologies + ontologies_licenses: Licenses used by ontologies + ontology_tools: Most used tools to build ontologies + more_properties_charts: More properties charts + ontology_properties_pie_charts: Pie charts for the properties used in ontologies + owl_ontology_preflabel_uris: URIs for prefLabel properties used for OWL ontologies + owl_ontology_synonym_uris: URIs for synonym properties used for OWL ontologies + owl_ontology_definition_uris: URIs for definition properties used for OWL ontologies + owl_ontology_author_uris: URIs for author properties used for OWL ontologies + ontology_types: Ontology types + ontology_formality_levels: Formality levels of ontologies + ontologies_formats: Format used + ontologies_contributors: Contributors to ontology development + most_active_people: Most active people + most_mentioned_people: Most mentioned people as contact, creator, contributor or curator + most_active_organizations: Most active organizations + funding_endorsing_organizations: Organizations funding and endorsing the most ontologies + ontologies_activity_on: "Ontology Activity on %{site}" + most_active_people_as_reviewer: "Most active people as reviewers" + most_mentioned_people_as_reviewer: People who published notes, reviews, and projects + most_active_ontologies: "Most active ontologies" + ontologies_with_notes_reviews_projects: "Ontologies with notes, reviews, and projects" + ontology_relations_network: "Ontology Relations Network" + relations_between_stored_ontologies: "Relations between stored ontologies in the portal" + filter_network: "Filter network" + ontology_fairness_evaluator: "Ontology FAIRness Evaluator (O’FAIRe)" + average_metrics: "Average metrics" + group: Group + category: Category + size: Size - date: - formats: - year_month_day_concise: "%Y-%m-%d" # 2017-03-01 - month_day_year: "%b %-d, %Y" # Mar 1, 2017 - monthfull_day_year: "%B %-d, %Y" # March 1, 2017 + home: + find_ontology: "Find an ontology" + search_class: "Search Class" + browse_by_group: "Browse by Group" + browse_ontologies: "Browse ontologies" + comprehensive_repository: "the most comprehensive repository of biomedical ontologies in the world" + advanced_search: "Advanced Search" + ontology_visits: "Ontology visits" + fair_scores: "FAIR Scores" + clear_selection: "Clear Selection" + latest_notes: "Latest Notes" + ontologies: "Ontologies" + classes: "Classes" + individuals: "People" + projects: "Projects" + users: "Users" + no_recent_notes: "No recent notes were submitted" + index: + find_ontology_placeholder: Start typing the ontology name, then choose from + query_placeholder: Enter a class, eg Melanoma + tagline: the world's most comprehensive repository of biomedical ontologies + title: Welcome to the %{organization} + welcome: Welcome to the %{site}, + help: + welcome: Welcome to the %{site} of the National Center for Biomedical Ontology. %{site} is a web application for accessing and sharing biomedical ontologies. + getting_started: > + %{site} allows users to browse, upload, download, search, comment, and create mappings for ontologies. + browse: > + Users can browse and explore individual ontologies by navigating either in a tree structure or in an animated graphical view. Users can also view mappings and + ontology metadata and ontology download. Additionally, logged in users can submit a new ontology to the library. + rest_examples_html: View documentation and examples for the %{site} REST API. + announce_list_html: > + To receive notices of new releases or site outages, please subscribe to + bioontology support list. - layouts: - footer: - copyright_html: Copyright © 2005‑2022, The Board of Trustees of Leland Stanford Junior University. All rights reserved. - grant_html: > - %{site} is currently being developed within French ANR D2KAB project (ANR-18-CE23-0017). It also receives or received support from ANR SIFR project (ANR-12-JS02-0010), European Union H2020-MSCA SIFRm project (No 701771), the NUMEV Labex (ANR-10-LABX-20), the IBC of Montpellier project (ANR-11-BINF0002), the Agro Labex (ANR-10-LABX-0001) as well as from University of Montpellier and the CNRS. - notices: - license_contact: > - For more information, email support@ontoportal.org or - visit https://ontoportal.org/licensing. - license_obtain: > - If you are the owner of this OntoPortal installation, you can visit - https://license.ontoportal.org to obtain a license. - license_expired: > - We're sorry, but the license for this OntoPortal installation has expired. If you are the owner of this OntoPortal installation, - please visit https://license.ontoportal.org to renew your license. - license_trial: - one: This installation of the OntoPortal Appliance is a trial license, which will expire in 1 day. - other: This installation of the OntoPortal Appliance is a trial license, which will expire in %{count} days. + recommend: + intro: Get recommendations for the most relevant ontologies from an excerpt of a biomedical text or a list of keywords + title: "recommender" + ontology_recommender: "Ontology Recommender" + ontology_recommendation_input: "Please paste a paragraph of text or some keywords to compute ontology recommendations." + weight_sum_greater_than_zero: "The sum of weights must be greater than zero" + weights_greater_than_zero: "All weights must be greater than or equal to zero" + valid_numeric_weights: "All weights must be valid numeric values" + valid_integer_max_ontologies_per_set: "Max ontologies per set must be a valid integer value" + valid_max_ontologies_per_set_range: "Max ontologies per set must be a number between 2 and 4" + recommendation_error: "Problem retrieving recommendations, please try again" + no_recommendations: "No recommendations found" + no_sets_recommended: "There are no recommended ontology sets for the provided input. Please try the 'Ontologies' output." + text_length_limit: "Please use less than 500 words. If you need to annotate longer pieces of text, you can use the recommendation web service." - home: - index: - find_ontology_placeholder: Start typing ontology name, then choose from list - query_placeholder: Enter a class, e.g. Melanoma - tagline: the world's most comprehensive repository of biomedical ontologies - title: Welcome to the %{organization} - welcome: Welcome to %{site}, - help: - welcome: Welcome to the National Center for Biomedical Ontology’s %{site}. %{site} is a web-based application for accessing and sharing biomedical ontologies. - getting_started: > - %{site} allows users to browse, upload, download, search, comment on, and create mappings for ontologies. - browse: > - Users can browse and explore individual ontologies by navigating either a tree structure or an animated graphical view. Users can also view mappings and - ontology metadata, and download ontologies. Additionally, users who are signed in may submit a new ontology to the library. - rest_examples_html: View documentation and examples of the %{site} REST API. - announce_list_html: > - To receive notices of new releases or site outages, please subscribe to the - bioontology-support list. + mappings: + title: "Correspondences" + upload_mappings: "Upload mappings" + mappings_bulk_load: "Mapping Bulk Load" + intro: "Browse mappings between classes of different ontologies" + no_mappings_available: "No mappings available" + loading_mappings: "Loading mappings..." + find_mappings: "Find mappings of a class/concept" + view_mappings_help: "View mappings help" + select_class: "Start typing to select a class" + select_ontologies: "Start typing to select ontologies or leave blank to use all ontologies" + select_semantic_types: "Select UMLS semantic types" + select_semantic_types_help: "Start typing to select UMLS semantic types or leave blank to use all types" + select_semantic_groups: "Select UMLS semantic groups" + select_semantic_groups_help: "Start typing to select UMLS semantic groups or leave blank to use all groups" + include_ancestors_up_to_level: "Include ancestors up to level" + include_score: "Include score" annotator: - index: - intro: Get annotations for biomedical text with classes from the ontologies - annotatorplus_html: Check out AnnotatorPlus beta; a new version of the Annotator with added support for negation, and more! - fast_context: - tooltip: "Enable FastContext to detect : if a concept has been negated (affirmed, negated), who experienced the found concept (patient, other), when the annotated concept occurred (recent, historical, hypothetical), and/or if the annotated concept is uncertain (certain, uncertain)." - lemmatize: - tooltip: "Enable Lemmatize to lemmatize the submitted text and use a lemmatized dictionary for the annotations" - sample_text: Melanoma is a malignant tumor of melanocytes which are found predominantly in skin but also in the bowel and the eye. + title: "Annotator" + get_annotator: "Get annotations" + filters: + match_longest_only: "Match longest only" + match_partial_words: "Recognize partial words" + include_mappings: "Include Mappings" + exclude_numbers: "Exclude Numbers" + exclude_synonyms: "Exclude synonyms" + max_hierarchy_level: "Include ancestors up to level" + score: "Include score" + score_help: "Score annotations following previous NCBO 2009 measure (old) or Score annotations following C-Value measure (cvalue) or Score annotations following C-Value measure with hierarchy expansion (cvalueh)" + score_threshold: "Filter by score threshold" + score_threshold_help: "Specify minimum score value for annotations" + confidence_threshold: "Filter Confidence Threshold" + confidence_threshold_help: "Specify the minimum position in the score distribution (between 1 and 100)" + recognizer recognizer: "entity recognition tool" + start_typing_to_select: "Start typing to select %{type} or leave blank to use all" + select: "Select %{name}" + enter_or_paste_text: "Enter or paste text to annotate" + fast_context: "FastContext" + lemmatize: "Lemmatize" + annotations_result: "Annotations" + results_filtered_by: "Results are filtered by" - nbco_annotatosplus: - index: - intro: > - The NCBO Annotator+ is a proxy calling the NCBO Annotator Web service on the NCBO BioPortal. -

    - Tchechmedjiev, A., Abdaoui, A., Emonet, V., Melzi, S., Jonnagaddala, J., & Jonquet, C. (2018). Enhanced functionalities for annotating and indexing clinical text with the NCBO Annotator+. Bioinformatics, 34(11), 1962-1965. -

    - If using the API, please provide a valid NCBO BioPortal apikey and hit the service at http://services.bioportal.lirmm.fr/ncbo_annotatorplus
    - Text submitted to the NCBO Annotator+ must be in English. - sample_text: Melanoma is a malignant tumor of melanocytes which are found predominantly in skin but also in the bowel and the eye. + umls: + semantic_types: "UMLS Semantic Types" + semantic_groups: "UMLS Semantic Groups" + index: + intro: Get annotations for biomedical text with ontology classes + annotatorplus_html: Check out the beta version of AnnotatorPlus; a new version of the Annotator with added support for negation, and more! + fast_context: + tooltip: "Enable FastContext to detect: if a concept was denied (affirmed, denied), who experienced the found concept (patient, other), when the annotated concept occurred (recent, historical, hypothetical), and/ or if the annotated concept is uncertain (certain, uncertain)." + lemmatize: + tooltip: "Enable Lemmatize to lemmatize submitted text and use a lemmatized dictionary for annotations" + sample_text: Melanoma is a malignant tumor of melanocytes found mainly in the skin but also in the intestine and the eye. - recommender: - intro: Get recommendations for the most relevant ontologies based on an excerpt from a biomedical text or a list of keywords + layout: + header: + browse: "Browse" + search: "Search" + mappings: "Mappings" + recommend: "Recommend" + annotator: "Annotator" + ncbo_annotator_plus: "NCBO Annotator+" + projects: "Projects" + landscape: "Landscape" + login: "Login" + account_setting: "Account Settings" + submit_feedback: "Send Feedback" + help: "Help" + release_notes: "Release Notes" + publications: "Publications" + footer: + products: "Products" + copyright_html: Copyright © 2005-2022, Leland Stanford Junior University Board of Trustees. All rights reserved. + grant_html: > + %{site} is currently being developed as part of the ANR D2KAB project (ANR-18-CE23-0017). It receives or has also received support from the ANR SIFR project (ANR-12-JS02-0010), European Union Project H2020-MSCA SIFRm (N° 701771), the Labex NUMEV (ANR-10-LABX-20), the Montpellier IBC project (ANR-11 -BINF0002) , the Agro Labex (ANR-10-LABX-0001) as well than the University of Montpellier and the CNRS. + notes: + license_contact: > + For more information, email support@ontoportal.org or + visit https://ontoportal.org/licensing. + license_obtain: > + If you are the owner of this OntoPortal installation, you can visit + https://license.ontoportal.org to obtain a license. + license_expired: > + We're sorry, but the license for this OntoPortal installation has expired. If you are the owner of this OntoPortal installation, + please visit https://license.ontoportal.org to renew your license. + license_trial: + one: This OntoPortal appliance installation is a trial license, which will expire in 1 day. + other: This OntoPortal appliance installation is a trial license, which will expire in %{count} days. + # Other - search: - index: - intro: Search for a class in multiple ontologies - search_keywords_placeholder: Enter a class, e.g. Melanoma - categories_placeholder: Start typing to select categories or leave blank to use all - property_definition: Named association between two entities. Examples are "definition" (a relation between a class and some text) and "part-of" (a relation between two classes). - obsolete_definition: > - A class that the authors of the ontology have flagged as being obsolete and which they recommend that people not use. These classes - are often left in ontologies (rather than removing them entirely) so that existing systems that depend on them will continue to function. + about: > +
    +

    Summary

    +

    + Many vocabularies and ontologies are produced to represent and annotate agronomic data. It is therefore necessary to have a common platform to identify them, host them and use them in agro-informatics applications. The AgroPortal project aims to provide a repository of reference ontologies for agronomy, by reusing the NCBO BioPortal technology. The scientific results and the experience of the biomedical field are thus exploited and transposed in the field of agronomy, including plants, food, the environment and possibly animal sciences. We propose an ontology portal that offers ontology hosting, search, versioning, visualization, commenting, recommendation, allows semantic annotation, as well as storing and exploiting alignments of ontologies. All this in an infrastructure fully compliant with the Semantic Web. The AgroPortal project pays particular attention to meeting the requirements of the agronomic community in terms of ontology formats (e.g. SKOS, trait dictionaries) or supported functionalities. The AgroPortal project is based on five agronomic use cases that participate in the design and orientation of the platform. AgroPortal already offers a robust and stable reference repository, of great value for the field of agronomy. +

    +

    Use cases

    + +
    +

    New Features

    +

    + See the release-notes +

    +
    +

    Partners

    +

    The National Center for Biomedical Ontology (NCBO), the Research Institute for Development (IRD), Research Data Alliance (RDA), + Bioversity International, Food & Agriculture Organization (FAO), Global Open Data for Agriculture & Nutrition (Godan Action), National Institute for Agronomic Research (INRA)

    +

    thanks

    +

    The AgroPortail is partly produced as part of the Semantic Indexing of French Biomedical Resources project (SIFR) + who have received funding from the EU H2020 research and innovation program under Marie Sklodowska-Curie (grant 701771) + and the National Research Agency (ANR-12-JS02-01001 grant), Labex NUMEV (ANR-10-LABX-20 grant), + the Institute of Computational Biology of Montpellier (grant ANR-11-BINF-0002) as well as by the University of Montpellier and the CNRS. + We also thank the National Center of Biomedical Ontologies for their help and the time spent with us in the deployment of the AgroPortail.

    +

    Team

    + To contact us: firstname.lastname@lirmm.fr +
      +
    • Clément Jonquet, researcher at LIRMM (Univ. of Montpellier, France), principal investigator of the AgroPortal project
    • +
    • Anne Toulet, researcher at LIRMM (Univ. of Montpellier, France)
    • +
    • Vincent Emonet, engineer at LIRMM (Univ. of Montpellier, France)
    • +
    +
    - projects: - index: - intro: Browse a selection of projects that use %{site} resources + activaterecord: + errors: + models: + license: + attributes: + encrypted_key: + invalid_license_key: is an invalid license key + no_appliance_id_for_comparison: Could not be validated. Unable to retrieve virtual appliance ID. + appliance_id_mismatch: is an appliance id mismatch + admin: + licenses: + create: + success: License renewed successfully! + + date: + formats: + year_month_day_concise: "%Y-%m-%d" # 2017-03-01 + month_day_year: "%b %-d, %Y" # Mar 1, 2017 + monthfull_day_year: "%B %-d, %Y" # March 1, 2017 + ontologies: - self: "Ontologies" - intro: Browse the library of ontologies + self: "Ontologies" + loading: Loading ontologies + intro: Browse the Ontology Library + please_wait: Please wait.. + browse: Explore + welcome_admin: Welcome admin + admin_help: This color indicates features reserved for administrators + debug_info: Debug Info + submit_new_ontology: Submit a new ontology + entry_type: Entry Type + uploaded_in_the_last: Uploaded in the last concepts: - request_term: - new_term_instructions: > -

    This ontology integrates with OntoloBridge, allowing community users to suggest additions to the public ontology. Complete the template below to submit a term request directly to the ontology maintainer.

    -
    -

    Term Label (required)
    Suggested term name. If a term can be described with multiple synonyms, only list the preferred name here.

    -
    -
    -

    Term description (required)
    A brief definition, description, or usage of your suggested term. Additional term synonyms may be listed in this section.

    -
    -
    -

    Superclass (required)
    The parent term of the suggested term. The parent term should be an existing entry of the current ontology. The superclass can be selected directly from Bioportal's Classes tree viewer.

    -
    -
    -

    References (optional)
    Provide evidence for the existence of the requested term such as Pubmed IDs of papers or links to other resources that describe the term.

    -
    -
    -

    Justification (optional)
    Provide any additional information about the requested term here.

    -
    + request_term: + new_term_instructions: > +

    This ontology integrates with OntoloBridge, allowing community users to suggest additions to the public ontology. Complete the template below to submit a term request directly to the Ontology Manager.

    +
    +

    Term label (required)
    Suggested term name. If a term can be described with more than one synonym, enter only the preferred name here.

    +
    +
    +

    Term Description (required)
    A brief definition, description, or usage of the suggested term. Synonyms of additional terms may be listed in this section.

    +
    +
    +

    Superclass (required)
    The parent term of the suggested term. The parent term must be an existing entry in the current ontology. The superclass can be selected directly from the Bioportal class tree.

    +
    +
    +

    References (optional)
    Provide evidence that the requested term exists, such as Pubmed IDs of articles or links to other resources describing the term.

    +
    +
    +

    Justification (optional)
    Provide here any additional information about the requested term.

    +
    + + # General - mappings: - title: "Mappings" - upload_mappings: "Upload Mappings" - mappings_bulk_load: "Mappings Bulk Load" - intro: Browse mappings between classes in different ontologies + showing: Display + of: of + sort: Sort + popular: Popular + name: Name + classes_count: Number of classes + instances_concepts_count: Number of instances/concepts + Notes: Notes + upload_date: Upload date + release_date: Release date + fair_score: FAIR score + search_rank: Search Rank + no_matches: No matches! + uploaded: Uploaded + view_of: View of + view: View + summary_only: Summary only + groups: Groups + categories: Categories + admins: Administrators + status: Status + no_submissions_available: No submissions available + classes: classes + + category: Category + group: Group + size: size + ontology_content: Ontology content + natural_language: Natural language + formality_levels: Formality levels + is_of_type: Is of type + missing_status: Missing Status + types: Types + artifacts: Artifacts + formats: formats + selected_ontologies: Selected ontologies + all: "All" + none: "none" + keywords: "Keywords" + keywords_separated_by_commas: "Keywords separated by commas" + see_details: "See details" + view_fair_scores_definitions: "View fair scores definitions" + get_json_version: "Get the json version" + select_ontologies: "Start typing to select ontologies or leave blank to use them all" + clear_selection: "Clear Selection" + select_from_list: "Select from list" + more: "More" + statistics: "Statistics" + average: "Average" + min: "Min" + max: "Max" + median: "Median" + slices: "Slices" + help: "Help" + or: "Or" + show_advanced_options: "Show advanced options" + insert_sample_text: "Insert sample text" + class: "Class" + filter: "Filter" + ontology: "Ontology" + type: "Type" + context: "Context" + umls_sem_type: "UMLS Sem Type" + matched_ontology: "matched ontology" + matched_class: "Matched class" + score: "Score" + negation: "negation" + experience: "Experience" + temporality: "Temporality" + certainty: "Certainty" + format_results: "Format results as " + reproduce_results: "Reproduce these results using the " + additional_parameters: "Additional Parameters Explained at " + input: "Input" + text: "Text" + output: "Output" + ontology_sets: "Ontology sets" + insert_sample_input: "Insert sample input" + weights_configuration: "Weights Configuration" + coverage: "Coverage" + accept: "Accept" + knowledge_detail: "Knowledge Detail" + specialization: "Specialization" + max_ontologies_per_set: "Maximum number of ontologies per set" + paste_input_text: "Paste a paragraph of text or keywords to use in calculating ontology recommendations" + get_recommendations: "Get recommendations" + select_ontologies_list: "Select ontologies" \ No newline at end of file From ecd4e50adad1cd8fcf0672be23ae7ec68f6e8f39 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Sat, 22 Apr 2023 16:19:49 +0200 Subject: [PATCH 081/533] wip (ontology/name page) --- .../ontologies/_additional_metadata.html.haml | 2 +- .../ontologies/sections/_metadata.html.haml | 82 +++++++++---------- config/locales/fr.yml | 47 +++++++++++ 3 files changed, 89 insertions(+), 42 deletions(-) diff --git a/app/views/ontologies/_additional_metadata.html.haml b/app/views/ontologies/_additional_metadata.html.haml index dab2314de..ed48690b5 100644 --- a/app/views/ontologies/_additional_metadata.html.haml +++ b/app/views/ontologies/_additional_metadata.html.haml @@ -1,6 +1,6 @@ -# Additional Metadata pane %section.ont-metadata-card.ont-additional-metadata-card %header.pb-2.font-weight-bold - Additional Metadata + = t('ontology_details.metadata.additional_metadata') %table.table.table-sm = raw additional_metadata(@submission_latest) unless @submission_latest.nil? diff --git a/app/views/ontologies/sections/_metadata.html.haml b/app/views/ontologies/sections/_metadata.html.haml index 46c942e61..a046a3f62 100644 --- a/app/views/ontologies/sections/_metadata.html.haml +++ b/app/views/ontologies/sections/_metadata.html.haml @@ -2,21 +2,21 @@ %div.ont-metadata -# Details pane %section.ont-metadata-card.ont-details-card - %header.pb-2.font-weight-bold Details + %header.pb-2.font-weight-bold= t('ontology_details.metadata.details') %table.table.table-sm %tr - %td Acronym + %td= t('ontology_details.metadata.acronym') %td= @ontology.acronym %tr - %td Visibility + %td= t('ontology_details.metadata.visibility') %td= strip_links(visibility_link(@ontology)) - if @ontology.viewing_restricted? %tr - %td Viewing restriction + %td= t('ontology_details.metadata.viewing_restriction') %td= @ontology.viewingRestriction.capitalize - unless @ontology.viewOf.nil? %tr - %td View of ontology + %td= t('ontology_details.metadata.view_of_ontology') %td - ont_parent_acronym = @ontology.viewOf.split('/').last - if $PURL_ENABLED @@ -26,32 +26,32 @@ = link_to(ont_parent_acronym, ont_url) - unless @submission_latest.nil? %tr - %td Description + %td= t('ontology_details.metadata.description') %td= sanitize(@submission_latest.description) %tr - %td Status + %td= t('ontology_details.metadata.status') %td= @submission_latest.status.capitalize unless @submission_latest.status.nil? %tr - %td Format + %td= t('ontology_details.metadata.format') %td= @submission_latest.hasOntologyLanguage %tr - %td Contact + %td= t('ontology_details.metadata.contact') %td= raw @submission_latest.contact.map {|c| [c.name, c.email].join(", ") if c.member?(:name) && c.member?(:email)}.join("
    ") - categories_hash = LinkedData::Client::Models::Category.all_to_hash - categories = @ontology.hasDomain - unless categories.empty? %tr - %td Categories + %td= t('ontology_details.metadata.categories') %td= categories.map {|c| categories_hash[c].name}.sort.join(", ") - groups_hash = LinkedData::Client::Models::Group.all_to_hash - groups = @ontology.group - unless groups.empty? %tr - %td Groups + %td= t('ontology_details.metadata.groups') %td= groups.map {|g| groups_hash[g].name}.sort.join(", ") - if @ontology.admin?(session[:user]) %tr - %td Pull URL + %td= t('ontology_details.metadata.pull_url') %td = link_to @submission_latest.pullLocation, @submission_latest.pullLocation = raw additional_details @@ -61,12 +61,12 @@ -# Submissions pane %section.ont-metadata-card.ont-subs-card %div.ont-section-toolbar - %header.pb-2.font-weight-bold Submissions + %header.pb-2.font-weight-bold= t('ontology_details.metadata.submissions') - if @ontology.admin?(session[:user]) - = link_to(new_ontology_submission_path(@ontology.acronym), "aria-label": "Add submission", title: "Add submission") do + = link_to(new_ontology_submission_path(@ontology.acronym), "aria-label": t('ontology_details.metadata.add_submission'), title: t('ontology_details.metadata.add_submission')) do %i.fas.fa-lg.fa-plus-circle{"aria-hidden": "true", style: "margin-left: 0.75rem;"} - unless (@submission_latest.nil? || (@submission_latest.respond_to?(:status) && @submission_latest.status == 404)) - = link_to(edit_ontology_submission_path(@ontology.acronym, @submission_latest.submissionId), "aria-label": "Edit latest submission", title: "Edit latest submission") do + = link_to(edit_ontology_submission_path(@ontology.acronym, @submission_latest.submissionId), "aria-label": t('ontology_details.metadata.edit_latest_submission'), title: t('ontology_details.metadata.edit_latest_submission')) do %i.fas.fa-user-edit{"aria-hidden": "true", style: "margin-left: 0.5rem;"} = render TurboFrameComponent.new(id: 'ontology_submissions', src: ontology_submissions_path(@ontology.acronym)) @@ -75,17 +75,17 @@ - unless @ontology.view? %section.ont-metadata-card.ont-views-card %div.ont-section-toolbar - %header.pb-2.font-weight-bold= "Views of #{@ontology.acronym}" + %header.pb-2.font-weight-bold= "#{t('ontology_details.metadata.views_of')} #{@ontology.acronym}" - ont_id_esc = CGI.escape(@ontology.id) -# TODO: I don't think we should have brackets in the URL parameters. - if session[:user].nil? - %a{href: "/login?redirect=#{escape("/ontologies/new?ontology[viewOf]=#{ont_id_esc}")}", "aria-label": "Create new view", title: "Create new view"} + %a{href: "/login?redirect=#{escape("/ontologies/new?ontology[viewOf]=#{ont_id_esc}")}", "aria-label": t('ontology_details.metadata.create_new_view'), title: t('ontology_details.metadata.create_new_view')} %i.fas.fa-lg.fa-plus-circle{"aria-hidden": "true", style: "margin-left: 0.5rem;"} - else %a{href: "/ontologies/new?ontology[viewOf]=#{ont_id_esc}"} %i.fas.fa-lg.fa-plus-circle{"aria-hidden": "true", style: "margin-left: 0.5rem;"} - if @views.empty? - %p.font-italic= "No views of #{@ontology.acronym} available" + %p.font-italic= t('ontology_details.metadata.no_views_of', name: @ontology.acronym) - else %div.border-top %dl @@ -98,20 +98,20 @@ -# Misc links pane %section.ont-metadata-card.ont-links-card %div.ont-section-toolbar - %header.pb-2.font-weight-bold Links - %a{:href => "#{(@submission_latest || @ontology).id}?display=all", :target => '_blank', :class => "btn btn-primary"} Go to the REST API JSON entry + %header.pb-2.font-weight-bold= t('ontology_details.metadata.links') + %a{:href => "#{(@submission_latest || @ontology).id}?display=all", :target => '_blank', :class => "btn btn-primary"}= t('ontology_details.metadata.go_to_rest_api_json_entry') -# Metadata links pane %section.ont-metadata-card.ont-metadatalinks-card %div.ont-section-toolbar - %header.pb-2.font-weight-bold Get my metadata back + %header.pb-2.font-weight-bold= t('ontology_details.metadata.get_my_metadata_back') %div - unless @submission_latest.nil? %div{data:{controller: 'metadata-downloader'}} =javascript_include_tag "jsonld" - %button{:id => "getMetadataBackNquadsBtn", :class => "btn btn-primary", 'data-action': 'metadata-downloader#downloadNQuads'} N-Triple - %button{:id => "getMetadataBackJsonldBtn", :class => "btn btn-primary", 'data-action': 'metadata-downloader#downloadJsonLd'} Json-LD - %button{:id => "getMetadataBackXmlBtn", :class => "btn btn-primary", 'data-action': 'metadata-downloader#downloadXML'} RDF/XML + %button{:id => "getMetadataBackNquadsBtn", :class => "btn btn-primary", 'data-action': 'metadata-downloader#downloadNQuads'}= t('ontology_details.metadata.n_triple') + %button{:id => "getMetadataBackJsonldBtn", :class => "btn btn-primary", 'data-action': 'metadata-downloader#downloadJsonLd'}= t('ontology_details.metadata.json_ld') + %button{:id => "getMetadataBackXmlBtn", :class => "btn btn-primary", 'data-action': 'metadata-downloader#downloadXML'}= t('ontology_details.metadata.rdf_xml') -# Listener in bp_ontology_viewer.js.erb -# Fair score pane -# TODO temporary hide fairness_service for AGROVOC after there demand @@ -126,46 +126,46 @@ -# Metrics pane %section.ont-metadata-card.ont-metrics-card %div.ont-section-toolbar - %header.pb-2.font-weight-bold Metrics - = link_to(Rails.configuration.settings.links[:metrics], target: "_blank", "aria-label": "View individual metrics definitions", title: "View individual metrics definitions") do + %header.pb-2.font-weight-bold= t('ontology_details.metadata.metrics') + = link_to(Rails.configuration.settings.links[:metrics], target: "_blank", "aria-label": t('ontology_details.metadata.view_individual_metrics_definitions'), title: t('ontology_details.metadata.view_individual_metrics_definitions')) do %i.fas.fa-lg.fa-question-circle{"aria-hidden": "true", style: "margin-left: 0.5rem"} - if @metrics.nil? || (@metrics.is_a?(Array) && @metrics.empty?) || (@metrics.respond_to?(:status) && @metrics.status == 404) - %p.font-italic= "We have not yet calculated metrics for #{@ontology.acronym}" + %p.font-italic= "#{t('ontology_details.metadata.metrics_not_calculated_yet')} #{@ontology.acronym}" - else %table.table.table-sm %tr - %td Classes + %td= t('ontology_details.metadata.classes') %td{style: "text-align: right"}= number_with_delimiter(@metrics.classes) %tr - %td Individuals + %td= t('ontology_details.metadata.individuals') %td= number_with_delimiter(@metrics.individuals) %tr - %td Properties + %td= t('ontology_details.metadata.properties') %td= number_with_delimiter(@metrics.properties) %tr - %td Maximum depth + %td= t('ontology_details.metadata.max_depth') %td= number_with_delimiter(@metrics.maxDepth) %tr - %td Maximum number of children + %td= t('ontology_details.metadata.max_children') %td= number_with_delimiter(@metrics.maxChildCount) %tr - %td Average number of children + %td= t('ontology_details.metadata.avg_children') %td= number_with_delimiter(@metrics.averageChildCount) %tr - %td Classes with a single child + %td= t('ontology_details.metadata.single_child_classes') %td= number_with_delimiter(@metrics.classesWithOneChild) %tr - %td Classes with more than 25 children + %td= t('ontology_details.metadata.many_children_classes') %td= number_with_delimiter(@metrics.classesWithMoreThan25Children) %tr - %td Classes with no definition + %td= t('ontology_details.metadata.no_definition_classes') %td= number_with_delimiter(@metrics.classesWithNoDefinition) -# Visits pane %section.ont-metadata-card.ont-analytics-card %div.ont-section-toolbar - %header.pb-2.font-weight-bold Visits + %header.pb-2.font-weight-bold= t('ontology_details.metadata.visits') - if visits_data(@ontology) - = link_to(@ontology.links["analytics"] + "?apikey=#{get_apikey}&format=csv", "aria-label": "Download as CSV", title: "Download as CSV") do + = link_to(@ontology.links["analytics"] + "?apikey=#{get_apikey}&format=csv", "aria-label": t('ontology_details.metadata.download_as_csv'), title: t('ontology_details.metadata.download_as_csv')) do %i.fas.fa-lg.fa-download{"aria-hidden": "true", style: "margin-left: 0.5rem"} = render partial: "visits" @@ -177,11 +177,11 @@ -# Projects pane %section.ont-metadata-card.ont-projects-card %div.ont-section-toolbar - %header.pb-2.font-weight-bold= "Projects using #{@ontology.acronym}" - = link_to(new_project_path(), "aria-label": "Create new project", title: "Create new project") do + %header.pb-2.font-weight-bold= "#{t('ontology_details.metadata.projects_using')} #{@ontology.acronym}" + = link_to(new_project_path(), "aria-label": t('ontology_details.metadata.create_new_project'), title: t('ontology_details.metadata.create_new_project')) do %i.fas.fa-lg.fa-plus-circle{"aria-hidden": "true", style: "margin-left: 0.5rem"} - if @projects.empty? - %p.font-italic= "No projects using #{@ontology.acronym}" + %p.font-italic= "#{t('ontology_details.metadata.no_projects_using')} #{@ontology.acronym}" - else %div.border-top - for project in @projects diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 4e60754ee..afbc1433a 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -280,6 +280,53 @@ fr: tooltip: "Activez Lemmatize pour lemmatiser le texte soumis et utiliser un dictionnaire lemmatisé pour les annotations" sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. + ontology_details: + metadata: + details: "Détails" + acronym: "Acronym" + visibility: "Visibilité" + viewing_restriction: "Restriction de visualisation" + view_of_ontology: "Vue de l'ontologie" + description: "Description" + status: "Statut" + format: "Format" + contact: "Contact" + categories: "Catégories" + groups: "Groupes" + pull_url: "URL de pull" + submissions: "Soumissions" + links: "Liens" + add_submission: "Ajouter une soumission" + views_of: "Vues de" + create_new_view: "Créer une nouvelle vue" + no_views_of: "Aucune vue de %{name} disponible" + go_to_rest_api_json_entry: "Accéder à l'entrée JSON de l'API REST" + get_my_metadata_back: "Récupérer mes métadonnées" + n_triple: "N-Triple" + json_ld: "JSON-LD" + rdf_xml: "RDF/XML" + view_individual_metrics_definitions: "Voir les définitions de métriques individuelles" + metrics: "Métriques" + metrics_not_calculated_yet: "Nous n'avons pas encore calculé de métriques pour" + classes: "Classes" + individuals: "Individus" + properties: "Propriétés" + max_depth: "Profondeur maximale" + max_children: "Nombre maximum d'enfants" + avg_children: "Nombre moyen d'enfants" + single_child_classes: "Classes avec un seul enfant" + many_children_classes: "Classes avec plus de 25 enfants" + no_definition_classes: "Classes sans définition" + visits: "Visites" + download_as_csv: "Télécharger en CSV" + projects_using: "Projets utilisant" + no_projects_using: "Aucun projet n'utilise" + create_new_project: "Créer un nouveau projet" + additional_metadata: "Métadonnées supplémentaires" + + + + layout: header: browse: "Parcourir" From 70183a85feaf66ee8c348f1f9b27f60eb4aa2a8d Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Sat, 22 Apr 2023 16:21:57 +0200 Subject: [PATCH 082/533] Update en.yml --- config/locales/en.yml | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index 254fa1fd6..9eb880e33 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -270,6 +270,51 @@ en: tooltip: "Enable Lemmatize to lemmatize submitted text and use a lemmatized dictionary for annotations" sample_text: Melanoma is a malignant tumor of melanocytes found mainly in the skin but also in the intestine and the eye. + + ontology_details: + metadata: + details: "Details" + acronym: "Acronym" + visibility: "Visibility" + viewing_restriction: "Viewing Restriction" + view_of_ontology: "View of ontology" + description: "Description" + status: "Status" + format: "Format" + contact: "Contact" + categories: "Categories" + groups: "Groups" + pull_url: "Pull URL" + submissions: "Submissions" + links: "Links" + add_submission: "Add Submission" + views_of: "Views of" + create_new_view: "Create a new view" + no_views_of: "No views of %{name} available" + go_to_rest_api_json_entry: "Go to REST API JSON Entry" + get_my_metadata_back: "Get my metadata back" + n_triple: "N-Triple" + json_ld: "JSON-LD" + rdf_xml: "RDF/XML" + view_individual_metrics_definitions: "View individual metrics definitions" + metrics: "Metrics" + metrics_not_calculated_yet: "We have not yet calculated metrics for" + classes: "Classes" + individuals: "Individuals" + properties: "Properties" + max_depth: "Maximum depth" + max_children: "Maximum number of children" + avg_children: "Average number of children" + single_child_classes: "Classes with a single child" + many_children_classes: "Classes with more than 25 children" + no_definition_classes: "Classes without definition" + visits: "Visits" + download_as_csv: "Download as CSV" + projects_using: "Projects Using" + no_projects_using: "No projects are using" + create_new_project: "Create a new project" + additional_metadata: "Additional Metadata" + layout: header: browse: "Browse" From a90a85a7c6ead4dade5b8443ab5b8ec724e89007 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Sat, 22 Apr 2023 16:40:16 +0200 Subject: [PATCH 083/533] add support of multi-language --- app/components/concept_details_component.rb | 2 +- app/views/concepts/_details.html.haml | 18 +++++++++--------- config/locales/en.yml | 12 ++++++++++++ config/locales/fr.yml | 12 ++++++++++++ 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/app/components/concept_details_component.rb b/app/components/concept_details_component.rb index b9de46ffe..87520af07 100644 --- a/app/components/concept_details_component.rb +++ b/app/components/concept_details_component.rb @@ -35,7 +35,7 @@ def render_properties(properties_set, ontology_acronym, &block) end end - displayed_text = ajax_links.length > 0 ? ajax_links.join('

    ') : 'No value for the selected language.' + displayed_text = ajax_links.length > 0 ? ajax_links.join('

    ') : t('ontology_details.concept.no_value_for_selected_language') line = <<-EOS diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index 1afe377ee..f19d85dfd 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -8,20 +8,20 @@ exclude_keys: schemes_keys + label_xl_set + ['inScheme']) do |c| - c.header do %tr - %td{nowrap: ""} ID + %td{nowrap: ""}= t('ontology_details.concept.id') %td %p= @concept.id %tr - %td{nowrap: ""} Preferred Name + %td{nowrap: ""}= t('ontology_details.concept.preferred_name') %td - if @concept.prefLabel().nil? - %p No preferred name for the selected language. + %p= t('ontology_details.concept.no_preferred_name_for_selected_language') - else %p= @concept.prefLabel({:use_html => true}).html_safe - unless @concept.synonym.nil? || @concept.synonym.empty? %tr - %td{nowrap: ""} Synonyms + %td{nowrap: ""}= t('ontology_details.concept.synonyms') %td - for synonym in @concept.synonym %p= synonym @@ -31,31 +31,31 @@ = remove_synonym_button - unless @concept.definition.nil? || @concept.definition.empty? %tr - %td{nowrap: ""} Definitions + %td{nowrap: ""}= t('ontology_details.concept.definitions') %td %p= @concept.definition.join(" ") - if @concept.obsolete? %tr - %td{nowrap: ""} Obsolete + %td{nowrap: ""}= t('ontology_details.concept.obsolete') %td %p true - if skos? - unless @concept.memberOf.nil? || @concept.memberOf.empty? %tr - %td{nowrap: ""} Member of + %td{nowrap: ""}= t('ontology_details.concept.member_of') %td %div.my-1 - @concept.memberOf.each do |v| = raw get_link_for_collection_ajax(v, @ontology.acronym, '_blank') - unless @concept.inScheme.nil? || @concept.inScheme.empty? %tr - %td{nowrap: ""} In Schemes + %td{nowrap: ""}= t('ontology_details.concept.in_schemes') %td %div.my-1 - @concept.inScheme.each do |v| = raw get_link_for_scheme_ajax(v, @ontology.acronym, '_blank') %tr - %td{nowrap: ""} Type + %td{nowrap: ""}= t('ontology_details.concept.type') %td %p= @concept.type diff --git a/config/locales/en.yml b/config/locales/en.yml index 9eb880e33..cb5bb13a4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -314,6 +314,18 @@ en: no_projects_using: "No projects are using" create_new_project: "Create a new project" additional_metadata: "Additional Metadata" + + concept: + no_preferred_name_for_selected_language: "No preferred name for selected language." + preferred_name: "Preferred name" + id: "ID" + synonyms: "Synonyms" + definitions: "Definitions" + obsolete: "Obsolete" + member_of: "Member of" + in_schemes: "In Schemes" + type: "Type" + no_value_for_selected_language: "No value for selected language." layout: header: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index afbc1433a..7a2f032fd 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -324,6 +324,18 @@ fr: create_new_project: "Créer un nouveau projet" additional_metadata: "Métadonnées supplémentaires" + concept: + no_preferred_name_for_selected_language: "Pas de nom préféré pour la langue sélectionnée." + preferred_name: "Nom préféré" + id: "Identifiant" + synonyms: "Synonymes" + definitions: "Définitions" + obsolete: "Obsolète" + member_of: "Membre de" + in_schemes: "Dans les schémas" + type: "Type" + no_value_for_selected_language: "Pas de valeur pour la langue sélectionnée." + From d460c089a6a7fb0821ae2d40ddc848a7a12795c1 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Sun, 23 Apr 2023 15:15:43 +0200 Subject: [PATCH 084/533] add footer translation feature --- config/locales/en.yml | 505 ++++++++++++++++++++++-------------------- config/locales/fr.yml | 27 ++- 2 files changed, 278 insertions(+), 254 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 9eb880e33..9626a94a0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,5 +1,4 @@ en: - nbco_annotatosplus: score_help: "Score annotations following previous NCBO 2009 measure (old) or Score annotations following C-Value measure (cvalue) or Score annotations following C-Value measure with hierarchy expansion (cvalueh)" start_typing_to_select: "Start typing to select %{type} or leave blank to use all" @@ -67,7 +66,6 @@ en: confidence_threshold_help: "Specify the minimum position in the scores distribution (between 1 and 100)" entity_recognizer: "entity recognition tool" - index: title: "NCBO Annotator +" intro: > @@ -125,7 +123,6 @@ en: index: intro: "Browse a selection of projects that use %{site} resources" - landscape: title: "%{site} Landscape" intro: Visualize data retrieved from ontologies stored in the portal @@ -166,39 +163,39 @@ en: size: Size home: - find_ontology: "Find an ontology" - search_class: "Search Class" - browse_by_group: "Browse by Group" - browse_ontologies: "Browse ontologies" - comprehensive_repository: "the most comprehensive repository of biomedical ontologies in the world" - advanced_search: "Advanced Search" - ontology_visits: "Ontology visits" - fair_scores: "FAIR Scores" - clear_selection: "Clear Selection" - latest_notes: "Latest Notes" - ontologies: "Ontologies" - classes: "Classes" - individuals: "People" - projects: "Projects" - users: "Users" - no_recent_notes: "No recent notes were submitted" - index: - find_ontology_placeholder: Start typing the ontology name, then choose from - query_placeholder: Enter a class, eg Melanoma - tagline: the world's most comprehensive repository of biomedical ontologies - title: Welcome to the %{organization} - welcome: Welcome to the %{site}, - help: - welcome: Welcome to the %{site} of the National Center for Biomedical Ontology. %{site} is a web application for accessing and sharing biomedical ontologies. - getting_started: > - %{site} allows users to browse, upload, download, search, comment, and create mappings for ontologies. - browse: > - Users can browse and explore individual ontologies by navigating either in a tree structure or in an animated graphical view. Users can also view mappings and - ontology metadata and ontology download. Additionally, logged in users can submit a new ontology to the library. - rest_examples_html: View documentation and examples for the %{site} REST API. - announce_list_html: > - To receive notices of new releases or site outages, please subscribe to - bioontology support list. + find_ontology: "Find an ontology" + search_class: "Search Class" + browse_by_group: "Browse by Group" + browse_ontologies: "Browse ontologies" + comprehensive_repository: "the most comprehensive repository of biomedical ontologies in the world" + advanced_search: "Advanced Search" + ontology_visits: "Ontology visits" + fair_scores: "FAIR Scores" + clear_selection: "Clear Selection" + latest_notes: "Latest Notes" + ontologies: "Ontologies" + classes: "Classes" + individuals: "People" + projects: "Projects" + users: "Users" + no_recent_notes: "No recent notes were submitted" + index: + find_ontology_placeholder: Start typing the ontology name, then choose from + query_placeholder: Enter a class, eg Melanoma + tagline: the world's most comprehensive repository of biomedical ontologies + title: Welcome to the %{organization} + welcome: Welcome to the %{site}, + help: + welcome: Welcome to the %{site} of the National Center for Biomedical Ontology. %{site} is a web application for accessing and sharing biomedical ontologies. + getting_started: > + %{site} allows users to browse, upload, download, search, comment, and create mappings for ontologies. + browse: > + Users can browse and explore individual ontologies by navigating either in a tree structure or in an animated graphical view. Users can also view mappings and + ontology metadata and ontology download. Additionally, logged in users can submit a new ontology to the library. + rest_examples_html: View documentation and examples for the %{site} REST API. + announce_list_html: > + To receive notices of new releases or site outages, please subscribe to + bioontology support list. recommend: intro: Get recommendations for the most relevant ontologies from an excerpt of a biomedical text or a list of keywords @@ -216,235 +213,251 @@ en: text_length_limit: "Please use less than 500 words. If you need to annotate longer pieces of text, you can use the recommendation web service." mappings: - title: "Correspondences" - upload_mappings: "Upload mappings" - mappings_bulk_load: "Mapping Bulk Load" - intro: "Browse mappings between classes of different ontologies" - no_mappings_available: "No mappings available" - loading_mappings: "Loading mappings..." - find_mappings: "Find mappings of a class/concept" - view_mappings_help: "View mappings help" - select_class: "Start typing to select a class" - select_ontologies: "Start typing to select ontologies or leave blank to use all ontologies" - select_semantic_types: "Select UMLS semantic types" - select_semantic_types_help: "Start typing to select UMLS semantic types or leave blank to use all types" - select_semantic_groups: "Select UMLS semantic groups" - select_semantic_groups_help: "Start typing to select UMLS semantic groups or leave blank to use all groups" - include_ancestors_up_to_level: "Include ancestors up to level" - include_score: "Include score" + title: "Correspondences" + upload_mappings: "Upload mappings" + mappings_bulk_load: "Mapping Bulk Load" + intro: "Browse mappings between classes of different ontologies" + no_mappings_available: "No mappings available" + loading_mappings: "Loading mappings..." + find_mappings: "Find mappings of a class/concept" + view_mappings_help: "View mappings help" + select_class: "Start typing to select a class" + select_ontologies: "Start typing to select ontologies or leave blank to use all ontologies" + select_semantic_types: "Select UMLS semantic types" + select_semantic_types_help: "Start typing to select UMLS semantic types or leave blank to use all types" + select_semantic_groups: "Select UMLS semantic groups" + select_semantic_groups_help: "Start typing to select UMLS semantic groups or leave blank to use all groups" + include_ancestors_up_to_level: "Include ancestors up to level" + include_score: "Include score" annotator: - title: "Annotator" - get_annotator: "Get annotations" - filters: - match_longest_only: "Match longest only" - match_partial_words: "Recognize partial words" - include_mappings: "Include Mappings" - exclude_numbers: "Exclude Numbers" - exclude_synonyms: "Exclude synonyms" - max_hierarchy_level: "Include ancestors up to level" - score: "Include score" - score_help: "Score annotations following previous NCBO 2009 measure (old) or Score annotations following C-Value measure (cvalue) or Score annotations following C-Value measure with hierarchy expansion (cvalueh)" - score_threshold: "Filter by score threshold" - score_threshold_help: "Specify minimum score value for annotations" - confidence_threshold: "Filter Confidence Threshold" - confidence_threshold_help: "Specify the minimum position in the score distribution (between 1 and 100)" - recognizer recognizer: "entity recognition tool" - start_typing_to_select: "Start typing to select %{type} or leave blank to use all" - select: "Select %{name}" - enter_or_paste_text: "Enter or paste text to annotate" - fast_context: "FastContext" - lemmatize: "Lemmatize" - annotations_result: "Annotations" - results_filtered_by: "Results are filtered by" + title: "Annotator" + get_annotator: "Get annotations" + filters: + match_longest_only: "Match longest only" + match_partial_words: "Recognize partial words" + include_mappings: "Include Mappings" + exclude_numbers: "Exclude Numbers" + exclude_synonyms: "Exclude synonyms" + max_hierarchy_level: "Include ancestors up to level" + score: "Include score" + score_help: "Score annotations following previous NCBO 2009 measure (old) or Score annotations following C-Value measure (cvalue) or Score annotations following C-Value measure with hierarchy expansion (cvalueh)" + score_threshold: "Filter by score threshold" + score_threshold_help: "Specify minimum score value for annotations" + confidence_threshold: "Filter Confidence Threshold" + confidence_threshold_help: "Specify the minimum position in the score distribution (between 1 and 100)" + recognizer recognizer: "entity recognition tool" + start_typing_to_select: "Start typing to select %{type} or leave blank to use all" + select: "Select %{name}" + enter_or_paste_text: "Enter or paste text to annotate" + fast_context: "FastContext" + lemmatize: "Lemmatize" + annotations_result: "Annotations" + results_filtered_by: "Results are filtered by" - umls: - semantic_types: "UMLS Semantic Types" - semantic_groups: "UMLS Semantic Groups" - index: - intro: Get annotations for biomedical text with ontology classes - annotatorplus_html: Check out the beta version of AnnotatorPlus; a new version of the Annotator with added support for negation, and more! - fast_context: - tooltip: "Enable FastContext to detect: if a concept was denied (affirmed, denied), who experienced the found concept (patient, other), when the annotated concept occurred (recent, historical, hypothetical), and/ or if the annotated concept is uncertain (certain, uncertain)." - lemmatize: - tooltip: "Enable Lemmatize to lemmatize submitted text and use a lemmatized dictionary for annotations" - sample_text: Melanoma is a malignant tumor of melanocytes found mainly in the skin but also in the intestine and the eye. + umls: + semantic_types: "UMLS Semantic Types" + semantic_groups: "UMLS Semantic Groups" + index: + intro: Get annotations for biomedical text with ontology classes + annotatorplus_html: Check out the beta version of AnnotatorPlus; a new version of the Annotator with added support for negation, and more! + fast_context: + tooltip: "Enable FastContext to detect: if a concept was denied (affirmed, denied), who experienced the found concept (patient, other), when the annotated concept occurred (recent, historical, hypothetical), and/ or if the annotated concept is uncertain (certain, uncertain)." + lemmatize: + tooltip: "Enable Lemmatize to lemmatize submitted text and use a lemmatized dictionary for annotations" + sample_text: Melanoma is a malignant tumor of melanocytes found mainly in the skin but also in the intestine and the eye. - ontology_details: - metadata: - details: "Details" - acronym: "Acronym" - visibility: "Visibility" - viewing_restriction: "Viewing Restriction" - view_of_ontology: "View of ontology" - description: "Description" - status: "Status" - format: "Format" - contact: "Contact" - categories: "Categories" - groups: "Groups" - pull_url: "Pull URL" - submissions: "Submissions" - links: "Links" - add_submission: "Add Submission" - views_of: "Views of" - create_new_view: "Create a new view" - no_views_of: "No views of %{name} available" - go_to_rest_api_json_entry: "Go to REST API JSON Entry" - get_my_metadata_back: "Get my metadata back" - n_triple: "N-Triple" - json_ld: "JSON-LD" - rdf_xml: "RDF/XML" - view_individual_metrics_definitions: "View individual metrics definitions" - metrics: "Metrics" - metrics_not_calculated_yet: "We have not yet calculated metrics for" - classes: "Classes" - individuals: "Individuals" - properties: "Properties" - max_depth: "Maximum depth" - max_children: "Maximum number of children" - avg_children: "Average number of children" - single_child_classes: "Classes with a single child" - many_children_classes: "Classes with more than 25 children" - no_definition_classes: "Classes without definition" - visits: "Visits" - download_as_csv: "Download as CSV" - projects_using: "Projects Using" - no_projects_using: "No projects are using" - create_new_project: "Create a new project" - additional_metadata: "Additional Metadata" - + metadata: + details: "Details" + acronym: "Acronym" + visibility: "Visibility" + viewing_restriction: "Viewing Restriction" + view_of_ontology: "View of ontology" + description: "Description" + status: "Status" + format: "Format" + contact: "Contact" + categories: "Categories" + groups: "Groups" + pull_url: "Pull URL" + submissions: "Submissions" + links: "Links" + add_submission: "Add Submission" + views_of: "Views of" + create_new_view: "Create a new view" + no_views_of: "No views of %{name} available" + go_to_rest_api_json_entry: "Go to REST API JSON Entry" + get_my_metadata_back: "Get my metadata back" + n_triple: "N-Triple" + json_ld: "JSON-LD" + rdf_xml: "RDF/XML" + view_individual_metrics_definitions: "View individual metrics definitions" + metrics: "Metrics" + metrics_not_calculated_yet: "We have not yet calculated metrics for" + classes: "Classes" + individuals: "Individuals" + properties: "Properties" + max_depth: "Maximum depth" + max_children: "Maximum number of children" + avg_children: "Average number of children" + single_child_classes: "Classes with a single child" + many_children_classes: "Classes with more than 25 children" + no_definition_classes: "Classes without definition" + visits: "Visits" + download_as_csv: "Download as CSV" + projects_using: "Projects Using" + no_projects_using: "No projects are using" + create_new_project: "Create a new project" + additional_metadata: "Additional Metadata" + layout: - header: - browse: "Browse" - search: "Search" - mappings: "Mappings" - recommend: "Recommend" - annotator: "Annotator" - ncbo_annotator_plus: "NCBO Annotator+" - projects: "Projects" - landscape: "Landscape" - login: "Login" - account_setting: "Account Settings" - submit_feedback: "Send Feedback" - help: "Help" - release_notes: "Release Notes" - publications: "Publications" - footer: - products: "Products" - copyright_html: Copyright © 2005-2022, Leland Stanford Junior University Board of Trustees. All rights reserved. - grant_html: > - %{site} is currently being developed as part of the ANR D2KAB project (ANR-18-CE23-0017). It receives or has also received support from the ANR SIFR project (ANR-12-JS02-0010), European Union Project H2020-MSCA SIFRm (N° 701771), the Labex NUMEV (ANR-10-LABX-20), the Montpellier IBC project (ANR-11 -BINF0002) , the Agro Labex (ANR-10-LABX-0001) as well than the University of Montpellier and the CNRS. - notes: - license_contact: > - For more information, email support@ontoportal.org or - visit https://ontoportal.org/licensing. - license_obtain: > - If you are the owner of this OntoPortal installation, you can visit - https://license.ontoportal.org to obtain a license. - license_expired: > - We're sorry, but the license for this OntoPortal installation has expired. If you are the owner of this OntoPortal installation, - please visit https://license.ontoportal.org to renew your license. - license_trial: - one: This OntoPortal appliance installation is a trial license, which will expire in 1 day. - other: This OntoPortal appliance installation is a trial license, which will expire in %{count} days. + header: + browse: "Browse" + search: "Search" + mappings: "Mappings" + recommend: "Recommend" + annotator: "Annotator" + ncbo_annotator_plus: "NCBO Annotator+" + projects: "Projects" + landscape: "Landscape" + login: "Login" + account_setting: "Account Settings" + submit_feedback: "Send Feedback" + help: "Help" + release_notes: "Release Notes" + publications: "Publications" + footer: + products: Products + ontoportal: OntoPortal + release_notes: Release Notes + api: API + sparql: SPARQL + support: Support + contact_us: Contact Us + wiki: Wiki + documentation: Documentation + agreements: Agreements + terms: Terms + privacy_policy: Privacy Policy + cite_us: Cite Us + acknowledgments: Acknowledgments + about: About + about_us: About Us + projects: Projects + team: Team + copyright_html: Copyright © 2005-2022, Leland Stanford Junior University Board of Trustees. All rights reserved. + grant_html: > + %{site} is currently being developed as part of the ANR D2KAB project (ANR-18-CE23-0017). It receives or has also received support from the ANR SIFR project (ANR-12-JS02-0010), European Union Project H2020-MSCA SIFRm (N° 701771), the Labex NUMEV (ANR-10-LABX-20), the Montpellier IBC project (ANR-11 -BINF0002) , the Agro Labex (ANR-10-LABX-0001) as well than the University of Montpellier and the CNRS. + notes: + license_contact: > + For more information, email support@ontoportal.org or + visit https://ontoportal.org/licensing. + license_obtain: > + If you are the owner of this OntoPortal installation, you can visit + https://license.ontoportal.org to obtain a license. + license_expired: > + We're sorry, but the license for this OntoPortal installation has expired. If you are the owner of this OntoPortal installation, + please visit https://license.ontoportal.org to renew your license. + license_trial: + one: This OntoPortal appliance installation is a trial license, which will expire in 1 day. + other: This OntoPortal appliance installation is a trial license, which will expire in %{count} days. # Other about: > -

    -

    Summary

    -

    - Many vocabularies and ontologies are produced to represent and annotate agronomic data. It is therefore necessary to have a common platform to identify them, host them and use them in agro-informatics applications. The AgroPortal project aims to provide a repository of reference ontologies for agronomy, by reusing the NCBO BioPortal technology. The scientific results and the experience of the biomedical field are thus exploited and transposed in the field of agronomy, including plants, food, the environment and possibly animal sciences. We propose an ontology portal that offers ontology hosting, search, versioning, visualization, commenting, recommendation, allows semantic annotation, as well as storing and exploiting alignments of ontologies. All this in an infrastructure fully compliant with the Semantic Web. The AgroPortal project pays particular attention to meeting the requirements of the agronomic community in terms of ontology formats (e.g. SKOS, trait dictionaries) or supported functionalities. The AgroPortal project is based on five agronomic use cases that participate in the design and orientation of the platform. AgroPortal already offers a robust and stable reference repository, of great value for the field of agronomy. -

    -

    Use cases

    - -
    -

    New Features

    -

    - See the release-notes -

    -
    -

    Partners

    -

    The National Center for Biomedical Ontology (NCBO), the Research Institute for Development (IRD), Research Data Alliance (RDA), - Bioversity International, Food & Agriculture Organization (FAO), Global Open Data for Agriculture & Nutrition (Godan Action), National Institute for Agronomic Research (INRA)

    -

    thanks

    -

    The AgroPortail is partly produced as part of the Semantic Indexing of French Biomedical Resources project (SIFR) - who have received funding from the EU H2020 research and innovation program under Marie Sklodowska-Curie (grant 701771) - and the National Research Agency (ANR-12-JS02-01001 grant), Labex NUMEV (ANR-10-LABX-20 grant), - the Institute of Computational Biology of Montpellier (grant ANR-11-BINF-0002) as well as by the University of Montpellier and the CNRS. - We also thank the National Center of Biomedical Ontologies for their help and the time spent with us in the deployment of the AgroPortail.

    -

    Team

    - To contact us: firstname.lastname@lirmm.fr -
      -
    • Clément Jonquet, researcher at LIRMM (Univ. of Montpellier, France), principal investigator of the AgroPortal project
    • -
    • Anne Toulet, researcher at LIRMM (Univ. of Montpellier, France)
    • -
    • Vincent Emonet, engineer at LIRMM (Univ. of Montpellier, France)
    • -
    -
    +
    +

    Summary

    +

    + Many vocabularies and ontologies are produced to represent and annotate agronomic data. It is therefore necessary to have a common platform to identify them, host them and use them in agro-informatics applications. The AgroPortal project aims to provide a repository of reference ontologies for agronomy, by reusing the NCBO BioPortal technology. The scientific results and the experience of the biomedical field are thus exploited and transposed in the field of agronomy, including plants, food, the environment and possibly animal sciences. We propose an ontology portal that offers ontology hosting, search, versioning, visualization, commenting, recommendation, allows semantic annotation, as well as storing and exploiting alignments of ontologies. All this in an infrastructure fully compliant with the Semantic Web. The AgroPortal project pays particular attention to meeting the requirements of the agronomic community in terms of ontology formats (e.g. SKOS, trait dictionaries) or supported functionalities. The AgroPortal project is based on five agronomic use cases that participate in the design and orientation of the platform. AgroPortal already offers a robust and stable reference repository, of great value for the field of agronomy. +

    +

    Use cases

    + +
    +

    New Features

    +

    + See the release-notes +

    +
    +

    Partners

    +

    The National Center for Biomedical Ontology (NCBO), the Research Institute for Development (IRD), Research Data Alliance (RDA), + Bioversity International, Food & Agriculture Organization (FAO), Global Open Data for Agriculture & Nutrition (Godan Action), National Institute for Agronomic Research (INRA)

    +

    thanks

    +

    The AgroPortail is partly produced as part of the Semantic Indexing of French Biomedical Resources project (SIFR) + who have received funding from the EU H2020 research and innovation program under Marie Sklodowska-Curie (grant 701771) + and the National Research Agency (ANR-12-JS02-01001 grant), Labex NUMEV (ANR-10-LABX-20 grant), + the Institute of Computational Biology of Montpellier (grant ANR-11-BINF-0002) as well as by the University of Montpellier and the CNRS. + We also thank the National Center of Biomedical Ontologies for their help and the time spent with us in the deployment of the AgroPortail.

    +

    Team

    + To contact us: firstname.lastname@lirmm.fr +
      +
    • Clément Jonquet, researcher at LIRMM (Univ. of Montpellier, France), principal investigator of the AgroPortal project
    • +
    • Anne Toulet, researcher at LIRMM (Univ. of Montpellier, France)
    • +
    • Vincent Emonet, engineer at LIRMM (Univ. of Montpellier, France)
    • +
    +
    activaterecord: - errors: - models: - license: - attributes: - encrypted_key: - invalid_license_key: is an invalid license key - no_appliance_id_for_comparison: Could not be validated. Unable to retrieve virtual appliance ID. - appliance_id_mismatch: is an appliance id mismatch + errors: + models: + license: + attributes: + encrypted_key: + invalid_license_key: is an invalid license key + no_appliance_id_for_comparison: Could not be validated. Unable to retrieve virtual appliance ID. + appliance_id_mismatch: is an appliance id mismatch admin: - licenses: - create: - success: License renewed successfully! + licenses: + create: + success: License renewed successfully! date: - formats: - year_month_day_concise: "%Y-%m-%d" # 2017-03-01 - month_day_year: "%b %-d, %Y" # Mar 1, 2017 - monthfull_day_year: "%B %-d, %Y" # March 1, 2017 - + formats: + year_month_day_concise: "%Y-%m-%d" # 2017-03-01 + month_day_year: "%b %-d, %Y" # Mar 1, 2017 + monthfull_day_year: "%B %-d, %Y" # March 1, 2017 + ontologies: - self: "Ontologies" - loading: Loading ontologies - intro: Browse the Ontology Library - please_wait: Please wait.. - browse: Explore - welcome_admin: Welcome admin - admin_help: This color indicates features reserved for administrators - debug_info: Debug Info - submit_new_ontology: Submit a new ontology - entry_type: Entry Type - uploaded_in_the_last: Uploaded in the last + self: "Ontologies" + loading: Loading ontologies + intro: Browse the Ontology Library + please_wait: Please wait.. + browse: Explore + welcome_admin: Welcome admin + admin_help: This color indicates features reserved for administrators + debug_info: Debug Info + submit_new_ontology: Submit a new ontology + entry_type: Entry Type + uploaded_in_the_last: Uploaded in the last concepts: - request_term: - new_term_instructions: > -

    This ontology integrates with OntoloBridge, allowing community users to suggest additions to the public ontology. Complete the template below to submit a term request directly to the Ontology Manager.

    -
    -

    Term label (required)
    Suggested term name. If a term can be described with more than one synonym, enter only the preferred name here.

    -
    -
    -

    Term Description (required)
    A brief definition, description, or usage of the suggested term. Synonyms of additional terms may be listed in this section.

    -
    -
    -

    Superclass (required)
    The parent term of the suggested term. The parent term must be an existing entry in the current ontology. The superclass can be selected directly from the Bioportal class tree.

    -
    -
    -

    References (optional)
    Provide evidence that the requested term exists, such as Pubmed IDs of articles or links to other resources describing the term.

    -
    -
    -

    Justification (optional)
    Provide here any additional information about the requested term.

    -
    + request_term: + new_term_instructions: > +

    This ontology integrates with OntoloBridge, allowing community users to suggest additions to the public ontology. Complete the template below to submit a term request directly to the Ontology Manager.

    +
    +

    Term label (required)
    Suggested term name. If a term can be described with more than one synonym, enter only the preferred name here.

    +
    +
    +

    Term Description (required)
    A brief definition, description, or usage of the suggested term. Synonyms of additional terms may be listed in this section.

    +
    +
    +

    Superclass (required)
    The parent term of the suggested term. The parent term must be an existing entry in the current ontology. The superclass can be selected directly from the Bioportal class tree.

    +
    +
    +

    References (optional)
    Provide evidence that the requested term exists, such as Pubmed IDs of articles or links to other resources describing the term.

    +
    +
    +

    Justification (optional)
    Provide here any additional information about the requested term.

    +
    # General - + showing: Display of: of sort: Sort @@ -531,4 +544,4 @@ en: max_ontologies_per_set: "Maximum number of ontologies per set" paste_input_text: "Paste a paragraph of text or keywords to use in calculating ontology recommendations" get_recommendations: "Get recommendations" - select_ontologies_list: "Select ontologies" \ No newline at end of file + select_ontologies_list: "Select ontologies" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index afbc1433a..698d988fe 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,5 +1,4 @@ fr: - nbco_annotatosplus: score_help: "Annotations de score suivant la mesure NCBO 2009 précédente (ancienne) ou Annotations de score suivant la mesure C-Value (cvalue) ou Annotations de score suivant la mesure C-Value avec expansion de la hiérarchie (cvalueh)" start_typing_to_select: "Commencez à taper pour sélectionner %{type} ou laissez vide pour tout utiliser" @@ -324,9 +323,6 @@ fr: create_new_project: "Créer un nouveau projet" additional_metadata: "Métadonnées supplémentaires" - - - layout: header: browse: "Parcourir" @@ -344,7 +340,24 @@ fr: release_notes: "Notes de version" publications: "Publications" footer: - products: "Produits" + products: Produits + ontoportal: OntoPortal + release_notes: Notes de version + api: API + sparql: SPARQL + support: Support + contact_us: Nous contacter + wiki: Wiki + documentation: Documentation + agreements: Accords + terms: Conditions d'utilisation + privacy_policy: Politique de confidentialité + cite_us: Nous citer + acknowledgments: Remerciements + about: À propos + about_us: À propos de nous + projects: Projets + team: Équipe copyright_html: Droit d'auteur &copie; 2005‑2022, Conseil d'administration de l'Université Leland Stanford Junior. Tous les droits sont réservés. grant_html: > %{site} est actuellement développé dans le cadre du projet ANR D2KAB (ANR-18-CE23-0017). Il reçoit ou a également reçu le soutien du projet ANR SIFR (ANR-12-JS02-0010), Union Européenne Projet H2020-MSCA SIFRm ( N° 701771), le Labex NUMEV (ANR-10-LABX-20), le projet IBC de Montpellier (ANR-11-BINF0002) , l'Agro Labex (ANR-10-LABX-0001) ainsi que de l'Université de Montpellier et du CNRS. @@ -422,7 +435,7 @@ fr: year_month_day_concise: "%Y-%m-%d" # 2017-03-01 month_day_year: "%b %-d, %Y" # Mar 1, 2017 monthfull_day_year: "%B %-d, %Y" # March 1, 2017 - + ontologies: self: "Ontologies" loading: Chargement des ontologies @@ -544,5 +557,3 @@ fr: paste_input_text: "Collez un paragraphe de texte ou des mots-clés à utiliser dans le calcul des recommandations d'ontologie" get_recommendations: "Obtenir des recommandations" select_ontologies_list: "Sélectionnez les ontologies" - - \ No newline at end of file From d55366557d60ef78db03aff288461383c505ed08 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:17:41 +0200 Subject: [PATCH 085/533] Do the logic of the annotator and recommender field in the home page --- Gemfile.lock | 1 + app/controllers/annotator_controller.rb | 1 + app/controllers/home_controller.rb | 8 ++++++ app/controllers/recommender_controller.rb | 1 + app/views/annotator/index.html.haml | 9 ++++++- app/views/home/index.html.haml | 32 +++++++++++++++-------- app/views/recommender/index.html.haml | 13 ++++++++- config/routes.rb | 1 + 8 files changed, 53 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3bd81f23e..c1713477b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -418,6 +418,7 @@ GEM zeitwerk (2.6.7) PLATFORMS + ruby x86_64-linux DEPENDENCIES diff --git a/app/controllers/annotator_controller.rb b/app/controllers/annotator_controller.rb index 0e4e53fdd..ae05a3a31 100644 --- a/app/controllers/annotator_controller.rb +++ b/app/controllers/annotator_controller.rb @@ -29,6 +29,7 @@ def index @recognizers = [] end @annotator_ontologies = LinkedData::Client::Models::Ontology.all + @text = params[:text] end diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 9150589ea..388410dba 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -185,6 +185,14 @@ def validate_ontology_file @process_id = response.process_id end + def annotator_recommender_form + if params[:submit_button] == "annotator" + redirect_to "/annotator?text=#{params[:text]}" + elsif params[:submit_button] == "recommender" + redirect_to "/recommender?text=#{params[:text]}" + end + end + private # Dr. Musen wants 5 specific groups to appear first, sorted by order of importance. diff --git a/app/controllers/recommender_controller.rb b/app/controllers/recommender_controller.rb index 591ffc326..256fee3e4 100644 --- a/app/controllers/recommender_controller.rb +++ b/app/controllers/recommender_controller.rb @@ -5,6 +5,7 @@ class RecommenderController < ApplicationController RECOMMENDER_URI = "/recommender" def index + @text = params[:text] end # def create diff --git a/app/views/annotator/index.html.haml b/app/views/annotator/index.html.haml index 6c12a1f55..6fe839807 100644 --- a/app/views/annotator/index.html.haml +++ b/app/views/annotator/index.html.haml @@ -17,7 +17,7 @@ %form %div.form-group = hidden_field_tag :annotation_sample_text, t('annotator.index.sample_text') - = text_area_tag("annotation_text", nil, rows: 10, class: "form-control", placeholder: "Enter or paste text to be annotated", "aria-describedby": "annotateTextHelpBlock") + = text_area_tag("annotation_text", @text, rows: 10, class: "form-control", placeholder: "Enter or paste text to be annotated", "aria-describedby": "annotateTextHelpBlock") %small#annotateTextHelpBlock.form-text %a#insert_text_link{href: "javascript:void(0);"} insert sample text @@ -170,3 +170,10 @@ %div.mb-4 Additional parameters explained at = link_to('Annotator API documentation', "#{$REST_URL}/documentation#nav_annotator", target: "_blank") + +:javascript + window.addEventListener("load", function() { + if(document.getElementById("annotation_text").value != ''){ + document.getElementById("annotator_button").click() + } + }); \ No newline at end of file diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index fb07910b3..e4977b3a4 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -68,17 +68,19 @@ %h4 Agroportal services %hr.home-section-line/ .home-card - %textarea.home-recommendations-and-annotations{:rows => "6"} - %input.hide{:type => "submit"}/ - .home-services-buttons - .home-get-recommendations - %p Get recommendations - %svg{:fill => "none", :height => "16", :viewbox => "0 0 15 16", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} - %path{:d => "M2.61197 15.6472C1.16948 16.4746 0 15.7968 0 14.1344V1.86672C0 0.202676 1.16948 -0.474289 2.61197 0.352365L13.3345 6.50169C14.7775 7.32941 14.7775 8.67046 13.3345 9.49799L2.61197 15.6472Z", :fill => "#31B404"} + %form{action: "/annotator_recommender_form", method: "post"} + %textarea.home-recommendations-and-annotations{rows: "6" , placeholder: "Paste a paragraph of text or some keywords ...", name: "text"} + %input.hide{type: "submit", name: "submit_button" ,value: "annotator", id: "annotator_submit"}/ + %input.hide{type: "submit" , name: "submit_button" ,value: "recommender", id: "recommender_submit"}/ .home-services-buttons - .home-get-annotations - %p Get annotations - %img{:src => asset_path("play-white.svg")}/ + .home-get-recommendations{onclick: "submitRecommender()"} + %p Get recommendations + %svg{:fill => "none", :height => "16", :viewbox => "0 0 15 16", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M2.61197 15.6472C1.16948 16.4746 0 15.7968 0 14.1344V1.86672C0 0.202676 1.16948 -0.474289 2.61197 0.352365L13.3345 6.50169C14.7775 7.32941 14.7775 8.67046 13.3345 9.49799L2.61197 15.6472Z", :fill => "#31B404"} + .home-services-buttons + .home-get-annotations{onclick: "submitAnnotator()"} + %p Get annotations + %img{:src => asset_path("play-white.svg")}/ .home-section .home-section-sub-sections-container .home-sub-section-left @@ -163,4 +165,12 @@ %img{:src => asset_path("logos/collaboration/d2kab.png")}/ %img{:src => asset_path("logos/collaboration/lirmm.png")}/ %img{:src => asset_path("logos/collaboration/stanford.png")}/ - %img{:src => asset_path("logos/collaboration/inrae.png")}/ \ No newline at end of file + %img{:src => asset_path("logos/collaboration/inrae.png")}/ + +:javascript + function submitAnnotator(){ + document.getElementById("annotator_submit").click() + } + function submitRecommender(){ + document.getElementById("recommender_submit").click() + } \ No newline at end of file diff --git a/app/views/recommender/index.html.haml b/app/views/recommender/index.html.haml index 7abac68a6..b9b485b97 100644 --- a/app/views/recommender/index.html.haml +++ b/app/views/recommender/index.html.haml @@ -30,7 +30,7 @@ -# Input text or keywords %div.form-group.mt-4 - = text_area_tag("inputText", nil, rows: 10, class: "form-control default", placeholder: "Paste a paragraph of text or some keywords to use in calculating ontology recommendations", aria: {describedby: "inputTextHelpBlock"}) + = text_area_tag("inputText", @text, rows: 10, class: "form-control default", placeholder: "Paste a paragraph of text or some keywords to use in calculating ontology recommendations", aria: {describedby: "inputTextHelpBlock"}) %div.card#inputTextHighlighted %div.card-body %small#inputTextHelpBlock.form-text @@ -106,3 +106,14 @@ %div.col %h5#resultsHeader %div#recommender-results.mb-5 + +:javascript + window.addEventListener("load", function() { + const value = document.getElementById("inputText").value + document.getElementById("inputText").click(); + + document.getElementById("inputText").value = value + if(document.getElementById("inputText").value != ''){ + document.getElementById("recommenderButton").click() + } + }); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 057297ac7..0b0f36b0e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -85,6 +85,7 @@ get '/about' => 'home#about' get '/site_config' => 'home#site_config' get '/validate_ontology_file' => 'home#validate_ontology_file_show' + post '/annotator_recommender_form' => 'home#annotator_recommender_form' match '/validate_ontology_file' => 'home#validate_ontology_file', via: [:get, :post] get '/layout_partial/:partial' => 'home#render_layout_partial' match '/visits', to: 'visits#index', via: :get From 222a69617dd9567a0aa1464c565a1692c7542174 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:22:08 +0200 Subject: [PATCH 086/533] with the previous commit --- app/views/recommender/index.html.haml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/recommender/index.html.haml b/app/views/recommender/index.html.haml index b9b485b97..ccb96e02c 100644 --- a/app/views/recommender/index.html.haml +++ b/app/views/recommender/index.html.haml @@ -111,7 +111,6 @@ window.addEventListener("load", function() { const value = document.getElementById("inputText").value document.getElementById("inputText").click(); - document.getElementById("inputText").value = value if(document.getElementById("inputText").value != ''){ document.getElementById("recommenderButton").click() From d9e8cdd95485c98b2ebea3258e53f16e3ebbb785 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:37:57 +0200 Subject: [PATCH 087/533] upload nav bar assets --- app/assets/images/logo-white.svg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/assets/images/logo-white.svg diff --git a/app/assets/images/logo-white.svg b/app/assets/images/logo-white.svg new file mode 100644 index 000000000..77f934b5a --- /dev/null +++ b/app/assets/images/logo-white.svg @@ -0,0 +1,3 @@ + + + From 18e722d0c1f85854cfcdab17cd614139892d020a Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:38:07 +0200 Subject: [PATCH 088/533] update nav bar design --- app/assets/stylesheets/nav_bar.scss | 110 ++++++++++++++++++++++------ app/views/layouts/_topnav.html.haml | 51 +++++++++---- 2 files changed, 123 insertions(+), 38 deletions(-) diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss index 5ef243852..a540768f9 100644 --- a/app/assets/stylesheets/nav_bar.scss +++ b/app/assets/stylesheets/nav_bar.scss @@ -19,31 +19,41 @@ nav{ .nav-logo p{ margin-left: 10px; color: white; - font-size: 15px; + font-size: 16px; font-weight: 700; + margin-bottom: 0; +} +.nav-items{ + display: flex; + justify-content: space-between; + align-items:center; + width: 85%; } -nav > ul { +.nav-items > ul { display: flex; list-style: none; margin-bottom: 0; } -nav > ul > li { +.nav-items > ul > li { margin-left: 20px; } -nav > ul > li > a { +.nav-items > ul > li > a { color: white !important; - - font-size: 14px; + font-size: 15px; opacity: 60%; font-weight: 300; + transition: opacity 0.2s ease-in-out; +} +.nav-items > ul > li > a:hover{ + opacity: 100%; } -nav > ul > li > a.active{ +.nav-items > ul > li > a.active{ opacity: 100%; font-weight: 500; } -nav > input { +.nav-items > input { height: 33px; width: 228px; outline: none; @@ -55,25 +65,81 @@ nav > input { font-size: 14px; padding: 0 10px; } -nav > input:focus{ +.nav-items > input:focus{ opacity: 100%; } +.nav-items > input::placeholder{ + color: white; + opacity: 60%; +} +.nav-items > input::-ms-input-placeholder{ + color: white; + opacity: 60%; +} .nav-language{ - background-color: #47BD1F; - height: 33px; - width: 79px; - border-radius: 5px; + background-color: transparent; + width: 47px; + color: white; + border: none; + outline: none; + cursor: pointer; + +} +.nav-language option{ + background-color: white; + color: black; } -nav > a{ - text-decoration: none; +.nav-items > a{ padding: 3px 34px; border: 1px solid white; border-radius: 5px; - color: white; + color: white !important; + transition: background-color 0.2s ease-in-out; } -.nav-support{ - background-color: #47BD1F; - height: 33px; - width: 65px; - border-radius: 5px; -} \ No newline at end of file +.nav-items > a:hover{ + background-color: rgba(255, 255, 255, 0.1); +} + +nav .menu-btn i{ + color: #fff; + font-size: 22px; + cursor: pointer; + display: none; +} +nav input[type="checkbox"]{ + display: none; +} + +.nav-link{ + color: white !important; + padding: 0 !important; +} + +@media (max-width: 1200px){ + nav .menu-btn i{ + display: block; + } + #nav-menu:checked ~ .menu-btn i:before{ + content: "\f00d"; + } + + + #nav-menu:checked ~ nav{ + display:block; + background-color: blue; + } + #nav-menu:checked ~ ul{ + display: block; + } + .nav-items{ + display: none; + } + #nav-menu:checked ~ .nav-items{ + display: block; + height: 100vh; + background-color: var(--primary-color); + } + + +} + diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 3b62bd33e..c988c4db8 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -1,20 +1,39 @@ .nav-container %nav .nav-logo - %img{:src => "logo-white.svg"}/ + %img{:src => asset_path("logo-white.svg")}/ %p AgroPortal - %ul - %li - %a.active{:href => ""} Browse - %li - %a{:href => ""} Mappings - %li - %a{:href => ""} Recommender - %li - %a{:href => ""} Annotator - %li - %a{:href => ""} Landscape - %input{:placeholder => "Search AgroPortal ...", :type => "text"}/ - .nav-language - %a{:href => "#login"} Login - .nav-support + %input#nav-menu{:type => "checkbox"}/ + %label.menu-btn{:for => "nav-menu"} + %i.fas.fa-bars + .nav-items + %ul + %li + %a{href: "/ontologies", class: ("active" if current_page?("/ontologies"))} Browse + %li + %a{href: "/mappings", class: ("active" if current_page?("/mappings"))} Mappings + %li + %a{href: "/recommender", class: ("active" if current_page?("/recommender"))} Recommender + %li + %a{href: "/annotator", class: ("active" if current_page?("/annotator"))} Annotator + %li + %a{href: "/landscape", class: ("active" if current_page?("/landscape"))} Landscape + %input{:placeholder => "Search AgroPortal ...", :type => "text"}/ + + %a{:href => "/login"} Login + + %select.nav-language + %option{:value => "EN"} + EN + %option{:value => "FR"} + FR + .dropdown + = link_to("#", id: "supportMenuDropdownLink", class: "nav-link dropdown-toggle", role: "button", data: {toggle: "dropdown"}, aria: {haspopup: "true", expanded: "false"}) do + Support + %div.dropdown-menu.dropdown-menu-right{aria: {labelledby: "supportMenuDropdownLink"}} + = link_to("Submit Feedback", feedback_path(location: encode_param(request.url)), id: "submitFeedbackMenuItem", class: "dropdown-item pop_window") + %div.dropdown-divider + %h6.dropdown-header Documentation + = link_to("Help", "#{$WIKI_HELP_PAGE}", target: "_blank", class: "dropdown-item") + = link_to("Release Notes", "#{$RELEASE_NOTES}", target: "_blank", class: "dropdown-item") + = link_to("Publications", $PUBLICATIONS_URL, target: "_blank", class: "dropdown-item") From e56d6eba123632c518429ecff9bbe7e088fcf1f6 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:38:31 +0200 Subject: [PATCH 089/533] make a function to determine the active page --- app/helpers/application_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c177add57..eb74691c1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -602,4 +602,8 @@ def skos? submission = @submission || @submission_latest submission&.hasOntologyLanguage === 'SKOS' end + + def current_page?(path) + request.path == path ? true : false + end end From 5f45a5da6b5d4b29e41f71761abc10376d4a9d72 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:46:36 +0200 Subject: [PATCH 090/533] Make the portal's logo in the nav bar clickable (take to the home page) --- app/views/layouts/_topnav.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index c988c4db8..020dea1d0 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -1,6 +1,6 @@ .nav-container %nav - .nav-logo + %a.nav-logo{href: "/"} %img{:src => asset_path("logo-white.svg")}/ %p AgroPortal %input#nav-menu{:type => "checkbox"}/ From 3cbf0b5d9e0b2514d2e10b0d0ceccdaf45ad6e02 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Fri, 28 Apr 2023 13:44:26 +0200 Subject: [PATCH 091/533] add warning and add feedback for definitions synonyms and --- app/components/concept_details_component.rb | 2 +- app/views/concepts/_details.html.haml | 24 ++++++++++++++++++++- config/locales/en.yml | 2 ++ config/locales/fr.yml | 2 ++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/app/components/concept_details_component.rb b/app/components/concept_details_component.rb index 87520af07..2a91fa384 100644 --- a/app/components/concept_details_component.rb +++ b/app/components/concept_details_component.rb @@ -35,7 +35,7 @@ def render_properties(properties_set, ontology_acronym, &block) end end - displayed_text = ajax_links.length > 0 ? ajax_links.join('

    ') : t('ontology_details.concept.no_value_for_selected_language') + displayed_text = ajax_links.length > 0 ? ajax_links.join('

    ') : "

    #{t('ontology_details.concept.no_value_for_selected_language')}

    " line = <<-EOS diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index f19d85dfd..37e6393f2 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -1,3 +1,13 @@ +%style + :css + .warning { + background-color: #ffeaa7; /* set the background color to a light yellow */ + color: #d63031; /* set the text color to a dark red */ + padding: 10px; /* add some padding around the text */ + border: 1px solid #d63031; /* add a border around the text */ + } + + = turbo_frame_tag 'concept_details' do - schemes_keys = %w[hasTopConcept topConceptOf] - label_xl_set = %w[skos-xl#prefLabel skos-xl#altLabel skos-xl#hiddenLabel] @@ -15,7 +25,7 @@ %td{nowrap: ""}= t('ontology_details.concept.preferred_name') %td - if @concept.prefLabel().nil? - %p= t('ontology_details.concept.no_preferred_name_for_selected_language') + %p.warning= t('ontology_details.concept.no_preferred_name_for_selected_language') - else %p= @concept.prefLabel({:use_html => true}).html_safe @@ -29,11 +39,23 @@ %div.synonym-change-request = add_synonym_button = remove_synonym_button + - else + %tr + %td{nowrap: ""}= t('ontology_details.concept.synonyms') + %td + %p.warning= t('ontology_details.concept.no_synonyms_for_selected_language') + - unless @concept.definition.nil? || @concept.definition.empty? %tr %td{nowrap: ""}= t('ontology_details.concept.definitions') %td %p= @concept.definition.join(" ") + - else + %tr + %td{nowrap: ""}= t('ontology_details.concept.definitions') + %td + %p.warning= t('ontology_details.concept.no_definitions_for_selected_language') + - if @concept.obsolete? %tr %td{nowrap: ""}= t('ontology_details.concept.obsolete') diff --git a/config/locales/en.yml b/config/locales/en.yml index cb5bb13a4..f7ddac56b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -317,6 +317,8 @@ en: concept: no_preferred_name_for_selected_language: "No preferred name for selected language." + no_synonym_name_for_selected_language: "No Synonym for selected language." + no_definitions_for_selected_language: "No Definitions for selected language." preferred_name: "Preferred name" id: "ID" synonyms: "Synonyms" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 7a2f032fd..3992efa92 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -326,6 +326,8 @@ fr: concept: no_preferred_name_for_selected_language: "Pas de nom préféré pour la langue sélectionnée." + no_synonym_name_for_selected_language : "Aucun synonyme pour la langue sélectionnée." + no_definitions_for_selected_language : "Aucune définition pour la langue sélectionnée." preferred_name: "Nom préféré" id: "Identifiant" synonyms: "Synonymes" From 040e7b3fbdc9c5dfe3cfc3dd5eeb4c17be59aaf9 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 3 May 2023 09:30:04 +0200 Subject: [PATCH 092/533] Auto stash before merge of "feature/support-multi-lingual" and "origin/feature/support-multi-lingual" --- Gemfile.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c7cb95205..8e94f0e8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,7 +82,7 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.2) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) airbrussh (1.4.1) sshkit (>= 1.6.1, != 1.7.0) @@ -158,7 +158,7 @@ GEM flamegraph (0.9.5) globalid (1.1.0) activesupport (>= 5.0) - graphql (2.0.20) + graphql (2.0.21) graphql-client (0.18.0) activesupport (>= 3.0) graphql @@ -173,14 +173,14 @@ GEM http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) - i18n (1.12.0) + i18n (1.13.0) concurrent-ruby (~> 1.0) iconv (1.0.8) - importmap-rails (1.1.5) + importmap-rails (1.1.6) actionpack (>= 6.0.0) railties (>= 6.0.0) io-console (0.6.0) - irb (1.6.3) + irb (1.6.4) reline (>= 0.3.0) jquery-rails (4.5.1) rails-dom-testing (>= 1, < 3) @@ -210,7 +210,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) mini_mime (1.1.2) - mini_portile2 (2.8.1) + mini_portile2 (2.8.2) minitest (5.18.0) msgpack (1.7.0) multi_json (1.15.0) @@ -234,15 +234,15 @@ GEM net-protocol net-ssh (7.1.0) netrc (0.11.0) - newrelic_rpm (9.1.0) + newrelic_rpm (9.2.2) nio4r (2.5.9) - nokogiri (1.14.2) + nokogiri (1.14.3) mini_portile2 (~> 2.8.0) racc (~> 1.4) - oj (3.14.2) + oj (3.14.3) open_uri_redirections (0.2.1) - parallel (1.22.1) - parser (3.2.2.0) + parallel (1.23.0) + parser (3.2.2.1) ast (~> 2.4.1) popper_js (1.16.1) pry (0.14.2) @@ -253,10 +253,10 @@ GEM puma (5.6.5) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.6.4) + rack (2.2.7) rack-accept (0.4.5) rack (>= 0.4) - rack-mini-profiler (3.0.0) + rack-mini-profiler (3.1.0) rack (>= 1.2.0) rack-test (2.1.0) rack (>= 1.3) @@ -298,7 +298,7 @@ GEM rdoc (6.3.3) recaptcha (5.9.0) json - regexp_parser (2.7.0) + regexp_parser (2.8.0) reline (0.3.3) io-console (~> 0.5) rest-client (2.1.0) @@ -307,9 +307,9 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rexml (3.2.5) - rspec-core (3.12.1) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-mocks (3.12.5) @@ -324,7 +324,7 @@ GEM rspec-mocks (~> 3.11) rspec-support (~> 3.11) rspec-support (3.12.0) - rubocop (1.49.0) + rubocop (1.50.2) json (~> 2.3) parallel (~> 1.10) parser (>= 3.2.0.0) @@ -334,7 +334,7 @@ GEM rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.28.0) + rubocop-ast (1.28.1) parser (>= 3.2.1.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) @@ -350,7 +350,7 @@ GEM sprockets-rails tilt select2-rails (4.0.13) - selenium-webdriver (4.8.6) + selenium-webdriver (4.9.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -366,7 +366,7 @@ GEM sshkit (1.21.4) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - stackprof (0.2.24) + stackprof (0.2.25) stimulus-rails (1.2.1) railties (>= 6.0.0) temple (0.10.0) @@ -417,7 +417,7 @@ GEM will_paginate (3.3.1) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.7) + zeitwerk (2.6.8) PLATFORMS ruby From 653ea6aad515cd81810446988bf581ba5bd9ecff Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Wed, 3 May 2023 16:00:15 +0200 Subject: [PATCH 093/533] use failure component --- app/components/concept_details_component.rb | 4 +--- app/views/concepts/_details.html.haml | 14 +++----------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/app/components/concept_details_component.rb b/app/components/concept_details_component.rb index 2a91fa384..ba27ea9fa 100644 --- a/app/components/concept_details_component.rb +++ b/app/components/concept_details_component.rb @@ -35,14 +35,12 @@ def render_properties(properties_set, ontology_acronym, &block) end end - displayed_text = ajax_links.length > 0 ? ajax_links.join('

    ') : "

    #{t('ontology_details.concept.no_value_for_selected_language')}

    " - line = <<-EOS #{remove_owl_notation(key)} - #{"

    #{displayed_text}

    ".html_safe} + #{"

    #{ ajax_links.join('

    ') }

    ".html_safe} EOS out += line diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index 37e6393f2..2207e1edd 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -25,7 +25,7 @@ %td{nowrap: ""}= t('ontology_details.concept.preferred_name') %td - if @concept.prefLabel().nil? - %p.warning= t('ontology_details.concept.no_preferred_name_for_selected_language') + = render(CardMessageComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language', type: "failure"))) - else %p= @concept.prefLabel({:use_html => true}).html_safe @@ -39,22 +39,14 @@ %div.synonym-change-request = add_synonym_button = remove_synonym_button - - else - %tr - %td{nowrap: ""}= t('ontology_details.concept.synonyms') - %td - %p.warning= t('ontology_details.concept.no_synonyms_for_selected_language') + - unless @concept.definition.nil? || @concept.definition.empty? %tr %td{nowrap: ""}= t('ontology_details.concept.definitions') %td %p= @concept.definition.join(" ") - - else - %tr - %td{nowrap: ""}= t('ontology_details.concept.definitions') - %td - %p.warning= t('ontology_details.concept.no_definitions_for_selected_language') + - if @concept.obsolete? %tr From 4c24d5cd50cd54b3a2b04f6b2ef0c999c8ff404a Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 3 May 2023 22:53:04 +0200 Subject: [PATCH 094/533] optimize and remove the unused methods in the home index action --- app/controllers/home_controller.rb | 69 ++++++++---------------------- app/views/home/index.html.haml | 8 ++-- 2 files changed, 23 insertions(+), 54 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 388410dba..0dec1e2ea 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -7,68 +7,37 @@ class HomeController < ApplicationController include FairScoreHelper def index - @ontologies_views = LinkedData::Client::Models::Ontology.all(include_views: true) - @ontologies = @ontologies_views.select {|o| !o.viewOf} - @ontologies_hash = Hash[@ontologies_views.map {|o| [o.acronym, o]}] - @groups = LinkedData::Client::Models::Group.all - @notes = LinkedData::Client::Models::Note.all - @last_notes = [] - unless @notes.empty? - @notes.sort! {|a,b| b.created <=> a.created } - @notes[0..20].each do |n| - ont_uri = n.relatedOntology.first - ont = LinkedData::Client::Models::Ontology.find(ont_uri) - next if ont.nil? - username = n.creator.split("/").last - note = { - :uri => n.links['ui'], - :id => n.id, - :subject => n.subject, - :body => n.body, - :created => n.created, - :author => username, - :ont_name => ont.name - } - @last_notes.push note - break if @last_notes.length >= [$HOME_LATEST_NOTES_COUNT.to_i, 5].max - end - end - # Get the latest manual mappings - # All mapping classes are bidirectional. - # Each class in the list maps to all other classes in the list. - if $DISPLAY_RECENT.nil? || $DISPLAY_RECENT == true - @recent_mappings = get_recent_mappings # application_controller - end - - organize_groups + @analytics = LinkedData::Client::Analytics.last_month # Calculate BioPortal summary statistics - @ont_count = @ontologies.length - @cls_count = LinkedData::Client::Models::Metrics.all.map { |m| m.classes.to_i }.sum - @individuals_count = LinkedData::Client::Models::Metrics.all.map {|m| m.individuals.to_i}.sum - @prop_count = 36286 + @ont_count = @analytics.onts.size + metrics = LinkedData::Client::Models::Metrics.all + metrics = metrics.each_with_object(Hash.new(0)) do |h, sum| + h.to_hash.slice(:classes, :properties, :individuals).each { |k, v| sum[k] += v } + end + + @cls_count = metrics[:classes] + @individuals_count = metrics[:individuals] + @prop_count = metrics[:properties] @map_count = total_mapping_count - @analytics = LinkedData::Client::Analytics.last_month @projects_count = LinkedData::Client::Models::Project.all.length @users_count = LinkedData::Client::Models::User.all.length - @ontology_names = @ontologies.map { |ont| ["#{ont.name} (#{ont.acronym})", ont.acronym] } - @upload_benifits = [ - "Discover new insights and connections by exploring other ontologies in the repository.", - "Contribute to the growth and development of your domain by adding new concepts and categories.", - "Use version control to manage the changes to your ontology over time and collaborate with other users.", - "Get feedback and suggestions from other users who can review and comment on your ontology.", - "Get the FAIR score and metrics for your ontology." + + @upload_benefits = [ + 'Discover new insights and connections by exploring other ontologies in the repository.', + 'Contribute to the growth and development of your domain by adding new concepts and categories.', + 'Use version control to manage the changes to your ontology over time and collaborate with other users.', + 'Get feedback and suggestions from other users who can review and comment on your ontology.', + 'Get the FAIR score and metrics for your ontology.' ] - @anal_ont_names = {} + @anal_ont_names = [] @anal_ont_numbers = [] @analytics.onts[0..4].each do |visits| - ont = @ontologies_hash[visits[:ont].to_s] - @anal_ont_names[ont.acronym] = ont.name + @anal_ont_names << visits[:ont] @anal_ont_numbers << visits[:views] end - end def render_layout_partial diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index e4977b3a4..6f4692c07 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -21,17 +21,17 @@ %img{:src => asset_path("home-random-bubbles.svg")}/ .home-bubble.home-bubble-one %h5 - = @anal_ont_names.keys[0] + = @anal_ont_names[0] %p = @anal_ont_numbers[0].to_s + " visits" .home-bubble.home-bubble-two %h5 - = @anal_ont_names.keys[1] + = @anal_ont_names[1] %p = @anal_ont_numbers[1].to_s + " visits" .home-bubble.home-bubble-three %h5 - = @anal_ont_names.keys[2] + = @anal_ont_names[2] %p = @anal_ont_numbers[2].to_s + " visits" %a.home-bubble.home-bubble-four{:href => "/visits"} @@ -49,7 +49,7 @@ %p Uploading an ontology is a way of sharing your domain knowledge with others. %p By uploading your ontology to agroportal, you can: .home-upload-benifits - - @upload_benifits.each do |benifit| + - @upload_benefits.each do |benifit| %div %img{:src => asset_path("check-outlined.svg")}/ %p From e0ddd4707577044cbca630c9e7060aa5a9d92074 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 4 May 2023 01:01:11 +0200 Subject: [PATCH 095/533] implement toggle input component --- app/assets/stylesheets/components/index.scss | 3 +- .../stylesheets/components/toggle_input.scss | 92 +++++++++++++++++++ app/components/toggle_input_component.rb | 14 +++ .../toggle_input_component.html.haml | 12 +++ .../toggle_input_component_controller.js | 26 ++++++ app/javascript/component_controllers/index.js | 3 + 6 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/components/toggle_input.scss create mode 100644 app/components/toggle_input_component.rb create mode 100644 app/components/toggle_input_component/toggle_input_component.html.haml create mode 100644 app/components/toggle_input_component/toggle_input_component_controller.js diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index c61d4d8dc..8d6a982e5 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -1,2 +1,3 @@ @import 'chips'; -@import 'card_message' \ No newline at end of file +@import 'card_message'; +@import 'toggle_input'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/toggle_input.scss b/app/assets/stylesheets/components/toggle_input.scss new file mode 100644 index 000000000..c8c040f82 --- /dev/null +++ b/app/assets/stylesheets/components/toggle_input.scss @@ -0,0 +1,92 @@ +.toggle-radio { + background: var(--primary-color); + border-radius: 50px; + padding: 5px 3px; + color: white; + font-weight: bold; + display: flex; + justify-content: space-between; + align-items: center; + font-size: 14px; + position: relative; + transition: all .5s ease-in-out; + + &.off { + background: #fff; + + .bar { + background: var(--primary-color); + right: 0; + } + + label.on-toggle-input-label { + color: #626262; + } + + label.off-toggle-input-label { + color: white; + } + } + + .wrap { + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + border-radius: 50px; + overflow: hidden; + position: relative; + height: 40px; + } + + input { + opacity: 0; + pointer-events: none; + } + + label { + position: relative; + z-index: 1; + cursor: pointer; + transition: all .5s ease-in-out; + user-select: none; + margin-bottom: 0; + width: 50%; + + &.on-toggle-input-label { + margin-left: 10px; + color: #000; + } + + &.off-toggle-input-label { + margin-right: 10px; + text-align: end; + } + } + + .on-input { + position: absolute; + left: 0; + top: 50%; + transform: translateY(-50%); + } + + .off-input { + position: absolute; + right: 0; + top: 50%; + transform: translateY(-50%); + } + + .bar { + position: absolute; + right: 50%; + top: 50%; + transform: translateY(-50%); + background: #fff; + height: 100%; + width: 50%; + border-radius: 50px; + transition: all .5s ease-in-out; + } +} diff --git a/app/components/toggle_input_component.rb b/app/components/toggle_input_component.rb new file mode 100644 index 000000000..0e2c73200 --- /dev/null +++ b/app/components/toggle_input_component.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class ToggleInputComponent < ViewComponent::Base + + def initialize(first_option: [], second_option: []) + super + @options = [first_option, second_option] # An array of [id, name, label] + end + + def option_id(order) + @options[order][0] + end + +end diff --git a/app/components/toggle_input_component/toggle_input_component.html.haml b/app/components/toggle_input_component/toggle_input_component.html.haml new file mode 100644 index 000000000..7e71a336d --- /dev/null +++ b/app/components/toggle_input_component/toggle_input_component.html.haml @@ -0,0 +1,12 @@ +.toggle-radio{data: {controller: 'toggle-input'}} + .wrap + - @options.each_with_index do |array, index| + - key, name, label = array + - input_class = index.zero? ? 'on-input' : 'off-input' + - label_class = index.zero? ? 'on-toggle-input-label' : 'off-toggle-input--label' + - action = index.zero? ? "selectFirstOption" : "selectSecondOption" + %input{ type: "radio", id: key, name: name, data:{'toggle-input-target': 'option', action: "click->toggle-input##{action}"} , class: input_class , checked: index.zero? } + %label{ for: key, class: label_class } + =label + .bar + diff --git a/app/components/toggle_input_component/toggle_input_component_controller.js b/app/components/toggle_input_component/toggle_input_component_controller.js new file mode 100644 index 000000000..cf1563798 --- /dev/null +++ b/app/components/toggle_input_component/toggle_input_component_controller.js @@ -0,0 +1,26 @@ +import {Controller} from "@hotwired/stimulus"; + +// Connects to data-controller="toggle-input" +export default class extends Controller { + static targets = ['option'] + + + selectFirstOption(){ + this.element.classList.remove('off') + this.#firstOption().checked = true + this.#secondOption().checked = false + + } + selectSecondOption(){ + this.element.classList.add('off') + this.#secondOption().checked = true + this.#firstOption().checked = false + } + + #secondOption(){ + return this.optionTargets[1] + } + #firstOption(){ + return this.optionTargets[0] + } +} diff --git a/app/javascript/component_controllers/index.js b/app/javascript/component_controllers/index.js index dc1edde16..89eeabbcf 100644 --- a/app/javascript/component_controllers/index.js +++ b/app/javascript/component_controllers/index.js @@ -10,9 +10,12 @@ import Metadata_selector_component_controller from "../../components/metadata_selector_component/metadata_selector_component_controller"; import Ontology_subscribe_button_component_controller from "../../components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller"; +import Toggle_input_component_controller + from "../../components/toggle_input_component/toggle_input_component_controller"; application.register("turbo-modal", TurboModalController) application.register("file-input", FileInputLoaderController) application.register("select-input", Select_input_component_controller) application.register("metadata-select", Metadata_selector_component_controller) application.register("subscribe-notes", Ontology_subscribe_button_component_controller) +application.register("toggle-input", Toggle_input_component_controller) From 3d0bf868753de0fef3457df9f4f43d07b25ec466 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 4 May 2023 01:02:07 +0200 Subject: [PATCH 096/533] fix a code typo for 'benefit' in the home view --- app/views/home/index.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 6f4692c07..8ed9ba325 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -49,11 +49,11 @@ %p Uploading an ontology is a way of sharing your domain knowledge with others. %p By uploading your ontology to agroportal, you can: .home-upload-benifits - - @upload_benefits.each do |benifit| + - @upload_benefits.each do |benefit| %div %img{:src => asset_path("check-outlined.svg")}/ %p - = benifit + = benefit - if session[:user].nil? %a.home-upload-ontology-button{:href => "/login?redirect=/ontologies/new"} %svg{:fill => "none", :height => "14", :viewbox => "0 0 15 14", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} From 30ee286900aa486548da4c86f4c0436f6ffbe0b9 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 4 May 2023 01:02:26 +0200 Subject: [PATCH 097/533] replace the two buttons with toggle input --- .../stylesheets/components/toggle_input.scss | 4 ++-- app/assets/stylesheets/home.scss | 18 ++++++-------- app/views/home/index.html.haml | 24 +++++++++---------- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/components/toggle_input.scss b/app/assets/stylesheets/components/toggle_input.scss index c8c040f82..6df19aacc 100644 --- a/app/assets/stylesheets/components/toggle_input.scss +++ b/app/assets/stylesheets/components/toggle_input.scss @@ -16,7 +16,7 @@ .bar { background: var(--primary-color); - right: 0; + right: 12px; } label.on-toggle-input-label { @@ -80,7 +80,7 @@ .bar { position: absolute; - right: 50%; + right: 63%; top: 50%; transform: translateY(-50%); background: #fff; diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 7620202b1..9301acaeb 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -274,22 +274,18 @@ i.fa.fa-caret-square-o-down { margin-right: 20px; margin-bottom: 0; } -.home-get-recommendations{ +.home-get-service{ cursor: pointer; color: var(--primary-color); display: flex; - width: fit-content; - height: fit-content; align-items: center; - padding: 15px 20px; - border-radius: 8px; - border: 1px solid var(--primary-color); - -} -.home-get-recommendations p{ - margin-right: 20px; - margin-bottom: 0; + justify-content: center; + height: 50px; + width: 50px; + border-radius: 50%; + border: solid var(--primary-color); } + .hide{ display: none; } diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 8ed9ba325..61336e923 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -70,17 +70,14 @@ .home-card %form{action: "/annotator_recommender_form", method: "post"} %textarea.home-recommendations-and-annotations{rows: "6" , placeholder: "Paste a paragraph of text or some keywords ...", name: "text"} - %input.hide{type: "submit", name: "submit_button" ,value: "annotator", id: "annotator_submit"}/ - %input.hide{type: "submit" , name: "submit_button" ,value: "recommender", id: "recommender_submit"}/ + %input.hide{type: "submit", name: "submit_button" ,value: "annotator", id: "annotator_submit"} + %input.hide{type: "submit" , name: "submit_button" ,value: "recommender", id: "recommender_submit"} .home-services-buttons - .home-get-recommendations{onclick: "submitRecommender()"} - %p Get recommendations + %div{style: 'width: 29%; height: 50px;'} + = render ToggleInputComponent.new(first_option: ['annotator-option','annotator', 'Annotatation'], second_option: ['recommender-option','recommender', 'Recommendations']) + .home-get-service.ml-1{onclick: "submitService()"} %svg{:fill => "none", :height => "16", :viewbox => "0 0 15 16", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} %path{:d => "M2.61197 15.6472C1.16948 16.4746 0 15.7968 0 14.1344V1.86672C0 0.202676 1.16948 -0.474289 2.61197 0.352365L13.3345 6.50169C14.7775 7.32941 14.7775 8.67046 13.3345 9.49799L2.61197 15.6472Z", :fill => "#31B404"} - .home-services-buttons - .home-get-annotations{onclick: "submitAnnotator()"} - %p Get annotations - %img{:src => asset_path("play-white.svg")}/ .home-section .home-section-sub-sections-container .home-sub-section-left @@ -168,9 +165,10 @@ %img{:src => asset_path("logos/collaboration/inrae.png")}/ :javascript - function submitAnnotator(){ - document.getElementById("annotator_submit").click() - } - function submitRecommender(){ - document.getElementById("recommender_submit").click() + function submitService(){ + const firstOption= document.getElementById("annotator-option") + const secondOption = document.getElementById("recommender-option") + let selected = firstOption.checked ? firstOption : secondOption + + document.getElementById(`${selected.name}_submit`).click() } \ No newline at end of file From b7c652d979f6e9f58a76eb90e7d51894f8b59eaa Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 4 May 2023 10:28:01 +0200 Subject: [PATCH 098/533] tmp --- app/assets/images/loop.svg | 3 + app/assets/stylesheets/home.scss | 72 ++++++++- .../controllers/home_search_controller.js | 9 ++ app/javascript/controllers/index.js | 3 + app/views/annotator/index.html.haml | 1 + app/views/home/index.html.haml | 150 +++++++++++++++--- app/views/recommender/index.html.haml | 1 + 7 files changed, 217 insertions(+), 22 deletions(-) create mode 100644 app/assets/images/loop.svg create mode 100644 app/javascript/controllers/home_search_controller.js diff --git a/app/assets/images/loop.svg b/app/assets/images/loop.svg new file mode 100644 index 000000000..8bf624de0 --- /dev/null +++ b/app/assets/images/loop.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 7620202b1..8bb22e0af 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -104,7 +104,7 @@ i.fa.fa-caret-square-o-down { color: white; } -.home-header-title p{ +.home-header-title > p{ font-size: 20px; font-weight: 400; color: white; @@ -341,6 +341,76 @@ i.fa.fa-caret-square-o-down { margin-left: 60px; } +#home-search-drop-down{ + display: none; + font-size: 16px; + background: white; + width: 100%; + border-radius: 0 0 14px 14px; + border: none; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); +} + +.home-search-ontology-content{ + display: flex; + color: #777777 !important; + justify-content: space-between; + padding: 20px 20px; + cursor: pointer; + border-top: 1px solid #f7f7f7 +} +.home-search-ontology-content:hover{ + background-color: rgba(0, 0, 0, 0.01); +} +.home-search-ontology-content div{ + display: flex; +} +.home-search-ontology-content div img{ + width: 12px; +} +.home-search-ontology-content div p{ + font-weight: 300; + margin-left: 10px; + margin-bottom: 0; +} + +.home-dropdown-active{ + box-shadow: none !important; +} +#seached-ontology{ + margin-bottom: 0; +} + +.home-support-title{ + display: flex; + justify-content: center; + flex-direction: column; + +} +.home-support-items{ + display: flex; + justify-content: center; + flex-wrap: wrap; + +} +.home-support-items > *:not(:first-child){ + margin-left: 40px; +} +.home-support-items img{ + margin-bottom: 40px; +} +.home-result-type{ + font-weight: 300; + margin-bottom: 0; +} + +.home-searched-ontology{ + margin-bottom: 0; + word-wrap: break-word; + max-width: 400px; + margin-right: 20px; + +} @keyframes scale-up { from { transform: scale(0.1); } diff --git a/app/javascript/controllers/home_search_controller.js b/app/javascript/controllers/home_search_controller.js new file mode 100644 index 000000000..4acd059f3 --- /dev/null +++ b/app/javascript/controllers/home_search_controller.js @@ -0,0 +1,9 @@ +import { Controller } from "@hotwired/stimulus" + +// Connects to data-controller="home-search" +export default class extends Controller { + connect() { + } + + +} diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index 553504b0a..e4ad4c1ef 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -19,6 +19,9 @@ application.register("form-auto-complete", FormAutoCompleteController) import HistoryController from "./history_controller" application.register("history", HistoryController) +import HomeSearchController from "./home_search_controller" +application.register("home-search", HomeSearchController) + import LabelAjaxController from "./label_ajax_controller" application.register("label-ajax", LabelAjaxController) diff --git a/app/views/annotator/index.html.haml b/app/views/annotator/index.html.haml index 6fe839807..836d609c7 100644 --- a/app/views/annotator/index.html.haml +++ b/app/views/annotator/index.html.haml @@ -175,5 +175,6 @@ window.addEventListener("load", function() { if(document.getElementById("annotation_text").value != ''){ document.getElementById("annotator_button").click() + window.scrollBy(0, 1080); } }); \ No newline at end of file diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index e4977b3a4..20c11f823 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -41,7 +41,13 @@ .home-header-title %h4 Welcome to AgroPortal %p The home of vocabularies and ontologies in agronomy and related fields. - %input{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text"}/ + %input#home-search{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text"}/ + #home-search-drop-down + %a.home-search-ontology-content#home-search-ontology-content{href: "#"} + %p#seached-ontology + %div + %img{src: asset_path("loop.svg")}/ + %p Search ontology content .home-body-container .home-section %h4 Wanna upload an ontology? @@ -69,7 +75,7 @@ %hr.home-section-line/ .home-card %form{action: "/annotator_recommender_form", method: "post"} - %textarea.home-recommendations-and-annotations{rows: "6" , placeholder: "Paste a paragraph of text or some keywords ...", name: "text"} + %textarea.home-recommendations-and-annotations{rows: "6" , placeholder: "Paste a paragraph or some keywords to be recommended/annotated ...", name: "text"} %input.hide{type: "submit", name: "submit_button" ,value: "annotator", id: "annotator_submit"}/ %input.hide{type: "submit" , name: "submit_button" ,value: "recommender", id: "recommender_submit"}/ .home-services-buttons @@ -150,27 +156,129 @@ = number_with_delimiter(@users_count, :delimiter => ",") %p Users .home-section - .home-section-sub-sections-container - .home-sub-section-left - %h4 Supported by + .home-statistics-container + .home-support-title + %p Supported by %hr.home-section-line/ - .home-card.home-logos - %img{:src => asset_path("logos/supports/numev.png")}/ - %img{:src => asset_path("logos/supports/anr.png")}/ - %img{:src => asset_path("logos/supports/eu.png")}/ - .home-sub-section-right - %h4 With the colaboration of + .home-support-items + %img{src: asset_path("logos/supports/numev.png")}/ + %img{src: asset_path("logos/supports/anr.png")}/ + %img{src: asset_path("logos/supports/eu.png")}/ + .home-support-title + %p With the collaboration of %hr.home-section-line/ - .home-card.home-logos - %img{:src => asset_path("logos/collaboration/d2kab.png")}/ - %img{:src => asset_path("logos/collaboration/lirmm.png")}/ - %img{:src => asset_path("logos/collaboration/stanford.png")}/ - %img{:src => asset_path("logos/collaboration/inrae.png")}/ + .home-support-items + %img{src: asset_path("logos/collaboration/d2kab.png")}/ + %img{src: asset_path("logos/collaboration/lirmm.png")}/ + %img{src: asset_path("logos/collaboration/stanford.png")}/ + %img{src: asset_path("logos/collaboration/inrae.png")}/ + + :javascript - function submitAnnotator(){ - document.getElementById("annotator_submit").click() + var ontologies = #{raw(@ontology_names.to_json)}; + + const input = document.getElementById("home-search"); + const dropdown = document.getElementById("home-search-drop-down"); + const ontology = document.getElementById("seached-ontology"); + const searchOntologyContent = document.getElementById("home-search-ontology-content") + let breaker = 0; + + + function scrollDown(currentScroll) { + const startPosition = window.pageYOffset; + const distance = 300 - currentScroll; + const duration = 1000; + let start = null; + + function scrollAnimation(timestamp) { + if (!start) start = timestamp; + const progress = timestamp - start; + const scrollPosition = startPosition + easeInOutCubic(progress, 0, distance, duration); + window.scrollTo(0, scrollPosition); + if (progress < duration) { + window.requestAnimationFrame(scrollAnimation); + } + } + + function easeInOutCubic(t, b, c, d) { + t /= d / 2; + if (t < 1) return c / 2 * t * t * t + b; + t -= 2; + return c / 2 * (t * t * t + 2) + b; + } + + window.requestAnimationFrame(scrollAnimation); } - function submitRecommender(){ - document.getElementById("recommender_submit").click() - } \ No newline at end of file + + + + + input.addEventListener("input", function() { + let results_list = [] + const inputValue = input.value.trim(); + if (inputValue.length > 0) { + + ontology.innerHTML = inputValue; + searchOntologyContent.href = "/search?query="+inputValue; + dropdown.innerHTML = "" + breaker = 0 + for (var i = 0; i < ontologies.length; i++) { + if (breaker == 4){ + break; + } + // Get the current item from the ontologies array + var item = ontologies[i]; + + // Check if the item contains the substring + if (item[0].toLowerCase().includes(inputValue.toLowerCase()) || item[1].toLowerCase().includes(inputValue.toLowerCase())) { + results_list.push(item); + breaker = breaker + 1 + } + } + + results_list.forEach(function(item) { + const link = document.createElement("a"); + link.href = "/ontologies/"+item[1]; + link.className = "home-search-ontology-content"; + + const p1 = document.createElement("p"); + p1.id = "seached-ontology"; + p1.className = "home-searched-ontology"; + p1.textContent = item[0]+" "+"("+item[1]+")"; + + const p2 = document.createElement("p"); + p2.className = "home-result-type"; + p2.textContent = "Ontology"; + + link.appendChild(p1); + link.appendChild(p2); + + dropdown.appendChild(link); + + + }); + dropdown.appendChild(searchOntologyContent); + dropdown.style.display = "block"; + input.classList.add("home-dropdown-active"); + + if (window.scrollY < 300) { + scrollDown(window.scrollY); + } + + + } else { + dropdown.style.display = "none"; + input.classList.remove("home-dropdown-active"); + } + }); + dropdown.addEventListener("mousedown", function(event) { + event.preventDefault(); // prevent the blur event from firing + }); + + input.addEventListener("blur", function() { + + dropdown.style.display = "none"; + input.classList.remove("home-dropdown-active"); + }); + \ No newline at end of file diff --git a/app/views/recommender/index.html.haml b/app/views/recommender/index.html.haml index ccb96e02c..f5ff17276 100644 --- a/app/views/recommender/index.html.haml +++ b/app/views/recommender/index.html.haml @@ -114,5 +114,6 @@ document.getElementById("inputText").value = value if(document.getElementById("inputText").value != ''){ document.getElementById("recommenderButton").click() + window.scrollBy(0, 1080); } }); \ No newline at end of file From 50c5f215885b20277f0a7592fccec3154f348a0c Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 00:44:36 +0200 Subject: [PATCH 099/533] extract EditSubmissionAttributeButton component --- ...t_submission_attribute_button_component.rb | 24 +++++++++++++++++++ .../_attribute_inline_editable.html.haml | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 app/components/edit_submission_attribute_button_component.rb diff --git a/app/components/edit_submission_attribute_button_component.rb b/app/components/edit_submission_attribute_button_component.rb new file mode 100644 index 000000000..a4ef5bbc7 --- /dev/null +++ b/app/components/edit_submission_attribute_button_component.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +class EditSubmissionAttributeButtonComponent < ViewComponent::Base + include ActionView::Helpers::TagHelper + + def initialize(acronym: , submission_id:, attribute:, inline: false) + @acronym = acronym + @submission_id = submission_id + @attribute = attribute + + if inline + @link = "ontologies_metadata_curator/#{@acronym}/submissions/#{@submission_id}?properties=#{@attribute}&inline_save=true" + else + @link = "/ontologies/#{@acronym}/submissions/#{@submission_id}/edit?properties=#{@attribute}" + end + end + + def call + link_to @link, data: {turbo: true}, class: "btn btn-sm btn-light" do + content + end + end + +end diff --git a/app/views/ontologies_metadata_curator/_attribute_inline_editable.html.haml b/app/views/ontologies_metadata_curator/_attribute_inline_editable.html.haml index b2fdeedcb..7358a35e0 100644 --- a/app/views/ontologies_metadata_curator/_attribute_inline_editable.html.haml +++ b/app/views/ontologies_metadata_curator/_attribute_inline_editable.html.haml @@ -20,5 +20,5 @@ %div - %a.btn.btn-sm.btn-light{href: "ontologies_metadata_curator/#{ontology.acronym}/submissions/#{submission_id}?properties=#{attribute}&inline_save=true", data: {turbo: true}} - %i.far.fa-edit + = render EditSubmissionAttributeButtonComponent.new(acronym: ontology.acronym, submission_id: submission_id, attribute: attribute, inline: true) do + %i.far.fa-edit \ No newline at end of file From d6d39e1bda7bb4259ac46af062f7d2251c2251fc Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 00:46:48 +0200 Subject: [PATCH 100/533] in ontology viewer show in an information text if no language defined --- app/helpers/ontologies_helper.rb | 13 ++++++++++++- app/views/layouts/_ontology_viewer.html.haml | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index b180fcc4e..7a26747b1 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -447,7 +447,18 @@ def sections_to_show def language_selector_tag(name) - select_tag name, languages_options, class: 'custom-select', disabled: !ontology_data_section?, data: {'ontology-viewer-tabs-target': 'languageSelector'} + languages = languages_options + + if languages.empty? + content_tag(:div ,data: {'ontology-viewer-tabs-target': 'languageSelector'}, style: "visibility: #{ontology_data_section? ? 'visible' : 'hidden'} ; margin-bottom: -1px;") do + render EditSubmissionAttributeButtonComponent.new(acronym: @ontology.acronym, submission_id: @submission_latest.submissionId, attribute: :naturalLanguage) do + concat "Enable multilingual display " + concat content_tag(:i , "", class: "fas fa-lg fa-question-circle") + end + end + else + select_tag name, languages_options, class: 'custom-select', disabled: !ontology_data_section?, style: "visibility: #{ontology_data_section? ? 'visible' : 'hidden'}; margin-bottom: -10px;", data: {'ontology-viewer-tabs-target': 'languageSelector'} + end end def language_selector_hidden_tag(section) diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index 2fbcd8e9c..d2ad4caea 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -49,7 +49,7 @@ %div.col - sections = sections_to_show %div.card - %div.card-header{style: 'padding-bottom: 3px'} + %div.card-header %div{style: "display: flex; justify-content: space-between;"} %ul.nav.nav-tabs.card-header-tabs{id: "navbar-ontology", role: "tablist"} - sections.each do |section| From 7463fe87c3655e240ff6e822b6808afe61fdc9ba Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 00:48:05 +0200 Subject: [PATCH 101/533] in ontology viewer hide the language selector if no language defined --- .../controllers/ontology_viewer_tabs_controller.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/javascript/controllers/ontology_viewer_tabs_controller.js b/app/javascript/controllers/ontology_viewer_tabs_controller.js index a36cf7de6..f8cb2a310 100644 --- a/app/javascript/controllers/ontology_viewer_tabs_controller.js +++ b/app/javascript/controllers/ontology_viewer_tabs_controller.js @@ -31,8 +31,8 @@ export default class extends Controller { } #updateURL(event){ - const page = jQuery(event.target).attr("data-bp-ont-page"); - const page_name = jQuery(event.target).attr("data-bp-ont-page-name"); + const page = event.target.getAttribute("data-bp-ont-page"); + const page_name = event.target.getAttribute("data-bp-ont-page-name"); (new HistoryService()).pushState({p: page}, page_name + " | " + jQuery(document).data().bp.ont_viewer.org_site, "?p=" + page); @@ -42,8 +42,10 @@ export default class extends Controller { #disableLanguageSelector(selectedSection){ if (this.languageSectionsValue.includes(selectedSection)){ this.languageSelectorTarget.removeAttribute("disabled") + this.languageSelectorTarget.style.visibility = 'visible' } else{ this.languageSelectorTarget.setAttribute("disabled", true) + this.languageSelectorTarget.style.visibility = 'hidden' } } From f809e1bedcf98f04233d1966fc826f5f90788f5f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 00:48:47 +0200 Subject: [PATCH 102/533] fix the submission edit page to show the selected attributes in the URL --- app/views/submissions/_form.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/submissions/_form.html.haml b/app/views/submissions/_form.html.haml index c98657349..75f859318 100644 --- a/app/views/submissions/_form.html.haml +++ b/app/views/submissions/_form.html.haml @@ -44,7 +44,7 @@ - unless @filters_disabled %div.w-75.mt-3 - if @submission.id - = render MetadataSelectorComponent.new(label: 'Filter properties to show', values: submission_editable_properties , selected: nil, inline: true) + = render MetadataSelectorComponent.new(label: 'Filter properties to show', values: submission_editable_properties , selected: @selected_attributes, inline: true) %div = render SwitchInputComponent.new(id:"filter-required-only", name: "required-only", label: "Required only", checked: @required_only) From 7ebf5cc897f39dc001df767d6b35065ee0fa399c Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 00:50:09 +0200 Subject: [PATCH 103/533] fix summary page submissions table to not show the loader in the bottom --- app/views/ontologies/sections/_metadata.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/ontologies/sections/_metadata.html.haml b/app/views/ontologies/sections/_metadata.html.haml index 46c942e61..f8711102a 100644 --- a/app/views/ontologies/sections/_metadata.html.haml +++ b/app/views/ontologies/sections/_metadata.html.haml @@ -68,7 +68,7 @@ - unless (@submission_latest.nil? || (@submission_latest.respond_to?(:status) && @submission_latest.status == 404)) = link_to(edit_ontology_submission_path(@ontology.acronym, @submission_latest.submissionId), "aria-label": "Edit latest submission", title: "Edit latest submission") do %i.fas.fa-user-edit{"aria-hidden": "true", style: "margin-left: 0.5rem;"} - = render TurboFrameComponent.new(id: 'ontology_submissions', src: ontology_submissions_path(@ontology.acronym)) + = render TurboFrameComponent.new(id: 'ontology_submissions', src: ontology_submissions_path(@ontology.acronym), target: '_top') -# Views pane (don't show if the ontology is a view - we don't allow views of views). From 276760c4225d41072457db4de4b22b9ed32f9ad4 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 03:08:28 +0200 Subject: [PATCH 104/533] mount the lookbook only in the development environnement --- config/routes.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 96794aeac..6e5d0c1ea 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -207,6 +207,9 @@ get '/visualize' => 'ontologies#visualize', :as => :visualize_concept, :constraints => { ontology: /[^\/?]+/, id: /[^\/?]+/, ontologyid: /[^\/?]+/, conceptid: /[^\/?]+/ } get '/exhibit/:ontology/:id' => 'concepts#exhibit' - - mount Lookbook::Engine, at: "/lookbook" + + if Rails.env.development? + mount Lookbook::Engine, at: "/lookbook" + end + end From 7c75a1cdbc44ba5e18336bfee67c5613a71b831a Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 03:09:22 +0200 Subject: [PATCH 105/533] put "lookbook" gem in development group and pin to the latest path of v1 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index dbf11f58b..6760c3e10 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,6 @@ gem 'rest-client' gem 'stackprof', require: false gem 'thin' gem 'view_component', '~> 2.72' -gem "lookbook" gem 'turnout' gem 'will_paginate', '~> 3.0' @@ -85,7 +84,7 @@ group :staging, :production, :appliance do end group :development do - # Capistrano Deployment + # Capistrano Deployment gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0', require: false # https://github.com/miloserdow/capistrano-deploy/issues/42 gem 'capistrano', '~> 3.11', require: false gem 'capistrano-bundler', require: false @@ -105,6 +104,7 @@ group :development do # Use console on exceptions pages [https://github.com/rails/web-console] gem 'web-console' + gem "lookbook", '~> 1.5.5' end group :test, :development do From 67a74d6d7cb66ef88b59e3b79552f673bbb81e5d Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 03:20:32 +0200 Subject: [PATCH 106/533] align and center previewed components --- app/views/layouts/component_preview.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/component_preview.html.erb b/app/views/layouts/component_preview.html.erb index 40a42adf7..bc38bff11 100644 --- a/app/views/layouts/component_preview.html.erb +++ b/app/views/layouts/component_preview.html.erb @@ -4,7 +4,7 @@ <%= stylesheet_link_tag "application" %> - + <%= yield %> From 91ef6dd326144ec14421e26b8c5987cac6c1d1bc Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 03:21:02 +0200 Subject: [PATCH 107/533] add alert message component preview --- test/components/previews/alert_component_preview.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 test/components/previews/alert_component_preview.rb diff --git a/test/components/previews/alert_component_preview.rb b/test/components/previews/alert_component_preview.rb new file mode 100644 index 000000000..23e6bb3a7 --- /dev/null +++ b/test/components/previews/alert_component_preview.rb @@ -0,0 +1,12 @@ +class AlertComponentPreview < ViewComponent::Preview + + # @param message text + # @param type select [primary, danger, success, info, light] + + def default(type: "success", message: "Here we can type a success or failure message to the user") + render AlertMessageComponent.new(id: '', type: type) do + message + end + end + +end \ No newline at end of file From 706463de835ee260f53fe52f681bfcae1e1b2608 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 05:12:56 +0200 Subject: [PATCH 108/533] migrate URI::escape to the escape helper --- app/views/admin/categories/edit.html.haml | 2 +- app/views/admin/groups/edit.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/categories/edit.html.haml b/app/views/admin/categories/edit.html.haml index 31511a88a..b3706314d 100644 --- a/app/views/admin/categories/edit.html.haml +++ b/app/views/admin/categories/edit.html.haml @@ -1,6 +1,6 @@ - @title = "Edit category" %div - = form_for :category, url: admin_categories_path + "/" + URI::escape(@category.acronym), method: "PATCH", remote: true, data: { collection: "categories"}, html: {class: "admin-collection-form" } do |f| + = form_for :category, url: admin_categories_path + "/" + escape(@category.acronym), method: "PATCH", remote: true, data: { collection: "categories"}, html: {class: "admin-collection-form" } do |f| = render partial: "form", locals: {f: f, title_text: "Edit category", button_text: "Edit category", button_class: "edit-category"} diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml index 76909dcc4..d51cf7123 100644 --- a/app/views/admin/groups/edit.html.haml +++ b/app/views/admin/groups/edit.html.haml @@ -1,6 +1,6 @@ - @title = "Edit group" %div - = form_for :group, url: admin_groups_path + "/" + URI::escape(@group.acronym), method: "PATCH", remote: true, data: { collection: "groups"}, html: {class: "admin-collection-form" } do |f| + = form_for :group, url: admin_groups_path + "/" + escape(@group.acronym), method: "PATCH", remote: true, data: { collection: "groups"}, html: {class: "admin-collection-form" } do |f| = render partial: "form", locals: {f: f, title_text: "Edit group", button_text: "Edit group", button_class: "edit-group"} From d2bce043314a1e7e72ab153b9c3af8601a96a03b Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 05:13:30 +0200 Subject: [PATCH 109/533] update categories and groups controllers to use response_error? helper --- app/controllers/admin/categories_controller.rb | 7 ++++--- app/controllers/admin/groups_controller.rb | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb index 4f766a84f..2af3f9143 100644 --- a/app/controllers/admin/categories_controller.rb +++ b/app/controllers/admin/categories_controller.rb @@ -33,7 +33,7 @@ def create begin category = LinkedData::Client::Models::Category.new(values: category_params) category_saved = category.save - if category_saved && category_saved.errors + if response_error?(category_saved) response[:errors] = response_errors(category_saved) else response[:success] = "category successfully created in #{Time.now - start}s" @@ -52,7 +52,8 @@ def update category = LinkedData::Client::Models::Category.find_by_acronym(params[:id]).first category.update_from_params(category_params) category_update = category.update - if category_update && category_update.errors + + if response_error?(category_update) response[:errors] = response_errors(category_update) else response[:success] = "category successfully updated in #{Time.now - start}s" @@ -70,7 +71,7 @@ def destroy category = LinkedData::Client::Models::Category.find_by_acronym(params[:id]).first error_response = category.delete - if error_response + if response_error?(error_response) response[:errors] = response_errors(error_response) else response[:success] = "category successfully deleted in #{Time.now - start}s" diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 48e861e03..842982957 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -33,7 +33,7 @@ def create begin group = LinkedData::Client::Models::Group.new(values: group_params) group_saved = group.save - if group_saved && group_saved.errors + if response_error?(group_saved) response[:errors] = response_errors(group_saved) else response[:success] = "group successfully created in #{Time.now - start}s" @@ -52,7 +52,7 @@ def update group = LinkedData::Client::Models::Group.find_by_acronym(params[:id]).first group.update_from_params(group_params) group_updated = group.update - if group_updated && group_updated.errors + if response_error?(group_updated) response[:errors] = response_errors(group_updated) else response[:success] = "group successfully updated in #{Time.now - start}s" @@ -70,7 +70,7 @@ def destroy group = LinkedData::Client::Models::Group.find_by_acronym(params[:id]).first error_response = group.delete - if error_response + if response_error?(error_response) response[:errors] = response_errors(error_response) else response[:success] = "group successfully deleted in #{Time.now - start}s" From 9b6768469fa7fc30178302f6ffdc66d756aaf778 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 07:45:19 +0200 Subject: [PATCH 110/533] add footer translation feature --- config/locales/en.yml | 545 +++++++++++++++++++++++++++++++++++------- 1 file changed, 463 insertions(+), 82 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index b37ebbb55..1af0c436b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,66 +1,9 @@ en: - - about: > -
    -

    Abstract

    -

    - Many vocabularies and ontologies are produced to represent and annotate agronomic data. Therefore, there is a need of - a common platform to identify, host and use them in agro-informatics application. The AgroPortal project aims to offer - a reference ontology repository for agronomy, reusing the NCBO BioPortal technology. The scientific outcomes and the - experience of the biomedical domain are thus exploited and transposed in the agronomy domain, including plants, food, - environment and possibly animal sciences. We offer an ontology portal which features ontology hosting, search, versioning, - visualization, comment, recommendation, enables semantic annotation, as well as storing and exploiting ontology alignments. - All of these within a fully semantic web compliant infrastructure. The AgroPortal specifically pays attention to respect the - requirements of the agronomic community in terms of ontology formats (e.g., SKOS, trait dictionaries) or supported features. - AgroPortal project is based on five driving agronomic use cases which participate in the design and orientation of the platform. - AgroPortal already offers a robust and stable reference repository highly valuable for the agronomic domain. -

    -

    Use cases

    - -
    -

    New features

    -

    - See the release notes -

    -
    -

    Partners

    -

    The National Center For Biomedical Ontology (NCBO), Institut de Recherche pour le Développement (IRD), Research Data Alliance (RDA), - Bioversity International, Food & Agriculture Organization (FAO), Global Open Data for Agriculture & Nutrition (Godan Action), Institut National de la Recherche Agronomique (INRA)

    -

    Acknowledgments

    -

    The AgroPortal is partly achieved within the Semantic Indexing of French biomedical Resources (SIFR) project - that received funding from the EU H2020 research and innovation programme under the Marie Sklodowska-Curie (grant 701771) - and the French National Research Agency (grant ANR-12-JS02-01001), the NUMEV Labex (grant ANR-10-LABX-20), - the Computational Biology Institute of Montpellier (grant ANR-11-BINF-0002) as well as by University of Montpellier and the CNRS. - We also thank the National Center for Biomedical Ontologies for help and time spent with us in deploying the AgroPortal.

    -

    Team

    - To contact us: firstname.lastname@lirmm.fr -
      -
    • Clément Jonquet, researcher at LIRMM (Univ. of Montpellier, France), main investigator of the AgroPortal project
    • -
    • Anne Toulet, researcher at LIRMM (Univ. of Montpellier, France)
    • -
    • Vincent Emonet, engineer at LIRMM (Univ. of Montpellier, France)
    • -
    -
    - - activerecord: - errors: - models: - license: - attributes: - encrypted_key: - invalid_license_key: is an invalid license key - no_appliance_id_for_comparison: couldn't be validated. Unable to retrieve virtual appliance ID. - appliance_id_mismatch: is an appliance ID mismatch - - admin: - licenses: - create: - success: License successfully renewed! + nbco_annotatosplus: + score_help: "Score annotations following previous NCBO 2009 measure (old) or Score annotations following C-Value measure (cvalue) or Score annotations following C-Value measure with hierarchy expansion (cvalueh)" + start_typing_to_select: "Start typing to select %{type} or leave blank to use all" + include_ancestors_up_to_level: "Include ancestors up to level" + include_score: "Include score" date: formats: @@ -116,7 +59,48 @@ en: tooltip: "Enable FastContext to detect : if a concept has been negated (affirmed, negated), who experienced the found concept (patient, other), when the annotated concept occurred (recent, historical, hypothetical), and/or if the annotated concept is uncertain (certain, uncertain)." sample_text: Melanoma is a malignant tumor of melanocytes which are found predominantly in skin but also in the bowel and the eye. - nbco_annotatosplus: + select: "Select %{name}" + + fast_context: + title: "FastContext" + help: "Activate FastContext to detect: if a concept has been negated (affirmed, negated), who experienced the concept found (patient, other), when the annotated concept occurred (recent, historical, hypothetical), and/or if the annotated concept is uncertain (certain, uncertain)." + + annotations: "Annotations" + + filters: + by: + filter: "Filter" + title: "Results are filtered by" + class: "Class" + ontology: "Ontology" + match_type: "Type" + match_context: "Context" + matched_class: "Associated Class" + matched_ontology: "Associated Ontology" + umls_sem_type: "UMLS Semantic Type" + score: "Score" + negation: "Negation" + experiencer: "Experiencer" + temporality: "Temporality" + certainty: "Certainty" + + additional_parameters_explained_at: "Additional parameters are explained on the page:" + format_results_as: "Format results as:" + reproduce_results_using: "Reproduce these results using the" + match_longest_only: "Match longest only" + match_partial_words: "Recognize partial words" + include_mappings: "Include mappings" + exclude_numbers: "Exclude numbers" + exclude_synonyms: "Exclude synonyms" + max_hierarchy_level: "Include ancestors up to level" + score: "Include score" + score_help: "Score annotations according to the previous NCBO 2009 measure (old) or score annotations using the C-Value measure (cvalue) or score annotations using the C-Value measure with hierarchy expansion (cvalueh)" + score_threshold: "Filter by score threshold" + score_threshold_help: "Specify the minimum score value for annotations" + confidence_threshold: "Filter confidence threshold" + confidence_threshold_help: "Specify the minimum position in the scores distribution (between 1 and 100)" + entity_recognizer: "entity recognition tool" + index: intro: > The NCBO Annotator+ is a proxy calling the NCBO Annotator Web service on the NCBO BioPortal. @@ -144,28 +128,425 @@ en: index: intro: Browse a selection of projects that use %{site} resources + landscape: + title: "%{site} Landscape" + intro: Visualize data retrieved from ontologies stored in the portal + groups_and_categories: Groups and Categories + ontologies_by: "Ontologies by %{type}" + ontologies_count_by_catalog: Number of ontologies in each data catalog + properties_use: Property Usage + properties_usage_proportion: The proportion of properties usage among stored ontologies + ontologies_languages: Natural languages of ontologies + ontologies_licenses: Licenses used by ontologies + ontology_tools: Most used tools to build ontologies + more_properties_charts: More properties charts + ontology_properties_pie_charts: Pie charts for the properties used in ontologies + owl_ontology_preflabel_uris: URIs for prefLabel properties used for OWL ontologies + owl_ontology_synonym_uris: URIs for synonym properties used for OWL ontologies + owl_ontology_definition_uris: URIs for definition properties used for OWL ontologies + owl_ontology_author_uris: URIs for author properties used for OWL ontologies + ontology_types: Ontology types + ontology_formality_levels: Formality levels of ontologies + ontologies_formats: Format used + ontologies_contributors: Contributors to ontology development + most_active_people: Most active people + most_mentioned_people: Most mentioned people as contact, creator, contributor or curator + most_active_organizations: Most active organizations + funding_endorsing_organizations: Organizations funding and endorsing the most ontologies + ontologies_activity_on: "Ontology Activity on %{site}" + most_active_people_as_reviewer: "Most active people as reviewers" + most_mentioned_people_as_reviewer: People who published notes, reviews, and projects + most_active_ontologies: "Most active ontologies" + ontologies_with_notes_reviews_projects: "Ontologies with notes, reviews, and projects" + ontology_relations_network: "Ontology Relations Network" + relations_between_stored_ontologies: "Relations between stored ontologies in the portal" + filter_network: "Filter network" + ontology_fairness_evaluator: "Ontology FAIRness Evaluator (O’FAIRe)" + average_metrics: "Average metrics" + group: Group + category: Category + size: Size + + home: + find_ontology: "Find an ontology" + search_class: "Search Class" + browse_by_group: "Browse by Group" + browse_ontologies: "Browse ontologies" + comprehensive_repository: "the most comprehensive repository of biomedical ontologies in the world" + advanced_search: "Advanced Search" + ontology_visits: "Ontology visits" + fair_scores: "FAIR Scores" + clear_selection: "Clear Selection" + latest_notes: "Latest Notes" + ontologies: "Ontologies" + classes: "Classes" + individuals: "People" + projects: "Projects" + users: "Users" + no_recent_notes: "No recent notes were submitted" + index: + find_ontology_placeholder: Start typing the ontology name, then choose from + query_placeholder: Enter a class, eg Melanoma + tagline: the world's most comprehensive repository of biomedical ontologies + title: Welcome to the %{organization} + welcome: Welcome to the %{site}, + help: + welcome: Welcome to the %{site} of the National Center for Biomedical Ontology. %{site} is a web application for accessing and sharing biomedical ontologies. + getting_started: > + %{site} allows users to browse, upload, download, search, comment, and create mappings for ontologies. + browse: > + Users can browse and explore individual ontologies by navigating either in a tree structure or in an animated graphical view. Users can also view mappings and + ontology metadata and ontology download. Additionally, logged in users can submit a new ontology to the library. + rest_examples_html: View documentation and examples for the %{site} REST API. + announce_list_html: > + To receive notices of new releases or site outages, please subscribe to + bioontology support list. + + recommend: + intro: Get recommendations for the most relevant ontologies from an excerpt of a biomedical text or a list of keywords + title: "recommender" + ontology_recommender: "Ontology Recommender" + ontology_recommendation_input: "Please paste a paragraph of text or some keywords to compute ontology recommendations." + weight_sum_greater_than_zero: "The sum of weights must be greater than zero" + weights_greater_than_zero: "All weights must be greater than or equal to zero" + valid_numeric_weights: "All weights must be valid numeric values" + valid_integer_max_ontologies_per_set: "Max ontologies per set must be a valid integer value" + valid_max_ontologies_per_set_range: "Max ontologies per set must be a number between 2 and 4" + recommendation_error: "Problem retrieving recommendations, please try again" + no_recommendations: "No recommendations found" + no_sets_recommended: "There are no recommended ontology sets for the provided input. Please try the 'Ontologies' output." + text_length_limit: "Please use less than 500 words. If you need to annotate longer pieces of text, you can use the recommendation web service." + + mappings: + title: "Correspondences" + upload_mappings: "Upload mappings" + mappings_bulk_load: "Mapping Bulk Load" + intro: "Browse mappings between classes of different ontologies" + no_mappings_available: "No mappings available" + loading_mappings: "Loading mappings..." + find_mappings: "Find mappings of a class/concept" + view_mappings_help: "View mappings help" + select_class: "Start typing to select a class" + select_ontologies: "Start typing to select ontologies or leave blank to use all ontologies" + select_semantic_types: "Select UMLS semantic types" + select_semantic_types_help: "Start typing to select UMLS semantic types or leave blank to use all types" + select_semantic_groups: "Select UMLS semantic groups" + select_semantic_groups_help: "Start typing to select UMLS semantic groups or leave blank to use all groups" + include_ancestors_up_to_level: "Include ancestors up to level" + include_score: "Include score" + + annotator: + title: "Annotator" + get_annotator: "Get annotations" + filters: + match_longest_only: "Match longest only" + match_partial_words: "Recognize partial words" + include_mappings: "Include Mappings" + exclude_numbers: "Exclude Numbers" + exclude_synonyms: "Exclude synonyms" + max_hierarchy_level: "Include ancestors up to level" + score: "Include score" + score_help: "Score annotations following previous NCBO 2009 measure (old) or Score annotations following C-Value measure (cvalue) or Score annotations following C-Value measure with hierarchy expansion (cvalueh)" + score_threshold: "Filter by score threshold" + score_threshold_help: "Specify minimum score value for annotations" + confidence_threshold: "Filter Confidence Threshold" + confidence_threshold_help: "Specify the minimum position in the score distribution (between 1 and 100)" + recognizer recognizer: "entity recognition tool" + start_typing_to_select: "Start typing to select %{type} or leave blank to use all" + select: "Select %{name}" + enter_or_paste_text: "Enter or paste text to annotate" + fast_context: "FastContext" + lemmatize: "Lemmatize" + annotations_result: "Annotations" + results_filtered_by: "Results are filtered by" + + umls: + semantic_types: "UMLS Semantic Types" + semantic_groups: "UMLS Semantic Groups" + index: + intro: Get annotations for biomedical text with ontology classes + annotatorplus_html: Check out the beta version of AnnotatorPlus; a new version of the Annotator with added support for negation, and more! + fast_context: + tooltip: "Enable FastContext to detect: if a concept was denied (affirmed, denied), who experienced the found concept (patient, other), when the annotated concept occurred (recent, historical, hypothetical), and/ or if the annotated concept is uncertain (certain, uncertain)." + lemmatize: + tooltip: "Enable Lemmatize to lemmatize submitted text and use a lemmatized dictionary for annotations" + sample_text: Melanoma is a malignant tumor of melanocytes found mainly in the skin but also in the intestine and the eye. + + ontology_details: + metadata: + details: "Details" + acronym: "Acronym" + visibility: "Visibility" + viewing_restriction: "Viewing Restriction" + view_of_ontology: "View of ontology" + description: "Description" + status: "Status" + format: "Format" + contact: "Contact" + categories: "Categories" + groups: "Groups" + pull_url: "Pull URL" + submissions: "Submissions" + links: "Links" + add_submission: "Add Submission" + views_of: "Views of" + create_new_view: "Create a new view" + no_views_of: "No views of %{name} available" + go_to_rest_api_json_entry: "Go to REST API JSON Entry" + get_my_metadata_back: "Get my metadata back" + n_triple: "N-Triple" + json_ld: "JSON-LD" + rdf_xml: "RDF/XML" + view_individual_metrics_definitions: "View individual metrics definitions" + metrics: "Metrics" + metrics_not_calculated_yet: "We have not yet calculated metrics for" + classes: "Classes" + individuals: "Individuals" + properties: "Properties" + max_depth: "Maximum depth" + max_children: "Maximum number of children" + avg_children: "Average number of children" + single_child_classes: "Classes with a single child" + many_children_classes: "Classes with more than 25 children" + no_definition_classes: "Classes without definition" + visits: "Visits" + download_as_csv: "Download as CSV" + projects_using: "Projects Using" + no_projects_using: "No projects are using" + create_new_project: "Create a new project" + additional_metadata: "Additional Metadata" + + layout: + header: + browse: "Browse" + search: "Search" + mappings: "Mappings" + recommend: "Recommend" + annotator: "Annotator" + ncbo_annotator_plus: "NCBO Annotator+" + projects: "Projects" + landscape: "Landscape" + login: "Login" + account_setting: "Account Settings" + submit_feedback: "Send Feedback" + help: "Help" + release_notes: "Release Notes" + publications: "Publications" + footer: + products: Products + ontoportal: OntoPortal + release_notes: Release Notes + api: API + sparql: SPARQL + support: Support + contact_us: Contact Us + wiki: Wiki + documentation: Documentation + agreements: Agreements + terms: Terms + privacy_policy: Privacy Policy + cite_us: Cite Us + acknowledgments: Acknowledgments + about: About + about_us: About Us + projects: Projects + team: Team + copyright_html: Copyright © 2005-2022, Leland Stanford Junior University Board of Trustees. All rights reserved. + grant_html: > + %{site} is currently being developed as part of the ANR D2KAB project (ANR-18-CE23-0017). It receives or has also received support from the ANR SIFR project (ANR-12-JS02-0010), European Union Project H2020-MSCA SIFRm (N° 701771), the Labex NUMEV (ANR-10-LABX-20), the Montpellier IBC project (ANR-11 -BINF0002) , the Agro Labex (ANR-10-LABX-0001) as well than the University of Montpellier and the CNRS. + notes: + license_contact: > + For more information, email support@ontoportal.org or + visit https://ontoportal.org/licensing. + license_obtain: > + If you are the owner of this OntoPortal installation, you can visit + https://license.ontoportal.org to obtain a license. + license_expired: > + We're sorry, but the license for this OntoPortal installation has expired. If you are the owner of this OntoPortal installation, + please visit https://license.ontoportal.org to renew your license. + license_trial: + one: This OntoPortal appliance installation is a trial license, which will expire in 1 day. + other: This OntoPortal appliance installation is a trial license, which will expire in %{count} days. + # Other + + about: > +
    +

    Summary

    +

    + Many vocabularies and ontologies are produced to represent and annotate agronomic data. It is therefore necessary to have a common platform to identify them, host them and use them in agro-informatics applications. The AgroPortal project aims to provide a repository of reference ontologies for agronomy, by reusing the NCBO BioPortal technology. The scientific results and the experience of the biomedical field are thus exploited and transposed in the field of agronomy, including plants, food, the environment and possibly animal sciences. We propose an ontology portal that offers ontology hosting, search, versioning, visualization, commenting, recommendation, allows semantic annotation, as well as storing and exploiting alignments of ontologies. All this in an infrastructure fully compliant with the Semantic Web. The AgroPortal project pays particular attention to meeting the requirements of the agronomic community in terms of ontology formats (e.g. SKOS, trait dictionaries) or supported functionalities. The AgroPortal project is based on five agronomic use cases that participate in the design and orientation of the platform. AgroPortal already offers a robust and stable reference repository, of great value for the field of agronomy. +

    +

    Use cases

    + +
    +

    New Features

    +

    + See the release-notes +

    +
    +

    Partners

    +

    The National Center for Biomedical Ontology (NCBO), the Research Institute for Development (IRD), Research Data Alliance (RDA), + Bioversity International, Food & Agriculture Organization (FAO), Global Open Data for Agriculture & Nutrition (Godan Action), National Institute for Agronomic Research (INRA)

    +

    thanks

    +

    The AgroPortail is partly produced as part of the Semantic Indexing of French Biomedical Resources project (SIFR) + who have received funding from the EU H2020 research and innovation program under Marie Sklodowska-Curie (grant 701771) + and the National Research Agency (ANR-12-JS02-01001 grant), Labex NUMEV (ANR-10-LABX-20 grant), + the Institute of Computational Biology of Montpellier (grant ANR-11-BINF-0002) as well as by the University of Montpellier and the CNRS. + We also thank the National Center of Biomedical Ontologies for their help and the time spent with us in the deployment of the AgroPortail.

    +

    Team

    + To contact us: firstname.lastname@lirmm.fr +
      +
    • Clément Jonquet, researcher at LIRMM (Univ. of Montpellier, France), principal investigator of the AgroPortal project
    • +
    • Anne Toulet, researcher at LIRMM (Univ. of Montpellier, France)
    • +
    • Vincent Emonet, engineer at LIRMM (Univ. of Montpellier, France)
    • +
    +
    + + activaterecord: + errors: + models: + license: + attributes: + encrypted_key: + invalid_license_key: is an invalid license key + no_appliance_id_for_comparison: Could not be validated. Unable to retrieve virtual appliance ID. + appliance_id_mismatch: is an appliance id mismatch + + admin: + licenses: + create: + success: License renewed successfully! + + date: + formats: + year_month_day_concise: "%Y-%m-%d" # 2017-03-01 + month_day_year: "%b %-d, %Y" # Mar 1, 2017 + monthfull_day_year: "%B %-d, %Y" # March 1, 2017 + ontologies: - intro: Browse the library of ontologies + self: "Ontologies" + loading: Loading ontologies + intro: Browse the Ontology Library + please_wait: Please wait.. + browse: Explore + welcome_admin: Welcome admin + admin_help: This color indicates features reserved for administrators + debug_info: Debug Info + submit_new_ontology: Submit a new ontology + entry_type: Entry Type + uploaded_in_the_last: Uploaded in the last concepts: request_term: new_term_instructions: > -

    This ontology integrates with OntoloBridge, allowing community users to suggest additions to the public ontology. Complete the template below to submit a term request directly to the ontology maintainer.

    -
    -

    Term Label (required)
    Suggested term name. If a term can be described with multiple synonyms, only list the preferred name here.

    -
    -
    -

    Term description (required)
    A brief definition, description, or usage of your suggested term. Additional term synonyms may be listed in this section.

    -
    -
    -

    Superclass (required)
    The parent term of the suggested term. The parent term should be an existing entry of the current ontology. The superclass can be selected directly from Bioportal's Classes tree viewer.

    -
    -
    -

    References (optional)
    Provide evidence for the existence of the requested term such as Pubmed IDs of papers or links to other resources that describe the term.

    -
    -
    -

    Justification (optional)
    Provide any additional information about the requested term here.

    -
    - mappings: - intro: Browse mappings between classes in different ontologies +

    This ontology integrates with OntoloBridge, allowing community users to suggest additions to the public ontology. Complete the template below to submit a term request directly to the Ontology Manager.

    +
    +

    Term label (required)
    Suggested term name. If a term can be described with more than one synonym, enter only the preferred name here.

    +
    +
    +

    Term Description (required)
    A brief definition, description, or usage of the suggested term. Synonyms of additional terms may be listed in this section.

    +
    +
    +

    Superclass (required)
    The parent term of the suggested term. The parent term must be an existing entry in the current ontology. The superclass can be selected directly from the Bioportal class tree.

    +
    +
    +

    References (optional)
    Provide evidence that the requested term exists, such as Pubmed IDs of articles or links to other resources describing the term.

    +
    +
    +

    Justification (optional)
    Provide here any additional information about the requested term.

    +
    + + # General + + showing: Display + of: of + sort: Sort + popular: Popular + name: Name + classes_count: Number of classes + instances_concepts_count: Number of instances/concepts + Notes: Notes + upload_date: Upload date + release_date: Release date + fair_score: FAIR score + search_rank: Search Rank + no_matches: No matches! + uploaded: Uploaded + view_of: View of + view: View + summary_only: Summary only + groups: Groups + categories: Categories + admins: Administrators + status: Status + no_submissions_available: No submissions available + classes: classes + category: Category + group: Group + size: size + ontology_content: Ontology content + natural_language: Natural language + formality_levels: Formality levels + is_of_type: Is of type + missing_status: Missing Status + types: Types + artifacts: Artifacts + formats: formats + selected_ontologies: Selected ontologies + all: "All" + none: "none" + keywords: "Keywords" + keywords_separated_by_commas: "Keywords separated by commas" + see_details: "See details" + view_fair_scores_definitions: "View fair scores definitions" + get_json_version: "Get the json version" + select_ontologies: "Start typing to select ontologies or leave blank to use them all" + clear_selection: "Clear Selection" + select_from_list: "Select from list" + more: "More" + statistics: "Statistics" + average: "Average" + min: "Min" + max: "Max" + median: "Median" + slices: "Slices" + help: "Help" + or: "Or" + show_advanced_options: "Show advanced options" + insert_sample_text: "Insert sample text" + class: "Class" + filter: "Filter" + ontology: "Ontology" + type: "Type" + context: "Context" + umls_sem_type: "UMLS Sem Type" + matched_ontology: "matched ontology" + matched_class: "Matched class" + score: "Score" + negation: "negation" + experience: "Experience" + temporality: "Temporality" + certainty: "Certainty" + format_results: "Format results as " + reproduce_results: "Reproduce these results using the " + additional_parameters: "Additional Parameters Explained at " + input: "Input" + text: "Text" + output: "Output" + ontology_sets: "Ontology sets" + insert_sample_input: "Insert sample input" + weights_configuration: "Weights Configuration" + coverage: "Coverage" + accept: "Accept" + knowledge_detail: "Knowledge Detail" + specialization: "Specialization" + max_ontologies_per_set: "Maximum number of ontologies per set" + paste_input_text: "Paste a paragraph of text or keywords to use in calculating ontology recommendations" + get_recommendations: "Get recommendations" + select_ontologies_list: "Select ontologies" From 926bbc1275b15261c48d0e3552a807a5d24c9934 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 08:11:12 +0200 Subject: [PATCH 111/533] refactor $FOOTER_LINKS loop to use key, value and not only the keys --- app/views/layouts/_footer.html.haml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index 3aa986ae0..2cdd9b7c0 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -17,14 +17,14 @@ %a{:href => link[:link], :target => "_blank"} %img{:src => "#{asset_path(link[:logo])}"}/ .footer-nav-links - - $FOOTER_LINKS[:sections].keys.each do |section| + - $FOOTER_LINKS[:sections].each do |key, section_links| %div %h2 - = t("layout.footer."+section) + = t("layout.footer."+key.to_s) %div - - $FOOTER_LINKS[:sections][section].keys.each do |item| - %a{:href => $FOOTER_LINKS[:sections][section][item], :target => "_blank"} - = t("layout.footer."+section) + - section_links.each do |section , link| + %a{:href => link, :target => "_blank"} + = t("layout.footer."+section.to_s) From 71083c7643ed96c855c041f9cf46beafb00e96a0 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 08:13:21 +0200 Subject: [PATCH 112/533] fix issue where the footer shift up from the bottom if the page is small --- app/views/annotator/index.html.haml | 2 +- app/views/annotatorplus/index.html.haml | 2 +- app/views/layouts/_header.html.erb | 2 +- app/views/layouts/appliance.html.haml | 2 +- app/views/mappings/index.html.haml | 2 +- app/views/ncbo_annotatorplus/index.html.haml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/annotator/index.html.haml b/app/views/annotator/index.html.haml index 6c12a1f55..ca9fa67bb 100644 --- a/app/views/annotator/index.html.haml +++ b/app/views/annotator/index.html.haml @@ -3,7 +3,7 @@ %head = javascript_include_tag "bp_annotator" -%div.container-fluid +%div.container-fluid.flex-grow-1 %div.row %div.col %h2.mt-3 Annotator diff --git a/app/views/annotatorplus/index.html.haml b/app/views/annotatorplus/index.html.haml index 0fab2ce09..01cbdbbac 100644 --- a/app/views/annotatorplus/index.html.haml +++ b/app/views/annotatorplus/index.html.haml @@ -3,7 +3,7 @@ %head = javascript_include_tag "bp_annotatorplus" -%div.container-fluid +%div.container-fluid.flex-grow-1 %div.row %div.col %h2.mt-3 Annotator + diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 730a85af5..0530d3209 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -43,5 +43,5 @@ <%=render partial: 'layouts/topnav'%> -
    +
    <%=render partial: 'layouts/notices'%> \ No newline at end of file diff --git a/app/views/layouts/appliance.html.haml b/app/views/layouts/appliance.html.haml index aae2cc1d6..9bf582dbb 100644 --- a/app/views/layouts/appliance.html.haml +++ b/app/views/layouts/appliance.html.haml @@ -28,7 +28,7 @@ %body{:class => "#{controller_name} #{action_name}"} = render partial: "layouts/topnav" - %div.container-fluid + %div.container-fluid.flex-grow-1 = render partial: "layouts/notices" = render TurboModalComponent.new(id: 'application_modal') = yield diff --git a/app/views/mappings/index.html.haml b/app/views/mappings/index.html.haml index 438f3658f..94807c194 100644 --- a/app/views/mappings/index.html.haml +++ b/app/views/mappings/index.html.haml @@ -1,5 +1,5 @@ - @title = "Mappings" -%div#mappings_container.container-fluid.py-4 +%div#mappings_container.container-fluid.py-4.flex-grow-1 %h1.my-1 Mappings %div#mappings_uploader.my-2 diff --git a/app/views/ncbo_annotatorplus/index.html.haml b/app/views/ncbo_annotatorplus/index.html.haml index ba1315f02..9d9cffc47 100644 --- a/app/views/ncbo_annotatorplus/index.html.haml +++ b/app/views/ncbo_annotatorplus/index.html.haml @@ -3,7 +3,7 @@ %head = javascript_include_tag "bp_annotator" -%div.container-fluid.annotator +%div.container-fluid.annotator.flex-grow-1 %div.row %div.col %h2.mt-3 NCBO Annotator + From 0ddcd57a4caabe6d0c467841d21282ad0733c4d7 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 22:16:24 +0200 Subject: [PATCH 113/533] update the $HOME_PAGE_LOGOS config variable to be internationalizable --- app/views/home/index.html.haml | 21 +++++++++------------ config/locales/en.yml | 2 ++ config/locales/fr.yml | 3 ++- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index cd0867bab..74cdb1b4d 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -127,15 +127,12 @@ %li.list-group-item = link_to slice_name, slice_link - - - - $HOME_PAGE_LOGOS.to_a.each do |home_page_logos_row| - - unless home_page_logos_row[:links].to_a.empty? - %div.row.pt-3 - %div.col - %div.card-deck - %div.card - %div.card-header= home_page_logos_row[:title][I18n.locale] - %div.logos - - home_page_logos_row[:links].to_a.each do |logo| - = link_to(image_tag(logo[:img_src]), logo[:url], target: logo[:target]) + - $HOME_PAGE_LOGOS.each do |key, home_page_logos_row| + %div.row.pt-3 + %div.col + %div.card-deck + %div.card + %div.card-header= t("home.#{key}") + %div.logos + - home_page_logos_row.each do |logo| + = link_to(image_tag(logo[:img_src]), logo[:url], target: logo[:target]) diff --git a/config/locales/en.yml b/config/locales/en.yml index 9626a94a0..0067c5d82 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -179,6 +179,8 @@ en: projects: "Projects" users: "Users" no_recent_notes: "No recent notes were submitted" + supported_by: "Supported by" + with_collaboration: "With the collaboration of" index: find_ontology_placeholder: Start typing the ontology name, then choose from query_placeholder: Enter a class, eg Melanoma diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 698d988fe..76549c8c0 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -190,7 +190,8 @@ fr: projects: "Projets" users: "Utilisateurs" no_recent_notes: "Aucune note récente n'a été soumise" - + supported_by: "Avec le soutien de" + with_collaboration: "Avec la collaboration de" index: find_ontology_placeholder: Commencez à taper le nom de l'ontologie, puis choisissez dans query_placeholder: Entrez une classe, par exemple Melanoma From b77c27fe735c8291c8d5b3cdd409865c147e5280 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 22:21:53 +0200 Subject: [PATCH 114/533] rename 'set_locale' to 'set_locale_language' to prevent name conflicts --- app/controllers/language_controller.rb | 2 +- config/routes.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/language_controller.rb b/app/controllers/language_controller.rb index f05f423b8..ed1ec7c79 100644 --- a/app/controllers/language_controller.rb +++ b/app/controllers/language_controller.rb @@ -1,7 +1,7 @@ class LanguageController < ApplicationController # set locale to the language selected by the user - def set_locale + def set_locale_language language = params[:language].strip.downcase.to_sym supported_languages = I18n.available_locales diff --git a/config/routes.rb b/config/routes.rb index ba90d4f9b..98bb049b6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ root to: 'home#index' - get 'locale/:language', to: 'language#set_locale' + get 'locale/:language', to: 'language#set_locale_language' get '/notes/new_comment', to: 'notes#new_comment' get '/notes/new_proposal', to: 'notes#new_proposal' From 691438888a10de48340731c1e8e01067282934d2 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 23:37:29 +0200 Subject: [PATCH 115/533] add rails-i18n gem to add french dates localization --- Gemfile | 1 + Gemfile.lock | 42 +++++++++++++++++++++++++++++++++--------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 6760c3e10..9aa696608 100644 --- a/Gemfile +++ b/Gemfile @@ -54,6 +54,7 @@ gem 'flamegraph' gem 'graphql-client' gem 'haml', '~> 5.1' gem 'i18n' +gem 'rails-i18n', '~> 7.0.0' gem 'iconv' gem 'multi_json' gem 'mysql2', '0.5.3' diff --git a/Gemfile.lock b/Gemfile.lock index 98f976990..a6db07def 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git - revision: 0c8cd2b377d88b66a979664d5b16e5068b6d4548 + revision: ca20880499a737803120f18ce99c14d3f10bc071 branch: development specs: ontologies_api_client (2.2.0) @@ -129,6 +129,8 @@ GEM coderay (1.1.3) concurrent-ruby (1.2.2) crass (1.0.6) + css_parser (1.14.0) + addressable cube-ruby (0.0.3) daemons (1.4.1) dalli (3.2.4) @@ -170,6 +172,8 @@ GEM haml (>= 4.0) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) + htmlbeautifier (1.4.2) + htmlentities (4.3.4) http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) @@ -197,6 +201,19 @@ GEM loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) + lookbook (1.5.5) + actioncable + activemodel + css_parser + htmlbeautifier (~> 1.3) + htmlentities (~> 4.3.4) + listen (~> 3.0) + railties (>= 5.0) + redcarpet (~> 3.5) + rouge (>= 3.26, < 5.0) + view_component (> 2.0, < 4) + yard (~> 0.9.25) + zeitwerk (~> 2.5) lz4-ruby (0.3.3) mail (2.8.1) mini_mime (>= 0.1.1) @@ -279,6 +296,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) + rails-i18n (7.0.6) + i18n (>= 0.7, < 2) + railties (>= 6.0.0, < 8) rails_autolink (1.1.8) actionview (> 3.1) activesupport (> 3.1) @@ -298,6 +318,7 @@ GEM rdoc (6.3.3) recaptcha (5.9.0) json + redcarpet (3.6.0) regexp_parser (2.8.0) reline (0.3.3) io-console (~> 0.5) @@ -307,6 +328,7 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rexml (3.2.5) + rouge (4.1.0) rspec-core (3.12.2) rspec-support (~> 3.12.0) rspec-expectations (3.12.3) @@ -315,14 +337,14 @@ GEM rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.1) + rspec-rails (6.0.2) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) rspec-support (3.12.0) rubocop (1.50.2) json (~> 2.3) @@ -354,7 +376,7 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - sexp_processor (4.16.1) + sexp_processor (4.17.0) spawnling (2.1.5) sprockets (4.2.0) concurrent-ruby (~> 1.0) @@ -417,6 +439,7 @@ GEM will_paginate (3.3.1) xpath (3.2.0) nokogiri (~> 1.8) + yard (0.9.34) zeitwerk (2.6.8) PLATFORMS @@ -450,6 +473,7 @@ DEPENDENCIES jquery-ui-rails jsbundling-rails listen + lookbook (~> 1.5.5) multi_json mysql2 (= 0.5.3) net-ftp (~> 0.2.0) @@ -463,6 +487,7 @@ DEPENDENCIES puma (~> 5.0) rack-mini-profiler rails (= 7.0.3) + rails-i18n (~> 7.0.0) rails_autolink rdoc recaptcha (~> 5.9.0) @@ -486,5 +511,4 @@ DEPENDENCIES will_paginate (~> 3.0) BUNDLED WITH - 2.3.23 - + 2.4.12 From 9644023e3581653e2b85b962e48704acfa370bb9 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 8 May 2023 23:37:57 +0200 Subject: [PATCH 116/533] add location for the ontology_viewer header --- app/helpers/schemes_helper.rb | 10 ++++------ .../layouts/ontology_viewer/_header.html.haml | 2 +- config/locales/en.yml | 12 ++++++++++++ config/locales/fr.yml | 17 +++++++++++++++-- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb index 1ecb91908..01b3993da 100644 --- a/app/helpers/schemes_helper.rb +++ b/app/helpers/schemes_helper.rb @@ -41,15 +41,13 @@ def get_schemes_labels(schemes, main_uri) end def concept_label_to_show(submission: @submission_latest) - submission&.hasOntologyLanguage == 'SKOS' ? 'Concepts' : 'Classes' + submission&.hasOntologyLanguage == 'SKOS' ? 'concepts' : 'classes' end def section_name(section) - if section.eql?('classes') - concept_label_to_show(submission: @submission_latest || @submission) - else - section.capitalize - end + section = concept_label_to_show(submission: @submission_latest || @submission) if section.eql?('classes') + + t("ontology_details.sections.#{section}") end def scheme_path(scheme_id = '') diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 82f2c421d..bc5e094da 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -10,7 +10,7 @@ %div - if (details_available && !sub.released.nil?) %span.text-muted - Last uploaded: + = t('ontology_details.header.last_uploaded') = l(Date.parse(sub.creationDate), format: :monthfull_day_year) %div.ont-info-links - unless (@ontology.summaryOnly || @ont_restricted || @submission_latest.nil?) diff --git a/config/locales/en.yml b/config/locales/en.yml index 0067c5d82..b19e00522 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -270,6 +270,18 @@ en: sample_text: Melanoma is a malignant tumor of melanocytes found mainly in the skin but also in the intestine and the eye. ontology_details: + header: + last_uploaded: "Last uploaded:" + sections: + summary: "Summary" + concepts: "Concepts" + classes: "Classes" + properties: "Properties" + notes: "Notes" + mappings: "Mappings" + schemes: "Schemes" + collections: "Collections" + widgets: "Widgets" metadata: details: "Details" acronym: "Acronym" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 76549c8c0..95940640f 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -281,9 +281,22 @@ fr: sample_text: Le mélanome est une tumeur maligne des mélanocytes qui se trouvent principalement dans la peau mais aussi dans l'intestin et l'œil. ontology_details: + header: + last_uploaded: "Dernière mise à jour:" + sections: + summary: "Résumé" + concepts: "Concepts" + classes: "Classes" + properties: "Propriétés" + notes: "Notes" + mappings: "Mappings" + schemes: "Schemes" + collections: "Collections" + widgets: "Widgets" + metadata: details: "Détails" - acronym: "Acronym" + acronym: "Acronyme" visibility: "Visibilité" viewing_restriction: "Restriction de visualisation" view_of_ontology: "Vue de l'ontologie" @@ -435,7 +448,7 @@ fr: formats: year_month_day_concise: "%Y-%m-%d" # 2017-03-01 month_day_year: "%b %-d, %Y" # Mar 1, 2017 - monthfull_day_year: "%B %-d, %Y" # March 1, 2017 + monthfull_day_year: "%-d %B %Y" # March 1, 2017 ontologies: self: "Ontologies" From 603d571cadd277be70c94654ff9fcbe368216e40 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 10 May 2023 14:53:44 +0200 Subject: [PATCH 117/533] tmp --- .../stylesheets/components/toggle_input.scss | 4 ++-- app/assets/stylesheets/home.scss | 20 +++++++++------- app/views/home/index.html.haml | 23 +++++++++++-------- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/components/toggle_input.scss b/app/assets/stylesheets/components/toggle_input.scss index 6df19aacc..c8c040f82 100644 --- a/app/assets/stylesheets/components/toggle_input.scss +++ b/app/assets/stylesheets/components/toggle_input.scss @@ -16,7 +16,7 @@ .bar { background: var(--primary-color); - right: 12px; + right: 0; } label.on-toggle-input-label { @@ -80,7 +80,7 @@ .bar { position: absolute; - right: 63%; + right: 50%; top: 50%; transform: translateY(-50%); background: #fff; diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 91c657cf9..8bb3292a3 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -233,7 +233,7 @@ i.fa.fa-caret-square-o-down { align-items: center; width: 193px; padding: 15px 25px; - border: 1px solid var(--primary-color);; + border: 1px solid var(--primary-color); border-radius: 8px; font-size: 15px; } @@ -274,18 +274,22 @@ i.fa.fa-caret-square-o-down { margin-right: 20px; margin-bottom: 0; } -.home-get-service{ +.home-get-recommendations{ cursor: pointer; color: var(--primary-color); display: flex; + width: fit-content; + height: fit-content; align-items: center; - justify-content: center; - height: 50px; - width: 50px; - border-radius: 50%; - border: solid var(--primary-color); + padding: 15px 20px; + border-radius: 8px; + border: 1px solid var(--primary-color); + +} +.home-get-recommendations p{ + margin-right: 20px; + margin-bottom: 0; } - .hide{ display: none; } diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index a4d342937..9d0ce3dce 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -81,14 +81,17 @@ .home-card %form{action: "/annotator_recommender_form", method: "post"} %textarea.home-recommendations-and-annotations{rows: "6" , placeholder: "Paste a paragraph of text or some keywords ...", name: "text"} - %input.hide{type: "submit", name: "submit_button" ,value: "annotator", id: "annotator_submit"} - %input.hide{type: "submit" , name: "submit_button" ,value: "recommender", id: "recommender_submit"} + %input.hide{type: "submit", name: "submit_button" ,value: "annotator", id: "annotator_submit"}/ + %input.hide{type: "submit" , name: "submit_button" ,value: "recommender", id: "recommender_submit"}/ .home-services-buttons - %div{style: 'width: 29%; height: 50px;'} - = render ToggleInputComponent.new(first_option: ['annotator-option','annotator', 'Annotatation'], second_option: ['recommender-option','recommender', 'Recommendations']) - .home-get-service.ml-1{onclick: "submitService()"} + .home-get-recommendations{onclick: "submitRecommender()"} + %p Get recommendations %svg{:fill => "none", :height => "16", :viewbox => "0 0 15 16", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} %path{:d => "M2.61197 15.6472C1.16948 16.4746 0 15.7968 0 14.1344V1.86672C0 0.202676 1.16948 -0.474289 2.61197 0.352365L13.3345 6.50169C14.7775 7.32941 14.7775 8.67046 13.3345 9.49799L2.61197 15.6472Z", :fill => "#31B404"} + .home-services-buttons + .home-get-annotations{onclick: "submitAnnotator()"} + %p Get annotations + %img{:src => asset_path("play-white.svg")}/ .home-section .home-section-sub-sections-container .home-sub-section-left @@ -180,11 +183,11 @@ :javascript - function submitService(){ - const firstOption= document.getElementById("annotator-option") - const secondOption = document.getElementById("recommender-option") - let selected = firstOption.checked ? firstOption : secondOption - document.getElementById(`${selected.name}_submit`).click() + function submitAnnotator(){ + document.getElementById("annotator_submit").click() + } + function submitRecommender(){ + document.getElementById("recommender_submit").click() } var ontologies = #{raw(@ontology_names.to_json)}; From 54a0728d9454ecf5f67e531192dfbcd89e4dc7b6 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 12 May 2023 10:22:06 +0200 Subject: [PATCH 118/533] update home search input field design --- app/assets/images/loop.svg | 3 +++ app/views/home/index.html.haml | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 app/assets/images/loop.svg diff --git a/app/assets/images/loop.svg b/app/assets/images/loop.svg new file mode 100644 index 000000000..8bf624de0 --- /dev/null +++ b/app/assets/images/loop.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 952d58867..92e26263c 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -41,7 +41,18 @@ .home-header-title %h4 Welcome to AgroPortal %p The home of vocabularies and ontologies in agronomy and related fields. - %input{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text"}/ + %input#home-search{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text"}/ + #home-search-drop-down + %a.home-search-ontology-content#home-search-ontology-content{href: "#"} + %p#seached-ontology + %div + %img{src: asset_path("loop.svg")}/ + %p Search ontology content + %a.home-search-ontology-content#home-search-ontologies{href: "#"} + %p#seached-ontologies + %div + %img{src: asset_path("loop.svg")}/ + %p See all .home-body-container .home-section %h4 Wanna upload an ontology? From a66ebc7410b8591a8db72a15a7baf55302bbd830 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 12 May 2023 10:23:55 +0200 Subject: [PATCH 119/533] implement home search field js logic --- app/views/home/index.html.haml | 114 ++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 92e26263c..b4c6ddf40 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -184,4 +184,116 @@ } function submitRecommender(){ document.getElementById("recommender_submit").click() - } \ No newline at end of file + } + + var ontologies = #{raw(@ontology_names.to_json)}; + + const input = document.getElementById("home-search"); + const dropdown = document.getElementById("home-search-drop-down"); + const ontology = document.getElementById("seached-ontology"); + const searchedOntologies = document.getElementById("seached-ontologies"); + const searchOntologyContent = document.getElementById("home-search-ontology-content") + const homeSearchOntologies = document.getElementById("home-search-ontologies") + let breaker = 0; + + + function scrollDown(currentScroll) { + const startPosition = window.pageYOffset; + const distance = 300 - currentScroll; + const duration = 1000; + let start = null; + + function scrollAnimation(timestamp) { + if (!start) start = timestamp; + const progress = timestamp - start; + const scrollPosition = startPosition + easeInOutCubic(progress, 0, distance, duration); + window.scrollTo(0, scrollPosition); + if (progress < duration) { + window.requestAnimationFrame(scrollAnimation); + } + } + + function easeInOutCubic(t, b, c, d) { + t /= d / 2; + if (t < 1) return c / 2 * t * t * t + b; + t -= 2; + return c / 2 * (t * t * t + 2) + b; + } + + window.requestAnimationFrame(scrollAnimation); + } + + + + + input.addEventListener("input", function() { + let results_list = [] + const inputValue = input.value.trim(); + if (inputValue.length > 0) { + + ontology.innerHTML = inputValue; + searchedOntologies.innerHTML = inputValue; + searchOntologyContent.href = "/search?query="+inputValue; + homeSearchOntologies.href = "/ontologies?search="+inputValue; + dropdown.innerHTML = "" + breaker = 0 + for (var i = 0; i < ontologies.length; i++) { + if (breaker == 4){ + break; + } + // Get the current item from the ontologies array + var item = ontologies[i]; + + // Check if the item contains the substring + if (item[0].toLowerCase().includes(inputValue.toLowerCase()) || item[1].toLowerCase().includes(inputValue.toLowerCase())) { + results_list.push(item); + breaker = breaker + 1 + } + } + + results_list.forEach(function(item) { + const link = document.createElement("a"); + link.href = "/ontologies/"+item[1]; + link.className = "home-search-ontology-content"; + + const p1 = document.createElement("p"); + p1.id = "seached-ontology"; + p1.className = "home-searched-ontology"; + p1.textContent = item[0]+" "+"("+item[1]+")"; + + const p2 = document.createElement("p"); + p2.className = "home-result-type"; + p2.textContent = "Ontology"; + + link.appendChild(p1); + link.appendChild(p2); + + dropdown.appendChild(link); + + + }); + dropdown.appendChild(homeSearchOntologies); + dropdown.appendChild(searchOntologyContent); + dropdown.style.display = "block"; + input.classList.add("home-dropdown-active"); + + if (window.scrollY < 300) { + scrollDown(window.scrollY); + } + + + } else { + dropdown.style.display = "none"; + input.classList.remove("home-dropdown-active"); + } + }); + dropdown.addEventListener("mousedown", function(event) { + event.preventDefault(); // prevent the blur event from firing + }); + + input.addEventListener("blur", function() { + + dropdown.style.display = "none"; + input.classList.remove("home-dropdown-active"); + }); + \ No newline at end of file From 6dde139481c825b444222ce521a8903af8b8f016 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 12 May 2023 10:28:53 +0200 Subject: [PATCH 120/533] add home page search input field css --- app/assets/stylesheets/home.scss | 73 ++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 7620202b1..b4180d918 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -341,6 +341,79 @@ i.fa.fa-caret-square-o-down { margin-left: 60px; } +#home-search-drop-down{ + display: none; + font-size: 16px; + background: white; + width: 100%; + border-radius: 0 0 14px 14px; + border: none; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); +} + +.home-search-ontology-content{ + display: flex; + color: #777777 !important; + justify-content: space-between; + padding: 20px 20px; + cursor: pointer; + border-top: 1px solid #f7f7f7 +} +.home-search-ontology-content:hover{ + background-color: rgba(0, 0, 0, 0.01); +} +.home-search-ontology-content div{ + display: flex; +} +.home-search-ontology-content div img{ + width: 12px; +} +.home-search-ontology-content div p{ + font-weight: 300; + margin-left: 10px; + margin-bottom: 0; +} + +.home-dropdown-active{ + box-shadow: none !important; +} +#seached-ontology{ + margin-bottom: 0; +} +#seached-ontologies{ + margin-bottom: 0; +} + +.home-support-title{ + display: flex; + justify-content: center; + flex-direction: column; + +} +.home-support-items{ + display: flex; + justify-content: center; + flex-wrap: wrap; + +} +.home-support-items > *:not(:first-child){ + margin-left: 40px; +} +.home-support-items img{ + margin-bottom: 40px; +} +.home-result-type{ + font-weight: 300; + margin-bottom: 0; +} + +.home-searched-ontology{ + margin-bottom: 0; + word-wrap: break-word; + max-width: 400px; + margin-right: 20px; + +} @keyframes scale-up { from { transform: scale(0.1); } From 80298e43df9ee3b7d4003fe6447fc2af661b5ef6 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 12 May 2023 10:27:22 +0200 Subject: [PATCH 121/533] add an auto scroll down to the annotator and recommeder on text display --- app/views/annotator/index.html.haml | 1 + app/views/recommender/index.html.haml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/views/annotator/index.html.haml b/app/views/annotator/index.html.haml index e15f83cad..c84c22ab1 100644 --- a/app/views/annotator/index.html.haml +++ b/app/views/annotator/index.html.haml @@ -175,5 +175,6 @@ window.addEventListener("load", function() { if(document.getElementById("annotation_text").value != ''){ document.getElementById("annotator_button").click() + window.scrollBy(0, 1080); } }); \ No newline at end of file diff --git a/app/views/recommender/index.html.haml b/app/views/recommender/index.html.haml index 7b186c0c9..04526742f 100644 --- a/app/views/recommender/index.html.haml +++ b/app/views/recommender/index.html.haml @@ -116,5 +116,6 @@ document.getElementById("inputText").value = value if(document.getElementById("inputText").value != ''){ document.getElementById("recommenderButton").click() + window.scrollBy(0, 1080); } }); \ No newline at end of file From 7dc968b19363430bb7430edacf0c23e2dadcea43 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 12 May 2023 10:30:56 +0200 Subject: [PATCH 122/533] fix home page alignement and syntax errors --- app/assets/stylesheets/components/index.scss | 2 +- app/assets/stylesheets/home.scss | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index c61d4d8dc..307bc2599 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -1,2 +1,2 @@ @import 'chips'; -@import 'card_message' \ No newline at end of file +@import 'card_message'; \ No newline at end of file diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index b4180d918..8bb3292a3 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -104,7 +104,7 @@ i.fa.fa-caret-square-o-down { color: white; } -.home-header-title p{ +.home-header-title > p{ font-size: 20px; font-weight: 400; color: white; @@ -233,7 +233,7 @@ i.fa.fa-caret-square-o-down { align-items: center; width: 193px; padding: 15px 25px; - border: 1px solid var(--primary-color);; + border: 1px solid var(--primary-color); border-radius: 8px; font-size: 15px; } @@ -310,7 +310,7 @@ i.fa.fa-caret-square-o-down { } .home-fair-scores{ height: 349px; - + padding-top: 35px; } .home-twitter-news{ @@ -319,11 +319,16 @@ i.fa.fa-caret-square-o-down { text-decoration: none; } +.home-fair-details{ + margin-right: 25px !important; +} .home-fair-scores div{ display: flex; justify-content: flex-end; align-items: center; margin-right: 20px; + margin-left: 27px; + margin-bottom: 14px; color: var(--primary-color); } .home-fair-scores div p{ From 5f9af0faece61cc6aa65cfeaba2a6f893b21df03 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 12 May 2023 10:31:46 +0200 Subject: [PATCH 123/533] fix 'benefits' typo error on home page --- app/views/home/index.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index b4c6ddf40..66669e4f7 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -60,11 +60,11 @@ %p Uploading an ontology is a way of sharing your domain knowledge with others. %p By uploading your ontology to agroportal, you can: .home-upload-benifits - - @upload_benifits.each do |benifit| + - @upload_benefits.each do |benefit| %div %img{:src => asset_path("check-outlined.svg")}/ %p - = benifit + = benefit - if session[:user].nil? %a.home-upload-ontology-button{:href => "/login?redirect=/ontologies/new"} %svg{:fill => "none", :height => "14", :viewbox => "0 0 15 14", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} From 775b83da9eecc36b50f2f62930108d69fb761613 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 12 May 2023 10:33:22 +0200 Subject: [PATCH 124/533] don't show faireness service in the home page if disabled --- app/views/home/index.html.haml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 66669e4f7..316ef18ec 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -98,9 +98,11 @@ %h4 FAIR scores %hr.home-section-line/ .home-card.home-fair-scores - = render partial: "shared/fair_score_bars", locals: {data: nil} + - if fairness_service_enabled? + %div#fair-home + = render partial: "shared/fair_score_bars", locals: {data: nil} %a{:href => "#fairDetails"} - %div + %div.home-fair-details %p See details %svg{:fill => "none", :height => "12", :viewbox => "0 0 7 12", :width => "7", :xmlns => "http://www.w3.org/2000/svg"} %path{:d => "M0.828447 0.982555C0.668147 0.979582 0.510886 1.02651 0.378427 1.11684C0.245967 1.20716 0.144858 1.33643 0.0890904 1.48675C0.0333229 1.63706 0.0256545 1.801 0.0671467 1.95586C0.108639 2.11073 0.19724 2.24887 0.32069 2.35117L5.04517 6.39572L0.317771 10.4403C0.231406 10.5032 0.15903 10.5834 0.105209 10.6757C0.0513877 10.7681 0.0172914 10.8706 0.00507139 10.9767C-0.00714863 11.0829 0.00277318 11.1905 0.0342104 11.2926C0.0656476 11.3948 0.117918 11.4893 0.187722 11.5702C0.257526 11.6512 0.343349 11.7168 0.439774 11.7628C0.536199 11.8089 0.641133 11.8346 0.747953 11.8381C0.854772 11.8416 0.961158 11.8229 1.0604 11.7832C1.15964 11.7435 1.24957 11.6837 1.32453 11.6075L6.72894 6.9881C6.81393 6.9155 6.88218 6.82534 6.92897 6.72383C6.97577 6.62232 7 6.51187 7 6.40009C7 6.28832 6.97577 6.17787 6.92897 6.07636C6.88218 5.97485 6.81393 5.88469 6.72894 5.81209L1.32453 1.17807C1.18758 1.05615 1.01176 0.986851 0.828447 0.982555Z", :fill => "#31B404"} From 80b632e00292c988b84219789ec486af71b0b9d3 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 12 May 2023 10:34:10 +0200 Subject: [PATCH 125/533] combine support and collaboration sections in the home page --- app/views/home/index.html.haml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 316ef18ec..9ae27b373 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -163,22 +163,24 @@ = number_with_delimiter(@users_count, :delimiter => ",") %p Users .home-section - .home-section-sub-sections-container - .home-sub-section-left - %h4 Supported by + .home-statistics-container + .home-support-title + %p Supported by %hr.home-section-line/ - .home-card.home-logos - %img{:src => asset_path("logos/supports/numev.png")}/ - %img{:src => asset_path("logos/supports/anr.png")}/ - %img{:src => asset_path("logos/supports/eu.png")}/ - .home-sub-section-right - %h4 With the colaboration of + .home-support-items + %img{src: asset_path("logos/supports/numev.png")}/ + %img{src: asset_path("logos/supports/anr.png")}/ + %img{src: asset_path("logos/supports/eu.png")}/ + .home-support-title + %p With the collaboration of %hr.home-section-line/ - .home-card.home-logos - %img{:src => asset_path("logos/collaboration/d2kab.png")}/ - %img{:src => asset_path("logos/collaboration/lirmm.png")}/ - %img{:src => asset_path("logos/collaboration/stanford.png")}/ - %img{:src => asset_path("logos/collaboration/inrae.png")}/ + .home-support-items + %img{src: asset_path("logos/collaboration/d2kab.png")}/ + %img{src: asset_path("logos/collaboration/lirmm.png")}/ + %img{src: asset_path("logos/collaboration/stanford.png")}/ + %img{src: asset_path("logos/collaboration/inrae.png")}/ + + :javascript function submitAnnotator(){ From 4abdbeaf0ac655f9a5ae932972e53515f172915f Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 12 May 2023 10:37:57 +0200 Subject: [PATCH 126/533] optimize and remove the unused methods in the home index action rewrite --- app/controllers/home_controller.rb | 68 +++++++++--------------------- app/views/home/index.html.haml | 6 +-- 2 files changed, 23 insertions(+), 51 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 388410dba..0c4caa272 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -7,68 +7,40 @@ class HomeController < ApplicationController include FairScoreHelper def index + @analytics = LinkedData::Client::Analytics.last_month + @ontologies_views = LinkedData::Client::Models::Ontology.all(include_views: true) @ontologies = @ontologies_views.select {|o| !o.viewOf} - @ontologies_hash = Hash[@ontologies_views.map {|o| [o.acronym, o]}] - @groups = LinkedData::Client::Models::Group.all - @notes = LinkedData::Client::Models::Note.all - @last_notes = [] - unless @notes.empty? - @notes.sort! {|a,b| b.created <=> a.created } - @notes[0..20].each do |n| - ont_uri = n.relatedOntology.first - ont = LinkedData::Client::Models::Ontology.find(ont_uri) - next if ont.nil? - username = n.creator.split("/").last - note = { - :uri => n.links['ui'], - :id => n.id, - :subject => n.subject, - :body => n.body, - :created => n.created, - :author => username, - :ont_name => ont.name - } - @last_notes.push note - break if @last_notes.length >= [$HOME_LATEST_NOTES_COUNT.to_i, 5].max - end - end - # Get the latest manual mappings - # All mapping classes are bidirectional. - # Each class in the list maps to all other classes in the list. - if $DISPLAY_RECENT.nil? || $DISPLAY_RECENT == true - @recent_mappings = get_recent_mappings # application_controller + @ontology_names = @ontologies.map { |ont| ["#{ont.name} (#{ont.acronym})", ont.acronym] } + # Calculate BioPortal summary statistics + @ont_count = @analytics.onts.size + metrics = LinkedData::Client::Models::Metrics.all + metrics = metrics.each_with_object(Hash.new(0)) do |h, sum| + h.to_hash.slice(:classes, :properties, :individuals).each { |k, v| sum[k] += v } end - - organize_groups - # Calculate BioPortal summary statistics - @ont_count = @ontologies.length - @cls_count = LinkedData::Client::Models::Metrics.all.map { |m| m.classes.to_i }.sum - @individuals_count = LinkedData::Client::Models::Metrics.all.map {|m| m.individuals.to_i}.sum - @prop_count = 36286 + @cls_count = metrics[:classes] + @individuals_count = metrics[:individuals] + @prop_count = metrics[:properties] @map_count = total_mapping_count - @analytics = LinkedData::Client::Analytics.last_month @projects_count = LinkedData::Client::Models::Project.all.length @users_count = LinkedData::Client::Models::User.all.length - @ontology_names = @ontologies.map { |ont| ["#{ont.name} (#{ont.acronym})", ont.acronym] } - @upload_benifits = [ - "Discover new insights and connections by exploring other ontologies in the repository.", - "Contribute to the growth and development of your domain by adding new concepts and categories.", - "Use version control to manage the changes to your ontology over time and collaborate with other users.", - "Get feedback and suggestions from other users who can review and comment on your ontology.", - "Get the FAIR score and metrics for your ontology." + + @upload_benefits = [ + 'Discover new insights and connections by exploring other ontologies in the repository.', + 'Contribute to the growth and development of your domain by adding new concepts and categories.', + 'Use version control to manage the changes to your ontology over time and collaborate with other users.', + 'Get feedback and suggestions from other users who can review and comment on your ontology.', + 'Get the FAIR score and metrics for your ontology.' ] - @anal_ont_names = {} + @anal_ont_names = [] @anal_ont_numbers = [] @analytics.onts[0..4].each do |visits| - ont = @ontologies_hash[visits[:ont].to_s] - @anal_ont_names[ont.acronym] = ont.name + @anal_ont_names << visits[:ont] @anal_ont_numbers << visits[:views] end - end def render_layout_partial diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 9ae27b373..9d0ce3dce 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -21,17 +21,17 @@ %img{:src => asset_path("home-random-bubbles.svg")}/ .home-bubble.home-bubble-one %h5 - = @anal_ont_names.keys[0] + = @anal_ont_names[0] %p = @anal_ont_numbers[0].to_s + " visits" .home-bubble.home-bubble-two %h5 - = @anal_ont_names.keys[1] + = @anal_ont_names[1] %p = @anal_ont_numbers[1].to_s + " visits" .home-bubble.home-bubble-three %h5 - = @anal_ont_names.keys[2] + = @anal_ont_names[2] %p = @anal_ont_numbers[2].to_s + " visits" %a.home-bubble.home-bubble-four{:href => "/visits"} From 00bc34d8d8299b52d99d663c1a73383207c2447e Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Fri, 12 May 2023 14:21:20 +0200 Subject: [PATCH 127/533] feat: create alert message component [x] Modify the existing alert component. [x] Add the alert component to the lookbook. --- app/components/alert_message_component.rb | 4 +++- .../alert_message_component.html.haml | 12 ++++++++---- .../previews/alert_message_component_preview.rb | 10 ++++++++++ .../previews/card_message_component_preview.rb | 2 +- test/components/previews/chips_component_preview.rb | 2 +- 5 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 test/components/previews/alert_message_component_preview.rb diff --git a/app/components/alert_message_component.rb b/app/components/alert_message_component.rb index f2175b7e0..1ef3b185c 100644 --- a/app/components/alert_message_component.rb +++ b/app/components/alert_message_component.rb @@ -2,8 +2,10 @@ class AlertMessageComponent < ViewComponent::Base include Turbo::FramesHelper - def initialize(id: '', type: 'info') + def initialize(id: '', message: '', type: 'info', closeable: true) @id = id + @message = message @type = "alert-#{type}" + @closeable = closeable end end diff --git a/app/components/alert_message_component/alert_message_component.html.haml b/app/components/alert_message_component/alert_message_component.html.haml index 19c0e89f0..107ab14ac 100644 --- a/app/components/alert_message_component/alert_message_component.html.haml +++ b/app/components/alert_message_component/alert_message_component.html.haml @@ -1,4 +1,8 @@ -.alert.alert-dismissible.fade.show{:role => "alert", class: "#{@type}"} - = content - %button.close{"aria-label": "Close", "data-dismiss": "alert", type: "button", style: "background: transparent"} - %span{"aria-hidden" => "true"} × \ No newline at end of file +.alert.alert-dismissible.fade.show{:role => "alert", class: "#{@type}", style: "text-align: left"} + = @message + + - if @closeable + %button.close{"aria-label": "Close", "data-dismiss": "alert", type: "button", style: "background: transparent"} + %span{"aria-hidden" => "true"} × + + \ No newline at end of file diff --git a/test/components/previews/alert_message_component_preview.rb b/test/components/previews/alert_message_component_preview.rb new file mode 100644 index 000000000..4efb845e9 --- /dev/null +++ b/test/components/previews/alert_message_component_preview.rb @@ -0,0 +1,10 @@ +class AlertMessageComponentPreview < ViewComponent::Preview + + # @param message text + # @param type select [error, info, success, warning] + + def default(message: "Here we can type a success or failure message to the user", type: "info", closeable: true ) + render(AlertMessageComponent.new(message: message, type: type, closeable: closeable)) + end + +end \ No newline at end of file diff --git a/test/components/previews/card_message_component_preview.rb b/test/components/previews/card_message_component_preview.rb index 02c17f200..2ac6bc4fb 100644 --- a/test/components/previews/card_message_component_preview.rb +++ b/test/components/previews/card_message_component_preview.rb @@ -9,4 +9,4 @@ def default(message: "Here we can type a success or failure message to the user" render(CardMessageComponent.new(message: message, button_text: button_text, type: type, button_link: button_link)) end - end \ No newline at end of file +end \ No newline at end of file diff --git a/test/components/previews/chips_component_preview.rb b/test/components/previews/chips_component_preview.rb index 55ff1b5bc..8f806211c 100644 --- a/test/components/previews/chips_component_preview.rb +++ b/test/components/previews/chips_component_preview.rb @@ -7,4 +7,4 @@ def default(name: "name", value: "value") render(ChipsComponent.new(name: name, value: value)) end - end \ No newline at end of file +end \ No newline at end of file From e52c67f80b809d12e2780b27831b38a7c99e1d38 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Fri, 12 May 2023 14:26:07 +0200 Subject: [PATCH 128/533] use the alert component to show warning if the preferred name is empty --- app/views/concepts/_details.html.haml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index 2207e1edd..bf8ae61f4 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -1,13 +1,3 @@ -%style - :css - .warning { - background-color: #ffeaa7; /* set the background color to a light yellow */ - color: #d63031; /* set the text color to a dark red */ - padding: 10px; /* add some padding around the text */ - border: 1px solid #d63031; /* add a border around the text */ - } - - = turbo_frame_tag 'concept_details' do - schemes_keys = %w[hasTopConcept topConceptOf] - label_xl_set = %w[skos-xl#prefLabel skos-xl#altLabel skos-xl#hiddenLabel] @@ -25,7 +15,7 @@ %td{nowrap: ""}= t('ontology_details.concept.preferred_name') %td - if @concept.prefLabel().nil? - = render(CardMessageComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language', type: "failure"))) + = render(AlertMessageComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language', type: "warning", closeable: false))) - else %p= @concept.prefLabel({:use_html => true}).html_safe From 75104b4db841a4c59756d379cd2f7dc0cf7d0273 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 15 May 2023 09:01:04 +0200 Subject: [PATCH 129/533] add "inline_svg" gem to use svg in files --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9aa696608..72bfecbed 100644 --- a/Gemfile +++ b/Gemfile @@ -72,7 +72,7 @@ gem 'thin' gem 'view_component', '~> 2.72' gem 'turnout' gem 'will_paginate', '~> 3.0' - +gem 'inline_svg' gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'development' From 42c3f647196a98b51fee2b29a517bf73f15d6011 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 15 May 2023 09:04:07 +0200 Subject: [PATCH 130/533] update AgroPortal primary color --- app/assets/stylesheets/theme-variables.scss.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/theme-variables.scss.erb b/app/assets/stylesheets/theme-variables.scss.erb index 4a7c79a68..515b56d99 100644 --- a/app/assets/stylesheets/theme-variables.scss.erb +++ b/app/assets/stylesheets/theme-variables.scss.erb @@ -3,8 +3,8 @@ case ui_theme when "agroportal" %> :root{ - --primary-color: #31B404; - --hover-color: #40C811; + --primary-color: #3CB371; + --hover-color: #41C67C; --secondary-color: #ffc107; } <% when "stageportal" %> From 8c4b6d4d7931c529ba4f080e330551a37bc33d22 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 15 May 2023 09:04:39 +0200 Subject: [PATCH 131/533] add notification alert message component --- app/assets/images/icons/alert.svg | 5 + app/assets/images/icons/close.svg | 6 + app/assets/images/icons/error.svg | 1 + app/assets/images/icons/success.svg | 3 + app/assets/stylesheets/components/index.scss | 3 +- .../stylesheets/components/notification.scss | 146 ++++++++++++++++++ app/components/notification_component.rb | 39 +++++ .../notification_component.html.haml | 13 ++ .../notification_component_preview.rb | 12 ++ 9 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 app/assets/images/icons/alert.svg create mode 100644 app/assets/images/icons/close.svg create mode 100644 app/assets/images/icons/error.svg create mode 100644 app/assets/images/icons/success.svg create mode 100644 app/assets/stylesheets/components/notification.scss create mode 100644 app/components/notification_component.rb create mode 100644 app/components/notification_component/notification_component.html.haml create mode 100644 test/components/previews/notification_component_preview.rb diff --git a/app/assets/images/icons/alert.svg b/app/assets/images/icons/alert.svg new file mode 100644 index 000000000..f944382c5 --- /dev/null +++ b/app/assets/images/icons/alert.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/assets/images/icons/close.svg b/app/assets/images/icons/close.svg new file mode 100644 index 000000000..d3f23c98c --- /dev/null +++ b/app/assets/images/icons/close.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/assets/images/icons/error.svg b/app/assets/images/icons/error.svg new file mode 100644 index 000000000..faf99a789 --- /dev/null +++ b/app/assets/images/icons/error.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/icons/success.svg b/app/assets/images/icons/success.svg new file mode 100644 index 000000000..8a7c34c13 --- /dev/null +++ b/app/assets/images/icons/success.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index c61d4d8dc..be2de3f09 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -1,2 +1,3 @@ @import 'chips'; -@import 'card_message' \ No newline at end of file +@import 'card_message' +@import "notification"; \ No newline at end of file diff --git a/app/assets/stylesheets/components/notification.scss b/app/assets/stylesheets/components/notification.scss new file mode 100644 index 000000000..d746bbb4f --- /dev/null +++ b/app/assets/stylesheets/components/notification.scss @@ -0,0 +1,146 @@ +.notification { + display: flex; + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 50; + padding: 1.5rem 1rem; + justify-content: center; + align-items: flex-end; + pointer-events: none; + transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform; + transition-duration: 1000ms; + transform: translateX(1rem); + opacity: 0; + @media (min-width: 640px) { + padding: 4rem 1.5rem 1.5rem; + justify-content: flex-end; + align-items: flex-start; + } +} + + +.notification-inner { + overflow: hidden; + padding: 1rem; + background-color: #ffffff; + width: 100%; + max-width: 24rem; + border-radius: 0.5rem; + pointer-events: auto; + box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05); +} + +.notification-content { + display: flex; + align-items: flex-start; +} + +.notification-content svg { + width: 1.5rem; + height: 1.5rem; +} + +.notification-text { + padding-top: 0.125rem; + margin-left: 0.75rem; + flex: 1 1 0; + width: 0; +} + +.notification-text p:first-of-type { + color: #111827; + font-size: 0.875rem; + line-height: 1.25rem; + font-weight: 500; +} + +.notification-text p:last-of-type { + margin-top: 0.25rem; + color: #6B7280; + font-size: 0.875rem; + line-height: 1.25rem; +} + +.notification-close { + display: inline-flex; + background-color: #ffffff; + color: #9CA3AF; + border: none; + cursor: pointer; +} + +.notification-close svg { + height: 1rem; + outline: none; +} + +.type-success path { + fill: #14a38c; +} + +.type-error { + path:first-of-type { + fill: #f44336; + } + + path { + fill: white; + } +} + +.type-warning path { + fill: #edb464; +} + + +.slide-in-right { + animation-name: slide-in-right; + animation-duration: 0.5s; + animation-delay: 0.5s; + animation-timing-function: cubic-bezier(0.250, 0.460, 0.450, 0.940); + animation-fill-mode: forwards; +} + + +.slide-in-out-right { + animation-name: slide-in-right, slide-out-right; + animation-duration: 0.5s, 0.5s; + animation-delay: 0.5s, 5s; + animation-timing-function: cubic-bezier(0.250, 0.460, 0.450, 0.940), cubic-bezier(0.550, 0.085, 0.680, 0.530); + animation-fill-mode: forwards, forwards; +} + + +@keyframes slide-in-right { + 0% { + transform: translateX(1rem); + opacity: 0; + } + 50% { + opacity: 0.4; + } + 100% { + transform: translateX(0); + opacity: 1; + } +} + +@keyframes slide-out-right { + 0% { + transform: translateX(0); + opacity: 1; + } + 50% { + opacity: 0.4; + } + 100% { + transform: translateX(1rem); + opacity: 0; + } +} + + + diff --git a/app/components/notification_component.rb b/app/components/notification_component.rb new file mode 100644 index 000000000..49f82354a --- /dev/null +++ b/app/components/notification_component.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +class NotificationComponent < ViewComponent::Base + + def initialize(title:, comment: '', type: 'success', auto_remove: true) + super + @title = title + @comment = comment + @type = type + @auto_remove = auto_remove + end + + def auto_remove? + @auto_remove + end + + def notification_type_icon + svg_icon(@type) + end + + def notification_animation_class + auto_remove? ? 'slide-in-out-right' : 'slide-in-right' + end + + def notification_type_class + "type-#{@type}" + end + + def notification_class + notification_animation_class + end + + private + def svg_icon(name) + inline_svg_tag("icons/#{name}.svg", class: notification_type_class) + end + + +end diff --git a/app/components/notification_component/notification_component.html.haml b/app/components/notification_component/notification_component.html.haml new file mode 100644 index 000000000..92962db54 --- /dev/null +++ b/app/components/notification_component/notification_component.html.haml @@ -0,0 +1,13 @@ +.notification{class: notification_class} + .notification-inner + .notification-content + %span + = notification_type_icon + .notification-text + %p.text-sm.font-medium.text-gray-900 + = @title + %p + = @comment + .ml-4.flex-shrink-0.d-flex + %button.notification-close{"onClick": "this.parentElement.parentElement.parentElement.style.opacity = 0"} + = svg_icon('close') \ No newline at end of file diff --git a/test/components/previews/notification_component_preview.rb b/test/components/previews/notification_component_preview.rb new file mode 100644 index 000000000..090fe394f --- /dev/null +++ b/test/components/previews/notification_component_preview.rb @@ -0,0 +1,12 @@ +class NotificationComponentPreview < ViewComponent::Preview + + # @param title text + # @param message text + # @param type select [success, warning, error] + # @param auto_remove toggle + + def default(title: "Notification message", message: "Here we can type a success or failure message to the user", type: 'success', auto_remove: false) + render NotificationComponent.new(title: title, comment: message, type: type, auto_remove: auto_remove) + end + +end \ No newline at end of file From a146f515696eec477fc2bbd3272c646df00f7dd0 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 15 May 2023 09:06:57 +0200 Subject: [PATCH 132/533] use the notification component as the default website flash message --- app/helpers/application_helper.rb | 36 +++++++++++++++++++++++----- app/views/layouts/_notices.html.haml | 5 +--- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 45d630567..3c39b04a0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -449,14 +449,14 @@ def xmldatetime_to_date(xml_date_time_str) #return DateTime.xmlschema( xml_date_time_str ).to_date.to_s end - def flash_class(level) + def notification_type(flash_key) bootstrap_alert_class = { - 'notice' => 'alert-info', - 'success' => 'alert-success', - 'error' => 'alert-danger', - 'alert' => 'alert-danger' + 'notice' => 'success', + 'success' => 'success', + 'error' => 'error', + 'alert' => 'alert' } - bootstrap_alert_class[level] + bootstrap_alert_class[flash_key] end ###BEGIN ruby equivalent of JS code in bp_ajax_controller. @@ -610,4 +610,28 @@ def request_lang lang = 'EN' unless lang lang.upcase end + def bp_config_json + # For config settings, see + # config/bioportal_config.rb + # config/initializers/ontologies_api_client.rb + config = { + org: $ORG, + org_url: $ORG_URL, + site: $SITE, + org_site: $ORG_SITE, + ui_url: $UI_URL, + apikey: LinkedData::Client.settings.apikey, + userapikey: get_apikey, + rest_url: LinkedData::Client.settings.rest_url, + proxy_url: $PROXY_URL, + biomixer_url: $BIOMIXER_URL, + annotator_url: $ANNOTATOR_URL, + ncbo_annotator_url: $NCBO_ANNOTATOR_URL, + ncbo_apikey: $NCBO_API_KEY, + interportal_hash: $INTERPORTAL_HASH, + resolve_namespace: RESOLVE_NAMESPACE + } + config[:ncbo_slice] = @subdomain_filter[:acronym] if (@subdomain_filter[:active] && !@subdomain_filter[:acronym].empty?) + config.to_json + end end diff --git a/app/views/layouts/_notices.html.haml b/app/views/layouts/_notices.html.haml index 9119dc815..35fe7cf79 100644 --- a/app/views/layouts/_notices.html.haml +++ b/app/views/layouts/_notices.html.haml @@ -2,10 +2,7 @@ = license_notification(current_license()) - flash.each do |key, message| - %div{class: "flash alert #{flash_class(key)} alert-dismissible fade show", role: "alert"} - = message - %button{type: 'button', class: 'close', 'data-dismiss': 'alert', 'aria-label': 'Close'} - %span{'aria-hidden': 'true'} × + = render NotificationComponent.new(title: message , type: notification_type(key)) - do_not_display_subdomain_info_here = Set.new(["homeall_resources"]) - if at_slice? && !do_not_display_subdomain_info_here.include?("#{controller.controller_name}#{controller.action_name}") From e93ab4c3da55ee64666825779315b912f50c44bf Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 15 May 2023 09:11:47 +0200 Subject: [PATCH 133/533] make the components preview container include JS cod if needed --- app/views/layouts/component_preview.html.erb | 48 +++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/component_preview.html.erb b/app/views/layouts/component_preview.html.erb index bc38bff11..745f4c563 100644 --- a/app/views/layouts/component_preview.html.erb +++ b/app/views/layouts/component_preview.html.erb @@ -3,10 +3,54 @@ Component Preview <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "vendor" %> + - <%= yield %> - +<%= yield %> +<%= javascript_include_tag "application" %> \ No newline at end of file From 9c8a2d404ffc6e582a69da2f4d07bc62b69ded40 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 15 May 2023 09:35:07 +0200 Subject: [PATCH 134/533] replace submitted ontology names by acronyms on the account page --- app/views/users/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index ecd788660..c5933dd87 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -112,7 +112,7 @@ .account-page-small-cards-container - @admin_ontologies.each do |ont| .account-page-submitted-ontology - %a{href: "/ontologies/#{ont.acronym}"}= ont.name + %a{href: "/ontologies/#{ont.acronym}"}= ont.acronym - unless @user_projects.nil? || @user_projects.empty? - no_ontologies = false .account-page-card From b5c921d533233c31f19087d682ab26738a85e20f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 15 May 2023 09:35:47 +0200 Subject: [PATCH 135/533] fix notification alert preview and style --- app/assets/stylesheets/components/index.scss | 2 +- app/assets/stylesheets/components/notification.scss | 2 +- test/components/previews/notification_component_preview.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index be2de3f09..8d42cc34a 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -1,3 +1,3 @@ @import 'chips'; -@import 'card_message' +@import 'card_message'; @import "notification"; \ No newline at end of file diff --git a/app/assets/stylesheets/components/notification.scss b/app/assets/stylesheets/components/notification.scss index d746bbb4f..fafecc190 100644 --- a/app/assets/stylesheets/components/notification.scss +++ b/app/assets/stylesheets/components/notification.scss @@ -91,7 +91,7 @@ } } -.type-warning path { +.type-alert path { fill: #edb464; } diff --git a/test/components/previews/notification_component_preview.rb b/test/components/previews/notification_component_preview.rb index 090fe394f..407c0d947 100644 --- a/test/components/previews/notification_component_preview.rb +++ b/test/components/previews/notification_component_preview.rb @@ -2,7 +2,7 @@ class NotificationComponentPreview < ViewComponent::Preview # @param title text # @param message text - # @param type select [success, warning, error] + # @param type select [success, alert, error] # @param auto_remove toggle def default(title: "Notification message", message: "Here we can type a success or failure message to the user", type: 'success', auto_remove: false) From aa40e655e7a351c8dc002eb490efc64a80a3236f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 15 May 2023 11:39:14 +0200 Subject: [PATCH 136/533] show the name of the submitted ontologies as tooltip in the account page --- app/views/users/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index c5933dd87..bf3657498 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -111,7 +111,7 @@ %h4.account-page-card-title Submitted ontologies .account-page-small-cards-container - @admin_ontologies.each do |ont| - .account-page-submitted-ontology + .account-page-submitted-ontology{data: {controller: 'tooltip'}, title: ont.name} %a{href: "/ontologies/#{ont.acronym}"}= ont.acronym - unless @user_projects.nil? || @user_projects.empty? - no_ontologies = false From 10c586f929a21ce2314949f6539533938049c702 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 15 May 2023 16:11:31 +0200 Subject: [PATCH 137/533] Do the requested changes on the PR --- app/assets/stylesheets/nav_bar.scss | 10 +++++----- app/helpers/application_helper.rb | 2 +- app/views/layouts/_topnav.html.haml | 17 ++++++----------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss index a540768f9..07eb48a03 100644 --- a/app/assets/stylesheets/nav_bar.scss +++ b/app/assets/stylesheets/nav_bar.scss @@ -3,7 +3,7 @@ justify-content: center; background-color: var(--primary-color); } -nav{ +.top-nav{ display: flex !important; justify-content: space-between; background-color: var(--primary-color); @@ -100,13 +100,13 @@ nav{ background-color: rgba(255, 255, 255, 0.1); } -nav .menu-btn i{ +.top-nav .menu-btn i{ color: #fff; font-size: 22px; cursor: pointer; display: none; } -nav input[type="checkbox"]{ +.top-nav input[type="checkbox"]{ display: none; } @@ -116,7 +116,7 @@ nav input[type="checkbox"]{ } @media (max-width: 1200px){ - nav .menu-btn i{ + .top-nav .menu-btn i{ display: block; } #nav-menu:checked ~ .menu-btn i:before{ @@ -124,7 +124,7 @@ nav input[type="checkbox"]{ } - #nav-menu:checked ~ nav{ + #nav-menu:checked ~ .top-nav{ display:block; background-color: blue; } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index eb74691c1..b50e410c7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -604,6 +604,6 @@ def skos? end def current_page?(path) - request.path == path ? true : false + request.path.eql?(path) end end diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 020dea1d0..51ff01e9a 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -1,23 +1,18 @@ .nav-container - %nav + %nav.top-nav %a.nav-logo{href: "/"} %img{:src => asset_path("logo-white.svg")}/ %p AgroPortal %input#nav-menu{:type => "checkbox"}/ %label.menu-btn{:for => "nav-menu"} %i.fas.fa-bars + - navitems = [["/ontologies", "Browse"],["/mappings", "Mappings"],["/recommender", "Recommender"],["/annotator", "Annotator"], ["/landscape", "Landscape"]] .nav-items %ul - %li - %a{href: "/ontologies", class: ("active" if current_page?("/ontologies"))} Browse - %li - %a{href: "/mappings", class: ("active" if current_page?("/mappings"))} Mappings - %li - %a{href: "/recommender", class: ("active" if current_page?("/recommender"))} Recommender - %li - %a{href: "/annotator", class: ("active" if current_page?("/annotator"))} Annotator - %li - %a{href: "/landscape", class: ("active" if current_page?("/landscape"))} Landscape + - navitems.each do |navItem| + %li + %a{href: navItem[0], class: ("active" if current_page?(navItem[0]))} #{navItem[1]} + %input{:placeholder => "Search AgroPortal ...", :type => "text"}/ %a{:href => "/login"} Login From d7b691eafba8073da59110e0768b72da7587f511 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Mon, 15 May 2023 18:15:19 +0200 Subject: [PATCH 138/533] fix alert message component call with correct parentheses --- app/views/concepts/_details.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index bf8ae61f4..93862c7ed 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -15,7 +15,7 @@ %td{nowrap: ""}= t('ontology_details.concept.preferred_name') %td - if @concept.prefLabel().nil? - = render(AlertMessageComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language', type: "warning", closeable: false))) + = render(AlertMessageComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language'), type: "warning", closeable: false)) - else %p= @concept.prefLabel({:use_html => true}).html_safe From 94465b7971449b85d7dd748b3b94a1cfb4e21bc0 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 16 May 2023 16:19:45 +0200 Subject: [PATCH 139/533] move home search logic to a stimilus controller --- .../controllers/home_search_controller.js | 119 ++++++++++++++++ app/views/home/index.html.haml | 127 ++---------------- 2 files changed, 127 insertions(+), 119 deletions(-) create mode 100644 app/javascript/controllers/home_search_controller.js diff --git a/app/javascript/controllers/home_search_controller.js b/app/javascript/controllers/home_search_controller.js new file mode 100644 index 000000000..b49dba1d4 --- /dev/null +++ b/app/javascript/controllers/home_search_controller.js @@ -0,0 +1,119 @@ +import { Controller } from "@hotwired/stimulus" + +// Connects to data-controller="home-search" +export default class extends Controller { + static targets = [ "input", "dropDown", "ontology", "searchedOntologies", "searchOntologyContent", "homeSearchOntologies" ] + static values = { + ontologies: Array + } + connect() { + this.ontologies = this.ontologiesValue + this.input = this.inputTarget + this.dropDown = this.dropDownTarget + this.ontology = this.ontologyTarget + this.searchedOntologies = this.searchedOntologiesTarget + this.searchOntologyContent = this.searchOntologyContentTarget + this.homeSearchOntologies = this.homeSearchOntologiesTarget + + this.input.addEventListener("input",()=>{ + this.#searchInput() + } ); + this.dropDown.addEventListener("mousedown", function(event) { + event.preventDefault(); // prevent the blur event from firing + }); + + this.input.addEventListener("blur", function() { + + this.dropDown.style.display = "none"; + this.input.classList.remove("home-dropdown-active"); + }); + + } + + + #scrollDown(currentScroll) { + const startPosition = window.pageYOffset; + const distance = 300 - currentScroll; + const duration = 1000; + let start = null; + + function scrollAnimation(timestamp) { + if (!start) start = timestamp; + const progress = timestamp - start; + const scrollPosition = startPosition + easeInOutCubic(progress, 0, distance, duration); + window.scrollTo(0, scrollPosition); + if (progress < duration) { + window.requestAnimationFrame(scrollAnimation); + } + } + + function easeInOutCubic(t, b, c, d) { + t /= d / 2; + if (t < 1) return c / 2 * t * t * t + b; + t -= 2; + return c / 2 * (t * t * t + 2) + b; + } + + window.requestAnimationFrame(scrollAnimation); + } + + #searchInput() { + let results_list = [] + const inputValue = this.input.value.trim(); + if (inputValue.length > 0) { + this.ontology.innerHTML = inputValue; + this.searchedOntologies.innerHTML = inputValue; + this.searchOntologyContent.href = "/search?query="+inputValue; + this.homeSearchOntologies.href = "/ontologies?search="+inputValue; + this.dropDown.innerHTML = "" + let breaker = 0 + for (var i = 0; i < this.ontologies.length; i++) { + if (breaker == 4){ + break; + } + // Get the current item from the ontologies array + var item = this.ontologies[i]; + + // Check if the item contains the substring + if (item[0].toLowerCase().includes(inputValue.toLowerCase()) || item[1].toLowerCase().includes(inputValue.toLowerCase())) { + results_list.push(item); + breaker = breaker + 1 + } + } + + results_list.forEach((item)=> { + let link = document.createElement("a"); + link.href = "/ontologies/"+item[1]; + link.className = "home-search-ontology-content"; + + let p1 = document.createElement("p"); + p1.id = "seached-ontology"; + p1.className = "home-searched-ontology"; + p1.textContent = item[0]+" "+"("+item[1]+")"; + + let p2 = document.createElement("p"); + p2.className = "home-result-type"; + p2.textContent = "Ontology"; + + link.appendChild(p1); + link.appendChild(p2); + + this.dropDown.appendChild(link); + + }); + this.dropDown.appendChild(this.homeSearchOntologies); + this.dropDown.appendChild(this.searchOntologyContent); + this.dropDown.style.display = "block"; + this.input.classList.add("home-dropdown-active"); + + if (window.scrollY < 300) { + this.#scrollDown(window.scrollY); + } + + + } else { + this.dropDown.style.display = "none"; + this.input.classList.remove("home-dropdown-active"); + } + } +} diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 9d0ce3dce..f3d77f947 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -37,19 +37,19 @@ %a.home-bubble.home-bubble-four{:href => "/visits"} %h5 ... - .home-header-title-container + .home-header-title-container{'data-controller': "home-search", 'data-home-search-ontologies-value': raw(@ontology_names.to_json)} .home-header-title %h4 Welcome to AgroPortal %p The home of vocabularies and ontologies in agronomy and related fields. - %input#home-search{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text"}/ - #home-search-drop-down - %a.home-search-ontology-content#home-search-ontology-content{href: "#"} - %p#seached-ontology + %input#home-search{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text", 'data-home-search-target': 'input'} + #home-search-drop-down{'data-home-search-target': 'dropDown'} + %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} + %p#seached-ontology{'data-home-search-target': 'ontology'} %div %img{src: asset_path("loop.svg")}/ %p Search ontology content - %a.home-search-ontology-content#home-search-ontologies{href: "#"} - %p#seached-ontologies + %a.home-search-ontology-content#home-search-ontologies{href: "#", 'data-home-search-target': 'homeSearchOntologies'} + %p#seached-ontologies{'data-home-search-target': 'searchedOntologies'} %div %img{src: asset_path("loop.svg")}/ %p See all @@ -108,7 +108,7 @@ %path{:d => "M0.828447 0.982555C0.668147 0.979582 0.510886 1.02651 0.378427 1.11684C0.245967 1.20716 0.144858 1.33643 0.0890904 1.48675C0.0333229 1.63706 0.0256545 1.801 0.0671467 1.95586C0.108639 2.11073 0.19724 2.24887 0.32069 2.35117L5.04517 6.39572L0.317771 10.4403C0.231406 10.5032 0.15903 10.5834 0.105209 10.6757C0.0513877 10.7681 0.0172914 10.8706 0.00507139 10.9767C-0.00714863 11.0829 0.00277318 11.1905 0.0342104 11.2926C0.0656476 11.3948 0.117918 11.4893 0.187722 11.5702C0.257526 11.6512 0.343349 11.7168 0.439774 11.7628C0.536199 11.8089 0.641133 11.8346 0.747953 11.8381C0.854772 11.8416 0.961158 11.8229 1.0604 11.7832C1.15964 11.7435 1.24957 11.6837 1.32453 11.6075L6.72894 6.9881C6.81393 6.9155 6.88218 6.82534 6.92897 6.72383C6.97577 6.62232 7 6.51187 7 6.40009C7 6.28832 6.97577 6.17787 6.92897 6.07636C6.88218 5.97485 6.81393 5.88469 6.72894 5.81209L1.32453 1.17807C1.18758 1.05615 1.01176 0.986851 0.828447 0.982555Z", :fill => "#31B404"} .home-sub-section-right %h4 Twitter news - %hr.home-section-line/ + %hr.home-section-line .home-card.home-twitter-news %a.twitter-timeline{"data-height" => "349", "data-width" => "533", :href => "https://twitter.com/lagroportal?ref_src=twsrc%5Etfw"} Tweets by lagroportal %script{:async => "", :charset => "utf-8", :src => "https://platform.twitter.com/widgets.js"} @@ -190,114 +190,3 @@ document.getElementById("recommender_submit").click() } - var ontologies = #{raw(@ontology_names.to_json)}; - - const input = document.getElementById("home-search"); - const dropdown = document.getElementById("home-search-drop-down"); - const ontology = document.getElementById("seached-ontology"); - const searchedOntologies = document.getElementById("seached-ontologies"); - const searchOntologyContent = document.getElementById("home-search-ontology-content") - const homeSearchOntologies = document.getElementById("home-search-ontologies") - let breaker = 0; - - - function scrollDown(currentScroll) { - const startPosition = window.pageYOffset; - const distance = 300 - currentScroll; - const duration = 1000; - let start = null; - - function scrollAnimation(timestamp) { - if (!start) start = timestamp; - const progress = timestamp - start; - const scrollPosition = startPosition + easeInOutCubic(progress, 0, distance, duration); - window.scrollTo(0, scrollPosition); - if (progress < duration) { - window.requestAnimationFrame(scrollAnimation); - } - } - - function easeInOutCubic(t, b, c, d) { - t /= d / 2; - if (t < 1) return c / 2 * t * t * t + b; - t -= 2; - return c / 2 * (t * t * t + 2) + b; - } - - window.requestAnimationFrame(scrollAnimation); - } - - - - - input.addEventListener("input", function() { - let results_list = [] - const inputValue = input.value.trim(); - if (inputValue.length > 0) { - - ontology.innerHTML = inputValue; - searchedOntologies.innerHTML = inputValue; - searchOntologyContent.href = "/search?query="+inputValue; - homeSearchOntologies.href = "/ontologies?search="+inputValue; - dropdown.innerHTML = "" - breaker = 0 - for (var i = 0; i < ontologies.length; i++) { - if (breaker == 4){ - break; - } - // Get the current item from the ontologies array - var item = ontologies[i]; - - // Check if the item contains the substring - if (item[0].toLowerCase().includes(inputValue.toLowerCase()) || item[1].toLowerCase().includes(inputValue.toLowerCase())) { - results_list.push(item); - breaker = breaker + 1 - } - } - - results_list.forEach(function(item) { - const link = document.createElement("a"); - link.href = "/ontologies/"+item[1]; - link.className = "home-search-ontology-content"; - - const p1 = document.createElement("p"); - p1.id = "seached-ontology"; - p1.className = "home-searched-ontology"; - p1.textContent = item[0]+" "+"("+item[1]+")"; - - const p2 = document.createElement("p"); - p2.className = "home-result-type"; - p2.textContent = "Ontology"; - - link.appendChild(p1); - link.appendChild(p2); - - dropdown.appendChild(link); - - - }); - dropdown.appendChild(homeSearchOntologies); - dropdown.appendChild(searchOntologyContent); - dropdown.style.display = "block"; - input.classList.add("home-dropdown-active"); - - if (window.scrollY < 300) { - scrollDown(window.scrollY); - } - - - } else { - dropdown.style.display = "none"; - input.classList.remove("home-dropdown-active"); - } - }); - dropdown.addEventListener("mousedown", function(event) { - event.preventDefault(); // prevent the blur event from firing - }); - - input.addEventListener("blur", function() { - - dropdown.style.display = "none"; - input.classList.remove("home-dropdown-active"); - }); - \ No newline at end of file From 368d8d5be26c0f10e7f156562dd0e307450c51fb Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 16 May 2023 16:20:24 +0200 Subject: [PATCH 140/533] Fix home twitter container size when the page is still loading --- app/assets/stylesheets/home.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 8bb3292a3..ef5e6dc8d 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -313,7 +313,7 @@ i.fa.fa-caret-square-o-down { padding-top: 35px; } .home-twitter-news{ - + height: 349px; } .home-fair-scores a{ text-decoration: none; From 1d9034856f5b3ecc88a202dbd9297f37e8bf3589 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 17 May 2023 09:58:09 +0200 Subject: [PATCH 141/533] [Feature] Implement dynamic navigation item activation --- app/helpers/application_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 511ba085c..7e2498800 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -604,6 +604,10 @@ def skos? submission = @submission || @submission_latest submission&.hasOntologyLanguage === 'SKOS' end + + def current_page?(path) + request.path.eql?(path) + end def request_lang lang = params[:language] || params[:lang] From f242c189cbebd74f4412e2804b4eeb85c460939b Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 17 May 2023 09:58:26 +0200 Subject: [PATCH 142/533] [Refactor] Improve navigation item rendering with a loop --- app/views/layouts/_topnav.html.haml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 276c91293..5fb6bf539 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -1,23 +1,18 @@ .nav-container - %nav + %nav.top-nav %a.nav-logo{href: "/"} %img{:src => asset_path("logo-white.svg")}/ %p AgroPortal %input#nav-menu{:type => "checkbox"}/ %label.menu-btn{:for => "nav-menu"} %i.fas.fa-bars + - navitems = [["/ontologies", "Browse"],["/mappings", "Mappings"],["/recommender", "Recommender"],["/annotator", "Annotator"], ["/landscape", "Landscape"]] .nav-items %ul - %li - %a{href: "/ontologies", class: ("active" if current_page?("/ontologies"))} Browse - %li - %a{href: "/mappings", class: ("active" if current_page?("/mappings"))} Mappings - %li - %a{href: "/recommender", class: ("active" if current_page?("/recommender"))} Recommender - %li - %a{href: "/annotator", class: ("active" if current_page?("/annotator"))} Annotator - %li - %a{href: "/landscape", class: ("active" if current_page?("/landscape"))} Landscape + - navitems.each do |navItem| + %li + %a{href: navItem[0], class: ("active" if current_page?(navItem[0]))} #{navItem[1]} + %input{:placeholder => "Search AgroPortal ...", :type => "text"}/ %a{:href => "/login"} Login From 49a2562ed7b1658168bd7c60ece07193d5d2e181 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 17 May 2023 09:59:57 +0200 Subject: [PATCH 143/533] [Refactor] Scoped CSS styling for specific navigation element (home nav) --- app/assets/stylesheets/nav_bar.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss index a540768f9..07eb48a03 100644 --- a/app/assets/stylesheets/nav_bar.scss +++ b/app/assets/stylesheets/nav_bar.scss @@ -3,7 +3,7 @@ justify-content: center; background-color: var(--primary-color); } -nav{ +.top-nav{ display: flex !important; justify-content: space-between; background-color: var(--primary-color); @@ -100,13 +100,13 @@ nav{ background-color: rgba(255, 255, 255, 0.1); } -nav .menu-btn i{ +.top-nav .menu-btn i{ color: #fff; font-size: 22px; cursor: pointer; display: none; } -nav input[type="checkbox"]{ +.top-nav input[type="checkbox"]{ display: none; } @@ -116,7 +116,7 @@ nav input[type="checkbox"]{ } @media (max-width: 1200px){ - nav .menu-btn i{ + .top-nav .menu-btn i{ display: block; } #nav-menu:checked ~ .menu-btn i:before{ @@ -124,7 +124,7 @@ nav input[type="checkbox"]{ } - #nav-menu:checked ~ nav{ + #nav-menu:checked ~ .top-nav{ display:block; background-color: blue; } From c4fea20a6708967273d7d91e69ece6d1ae2ec06a Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 17 May 2023 10:01:27 +0200 Subject: [PATCH 144/533] [fix] remove indesired debugger from language change controller --- app/javascript/controllers/language_change_controller.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/javascript/controllers/language_change_controller.js b/app/javascript/controllers/language_change_controller.js index 144b5fa36..e4d891317 100644 --- a/app/javascript/controllers/language_change_controller.js +++ b/app/javascript/controllers/language_change_controller.js @@ -1,11 +1,10 @@ import { Controller } from "@hotwired/stimulus" // Connects to data-controller="language-change" -// This controller is used to change the language of the Concepts, Schemes and Collections export default class extends Controller { dispatchLangChangeEvent() { - debugger + this.element.dispatchEvent(new CustomEvent('lang_changed', { bubbles: true, cancelable: true, @@ -15,6 +14,6 @@ export default class extends Controller { } } })); - } + } } From b80112868f51157e0b8e0223203fb8532deed1d3 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 17 May 2023 10:05:10 +0200 Subject: [PATCH 145/533] [fix] add home search stimilus controller to the index.js --- app/javascript/controllers/index.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index 21c0817b8..a255efbff 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -19,6 +19,9 @@ application.register("form-auto-complete", FormAutoCompleteController) import HistoryController from "./history_controller" application.register("history", HistoryController) +import HomeSearchController from "./home_search_controller" +application.register("home-search", HomeSearchController) + import LabelAjaxController from "./label_ajax_controller" application.register("label-ajax", LabelAjaxController) From b5621fa2ac14862a12c8c2bfecfc711819649b56 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 17 May 2023 15:55:33 +0200 Subject: [PATCH 146/533] Remove duplicated js code from home page --- app/views/home/index.html.haml | 102 --------------------------------- 1 file changed, 102 deletions(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index d0dc77f08..bbf74aa08 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -188,105 +188,3 @@ function submitRecommender(){ document.getElementById("recommender_submit").click() } - - - function scrollDown(currentScroll) { - const startPosition = window.pageYOffset; - const distance = 300 - currentScroll; - const duration = 1000; - let start = null; - - function scrollAnimation(timestamp) { - if (!start) start = timestamp; - const progress = timestamp - start; - const scrollPosition = startPosition + easeInOutCubic(progress, 0, distance, duration); - window.scrollTo(0, scrollPosition); - if (progress < duration) { - window.requestAnimationFrame(scrollAnimation); - } - } - - function easeInOutCubic(t, b, c, d) { - t /= d / 2; - if (t < 1) return c / 2 * t * t * t + b; - t -= 2; - return c / 2 * (t * t * t + 2) + b; - } - - window.requestAnimationFrame(scrollAnimation); - } - - - - - input.addEventListener("input", function() { - let results_list = [] - const inputValue = input.value.trim(); - if (inputValue.length > 0) { - - ontology.innerHTML = inputValue; - searchedOntologies.innerHTML = inputValue; - searchOntologyContent.href = "/search?query="+inputValue; - homeSearchOntologies.href = "/ontologies?search="+inputValue; - dropdown.innerHTML = "" - breaker = 0 - for (var i = 0; i < ontologies.length; i++) { - if (breaker == 4){ - break; - } - // Get the current item from the ontologies array - var item = ontologies[i]; - - // Check if the item contains the substring - if (item[0].toLowerCase().includes(inputValue.toLowerCase()) || item[1].toLowerCase().includes(inputValue.toLowerCase())) { - results_list.push(item); - breaker = breaker + 1 - } - } - - results_list.forEach(function(item) { - const link = document.createElement("a"); - link.href = "/ontologies/"+item[1]; - link.className = "home-search-ontology-content"; - - const p1 = document.createElement("p"); - p1.id = "seached-ontology"; - p1.className = "home-searched-ontology"; - p1.textContent = item[0]+" "+"("+item[1]+")"; - - const p2 = document.createElement("p"); - p2.className = "home-result-type"; - p2.textContent = "Ontology"; - - link.appendChild(p1); - link.appendChild(p2); - - dropdown.appendChild(link); - - - }); - dropdown.appendChild(homeSearchOntologies); - dropdown.appendChild(searchOntologyContent); - dropdown.style.display = "block"; - input.classList.add("home-dropdown-active"); - - if (window.scrollY < 300) { - scrollDown(window.scrollY); - } - - - } else { - dropdown.style.display = "none"; - input.classList.remove("home-dropdown-active"); - } - }); - dropdown.addEventListener("mousedown", function(event) { - event.preventDefault(); // prevent the blur event from firing - }); - - input.addEventListener("blur", function() { - - dropdown.style.display = "none"; - input.classList.remove("home-dropdown-active"); - }); - \ No newline at end of file From 21d18c90dffbe92d8268ce7af0f04dcd23d76f95 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 23 May 2023 09:53:48 +0200 Subject: [PATCH 147/533] add ontology details header assets --- app/assets/images/arrow-right-outlined.svg | 3 +++ app/assets/images/update.svg | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 app/assets/images/arrow-right-outlined.svg create mode 100644 app/assets/images/update.svg diff --git a/app/assets/images/arrow-right-outlined.svg b/app/assets/images/arrow-right-outlined.svg new file mode 100644 index 000000000..5161a4b17 --- /dev/null +++ b/app/assets/images/arrow-right-outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/update.svg b/app/assets/images/update.svg new file mode 100644 index 000000000..29d1f5bcb --- /dev/null +++ b/app/assets/images/update.svg @@ -0,0 +1,3 @@ + + + From 96348848bc19c66ed12ed1308dd74d9c915c45a9 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 23 May 2023 09:54:26 +0200 Subject: [PATCH 148/533] update ontology details header design --- .../stylesheets/application.css.scss.erb | 1 + .../stylesheets/ontology_details_header.scss | 82 +++++++++++++++++++ app/views/layouts/_ontology_viewer.html.haml | 16 ++-- .../layouts/ontology_viewer/_header.html.haml | 53 ++++++------ 4 files changed, 115 insertions(+), 37 deletions(-) create mode 100644 app/assets/stylesheets/ontology_details_header.scss diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index 1b70724a0..b0a28fbcc 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -49,6 +49,7 @@ @import "login"; @import "components/index"; @import "account"; +@import "ontology_details_header"; /* Bootstrap and Font Awesome */ @import "bootstrap"; diff --git a/app/assets/stylesheets/ontology_details_header.scss b/app/assets/stylesheets/ontology_details_header.scss new file mode 100644 index 000000000..e7c0c5eef --- /dev/null +++ b/app/assets/stylesheets/ontology_details_header.scss @@ -0,0 +1,82 @@ +.ontology-details-header-container{ + margin: 40px; +} + +.ontology-details-path{ + display: flex; + color: #888888; + margin-bottom: 20px; +} +.ontology-details-path img{ + margin: 0 12px; +} +.ontology-details-path a{ + text-decoration: underline !important; + color: #888888 !important; +} +.ontology-details-header-sub-container{ + display: flex; + justify-content: space-between; + align-items: center; +} + +.ontology-details-name-bar{ + display: flex; + align-items: center; +} +.ontology-details-name-bar > div{ + font-size: 25px; + font-weight: 700; + margin-right: 10px; +} + +.ontology-details-name-bar > div > span{ + font-size: 17px; + font-weight: 500; +} + +.ontology-details-name-bar .ontology-details-licence{ + display: flex; + align-items: center; + background-color: #F6F6F6; + border-radius: 3px; + padding: 10px 20px; + cursor: pointer; + font-size: 12px; + color: #777777; + font-weight: 600; +} +.ontology-details-name-bar .ontology-details-licence svg{ + margin-left: 10px; + transform: scale(1.2); +} +.ontology-details-last-update{ + display: flex; + align-items: center; + font-size: 14px; + color: #888888; +} +.ontology-details-last-update img{ + margin-right: 10px; +} +.ontology-details-header-right-container{ + color: var(--primary-color); + font-size: 15px; + display: flex; + align-items: center; + border: 1px solid var(--primary-color); + border-radius: 32px; + padding: 10px 20px; + cursor: pointer; +} +.ontology-details-header-right-container:hover{ + background-color: var(--primary-color); + color: white; + +} +.ontology-details-header-right-container:hover svg path{ + fill: white; +} +.ontology-details-header-right-container svg{ + margin-right: 10px; +} \ No newline at end of file diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index d2ad4caea..5826253ae 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -8,12 +8,12 @@ :javascript // Javascript History HTML5 API if ( typeof JSON === 'undefined' ) { - var - url = '/javascripts/history/json2.js', - scriptEl = document.createElement('script'); - scriptEl.type = 'text/javascript'; - scriptEl.src = url; - document.body.appendChild(scriptEl); + var + url = '/javascripts/history/json2.js', + scriptEl = document.createElement('script'); + scriptEl.type = 'text/javascript'; + scriptEl.src = url; + document.body.appendChild(scriptEl); } // Ontology viewer vars @@ -30,7 +30,7 @@ jQuery(document).data().bp.ont_viewer.current_purl = "#{@current_purl}"; jQuery(document).data().bp.ont_viewer.purl_prefix = "#{($PURL_ENABLED ? $PURL_PREFIX+"/"+@ontology.acronym : '')}"; jQuery(document).data().bp.ont_viewer.concept_name_title = (jQuery(document).data().bp.ont_viewer.concept_name == "") ? - "" : " - " + jQuery(document).data().bp.ont_viewer.concept_name; + "" : " - " + jQuery(document).data().bp.ont_viewer.concept_name; @@ -41,7 +41,7 @@ = render partial: 'kgcl_dialogs' - %div.row.pt-md-3.pb-md-2 + %div.row.pt-md-3.pb-md-2{style: "background-color:white;"} %div.col = render partial: 'layouts/ontology_viewer/header' diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index bc5e094da..38af311a0 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -3,32 +3,27 @@ - if sub.nil? || (sub.respond_to?(:status) && sub.status == 404) - details_available = false -# A header of sorts to display ontology name and subset of details. -%div.ont-info-bar.rounded - %div - %h4 - = link_to(@ontology.name, ontology_path(@ontology.acronym)) - %div - - if (details_available && !sub.released.nil?) - %span.text-muted - = t('ontology_details.header.last_uploaded') - = l(Date.parse(sub.creationDate), format: :monthfull_day_year) - %div.ont-info-links - - unless (@ontology.summaryOnly || @ont_restricted || @submission_latest.nil?) - = link_to(@submission_latest.id + "/download?apikey=#{get_apikey}", "aria-label": "Download latest version", title: "Download latest version") do - %i.fas.fa-lg.fa-download{"aria-hidden": true} - - if details_available - - if $PURL_ENABLED - = link_to(@ontology.purl, "aria-label": "BioPortal PURL", title: "BioPortal PURL", target: "_blank") do - %i.fas.fa-lg.fa-link{"aria-hidden": true} - = link_to(sub.homepage, "aria-label": "Ontology home page", title: "Ontology home page", target: "_blank") do - %i.fas.fa-lg.fa-home{"aria-hidden": true} - - unless sub.documentation.nil? - = link_to(sub.documentation, "aria-label": "Ontology documentation", title: "Ontology documentation", target: "_blank") do - %i.fas.fa-lg.fa-book-reader{"aria-hidden": true} - - unless sub.publication.nil? - - sub.publication.each do |pub| - = link_to(pub, "aria-label": "Ontology publications", title: "Ontology publications", target: "_blank") do - %i.fas.fa-lg.fa-book{"aria-hidden": true} - - if @ontology.admin?(session[:user]) - = link_to(edit_ontology_path(@ontology.acronym), "aria-label": "Edit ontology details", title: "Edit ontology details") do - %i.fas.fa-lg.fa-user-edit \ No newline at end of file +.ontology-details-header-container + .ontology-details-path + %a{href: "/ontologies"} ontologies + %img{src: asset_path("arrow-right-outlined.svg")}/ + %div agrovoc + .ontology-details-header-sub-container + .ontology-details-header-left-container + .ontology-details-name-bar + %div + AGROVOC + %span (AGROVOCNIM) + .ontology-details-licence + %div CC-BY IGO 3.0 + %svg{fill: "none", height: "12", viewbox: "0 0 12 12", width: "12", xmlns: "http://www.w3.org/2000/svg"} + %path{"clip-rule" => "evenodd", d: "M0.681818 0C4.22727 0 7.77273 0 11.3182 0C11.3182 0.0606045 11.3182 0.121214 11.3182 0.181818C11.4242 0.181818 11.5303 0.181818 11.6364 0.181818C11.6364 0.242423 11.6364 0.303032 11.6364 0.363636C11.697 0.363636 11.7576 0.363636 11.8182 0.363636C11.8182 0.469695 11.8182 0.575759 11.8182 0.681818C11.8788 0.681818 11.9394 0.681818 12 0.681818C12 4.22727 12 7.77273 12 11.3182C11.9394 11.3182 11.8788 11.3182 11.8182 11.3182C11.8182 11.4242 11.8182 11.5303 11.8182 11.6364C11.7576 11.6364 11.697 11.6364 11.6364 11.6364C11.6364 11.697 11.6364 11.7576 11.6364 11.8182C11.5303 11.8182 11.4242 11.8182 11.3182 11.8182C11.3182 11.8788 11.3182 11.9394 11.3182 12C8.48486 12 5.6515 12 2.81818 12C2.81818 11.9242 2.81818 11.8485 2.81818 11.7727C2.87877 11.7727 2.93941 11.7727 3 11.7727C3 11.7273 3 11.6818 3 11.6364C3.06059 11.6364 3.12123 11.6364 3.18182 11.6364C3.18182 11.5758 3.18182 11.5151 3.18182 11.4545C3.22727 11.4545 3.27273 11.4545 3.31818 11.4545C3.31818 11.394 3.31818 11.3333 3.31818 11.2727C3.37877 11.2727 3.43941 11.2727 3.5 11.2727C3.5 11.2273 3.5 11.1818 3.5 11.1364C3.56059 11.1364 3.62123 11.1364 3.68182 11.1364C3.68182 11.0758 3.68182 11.0151 3.68182 10.9545C3.72727 10.9545 3.77273 10.9545 3.81818 10.9545C3.81818 10.894 3.81818 10.8333 3.81818 10.7727C3.87877 10.7727 3.93941 10.7727 4 10.7727C4 10.7273 4 10.6818 4 10.6364C6.21214 10.6364 8.42423 10.6364 10.6364 10.6364C10.6364 8 10.6364 5.36364 10.6364 2.72727C7.54545 2.72727 4.45455 2.72727 1.36364 2.72727C1.36364 4.48486 1.36364 6.24241 1.36364 8C1.31818 8 1.27273 8 1.22727 8C1.22727 8.06059 1.22727 8.12123 1.22727 8.18182C1.16667 8.18182 1.10606 8.18182 1.04545 8.18182C1.04545 8.22727 1.04545 8.27273 1.04545 8.31818C0.98485 8.31818 0.924241 8.31818 0.863636 8.31818C0.863636 8.37877 0.863636 8.43941 0.863636 8.5C0.818182 8.5 0.772727 8.5 0.727273 8.5C0.727273 8.56059 0.727273 8.62123 0.727273 8.68182C0.666668 8.68182 0.606059 8.68182 0.545455 8.68182C0.545455 8.72727 0.545455 8.77273 0.545455 8.81818C0.48485 8.81818 0.424241 8.81818 0.363636 8.81818C0.363636 8.87877 0.363636 8.93941 0.363636 9C0.318182 9 0.272727 9 0.227273 9C0.227273 9.06059 0.227273 9.12123 0.227273 9.18182C0.151514 9.18182 0.0757591 9.18182 0 9.18182C0 6.3485 0 3.51514 0 0.681818C0.0606045 0.681818 0.121214 0.681818 0.181818 0.681818C0.181818 0.575759 0.181818 0.469695 0.181818 0.363636C0.242423 0.363636 0.303032 0.363636 0.363636 0.363636C0.363636 0.303032 0.363636 0.242423 0.363636 0.181818C0.469695 0.181818 0.575759 0.181818 0.681818 0.181818C0.681818 0.121214 0.681818 0.0606045 0.681818 0Z", fill: "#30B303", "fill-rule" => "evenodd", opacity: "0.972"} + %path{"clip-rule" => "evenodd", d: "M2.81818 5.31836C4.10605 5.31836 5.39396 5.31836 6.68182 5.31836C6.68182 6.60622 6.68182 7.89413 6.68182 9.182C6.60605 9.182 6.53032 9.182 6.45455 9.182C6.45455 9.1214 6.45455 9.06077 6.45455 9.00018C6.40909 9.00018 6.36364 9.00018 6.31818 9.00018C6.31818 8.93959 6.31818 8.87895 6.31818 8.81836C6.25759 8.81836 6.19696 8.81836 6.13636 8.81836C6.13636 8.7729 6.13636 8.72745 6.13636 8.682C6.09091 8.682 6.04546 8.682 6 8.682C6 8.6214 6 8.56077 6 8.50018C5.93941 8.50018 5.87877 8.50018 5.81818 8.50018C5.81818 8.43959 5.81818 8.37895 5.81818 8.31836C5.75759 8.31836 5.69696 8.31836 5.63636 8.31836C5.63636 8.2729 5.63636 8.22745 5.63636 8.182C5.59091 8.182 5.54546 8.182 5.5 8.182C5.5 8.1214 5.5 8.06077 5.5 8.00018C5.43941 8.00018 5.37877 8.00018 5.31818 8.00018C5.31818 7.95472 5.31818 7.90927 5.31818 7.86381C5.27273 7.86381 5.22727 7.86381 5.18182 7.86381C5.18182 7.90927 5.18182 7.95472 5.18182 8.00018C5.13636 8.00018 5.09091 8.00018 5.04546 8.00018C5.04546 8.06077 5.04546 8.1214 5.04546 8.182C4.98486 8.182 4.92423 8.182 4.86364 8.182C4.86364 8.22745 4.86364 8.2729 4.86364 8.31836C4.80305 8.31836 4.74241 8.31836 4.68182 8.31836C4.68182 8.37895 4.68182 8.43959 4.68182 8.50018C4.63636 8.50018 4.59091 8.50018 4.54546 8.50018C4.54546 8.56077 4.54546 8.6214 4.54546 8.682C4.48486 8.682 4.42423 8.682 4.36364 8.682C4.36364 8.72745 4.36364 8.7729 4.36364 8.81836C4.30305 8.81836 4.24241 8.81836 4.18182 8.81836C4.18182 8.87895 4.18182 8.93959 4.18182 9.00018C4.13636 9.00018 4.09091 9.00018 4.04546 9.00018C4.04546 9.06077 4.04546 9.1214 4.04546 9.182C3.98486 9.182 3.92423 9.182 3.86364 9.182C3.86364 9.22745 3.86364 9.2729 3.86364 9.31836C3.80305 9.31836 3.74241 9.31836 3.68182 9.31836C3.68182 9.37895 3.68182 9.43959 3.68182 9.50018C3.63636 9.50018 3.59091 9.50018 3.54546 9.50018C3.54546 9.56077 3.54546 9.6214 3.54546 9.682C3.48486 9.682 3.42423 9.682 3.36364 9.682C3.36364 9.72745 3.36364 9.7729 3.36364 9.81836C3.30305 9.81836 3.24241 9.81836 3.18182 9.81836C3.18182 9.87895 3.18182 9.93959 3.18182 10.0002C3.13636 10.0002 3.09091 10.0002 3.04546 10.0002C3.04546 10.0608 3.04546 10.1214 3.04546 10.182C2.98486 10.182 2.92423 10.182 2.86364 10.182C2.86364 10.2275 2.86364 10.2729 2.86364 10.3184C2.81818 10.3184 2.77273 10.3184 2.72727 10.3184C2.72727 10.379 2.72727 10.4396 2.72727 10.5002C2.66668 10.5002 2.60606 10.5002 2.54546 10.5002C2.54546 10.5608 2.54546 10.6214 2.54546 10.682C2.48485 10.682 2.42424 10.682 2.36364 10.682C2.36364 10.7275 2.36364 10.7729 2.36364 10.8184C2.31818 10.8184 2.27273 10.8184 2.22727 10.8184C2.22727 10.8789 2.22727 10.9396 2.22727 11.0002C2.16667 11.0002 2.10606 11.0002 2.04546 11.0002C2.04546 11.0456 2.04546 11.0911 2.04546 11.1365C1.98485 11.1365 1.92424 11.1365 1.86364 11.1365C1.86364 11.1971 1.86364 11.2578 1.86364 11.3184C1.81818 11.3184 1.77273 11.3184 1.72727 11.3184C1.72727 11.3789 1.72727 11.4396 1.72727 11.5002C1.66667 11.5002 1.60606 11.5002 1.54546 11.5002C1.54546 11.5456 1.54546 11.5911 1.54546 11.6365C1.48485 11.6365 1.42424 11.6365 1.36364 11.6365C1.36364 11.6971 1.36364 11.7578 1.36364 11.8184C1.31818 11.8184 1.27273 11.8184 1.22727 11.8184C1.23409 11.9848 1.16591 12.0302 1.02273 11.9547C1.00078 11.9116 0.993206 11.8662 1 11.8184C0.954547 11.8184 0.909092 11.8184 0.863638 11.8184C0.863638 11.7578 0.863638 11.6971 0.863638 11.6365C0.803033 11.6365 0.742424 11.6365 0.68182 11.6365C0.68182 11.5911 0.68182 11.5456 0.68182 11.5002C0.621215 11.5002 0.560606 11.5002 0.500001 11.5002C0.500001 11.4396 0.500001 11.3789 0.500001 11.3184C0.454547 11.3184 0.409092 11.3184 0.363638 11.3184C0.363638 11.2578 0.363638 11.1971 0.363638 11.1365C0.303033 11.1365 0.242424 11.1365 0.18182 11.1365C0.18182 11.0911 0.18182 11.0456 0.18182 11.0002C0.136365 11.0002 0.0909105 11.0002 0.0454559 11.0002C0.0454559 10.9396 0.0454559 10.8789 0.0454559 10.8184C0.0909105 10.8184 0.136365 10.8184 0.18182 10.8184C0.18182 10.7578 0.18182 10.6971 0.18182 10.6365C0.242424 10.6365 0.303033 10.6365 0.363638 10.6365C0.363638 10.576 0.363638 10.5153 0.363638 10.4547C0.409092 10.4547 0.454547 10.4547 0.500001 10.4547C0.500001 10.3941 0.500001 10.3335 0.500001 10.2729C0.560606 10.2729 0.621215 10.2729 0.68182 10.2729C0.68182 10.2275 0.68182 10.182 0.68182 10.1365C0.742424 10.1365 0.803033 10.1365 0.863638 10.1365C0.863638 10.076 0.863638 10.0153 0.863638 9.95472C0.909092 9.95472 0.954547 9.95472 1 9.95472C1 9.89413 1 9.8335 1 9.7729C1.06061 9.7729 1.12121 9.7729 1.18182 9.7729C1.18182 9.72745 1.18182 9.682 1.18182 9.63654C1.22727 9.63654 1.27273 9.63654 1.31818 9.63654C1.31818 9.57595 1.31818 9.51531 1.31818 9.45472C1.37879 9.45472 1.4394 9.45472 1.5 9.45472C1.5 9.39413 1.5 9.3335 1.5 9.2729C1.56061 9.2729 1.62121 9.2729 1.68182 9.2729C1.68182 9.22745 1.68182 9.182 1.68182 9.13654C1.72727 9.13654 1.77273 9.13654 1.81818 9.13654C1.81818 9.07595 1.81818 9.01531 1.81818 8.95472C1.87879 8.95472 1.9394 8.95472 2 8.95472C2 8.90927 2 8.86381 2 8.81836C2.06061 8.81836 2.12121 8.81836 2.18182 8.81836C2.18182 8.75777 2.18182 8.69713 2.18182 8.63654C2.22727 8.63654 2.27273 8.63654 2.31818 8.63654C2.31818 8.57595 2.31818 8.51531 2.31818 8.45472C2.37879 8.45472 2.4394 8.45472 2.5 8.45472C2.5 8.40927 2.5 8.36381 2.5 8.31836C2.56061 8.31836 2.62123 8.31836 2.68182 8.31836C2.68182 8.25777 2.68182 8.19713 2.68182 8.13654C2.72727 8.13654 2.77273 8.13654 2.81818 8.13654C2.81818 8.07595 2.81818 8.01531 2.81818 7.95472C2.87877 7.95472 2.93941 7.95472 3 7.95472C3 7.90927 3 7.86381 3 7.81836C3.06059 7.81836 3.12123 7.81836 3.18182 7.81836C3.18182 7.75777 3.18182 7.69713 3.18182 7.63654C3.22727 7.63654 3.27273 7.63654 3.31818 7.63654C3.31818 7.57595 3.31818 7.51531 3.31818 7.45472C3.37877 7.45472 3.43941 7.45472 3.5 7.45472C3.5 7.40927 3.5 7.36381 3.5 7.31836C3.56059 7.31836 3.62123 7.31836 3.68182 7.31836C3.68182 7.25777 3.68182 7.19713 3.68182 7.13654C3.72727 7.13654 3.77273 7.13654 3.81818 7.13654C3.81818 7.07595 3.81818 7.01531 3.81818 6.95472C3.87877 6.95472 3.93941 6.95472 4 6.95472C4 6.90927 4 6.86381 4 6.81836C4.04546 6.81836 4.09091 6.81836 4.13636 6.81836C4.13636 6.7729 4.13636 6.72745 4.13636 6.682C4.09091 6.682 4.04546 6.682 4 6.682C4 6.6214 4 6.56077 4 6.50018C3.93941 6.50018 3.87877 6.50018 3.81818 6.50018C3.81818 6.45472 3.81818 6.40927 3.81818 6.36381C3.77273 6.36381 3.72727 6.36381 3.68182 6.36381C3.68182 6.30322 3.68182 6.24259 3.68182 6.182C3.62123 6.182 3.56059 6.182 3.5 6.182C3.5 6.1214 3.5 6.06077 3.5 6.00018C3.43941 6.00018 3.37877 6.00018 3.31818 6.00018C3.31818 5.95472 3.31818 5.90927 3.31818 5.86381C3.27273 5.86381 3.22727 5.86381 3.18182 5.86381C3.18182 5.80322 3.18182 5.74259 3.18182 5.682C3.12123 5.682 3.06059 5.682 3 5.682C3 5.6214 3 5.56077 3 5.50018C2.93941 5.50018 2.87877 5.50018 2.81818 5.50018C2.81818 5.43959 2.81818 5.37895 2.81818 5.31836Z", fill: "#31B304", "fill-rule" => "evenodd", opacity: "0.951"} + .ontology-details-last-update + %img{src: asset_path("update.svg")}/ + %div Last update on February 2, 2023 + .ontology-details-header-right-container + %svg{fill: "none", height: "14", viewbox: "0 0 20 14", width: "20", xmlns: "http://www.w3.org/2000/svg"} + %path{d: "M10.0001 0.415132C6.25672 0.415132 2.67253 3.16921 0.306647 6.02839C-0.102216 6.52254 -0.102216 7.23985 0.306647 7.73397C0.901484 8.45285 2.14805 9.83978 3.81325 11.0519C8.0074 14.1048 11.9847 14.1106 16.187 11.0519C18.1432 9.62794 19.6936 7.76068 19.6936 7.73397C20.1024 7.23985 20.1024 6.52254 19.6936 6.02843C17.328 3.16959 13.7443 0.415132 10.0001 0.415132ZM10.0001 12.1156C5.85321 12.1156 2.25847 8.16088 1.25554 6.9488C1.23983 6.92977 1.23123 6.90586 1.23123 6.88118C1.23123 6.8565 1.23983 6.83259 1.25554 6.81356C2.25851 5.60148 5.85321 1.64676 10.0001 1.64676C14.147 1.64676 17.7417 5.60148 18.7447 6.81356C18.8031 6.88426 18.7408 6.9488 18.7447 6.9488C17.7417 8.16088 14.147 12.1156 10.0001 12.1156Z", fill: "#31B404"} + %path{d: "M10.0001 2.57001C7.62316 2.57001 5.68939 4.50378 5.68939 6.88071C5.68939 9.25763 7.62316 11.1914 10.0001 11.1914C12.377 11.1914 14.3108 9.25763 14.3108 6.88071C14.3108 4.50378 12.377 2.57001 10.0001 2.57001ZM10.0001 9.95978C8.30229 9.95978 6.92102 8.57851 6.92102 6.88071C6.92102 5.18291 8.30229 3.80164 10.0001 3.80164C11.6979 3.80164 13.0792 5.18291 13.0792 6.88071C13.0792 8.57851 11.6979 9.95978 10.0001 9.95978Z", fill: "#31B404"} + %div Watch (12) From 642f15ae44ee3a93672ae5afcb466305ac45cfdc Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 23 May 2023 10:02:27 +0200 Subject: [PATCH 149/533] add home page assets --- app/assets/images/logos/ontoportal.svg | 3 +++ app/assets/images/loop.svg | 3 +++ app/assets/images/social/github.svg | 3 +++ app/assets/images/social/people.svg | 3 +++ app/assets/images/social/twitter.svg | 10 ++++++++++ 5 files changed, 22 insertions(+) create mode 100644 app/assets/images/logos/ontoportal.svg create mode 100644 app/assets/images/loop.svg create mode 100644 app/assets/images/social/github.svg create mode 100644 app/assets/images/social/people.svg create mode 100644 app/assets/images/social/twitter.svg diff --git a/app/assets/images/logos/ontoportal.svg b/app/assets/images/logos/ontoportal.svg new file mode 100644 index 000000000..dfb0838d3 --- /dev/null +++ b/app/assets/images/logos/ontoportal.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/loop.svg b/app/assets/images/loop.svg new file mode 100644 index 000000000..8bf624de0 --- /dev/null +++ b/app/assets/images/loop.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/social/github.svg b/app/assets/images/social/github.svg new file mode 100644 index 000000000..9f2ef1737 --- /dev/null +++ b/app/assets/images/social/github.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/images/social/people.svg b/app/assets/images/social/people.svg new file mode 100644 index 000000000..85f1d5fd0 --- /dev/null +++ b/app/assets/images/social/people.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/images/social/twitter.svg b/app/assets/images/social/twitter.svg new file mode 100644 index 000000000..162e21ae2 --- /dev/null +++ b/app/assets/images/social/twitter.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file From 1c2de07cff4fea103beb10226345fe7d1f95de7a Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 23 May 2023 10:07:50 +0200 Subject: [PATCH 150/533] Update home page design --- app/assets/stylesheets/home.scss | 440 +++++++++++++++++++++++++++++++ app/views/home/index.html.haml | 303 ++++++++++++--------- 2 files changed, 618 insertions(+), 125 deletions(-) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index f26409b71..b048adb09 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -2,3 +2,443 @@ i.fa.fa-caret-square-o-down { vertical-align: middle; margin-left: 2px; } + +.container-fluid{ + padding: 0 !important; +} + +.home-header-container{ + height: 310px; +} + +.home-header-background{ + background-color: var(--primary-color);; + width: 100%; + height: 309px; + position: absolute; + z-index: 0; +} + +.home-bubbles{ + display: flex; + justify-content: center; +} +.home-bubble{ + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + background-color: rgba(255, 255, 255, 0.4); + position: absolute; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.05); + transform: scale(0.1); + animation: scale-up 1s ease forwards; +} +.home-bubble-one{ + width: 232px; + height: 232px; + border-radius: 116px; + z-index: 1; + margin-left: 622px; +} +.home-bubble-two{ + width: 194px; + height: 194px; + border-radius: 97px; + z-index: 2; + margin-left: 387px; + margin-top: 161px; +} +.home-bubble-three{ + width: 130px; + height: 130px; + border-radius: 65px; + z-index: 3; + margin-left: 656px; + margin-top: 192px; +} +.home-bubble-four{ + width: 70px; + height: 70px; + border-radius: 35px; + z-index: 4; + margin-left: 815px; + margin-top: 189px; + transform: scale(1); + +} + +.home-bubble h5{ + color: white; + font-size: 18px; + margin: 0; + font-weight: 600; +} +.home-bubble p{ + color: white; + font-size: 15px; + margin: 0; +} +.home-random-bubbles{ + position: absolute; + transform: scale(0.1); + animation: scale-up-random 1s ease forwards; +} +.home-header-title-container{ + display: flex; + justify-content: center; +} +.home-header-title{ + position: absolute; + z-index: 4; + width: 481px; + margin-right: 664px; + margin-top: 123px; + opacity: 0; + transform: translateY(-100%); + animation: slide-and-fade 1s ease forwards; +} +.home-header-title h4{ + font-size: 40px; + font-weight: 800; + color: white; +} + +.home-header-title > p{ + font-size: 20px; + font-weight: 400; + color: white; +} + +.home-header-title input{ + font-size: 16px; + outline: none; + padding: 20px; + width: 100%; + margin-top: 20px; + border-radius: 14px; + border: none; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); +} +.home-header-title input:focus{ + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.15); +} + + +.home-body-container{ + display: flex; + flex-direction: column; + align-items: center; +} +.home-section{ + margin-top: 70px; + width: 1138px; +} +.home-section > h4{ + font-size: 20px; + margin-bottom: 5px; + font-weight: 700; +} + +.home-section-line{ + width: 60px; + margin-top: 3px; + border: 0.5px solid var(--primary-color);; + border-radius: 5px; + margin-bottom: 20px; +} +.home-statistics{ + display: flex; + justify-content: space-between; +} +.home-statistics-container{ + border-radius: 8px; + box-shadow: 2px 0px 60px rgba(0, 0, 0, 0.10); + padding: 30px 40px; + +} +.home-statistics-container > div { + display: flex; + align-items: center; + +} +.home-agroportal-figures{ + margin-bottom: 20px; +} + +.home-statistics-container > div > p { + font-size: 20px; + font-weight: 600; + margin-left: 18px; + margin-bottom: 0; +} +.home-statistics-item{ + display: flex; + align-items: center; + +} +.home-statistics-item hr{ + height: 83px; + width: 0px; + border: 2px solid var(--primary-color);; + border-radius: 5px; + margin-right: 15px; + margin-top: 0; + margin-bottom: 0; +} +.home-statistics-item h4{ + font-size: 30px; + font-weight: 600; + line-height: 1.2; + margin: 0; +} +.home-statistics-item p{ + font-size: 18px; + font-weight: 400; + margin: 0; + color: #888; +} +.home-section > p { + font-size: 16px; + color: #888888; + margin-bottom: 9px; +} +.home-upload-benifits{ + display: flex; + flex-wrap: wrap; +} +.home-upload-benifits div{ + display: flex; + width: 455px; + align-items: flex-start; + margin-right: 57px; + margin-top: 15px +} + +.home-upload-benifits div p{ + margin-left: 17px; + font-size: 16px; + color: #888888; + margin-bottom: 0; +} +.home-upload-benifits div img{ + margin-top: 3px +} +.home-upload-ontology-button{ + margin-top: 30px; + text-decoration: none; + color: var(--primary-color);; + display: flex; + justify-content: space-between; + align-items: center; + width: 193px; + padding: 15px 25px; + border: 1px solid var(--primary-color); + border-radius: 8px; + font-size: 15px; +} +.home-recommendations-and-annotations{ + font-size: 16px; + outline: none; + padding: 20px; + width: 100%; + resize: none; + border-radius: 14px; + border: none; + +} +.home-services-buttons{ + background-color: white; + border-radius: 8px; + padding: 20px; + display: flex; + justify-content: flex-end; + align-items: center; +} +.home-card{ + border-radius: 8px; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); +} +.home-get-annotations{ + cursor: pointer; + color: white; + background-color: var(--primary-color); + display: flex; + width: fit-content; + align-items: center; + padding: 15px 20px; + border-radius: 8px; + margin-left: 10px; +} +.home-get-annotations p{ + margin-right: 20px; + margin-bottom: 0; +} +.home-get-recommendations{ + cursor: pointer; + color: var(--primary-color); + display: flex; + width: fit-content; + height: fit-content; + align-items: center; + padding: 15px 20px; + border-radius: 8px; + border: 1px solid var(--primary-color); + +} +.home-get-recommendations p{ + margin-right: 20px; + margin-bottom: 0; +} +.hide{ + display: none; +} +.home-section-sub-sections-container{ + display: flex; + justify-content: space-between; +} +.home-sub-section-left{ + width: 533px; +} +.home-sub-section-right{ + width: 533px; +} +.home-sub-section-left h4, .home-sub-section-right h4{ + font-size: 20px; + margin-bottom: 5px; + font-weight: 700; +} +.home-fair-scores{ + height: 349px; + padding-top: 35px; +} +.home-twitter-news{ + height: 349px; +} +.home-fair-scores a{ + text-decoration: none; + +} +.home-fair-details{ + margin-right: 25px !important; +} +.home-fair-scores div{ + display: flex; + justify-content: flex-end; + align-items: center; + margin-right: 20px; + margin-left: 27px; + margin-bottom: 14px; + color: var(--primary-color); +} +.home-fair-scores div p{ + margin-right: 10px; + margin-bottom: 0; +} +.home-logos{ + height: 138px; + display: flex; + align-items: center; + overflow: auto; + +} +.home-logos img{ + margin-left: 60px; +} + +#home-search-drop-down{ + display: none; + font-size: 16px; + background: white; + width: 100%; + border-radius: 0 0 14px 14px; + border: none; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); +} + +.home-search-ontology-content{ + display: flex; + color: #777777 !important; + justify-content: space-between; + padding: 20px 20px; + cursor: pointer; + border-top: 1px solid #f7f7f7 +} +.home-search-ontology-content:hover{ + background-color: rgba(0, 0, 0, 0.01); +} +.home-search-ontology-content div{ + display: flex; +} +.home-search-ontology-content div img{ + width: 12px; +} +.home-search-ontology-content div p{ + font-weight: 300; + margin-left: 10px; + margin-bottom: 0; +} + +.home-dropdown-active{ + box-shadow: none !important; +} +#seached-ontology{ + margin-bottom: 0; +} +#seached-ontologies{ + margin-bottom: 0; +} + +.home-support-title{ + display: flex; + justify-content: center; + flex-direction: column; + +} +.home-support-items{ + display: flex; + justify-content: center; + flex-wrap: wrap; + +} +.home-support-items > *:not(:first-child){ + margin-left: 40px; +} +.home-support-items a{ + margin-bottom: 40px; + opacity: 85%; + transition: opacity 0.3s ease; +} +.home-support-items a:hover{ + opacity: 100%; +} +.home-result-type{ + font-weight: 300; + margin-bottom: 0; +} + +.home-searched-ontology{ + margin-bottom: 0; + word-wrap: break-word; + max-width: 400px; + margin-right: 20px; + +} + +@keyframes scale-up { + from { transform: scale(0.1); } + to { transform: scale(1); } +} + +@keyframes scale-up-random { + from { transform: scale(0.1); } + to { transform: scale(1.06); } +} + +@keyframes slide-and-fade { + from { opacity: 0; transform: translateY(-100%); } + to { opacity: 1; transform: translateY(0); } +} + + + diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 74cdb1b4d..6585b5b1a 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -3,10 +3,10 @@ - unless $FRONT_NOTICE.nil? || $FRONT_NOTICE.empty? || cookies[:front_page_notice_closed].eql?("true") :javascript function close_message(){ - var exdate = new Date(); - exdate.setDate(exdate.getDate() + 7); - document.cookie="front_page_notice_closed=true; expires="+exdate.toGMTString(); - jQuery("#notice_message").hide(); + var exdate = new Date(); + exdate.setDate(exdate.getDate() + 7); + document.cookie="front_page_notice_closed=true; expires="+exdate.toGMTString(); + jQuery("#notice_message").hide(); } %p#notice_message{:style => "padding: 10px; margin: 10px; border:1px solid #EFEFEF; background-color: #F9F9F9;"} @@ -14,125 +14,178 @@ \   %a{:href => "#", :onclick => "close_message(); return false;", :style => "font-size: small; color: darkGray;"} [close] -%div.container.pb-4.pb-md-5 - %div.row - %div.col - %div.px-2.py-2.pt-md-5.border-bottom.text-center - %h2 - = t("home.index.welcome", site: "#{$SITE}") - %small.text-muted - = t("home.index.tagline") - %div.row.search.pt-4 - %div.col - %div.card-deck - -# Search for a class across ontologies - %div.card - %div.card-header= t('home.search_class') - %div.card-body - = form_tag("/search", method: "get") do - %div.input-group.mb-3 - - placeholder = t("home.index.query_placeholder") - = text_field_tag("query", nil, class: "form-control", placeholder: placeholder) - %div.input-group-append - = button_tag(type: "submit", class: "btn btn-primary", aria: {label: "Search for a class"}) do - %i{class: "fas fa-search fa-lg", aria: {hidden: "true"}} - %a{:href => "/search?opt=advanced"}= t("home.advanced_search") - -# Search for an ontology - %div.card - %div.card-header= t('home.find_ontology') - %div.card-body - %input#find_ontology_id{:type => "hidden"} - %div.input-group.mb-3 - = text_field_tag("ontology", nil, id: "find_ontology", class: "form-control", data: {ontologynames: @ontology_names}, placeholder: t(".find_ontology_placeholder")) - %div.input-group-append - = button_tag(class: "btn btn-primary", onclick: "jumpToValueOntology()", aria: {label: "Find an ontology"}) do - %i{class: "fas fa-search fa-lg", aria: {hidden: "true"}} - %div.dropdown - = button_tag(t('home.browse_ontologies'), type: "button", id: "ontologyGroupsDropdown", class: "btn btn-info dropdown-toggle", data: {toggle: "dropdown", offset: "0,10"}, aria: {haspopup: "true", expanded: "false"}) - %div.dropdown-menu{"aria-labelledby": "ontologyGroupsDropdown"} - = link_to(t('all'), ontologies_path(), class: "dropdown-item") - %div.dropdown-divider - %h6.dropdown-header= t("home.browse_by_group") - - @groups.each do |group| - = link_to(group[:name], ontologies_path(filter: group[:acronym]), class: "dropdown-item") - %div.row.pt-3.statistics - %div.col - %div.card-deck - -# Ontology visits - %div.card - %div.card-header #{t('home.ontology_visits')} #{"in full #{$SITE} " if at_slice?} (#{@analytics.date.strftime("%B %Y")}) - = content_tag(:div, nil, id: "ontology-visits-chart", class: "card-body", data: {ontnames: @anal_ont_names, ontnumbers: @anal_ont_numbers}) do - %canvas#myChart - = link_to(t('more'), visits_path()) - -# Ontology statistics - %div.card - %div.card-header #{$SITE} #{t('statistics')} #{"in full #{$SITE}" if at_slice?} - %ul.list-group.list-group-flush - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span= t('home.ontologies') - %span= number_with_delimiter(@ont_count) - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span= t('home.classes') - %span= number_with_delimiter(@cls_count, :delimiter => ",") - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span= t('home.individuals') - %span= number_with_delimiter(@individuals_count, :delimiter => ",") - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span= t('home.projects') - %span= LinkedData::Client::Models::Project.all.length - %li.list-group-item - %div.d-flex.justify-content-between.align-items-center - %span= t('home.users') - %span= LinkedData::Client::Models::User.all.length - - if fairness_service_enabled? - %div#fair-home.row.mt-3 - = render partial: "fair_score_home" - %div.row.pt-3.extra - %div.col - %div.card-deck - -# Latest Notes - %div.card - %div.card-header= t('home.latest_notes') - %ul.list-group.list-group-flush - - if @last_notes.nil? || @last_notes.empty? - %li.list-group-item - %span= t('home.no_recent_notes') - - else - - for note in @last_notes - %li.list-group-item - - begin - = link_to "#{note[:subject]} (#{note[:ont_name]})", note_path(CGI.escape(note[:id])) - %br/ - %span{:style => "color: #AAAAAA"} - = "#{time_ago_in_words(note[:created])} ago" - by #{note[:author]} - - if note[:body] - %p - = truncate(strip_tags(note[:body]), :length => 100) - \  - - rescue - - if !$ENABLE_SLICES.nil? && $ENABLE_SLICES == true && !at_slice? - -# Slices - %div.card - %div.card-header= t("slices") - %ul.list-group.list-group-flush - - LinkedData::Client::Models::Slice.all.each_with_index do |slice, index| - - break if index == 10 - - slice_name = "#{slice.name} (#{slice.acronym})" - - slice_link = "http://#{slice.acronym}.#{$UI_URL.sub("http://", "")}" - %li.list-group-item - = link_to slice_name, slice_link +.home-header-container + .home-header-background + .home-bubbles + .home-random-bubbles + %img{:src => asset_path("home-random-bubbles.svg")}/ + .home-bubble.home-bubble-one + %h5 + = @anal_ont_names[0] + %p + = @anal_ont_numbers[0].to_s + " visits" + .home-bubble.home-bubble-two + %h5 + = @anal_ont_names[1] + %p + = @anal_ont_numbers[1].to_s + " visits" + .home-bubble.home-bubble-three + %h5 + = @anal_ont_names[2] + %p + = @anal_ont_numbers[2].to_s + " visits" + %a.home-bubble.home-bubble-four{:href => "/visits"} + %h5 ... + + .home-header-title-container{'data-controller': "home-search", 'data-home-search-ontologies-value': raw(@ontology_names.to_json)} + .home-header-title + %h4 Welcome to AgroPortal + %p The home of vocabularies and ontologies in agronomy and related fields. + %input#home-search{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text", 'data-home-search-target': 'input'} + #home-search-drop-down{'data-home-search-target': 'dropDown'} + %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} + %p#seached-ontology{'data-home-search-target': 'ontology'} + %div + %img{src: asset_path("loop.svg")}/ + %p Search ontology content + %a.home-search-ontology-content#home-search-ontologies{href: "#", 'data-home-search-target': 'homeSearchOntologies'} + %p#seached-ontologies{'data-home-search-target': 'searchedOntologies'} + %div + %img{src: asset_path("loop.svg")}/ + %p See all +.home-body-container + .home-section + %h4 Wanna upload an ontology? + %hr.home-section-line/ + %p Uploading an ontology is a way of sharing your domain knowledge with others. + %p By uploading your ontology to agroportal, you can: + .home-upload-benifits + - @upload_benefits.each do |benefit| + %div + %img{:src => asset_path("check-outlined.svg")}/ + %p + = benefit + - if session[:user].nil? + %a.home-upload-ontology-button{:href => "/login?redirect=/ontologies/new"} + %svg{:fill => "none", :height => "14", :viewbox => "0 0 15 14", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M3.46242 4.17686L6.91776 0.23682C6.98312 0.162278 7.06302 0.102677 7.15225 0.0618794C7.24149 0.0210821 7.33808 0 7.43576 0C7.53344 0 7.63003 0.0210821 7.71927 0.0618794C7.80851 0.102677 7.8884 0.162278 7.95377 0.23682L11.4092 4.17686C11.533 4.31795 11.5971 4.50373 11.5874 4.69334C11.5777 4.88295 11.4951 5.06086 11.3577 5.18792C11.2204 5.31498 11.0395 5.38079 10.8548 5.37087C10.6702 5.36095 10.497 5.27612 10.3732 5.13503L8.13286 2.58055V10.4116C8.13286 10.6015 8.05942 10.7836 7.92869 10.9178C7.79796 11.0521 7.62065 11.1275 7.43576 11.1275C7.25088 11.1275 7.07357 11.0521 6.94284 10.9178C6.8121 10.7836 6.73866 10.6015 6.73866 10.4116V2.58058L4.49846 5.13512C4.43719 5.20498 4.36313 5.26177 4.28049 5.30223C4.19785 5.3427 4.10826 5.36605 4.01684 5.37096C3.92541 5.37587 3.83394 5.36223 3.74764 5.33084C3.66135 5.29944 3.58192 5.2509 3.51389 5.18798C3.44586 5.12506 3.39057 5.04899 3.35117 4.96413C3.31176 4.87926 3.28902 4.78726 3.28425 4.69337C3.27947 4.59948 3.29274 4.50554 3.32331 4.41692C3.35388 4.32829 3.40115 4.24672 3.46242 4.17686ZM14.1744 12.488H0.697103C0.51222 12.488 0.334909 12.5635 0.204177 12.6977C0.0734445 12.832 0 13.0141 0 13.2039C0 13.3938 0.0734445 13.5759 0.204177 13.7101C0.334909 13.8444 0.51222 13.9198 0.697103 13.9198H14.1744C14.3593 13.9198 14.5366 13.8444 14.6673 13.7101C14.7981 13.5759 14.8715 13.3938 14.8715 13.2039C14.8715 13.0141 14.7981 12.832 14.6673 12.6977C14.5366 12.5635 14.3593 12.488 14.1744 12.488Z", :fill => "#31B404"} + upload ontology + - else + %a.home-upload-ontology-button{:href => "/ontologies/new"} + %svg{:fill => "none", :height => "14", :viewbox => "0 0 15 14", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M3.46242 4.17686L6.91776 0.23682C6.98312 0.162278 7.06302 0.102677 7.15225 0.0618794C7.24149 0.0210821 7.33808 0 7.43576 0C7.53344 0 7.63003 0.0210821 7.71927 0.0618794C7.80851 0.102677 7.8884 0.162278 7.95377 0.23682L11.4092 4.17686C11.533 4.31795 11.5971 4.50373 11.5874 4.69334C11.5777 4.88295 11.4951 5.06086 11.3577 5.18792C11.2204 5.31498 11.0395 5.38079 10.8548 5.37087C10.6702 5.36095 10.497 5.27612 10.3732 5.13503L8.13286 2.58055V10.4116C8.13286 10.6015 8.05942 10.7836 7.92869 10.9178C7.79796 11.0521 7.62065 11.1275 7.43576 11.1275C7.25088 11.1275 7.07357 11.0521 6.94284 10.9178C6.8121 10.7836 6.73866 10.6015 6.73866 10.4116V2.58058L4.49846 5.13512C4.43719 5.20498 4.36313 5.26177 4.28049 5.30223C4.19785 5.3427 4.10826 5.36605 4.01684 5.37096C3.92541 5.37587 3.83394 5.36223 3.74764 5.33084C3.66135 5.29944 3.58192 5.2509 3.51389 5.18798C3.44586 5.12506 3.39057 5.04899 3.35117 4.96413C3.31176 4.87926 3.28902 4.78726 3.28425 4.69337C3.27947 4.59948 3.29274 4.50554 3.32331 4.41692C3.35388 4.32829 3.40115 4.24672 3.46242 4.17686ZM14.1744 12.488H0.697103C0.51222 12.488 0.334909 12.5635 0.204177 12.6977C0.0734445 12.832 0 13.0141 0 13.2039C0 13.3938 0.0734445 13.5759 0.204177 13.7101C0.334909 13.8444 0.51222 13.9198 0.697103 13.9198H14.1744C14.3593 13.9198 14.5366 13.8444 14.6673 13.7101C14.7981 13.5759 14.8715 13.3938 14.8715 13.2039C14.8715 13.0141 14.7981 12.832 14.6673 12.6977C14.5366 12.5635 14.3593 12.488 14.1744 12.488Z", :fill => "#31B404"} + upload ontology + .home-section + %h4 Agroportal services + %hr.home-section-line/ + .home-card + %form{action: "/annotator_recommender_form", method: "post"} + %textarea.home-recommendations-and-annotations{rows: "6" , placeholder: "Paste a paragraph of text or some keywords ...", name: "text"} + %input.hide{type: "submit", name: "submit_button" ,value: "annotator", id: "annotator_submit"}/ + %input.hide{type: "submit" , name: "submit_button" ,value: "recommender", id: "recommender_submit"}/ + .home-services-buttons + .home-get-recommendations{onclick: "submitRecommender()"} + %p Get recommendations + %svg{:fill => "none", :height => "16", :viewbox => "0 0 15 16", :width => "15", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M2.61197 15.6472C1.16948 16.4746 0 15.7968 0 14.1344V1.86672C0 0.202676 1.16948 -0.474289 2.61197 0.352365L13.3345 6.50169C14.7775 7.32941 14.7775 8.67046 13.3345 9.49799L2.61197 15.6472Z", :fill => "#31B404"} + .home-services-buttons + .home-get-annotations{onclick: "submitAnnotator()"} + %p Get annotations + %img{:src => asset_path("play-white.svg")}/ + .home-section + .home-section-sub-sections-container + .home-sub-section-left + %h4 FAIR scores + %hr.home-section-line/ + .home-card.home-fair-scores + - if fairness_service_enabled? + %div#fair-home + = render partial: "shared/fair_score_bars", locals: {data: nil} + %a{:href => "#fairDetails"} + %div.home-fair-details + %p See details + %svg{:fill => "none", :height => "12", :viewbox => "0 0 7 12", :width => "7", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M0.828447 0.982555C0.668147 0.979582 0.510886 1.02651 0.378427 1.11684C0.245967 1.20716 0.144858 1.33643 0.0890904 1.48675C0.0333229 1.63706 0.0256545 1.801 0.0671467 1.95586C0.108639 2.11073 0.19724 2.24887 0.32069 2.35117L5.04517 6.39572L0.317771 10.4403C0.231406 10.5032 0.15903 10.5834 0.105209 10.6757C0.0513877 10.7681 0.0172914 10.8706 0.00507139 10.9767C-0.00714863 11.0829 0.00277318 11.1905 0.0342104 11.2926C0.0656476 11.3948 0.117918 11.4893 0.187722 11.5702C0.257526 11.6512 0.343349 11.7168 0.439774 11.7628C0.536199 11.8089 0.641133 11.8346 0.747953 11.8381C0.854772 11.8416 0.961158 11.8229 1.0604 11.7832C1.15964 11.7435 1.24957 11.6837 1.32453 11.6075L6.72894 6.9881C6.81393 6.9155 6.88218 6.82534 6.92897 6.72383C6.97577 6.62232 7 6.51187 7 6.40009C7 6.28832 6.97577 6.17787 6.92897 6.07636C6.88218 5.97485 6.81393 5.88469 6.72894 5.81209L1.32453 1.17807C1.18758 1.05615 1.01176 0.986851 0.828447 0.982555Z", :fill => "#31B404"} + .home-sub-section-right + %h4 Twitter news + %hr.home-section-line + .home-card.home-twitter-news + %a.twitter-timeline{"data-height" => "349", "data-width" => "533", :href => "https://twitter.com/lagroportal?ref_src=twsrc%5Etfw"} Tweets by lagroportal + %script{:async => "", :charset => "utf-8", :src => "https://platform.twitter.com/widgets.js"} + + .home-section + .home-statistics-container + .home-agroportal-figures + %svg{:fill => "none", :height => "26", :viewbox => "0 0 35 26", :width => "35", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M34.3828 6.44418C33.2599 4.04698 31.4332 2.31495 28.9364 1.29338C25.5484 -0.0996672 22.02 -0.272638 18.4279 0.325213C14.6484 0.954407 11.24 2.42988 8.13908 4.59143C7.52058 5.02327 6.92129 5.48066 6.31359 5.92179C6.28357 5.88812 6.25475 5.85446 6.22472 5.82195L9.85167 2.54597L9.7616 2.34513C9.43493 2.4264 9.05302 2.42872 8.79001 2.60053C5.93168 4.47882 3.58858 6.82611 1.9012 9.76312C0.682212 11.8782 -0.0587909 14.106 0.00365996 16.5542C0.0295292 18.387 0.756885 20.1455 2.04532 21.4903C2.93284 22.4364 4.01372 23.1387 5.14144 23.812C7.39327 25.1482 9.82525 25.8296 12.4374 25.9666C16.66 26.1895 20.6413 25.2921 24.3751 23.4127C25.6662 22.766 26.9022 22.0215 28.0717 21.1861C29.4879 20.1586 30.7312 18.9255 31.7575 17.5305C33.3188 15.4491 34.7191 13.3235 34.9461 10.65C35.0722 9.19545 35.0121 7.78847 34.3828 6.44418ZM31.3251 10.1009C31.1779 11.5537 30.748 12.9665 30.0581 14.265C28.1233 17.9275 24.9828 20.2655 21.1036 21.6946C18.2501 22.7487 15.2789 22.8798 12.3593 21.9268C10.4786 21.3115 8.9017 20.2098 7.83043 18.53C7.74095 18.3821 7.6306 18.2469 7.50256 18.1284C7.35925 18.0198 7.20702 17.9228 7.04739 17.8382C7.04739 18.0494 6.96092 18.3025 7.04739 18.4685C8.50538 21.2546 10.7428 23.0946 13.9518 23.7261C14.7106 23.8796 15.4788 23.9858 16.2517 24.0442C17.0251 24.0988 17.8057 24.057 18.6056 24.0895C17.9391 24.2172 17.2749 24.4296 16.6036 24.4563C14.7661 24.5283 12.9346 24.5051 11.1403 23.9711C8.87168 23.2966 7.07622 22.0904 5.91367 20.0438C4.97931 18.4012 4.66345 16.6692 5.04776 14.835C5.57513 12.2696 6.86135 9.90726 8.75038 8.03458C10.6532 6.11095 12.9173 4.55481 15.4218 3.44913C17.9919 2.30683 20.7061 1.89471 23.4756 2.40434C25.4992 2.78046 27.2779 3.69523 28.2795 5.58513C29.0001 6.93755 29.3315 8.3515 28.7755 9.85019C28.5089 10.5653 28.223 11.2734 27.966 11.992C27.9204 12.1197 27.966 12.2787 27.978 12.4238C28.1269 12.4169 28.2891 12.4436 28.42 12.3925C28.5665 12.3365 28.6921 12.239 28.7803 12.1127C29.5873 10.8358 30.3007 9.51121 30.3235 7.96493C30.3355 7.15231 30.2671 6.32577 30.2383 5.58049C31.0969 6.934 31.4782 8.52015 31.3251 10.1009Z", :fill => "#31B404"} + %p AgroPortal in figures: + .home-statistics + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@ont_count, :delimiter => ",") + %p Ontologies + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@cls_count, :delimiter => ",") + %p Classes + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@individuals_count, :delimiter => ",") + %p Individuals + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@prop_count, :delimiter => ",") + %p Properties + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@projects_count, :delimiter => ",") + %p Projects + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@map_count, :delimiter => ",") + %p Mappings + .home-statistics-item + %hr/ + %div + %h4 + = number_with_delimiter(@users_count, :delimiter => ",") + %p Users + .home-section + .home-statistics-container + .home-support-title + %p Supported by + %hr.home-section-line/ + .home-support-items + - $HOME_PAGE_LOGOS[:supported_by].each do |logo| + %a{href:logo[:url], target: "_blanc"} + %img{src: asset_path(logo[:img_src])} + .home-support-title + %p With the collaboration of + %hr.home-section-line/ + .home-support-items + - $HOME_PAGE_LOGOS[:with_the_collaboration_of].each do |logo| + %a{href:logo[:url], target: "_blanc"} + %img{src: asset_path(logo[:img_src])} + + + +:javascript + function submitAnnotator(){ + document.getElementById("annotator_submit").click() + } + function submitRecommender(){ + document.getElementById("recommender_submit").click() + } - - $HOME_PAGE_LOGOS.each do |key, home_page_logos_row| - %div.row.pt-3 - %div.col - %div.card-deck - %div.card - %div.card-header= t("home.#{key}") - %div.logos - - home_page_logos_row.each do |logo| - = link_to(image_tag(logo[:img_src]), logo[:url], target: logo[:target]) From b49db0be68d5b1796c9c55dd5097f0de0ef86c80 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 23 May 2023 10:12:24 +0200 Subject: [PATCH 151/533] in home controller: remove undesired code and add needed variables on the new design undesired code: repetitive calls, and non needed variables. --- app/controllers/home_controller.rb | 76 +++++++++++++----------------- 1 file changed, 32 insertions(+), 44 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 2c7b8065c..0c4caa272 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -7,60 +7,40 @@ class HomeController < ApplicationController include FairScoreHelper def index + @analytics = LinkedData::Client::Analytics.last_month + @ontologies_views = LinkedData::Client::Models::Ontology.all(include_views: true) @ontologies = @ontologies_views.select {|o| !o.viewOf} - @ontologies_hash = Hash[@ontologies_views.map {|o| [o.acronym, o]}] - @groups = LinkedData::Client::Models::Group.all - @notes = LinkedData::Client::Models::Note.all - @last_notes = [] - unless @notes.empty? - @notes.sort! {|a,b| b.created <=> a.created } - @notes[0..20].each do |n| - ont_uri = n.relatedOntology.first - ont = LinkedData::Client::Models::Ontology.find(ont_uri) - next if ont.nil? - username = n.creator.split("/").last - note = { - :uri => n.links['ui'], - :id => n.id, - :subject => n.subject, - :body => n.body, - :created => n.created, - :author => username, - :ont_name => ont.name - } - @last_notes.push note - break if @last_notes.length >= [$HOME_LATEST_NOTES_COUNT.to_i, 5].max - end - end - # Get the latest manual mappings - # All mapping classes are bidirectional. - # Each class in the list maps to all other classes in the list. - if $DISPLAY_RECENT.nil? || $DISPLAY_RECENT == true - @recent_mappings = get_recent_mappings # application_controller + @ontology_names = @ontologies.map { |ont| ["#{ont.name} (#{ont.acronym})", ont.acronym] } + # Calculate BioPortal summary statistics + @ont_count = @analytics.onts.size + metrics = LinkedData::Client::Models::Metrics.all + metrics = metrics.each_with_object(Hash.new(0)) do |h, sum| + h.to_hash.slice(:classes, :properties, :individuals).each { |k, v| sum[k] += v } end - - organize_groups - # Calculate BioPortal summary statistics - @ont_count = @ontologies.length - @cls_count = LinkedData::Client::Models::Metrics.all.map { |m| m.classes.to_i }.sum - @individuals_count = LinkedData::Client::Models::Metrics.all.map {|m| m.individuals.to_i}.sum - @prop_count = 36286 + @cls_count = metrics[:classes] + @individuals_count = metrics[:individuals] + @prop_count = metrics[:properties] @map_count = total_mapping_count - @analytics = LinkedData::Client::Analytics.last_month - - @ontology_names = @ontologies.map { |ont| ["#{ont.name} (#{ont.acronym})", ont.acronym] } - - @anal_ont_names = {} + @projects_count = LinkedData::Client::Models::Project.all.length + @users_count = LinkedData::Client::Models::User.all.length + + @upload_benefits = [ + 'Discover new insights and connections by exploring other ontologies in the repository.', + 'Contribute to the growth and development of your domain by adding new concepts and categories.', + 'Use version control to manage the changes to your ontology over time and collaborate with other users.', + 'Get feedback and suggestions from other users who can review and comment on your ontology.', + 'Get the FAIR score and metrics for your ontology.' + ] + + @anal_ont_names = [] @anal_ont_numbers = [] @analytics.onts[0..4].each do |visits| - ont = @ontologies_hash[visits[:ont].to_s] - @anal_ont_names[ont.acronym] = ont.name + @anal_ont_names << visits[:ont] @anal_ont_numbers << visits[:views] end - end def render_layout_partial @@ -177,6 +157,14 @@ def validate_ontology_file @process_id = response.process_id end + def annotator_recommender_form + if params[:submit_button] == "annotator" + redirect_to "/annotator?text=#{params[:text]}" + elsif params[:submit_button] == "recommender" + redirect_to "/recommender?text=#{params[:text]}" + end + end + private # Dr. Musen wants 5 specific groups to appear first, sorted by order of importance. From 678b8ae9f701a66afc1fab13b4b1234bc26d810f Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 23 May 2023 10:22:14 +0200 Subject: [PATCH 152/533] integrate recommender and annotator in the home page --- app/controllers/annotator_controller.rb | 1 + app/controllers/recommender_controller.rb | 1 + app/views/annotator/index.html.haml | 10 +++++++++- app/views/recommender/index.html.haml | 13 ++++++++++++- config/routes.rb | 1 + 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/app/controllers/annotator_controller.rb b/app/controllers/annotator_controller.rb index 0e4e53fdd..ae05a3a31 100644 --- a/app/controllers/annotator_controller.rb +++ b/app/controllers/annotator_controller.rb @@ -29,6 +29,7 @@ def index @recognizers = [] end @annotator_ontologies = LinkedData::Client::Models::Ontology.all + @text = params[:text] end diff --git a/app/controllers/recommender_controller.rb b/app/controllers/recommender_controller.rb index 591ffc326..256fee3e4 100644 --- a/app/controllers/recommender_controller.rb +++ b/app/controllers/recommender_controller.rb @@ -5,6 +5,7 @@ class RecommenderController < ApplicationController RECOMMENDER_URI = "/recommender" def index + @text = params[:text] end # def create diff --git a/app/views/annotator/index.html.haml b/app/views/annotator/index.html.haml index e4e72566c..c84c22ab1 100644 --- a/app/views/annotator/index.html.haml +++ b/app/views/annotator/index.html.haml @@ -17,7 +17,7 @@ %form %div.form-group = hidden_field_tag :annotation_sample_text, t('annotator.index.sample_text') - = text_area_tag("annotation_text", nil, rows: 10, class: "form-control", placeholder: t('annotator.enter_or_paste_text'), "aria-describedby": "annotateTextHelpBlock") + = text_area_tag("annotation_text", @text, rows: 10, class: "form-control", placeholder: "Enter or paste text to be annotated", "aria-describedby": "annotateTextHelpBlock") %small#annotateTextHelpBlock.form-text %a#insert_text_link{href: "javascript:void(0);"}= t('shared.insert_sample_text') @@ -170,3 +170,11 @@ %div.mb-4 = t('additional_parameters') = link_to('Annotator API documentation', "#{$REST_URL}/documentation#nav_annotator", target: "_blank") + +:javascript + window.addEventListener("load", function() { + if(document.getElementById("annotation_text").value != ''){ + document.getElementById("annotator_button").click() + window.scrollBy(0, 1080); + } + }); \ No newline at end of file diff --git a/app/views/recommender/index.html.haml b/app/views/recommender/index.html.haml index 8dddc3846..0cb71e46e 100644 --- a/app/views/recommender/index.html.haml +++ b/app/views/recommender/index.html.haml @@ -31,7 +31,7 @@ -# Input text or keywords %div.form-group.mt-4 - = text_area_tag("inputText", nil, rows: 10, class: "form-control default", placeholder: t('paste_input_text'), aria: {describedby: "inputTextHelpBlock"}) + = text_area_tag("inputText", @text, rows: 10, class: "form-control default", placeholder: "Paste a paragraph of text or some keywords to use in calculating ontology recommendations", aria: {describedby: "inputTextHelpBlock"}) %div.card#inputTextHighlighted %div.card-body %small#inputTextHelpBlock.form-text @@ -107,3 +107,14 @@ %div.col %h5#resultsHeader %div#recommender-results.mb-5 + +:javascript + window.addEventListener("load", function() { + const value = document.getElementById("inputText").value + document.getElementById("inputText").click(); + document.getElementById("inputText").value = value + if(document.getElementById("inputText").value != ''){ + document.getElementById("recommenderButton").click() + window.scrollBy(0, 1080); + } + }); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 4862b94cc..f30fe3b22 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -89,6 +89,7 @@ get '/about' => 'home#about' get '/site_config' => 'home#site_config' get '/validate_ontology_file' => 'home#validate_ontology_file_show' + post '/annotator_recommender_form' => 'home#annotator_recommender_form' match '/validate_ontology_file' => 'home#validate_ontology_file', via: [:get, :post] get '/layout_partial/:partial' => 'home#render_layout_partial' match '/visits', to: 'visits#index', via: :get From 728af0eed627531257327d388ec00f650bfaa415 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 23 May 2023 10:22:48 +0200 Subject: [PATCH 153/533] add home search field logic --- .../controllers/home_search_controller.js | 119 ++++++++++++++++++ app/javascript/controllers/index.js | 3 + 2 files changed, 122 insertions(+) create mode 100644 app/javascript/controllers/home_search_controller.js diff --git a/app/javascript/controllers/home_search_controller.js b/app/javascript/controllers/home_search_controller.js new file mode 100644 index 000000000..b49dba1d4 --- /dev/null +++ b/app/javascript/controllers/home_search_controller.js @@ -0,0 +1,119 @@ +import { Controller } from "@hotwired/stimulus" + +// Connects to data-controller="home-search" +export default class extends Controller { + static targets = [ "input", "dropDown", "ontology", "searchedOntologies", "searchOntologyContent", "homeSearchOntologies" ] + static values = { + ontologies: Array + } + connect() { + this.ontologies = this.ontologiesValue + this.input = this.inputTarget + this.dropDown = this.dropDownTarget + this.ontology = this.ontologyTarget + this.searchedOntologies = this.searchedOntologiesTarget + this.searchOntologyContent = this.searchOntologyContentTarget + this.homeSearchOntologies = this.homeSearchOntologiesTarget + + this.input.addEventListener("input",()=>{ + this.#searchInput() + } ); + this.dropDown.addEventListener("mousedown", function(event) { + event.preventDefault(); // prevent the blur event from firing + }); + + this.input.addEventListener("blur", function() { + + this.dropDown.style.display = "none"; + this.input.classList.remove("home-dropdown-active"); + }); + + } + + + #scrollDown(currentScroll) { + const startPosition = window.pageYOffset; + const distance = 300 - currentScroll; + const duration = 1000; + let start = null; + + function scrollAnimation(timestamp) { + if (!start) start = timestamp; + const progress = timestamp - start; + const scrollPosition = startPosition + easeInOutCubic(progress, 0, distance, duration); + window.scrollTo(0, scrollPosition); + if (progress < duration) { + window.requestAnimationFrame(scrollAnimation); + } + } + + function easeInOutCubic(t, b, c, d) { + t /= d / 2; + if (t < 1) return c / 2 * t * t * t + b; + t -= 2; + return c / 2 * (t * t * t + 2) + b; + } + + window.requestAnimationFrame(scrollAnimation); + } + + #searchInput() { + let results_list = [] + const inputValue = this.input.value.trim(); + if (inputValue.length > 0) { + this.ontology.innerHTML = inputValue; + this.searchedOntologies.innerHTML = inputValue; + this.searchOntologyContent.href = "/search?query="+inputValue; + this.homeSearchOntologies.href = "/ontologies?search="+inputValue; + this.dropDown.innerHTML = "" + let breaker = 0 + for (var i = 0; i < this.ontologies.length; i++) { + if (breaker == 4){ + break; + } + // Get the current item from the ontologies array + var item = this.ontologies[i]; + + // Check if the item contains the substring + if (item[0].toLowerCase().includes(inputValue.toLowerCase()) || item[1].toLowerCase().includes(inputValue.toLowerCase())) { + results_list.push(item); + breaker = breaker + 1 + } + } + + results_list.forEach((item)=> { + let link = document.createElement("a"); + link.href = "/ontologies/"+item[1]; + link.className = "home-search-ontology-content"; + + let p1 = document.createElement("p"); + p1.id = "seached-ontology"; + p1.className = "home-searched-ontology"; + p1.textContent = item[0]+" "+"("+item[1]+")"; + + let p2 = document.createElement("p"); + p2.className = "home-result-type"; + p2.textContent = "Ontology"; + + link.appendChild(p1); + link.appendChild(p2); + + this.dropDown.appendChild(link); + + }); + this.dropDown.appendChild(this.homeSearchOntologies); + this.dropDown.appendChild(this.searchOntologyContent); + this.dropDown.style.display = "block"; + this.input.classList.add("home-dropdown-active"); + + if (window.scrollY < 300) { + this.#scrollDown(window.scrollY); + } + + + } else { + this.dropDown.style.display = "none"; + this.input.classList.remove("home-dropdown-active"); + } + } +} diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index 21c0817b8..a255efbff 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -19,6 +19,9 @@ application.register("form-auto-complete", FormAutoCompleteController) import HistoryController from "./history_controller" application.register("history", HistoryController) +import HomeSearchController from "./home_search_controller" +application.register("home-search", HomeSearchController) + import LabelAjaxController from "./label_ajax_controller" application.register("label-ajax", LabelAjaxController) From 1a22966447e564fc151ba47e5a86706d755833f3 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 23 May 2023 10:53:39 +0200 Subject: [PATCH 154/533] extract home search link paths to constants --- app/javascript/controllers/home_search_controller.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/javascript/controllers/home_search_controller.js b/app/javascript/controllers/home_search_controller.js index b49dba1d4..44cc2055d 100644 --- a/app/javascript/controllers/home_search_controller.js +++ b/app/javascript/controllers/home_search_controller.js @@ -59,12 +59,14 @@ export default class extends Controller { #searchInput() { let results_list = [] + const class_search_path = "/search?query=" + const browse_search_path = "/ontologies?search=" const inputValue = this.input.value.trim(); if (inputValue.length > 0) { this.ontology.innerHTML = inputValue; this.searchedOntologies.innerHTML = inputValue; - this.searchOntologyContent.href = "/search?query="+inputValue; - this.homeSearchOntologies.href = "/ontologies?search="+inputValue; + this.searchOntologyContent.href = class_search_path+inputValue; + this.homeSearchOntologies.href = browse_search_path+inputValue; this.dropDown.innerHTML = "" let breaker = 0 for (var i = 0; i < this.ontologies.length; i++) { From 066946158077a839773f60b8c0550901bea92656 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 23 May 2023 10:55:00 +0200 Subject: [PATCH 155/533] replace event listeners by stimulus actions in home search controller --- .../controllers/home_search_controller.js | 22 +++++++++---------- app/views/home/index.html.haml | 4 ++-- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/javascript/controllers/home_search_controller.js b/app/javascript/controllers/home_search_controller.js index 44cc2055d..946b93558 100644 --- a/app/javascript/controllers/home_search_controller.js +++ b/app/javascript/controllers/home_search_controller.js @@ -14,20 +14,18 @@ export default class extends Controller { this.searchedOntologies = this.searchedOntologiesTarget this.searchOntologyContent = this.searchOntologyContentTarget this.homeSearchOntologies = this.homeSearchOntologiesTarget - - this.input.addEventListener("input",()=>{ - this.#searchInput() - } ); - this.dropDown.addEventListener("mousedown", function(event) { - event.preventDefault(); // prevent the blur event from firing - }); + } - this.input.addEventListener("blur", function() { - - this.dropDown.style.display = "none"; - this.input.classList.remove("home-dropdown-active"); - }); + search(){ + this.#searchInput() + } + prevent(event){ + event.preventDefault(); + } + blur(){ + this.dropDown.style.display = "none"; + this.input.classList.remove("home-dropdown-active"); } diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 6585b5b1a..d089d2e77 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -41,8 +41,8 @@ .home-header-title %h4 Welcome to AgroPortal %p The home of vocabularies and ontologies in agronomy and related fields. - %input#home-search{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text", 'data-home-search-target': 'input'} - #home-search-drop-down{'data-home-search-target': 'dropDown'} + %input#home-search{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text", 'data-home-search-target': 'input', 'data-action': 'input->home-search#search blur->home-search#blur'} + #home-search-drop-down{'data-home-search-target': 'dropDown', 'data-action': 'mousedown->home-search#prevent'} %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} %p#seached-ontology{'data-home-search-target': 'ontology'} %div From e6af2b5236c006c6e6c097d2bf19eddd3f2f5411 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 23 May 2023 13:24:18 +0200 Subject: [PATCH 156/533] display ontology details header values dynamically --- .../stylesheets/ontology_details_header.scss | 2 +- .../layouts/ontology_viewer/_header.html.haml | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/ontology_details_header.scss b/app/assets/stylesheets/ontology_details_header.scss index e7c0c5eef..d726df6ef 100644 --- a/app/assets/stylesheets/ontology_details_header.scss +++ b/app/assets/stylesheets/ontology_details_header.scss @@ -39,7 +39,7 @@ display: flex; align-items: center; background-color: #F6F6F6; - border-radius: 3px; + border-radius: 5px; padding: 10px 20px; cursor: pointer; font-size: 12px; diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 38af311a0..42006dacd 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -2,18 +2,23 @@ - details_available = true - if sub.nil? || (sub.respond_to?(:status) && sub.status == 404) - details_available = false +- date = DateTime.parse(@submission_latest.modificationDate) +- last_update_date = date.strftime("%B %d, %Y") + -# A header of sorts to display ontology name and subset of details. .ontology-details-header-container .ontology-details-path %a{href: "/ontologies"} ontologies %img{src: asset_path("arrow-right-outlined.svg")}/ - %div agrovoc + %div + = @ontology.acronym .ontology-details-header-sub-container .ontology-details-header-left-container .ontology-details-name-bar %div - AGROVOC - %span (AGROVOCNIM) + = @ontology.name + %span + = "("+ @ontology.acronym+")" .ontology-details-licence %div CC-BY IGO 3.0 %svg{fill: "none", height: "12", viewbox: "0 0 12 12", width: "12", xmlns: "http://www.w3.org/2000/svg"} @@ -21,7 +26,8 @@ %path{"clip-rule" => "evenodd", d: "M2.81818 5.31836C4.10605 5.31836 5.39396 5.31836 6.68182 5.31836C6.68182 6.60622 6.68182 7.89413 6.68182 9.182C6.60605 9.182 6.53032 9.182 6.45455 9.182C6.45455 9.1214 6.45455 9.06077 6.45455 9.00018C6.40909 9.00018 6.36364 9.00018 6.31818 9.00018C6.31818 8.93959 6.31818 8.87895 6.31818 8.81836C6.25759 8.81836 6.19696 8.81836 6.13636 8.81836C6.13636 8.7729 6.13636 8.72745 6.13636 8.682C6.09091 8.682 6.04546 8.682 6 8.682C6 8.6214 6 8.56077 6 8.50018C5.93941 8.50018 5.87877 8.50018 5.81818 8.50018C5.81818 8.43959 5.81818 8.37895 5.81818 8.31836C5.75759 8.31836 5.69696 8.31836 5.63636 8.31836C5.63636 8.2729 5.63636 8.22745 5.63636 8.182C5.59091 8.182 5.54546 8.182 5.5 8.182C5.5 8.1214 5.5 8.06077 5.5 8.00018C5.43941 8.00018 5.37877 8.00018 5.31818 8.00018C5.31818 7.95472 5.31818 7.90927 5.31818 7.86381C5.27273 7.86381 5.22727 7.86381 5.18182 7.86381C5.18182 7.90927 5.18182 7.95472 5.18182 8.00018C5.13636 8.00018 5.09091 8.00018 5.04546 8.00018C5.04546 8.06077 5.04546 8.1214 5.04546 8.182C4.98486 8.182 4.92423 8.182 4.86364 8.182C4.86364 8.22745 4.86364 8.2729 4.86364 8.31836C4.80305 8.31836 4.74241 8.31836 4.68182 8.31836C4.68182 8.37895 4.68182 8.43959 4.68182 8.50018C4.63636 8.50018 4.59091 8.50018 4.54546 8.50018C4.54546 8.56077 4.54546 8.6214 4.54546 8.682C4.48486 8.682 4.42423 8.682 4.36364 8.682C4.36364 8.72745 4.36364 8.7729 4.36364 8.81836C4.30305 8.81836 4.24241 8.81836 4.18182 8.81836C4.18182 8.87895 4.18182 8.93959 4.18182 9.00018C4.13636 9.00018 4.09091 9.00018 4.04546 9.00018C4.04546 9.06077 4.04546 9.1214 4.04546 9.182C3.98486 9.182 3.92423 9.182 3.86364 9.182C3.86364 9.22745 3.86364 9.2729 3.86364 9.31836C3.80305 9.31836 3.74241 9.31836 3.68182 9.31836C3.68182 9.37895 3.68182 9.43959 3.68182 9.50018C3.63636 9.50018 3.59091 9.50018 3.54546 9.50018C3.54546 9.56077 3.54546 9.6214 3.54546 9.682C3.48486 9.682 3.42423 9.682 3.36364 9.682C3.36364 9.72745 3.36364 9.7729 3.36364 9.81836C3.30305 9.81836 3.24241 9.81836 3.18182 9.81836C3.18182 9.87895 3.18182 9.93959 3.18182 10.0002C3.13636 10.0002 3.09091 10.0002 3.04546 10.0002C3.04546 10.0608 3.04546 10.1214 3.04546 10.182C2.98486 10.182 2.92423 10.182 2.86364 10.182C2.86364 10.2275 2.86364 10.2729 2.86364 10.3184C2.81818 10.3184 2.77273 10.3184 2.72727 10.3184C2.72727 10.379 2.72727 10.4396 2.72727 10.5002C2.66668 10.5002 2.60606 10.5002 2.54546 10.5002C2.54546 10.5608 2.54546 10.6214 2.54546 10.682C2.48485 10.682 2.42424 10.682 2.36364 10.682C2.36364 10.7275 2.36364 10.7729 2.36364 10.8184C2.31818 10.8184 2.27273 10.8184 2.22727 10.8184C2.22727 10.8789 2.22727 10.9396 2.22727 11.0002C2.16667 11.0002 2.10606 11.0002 2.04546 11.0002C2.04546 11.0456 2.04546 11.0911 2.04546 11.1365C1.98485 11.1365 1.92424 11.1365 1.86364 11.1365C1.86364 11.1971 1.86364 11.2578 1.86364 11.3184C1.81818 11.3184 1.77273 11.3184 1.72727 11.3184C1.72727 11.3789 1.72727 11.4396 1.72727 11.5002C1.66667 11.5002 1.60606 11.5002 1.54546 11.5002C1.54546 11.5456 1.54546 11.5911 1.54546 11.6365C1.48485 11.6365 1.42424 11.6365 1.36364 11.6365C1.36364 11.6971 1.36364 11.7578 1.36364 11.8184C1.31818 11.8184 1.27273 11.8184 1.22727 11.8184C1.23409 11.9848 1.16591 12.0302 1.02273 11.9547C1.00078 11.9116 0.993206 11.8662 1 11.8184C0.954547 11.8184 0.909092 11.8184 0.863638 11.8184C0.863638 11.7578 0.863638 11.6971 0.863638 11.6365C0.803033 11.6365 0.742424 11.6365 0.68182 11.6365C0.68182 11.5911 0.68182 11.5456 0.68182 11.5002C0.621215 11.5002 0.560606 11.5002 0.500001 11.5002C0.500001 11.4396 0.500001 11.3789 0.500001 11.3184C0.454547 11.3184 0.409092 11.3184 0.363638 11.3184C0.363638 11.2578 0.363638 11.1971 0.363638 11.1365C0.303033 11.1365 0.242424 11.1365 0.18182 11.1365C0.18182 11.0911 0.18182 11.0456 0.18182 11.0002C0.136365 11.0002 0.0909105 11.0002 0.0454559 11.0002C0.0454559 10.9396 0.0454559 10.8789 0.0454559 10.8184C0.0909105 10.8184 0.136365 10.8184 0.18182 10.8184C0.18182 10.7578 0.18182 10.6971 0.18182 10.6365C0.242424 10.6365 0.303033 10.6365 0.363638 10.6365C0.363638 10.576 0.363638 10.5153 0.363638 10.4547C0.409092 10.4547 0.454547 10.4547 0.500001 10.4547C0.500001 10.3941 0.500001 10.3335 0.500001 10.2729C0.560606 10.2729 0.621215 10.2729 0.68182 10.2729C0.68182 10.2275 0.68182 10.182 0.68182 10.1365C0.742424 10.1365 0.803033 10.1365 0.863638 10.1365C0.863638 10.076 0.863638 10.0153 0.863638 9.95472C0.909092 9.95472 0.954547 9.95472 1 9.95472C1 9.89413 1 9.8335 1 9.7729C1.06061 9.7729 1.12121 9.7729 1.18182 9.7729C1.18182 9.72745 1.18182 9.682 1.18182 9.63654C1.22727 9.63654 1.27273 9.63654 1.31818 9.63654C1.31818 9.57595 1.31818 9.51531 1.31818 9.45472C1.37879 9.45472 1.4394 9.45472 1.5 9.45472C1.5 9.39413 1.5 9.3335 1.5 9.2729C1.56061 9.2729 1.62121 9.2729 1.68182 9.2729C1.68182 9.22745 1.68182 9.182 1.68182 9.13654C1.72727 9.13654 1.77273 9.13654 1.81818 9.13654C1.81818 9.07595 1.81818 9.01531 1.81818 8.95472C1.87879 8.95472 1.9394 8.95472 2 8.95472C2 8.90927 2 8.86381 2 8.81836C2.06061 8.81836 2.12121 8.81836 2.18182 8.81836C2.18182 8.75777 2.18182 8.69713 2.18182 8.63654C2.22727 8.63654 2.27273 8.63654 2.31818 8.63654C2.31818 8.57595 2.31818 8.51531 2.31818 8.45472C2.37879 8.45472 2.4394 8.45472 2.5 8.45472C2.5 8.40927 2.5 8.36381 2.5 8.31836C2.56061 8.31836 2.62123 8.31836 2.68182 8.31836C2.68182 8.25777 2.68182 8.19713 2.68182 8.13654C2.72727 8.13654 2.77273 8.13654 2.81818 8.13654C2.81818 8.07595 2.81818 8.01531 2.81818 7.95472C2.87877 7.95472 2.93941 7.95472 3 7.95472C3 7.90927 3 7.86381 3 7.81836C3.06059 7.81836 3.12123 7.81836 3.18182 7.81836C3.18182 7.75777 3.18182 7.69713 3.18182 7.63654C3.22727 7.63654 3.27273 7.63654 3.31818 7.63654C3.31818 7.57595 3.31818 7.51531 3.31818 7.45472C3.37877 7.45472 3.43941 7.45472 3.5 7.45472C3.5 7.40927 3.5 7.36381 3.5 7.31836C3.56059 7.31836 3.62123 7.31836 3.68182 7.31836C3.68182 7.25777 3.68182 7.19713 3.68182 7.13654C3.72727 7.13654 3.77273 7.13654 3.81818 7.13654C3.81818 7.07595 3.81818 7.01531 3.81818 6.95472C3.87877 6.95472 3.93941 6.95472 4 6.95472C4 6.90927 4 6.86381 4 6.81836C4.04546 6.81836 4.09091 6.81836 4.13636 6.81836C4.13636 6.7729 4.13636 6.72745 4.13636 6.682C4.09091 6.682 4.04546 6.682 4 6.682C4 6.6214 4 6.56077 4 6.50018C3.93941 6.50018 3.87877 6.50018 3.81818 6.50018C3.81818 6.45472 3.81818 6.40927 3.81818 6.36381C3.77273 6.36381 3.72727 6.36381 3.68182 6.36381C3.68182 6.30322 3.68182 6.24259 3.68182 6.182C3.62123 6.182 3.56059 6.182 3.5 6.182C3.5 6.1214 3.5 6.06077 3.5 6.00018C3.43941 6.00018 3.37877 6.00018 3.31818 6.00018C3.31818 5.95472 3.31818 5.90927 3.31818 5.86381C3.27273 5.86381 3.22727 5.86381 3.18182 5.86381C3.18182 5.80322 3.18182 5.74259 3.18182 5.682C3.12123 5.682 3.06059 5.682 3 5.682C3 5.6214 3 5.56077 3 5.50018C2.93941 5.50018 2.87877 5.50018 2.81818 5.50018C2.81818 5.43959 2.81818 5.37895 2.81818 5.31836Z", fill: "#31B304", "fill-rule" => "evenodd", opacity: "0.951"} .ontology-details-last-update %img{src: asset_path("update.svg")}/ - %div Last update on February 2, 2023 + %div + = "Last update on "+last_update_date .ontology-details-header-right-container %svg{fill: "none", height: "14", viewbox: "0 0 20 14", width: "20", xmlns: "http://www.w3.org/2000/svg"} %path{d: "M10.0001 0.415132C6.25672 0.415132 2.67253 3.16921 0.306647 6.02839C-0.102216 6.52254 -0.102216 7.23985 0.306647 7.73397C0.901484 8.45285 2.14805 9.83978 3.81325 11.0519C8.0074 14.1048 11.9847 14.1106 16.187 11.0519C18.1432 9.62794 19.6936 7.76068 19.6936 7.73397C20.1024 7.23985 20.1024 6.52254 19.6936 6.02843C17.328 3.16959 13.7443 0.415132 10.0001 0.415132ZM10.0001 12.1156C5.85321 12.1156 2.25847 8.16088 1.25554 6.9488C1.23983 6.92977 1.23123 6.90586 1.23123 6.88118C1.23123 6.8565 1.23983 6.83259 1.25554 6.81356C2.25851 5.60148 5.85321 1.64676 10.0001 1.64676C14.147 1.64676 17.7417 5.60148 18.7447 6.81356C18.8031 6.88426 18.7408 6.9488 18.7447 6.9488C17.7417 8.16088 14.147 12.1156 10.0001 12.1156Z", fill: "#31B404"} From 600a05d7bc259769b21d06d654c9091cb1220483 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 23 May 2023 15:31:13 +0200 Subject: [PATCH 157/533] make the navbar responsive --- app/assets/stylesheets/nav_bar.scss | 44 ++++++++++++++++++++--------- app/views/layouts/_topnav.html.haml | 37 ++++++++++++++++-------- 2 files changed, 56 insertions(+), 25 deletions(-) diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss index 07eb48a03..2ba849829 100644 --- a/app/assets/stylesheets/nav_bar.scss +++ b/app/assets/stylesheets/nav_bar.scss @@ -12,6 +12,10 @@ padding: 8px 50px; width: 1280px; } +.nav-responsiveness-container{ + display: flex; + justify-content: space-between; +} .nav-logo{ display: flex; align-items: center; @@ -122,24 +126,36 @@ #nav-menu:checked ~ .menu-btn i:before{ content: "\f00d"; } - - - #nav-menu:checked ~ .top-nav{ - display:block; - background-color: blue; - } - #nav-menu:checked ~ ul{ - display: block; - } .nav-items{ display: none; } - #nav-menu:checked ~ .nav-items{ - display: block; - height: 100vh; - background-color: var(--primary-color); + .menu-btn{ + position: absolute; + right: 40px; } - } +.top-nav.show-responsive { + display: block !important; + background-color: var(--primary-color); + height: unset; +} + +.top-nav-ul.show-responsive { + display: block; +} +.nav-items.show-responsive { + flex-direction: column; + width: unset; + display: flex; + align-items: flex-start; +} + +.show-responsive { + margin: 15px 0 !important; +} + +.supportMenuDropdownLink.show-responsive { + margin-bottom: 15px; +} diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 5fb6bf539..9df6c78e6 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -1,21 +1,22 @@ .nav-container %nav.top-nav - %a.nav-logo{href: "/"} - %img{:src => asset_path("logo-white.svg")}/ - %p AgroPortal - %input#nav-menu{:type => "checkbox"}/ - %label.menu-btn{:for => "nav-menu"} - %i.fas.fa-bars + .nav-responsiveness-container + %a.nav-logo{href: "/"} + %img{:src => asset_path("logo-white.svg")}/ + %p AgroPortal + %input#nav-menu{:type => "checkbox"}/ + %label.menu-btn{:for => "nav-menu"} + %i.fas.fa-bars - navitems = [["/ontologies", "Browse"],["/mappings", "Mappings"],["/recommender", "Recommender"],["/annotator", "Annotator"], ["/landscape", "Landscape"]] .nav-items - %ul + %ul.top-nav-ul - navitems.each do |navItem| - %li + %li.nav-ul-li %a{href: navItem[0], class: ("active" if current_page?(navItem[0]))} #{navItem[1]} - %input{:placeholder => "Search AgroPortal ...", :type => "text"}/ + %input.nav-input{:placeholder => "Search AgroPortal ...", :type => "text"}/ - %a{:href => "/login"} Login + %a.nav-a{:href => "/login"} Login %select.nav-language %option{:value => "EN"} @@ -23,7 +24,7 @@ %option{:value => "FR"} FR .dropdown - = link_to("#", id: "supportMenuDropdownLink", class: "nav-link dropdown-toggle", role: "button", data: {toggle: "dropdown"}, aria: {haspopup: "true", expanded: "false"}) do + = link_to("#", id: "supportMenuDropdownLink", class: "nav-link dropdown-toggle supportMenuDropdownLink", role: "button", data: {toggle: "dropdown"}, aria: {haspopup: "true", expanded: "false"}) do Support %div.dropdown-menu.dropdown-menu-right{aria: {labelledby: "supportMenuDropdownLink"}} = link_to(t(:submit_feedback), feedback_path(location: encode_param(request.url)), id: "submitFeedbackMenuItem", class: "dropdown-item pop_window") @@ -32,3 +33,17 @@ = link_to(t(:_help), "#{$WIKI_HELP_PAGE}", target: "_blank", class: "dropdown-item") = link_to(t(:_release_notes), "#{$RELEASE_NOTES}", target: "_blank", class: "dropdown-item") = link_to(t(:_publications), $PUBLICATIONS_URL, target: "_blank", class: "dropdown-item") +:javascript + let checkbox = document.getElementById('nav-menu'); + let divs = document.querySelectorAll('.top-nav, .top-nav-ul, .nav-items, .nav-ul-li, .nav-input, .nav-a, .nav-language, .supportMenuDropdownLink'); + checkbox.addEventListener('change', function() { + if (this.checked) { + divs.forEach(function(div) { + div.classList.add('show-responsive'); + }); + } else { + divs.forEach(function(div) { + div.classList.remove('show-responsive'); + }); + } + }); From 705939fc22ef20c3e4178b22c58b0e5cbb962a14 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 24 May 2023 10:57:33 +0200 Subject: [PATCH 158/533] Add hove effects to the buttons of home page --- app/assets/stylesheets/home.scss | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index b048adb09..2dbbf4736 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -227,7 +227,7 @@ i.fa.fa-caret-square-o-down { .home-upload-ontology-button{ margin-top: 30px; text-decoration: none; - color: var(--primary-color);; + color: var(--primary-color); display: flex; justify-content: space-between; align-items: center; @@ -236,7 +236,17 @@ i.fa.fa-caret-square-o-down { border: 1px solid var(--primary-color); border-radius: 8px; font-size: 15px; + transition: background-color 0.3s ease; +} +.home-upload-ontology-button:hover{ + color: white !important; + background-color: var(--primary-color); } +.home-upload-ontology-button:hover .home-upload-icon path{ + fill: white; +} + + .home-recommendations-and-annotations{ font-size: 16px; outline: none; @@ -269,6 +279,10 @@ i.fa.fa-caret-square-o-down { padding: 15px 20px; border-radius: 8px; margin-left: 10px; + transition: background-color 0.3s ease; +} +.home-get-annotations:hover{ + background-color: var(--hover-color); } .home-get-annotations p{ margin-right: 20px; @@ -284,7 +298,14 @@ i.fa.fa-caret-square-o-down { padding: 15px 20px; border-radius: 8px; border: 1px solid var(--primary-color); - + transition: background-color 0.3s ease; +} +.home-get-recommendations:hover{ + color: white !important; + background-color: var(--primary-color); +} +.home-get-recommendations:hover .home-play-icon path{ + fill: white; } .home-get-recommendations p{ margin-right: 20px; From b5c0e50d00feafa7adc21e34693229dcbe1097a9 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 24 May 2023 11:16:23 +0200 Subject: [PATCH 159/533] Extract SVGs from ontology details header's html to svg files and use inline_svg gem --- Gemfile | 2 +- Gemfile.lock | 4 ++++ app/assets/images/eye.svg | 4 ++++ app/assets/images/open-popup.svg | 4 ++++ app/views/layouts/ontology_viewer/_header.html.haml | 8 ++------ 5 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 app/assets/images/eye.svg create mode 100644 app/assets/images/open-popup.svg diff --git a/Gemfile b/Gemfile index 9aa696608..72bfecbed 100644 --- a/Gemfile +++ b/Gemfile @@ -72,7 +72,7 @@ gem 'thin' gem 'view_component', '~> 2.72' gem 'turnout' gem 'will_paginate', '~> 3.0' - +gem 'inline_svg' gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'development' diff --git a/Gemfile.lock b/Gemfile.lock index a6db07def..85862836c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,6 +183,9 @@ GEM importmap-rails (1.1.6) actionpack (>= 6.0.0) railties (>= 6.0.0) + inline_svg (1.9.0) + activesupport (>= 3.0) + nokogiri (>= 1.6) io-console (0.6.0) irb (1.6.4) reline (>= 0.3.0) @@ -469,6 +472,7 @@ DEPENDENCIES i18n iconv importmap-rails + inline_svg jquery-rails jquery-ui-rails jsbundling-rails diff --git a/app/assets/images/eye.svg b/app/assets/images/eye.svg new file mode 100644 index 000000000..28889ecc3 --- /dev/null +++ b/app/assets/images/eye.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/assets/images/open-popup.svg b/app/assets/images/open-popup.svg new file mode 100644 index 000000000..f8ceee84b --- /dev/null +++ b/app/assets/images/open-popup.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 42006dacd..5ec74ea6b 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -21,15 +21,11 @@ = "("+ @ontology.acronym+")" .ontology-details-licence %div CC-BY IGO 3.0 - %svg{fill: "none", height: "12", viewbox: "0 0 12 12", width: "12", xmlns: "http://www.w3.org/2000/svg"} - %path{"clip-rule" => "evenodd", d: "M0.681818 0C4.22727 0 7.77273 0 11.3182 0C11.3182 0.0606045 11.3182 0.121214 11.3182 0.181818C11.4242 0.181818 11.5303 0.181818 11.6364 0.181818C11.6364 0.242423 11.6364 0.303032 11.6364 0.363636C11.697 0.363636 11.7576 0.363636 11.8182 0.363636C11.8182 0.469695 11.8182 0.575759 11.8182 0.681818C11.8788 0.681818 11.9394 0.681818 12 0.681818C12 4.22727 12 7.77273 12 11.3182C11.9394 11.3182 11.8788 11.3182 11.8182 11.3182C11.8182 11.4242 11.8182 11.5303 11.8182 11.6364C11.7576 11.6364 11.697 11.6364 11.6364 11.6364C11.6364 11.697 11.6364 11.7576 11.6364 11.8182C11.5303 11.8182 11.4242 11.8182 11.3182 11.8182C11.3182 11.8788 11.3182 11.9394 11.3182 12C8.48486 12 5.6515 12 2.81818 12C2.81818 11.9242 2.81818 11.8485 2.81818 11.7727C2.87877 11.7727 2.93941 11.7727 3 11.7727C3 11.7273 3 11.6818 3 11.6364C3.06059 11.6364 3.12123 11.6364 3.18182 11.6364C3.18182 11.5758 3.18182 11.5151 3.18182 11.4545C3.22727 11.4545 3.27273 11.4545 3.31818 11.4545C3.31818 11.394 3.31818 11.3333 3.31818 11.2727C3.37877 11.2727 3.43941 11.2727 3.5 11.2727C3.5 11.2273 3.5 11.1818 3.5 11.1364C3.56059 11.1364 3.62123 11.1364 3.68182 11.1364C3.68182 11.0758 3.68182 11.0151 3.68182 10.9545C3.72727 10.9545 3.77273 10.9545 3.81818 10.9545C3.81818 10.894 3.81818 10.8333 3.81818 10.7727C3.87877 10.7727 3.93941 10.7727 4 10.7727C4 10.7273 4 10.6818 4 10.6364C6.21214 10.6364 8.42423 10.6364 10.6364 10.6364C10.6364 8 10.6364 5.36364 10.6364 2.72727C7.54545 2.72727 4.45455 2.72727 1.36364 2.72727C1.36364 4.48486 1.36364 6.24241 1.36364 8C1.31818 8 1.27273 8 1.22727 8C1.22727 8.06059 1.22727 8.12123 1.22727 8.18182C1.16667 8.18182 1.10606 8.18182 1.04545 8.18182C1.04545 8.22727 1.04545 8.27273 1.04545 8.31818C0.98485 8.31818 0.924241 8.31818 0.863636 8.31818C0.863636 8.37877 0.863636 8.43941 0.863636 8.5C0.818182 8.5 0.772727 8.5 0.727273 8.5C0.727273 8.56059 0.727273 8.62123 0.727273 8.68182C0.666668 8.68182 0.606059 8.68182 0.545455 8.68182C0.545455 8.72727 0.545455 8.77273 0.545455 8.81818C0.48485 8.81818 0.424241 8.81818 0.363636 8.81818C0.363636 8.87877 0.363636 8.93941 0.363636 9C0.318182 9 0.272727 9 0.227273 9C0.227273 9.06059 0.227273 9.12123 0.227273 9.18182C0.151514 9.18182 0.0757591 9.18182 0 9.18182C0 6.3485 0 3.51514 0 0.681818C0.0606045 0.681818 0.121214 0.681818 0.181818 0.681818C0.181818 0.575759 0.181818 0.469695 0.181818 0.363636C0.242423 0.363636 0.303032 0.363636 0.363636 0.363636C0.363636 0.303032 0.363636 0.242423 0.363636 0.181818C0.469695 0.181818 0.575759 0.181818 0.681818 0.181818C0.681818 0.121214 0.681818 0.0606045 0.681818 0Z", fill: "#30B303", "fill-rule" => "evenodd", opacity: "0.972"} - %path{"clip-rule" => "evenodd", d: "M2.81818 5.31836C4.10605 5.31836 5.39396 5.31836 6.68182 5.31836C6.68182 6.60622 6.68182 7.89413 6.68182 9.182C6.60605 9.182 6.53032 9.182 6.45455 9.182C6.45455 9.1214 6.45455 9.06077 6.45455 9.00018C6.40909 9.00018 6.36364 9.00018 6.31818 9.00018C6.31818 8.93959 6.31818 8.87895 6.31818 8.81836C6.25759 8.81836 6.19696 8.81836 6.13636 8.81836C6.13636 8.7729 6.13636 8.72745 6.13636 8.682C6.09091 8.682 6.04546 8.682 6 8.682C6 8.6214 6 8.56077 6 8.50018C5.93941 8.50018 5.87877 8.50018 5.81818 8.50018C5.81818 8.43959 5.81818 8.37895 5.81818 8.31836C5.75759 8.31836 5.69696 8.31836 5.63636 8.31836C5.63636 8.2729 5.63636 8.22745 5.63636 8.182C5.59091 8.182 5.54546 8.182 5.5 8.182C5.5 8.1214 5.5 8.06077 5.5 8.00018C5.43941 8.00018 5.37877 8.00018 5.31818 8.00018C5.31818 7.95472 5.31818 7.90927 5.31818 7.86381C5.27273 7.86381 5.22727 7.86381 5.18182 7.86381C5.18182 7.90927 5.18182 7.95472 5.18182 8.00018C5.13636 8.00018 5.09091 8.00018 5.04546 8.00018C5.04546 8.06077 5.04546 8.1214 5.04546 8.182C4.98486 8.182 4.92423 8.182 4.86364 8.182C4.86364 8.22745 4.86364 8.2729 4.86364 8.31836C4.80305 8.31836 4.74241 8.31836 4.68182 8.31836C4.68182 8.37895 4.68182 8.43959 4.68182 8.50018C4.63636 8.50018 4.59091 8.50018 4.54546 8.50018C4.54546 8.56077 4.54546 8.6214 4.54546 8.682C4.48486 8.682 4.42423 8.682 4.36364 8.682C4.36364 8.72745 4.36364 8.7729 4.36364 8.81836C4.30305 8.81836 4.24241 8.81836 4.18182 8.81836C4.18182 8.87895 4.18182 8.93959 4.18182 9.00018C4.13636 9.00018 4.09091 9.00018 4.04546 9.00018C4.04546 9.06077 4.04546 9.1214 4.04546 9.182C3.98486 9.182 3.92423 9.182 3.86364 9.182C3.86364 9.22745 3.86364 9.2729 3.86364 9.31836C3.80305 9.31836 3.74241 9.31836 3.68182 9.31836C3.68182 9.37895 3.68182 9.43959 3.68182 9.50018C3.63636 9.50018 3.59091 9.50018 3.54546 9.50018C3.54546 9.56077 3.54546 9.6214 3.54546 9.682C3.48486 9.682 3.42423 9.682 3.36364 9.682C3.36364 9.72745 3.36364 9.7729 3.36364 9.81836C3.30305 9.81836 3.24241 9.81836 3.18182 9.81836C3.18182 9.87895 3.18182 9.93959 3.18182 10.0002C3.13636 10.0002 3.09091 10.0002 3.04546 10.0002C3.04546 10.0608 3.04546 10.1214 3.04546 10.182C2.98486 10.182 2.92423 10.182 2.86364 10.182C2.86364 10.2275 2.86364 10.2729 2.86364 10.3184C2.81818 10.3184 2.77273 10.3184 2.72727 10.3184C2.72727 10.379 2.72727 10.4396 2.72727 10.5002C2.66668 10.5002 2.60606 10.5002 2.54546 10.5002C2.54546 10.5608 2.54546 10.6214 2.54546 10.682C2.48485 10.682 2.42424 10.682 2.36364 10.682C2.36364 10.7275 2.36364 10.7729 2.36364 10.8184C2.31818 10.8184 2.27273 10.8184 2.22727 10.8184C2.22727 10.8789 2.22727 10.9396 2.22727 11.0002C2.16667 11.0002 2.10606 11.0002 2.04546 11.0002C2.04546 11.0456 2.04546 11.0911 2.04546 11.1365C1.98485 11.1365 1.92424 11.1365 1.86364 11.1365C1.86364 11.1971 1.86364 11.2578 1.86364 11.3184C1.81818 11.3184 1.77273 11.3184 1.72727 11.3184C1.72727 11.3789 1.72727 11.4396 1.72727 11.5002C1.66667 11.5002 1.60606 11.5002 1.54546 11.5002C1.54546 11.5456 1.54546 11.5911 1.54546 11.6365C1.48485 11.6365 1.42424 11.6365 1.36364 11.6365C1.36364 11.6971 1.36364 11.7578 1.36364 11.8184C1.31818 11.8184 1.27273 11.8184 1.22727 11.8184C1.23409 11.9848 1.16591 12.0302 1.02273 11.9547C1.00078 11.9116 0.993206 11.8662 1 11.8184C0.954547 11.8184 0.909092 11.8184 0.863638 11.8184C0.863638 11.7578 0.863638 11.6971 0.863638 11.6365C0.803033 11.6365 0.742424 11.6365 0.68182 11.6365C0.68182 11.5911 0.68182 11.5456 0.68182 11.5002C0.621215 11.5002 0.560606 11.5002 0.500001 11.5002C0.500001 11.4396 0.500001 11.3789 0.500001 11.3184C0.454547 11.3184 0.409092 11.3184 0.363638 11.3184C0.363638 11.2578 0.363638 11.1971 0.363638 11.1365C0.303033 11.1365 0.242424 11.1365 0.18182 11.1365C0.18182 11.0911 0.18182 11.0456 0.18182 11.0002C0.136365 11.0002 0.0909105 11.0002 0.0454559 11.0002C0.0454559 10.9396 0.0454559 10.8789 0.0454559 10.8184C0.0909105 10.8184 0.136365 10.8184 0.18182 10.8184C0.18182 10.7578 0.18182 10.6971 0.18182 10.6365C0.242424 10.6365 0.303033 10.6365 0.363638 10.6365C0.363638 10.576 0.363638 10.5153 0.363638 10.4547C0.409092 10.4547 0.454547 10.4547 0.500001 10.4547C0.500001 10.3941 0.500001 10.3335 0.500001 10.2729C0.560606 10.2729 0.621215 10.2729 0.68182 10.2729C0.68182 10.2275 0.68182 10.182 0.68182 10.1365C0.742424 10.1365 0.803033 10.1365 0.863638 10.1365C0.863638 10.076 0.863638 10.0153 0.863638 9.95472C0.909092 9.95472 0.954547 9.95472 1 9.95472C1 9.89413 1 9.8335 1 9.7729C1.06061 9.7729 1.12121 9.7729 1.18182 9.7729C1.18182 9.72745 1.18182 9.682 1.18182 9.63654C1.22727 9.63654 1.27273 9.63654 1.31818 9.63654C1.31818 9.57595 1.31818 9.51531 1.31818 9.45472C1.37879 9.45472 1.4394 9.45472 1.5 9.45472C1.5 9.39413 1.5 9.3335 1.5 9.2729C1.56061 9.2729 1.62121 9.2729 1.68182 9.2729C1.68182 9.22745 1.68182 9.182 1.68182 9.13654C1.72727 9.13654 1.77273 9.13654 1.81818 9.13654C1.81818 9.07595 1.81818 9.01531 1.81818 8.95472C1.87879 8.95472 1.9394 8.95472 2 8.95472C2 8.90927 2 8.86381 2 8.81836C2.06061 8.81836 2.12121 8.81836 2.18182 8.81836C2.18182 8.75777 2.18182 8.69713 2.18182 8.63654C2.22727 8.63654 2.27273 8.63654 2.31818 8.63654C2.31818 8.57595 2.31818 8.51531 2.31818 8.45472C2.37879 8.45472 2.4394 8.45472 2.5 8.45472C2.5 8.40927 2.5 8.36381 2.5 8.31836C2.56061 8.31836 2.62123 8.31836 2.68182 8.31836C2.68182 8.25777 2.68182 8.19713 2.68182 8.13654C2.72727 8.13654 2.77273 8.13654 2.81818 8.13654C2.81818 8.07595 2.81818 8.01531 2.81818 7.95472C2.87877 7.95472 2.93941 7.95472 3 7.95472C3 7.90927 3 7.86381 3 7.81836C3.06059 7.81836 3.12123 7.81836 3.18182 7.81836C3.18182 7.75777 3.18182 7.69713 3.18182 7.63654C3.22727 7.63654 3.27273 7.63654 3.31818 7.63654C3.31818 7.57595 3.31818 7.51531 3.31818 7.45472C3.37877 7.45472 3.43941 7.45472 3.5 7.45472C3.5 7.40927 3.5 7.36381 3.5 7.31836C3.56059 7.31836 3.62123 7.31836 3.68182 7.31836C3.68182 7.25777 3.68182 7.19713 3.68182 7.13654C3.72727 7.13654 3.77273 7.13654 3.81818 7.13654C3.81818 7.07595 3.81818 7.01531 3.81818 6.95472C3.87877 6.95472 3.93941 6.95472 4 6.95472C4 6.90927 4 6.86381 4 6.81836C4.04546 6.81836 4.09091 6.81836 4.13636 6.81836C4.13636 6.7729 4.13636 6.72745 4.13636 6.682C4.09091 6.682 4.04546 6.682 4 6.682C4 6.6214 4 6.56077 4 6.50018C3.93941 6.50018 3.87877 6.50018 3.81818 6.50018C3.81818 6.45472 3.81818 6.40927 3.81818 6.36381C3.77273 6.36381 3.72727 6.36381 3.68182 6.36381C3.68182 6.30322 3.68182 6.24259 3.68182 6.182C3.62123 6.182 3.56059 6.182 3.5 6.182C3.5 6.1214 3.5 6.06077 3.5 6.00018C3.43941 6.00018 3.37877 6.00018 3.31818 6.00018C3.31818 5.95472 3.31818 5.90927 3.31818 5.86381C3.27273 5.86381 3.22727 5.86381 3.18182 5.86381C3.18182 5.80322 3.18182 5.74259 3.18182 5.682C3.12123 5.682 3.06059 5.682 3 5.682C3 5.6214 3 5.56077 3 5.50018C2.93941 5.50018 2.87877 5.50018 2.81818 5.50018C2.81818 5.43959 2.81818 5.37895 2.81818 5.31836Z", fill: "#31B304", "fill-rule" => "evenodd", opacity: "0.951"} + = inline_svg_tag "open-popup.svg" .ontology-details-last-update %img{src: asset_path("update.svg")}/ %div = "Last update on "+last_update_date .ontology-details-header-right-container - %svg{fill: "none", height: "14", viewbox: "0 0 20 14", width: "20", xmlns: "http://www.w3.org/2000/svg"} - %path{d: "M10.0001 0.415132C6.25672 0.415132 2.67253 3.16921 0.306647 6.02839C-0.102216 6.52254 -0.102216 7.23985 0.306647 7.73397C0.901484 8.45285 2.14805 9.83978 3.81325 11.0519C8.0074 14.1048 11.9847 14.1106 16.187 11.0519C18.1432 9.62794 19.6936 7.76068 19.6936 7.73397C20.1024 7.23985 20.1024 6.52254 19.6936 6.02843C17.328 3.16959 13.7443 0.415132 10.0001 0.415132ZM10.0001 12.1156C5.85321 12.1156 2.25847 8.16088 1.25554 6.9488C1.23983 6.92977 1.23123 6.90586 1.23123 6.88118C1.23123 6.8565 1.23983 6.83259 1.25554 6.81356C2.25851 5.60148 5.85321 1.64676 10.0001 1.64676C14.147 1.64676 17.7417 5.60148 18.7447 6.81356C18.8031 6.88426 18.7408 6.9488 18.7447 6.9488C17.7417 8.16088 14.147 12.1156 10.0001 12.1156Z", fill: "#31B404"} - %path{d: "M10.0001 2.57001C7.62316 2.57001 5.68939 4.50378 5.68939 6.88071C5.68939 9.25763 7.62316 11.1914 10.0001 11.1914C12.377 11.1914 14.3108 9.25763 14.3108 6.88071C14.3108 4.50378 12.377 2.57001 10.0001 2.57001ZM10.0001 9.95978C8.30229 9.95978 6.92102 8.57851 6.92102 6.88071C6.92102 5.18291 8.30229 3.80164 10.0001 3.80164C11.6979 3.80164 13.0792 5.18291 13.0792 6.88071C13.0792 8.57851 11.6979 9.95978 10.0001 9.95978Z", fill: "#31B404"} + = inline_svg_tag "eye.svg" %div Watch (12) From c321fbaea581035dcf848b580ef0d6ae92505ca4 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 24 May 2023 14:54:21 +0200 Subject: [PATCH 160/533] Add edit button in the ontology details header --- app/assets/images/edit.svg | 8 +++++ .../stylesheets/ontology_details_header.scss | 32 ++++++++++++++++--- .../layouts/ontology_viewer/_header.html.haml | 22 +++++++++---- 3 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 app/assets/images/edit.svg diff --git a/app/assets/images/edit.svg b/app/assets/images/edit.svg new file mode 100644 index 000000000..5d042ab84 --- /dev/null +++ b/app/assets/images/edit.svg @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/ontology_details_header.scss b/app/assets/stylesheets/ontology_details_header.scss index d726df6ef..33f912a30 100644 --- a/app/assets/stylesheets/ontology_details_header.scss +++ b/app/assets/stylesheets/ontology_details_header.scss @@ -60,6 +60,9 @@ margin-right: 10px; } .ontology-details-header-right-container{ + display: flex; +} +.ontology-details-watch-button { color: var(--primary-color); font-size: 15px; display: flex; @@ -68,15 +71,34 @@ border-radius: 32px; padding: 10px 20px; cursor: pointer; + margin-left: 10px; + transition: background-color ease 0.3s; } -.ontology-details-header-right-container:hover{ + + +.ontology-details-watch-button:hover,.ontology-details-edit-button:hover { background-color: var(--primary-color); - color: white; + color: white !important; } -.ontology-details-header-right-container:hover svg path{ + +.ontology-details-watch-button:hover svg path,.ontology-details-edit-button:hover svg path { fill: white; } -.ontology-details-header-right-container svg{ + +.ontology-details-watch-button svg { margin-right: 10px; -} \ No newline at end of file +} + +.ontology-details-edit-button { + display: flex; + justify-content: center; + align-items: center; + border: 1px solid var(--primary-color); + border-radius: 22.5px; + padding: 10px; + height: 45px; + width: 45px; + cursor: pointer; + transition: background-color ease 0.3s; +} diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 5ec74ea6b..4ab740108 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -22,10 +22,20 @@ .ontology-details-licence %div CC-BY IGO 3.0 = inline_svg_tag "open-popup.svg" - .ontology-details-last-update - %img{src: asset_path("update.svg")}/ - %div - = "Last update on "+last_update_date + - if (details_available && !sub.released.nil?) + .ontology-details-last-update + %img{src: asset_path("update.svg")}/ + %div + = "Last update on "+last_update_date .ontology-details-header-right-container - = inline_svg_tag "eye.svg" - %div Watch (12) + - if @ontology.admin?(session[:user]) + %a.ontology-details-edit-button{href: edit_ontology_path(@ontology.acronym)} + = inline_svg_tag "edit.svg" + - if session[:user].nil? + %a.ontology-details-watch-button{href: "/login?redirect=/watch-lorem-ipsum"} + = inline_svg_tag "eye.svg" + %div Watch (12) + - else + %a.ontology-details-watch-button{href: "/watch-lorem-ipsum"} + = inline_svg_tag "eye.svg" + %div Watch (12) From 1bd65de47b3a3d562fcc4d74ac56632db15ebbea Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Wed, 24 May 2023 17:03:36 +0200 Subject: [PATCH 161/533] add column ontologies count to categories and-groups admin page --- app/assets/javascripts/bp_admin.js | 28 +++++++++++++++---- .../admin/categories_controller.rb | 2 +- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/bp_admin.js b/app/assets/javascripts/bp_admin.js index 744a297e9..45596faa6 100644 --- a/app/assets/javascripts/bp_admin.js +++ b/app/assets/javascripts/bp_admin.js @@ -1303,8 +1303,14 @@ function displayGroups(data, group) { "targets": 4, "searchable": false, "orderable": false, - "title": "Actions", - "width": "210px" + "title": "nb", + }, + { + "targets": 5, + "searchable": false, + "orderable": false, + "title": "Actions", + "width": "250px" } ], "autoWidth": false, @@ -1333,10 +1339,13 @@ function populateGroupRows(data) { let description = group['description'] let created = group['created']; let id = group['acronym']; + let nb = [ + ' ' + group['ontologies'].length + ' ', + ]; let actions = [ 'Edit', ] - return [name, description, created, id , actions.join('|')]; + return [name, description, created, id , nb, actions.join('|')]; }) return allRows; @@ -1456,8 +1465,14 @@ function displayCategories(data, category) { "targets": 5, "searchable": false, "orderable": false, + "title": "nb", + }, + { + "targets": 6, + "searchable": false, + "orderable": false, "title": "Actions", - "width": "210px" + "width": "250px" } ], "autoWidth": false, @@ -1487,10 +1502,13 @@ function populateCategoryRows(data) { let created = category['created']; let id = category['acronym']; let parentCategory = category['parentCategory']; + let nb = [ + ' ' + category['ontologies'].length + ' ', + ]; let actions = [ 'Edit', ] - return [name, description, created, id , parentCategory, actions.join('|')]; + return [name, description, created, id , parentCategory, nb , actions.join('|')]; }) return allRows; diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb index 2af3f9143..44a69eac2 100644 --- a/app/controllers/admin/categories_controller.rb +++ b/app/controllers/admin/categories_controller.rb @@ -96,7 +96,7 @@ def _categories response = { categories: Hash.new, errors: '', success: '' } start = Time.now begin - response[:categories] = JSON.parse(LinkedData::Client::HTTP.get(CATEGORIES_URL, { include: 'all' }, raw: true)) + response[:categories] = JSON.parse(LinkedData::Client::HTTP.get(CATEGORIES_URL, { include: 'ontologies,acronym,name,created,description,parentCategory' }, raw: true)) response[:success] = "categories successfully retrieved in #{Time.now - start}s" LOG.add :debug, "Categories - retrieved #{response[:categories].length} groups in #{Time.now - start}s" From ea471b53012231a47bc8a11a3d8e485f51b45df5 Mon Sep 17 00:00:00 2001 From: HADDAD Zineddine Date: Wed, 24 May 2023 20:37:47 +0200 Subject: [PATCH 162/533] move alter message position within the UI --- app/views/concepts/_details.html.haml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index 93862c7ed..084eb6642 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -1,11 +1,16 @@ = turbo_frame_tag 'concept_details' do - schemes_keys = %w[hasTopConcept topConceptOf] - label_xl_set = %w[skos-xl#prefLabel skos-xl#altLabel skos-xl#hiddenLabel] + + - if @concept.prefLabel().nil? + = render(AlertMessageComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language'), type: "warning", closeable: false)) + = render ConceptDetailsComponent.new(id:'concept-details', acronym: @ontology.acronym, properties: @concept.properties, top_keys: %w[description comment], bottom_keys: %w[disjoint subclass is_a has_part], exclude_keys: schemes_keys + label_xl_set + ['inScheme']) do |c| + - c.header do %tr %td{nowrap: ""}= t('ontology_details.concept.id') @@ -14,10 +19,7 @@ %tr %td{nowrap: ""}= t('ontology_details.concept.preferred_name') %td - - if @concept.prefLabel().nil? - = render(AlertMessageComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language'), type: "warning", closeable: false)) - - else - %p= @concept.prefLabel({:use_html => true}).html_safe + %p= @concept.prefLabel({:use_html => true}).html_safe - unless @concept.synonym.nil? || @concept.synonym.empty? %tr From 5348483a6115f3e380cd6eec21a3d1f2fc29fa00 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 25 May 2023 11:41:56 +0200 Subject: [PATCH 163/533] Undo overriding bootstrap class (container-fluid) on the home page --- app/assets/stylesheets/home.scss | 4 +--- app/views/layouts/_header.html.erb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 2dbbf4736..642bb562c 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -3,9 +3,7 @@ i.fa.fa-caret-square-o-down { margin-left: 2px; } -.container-fluid{ - padding: 0 !important; -} + .home-header-container{ height: 310px; diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 0530d3209..111fc1b69 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -43,5 +43,5 @@ <%=render partial: 'layouts/topnav'%> -
    +
    <%=render partial: 'layouts/notices'%> \ No newline at end of file From 1de014b97f34af716eccafb91dffca6ee366e926 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 25 May 2023 11:44:41 +0200 Subject: [PATCH 164/533] Replace css class .hide by the existing bootstrap class on the home page --- app/assets/stylesheets/home.scss | 3 --- app/views/home/index.html.haml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 642bb562c..46ef4d4f9 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -309,9 +309,6 @@ i.fa.fa-caret-square-o-down { margin-right: 20px; margin-bottom: 0; } -.hide{ - display: none; -} .home-section-sub-sections-container{ display: flex; justify-content: space-between; diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index bc0692b86..8f1cc3dae 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -79,8 +79,8 @@ .home-card %form{action: "/annotator_recommender_form", method: "post"} %textarea.home-recommendations-and-annotations{rows: "6" , placeholder: "Paste a paragraph of text or some keywords ...", name: "text"} - %input.hide{type: "submit", name: "submit_button" ,value: "annotator", id: "annotator_submit"}/ - %input.hide{type: "submit" , name: "submit_button" ,value: "recommender", id: "recommender_submit"}/ + %input.d-none{type: "submit", name: "submit_button" ,value: "annotator", id: "annotator_submit"}/ + %input.d-none{type: "submit" , name: "submit_button" ,value: "recommender", id: "recommender_submit"}/ .home-services-buttons .home-get-recommendations{onclick: "submitRecommender()"} %p Get recommendations From df364b2c86918a915a5b051133d64f87812f9f7c Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 25 May 2023 11:50:25 +0200 Subject: [PATCH 165/533] remove duplicated current_page? method from the application helper --- app/helpers/application_helper.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7e2498800..493228b1a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -615,7 +615,4 @@ def request_lang lang.upcase end - def current_page?(path) - request.path == path ? true : false - end end From cba60459e21b530cb2f4b30ce2eba8347a4fb902 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 25 May 2023 12:18:21 +0200 Subject: [PATCH 166/533] use dynamic portal name, and extract navitems to the application helper in the navbar --- app/helpers/application_helper.rb | 9 +++++++++ app/views/layouts/_topnav.html.haml | 7 +++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 493228b1a..00f3df5f3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -615,4 +615,13 @@ def request_lang lang.upcase end + def portal_name + name = $UI_THEME.to_s.capitalize + name.sub! 'portal' , 'Portal' + end + + def navitems + items = [["/ontologies", "Browse"],["/mappings", "Mappings"],["/recommender", "Recommender"],["/annotator", "Annotator"], ["/landscape", "Landscape"]] + end + end diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 9df6c78e6..1615f94e9 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -3,18 +3,17 @@ .nav-responsiveness-container %a.nav-logo{href: "/"} %img{:src => asset_path("logo-white.svg")}/ - %p AgroPortal + %p + = portal_name %input#nav-menu{:type => "checkbox"}/ %label.menu-btn{:for => "nav-menu"} %i.fas.fa-bars - - navitems = [["/ontologies", "Browse"],["/mappings", "Mappings"],["/recommender", "Recommender"],["/annotator", "Annotator"], ["/landscape", "Landscape"]] .nav-items %ul.top-nav-ul - navitems.each do |navItem| %li.nav-ul-li %a{href: navItem[0], class: ("active" if current_page?(navItem[0]))} #{navItem[1]} - - %input.nav-input{:placeholder => "Search AgroPortal ...", :type => "text"}/ + %input.nav-input{:placeholder => "Search "+portal_name+" ...", :type => "text"}/ %a.nav-a{:href => "/login"} Login From d9d463b995ced70b26da3b94b82c7e7804a7d44b Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 25 May 2023 14:13:27 +0200 Subject: [PATCH 167/533] add padding the concept details no prefLabel warning --- app/views/concepts/_details.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index 084eb6642..5079eb9a7 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -2,8 +2,8 @@ - schemes_keys = %w[hasTopConcept topConceptOf] - label_xl_set = %w[skos-xl#prefLabel skos-xl#altLabel skos-xl#hiddenLabel] - - if @concept.prefLabel().nil? - = render(AlertMessageComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language'), type: "warning", closeable: false)) + - if @concept.prefLabel.nil? + %div.py-3.px-2 = render ConceptDetailsComponent.new(id:'concept-details', acronym: @ontology.acronym, properties: @concept.properties, From 236d86f23c7486bba3477619eb07d11d49266702 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 25 May 2023 14:14:08 +0200 Subject: [PATCH 168/533] make the concept details no prefLabel alert closable --- app/views/concepts/_details.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index 5079eb9a7..7212012ab 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -4,6 +4,7 @@ - if @concept.prefLabel.nil? %div.py-3.px-2 + = render(AlertMessageComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language'), type: "warning", closeable: true)) = render ConceptDetailsComponent.new(id:'concept-details', acronym: @ontology.acronym, properties: @concept.properties, From ae916ac23d7204e5e9bc65efc5c53653c84fca53 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 25 May 2023 14:19:27 +0200 Subject: [PATCH 169/533] in concepts treeview the ones with no prefLabel show only their id last part --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 45d630567..91880e6a3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -193,7 +193,7 @@ def tree_link_to_concept(child:, ontology_acronym:, active_style:, node: nil) data-active-collections-value='#{child.isInActiveCollection || []}' data-skos-collection-colors-target='collection' class='#{muted_style} #{active_style}'> - #{child.prefLabel ? child.prefLabel({ use_html: true }) : child.id} + #{child.prefLabel ? child.prefLabel({ use_html: true }) : child.id.split('/').last} EOS From c015d988dfc7f0d5a363b3d89e483ac38b6eada1 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 25 May 2023 16:21:58 +0200 Subject: [PATCH 170/533] replace static portal name and title with a configurable one --- app/helpers/application_helper.rb | 5 +++++ app/views/home/index.html.haml | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 45d630567..679d62ad1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -611,3 +611,8 @@ def request_lang lang.upcase end end + +def portal_name + name = $UI_THEME.to_s.capitalize + name.sub! 'portal' , 'Portal' +end \ No newline at end of file diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 8f1cc3dae..273525782 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -39,8 +39,10 @@ .home-header-title-container{'data-controller': "home-search", 'data-home-search-ontologies-value': raw(@ontology_names.to_json)} .home-header-title - %h4 Welcome to AgroPortal - %p The home of vocabularies and ontologies in agronomy and related fields. + %h4 + = $WESBITE_TITLE[$UI_THEME] + %p + = $WEBSITE_SUB_TITLE[$UI_THEME] %input#home-search{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text", 'data-home-search-target': 'input', 'data-action': 'input->home-search#search blur->home-search#blur'} #home-search-drop-down{'data-home-search-target': 'dropDown', 'data-action': 'mousedown->home-search#prevent'} %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} @@ -74,7 +76,8 @@ = inline_svg_tag "upload.svg", class: "home-upload-icon" upload ontology .home-section - %h4 Agroportal services + %h4 + = portal_name+" services" %hr.home-section-line/ .home-card %form{action: "/annotator_recommender_form", method: "post"} @@ -113,7 +116,8 @@ .home-statistics-container .home-agroportal-figures = inline_svg_tag "ontoportal-icon.svg" - %p AgroPortal in figures: + %p + = portal_name+" in figures:" .home-statistics .home-statistics-item %hr/ From 12ed63040d65cf9341e3844584da9ca40faab18a Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 26 May 2023 11:35:03 +0200 Subject: [PATCH 171/533] Fix merge developement branch into feature/update-nav-bar-design problems --- app/assets/images/logo-white.svg | 3 +++ app/assets/stylesheets/application.css.scss.erb | 1 + 2 files changed, 4 insertions(+) create mode 100644 app/assets/images/logo-white.svg diff --git a/app/assets/images/logo-white.svg b/app/assets/images/logo-white.svg new file mode 100644 index 000000000..f920cd7de --- /dev/null +++ b/app/assets/images/logo-white.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index b0a28fbcc..80014e7b0 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -50,6 +50,7 @@ @import "components/index"; @import "account"; @import "ontology_details_header"; +@import "nav_bar"; /* Bootstrap and Font Awesome */ @import "bootstrap"; From 26dde51b32b18267e434c410a595f78dfcb79628 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 30 May 2023 14:58:44 +0200 Subject: [PATCH 172/533] Replace see all by see all ontologies in home page search --- app/views/home/index.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 273525782..8b3599180 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -54,7 +54,7 @@ %p#seached-ontologies{'data-home-search-target': 'searchedOntologies'} %div %img{src: asset_path("loop.svg")}/ - %p See all + %p See all ontologies .home-body-container .home-section %h4 Wanna upload an ontology? @@ -74,7 +74,7 @@ - else %a.home-upload-ontology-button{:href => "/ontologies/new"} = inline_svg_tag "upload.svg", class: "home-upload-icon" - upload ontology + Upload ontology .home-section %h4 = portal_name+" services" From bae239b4470af00b13b93cab2ca0af01ef2923cb Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 31 May 2023 09:13:30 +0200 Subject: [PATCH 173/533] Fetch ontologies on home search only on typing event --- app/controllers/home_controller.rb | 4 - app/controllers/ontologies_controller.rb | 8 +- .../controllers/home_search_controller.js | 134 +++++++++++------- app/views/home/index.html.haml | 2 +- config/routes.rb | 1 + 5 files changed, 92 insertions(+), 57 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 0c4caa272..c56da890e 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -8,10 +8,6 @@ class HomeController < ApplicationController def index @analytics = LinkedData::Client::Analytics.last_month - - @ontologies_views = LinkedData::Client::Models::Ontology.all(include_views: true) - @ontologies = @ontologies_views.select {|o| !o.viewOf} - @ontology_names = @ontologies.map { |ont| ["#{ont.name} (#{ont.acronym})", ont.acronym] } # Calculate BioPortal summary statistics @ont_count = @analytics.onts.size metrics = LinkedData::Client::Models::Metrics.all diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index f37a0e2a3..c8d38d335 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -451,8 +451,12 @@ def widgets render partial: 'ontologies/sections/widgets', layout: 'ontology_viewer' end end - - + def ajax_ontologies + + + render json: LinkedData::Client::Models::Ontology.all(include_views: true, + display: 'acronym,name', display_links: false, display_context: false) + end private diff --git a/app/javascript/controllers/home_search_controller.js b/app/javascript/controllers/home_search_controller.js index 946b93558..3cd8d0e9c 100644 --- a/app/javascript/controllers/home_search_controller.js +++ b/app/javascript/controllers/home_search_controller.js @@ -1,5 +1,5 @@ import { Controller } from "@hotwired/stimulus" - +import useAjax from "../../javascript/mixins/useAjax"; // Connects to data-controller="home-search" export default class extends Controller { static targets = [ "input", "dropDown", "ontology", "searchedOntologies", "searchOntologyContent", "homeSearchOntologies" ] @@ -7,7 +7,7 @@ export default class extends Controller { ontologies: Array } connect() { - this.ontologies = this.ontologiesValue + this.input = this.inputTarget this.dropDown = this.dropDownTarget this.ontology = this.ontologyTarget @@ -54,66 +54,100 @@ export default class extends Controller { window.requestAnimationFrame(scrollAnimation); } + #fetchOntologies(){ + + if(this.ontologies !== undefined){ + this.#renderLines() + } else{ + useAjax({ + type: "GET", + url: "/ajax/ontologies", + dataType: "json", + success: (data) => { + + + this.ontologies = data.map(ont => [`${ont.name} (${ont.acronym})`, ont.acronym]); + this.#renderLines() + + }, + error: () => { + console.log("error") + } + }) + } + - #searchInput() { + } + + + #renderLines(){ + const inputValue = this.input.value.trim(); let results_list = [] const class_search_path = "/search?query=" const browse_search_path = "/ontologies?search=" - const inputValue = this.input.value.trim(); if (inputValue.length > 0) { - this.ontology.innerHTML = inputValue; - this.searchedOntologies.innerHTML = inputValue; - this.searchOntologyContent.href = class_search_path+inputValue; - this.homeSearchOntologies.href = browse_search_path+inputValue; - this.dropDown.innerHTML = "" - let breaker = 0 - for (var i = 0; i < this.ontologies.length; i++) { - if (breaker == 4){ - break; - } - // Get the current item from the ontologies array - var item = this.ontologies[i]; - - // Check if the item contains the substring - if (item[0].toLowerCase().includes(inputValue.toLowerCase()) || item[1].toLowerCase().includes(inputValue.toLowerCase())) { - results_list.push(item); - breaker = breaker + 1 - } - } - results_list.forEach((item)=> { - let link = document.createElement("a"); - link.href = "/ontologies/"+item[1]; - link.className = "home-search-ontology-content"; - - let p1 = document.createElement("p"); - p1.id = "seached-ontology"; - p1.className = "home-searched-ontology"; - p1.textContent = item[0]+" "+"("+item[1]+")"; - - let p2 = document.createElement("p"); - p2.className = "home-result-type"; - p2.textContent = "Ontology"; - - link.appendChild(p1); - link.appendChild(p2); - - this.dropDown.appendChild(link); - - }); - this.dropDown.appendChild(this.homeSearchOntologies); - this.dropDown.appendChild(this.searchOntologyContent); - this.dropDown.style.display = "block"; - this.input.classList.add("home-dropdown-active"); - - if (window.scrollY < 300) { - this.#scrollDown(window.scrollY); + this.ontology.innerHTML = inputValue; + this.searchedOntologies.innerHTML = inputValue; + this.searchOntologyContent.href = class_search_path+inputValue; + this.homeSearchOntologies.href = browse_search_path+inputValue; + this.dropDown.innerHTML = "" + let breaker = 0 + for (var i = 0; i < this.ontologies.length; i++) { + if (breaker == 4){ + break; + } + // Get the current item from the ontologies array + var item = this.ontologies[i]; + + // Check if the item contains the substring + if (item[0].toLowerCase().includes(inputValue.toLowerCase()) || item[1].toLowerCase().includes(inputValue.toLowerCase())) { + results_list.push(item); + breaker = breaker + 1 } + } + + results_list.forEach((item)=> { + let link = document.createElement("a"); + link.href = "/ontologies/"+item[1]; + link.className = "home-search-ontology-content"; + + let p1 = document.createElement("p"); + p1.id = "seached-ontology"; + p1.className = "home-searched-ontology"; + p1.textContent = item[0]+" "+"("+item[1]+")"; + + let p2 = document.createElement("p"); + p2.className = "home-result-type"; + p2.textContent = "Ontology"; + + link.appendChild(p1); + link.appendChild(p2); + + this.dropDown.appendChild(link); + + }); + this.dropDown.appendChild(this.homeSearchOntologies); + this.dropDown.appendChild(this.searchOntologyContent); + this.dropDown.style.display = "block"; + this.input.classList.add("home-dropdown-active"); + + if (window.scrollY < 300) { + this.#scrollDown(window.scrollY); + } + } else { this.dropDown.style.display = "none"; this.input.classList.remove("home-dropdown-active"); } + + + + } + + #searchInput() { + this.#fetchOntologies() } } diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 8b3599180..16fbe3662 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -37,7 +37,7 @@ %a.home-bubble.home-bubble-four{:href => "/visits"} %h5 ... - .home-header-title-container{'data-controller': "home-search", 'data-home-search-ontologies-value': raw(@ontology_names.to_json)} + .home-header-title-container{'data-controller': "home-search"} .home-header-title %h4 = $WESBITE_TITLE[$UI_THEME] diff --git a/config/routes.rb b/config/routes.rb index f30fe3b22..5090016ec 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -152,6 +152,7 @@ get '/ajax/fair_score/json' => 'fair_score#details_json' get '/ajax/:ontology/instances' => 'instances#index_by_ontology' get '/ajax/:ontology/classes/:conceptid/instances' => 'instances#index_by_class', :constraints => { conceptid: /[^\/?]+/ } + get '/ajax/ontologies' , to:"ontologies#ajax_ontologies" # User get '/logout' => 'login#destroy', :as => :logout From 62d56f4bae6fcedc4c52e5a27d0e3219d3677d4d Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 31 May 2023 11:08:39 +0200 Subject: [PATCH 174/533] Make nav search work --- app/assets/stylesheets/home.scss | 1 + app/assets/stylesheets/nav_bar.scss | 16 +++++++++++---- .../controllers/home_search_controller.js | 7 ++++--- app/views/layouts/_topnav.html.haml | 20 +++++++++++++++---- 4 files changed, 33 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 46ef4d4f9..562a5575c 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -385,6 +385,7 @@ i.fa.fa-caret-square-o-down { } .home-search-ontology-content div{ display: flex; + margin-left: 20px; } .home-search-ontology-content div img{ width: 12px; diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss index 2ba849829..d457f95a1 100644 --- a/app/assets/stylesheets/nav_bar.scss +++ b/app/assets/stylesheets/nav_bar.scss @@ -57,7 +57,7 @@ opacity: 100%; font-weight: 500; } -.nav-items > input { +.nav-search-container > input { height: 33px; width: 228px; outline: none; @@ -69,14 +69,15 @@ font-size: 14px; padding: 0 10px; } -.nav-items > input:focus{ +.nav-search-container > input:focus{ opacity: 100%; + border-radius: 5px 5px 0 0; } -.nav-items > input::placeholder{ +.nav-search-container > input::placeholder{ color: white; opacity: 60%; } -.nav-items > input::-ms-input-placeholder{ +.nav-search-container > input::-ms-input-placeholder{ color: white; opacity: 60%; } @@ -119,6 +120,13 @@ padding: 0 !important; } +.nav-search-drop-down{ + position: absolute; + z-index: 9999; + font-size: 12px !important; + width: 228px !important; +} + @media (max-width: 1200px){ .top-nav .menu-btn i{ display: block; diff --git a/app/javascript/controllers/home_search_controller.js b/app/javascript/controllers/home_search_controller.js index 3cd8d0e9c..f2db88044 100644 --- a/app/javascript/controllers/home_search_controller.js +++ b/app/javascript/controllers/home_search_controller.js @@ -115,7 +115,7 @@ export default class extends Controller { let p1 = document.createElement("p"); p1.id = "seached-ontology"; p1.className = "home-searched-ontology"; - p1.textContent = item[0]+" "+"("+item[1]+")"; + p1.textContent = item[0]; let p2 = document.createElement("p"); p2.className = "home-result-type"; @@ -131,10 +131,11 @@ export default class extends Controller { this.dropDown.appendChild(this.searchOntologyContent); this.dropDown.style.display = "block"; this.input.classList.add("home-dropdown-active"); - - if (window.scrollY < 300) { + if ((window.scrollY < 300) && (!this.input.className.includes("nav-input"))) { this.#scrollDown(window.scrollY); } + + diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 1615f94e9..22e44c041 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -8,15 +8,27 @@ %input#nav-menu{:type => "checkbox"}/ %label.menu-btn{:for => "nav-menu"} %i.fas.fa-bars - .nav-items + .nav-items{'data-controller': "home-search"} %ul.top-nav-ul - navitems.each do |navItem| %li.nav-ul-li %a{href: navItem[0], class: ("active" if current_page?(navItem[0]))} #{navItem[1]} - %input.nav-input{:placeholder => "Search "+portal_name+" ...", :type => "text"}/ - - %a.nav-a{:href => "/login"} Login + .nav-search-container + %input.nav-input{:placeholder => "Search "+portal_name+" ...", :type => "text", :name => "search", 'data-home-search-target': 'input', 'data-action': 'input->home-search#search blur->home-search#blur'} + #home-search-drop-down.nav-search-drop-down{'data-home-search-target': 'dropDown', 'data-action': 'mousedown->home-search#prevent'} + %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} + %p#seached-ontology{'data-home-search-target': 'ontology'} + %div + %img{src: asset_path("loop.svg")}/ + %p Search ontology content + %a.home-search-ontology-content#home-search-ontologies{href: "#", 'data-home-search-target': 'homeSearchOntologies'} + %p#seached-ontologies{'data-home-search-target': 'searchedOntologies'} + %div + %img{src: asset_path("loop.svg")}/ + %p See all ontologies + + %a.nav-a{:href => "/login"} Login %select.nav-language %option{:value => "EN"} EN From 911091162119e308c3a1688023f2ac2b511e7785 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Wed, 31 May 2023 15:47:16 +0200 Subject: [PATCH 175/533] change the name of column count from nb to count in group/category table --- app/assets/javascripts/bp_admin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/bp_admin.js b/app/assets/javascripts/bp_admin.js index 45596faa6..8114c1b50 100644 --- a/app/assets/javascripts/bp_admin.js +++ b/app/assets/javascripts/bp_admin.js @@ -1303,7 +1303,7 @@ function displayGroups(data, group) { "targets": 4, "searchable": false, "orderable": false, - "title": "nb", + "title": "Count", }, { "targets": 5, @@ -1465,7 +1465,7 @@ function displayCategories(data, category) { "targets": 5, "searchable": false, "orderable": false, - "title": "nb", + "title": "Count", }, { "targets": 6, From c4b391a9d3e5272703051922bcb9495ac35297c8 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Wed, 31 May 2023 15:51:42 +0200 Subject: [PATCH 176/533] add a pop-up with list of ontologies in group and category admin table --- app/assets/javascripts/bp_admin.js | 10 +++++-- app/controllers/ontologies_controller.rb | 10 +++++++ .../ontologies/_related_ontologies.html.haml | 30 +++++++++++++++++++ config/routes.rb | 1 + 4 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 app/views/ontologies/_related_ontologies.html.haml diff --git a/app/assets/javascripts/bp_admin.js b/app/assets/javascripts/bp_admin.js index 8114c1b50..7506ae192 100644 --- a/app/assets/javascripts/bp_admin.js +++ b/app/assets/javascripts/bp_admin.js @@ -1343,7 +1343,8 @@ function populateGroupRows(data) { ' ' + group['ontologies'].length + ' ', ]; let actions = [ - 'Edit', + 'Edit Groups', + 'Edit Ontologies' ] return [name, description, created, id , nb, actions.join('|')]; }) @@ -1351,6 +1352,10 @@ function populateGroupRows(data) { return allRows; } +function getOntologiesAcronyms(ontologies) { + return ontologies.map(ontology => ontology.substring(ontology.lastIndexOf('/') +1)) +} + function DeleteGroups() { } @@ -1506,7 +1511,8 @@ function populateCategoryRows(data) { ' ' + category['ontologies'].length + ' ', ]; let actions = [ - 'Edit', + 'Edit Categories', + 'Edit Ontologies' ] return [name, description, created, id , parentCategory, nb , actions.join('|')]; }) diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index f37a0e2a3..dcc0e0b28 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -436,6 +436,11 @@ def update end end + def related_ontologies + get_related_ontologies + render partial: 'related_ontologies' + end + def virtual redirect_new_api end @@ -485,4 +490,9 @@ def get_views(ontology) views.sort{ |a,b| a.acronym.downcase <=> b.acronym.downcase } end + def get_related_ontologies + ontologies_acronyms = params[:ontologies].split(',') + @onts = LinkedData::Client::Models::Ontology.all.select { |o| ontologies_acronyms.include?(o.acronym) } + end + end diff --git a/app/views/ontologies/_related_ontologies.html.haml b/app/views/ontologies/_related_ontologies.html.haml new file mode 100644 index 000000000..8eacf0751 --- /dev/null +++ b/app/views/ontologies/_related_ontologies.html.haml @@ -0,0 +1,30 @@ += turbo_frame_tag 'application_modal_content' do + - if @onts.present? + %style + :plain + table { + border-collapse: collapse; + } + th, td { + border: 0px solid black; + padding: 5px; + } + %table + %tr + %th + N° + %th + Acronym + %th + Actions + - nb = 1 + - @onts.each do |o| + %tr + %td + = nb + - nb += 1 + %td + = o.acronym + %td + - else + %p There is no ontologies \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 4862b94cc..df8605d49 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -148,6 +148,7 @@ get 'ajax/label_xl', to: "label_xl#show" get '/ajax/biomixer' => 'concepts#biomixer' get '/ajax/fair_score/html' => 'fair_score#details_html' + get '/ajax/ontologies/bygroup/bycategory' => 'ontologies#related_ontologies' get '/ajax/fair_score/json' => 'fair_score#details_json' get '/ajax/:ontology/instances' => 'instances#index_by_ontology' get '/ajax/:ontology/classes/:conceptid/instances' => 'instances#index_by_class', :constraints => { conceptid: /[^\/?]+/ } From a728623e54853fa50ffa8988537e3c6ad9283d3a Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 30 May 2023 10:42:11 +0200 Subject: [PATCH 177/533] Add light color to theme variables --- app/assets/stylesheets/theme-variables.scss.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/theme-variables.scss.erb b/app/assets/stylesheets/theme-variables.scss.erb index 4a7c79a68..d442f5a8f 100644 --- a/app/assets/stylesheets/theme-variables.scss.erb +++ b/app/assets/stylesheets/theme-variables.scss.erb @@ -6,24 +6,28 @@ --primary-color: #31B404; --hover-color: #40C811; --secondary-color: #ffc107; + --light-color: #F1FAED; } <% when "stageportal" %> :root{ --primary-color: #76A7CC; --hover-color: #6B96B7; --secondary-color: #ffc107; + --light-color: #F1F6FA; } <% when "bioportal" %> :root{ --primary-color: #76A7CC; --hover-color: #6B96B7; --secondary-color: #ffc107; + --light-color: #F1F6FA; } <% when "ontoportal" %> :root{ --primary-color: #6E98A2; --hover-color: #7BABB6; --secondary-color: #ffc107; + --light-color: #F0F5F6; } <%# Here to add a new theme ... %> <% end %> From e710add3e155d2158aeeadda1f83afcf2d69309c Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 30 May 2023 10:42:27 +0200 Subject: [PATCH 178/533] Add chip button component to lookbook --- Gemfile.lock | 19 +++++++++++-------- .../stylesheets/components/chip_button.scss | 18 ++++++++++++++++++ app/assets/stylesheets/components/index.scss | 3 ++- app/components/chip_button_component.rb | 7 +++++++ .../chip_button_component.html.haml | 5 +++++ .../previews/chip_button_component_preview.rb | 19 +++++++++++++++++++ 6 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 app/assets/stylesheets/components/chip_button.scss create mode 100644 app/components/chip_button_component.rb create mode 100644 app/components/chip_button_component/chip_button_component.html.haml create mode 100644 test/components/previews/chip_button_component_preview.rb diff --git a/Gemfile.lock b/Gemfile.lock index 85862836c..37976654e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -254,11 +254,13 @@ GEM net-protocol net-ssh (7.1.0) netrc (0.11.0) - newrelic_rpm (9.2.2) - nio4r (2.5.9) - nokogiri (1.14.3) + newrelic_rpm (9.0.0) + nio4r (2.5.8) + nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) + nokogiri (1.14.2-x86_64-linux) + racc (~> 1.4) oj (3.14.3) open_uri_redirections (0.2.1) parallel (1.23.0) @@ -322,8 +324,8 @@ GEM recaptcha (5.9.0) json redcarpet (3.6.0) - regexp_parser (2.8.0) - reline (0.3.3) + regexp_parser (2.7.0) + reline (0.3.2) io-console (~> 0.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -331,8 +333,8 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rexml (3.2.5) - rouge (4.1.0) - rspec-core (3.12.2) + rouge (4.1.1) + rspec-core (3.12.1) rspec-support (~> 3.12.0) rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) @@ -443,10 +445,11 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.34) - zeitwerk (2.6.8) + zeitwerk (2.6.7) PLATFORMS ruby + x86_64-linux DEPENDENCIES bcrypt_pbkdf (>= 1.0, < 2.0) diff --git a/app/assets/stylesheets/components/chip_button.scss b/app/assets/stylesheets/components/chip_button.scss new file mode 100644 index 000000000..943bb48bb --- /dev/null +++ b/app/assets/stylesheets/components/chip_button.scss @@ -0,0 +1,18 @@ +.chip_button_container { + background-color: #F6F6F6; + padding: 10px; + border-radius: 5px; + color: #777777 !important; + font-weight: 500; + font-size: 15px; +} +.chip_button_container_clickable{ + background-color: var(--light-color); + padding: 10px; + border-radius: 5px; + color: var(--primary-color); + font-weight: 500; + font-size: 15px; +} + + diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index c61d4d8dc..3351092f5 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -1,2 +1,3 @@ @import 'chips'; -@import 'card_message' \ No newline at end of file +@import 'card_message'; +@import 'chip_button'; \ No newline at end of file diff --git a/app/components/chip_button_component.rb b/app/components/chip_button_component.rb new file mode 100644 index 000000000..059e80379 --- /dev/null +++ b/app/components/chip_button_component.rb @@ -0,0 +1,7 @@ +class ChipButtonComponent < ViewComponent::Base + def initialize(url: nil, text:, type: "static") + @url = url + @text = text + @type = type + end +end \ No newline at end of file diff --git a/app/components/chip_button_component/chip_button_component.html.haml b/app/components/chip_button_component/chip_button_component.html.haml new file mode 100644 index 000000000..36d14bdf9 --- /dev/null +++ b/app/components/chip_button_component/chip_button_component.html.haml @@ -0,0 +1,5 @@ +- if @type == "static" + .chip_button_container + = @text +- else + %a.chip_button_container_clickable{href: @url}= @text diff --git a/test/components/previews/chip_button_component_preview.rb b/test/components/previews/chip_button_component_preview.rb new file mode 100644 index 000000000..ab5dedab2 --- /dev/null +++ b/test/components/previews/chip_button_component_preview.rb @@ -0,0 +1,19 @@ +class ChipButtonComponentPreview < ViewComponent::Preview + + # @param url text + # @param text text + + def standard(url: "nil", text: "text") + render(ChipButtonComponent.new(url: url, text: text, type: "static")) + end + + # @param url text + # @param text text + + def clickable(url: "nil", text: "text") + render(ChipButtonComponent.new(url: url, text: text, type: "clickable")) + end + + + +end \ No newline at end of file From e2d2ea0ca52209293af546b79d4eed73b9f97fda Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 30 May 2023 11:21:21 +0200 Subject: [PATCH 179/533] Add warning state to card message component in the lookbook --- app/assets/images/orange-warning.svg | 5 ++++ .../stylesheets/components/card_message.scss | 4 ++++ app/components/card_message_component.rb | 2 ++ .../card_message_component.html.haml | 4 ++++ .../card_message_component_preview.rb | 24 ++++++++++++++++--- 5 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 app/assets/images/orange-warning.svg diff --git a/app/assets/images/orange-warning.svg b/app/assets/images/orange-warning.svg new file mode 100644 index 000000000..bebb56764 --- /dev/null +++ b/app/assets/images/orange-warning.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/components/card_message.scss b/app/assets/stylesheets/components/card_message.scss index 0201775d3..9d3332a1c 100644 --- a/app/assets/stylesheets/components/card_message.scss +++ b/app/assets/stylesheets/components/card_message.scss @@ -34,6 +34,10 @@ color: #EE404C !important; border: 1px solid #EE404C; } +.card-message-button-warning { + color: #ff6700 !important; + border: 1px solid #ff6700; +} .card-message-has-title{ color: #666666; font-weight: 400; diff --git a/app/components/card_message_component.rb b/app/components/card_message_component.rb index d4b10b4d4..d0f15d062 100644 --- a/app/components/card_message_component.rb +++ b/app/components/card_message_component.rb @@ -21,6 +21,8 @@ def icon "green-check.svg" when "failure" "red-warning.svg" + when "warning" + "orange-warning.svg" end end end diff --git a/app/components/card_message_component/card_message_component.html.haml b/app/components/card_message_component/card_message_component.html.haml index 587869335..bc7641ee1 100644 --- a/app/components/card_message_component/card_message_component.html.haml +++ b/app/components/card_message_component/card_message_component.html.haml @@ -18,3 +18,7 @@ - when "failure" %a.card-message-button.card-message-button-failure{:href => @button_link} = @button_text + - when "warning" + %a.card-message-button.card-message-button-warning{:href => @button_link} + = @button_text + diff --git a/test/components/previews/card_message_component_preview.rb b/test/components/previews/card_message_component_preview.rb index 2ac6bc4fb..522031669 100644 --- a/test/components/previews/card_message_component_preview.rb +++ b/test/components/previews/card_message_component_preview.rb @@ -2,11 +2,29 @@ class CardMessageComponentPreview < ViewComponent::Preview # @param message text # @param button_text text - # @param type select [success, failure] # @param button_link text - def default(message: "Here we can type a success or failure message to the user", button_text: "Do action", type: "success", button_link: "/" ) - render(CardMessageComponent.new(message: message, button_text: button_text, type: type, button_link: button_link)) + def default(message: "Here we can type a success or failure message to the user", button_text: "Do action", button_link: "/" ) + render(CardMessageComponent.new(message: message, button_text: button_text, type: "success", button_link: button_link)) end + + # @param message text + # @param button_text text + # @param button_link text + + def warning(message: "Here we can type a success or failure message to the user", button_text: "Do action", button_link: "/" ) + render(CardMessageComponent.new(message: message, button_text: button_text, type: "warning", button_link: button_link)) + end + + + # @param message text + # @param button_text text + # @param button_link text + + def failure(message: "Here we can type a success or failure message to the user", button_text: "Do action", button_link: "/" ) + render(CardMessageComponent.new(message: message, button_text: button_text, type: "failure", button_link: button_link)) + end + + end \ No newline at end of file From 0e336baf0439d93b3fb35a9334fc832e4dc9db0b Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 01:35:36 +0200 Subject: [PATCH 180/533] add dropdown button component --- app/components/dropdown_button_component.rb | 12 ++++++++++++ .../dropdown_button_component.html.haml | 8 ++++++++ .../dropdown_section_button_component.rb | 16 ++++++++++++++++ .../dropdown_section_button_component.html.haml | 7 +++++++ 4 files changed, 43 insertions(+) create mode 100644 app/components/dropdown_button_component.rb create mode 100644 app/components/dropdown_button_component/dropdown_button_component.html.haml create mode 100644 app/components/dropdown_section_button_component.rb create mode 100644 app/components/dropdown_section_button_component/dropdown_section_button_component.html.haml diff --git a/app/components/dropdown_button_component.rb b/app/components/dropdown_button_component.rb new file mode 100644 index 000000000..08c97795c --- /dev/null +++ b/app/components/dropdown_button_component.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class DropdownButtonComponent < ViewComponent::Base + + renders_one :header + renders_many :sections, DropdownSectionButtonComponent + + def initialize(css_class: '') + super + @component_classes = css_class + end +end diff --git a/app/components/dropdown_button_component/dropdown_button_component.html.haml b/app/components/dropdown_button_component/dropdown_button_component.html.haml new file mode 100644 index 000000000..952e03ceb --- /dev/null +++ b/app/components/dropdown_button_component/dropdown_button_component.html.haml @@ -0,0 +1,8 @@ +.dropdown{class:@component_classes} + %div.d-flex.align-items-center{data: {toggle: "dropdown"}} + %div + = header + %i.fas.fa-chevron-down.ml-1 + %div.dropdown-menu + - sections.each do |s| + = s \ No newline at end of file diff --git a/app/components/dropdown_section_button_component.rb b/app/components/dropdown_section_button_component.rb new file mode 100644 index 000000000..c46074f75 --- /dev/null +++ b/app/components/dropdown_section_button_component.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class DropdownSectionButtonComponent < ViewComponent::Base + + renders_one :header + renders_many :items + + def initialize(divide: true) + super + @divide = divide + end + + def show_divider? + @divide + end +end diff --git a/app/components/dropdown_section_button_component/dropdown_section_button_component.html.haml b/app/components/dropdown_section_button_component/dropdown_section_button_component.html.haml new file mode 100644 index 000000000..3070f75de --- /dev/null +++ b/app/components/dropdown_section_button_component/dropdown_section_button_component.html.haml @@ -0,0 +1,7 @@ +- if show_divider? + %div.dropdown-divider +- if header? + %h6.dropdown-header= header +- items.each do |i| + %span.dropdown-item + = i \ No newline at end of file From 478e62d61deba1957d81a46c690788b2da2ef9e7 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 01:36:04 +0200 Subject: [PATCH 181/533] remove Twitter from the news header --- app/views/home/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 16fbe3662..0d5164758 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -106,7 +106,7 @@ %p See details = inline_svg_tag "arrow-right.svg" .home-sub-section-right - %h4 Twitter news + %h4 News %hr.home-section-line .home-card.home-twitter-news %a.twitter-timeline{"data-height" => "349", "data-width" => "533", :href => "https://twitter.com/lagroportal?ref_src=twsrc%5Etfw"} Tweets by lagroportal From 836b01ba1199bcc8d23e7f54c50f5cde4b445c8a Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 01:37:40 +0200 Subject: [PATCH 182/533] update the home search placeholder to explain what it does --- app/views/home/index.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 0d5164758..c0e7d0bd0 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -39,11 +39,11 @@ .home-header-title-container{'data-controller': "home-search"} .home-header-title - %h4 - = $WESBITE_TITLE[$UI_THEME] + %h4 + = t('.welcome', site: $SITE) %p - = $WEBSITE_SUB_TITLE[$UI_THEME] - %input#home-search{:name => "search", :placeholder => "Ex: Agrovoc ...", :type => "text", 'data-home-search-target': 'input', 'data-action': 'input->home-search#search blur->home-search#blur'} + = t('.tagline') + %input#home-search{:name => "search", :placeholder => "Search for an ontology or concept (Ex: Agrovoc ...)", :type => "text", 'data-home-search-target': 'input', 'data-action': 'input->home-search#search blur->home-search#blur'} #home-search-drop-down{'data-home-search-target': 'dropDown', 'data-action': 'mousedown->home-search#prevent'} %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} %p#seached-ontology{'data-home-search-target': 'ontology'} From e91d2d9a14717b49c60d881120b313b27dea6898 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 01:37:03 +0200 Subject: [PATCH 183/533] use locales text for the home welcome and tagline text --- app/views/home/index.html.haml | 4 ++-- config/locales/en.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index c0e7d0bd0..2d999efcc 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -39,7 +39,7 @@ .home-header-title-container{'data-controller': "home-search"} .home-header-title - %h4 + %h4 = t('.welcome', site: $SITE) %p = t('.tagline') @@ -60,7 +60,7 @@ %h4 Wanna upload an ontology? %hr.home-section-line/ %p Uploading an ontology is a way of sharing your domain knowledge with others. - %p By uploading your ontology to agroportal, you can: + %p By uploading your ontology to #{$SITE}, you can: .home-upload-benifits - @upload_benefits.each do |benefit| %div diff --git a/config/locales/en.yml b/config/locales/en.yml index 8664a3cd4..ae4ebeeae 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -184,9 +184,9 @@ en: index: find_ontology_placeholder: Start typing the ontology name, then choose from query_placeholder: Enter a class, eg Melanoma - tagline: the world's most comprehensive repository of biomedical ontologies + tagline: The home of vocabularies and ontologies in agronomy and related fields. title: Welcome to the %{organization} - welcome: Welcome to the %{site}, + welcome: Welcome to %{site}, help: welcome: Welcome to the %{site} of the National Center for Biomedical Ontology. %{site} is a web application for accessing and sharing biomedical ontologies. getting_started: > From ceec0aebaba1a26e719bf3ab2f19f63bf4df5f82 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 01:39:05 +0200 Subject: [PATCH 184/533] update portalname helper to use $SITE config variable --- app/helpers/application_helper.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index eaf593826..0944b6d93 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -616,8 +616,7 @@ def request_lang end def portal_name - name = $UI_THEME.to_s.capitalize - name.sub! 'portal' , 'Portal' + $SITE end def navitems @@ -625,8 +624,3 @@ def navitems end end - -def portal_name - name = $UI_THEME.to_s.capitalize - name.sub! 'portal' , 'Portal' -end \ No newline at end of file From 40984ac5c7c386ba9adeab59af8172312e7415a1 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 01:40:37 +0200 Subject: [PATCH 185/533] extract top nav responsiveness to a stimulus controller --- app/javascript/controllers/index.js | 3 +++ .../topnav_responsiveness_controller.js | 22 +++++++++++++++++++ app/views/layouts/_topnav.html.haml | 18 ++------------- 3 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 app/javascript/controllers/topnav_responsiveness_controller.js diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index a255efbff..da9148d6b 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -58,6 +58,9 @@ application.register("skos-collection-colors", SkosCollectionColorsController) import TooltipController from "./tooltip_controller" application.register("tooltip", TooltipController) +import TopnavResponsivenessController from "./topnav_responsiveness_controller" +application.register("topnav-responsiveness", TopnavResponsivenessController) + import TurboFrameController from "./turbo_frame_controller" application.register("turbo-frame", TurboFrameController) diff --git a/app/javascript/controllers/topnav_responsiveness_controller.js b/app/javascript/controllers/topnav_responsiveness_controller.js new file mode 100644 index 000000000..218919ff8 --- /dev/null +++ b/app/javascript/controllers/topnav_responsiveness_controller.js @@ -0,0 +1,22 @@ +import { Controller } from "@hotwired/stimulus" + +// Connects to data-controller="topnav-responsiveness" +export default class extends Controller { + static targets = ['navMenu'] + + connect() { + let checkbox = this.navMenuTarget + let divs = document.querySelectorAll('.top-nav, .top-nav-ul, .nav-items, .nav-ul-li, .nav-input, .nav-a, .nav-language, .supportMenuDropdownLink'); + checkbox.addEventListener('change', function() { + if (this.checked) { + divs.forEach(function(div) { + div.classList.add('show-responsive'); + }); + } else { + divs.forEach(function(div) { + div.classList.remove('show-responsive'); + }); + } + }); + } +} diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 22e44c041..3b0936652 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -1,11 +1,11 @@ -.nav-container +.nav-container{data: {controller:"topnav-responsiveness"}} %nav.top-nav .nav-responsiveness-container %a.nav-logo{href: "/"} %img{:src => asset_path("logo-white.svg")}/ %p = portal_name - %input#nav-menu{:type => "checkbox"}/ + %input#nav-menu{:type => "checkbox", 'data-topnav-responsiveness-target': 'navMenu'} %label.menu-btn{:for => "nav-menu"} %i.fas.fa-bars .nav-items{'data-controller': "home-search"} @@ -44,17 +44,3 @@ = link_to(t(:_help), "#{$WIKI_HELP_PAGE}", target: "_blank", class: "dropdown-item") = link_to(t(:_release_notes), "#{$RELEASE_NOTES}", target: "_blank", class: "dropdown-item") = link_to(t(:_publications), $PUBLICATIONS_URL, target: "_blank", class: "dropdown-item") -:javascript - let checkbox = document.getElementById('nav-menu'); - let divs = document.querySelectorAll('.top-nav, .top-nav-ul, .nav-items, .nav-ul-li, .nav-input, .nav-a, .nav-language, .supportMenuDropdownLink'); - checkbox.addEventListener('change', function() { - if (this.checked) { - divs.forEach(function(div) { - div.classList.add('show-responsive'); - }); - } else { - divs.forEach(function(div) { - div.classList.remove('show-responsive'); - }); - } - }); From 534827110c320aa6c90687f4481df9d8462d6adc Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 01:41:46 +0200 Subject: [PATCH 186/533] hide topnav search input if the current page is the home --- app/views/layouts/_topnav.html.haml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 3b0936652..4fdf609cc 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -8,13 +8,17 @@ %input#nav-menu{:type => "checkbox", 'data-topnav-responsiveness-target': 'navMenu'} %label.menu-btn{:for => "nav-menu"} %i.fas.fa-bars - .nav-items{'data-controller': "home-search"} + .nav-items %ul.top-nav-ul - navitems.each do |navItem| %li.nav-ul-li %a{href: navItem[0], class: ("active" if current_page?(navItem[0]))} #{navItem[1]} - .nav-search-container - %input.nav-input{:placeholder => "Search "+portal_name+" ...", :type => "text", :name => "search", 'data-home-search-target': 'input', 'data-action': 'input->home-search#search blur->home-search#blur'} + - if current_page?('/') + .nav-search-container{style:'visibility: hidden'} + %input + - else + .nav-search-container{'data-controller': "home-search"} + %input.nav-input{:placeholder => "Search in "+portal_name+" ...", :type => "text", :name => "search", 'data-home-search-target': 'input', 'data-action': 'input->home-search#search blur->home-search#blur'} #home-search-drop-down.nav-search-drop-down{'data-home-search-target': 'dropDown', 'data-action': 'mousedown->home-search#prevent'} %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} %p#seached-ontology{'data-home-search-target': 'ontology'} From 04e0aab804c42a4918cca8f8743975104f624899 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 01:42:29 +0200 Subject: [PATCH 187/533] use the dropdown component in the topnav for the support link --- app/views/layouts/_topnav.html.haml | 34 +++++++++++++++-------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 4fdf609cc..a47c371bf 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -32,19 +32,21 @@ %p See all ontologies - %a.nav-a{:href => "/login"} Login - %select.nav-language - %option{:value => "EN"} - EN - %option{:value => "FR"} - FR - .dropdown - = link_to("#", id: "supportMenuDropdownLink", class: "nav-link dropdown-toggle supportMenuDropdownLink", role: "button", data: {toggle: "dropdown"}, aria: {haspopup: "true", expanded: "false"}) do - Support - %div.dropdown-menu.dropdown-menu-right{aria: {labelledby: "supportMenuDropdownLink"}} - = link_to(t(:submit_feedback), feedback_path(location: encode_param(request.url)), id: "submitFeedbackMenuItem", class: "dropdown-item pop_window") - %div.dropdown-divider - %h6.dropdown-header Documentation - = link_to(t(:_help), "#{$WIKI_HELP_PAGE}", target: "_blank", class: "dropdown-item") - = link_to(t(:_release_notes), "#{$RELEASE_NOTES}", target: "_blank", class: "dropdown-item") - = link_to(t(:_publications), $PUBLICATIONS_URL, target: "_blank", class: "dropdown-item") + = render DropdownButtonComponent.new(css_class:'text-white') do |d| + - d.header do + = link_to("#", id: "supportMenuDropdownLink", class: "nav-link supportMenuDropdownLink", role: "button") do + Support + - d.with_section(divide: false) do |s| + - s.item do + = link_to(t(:submit_feedback), feedback_path(location: encode_param(request.url)), id: "submitFeedbackMenuItem", class: "pop_window") + - d.with_section do |s| + - s.header do + Documentation + - s.item do + = link_to(t(:_help), "#{$WIKI_HELP_PAGE}", target: "_blank") + - s.item do + = link_to(t(:_release_notes), "#{$RELEASE_NOTES}", target: "_blank") + - s.item do + = link_to(t(:_publications), $PUBLICATIONS_URL, target: "_blank") + + From f31321d2b5f033e901b2a5ade32d57eed4a1adc2 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 01:43:19 +0200 Subject: [PATCH 188/533] add again the platform-language controller to topnav language selector --- Gemfile.lock | 51 +++++++++++++++-------------- app/views/layouts/_topnav.html.haml | 25 +++++++------- 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 37976654e..91139abec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,7 @@ GEM sassc-rails (>= 2.0.0) brakeman (5.4.1) builder (3.2.4) - capistrano (3.17.2) + capistrano (3.17.3) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -115,7 +115,7 @@ GEM capistrano-bundler (>= 1.1, < 3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.39.0) + capybara (3.39.1) addressable matrix mini_mime (>= 0.1.3) @@ -135,7 +135,7 @@ GEM daemons (1.4.1) dalli (3.2.4) date (3.3.3) - debug (1.7.2) + debug (1.8.0) irb (>= 1.5.0) reline (>= 0.3.1) diff-lcs (1.5.0) @@ -160,7 +160,7 @@ GEM flamegraph (0.9.5) globalid (1.1.0) activesupport (>= 5.0) - graphql (2.0.21) + graphql (2.0.22) graphql-client (0.18.0) activesupport (>= 3.0) graphql @@ -201,9 +201,9 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.20.0) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) lookbook (1.5.5) actioncable activemodel @@ -232,7 +232,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.2) minitest (5.18.0) - msgpack (1.7.0) + msgpack (1.7.1) multi_json (1.15.0) multipart-post (2.3.0) mysql2 (0.5.3) @@ -254,10 +254,10 @@ GEM net-protocol net-ssh (7.1.0) netrc (0.11.0) - newrelic_rpm (9.0.0) - nio4r (2.5.8) - nokogiri (1.14.2) - mini_portile2 (~> 2.8.0) + newrelic_rpm (9.2.2) + nio4r (2.5.9) + nokogiri (1.15.2) + mini_portile2 (~> 2.8.2) racc (~> 1.4) nokogiri (1.14.2-x86_64-linux) racc (~> 1.4) @@ -299,9 +299,10 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) - rails-i18n (7.0.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rails-i18n (7.0.7) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) rails_autolink (1.1.8) @@ -324,8 +325,8 @@ GEM recaptcha (5.9.0) json redcarpet (3.6.0) - regexp_parser (2.7.0) - reline (0.3.2) + regexp_parser (2.8.0) + reline (0.3.4) io-console (~> 0.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -333,8 +334,8 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rexml (3.2.5) - rouge (4.1.1) - rspec-core (3.12.1) + rouge (4.1.2) + rspec-core (3.12.2) rspec-support (~> 3.12.0) rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) @@ -342,7 +343,7 @@ GEM rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.2) + rspec-rails (6.0.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -351,7 +352,7 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.0) - rubocop (1.50.2) + rubocop (1.51.0) json (~> 2.3) parallel (~> 1.10) parser (>= 3.2.0.0) @@ -361,11 +362,11 @@ GEM rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.28.1) + rubocop-ast (1.29.0) parser (>= 3.2.1.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - ruby_parser (3.20.0) + ruby_parser (3.20.1) sexp_processor (~> 4.16) rubyzip (2.3.2) sassc (2.4.0) @@ -396,14 +397,14 @@ GEM stackprof (0.2.25) stimulus-rails (1.2.1) railties (>= 6.0.0) - temple (0.10.0) - terser (1.1.14) + temple (0.10.2) + terser (1.1.16) execjs (>= 0.3.0, < 3) thin (1.8.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.2.1) + thor (1.2.2) tilt (2.1.0) time (0.2.2) date diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index a47c371bf..3ab3c4d6b 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -19,18 +19,21 @@ - else .nav-search-container{'data-controller': "home-search"} %input.nav-input{:placeholder => "Search in "+portal_name+" ...", :type => "text", :name => "search", 'data-home-search-target': 'input', 'data-action': 'input->home-search#search blur->home-search#blur'} - #home-search-drop-down.nav-search-drop-down{'data-home-search-target': 'dropDown', 'data-action': 'mousedown->home-search#prevent'} - %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} - %p#seached-ontology{'data-home-search-target': 'ontology'} - %div - %img{src: asset_path("loop.svg")}/ - %p Search ontology content - %a.home-search-ontology-content#home-search-ontologies{href: "#", 'data-home-search-target': 'homeSearchOntologies'} - %p#seached-ontologies{'data-home-search-target': 'searchedOntologies'} - %div - %img{src: asset_path("loop.svg")}/ - %p See all ontologies + #home-search-drop-down.nav-search-drop-down{'data-home-search-target': 'dropDown', 'data-action': 'mousedown->home-search#prevent'} + %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} + %p#seached-ontology{'data-home-search-target': 'ontology'} + %div + %img{src: asset_path("loop.svg")}/ + %p Search ontology content + %a.home-search-ontology-content#home-search-ontologies{href: "#", 'data-home-search-target': 'homeSearchOntologies'} + %p#seached-ontologies{'data-home-search-target': 'searchedOntologies'} + %div + %img{src: asset_path("loop.svg")}/ + %p See all ontologies + %a.nav-a{:href => "/login"} Login + = select_tag('language', options_for_select([['EN','en'],['FR','fr']]), id: 'language-select', class: 'nav-language', + data: { controller: "platform-language", action: "change->platform-language#handleLangChanged" }) = render DropdownButtonComponent.new(css_class:'text-white') do |d| - d.header do From b2212edbe7d22487191a4d40453d0f090c22b83a Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 01:52:20 +0200 Subject: [PATCH 189/533] revert ontology_viewer header changes --- .../stylesheets/ontology_details_header.scss | 82 ------------------- app/views/layouts/_ontology_viewer.html.haml | 16 ++-- .../layouts/ontology_viewer/_header.html.haml | 53 ++++++------ 3 files changed, 37 insertions(+), 114 deletions(-) delete mode 100644 app/assets/stylesheets/ontology_details_header.scss diff --git a/app/assets/stylesheets/ontology_details_header.scss b/app/assets/stylesheets/ontology_details_header.scss deleted file mode 100644 index e7c0c5eef..000000000 --- a/app/assets/stylesheets/ontology_details_header.scss +++ /dev/null @@ -1,82 +0,0 @@ -.ontology-details-header-container{ - margin: 40px; -} - -.ontology-details-path{ - display: flex; - color: #888888; - margin-bottom: 20px; -} -.ontology-details-path img{ - margin: 0 12px; -} -.ontology-details-path a{ - text-decoration: underline !important; - color: #888888 !important; -} -.ontology-details-header-sub-container{ - display: flex; - justify-content: space-between; - align-items: center; -} - -.ontology-details-name-bar{ - display: flex; - align-items: center; -} -.ontology-details-name-bar > div{ - font-size: 25px; - font-weight: 700; - margin-right: 10px; -} - -.ontology-details-name-bar > div > span{ - font-size: 17px; - font-weight: 500; -} - -.ontology-details-name-bar .ontology-details-licence{ - display: flex; - align-items: center; - background-color: #F6F6F6; - border-radius: 3px; - padding: 10px 20px; - cursor: pointer; - font-size: 12px; - color: #777777; - font-weight: 600; -} -.ontology-details-name-bar .ontology-details-licence svg{ - margin-left: 10px; - transform: scale(1.2); -} -.ontology-details-last-update{ - display: flex; - align-items: center; - font-size: 14px; - color: #888888; -} -.ontology-details-last-update img{ - margin-right: 10px; -} -.ontology-details-header-right-container{ - color: var(--primary-color); - font-size: 15px; - display: flex; - align-items: center; - border: 1px solid var(--primary-color); - border-radius: 32px; - padding: 10px 20px; - cursor: pointer; -} -.ontology-details-header-right-container:hover{ - background-color: var(--primary-color); - color: white; - -} -.ontology-details-header-right-container:hover svg path{ - fill: white; -} -.ontology-details-header-right-container svg{ - margin-right: 10px; -} \ No newline at end of file diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index 5826253ae..d2ad4caea 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -8,12 +8,12 @@ :javascript // Javascript History HTML5 API if ( typeof JSON === 'undefined' ) { - var - url = '/javascripts/history/json2.js', - scriptEl = document.createElement('script'); - scriptEl.type = 'text/javascript'; - scriptEl.src = url; - document.body.appendChild(scriptEl); + var + url = '/javascripts/history/json2.js', + scriptEl = document.createElement('script'); + scriptEl.type = 'text/javascript'; + scriptEl.src = url; + document.body.appendChild(scriptEl); } // Ontology viewer vars @@ -30,7 +30,7 @@ jQuery(document).data().bp.ont_viewer.current_purl = "#{@current_purl}"; jQuery(document).data().bp.ont_viewer.purl_prefix = "#{($PURL_ENABLED ? $PURL_PREFIX+"/"+@ontology.acronym : '')}"; jQuery(document).data().bp.ont_viewer.concept_name_title = (jQuery(document).data().bp.ont_viewer.concept_name == "") ? - "" : " - " + jQuery(document).data().bp.ont_viewer.concept_name; + "" : " - " + jQuery(document).data().bp.ont_viewer.concept_name; @@ -41,7 +41,7 @@ = render partial: 'kgcl_dialogs' - %div.row.pt-md-3.pb-md-2{style: "background-color:white;"} + %div.row.pt-md-3.pb-md-2 %div.col = render partial: 'layouts/ontology_viewer/header' diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 38af311a0..bc5e094da 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -3,27 +3,32 @@ - if sub.nil? || (sub.respond_to?(:status) && sub.status == 404) - details_available = false -# A header of sorts to display ontology name and subset of details. -.ontology-details-header-container - .ontology-details-path - %a{href: "/ontologies"} ontologies - %img{src: asset_path("arrow-right-outlined.svg")}/ - %div agrovoc - .ontology-details-header-sub-container - .ontology-details-header-left-container - .ontology-details-name-bar - %div - AGROVOC - %span (AGROVOCNIM) - .ontology-details-licence - %div CC-BY IGO 3.0 - %svg{fill: "none", height: "12", viewbox: "0 0 12 12", width: "12", xmlns: "http://www.w3.org/2000/svg"} - %path{"clip-rule" => "evenodd", d: "M0.681818 0C4.22727 0 7.77273 0 11.3182 0C11.3182 0.0606045 11.3182 0.121214 11.3182 0.181818C11.4242 0.181818 11.5303 0.181818 11.6364 0.181818C11.6364 0.242423 11.6364 0.303032 11.6364 0.363636C11.697 0.363636 11.7576 0.363636 11.8182 0.363636C11.8182 0.469695 11.8182 0.575759 11.8182 0.681818C11.8788 0.681818 11.9394 0.681818 12 0.681818C12 4.22727 12 7.77273 12 11.3182C11.9394 11.3182 11.8788 11.3182 11.8182 11.3182C11.8182 11.4242 11.8182 11.5303 11.8182 11.6364C11.7576 11.6364 11.697 11.6364 11.6364 11.6364C11.6364 11.697 11.6364 11.7576 11.6364 11.8182C11.5303 11.8182 11.4242 11.8182 11.3182 11.8182C11.3182 11.8788 11.3182 11.9394 11.3182 12C8.48486 12 5.6515 12 2.81818 12C2.81818 11.9242 2.81818 11.8485 2.81818 11.7727C2.87877 11.7727 2.93941 11.7727 3 11.7727C3 11.7273 3 11.6818 3 11.6364C3.06059 11.6364 3.12123 11.6364 3.18182 11.6364C3.18182 11.5758 3.18182 11.5151 3.18182 11.4545C3.22727 11.4545 3.27273 11.4545 3.31818 11.4545C3.31818 11.394 3.31818 11.3333 3.31818 11.2727C3.37877 11.2727 3.43941 11.2727 3.5 11.2727C3.5 11.2273 3.5 11.1818 3.5 11.1364C3.56059 11.1364 3.62123 11.1364 3.68182 11.1364C3.68182 11.0758 3.68182 11.0151 3.68182 10.9545C3.72727 10.9545 3.77273 10.9545 3.81818 10.9545C3.81818 10.894 3.81818 10.8333 3.81818 10.7727C3.87877 10.7727 3.93941 10.7727 4 10.7727C4 10.7273 4 10.6818 4 10.6364C6.21214 10.6364 8.42423 10.6364 10.6364 10.6364C10.6364 8 10.6364 5.36364 10.6364 2.72727C7.54545 2.72727 4.45455 2.72727 1.36364 2.72727C1.36364 4.48486 1.36364 6.24241 1.36364 8C1.31818 8 1.27273 8 1.22727 8C1.22727 8.06059 1.22727 8.12123 1.22727 8.18182C1.16667 8.18182 1.10606 8.18182 1.04545 8.18182C1.04545 8.22727 1.04545 8.27273 1.04545 8.31818C0.98485 8.31818 0.924241 8.31818 0.863636 8.31818C0.863636 8.37877 0.863636 8.43941 0.863636 8.5C0.818182 8.5 0.772727 8.5 0.727273 8.5C0.727273 8.56059 0.727273 8.62123 0.727273 8.68182C0.666668 8.68182 0.606059 8.68182 0.545455 8.68182C0.545455 8.72727 0.545455 8.77273 0.545455 8.81818C0.48485 8.81818 0.424241 8.81818 0.363636 8.81818C0.363636 8.87877 0.363636 8.93941 0.363636 9C0.318182 9 0.272727 9 0.227273 9C0.227273 9.06059 0.227273 9.12123 0.227273 9.18182C0.151514 9.18182 0.0757591 9.18182 0 9.18182C0 6.3485 0 3.51514 0 0.681818C0.0606045 0.681818 0.121214 0.681818 0.181818 0.681818C0.181818 0.575759 0.181818 0.469695 0.181818 0.363636C0.242423 0.363636 0.303032 0.363636 0.363636 0.363636C0.363636 0.303032 0.363636 0.242423 0.363636 0.181818C0.469695 0.181818 0.575759 0.181818 0.681818 0.181818C0.681818 0.121214 0.681818 0.0606045 0.681818 0Z", fill: "#30B303", "fill-rule" => "evenodd", opacity: "0.972"} - %path{"clip-rule" => "evenodd", d: "M2.81818 5.31836C4.10605 5.31836 5.39396 5.31836 6.68182 5.31836C6.68182 6.60622 6.68182 7.89413 6.68182 9.182C6.60605 9.182 6.53032 9.182 6.45455 9.182C6.45455 9.1214 6.45455 9.06077 6.45455 9.00018C6.40909 9.00018 6.36364 9.00018 6.31818 9.00018C6.31818 8.93959 6.31818 8.87895 6.31818 8.81836C6.25759 8.81836 6.19696 8.81836 6.13636 8.81836C6.13636 8.7729 6.13636 8.72745 6.13636 8.682C6.09091 8.682 6.04546 8.682 6 8.682C6 8.6214 6 8.56077 6 8.50018C5.93941 8.50018 5.87877 8.50018 5.81818 8.50018C5.81818 8.43959 5.81818 8.37895 5.81818 8.31836C5.75759 8.31836 5.69696 8.31836 5.63636 8.31836C5.63636 8.2729 5.63636 8.22745 5.63636 8.182C5.59091 8.182 5.54546 8.182 5.5 8.182C5.5 8.1214 5.5 8.06077 5.5 8.00018C5.43941 8.00018 5.37877 8.00018 5.31818 8.00018C5.31818 7.95472 5.31818 7.90927 5.31818 7.86381C5.27273 7.86381 5.22727 7.86381 5.18182 7.86381C5.18182 7.90927 5.18182 7.95472 5.18182 8.00018C5.13636 8.00018 5.09091 8.00018 5.04546 8.00018C5.04546 8.06077 5.04546 8.1214 5.04546 8.182C4.98486 8.182 4.92423 8.182 4.86364 8.182C4.86364 8.22745 4.86364 8.2729 4.86364 8.31836C4.80305 8.31836 4.74241 8.31836 4.68182 8.31836C4.68182 8.37895 4.68182 8.43959 4.68182 8.50018C4.63636 8.50018 4.59091 8.50018 4.54546 8.50018C4.54546 8.56077 4.54546 8.6214 4.54546 8.682C4.48486 8.682 4.42423 8.682 4.36364 8.682C4.36364 8.72745 4.36364 8.7729 4.36364 8.81836C4.30305 8.81836 4.24241 8.81836 4.18182 8.81836C4.18182 8.87895 4.18182 8.93959 4.18182 9.00018C4.13636 9.00018 4.09091 9.00018 4.04546 9.00018C4.04546 9.06077 4.04546 9.1214 4.04546 9.182C3.98486 9.182 3.92423 9.182 3.86364 9.182C3.86364 9.22745 3.86364 9.2729 3.86364 9.31836C3.80305 9.31836 3.74241 9.31836 3.68182 9.31836C3.68182 9.37895 3.68182 9.43959 3.68182 9.50018C3.63636 9.50018 3.59091 9.50018 3.54546 9.50018C3.54546 9.56077 3.54546 9.6214 3.54546 9.682C3.48486 9.682 3.42423 9.682 3.36364 9.682C3.36364 9.72745 3.36364 9.7729 3.36364 9.81836C3.30305 9.81836 3.24241 9.81836 3.18182 9.81836C3.18182 9.87895 3.18182 9.93959 3.18182 10.0002C3.13636 10.0002 3.09091 10.0002 3.04546 10.0002C3.04546 10.0608 3.04546 10.1214 3.04546 10.182C2.98486 10.182 2.92423 10.182 2.86364 10.182C2.86364 10.2275 2.86364 10.2729 2.86364 10.3184C2.81818 10.3184 2.77273 10.3184 2.72727 10.3184C2.72727 10.379 2.72727 10.4396 2.72727 10.5002C2.66668 10.5002 2.60606 10.5002 2.54546 10.5002C2.54546 10.5608 2.54546 10.6214 2.54546 10.682C2.48485 10.682 2.42424 10.682 2.36364 10.682C2.36364 10.7275 2.36364 10.7729 2.36364 10.8184C2.31818 10.8184 2.27273 10.8184 2.22727 10.8184C2.22727 10.8789 2.22727 10.9396 2.22727 11.0002C2.16667 11.0002 2.10606 11.0002 2.04546 11.0002C2.04546 11.0456 2.04546 11.0911 2.04546 11.1365C1.98485 11.1365 1.92424 11.1365 1.86364 11.1365C1.86364 11.1971 1.86364 11.2578 1.86364 11.3184C1.81818 11.3184 1.77273 11.3184 1.72727 11.3184C1.72727 11.3789 1.72727 11.4396 1.72727 11.5002C1.66667 11.5002 1.60606 11.5002 1.54546 11.5002C1.54546 11.5456 1.54546 11.5911 1.54546 11.6365C1.48485 11.6365 1.42424 11.6365 1.36364 11.6365C1.36364 11.6971 1.36364 11.7578 1.36364 11.8184C1.31818 11.8184 1.27273 11.8184 1.22727 11.8184C1.23409 11.9848 1.16591 12.0302 1.02273 11.9547C1.00078 11.9116 0.993206 11.8662 1 11.8184C0.954547 11.8184 0.909092 11.8184 0.863638 11.8184C0.863638 11.7578 0.863638 11.6971 0.863638 11.6365C0.803033 11.6365 0.742424 11.6365 0.68182 11.6365C0.68182 11.5911 0.68182 11.5456 0.68182 11.5002C0.621215 11.5002 0.560606 11.5002 0.500001 11.5002C0.500001 11.4396 0.500001 11.3789 0.500001 11.3184C0.454547 11.3184 0.409092 11.3184 0.363638 11.3184C0.363638 11.2578 0.363638 11.1971 0.363638 11.1365C0.303033 11.1365 0.242424 11.1365 0.18182 11.1365C0.18182 11.0911 0.18182 11.0456 0.18182 11.0002C0.136365 11.0002 0.0909105 11.0002 0.0454559 11.0002C0.0454559 10.9396 0.0454559 10.8789 0.0454559 10.8184C0.0909105 10.8184 0.136365 10.8184 0.18182 10.8184C0.18182 10.7578 0.18182 10.6971 0.18182 10.6365C0.242424 10.6365 0.303033 10.6365 0.363638 10.6365C0.363638 10.576 0.363638 10.5153 0.363638 10.4547C0.409092 10.4547 0.454547 10.4547 0.500001 10.4547C0.500001 10.3941 0.500001 10.3335 0.500001 10.2729C0.560606 10.2729 0.621215 10.2729 0.68182 10.2729C0.68182 10.2275 0.68182 10.182 0.68182 10.1365C0.742424 10.1365 0.803033 10.1365 0.863638 10.1365C0.863638 10.076 0.863638 10.0153 0.863638 9.95472C0.909092 9.95472 0.954547 9.95472 1 9.95472C1 9.89413 1 9.8335 1 9.7729C1.06061 9.7729 1.12121 9.7729 1.18182 9.7729C1.18182 9.72745 1.18182 9.682 1.18182 9.63654C1.22727 9.63654 1.27273 9.63654 1.31818 9.63654C1.31818 9.57595 1.31818 9.51531 1.31818 9.45472C1.37879 9.45472 1.4394 9.45472 1.5 9.45472C1.5 9.39413 1.5 9.3335 1.5 9.2729C1.56061 9.2729 1.62121 9.2729 1.68182 9.2729C1.68182 9.22745 1.68182 9.182 1.68182 9.13654C1.72727 9.13654 1.77273 9.13654 1.81818 9.13654C1.81818 9.07595 1.81818 9.01531 1.81818 8.95472C1.87879 8.95472 1.9394 8.95472 2 8.95472C2 8.90927 2 8.86381 2 8.81836C2.06061 8.81836 2.12121 8.81836 2.18182 8.81836C2.18182 8.75777 2.18182 8.69713 2.18182 8.63654C2.22727 8.63654 2.27273 8.63654 2.31818 8.63654C2.31818 8.57595 2.31818 8.51531 2.31818 8.45472C2.37879 8.45472 2.4394 8.45472 2.5 8.45472C2.5 8.40927 2.5 8.36381 2.5 8.31836C2.56061 8.31836 2.62123 8.31836 2.68182 8.31836C2.68182 8.25777 2.68182 8.19713 2.68182 8.13654C2.72727 8.13654 2.77273 8.13654 2.81818 8.13654C2.81818 8.07595 2.81818 8.01531 2.81818 7.95472C2.87877 7.95472 2.93941 7.95472 3 7.95472C3 7.90927 3 7.86381 3 7.81836C3.06059 7.81836 3.12123 7.81836 3.18182 7.81836C3.18182 7.75777 3.18182 7.69713 3.18182 7.63654C3.22727 7.63654 3.27273 7.63654 3.31818 7.63654C3.31818 7.57595 3.31818 7.51531 3.31818 7.45472C3.37877 7.45472 3.43941 7.45472 3.5 7.45472C3.5 7.40927 3.5 7.36381 3.5 7.31836C3.56059 7.31836 3.62123 7.31836 3.68182 7.31836C3.68182 7.25777 3.68182 7.19713 3.68182 7.13654C3.72727 7.13654 3.77273 7.13654 3.81818 7.13654C3.81818 7.07595 3.81818 7.01531 3.81818 6.95472C3.87877 6.95472 3.93941 6.95472 4 6.95472C4 6.90927 4 6.86381 4 6.81836C4.04546 6.81836 4.09091 6.81836 4.13636 6.81836C4.13636 6.7729 4.13636 6.72745 4.13636 6.682C4.09091 6.682 4.04546 6.682 4 6.682C4 6.6214 4 6.56077 4 6.50018C3.93941 6.50018 3.87877 6.50018 3.81818 6.50018C3.81818 6.45472 3.81818 6.40927 3.81818 6.36381C3.77273 6.36381 3.72727 6.36381 3.68182 6.36381C3.68182 6.30322 3.68182 6.24259 3.68182 6.182C3.62123 6.182 3.56059 6.182 3.5 6.182C3.5 6.1214 3.5 6.06077 3.5 6.00018C3.43941 6.00018 3.37877 6.00018 3.31818 6.00018C3.31818 5.95472 3.31818 5.90927 3.31818 5.86381C3.27273 5.86381 3.22727 5.86381 3.18182 5.86381C3.18182 5.80322 3.18182 5.74259 3.18182 5.682C3.12123 5.682 3.06059 5.682 3 5.682C3 5.6214 3 5.56077 3 5.50018C2.93941 5.50018 2.87877 5.50018 2.81818 5.50018C2.81818 5.43959 2.81818 5.37895 2.81818 5.31836Z", fill: "#31B304", "fill-rule" => "evenodd", opacity: "0.951"} - .ontology-details-last-update - %img{src: asset_path("update.svg")}/ - %div Last update on February 2, 2023 - .ontology-details-header-right-container - %svg{fill: "none", height: "14", viewbox: "0 0 20 14", width: "20", xmlns: "http://www.w3.org/2000/svg"} - %path{d: "M10.0001 0.415132C6.25672 0.415132 2.67253 3.16921 0.306647 6.02839C-0.102216 6.52254 -0.102216 7.23985 0.306647 7.73397C0.901484 8.45285 2.14805 9.83978 3.81325 11.0519C8.0074 14.1048 11.9847 14.1106 16.187 11.0519C18.1432 9.62794 19.6936 7.76068 19.6936 7.73397C20.1024 7.23985 20.1024 6.52254 19.6936 6.02843C17.328 3.16959 13.7443 0.415132 10.0001 0.415132ZM10.0001 12.1156C5.85321 12.1156 2.25847 8.16088 1.25554 6.9488C1.23983 6.92977 1.23123 6.90586 1.23123 6.88118C1.23123 6.8565 1.23983 6.83259 1.25554 6.81356C2.25851 5.60148 5.85321 1.64676 10.0001 1.64676C14.147 1.64676 17.7417 5.60148 18.7447 6.81356C18.8031 6.88426 18.7408 6.9488 18.7447 6.9488C17.7417 8.16088 14.147 12.1156 10.0001 12.1156Z", fill: "#31B404"} - %path{d: "M10.0001 2.57001C7.62316 2.57001 5.68939 4.50378 5.68939 6.88071C5.68939 9.25763 7.62316 11.1914 10.0001 11.1914C12.377 11.1914 14.3108 9.25763 14.3108 6.88071C14.3108 4.50378 12.377 2.57001 10.0001 2.57001ZM10.0001 9.95978C8.30229 9.95978 6.92102 8.57851 6.92102 6.88071C6.92102 5.18291 8.30229 3.80164 10.0001 3.80164C11.6979 3.80164 13.0792 5.18291 13.0792 6.88071C13.0792 8.57851 11.6979 9.95978 10.0001 9.95978Z", fill: "#31B404"} - %div Watch (12) +%div.ont-info-bar.rounded + %div + %h4 + = link_to(@ontology.name, ontology_path(@ontology.acronym)) + %div + - if (details_available && !sub.released.nil?) + %span.text-muted + = t('ontology_details.header.last_uploaded') + = l(Date.parse(sub.creationDate), format: :monthfull_day_year) + %div.ont-info-links + - unless (@ontology.summaryOnly || @ont_restricted || @submission_latest.nil?) + = link_to(@submission_latest.id + "/download?apikey=#{get_apikey}", "aria-label": "Download latest version", title: "Download latest version") do + %i.fas.fa-lg.fa-download{"aria-hidden": true} + - if details_available + - if $PURL_ENABLED + = link_to(@ontology.purl, "aria-label": "BioPortal PURL", title: "BioPortal PURL", target: "_blank") do + %i.fas.fa-lg.fa-link{"aria-hidden": true} + = link_to(sub.homepage, "aria-label": "Ontology home page", title: "Ontology home page", target: "_blank") do + %i.fas.fa-lg.fa-home{"aria-hidden": true} + - unless sub.documentation.nil? + = link_to(sub.documentation, "aria-label": "Ontology documentation", title: "Ontology documentation", target: "_blank") do + %i.fas.fa-lg.fa-book-reader{"aria-hidden": true} + - unless sub.publication.nil? + - sub.publication.each do |pub| + = link_to(pub, "aria-label": "Ontology publications", title: "Ontology publications", target: "_blank") do + %i.fas.fa-lg.fa-book{"aria-hidden": true} + - if @ontology.admin?(session[:user]) + = link_to(edit_ontology_path(@ontology.acronym), "aria-label": "Edit ontology details", title: "Edit ontology details") do + %i.fas.fa-lg.fa-user-edit \ No newline at end of file From 9d96487728f9f34032ce9fffd545f19b76f86dd6 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 02:27:05 +0200 Subject: [PATCH 190/533] refactor ontology watch button link test --- app/views/layouts/ontology_viewer/_header.html.haml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 4ab740108..05e8d19c8 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -31,11 +31,7 @@ - if @ontology.admin?(session[:user]) %a.ontology-details-edit-button{href: edit_ontology_path(@ontology.acronym)} = inline_svg_tag "edit.svg" - - if session[:user].nil? - %a.ontology-details-watch-button{href: "/login?redirect=/watch-lorem-ipsum"} - = inline_svg_tag "eye.svg" - %div Watch (12) - - else - %a.ontology-details-watch-button{href: "/watch-lorem-ipsum"} + - link = session[:user].nil? ? "/login?redirect=/watch-lorem-ipsum" : "/watch-lorem-ipsum" + %a.ontology-details-watch-button{href: link} = inline_svg_tag "eye.svg" %div Watch (12) From 26e86d2aaffbd2b3edd5d757ca2bafc6bf9e6a86 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 02:26:12 +0200 Subject: [PATCH 191/533] use localization for ontology viewer date displaying --- app/views/layouts/ontology_viewer/_header.html.haml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 05e8d19c8..d8c9b4e1c 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -2,8 +2,6 @@ - details_available = true - if sub.nil? || (sub.respond_to?(:status) && sub.status == 404) - details_available = false -- date = DateTime.parse(@submission_latest.modificationDate) -- last_update_date = date.strftime("%B %d, %Y") -# A header of sorts to display ontology name and subset of details. .ontology-details-header-container @@ -26,8 +24,8 @@ .ontology-details-last-update %img{src: asset_path("update.svg")}/ %div - = "Last update on "+last_update_date - .ontology-details-header-right-container + = t('ontology_details.header.last_uploaded') + = l(Date.parse(sub.creationDate), format: :monthfull_day_year) - if @ontology.admin?(session[:user]) %a.ontology-details-edit-button{href: edit_ontology_path(@ontology.acronym)} = inline_svg_tag "edit.svg" From 93a3b619e3c29275812628b740d75b927f98bd2b Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 02:28:08 +0200 Subject: [PATCH 192/533] fix ontology viewer max and min widths --- app/views/layouts/ontology_viewer/_header.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index d8c9b4e1c..e4049e531 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -11,9 +11,9 @@ %div = @ontology.acronym .ontology-details-header-sub-container - .ontology-details-header-left-container + .ontology-details-header-left-container{style:'width: 80%'} .ontology-details-name-bar - %div + %div{style:'max-width: 60%'} = @ontology.name %span = "("+ @ontology.acronym+")" @@ -26,6 +26,7 @@ %div = t('ontology_details.header.last_uploaded') = l(Date.parse(sub.creationDate), format: :monthfull_day_year) + .ontology-details-header-right-container.justify-content-end{style: 'min-width: 20%;'} - if @ontology.admin?(session[:user]) %a.ontology-details-edit-button{href: edit_ontology_path(@ontology.acronym)} = inline_svg_tag "edit.svg" From 5cf93ec9dc569c81e3f9a2a756d9eaadadaf1627 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 02:29:02 +0200 Subject: [PATCH 193/533] display the correct value of license in the ontology viewer header --- app/helpers/application_helper.rb | 4 ++++ app/views/layouts/ontology_viewer/_header.html.haml | 13 +++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 45d630567..01be5abbb 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -610,4 +610,8 @@ def request_lang lang = 'EN' unless lang lang.upcase end + + def attribute_enforced_values(attr) + submission_metadata.select {|x| x['@id'][attr]}.first['enforcedValues'] + end end diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index e4049e531..2637e3938 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -8,22 +8,23 @@ .ontology-details-path %a{href: "/ontologies"} ontologies %img{src: asset_path("arrow-right-outlined.svg")}/ - %div + %div = @ontology.acronym .ontology-details-header-sub-container .ontology-details-header-left-container{style:'width: 80%'} .ontology-details-name-bar %div{style:'max-width: 60%'} = @ontology.name - %span + %span = "("+ @ontology.acronym+")" .ontology-details-licence - %div CC-BY IGO 3.0 + %div + = attribute_enforced_values('hasLicense')[sub.hasLicense] || sub.hasLicense = inline_svg_tag "open-popup.svg" - if (details_available && !sub.released.nil?) .ontology-details-last-update %img{src: asset_path("update.svg")}/ - %div + %div = t('ontology_details.header.last_uploaded') = l(Date.parse(sub.creationDate), format: :monthfull_day_year) .ontology-details-header-right-container.justify-content-end{style: 'min-width: 20%;'} @@ -32,5 +33,5 @@ = inline_svg_tag "edit.svg" - link = session[:user].nil? ? "/login?redirect=/watch-lorem-ipsum" : "/watch-lorem-ipsum" %a.ontology-details-watch-button{href: link} - = inline_svg_tag "eye.svg" - %div Watch (12) + = inline_svg_tag "eye.svg" + %div Watch (12) From 98a2dd9e6e09c2900a348f1bc796da57c6fcbe84 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 10:36:29 +0200 Subject: [PATCH 194/533] update subscribe button to use the new style and count subscriptions --- .../ontology_subscribe_button_component.rb | 6 ++++-- .../ontology_subscribe_button_component.html.haml | 15 +++++++++++---- ...ology_subscribe_button_component_controller.js | 11 +++++++---- app/helpers/application_helper.rb | 5 +++-- app/helpers/ontologies_helper.rb | 5 +++++ .../layouts/ontology_viewer/_header.html.haml | 5 +---- 6 files changed, 31 insertions(+), 16 deletions(-) diff --git a/app/components/ontology_subscribe_button_component.rb b/app/components/ontology_subscribe_button_component.rb index 282c569a3..1feda188d 100644 --- a/app/components/ontology_subscribe_button_component.rb +++ b/app/components/ontology_subscribe_button_component.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true class OntologySubscribeButtonComponent < ViewComponent::Base - def initialize(ontology_id: , subscribed: , user_id:) + def initialize(ontology_id: , subscribed: , user_id:, count: 0, link: 'javascript:void(0);') super - @sub_text = subscribed ? "Unsubscribe" : "Subscribe" + @sub_text = subscribed ? "UnWatch" : "Watch" @controller_params = { data: { controller: 'subscribe-notes', @@ -13,5 +13,7 @@ def initialize(ontology_id: , subscribed: , user_id:) action: 'click->subscribe-notes#subscribeToNotes' } } + @link = link + @count = count end end diff --git a/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml index 6eb97097e..4120ae9ff 100644 --- a/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml +++ b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml @@ -1,6 +1,13 @@ %span{@controller_params} - %a.subscribe_to_notes.btn.btn-primary{href:'javascript:void(0);'} - #{@sub_text} to notes emails - %span{style:"display: none;", 'data-subscribe-notes-target': 'loader'} - = image_tag("spinners/spinner_000000_16px.gif", style: "vertical-align: text-bottom; background: transparent") + %a.ontology-details-watch-button{href: @link} + = inline_svg_tag "eye.svg" + %div + %span{'data-subscribe-notes-target': 'text'} + #{@sub_text} + ( + %span{'data-subscribe-notes-target': 'count'} + #{@count} + ) + %span{style:"display: none;", 'data-subscribe-notes-target': 'loader'} + = image_tag("spinners/spinner_000000_16px.gif", style: "vertical-align: text-bottom; background: transparent") %span.notes_sub_error{style:'color: red; display: none', 'data-subscribe-notes-target': 'error'} \ No newline at end of file diff --git a/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller.js b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller.js index 99b8e190f..94cdaf900 100644 --- a/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller.js +++ b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller.js @@ -8,7 +8,7 @@ export default class extends Controller { isSubbed: Boolean, userId: String } - static targets = ["error", "loader"] + static targets = ["error", "loader", "text" ,"count"] subscribeToNotes() { let ontologyId = this.ontologyIdValue @@ -30,9 +30,12 @@ export default class extends Controller { this.isSubbedValue = !isSubbed // Change button text - let txt = linkElement.html(); - let newButtonText = txt.match("Unsubscribe") ? txt.replace("Unsubscribe", "Subscribe") : txt.replace("Subscribe", "Unsubscribe"); - linkElement.html(newButtonText); + let txt = this.textTarget.innerHTML + let count = parseInt(this.countTarget.innerHTML) + + let newButtonText = txt.match("UnWatch") ? txt.replace("UnWatch", "Watch") : txt.replace("Watch", "UnWatch"); + this.textTarget.innerHTML = newButtonText + this.countTarget.innerHTML = newButtonText.match("UnWatch") ? (count + 1) : (count - 1) }, error: () => { this.#hideSpinner() diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 01be5abbb..6465cc8a0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -405,8 +405,9 @@ def subscribe_button(ontology_id) user = LinkedData::Client::Models::User.find(session[:user].id) ontology_acronym = ontology_id.split('/').last subscribed = subscribed_to_ontology?(ontology_acronym, user) - - render OntologySubscribeButtonComponent.new(ontology_id: ontology_id, subscribed: subscribed, user_id: user.id) + count = count_subscriptions(ontology_id) + link = session[:user].nil? ? "/login" : "javascript:void(0);" + render OntologySubscribeButtonComponent.new(ontology_id: ontology_id, subscribed: subscribed, user_id: user.id, count: count, link: link) end def subscribed_to_ontology?(ontology_acronym, user) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 7a26747b1..2b9bcdcb8 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -477,6 +477,11 @@ def languages_options(submission = @submission || @submission_latest) options_for_select(submission_lang) end + + def count_subscriptions(ontology_id) + users = LinkedData::Client::Models::User.all(include: 'subscription', display_context: false, display_links: false ) + users.select{ |u| u.subscription.find{ |s| s.ontology.eql?(ontology_id)} }.count + end private def submission_languages(submission = @submission) diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 2637e3938..8a24ed6d7 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -31,7 +31,4 @@ - if @ontology.admin?(session[:user]) %a.ontology-details-edit-button{href: edit_ontology_path(@ontology.acronym)} = inline_svg_tag "edit.svg" - - link = session[:user].nil? ? "/login?redirect=/watch-lorem-ipsum" : "/watch-lorem-ipsum" - %a.ontology-details-watch-button{href: link} - = inline_svg_tag "eye.svg" - %div Watch (12) + = subscribe_button(@ontology.id) From 4c5e6e50d9046e706c2d28ceecb05878ac9ee7a3 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 11:22:33 +0200 Subject: [PATCH 195/533] replace bootstrap .nav-link to .top-nav-nav-link to prevent conflicts --- app/assets/stylesheets/nav_bar.scss | 2 +- app/views/layouts/_topnav.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss index d457f95a1..53c18c245 100644 --- a/app/assets/stylesheets/nav_bar.scss +++ b/app/assets/stylesheets/nav_bar.scss @@ -115,7 +115,7 @@ display: none; } -.nav-link{ +.top-nav-nav-link{ color: white !important; padding: 0 !important; } diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 3ab3c4d6b..0678976b1 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -37,7 +37,7 @@ = render DropdownButtonComponent.new(css_class:'text-white') do |d| - d.header do - = link_to("#", id: "supportMenuDropdownLink", class: "nav-link supportMenuDropdownLink", role: "button") do + = link_to("#", id: "supportMenuDropdownLink", class: "nav-link top-nav-nav-link supportMenuDropdownLink", role: "button") do Support - d.with_section(divide: false) do |s| - s.item do From 13138bba67d8bc59548c1908e6d5f4998cdd6f72 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 11:22:55 +0200 Subject: [PATCH 196/533] add bg-white to the ontology_viewer layout --- app/views/layouts/_ontology_viewer.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index d2ad4caea..e6f3fb845 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -4,7 +4,7 @@ = render :partial =>'layouts/header' -%div#bd +%div#bd.bg-white :javascript // Javascript History HTML5 API if ( typeof JSON === 'undefined' ) { From ace71b527f77c70737f88871932548daa216e132 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 12:01:09 +0200 Subject: [PATCH 197/533] update unsubscribe button to use the same style as the subscribe state --- app/helpers/application_helper.rb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bf4f91383..44ffd7f45 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -398,16 +398,21 @@ def add_proposal_button(parent_id, parent_type) end def subscribe_button(ontology_id) + ontology_acronym = ontology_id.split('/').last + if session[:user].nil? - return link_to 'Subscribe to notes emails', "/login?redirect=#{request.url}", {style:'font-size: .9em;', class:'link_button'} + link = "/login?redirect=#{request.url}" + subscribed = false + user_id = nil + else + user = LinkedData::Client::Models::User.find(session[:user].id) + subscribed = subscribed_to_ontology?(ontology_acronym, user) + link = "javascript:void(0);" + user_id = user.id end - user = LinkedData::Client::Models::User.find(session[:user].id) - ontology_acronym = ontology_id.split('/').last - subscribed = subscribed_to_ontology?(ontology_acronym, user) count = count_subscriptions(ontology_id) - link = session[:user].nil? ? "/login" : "javascript:void(0);" - render OntologySubscribeButtonComponent.new(ontology_id: ontology_id, subscribed: subscribed, user_id: user.id, count: count, link: link) + render OntologySubscribeButtonComponent.new(ontology_id: ontology_id, subscribed: subscribed, user_id: user_id, count: count, link: link) end def subscribed_to_ontology?(ontology_acronym, user) From 0c23f66ff3a26a76f49a75815b4a51d05af2d96c Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 12:02:42 +0200 Subject: [PATCH 198/533] add for logged users the account settings dropdown to the topnav --- app/assets/stylesheets/nav_bar.scss | 13 ++-- app/views/layouts/_topnav.html.haml | 93 +++++++++++++++++------------ 2 files changed, 64 insertions(+), 42 deletions(-) diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss index d457f95a1..88ebf0b1c 100644 --- a/app/assets/stylesheets/nav_bar.scss +++ b/app/assets/stylesheets/nav_bar.scss @@ -5,12 +5,11 @@ } .top-nav{ display: flex !important; - justify-content: space-between; background-color: var(--primary-color); align-items: center; height: 62px; padding: 8px 50px; - width: 1280px; + width: 60%; } .nav-responsiveness-container{ display: flex; @@ -57,9 +56,13 @@ opacity: 100%; font-weight: 500; } + +.nav-search-container { + width: 50% ; +} .nav-search-container > input { height: 33px; - width: 228px; + width: 100%; outline: none; opacity: 60%; border: 1px solid white; @@ -94,14 +97,14 @@ background-color: white; color: black; } -.nav-items > a{ +.nav-items .nav-a{ padding: 3px 34px; border: 1px solid white; border-radius: 5px; color: white !important; transition: background-color 0.2s ease-in-out; } -.nav-items > a:hover{ +.nav-items .nav-a:hover{ background-color: rgba(255, 255, 255, 0.1); } diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 3ab3c4d6b..8ce7afe78 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -1,4 +1,4 @@ -.nav-container{data: {controller:"topnav-responsiveness"}} +.nav-container.text-white{data: {controller:"topnav-responsiveness"}} %nav.top-nav .nav-responsiveness-container %a.nav-logo{href: "/"} @@ -13,43 +13,62 @@ - navitems.each do |navItem| %li.nav-ul-li %a{href: navItem[0], class: ("active" if current_page?(navItem[0]))} #{navItem[1]} - - if current_page?('/') - .nav-search-container{style:'visibility: hidden'} - %input - - else - .nav-search-container{'data-controller': "home-search"} - %input.nav-input{:placeholder => "Search in "+portal_name+" ...", :type => "text", :name => "search", 'data-home-search-target': 'input', 'data-action': 'input->home-search#search blur->home-search#blur'} - #home-search-drop-down.nav-search-drop-down{'data-home-search-target': 'dropDown', 'data-action': 'mousedown->home-search#prevent'} - %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} - %p#seached-ontology{'data-home-search-target': 'ontology'} - %div - %img{src: asset_path("loop.svg")}/ - %p Search ontology content - %a.home-search-ontology-content#home-search-ontologies{href: "#", 'data-home-search-target': 'homeSearchOntologies'} - %p#seached-ontologies{'data-home-search-target': 'searchedOntologies'} - %div - %img{src: asset_path("loop.svg")}/ - %p See all ontologies - %a.nav-a{:href => "/login"} Login + %div.d-flex.align-items-center.justify-content-between{style:'min-width: 40%'} + - if current_page?('/') + .nav-search-container{style:'visibility: hidden'} + %input + - else + .nav-search-container{'data-controller': "home-search"} + %input.nav-input{:placeholder => "Search in "+portal_name+" ...", :type => "text", :name => "search", 'data-home-search-target': 'input', 'data-action': 'input->home-search#search blur->home-search#blur'} + #home-search-drop-down.nav-search-drop-down{'data-home-search-target': 'dropDown', 'data-action': 'mousedown->home-search#prevent'} + %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} + %p#seached-ontology{'data-home-search-target': 'ontology'} + %div + %img{src: asset_path("loop.svg")}/ + %p Search ontology content + %a.home-search-ontology-content#home-search-ontologies{href: "#", 'data-home-search-target': 'homeSearchOntologies'} + %p#seached-ontologies{'data-home-search-target': 'searchedOntologies'} + %div + %img{src: asset_path("loop.svg")}/ + %p See all ontologies - = select_tag('language', options_for_select([['EN','en'],['FR','fr']]), id: 'language-select', class: 'nav-language', - data: { controller: "platform-language", action: "change->platform-language#handleLangChanged" }) + - if session[:user].nil? + %a.nav-a{:href => "/login"} Login + - else + = render DropdownButtonComponent.new do |d| + - d.header do + = session[:user].username + - d.with_section(divide: false) do |s| + - s.item do + = link_to(t(:_account_setting), "/account") + - d.with_section do |s| + - s.header do + Recently Viewed + - for ont in session[:ontologies] + - s.item do + = link_to(ont.ontology_name, "/ontologies/#{ont.ontology_acronym}/?p=classes&conceptid=#{CGI.escape(ont.concept)}") + - d.with_section do |s| + - s.item do + = link_to("Logout", logout_path) - = render DropdownButtonComponent.new(css_class:'text-white') do |d| - - d.header do - = link_to("#", id: "supportMenuDropdownLink", class: "nav-link supportMenuDropdownLink", role: "button") do - Support - - d.with_section(divide: false) do |s| - - s.item do - = link_to(t(:submit_feedback), feedback_path(location: encode_param(request.url)), id: "submitFeedbackMenuItem", class: "pop_window") - - d.with_section do |s| - - s.header do - Documentation - - s.item do - = link_to(t(:_help), "#{$WIKI_HELP_PAGE}", target: "_blank") - - s.item do - = link_to(t(:_release_notes), "#{$RELEASE_NOTES}", target: "_blank") - - s.item do - = link_to(t(:_publications), $PUBLICATIONS_URL, target: "_blank") + = select_tag('language', options_for_select([['EN','en'],['FR','fr']]), id: 'language-select', class: 'nav-language', + data: { controller: "platform-language", action: "change->platform-language#handleLangChanged" }) + + = render DropdownButtonComponent.new do |d| + - d.header do + = link_to("#", id: "supportMenuDropdownLink", class: "nav-link top-nav-nav-link supportMenuDropdownLink", role: "button") do + Support + - d.with_section(divide: false) do |s| + - s.item do + = link_to(t(:submit_feedback), feedback_path(location: encode_param(request.url)), id: "submitFeedbackMenuItem", class: "pop_window") + - d.with_section do |s| + - s.header do + Documentation + - s.item do + = link_to(t(:_help), "#{$WIKI_HELP_PAGE}", target: "_blank") + - s.item do + = link_to(t(:_release_notes), "#{$RELEASE_NOTES}", target: "_blank") + - s.item do + = link_to(t(:_publications), $PUBLICATIONS_URL, target: "_blank") From f6a6f37fa83c2512b27ac95e4d0285cce9f6893a Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 2 Jun 2023 12:03:22 +0200 Subject: [PATCH 199/533] Update concepts partial design --- app/assets/images/arrow-down.svg | 3 + app/assets/stylesheets/concepts.scss | 118 ++++++++++++++++- app/components/concept_details_component.rb | 2 +- .../concept_details_component.html.haml | 35 +++--- app/views/concepts/_details.html.haml | 20 +-- app/views/concepts/_show.html.haml | 119 +++++++++--------- .../ontologies/sections/visualize.html.haml | 16 +-- app/views/submissions/_form_content.html.haml | 4 +- db/schema.rb | 10 +- 9 files changed, 223 insertions(+), 104 deletions(-) create mode 100644 app/assets/images/arrow-down.svg diff --git a/app/assets/images/arrow-down.svg b/app/assets/images/arrow-down.svg new file mode 100644 index 000000000..2757508f6 --- /dev/null +++ b/app/assets/images/arrow-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/stylesheets/concepts.scss b/app/assets/stylesheets/concepts.scss index 7f3bc860d..0c8c7a08d 100644 --- a/app/assets/stylesheets/concepts.scss +++ b/app/assets/stylesheets/concepts.scss @@ -18,7 +18,7 @@ } } -.concept_details td:nth-child(1) { +.concept_details td:nth-child(2) { white-space: nowrap; } @@ -31,3 +31,119 @@ div.synonym-change-request { div.synonym-change-request button { padding: 0px; } +.nav-link.active{ + border-radius: 5px; +} +.concepts-general-details{ + width: 870px; + border-radius: 5px; + border: 1px solid #DFDFDF; +} +.concepts-nav-item{ + display: flex; + flex-direction: column; + justify-content: center; +} + +.concepts-nav-item a{ + margin: 12px 24px; + color: #888888 !important; + cursor: pointer; +} +.concepts-tabs-container{ + display: flex; + justify-content: space-between; + align-items: center; +} +.concepts-tabs{ + display: flex; + justify-content: space-between; + width: 589px; +} +.concepts-active-tab a{ + font-weight: 600; + color: var(--primary-color) !important; +} +.concepts-active-tab hr{ + margin: 0; + border: 1px solid var(--primary-color); + border-radius: 5px; + display: block !important; + width: 100%; +} +.concepts-nav-item hr{ + margin: 0; + display: none; +} +#concepts-header-line{ + margin: 0; +} +.concepts-json{ + width: 32px; + height: 32px; + border: 1px solid var(--primary-color); + border-radius: 16px; + display: flex; + align-items: center; + justify-content: center; + position: absolute; + right: 40px; + transition: background-color ease 0.3s; +} +.concepts-json:hover{ + background-color: var(--primary-color); + +} +.concepts-json:hover svg path{ + fill: white; +} +.concepts-content{ + border-collapse: collapse; + width: 100%; + border-spacing: 0; + +} +.concepts-content td{ + padding: 12px 24px; + vertical-align: top; +} +.concepts-content tr:nth-child(odd) { + background-color: #FAFAFA; +} + +.concepts-content td:first-child { + color: #888888; + width: 220px; +} +.concepts-content td:first-child { + color: #888888; + width: 220px; +} +.concepts-content a{ + text-decoration: underline; + color: #888888; +} +.concepts-content div{ + margin-bottom: 5px; +} +.concepts-raw-data{ + margin-top: 20px; + border-radius: 5px; + border: 1px solid #DFDFDF; + +} +.concepts-raw-title{ + display: flex; + justify-content: space-between; + padding: 12px 24px; + color: #888888; + cursor: pointer; + font-size: 16px; + font-weight: 400; +} +.concepts-raw-title div{ + padding: 10px 0px; +} +#details_content{ + margin-top: 15px; +} \ No newline at end of file diff --git a/app/components/concept_details_component.rb b/app/components/concept_details_component.rb index 380427a3c..82d74dd9f 100644 --- a/app/components/concept_details_component.rb +++ b/app/components/concept_details_component.rb @@ -40,7 +40,7 @@ def render_properties(properties_set, ontology_acronym, &block) #{remove_owl_notation(key)} - #{"

    #{ajax_links.join('

    ')}

    ".html_safe} + #{"#{ajax_links.join('

    ')}".html_safe} EOS out += line diff --git a/app/components/concept_details_component/concept_details_component.html.haml b/app/components/concept_details_component/concept_details_component.html.haml index e60407b13..f2741dc8a 100644 --- a/app/components/concept_details_component/concept_details_component.html.haml +++ b/app/components/concept_details_component/concept_details_component.html.haml @@ -1,23 +1,20 @@ - require 'cgi' -%div.py-3.pl-3.hide-if-loading +%div.hide-if-loading %div.card - %table.minimal.concept_details{cellpadding: "0", cellspacing: "0", width: "100%"} - %tr{style:"visibility:hidden"} - %td{style:"width:30%"} - %td + %table.concepts-content = header %div.my-3 - .accordion.card{id: "accordion-#{@id}"} - .card - %div{id: "heading-#{@id}"} - %h2.mb-0.text-right - %button.btn.btn-link{"data-target" => "#collapse-#{@id}", "data-toggle" => "collapse"} - %i.fas.fa-sort - .collapse.show{id: "collapse-#{@id}", "data-parent" => "#accordion-#{@id}"} - %table.minimal.concept_details{cellpadding: "0", cellspacing: "0", width: "100%"} - - top_set, leftover_set, bottom_set = filter_properties(@top_keys, @bottom_keys, @exclude_keys, @concept_properties) - = render_properties(top_set, @acronym) - = render_properties(leftover_set, @acronym) - - sections&.each do |section| - = section - = render_properties(bottom_set, @acronym) \ No newline at end of file + .accordion.concepts-raw-data{id: "accordion-#{@id}"} + %div{id: "heading-#{@id}"} + %h2.mb-0.text-right + .concepts-raw-title{"data-target" => "#collapse-#{@id}", "data-toggle" => "collapse"} + %div Raw data + %img{src: asset_path("arrow-down.svg")} + .collapse{id: "collapse-#{@id}", "data-parent" => "#accordion-#{@id}"} + %table#concepts-content.concepts-content + - top_set, leftover_set, bottom_set = filter_properties(@top_keys, @bottom_keys, @exclude_keys, @concept_properties) + = render_properties(top_set, @acronym) + = render_properties(leftover_set, @acronym) + - sections&.each do |section| + = section + = render_properties(bottom_set, @acronym) diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index 0d55f3130..b122f67e7 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -2,25 +2,25 @@ - schemes_keys = %w[hasTopConcept topConceptOf] - label_xl_set = %w[skos-xl#prefLabel skos-xl#altLabel skos-xl#hiddenLabel] = render ConceptDetailsComponent.new(id:'concept-details', acronym: @ontology.acronym, - properties: @concept.properties, - top_keys: %w[description comment], - bottom_keys: %w[disjoint subclass is_a has_part], - exclude_keys: schemes_keys + label_xl_set + ['inScheme']) do |c| + properties: @concept.properties, + top_keys: %w[description comment], + bottom_keys: %w[disjoint subclass is_a has_part], + exclude_keys: schemes_keys + label_xl_set + ['inScheme']) do |c| - c.header do %tr %td{nowrap: ""} ID %td - %p= @concept.id + = @concept.id %tr %td{nowrap: ""} Preferred Name %td - %p= @concept.prefLabel({:use_html => true}).html_safe + = @concept.prefLabel({:use_html => true}).html_safe - unless @concept.synonym.nil? || @concept.synonym.empty? %tr %td{nowrap: ""} Synonyms %td - for synonym in @concept.synonym - %p= synonym + = synonym %td %div.synonym-change-request = add_synonym_button @@ -29,12 +29,12 @@ %tr %td{nowrap: ""} Definitions %td - %p= @concept.definition.join(" ") + = @concept.definition.join(" ") - if @concept.obsolete? %tr %td{nowrap: ""} Obsolete %td - %p true + true - if skos? - unless @concept.memberOf.nil? || @concept.memberOf.empty? %tr @@ -53,7 +53,7 @@ %tr %td{nowrap: ""} Type %td - %p= @concept.type + = @concept.type - scheme_set = c.properties_set_by_keys(schemes_keys, c.concept_properties) - label_xl_set = c.properties_set_by_keys(label_xl_set, c.concept_properties) diff --git a/app/views/concepts/_show.html.haml b/app/views/concepts/_show.html.haml index 0ac47b83e..bfcc26ed7 100644 --- a/app/views/concepts/_show.html.haml +++ b/app/views/concepts/_show.html.haml @@ -3,66 +3,69 @@ %div{:style => "padding: 100px 0; font-size: larger; font-weight: bold; text-align: center;"} Use the "Jump To" to find a class and display details, visualization, notes, and mappings - else - .cls-info-container - %ul.nav.nav-tabs.tabs - %li#details_top.nav-item - %a.nav-link.active.py-1{:href => "#details" , data:{toggle: 'tab', target: '#details_content'}} Details - - unless skos? - %li#instances_top.nav-item - %a.nav-link.py-1{:href => "#instances" , data:{toggle: 'tab', target: '#instances_content'}} - Instances - ( - %span#instances_count - ) - %li#visualization_top.nav-item - %a.nav-link.py-1{:href => "#visualization", data:{toggle: 'tab', target: '#visualization_content'}} Visualization - %li#notes_top.nav-item - %a.nav-link.py-1{:href => "#notes", data:{toggle: 'tab', target: '#notes_content'}} - Notes - %span#note_count_wrapper - ( - %span#note_count= @notes.length - ) - %li#mappings_top.nav-item - %a.nav-link.py-1{:href => "#mappings", data:{toggle: 'tab', target: '#mappings_content'}} - #{concept_label_to_show(submission: @submission)} Mappings ( - %span#mapping_count= 'loading' + + %ul.nav.tabs + %li#details_top.nav-item + %a.nav-link.active.py-1{:href => "#details" , data:{toggle: 'tab', target: '#details_content'}} Details + - unless skos? + %li#instances_top.nav-item + %a.nav-link.py-1{:href => "#instances" , data:{toggle: 'tab', target: '#instances_content'}} + Instances + ( + %span#instances_count + ) + %li#visualization_top.nav-item + %a.nav-link.py-1{:href => "#visualization", data:{toggle: 'tab', target: '#visualization_content'}} Visualization + %li#notes_top.nav-item + %a.nav-link.py-1{:href => "#notes", data:{toggle: 'tab', target: '#notes_content'}} + Notes + %span#note_count_wrapper + ( + %span#note_count= @notes.length ) + %li#mappings_top.nav-item + %a.nav-link.py-1{:href => "#mappings", data:{toggle: 'tab', target: '#mappings_content'}} + #{concept_label_to_show(submission: @submission)} Mappings ( + %span#mapping_count= 'loading' + ) + + %a.concepts-json{:href => "#json"} + %svg{:fill => "none", :height => "14", :viewbox => "0 0 14 14", :width => "14", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M12.4444 4.66573V3.11173C12.4444 1.39417 11.0514 0 9.33333 0V1.55633C9.74582 1.55652 10.1414 1.72044 10.433 2.01209C10.7247 2.30374 10.8887 2.69925 10.889 3.11173V4.66573C10.889 5.60047 11.3097 6.4295 11.9623 7C11.3097 7.57027 10.889 8.39813 10.889 9.33333V10.8887C10.8888 11.3014 10.7247 11.6971 10.4329 11.9888C10.141 12.2805 9.74528 12.4444 9.33263 12.4444V14C11.0497 14 12.4444 12.6077 12.4444 10.8887V9.33333C12.4445 8.92079 12.6084 8.52518 12.9001 8.23347C13.1918 7.94176 13.5875 7.77782 14 7.7777V6.22137C13.7957 6.2214 13.5934 6.18118 13.4046 6.10301C13.2159 6.02485 13.0444 5.91026 12.8999 5.7658C12.7555 5.62134 12.6409 5.44984 12.5627 5.26108C12.4846 5.07233 12.4443 4.87003 12.4444 4.66573ZM3.11197 4.66667V3.11103C3.11215 2.69839 3.2762 2.30271 3.56805 2.01099C3.8599 1.71927 4.25566 1.5554 4.6683 1.5554V0C2.95027 0 1.55633 1.3923 1.55633 3.11103L1.55563 4.66667C1.55563 4.87094 1.51539 5.07322 1.43721 5.26195C1.35903 5.45067 1.24444 5.62215 1.09998 5.76658C0.955528 5.91102 0.784034 6.02558 0.595298 6.10374C0.406561 6.18189 0.204278 6.2221 0 6.22207V7.7777L0.000700061 7.7784C0.204989 7.7784 0.407277 7.81864 0.596015 7.89682C0.784753 7.97499 0.956245 8.08958 1.1007 8.23403C1.24515 8.37849 1.35974 8.54998 1.43792 8.73872C1.5161 8.92746 1.55633 9.12974 1.55633 9.33403V10.888C1.55633 12.6054 2.94863 14 4.66737 14V12.4437C4.46309 12.4437 4.26081 12.4034 4.07209 12.3252C3.88336 12.2471 3.71189 12.1325 3.56745 11.988C3.42302 11.8436 3.30845 11.6721 3.2303 11.4833C3.15214 11.2946 3.11194 11.0923 3.11197 10.888V9.33403C3.11197 8.39907 2.69103 7.57027 2.03863 7C2.69103 6.4295 3.11197 5.60117 3.11197 4.66667Z", :fill => "#31B404"} - %li#restlink_top.nav-item - %a.nav-link.py-1{:href => "#{@ontology.id}/classes/#{escape(@concept.id)}?display=all", :style => "margin-bottom: 1em; margin-left: 1em;", :target => "_blank"} Access #{concept_label_to_show(submission: @submission)} JSON - - if @enable_ontolobridge - %li#request_term_top.nav-item - %a.nav-link.py-1{:href => "#request_term", data:{toggle: 'tab', target: '#request_term'}} - New Term Requests - - if $PURL_ENABLED - = link_to("#classPermalinkModal", class: "class-permalink nav-link", title: "Get a permanent link to this class", aria: {label: "Get a permanent link to this class"}, data: {toggle: "modal", current_purl: "#{@current_purl}"}) do - %i{class: "fas fa-link", aria: {hidden: "true"}} - #contents.tab-content - #details_content.tab-pane.active.show - = render :partial =>'/concepts/details' - - unless skos? - #instances_content.tab-pane - = render :partial =>'instances/instances' , locals: {id: "class-instances-data-table"} - #visualization_content.tab-pane - = render :partial =>'/concepts/biomixer' - #notes_content.tab-pane - = render :partial =>'/notes/list' - #mappings_content.tab-pane - = render TurboFrameComponent.new(id:'concept_mappings', - src:"/ajax/mappings/get_concept_table?ontologyid=#{@ontology.acronym}&conceptid=#{CGI.escape(@concept.id)}") - - if @enable_ontolobridge - #request_term_content.tab-pane - = render :partial =>'/concepts/request_term' + + - if @enable_ontolobridge + %li#request_term_top.nav-item + %a.nav-link.py-1{:href => "#request_term", data:{toggle: 'tab', target: '#request_term'}} + New Term Requests + - if $PURL_ENABLED + = link_to("#classPermalinkModal", class: "class-permalink nav-link", title: "Get a permanent link to this class", aria: {label: "Get a permanent link to this class"}, data: {toggle: "modal", current_purl: "#{@current_purl}"}) do + %i{class: "fas fa-link", aria: {hidden: "true"}} + #contents.tab-content + #details_content.tab-pane.active.show + = render :partial =>'/concepts/details' + - unless skos? + #instances_content.tab-pane + = render :partial =>'instances/instances' , locals: {id: "class-instances-data-table"} + #visualization_content.tab-pane + = render :partial =>'/concepts/biomixer' + #notes_content.tab-pane + = render :partial =>'/notes/list' + #mappings_content.tab-pane + = render TurboFrameComponent.new(id:'concept_mappings', + src:"/ajax/mappings/get_concept_table?ontologyid=#{@ontology.acronym}&conceptid=#{CGI.escape(@concept.id)}") + - if @enable_ontolobridge + #request_term_content.tab-pane + = render :partial =>'/concepts/request_term' :javascript - jQuery(document).ready(function(){ + jQuery(document).ready(function(){ - jQuery("#classPermalinkModal").on("shown.bs.modal", function (e) { - var currentPurl = jQuery("a.class-permalink").data("current-purl"); - jQuery("#purl_input").val(currentPurl); - }) + jQuery("#classPermalinkModal").on("shown.bs.modal", function (e) { + var currentPurl = jQuery("a.class-permalink").data("current-purl"); + jQuery("#purl_input").val(currentPurl); + }) - jQuery("#purl_input").on("click", function () { - jQuery(this).select(); - }); - }); + jQuery("#purl_input").on("click", function () { + jQuery(this).select(); + }); + }); diff --git a/app/views/ontologies/sections/visualize.html.haml b/app/views/ontologies/sections/visualize.html.haml index 52f9808b7..fcaa805f2 100644 --- a/app/views/ontologies/sections/visualize.html.haml +++ b/app/views/ontologies/sections/visualize.html.haml @@ -7,7 +7,7 @@ %div#bd_content.bd_content.explore{data:{controller: 'container-splitter'}} %div.sidebar.d-flex.flex-column.mr-2.card{data:{'container-splitter-target': 'container'}} = render partial: 'ontologies/concepts_browsers/concepts_browser' - %div#concept_content.d-flex.flex-column.card.p-1.ml-2{data:{'container-splitter-target': 'container'}} + %div#concept_content.d-flex.flex-column.p-1.ml-2{data:{'container-splitter-target': 'container'}} = render partial: 'concepts/show' - form_for(:search, :url => {:controller =>'search',:action=>'fetch_results'},:html=>{:id=>'search_form'}) do |f| @@ -18,14 +18,14 @@ = "

    #{@error}

    " :javascript - $(document).ready(function() { - const ontology_acronym = "#{@ontology.acronym}" - let data = #{raw @instance_details.to_json} || null + $(document).ready(function() { + const ontology_acronym = "#{@ontology.acronym}" + let data = #{raw @instance_details.to_json} || null - if(data && Object.keys(data).length !== 0){ - $.facebox({ajax: `/ontologies/${ontology_acronym}/instances/${encodeURIComponent(data["@id"])}`}) - } - }) + if(data && Object.keys(data).length !== 0){ + $.facebox({ajax: `/ontologies/${ontology_acronym}/instances/${encodeURIComponent(data["@id"])}`}) + } + }) diff --git a/app/views/submissions/_form_content.html.haml b/app/views/submissions/_form_content.html.haml index 5b55e4ec9..0eeaa8d3f 100644 --- a/app/views/submissions/_form_content.html.haml +++ b/app/views/submissions/_form_content.html.haml @@ -2,7 +2,7 @@ = hidden_field object_name, :ontology, value: acronym = hidden_field object_name, :id, value: submissionId %div#general-card.mt-4 - = metadata_section('general', 'General', collapsed: false) do + = metadata_section('general', 'General', collapsed: false) do |c| = attribute_container('format', required: true) do = turbo_frame_tag "#{object_name(acronym, submissionId)}Format_from_group_input" do = render partial: 'submissions/submission_format_form' @@ -143,4 +143,4 @@ = metadata_section('more-metrics-informations', 'More metrics informations', parent_id: "ontology-content-metrics") do - for attr in @metadata.select { |m| m['display'] == 'metrics' } - = form_group_attribute(attr["attribute"]) \ No newline at end of file + = form_group_attribute(attr["attribute"]) diff --git a/db/schema.rb b/db/schema.rb index 51716810e..22dc2b318 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # It's strongly recommended that you check this file into your version control system. ActiveRecord::Schema[7.0].define(version: 2020_09_21_120918) do - create_table "analytics", id: :integer, charset: "utf8mb3", force: :cascade do |t| + create_table "analytics", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| t.string "segment" t.string "action" t.string "bp_slice" @@ -22,13 +22,13 @@ t.datetime "updated_at", precision: nil end - create_table "licenses", charset: "utf8mb3", force: :cascade do |t| + create_table "licenses", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| t.text "encrypted_key" t.datetime "created_at", precision: nil, null: false t.datetime "updated_at", precision: nil, null: false end - create_table "ontologies", charset: "utf8mb3", force: :cascade do |t| + create_table "ontologies", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| t.string "acronym", null: false t.text "new_term_instructions" t.text "custom_message" @@ -37,7 +37,7 @@ t.index ["acronym"], name: "index_ontologies_on_acronym", unique: true end - create_table "timeouts", id: :integer, charset: "utf8mb3", force: :cascade do |t| + create_table "timeouts", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| t.string "path" t.integer "ontology_id" t.text "concept_id" @@ -45,7 +45,7 @@ t.timestamp "created" end - create_table "virtual_appliance_users", id: :integer, charset: "utf8mb3", force: :cascade do |t| + create_table "virtual_appliance_users", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| t.string "user_id" t.datetime "created_at", precision: nil t.datetime "updated_at", precision: nil From 3ee57362a88ba03cb0e4252f94ce4fffdb6bae39 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 2 Jun 2023 12:14:09 +0200 Subject: [PATCH 200/533] Extract json icon to an svg file and use inline_svg gem in concepts page --- Gemfile | 1 + Gemfile.lock | 4 ++++ app/assets/images/json.svg | 3 +++ app/views/concepts/_show.html.haml | 4 +--- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 app/assets/images/json.svg diff --git a/Gemfile b/Gemfile index 9aa696608..af11624c9 100644 --- a/Gemfile +++ b/Gemfile @@ -122,3 +122,4 @@ end gem "net-ftp", "~> 0.2.0", require: false gem "net-http" +gem 'inline_svg' diff --git a/Gemfile.lock b/Gemfile.lock index a6db07def..85862836c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,6 +183,9 @@ GEM importmap-rails (1.1.6) actionpack (>= 6.0.0) railties (>= 6.0.0) + inline_svg (1.9.0) + activesupport (>= 3.0) + nokogiri (>= 1.6) io-console (0.6.0) irb (1.6.4) reline (>= 0.3.0) @@ -469,6 +472,7 @@ DEPENDENCIES i18n iconv importmap-rails + inline_svg jquery-rails jquery-ui-rails jsbundling-rails diff --git a/app/assets/images/json.svg b/app/assets/images/json.svg new file mode 100644 index 000000000..7af4b2fb2 --- /dev/null +++ b/app/assets/images/json.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/views/concepts/_show.html.haml b/app/views/concepts/_show.html.haml index bfcc26ed7..5afdf4c88 100644 --- a/app/views/concepts/_show.html.haml +++ b/app/views/concepts/_show.html.haml @@ -30,9 +30,7 @@ ) %a.concepts-json{:href => "#json"} - %svg{:fill => "none", :height => "14", :viewbox => "0 0 14 14", :width => "14", :xmlns => "http://www.w3.org/2000/svg"} - %path{:d => "M12.4444 4.66573V3.11173C12.4444 1.39417 11.0514 0 9.33333 0V1.55633C9.74582 1.55652 10.1414 1.72044 10.433 2.01209C10.7247 2.30374 10.8887 2.69925 10.889 3.11173V4.66573C10.889 5.60047 11.3097 6.4295 11.9623 7C11.3097 7.57027 10.889 8.39813 10.889 9.33333V10.8887C10.8888 11.3014 10.7247 11.6971 10.4329 11.9888C10.141 12.2805 9.74528 12.4444 9.33263 12.4444V14C11.0497 14 12.4444 12.6077 12.4444 10.8887V9.33333C12.4445 8.92079 12.6084 8.52518 12.9001 8.23347C13.1918 7.94176 13.5875 7.77782 14 7.7777V6.22137C13.7957 6.2214 13.5934 6.18118 13.4046 6.10301C13.2159 6.02485 13.0444 5.91026 12.8999 5.7658C12.7555 5.62134 12.6409 5.44984 12.5627 5.26108C12.4846 5.07233 12.4443 4.87003 12.4444 4.66573ZM3.11197 4.66667V3.11103C3.11215 2.69839 3.2762 2.30271 3.56805 2.01099C3.8599 1.71927 4.25566 1.5554 4.6683 1.5554V0C2.95027 0 1.55633 1.3923 1.55633 3.11103L1.55563 4.66667C1.55563 4.87094 1.51539 5.07322 1.43721 5.26195C1.35903 5.45067 1.24444 5.62215 1.09998 5.76658C0.955528 5.91102 0.784034 6.02558 0.595298 6.10374C0.406561 6.18189 0.204278 6.2221 0 6.22207V7.7777L0.000700061 7.7784C0.204989 7.7784 0.407277 7.81864 0.596015 7.89682C0.784753 7.97499 0.956245 8.08958 1.1007 8.23403C1.24515 8.37849 1.35974 8.54998 1.43792 8.73872C1.5161 8.92746 1.55633 9.12974 1.55633 9.33403V10.888C1.55633 12.6054 2.94863 14 4.66737 14V12.4437C4.46309 12.4437 4.26081 12.4034 4.07209 12.3252C3.88336 12.2471 3.71189 12.1325 3.56745 11.988C3.42302 11.8436 3.30845 11.6721 3.2303 11.4833C3.15214 11.2946 3.11194 11.0923 3.11197 10.888V9.33403C3.11197 8.39907 2.69103 7.57027 2.03863 7C2.69103 6.4295 3.11197 5.60117 3.11197 4.66667Z", :fill => "#31B404"} - + = inline_svg_tag "json.svg" - if @enable_ontolobridge %li#request_term_top.nav-item From 6cfe0828b1d2b4995b4557d07be5ad980dd6d3e7 Mon Sep 17 00:00:00 2001 From: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 2 Jun 2023 14:44:58 +0200 Subject: [PATCH 201/533] Add rounded button to lookbook --- Gemfile.lock | 4 ++-- app/assets/images/json.svg | 3 +++ .../stylesheets/application.css.scss.erb | 2 +- app/assets/stylesheets/components/index.scss | 3 ++- .../components/rounded_button.scss | 17 +++++++++++++++++ app/components/rounded_button_component.rb | 19 +++++++++++++++++++ .../rounded_button_component.html.haml | 2 ++ .../rounded_button_component_preview.rb | 14 ++++++++++++++ 8 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 app/assets/images/json.svg create mode 100644 app/assets/stylesheets/components/rounded_button.scss create mode 100644 app/components/rounded_button_component.rb create mode 100644 app/components/rounded_button_component/rounded_button_component.html.haml create mode 100644 test/components/previews/rounded_button_component_preview.rb diff --git a/Gemfile.lock b/Gemfile.lock index 91139abec..1b6b17dff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -256,11 +256,11 @@ GEM netrc (0.11.0) newrelic_rpm (9.2.2) nio4r (2.5.9) + nokogiri (1.14.2-x86_64-linux) + racc (~> 1.4) nokogiri (1.15.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.14.2-x86_64-linux) - racc (~> 1.4) oj (3.14.3) open_uri_redirections (0.2.1) parallel (1.23.0) diff --git a/app/assets/images/json.svg b/app/assets/images/json.svg new file mode 100644 index 000000000..e7f7e8898 --- /dev/null +++ b/app/assets/images/json.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index 80014e7b0..03a6c9d11 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -49,7 +49,7 @@ @import "login"; @import "components/index"; @import "account"; -@import "ontology_details_header"; + @import "nav_bar"; /* Bootstrap and Font Awesome */ diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 3351092f5..7e1a2f4d6 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -1,3 +1,4 @@ @import 'chips'; @import 'card_message'; -@import 'chip_button'; \ No newline at end of file +@import 'chip_button'; +@import 'rounded_button'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/rounded_button.scss b/app/assets/stylesheets/components/rounded_button.scss new file mode 100644 index 000000000..41e2b7695 --- /dev/null +++ b/app/assets/stylesheets/components/rounded_button.scss @@ -0,0 +1,17 @@ +.rounded-button { + border: 1px solid var(--primary-color); + display: flex; + align-items: center; + justify-content: center; + right: 40px; + transition: background-color ease 0.3s; +} + +.rounded-button:hover { + background-color: var(--primary-color); + +} + +.rounded-button:hover svg path { + fill: white; +} \ No newline at end of file diff --git a/app/components/rounded_button_component.rb b/app/components/rounded_button_component.rb new file mode 100644 index 000000000..65a11dd0a --- /dev/null +++ b/app/components/rounded_button_component.rb @@ -0,0 +1,19 @@ +class RoundedButtonComponent < ViewComponent::Base + def initialize(icon: "json.svg", link: "#", size: "small") + @icon = icon + @link = link + @size = size + end + + def size + case @size + when "small" + ["32px", "1", "16px"] + when "medium" + ["64px", "2", "32px"] + when "big" + ["100px", "2.5", "50px"] + end + end + +end \ No newline at end of file diff --git a/app/components/rounded_button_component/rounded_button_component.html.haml b/app/components/rounded_button_component/rounded_button_component.html.haml new file mode 100644 index 000000000..7eb803aff --- /dev/null +++ b/app/components/rounded_button_component/rounded_button_component.html.haml @@ -0,0 +1,2 @@ +%a.rounded-button{:href => @link, style: "height:"+size[0]+"; width:"+size[0]+"; border-radius:"+size[2]+";"} + = inline_svg_tag @icon, style: "transform: scale("+size[1]+");" diff --git a/test/components/previews/rounded_button_component_preview.rb b/test/components/previews/rounded_button_component_preview.rb new file mode 100644 index 000000000..1ba6584f1 --- /dev/null +++ b/test/components/previews/rounded_button_component_preview.rb @@ -0,0 +1,14 @@ +class RoundedButtonComponentPreview < ViewComponent::Preview + + # @param icon text + # @param link text + # @param size select [small, medium, big] + + def default(icon: "json.svg", link: "text", size: "small") + render(RoundedButtonComponent.new(icon: icon, link: link, size: size)) + end + + + + +end \ No newline at end of file From 9bda461b9b3c10be9e9cdc035436544e1932ac7b Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 2 Jun 2023 14:45:22 +0200 Subject: [PATCH 202/533] update ontology viewer tabs design --- app/assets/stylesheets/components/index.scss | 3 +- .../components/tabs_container.scss | 46 +++++++++++++++++++ app/helpers/ontologies_helper.rb | 7 ++- .../ontology_viewer_tabs_controller.js | 5 +- app/views/layouts/_ontology_viewer.html.haml | 15 +++--- 5 files changed, 62 insertions(+), 14 deletions(-) create mode 100644 app/assets/stylesheets/components/tabs_container.scss diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 3351092f5..1b40ff4b4 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -1,3 +1,4 @@ @import 'chips'; @import 'card_message'; -@import 'chip_button'; \ No newline at end of file +@import 'chip_button'; +@import 'tabs_container'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/tabs_container.scss b/app/assets/stylesheets/components/tabs_container.scss new file mode 100644 index 000000000..109842769 --- /dev/null +++ b/app/assets/stylesheets/components/tabs_container.scss @@ -0,0 +1,46 @@ +.ontology-details-tabs{ + margin: 40px 0; + border-bottom: 1px solid #DFDFDF; +} + +.ontology-details-tabs hr{ + border: 1px solid #f3f3f3; + width: 100%; + margin: 0; +} +.ontology-details-tabs .tab-items{ + display: flex; + margin: 0 50px; +} +.ontology-details-tabs .tab-items div{ + font-size: 16px; + font-weight: 400; + color: #5e5e5e; + margin-right: 50px; + cursor: pointer; + opacity: 60%; + transition: opacity 0.3s ease; + a { + color: #5e5e5e !important; + } +} + +.ontology-details-tabs .tab-items div:hover{ + + opacity: 100%; +} + +.ontology-details-tabs .tab-items div hr{ + display: none; + margin-top: 10px; +} +.ontology-details-tabs .tab-items .active{ + font-weight: 500; + color: black; + opacity: 100%; +} +.ontology-details-tabs .tab-items .active hr{ + display: block; + border: 1px solid var(--primary-color); + opacity: 100%; +} \ No newline at end of file diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 2b9bcdcb8..ff7d4dddc 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -387,10 +387,9 @@ def current_section def link_to_section(section_title) link_to(section_name(section_title) , ontology_path(@ontology.acronym, p: section_title), - id: "ont-#{section_title}-tab", class: "nav-link #{selected_section?(section_title) ? 'active show' : ''}", - data: { action: 'click->ontology-viewer-tabs#selectTab', - toggle: "tab", target: "#ont_#{section_title}_content", 'bp-ont-page': section_title , - 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section_title) }) + id: "ont-#{section_title}-tab", + class: "#{selected_section?(section_title) ? 'active show' : ''}") + end def selected_section?(section_title) diff --git a/app/javascript/controllers/ontology_viewer_tabs_controller.js b/app/javascript/controllers/ontology_viewer_tabs_controller.js index f8cb2a310..642570843 100644 --- a/app/javascript/controllers/ontology_viewer_tabs_controller.js +++ b/app/javascript/controllers/ontology_viewer_tabs_controller.js @@ -31,9 +31,8 @@ export default class extends Controller { } #updateURL(event){ - const page = event.target.getAttribute("data-bp-ont-page"); - const page_name = event.target.getAttribute("data-bp-ont-page-name"); - + const page = event.currentTarget.getAttribute("data-bp-ont-page"); + const page_name = event.currentTarget.getAttribute("data-bp-ont-page-name"); (new HistoryService()).pushState({p: page}, page_name + " | " + jQuery(document).data().bp.ont_viewer.org_site, "?p=" + page); this.#disableLanguageSelector(page) diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index e6f3fb845..eca148dbe 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -48,13 +48,16 @@ %div.row.pb-4{data: {controller: 'ontology-viewer-tabs', 'ontology-viewer-tabs-language-sections-value': ontology_data_sections }} %div.col - sections = sections_to_show - %div.card - %div.card-header + %div + %div.ontology-details-tabs %div{style: "display: flex; justify-content: space-between;"} - %ul.nav.nav-tabs.card-header-tabs{id: "navbar-ontology", role: "tablist"} - - sections.each do |section| - %li.nav-item - = link_to_section(section) + %div.nav.nav-tabs.card-header-tabs.tab-items{id: "navbar-ontology", role: "tablist"} + - sections.each do |section_title| + %div{class: selected_section?(section_title) ? 'active show' : '', data: { action: 'click->ontology-viewer-tabs#selectTab', + toggle: "tab", target: "#ont_#{section_title}_content", 'bp-ont-page': section_title , + 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section_title)}} + = link_to_section(section_title) + %hr %div = language_selector_tag(:language_selector) %div.card-body From e01fecb1d76cb656ef1a4abc8ef602c98c202505 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 7 Jun 2023 12:19:57 +0200 Subject: [PATCH 203/533] wrap concept details links values --- app/components/concept_details_component.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/concept_details_component.rb b/app/components/concept_details_component.rb index 82d74dd9f..86074870e 100644 --- a/app/components/concept_details_component.rb +++ b/app/components/concept_details_component.rb @@ -40,7 +40,7 @@ def render_properties(properties_set, ontology_acronym, &block) #{remove_owl_notation(key)} - #{"#{ajax_links.join('

    ')}".html_safe} + #{"

    #{ajax_links.join('

    ')}".html_safe} EOS out += line From ffb1b2bc33fb63f79961f59c04937e8824ca0789 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 7 Jun 2023 12:20:47 +0200 Subject: [PATCH 204/533] add concept details JSON link --- app/views/concepts/_show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/concepts/_show.html.haml b/app/views/concepts/_show.html.haml index 5afdf4c88..af69f8f2e 100644 --- a/app/views/concepts/_show.html.haml +++ b/app/views/concepts/_show.html.haml @@ -29,9 +29,9 @@ %span#mapping_count= 'loading' ) - %a.concepts-json{:href => "#json"} + %a.concepts-json{:href => "#{@ontology.id}/classes/#{escape(@concept.id)}?display=all&apikey=#{get_apikey}", target: '_blank'} = inline_svg_tag "json.svg" - + - if @enable_ontolobridge %li#request_term_top.nav-item %a.nav-link.py-1{:href => "#request_term", data:{toggle: 'tab', target: '#request_term'}} From f98f5aa6584cf468f36840615eb13769bfbc19d9 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 7 Jun 2023 12:22:51 +0200 Subject: [PATCH 205/533] replace nav_bar css nav-link to top-nav-nav-link to prevent conflicts --- app/assets/stylesheets/nav_bar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss index 88ebf0b1c..2e754b5e0 100644 --- a/app/assets/stylesheets/nav_bar.scss +++ b/app/assets/stylesheets/nav_bar.scss @@ -118,7 +118,7 @@ display: none; } -.nav-link{ +.top-nav-nav-link{ color: white !important; padding: 0 !important; } From cf4817eabb8c10bc350136f713ebbf9ce3a4195c Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 8 Jun 2023 21:57:37 +0200 Subject: [PATCH 206/533] make no clickable chip button a span --- .../chip_button_component/chip_button_component.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/chip_button_component/chip_button_component.html.haml b/app/components/chip_button_component/chip_button_component.html.haml index 36d14bdf9..f735a6833 100644 --- a/app/components/chip_button_component/chip_button_component.html.haml +++ b/app/components/chip_button_component/chip_button_component.html.haml @@ -1,5 +1,5 @@ - if @type == "static" - .chip_button_container + %span.chip_button_container = @text - else %a.chip_button_container_clickable{href: @url}= @text From c3d5cda2e4d71cda377687b8c0aae0229c76edf7 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 8 Jun 2023 22:31:38 +0200 Subject: [PATCH 207/533] add generate component previews rake task --- lib/tasks/generate_component_previews.rake | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 lib/tasks/generate_component_previews.rake diff --git a/lib/tasks/generate_component_previews.rake b/lib/tasks/generate_component_previews.rake new file mode 100644 index 000000000..2bc61c28b --- /dev/null +++ b/lib/tasks/generate_component_previews.rake @@ -0,0 +1,34 @@ +# lib/tasks/generate_component_previews.rake + +namespace :component_previews do + desc "Generate previews for all components" + task generate: :environment do + components_path = Rails.root.join("app/components") + components = Dir.glob("#{components_path}/**/*_component.rb") + + components.each do |component_path| + component_name = File.basename(component_path, "_component.rb") + preview_path = Rails.root.join("test/components/previews/#{component_name}_preview.rb") + + # Skip if the preview already exists + next if File.exist?(preview_path) + + File.open(preview_path, "w") do |file| + file.puts("class #{component_name.camelize}Preview < ViewComponent::Preview") + file.puts(" def default") + file.puts(" # Initialize the component with any necessary data") + file.puts(" component = #{component_name.camelize}Component.new") + + file.puts(" # Add any necessary data or context to the component") + file.puts(" # component.some_data = some_value") + + file.puts(" # Render the component") + file.puts(" render(component)") + file.puts(" end") + file.puts("end") + end + + puts "Generated preview for #{component_name}" + end + end +end From cc301371b95646e43d8d561afde148c11e2da213 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 8 Jun 2023 22:01:44 +0200 Subject: [PATCH 208/533] add language field component --- app/components/language_field_component.rb | 26 +++++++++++++++++++ .../language_field_component.html.haml | 5 ++++ .../language_field_component_preview.rb | 8 ++++++ 3 files changed, 39 insertions(+) create mode 100644 app/components/language_field_component.rb create mode 100644 app/components/language_field_component/language_field_component.html.haml create mode 100644 test/components/previews/language_field_component_preview.rb diff --git a/app/components/language_field_component.rb b/app/components/language_field_component.rb new file mode 100644 index 000000000..6922f855e --- /dev/null +++ b/app/components/language_field_component.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +class LanguageFieldComponent < ViewComponent::Base + + LEXVO_TO_FLAG = { 'http://lexvo.org/id/iso639-3/aar' => 'aa', 'http://lexvo.org/id/iso639-3/abk' => 'ab', + 'http://lexvo.org/id/iso639-3/ave' => 'ae', 'http://lexvo.org/id/iso639-3/afr' => 'af', + 'http://lexvo.org/id/iso639-3/aka' => 'ak', 'http://lexvo.org/id/iso639-3/amh' => 'am', + 'http://lexvo.org/id/iso639-3/arg' => 'an', 'http://lexvo.org/id/iso639-3/ara' => 'ar', 'http://lexvo.org/id/iso639-3/asm' => 'as', 'http://lexvo.org/id/iso639-3/ava' => 'av', 'http://lexvo.org/id/iso639-3/aym' => 'ay', 'http://lexvo.org/id/iso639-3/aze' => 'az', 'http://lexvo.org/id/iso639-3/bak' => 'ba', 'http://lexvo.org/id/iso639-3/bel' => 'be', 'http://lexvo.org/id/iso639-3/bul' => 'bg', 'http://lexvo.org/id/iso639-3/bis' => 'bi', 'http://lexvo.org/id/iso639-3/bam' => 'bm', 'http://lexvo.org/id/iso639-3/ben' => 'bn', 'http://lexvo.org/id/iso639-3/bod' => 'bo', 'http://lexvo.org/id/iso639-3/bre' => 'br', 'http://lexvo.org/id/iso639-3/bos' => 'bs', 'http://lexvo.org/id/iso639-3/cat' => 'ca', 'http://lexvo.org/id/iso639-3/che' => 'ce', 'http://lexvo.org/id/iso639-3/cha' => 'ch', 'http://lexvo.org/id/iso639-3/cos' => 'co', 'http://lexvo.org/id/iso639-3/cre' => 'cr', 'http://lexvo.org/id/iso639-3/ces' => 'cs', 'http://lexvo.org/id/iso639-3/chu' => 'cu', 'http://lexvo.org/id/iso639-3/chv' => 'cv', 'http://lexvo.org/id/iso639-3/cym' => 'cy', 'http://lexvo.org/id/iso639-3/dan' => 'da', 'http://lexvo.org/id/iso639-3/deu' => 'de', 'http://lexvo.org/id/iso639-3/div' => 'dv', 'http://lexvo.org/id/iso639-3/dzo' => 'dz', 'http://lexvo.org/id/iso639-3/ewe' => 'ee', 'http://lexvo.org/id/iso639-3/ell' => 'el', 'http://lexvo.org/id/iso639-3/eng' => 'en', 'http://lexvo.org/id/iso639-3/epo' => 'eo', 'http://lexvo.org/id/iso639-3/spa' => 'es', 'http://lexvo.org/id/iso639-3/est' => 'et', 'http://lexvo.org/id/iso639-3/eus' => 'eu', 'http://lexvo.org/id/iso639-3/fas' => 'fa', 'http://lexvo.org/id/iso639-3/ful' => 'ff', 'http://lexvo.org/id/iso639-3/fin' => 'fi', 'http://lexvo.org/id/iso639-3/fij' => 'fj', 'http://lexvo.org/id/iso639-3/fao' => 'fo', 'http://lexvo.org/id/iso639-3/fra' => 'fr', 'http://lexvo.org/id/iso639-3/fry' => 'fy', 'http://lexvo.org/id/iso639-3/gle' => 'ga', 'http://lexvo.org/id/iso639-3/gla' => 'gd', 'http://lexvo.org/id/iso639-3/glg' => 'gl', 'http://lexvo.org/id/iso639-3/grn' => 'gn', 'http://lexvo.org/id/iso639-3/guj' => 'gu', 'http://lexvo.org/id/iso639-3/glv' => 'gv', 'http://lexvo.org/id/iso639-3/hau' => 'ha', 'http://lexvo.org/id/iso639-3/heb' => 'he', 'http://lexvo.org/id/iso639-3/hin' => 'hi', 'http://lexvo.org/id/iso639-3/hmo' => 'ho', 'http://lexvo.org/id/iso639-3/hrv' => 'hr', 'http://lexvo.org/id/iso639-3/hat' => 'ht', 'http://lexvo.org/id/iso639-3/hun' => 'hu', 'http://lexvo.org/id/iso639-3/hye' => 'hy', 'http://lexvo.org/id/iso639-3/her' => 'hz', 'http://lexvo.org/id/iso639-3/ina' => 'ia', 'http://lexvo.org/id/iso639-3/ind' => 'id', 'http://lexvo.org/id/iso639-3/ile' => 'ie', 'http://lexvo.org/id/iso639-3/ibo' => 'ig', 'http://lexvo.org/id/iso639-3/iii' => 'ii', 'http://lexvo.org/id/iso639-3/ipk' => 'ik', 'http://lexvo.org/id/iso639-3/ido' => 'io', 'http://lexvo.org/id/iso639-3/isl' => 'is', 'http://lexvo.org/id/iso639-3/ita' => 'it', 'http://lexvo.org/id/iso639-3/iku' => 'iu', 'http://lexvo.org/id/iso639-3/jpn' => 'ja', 'http://lexvo.org/id/iso639-3/jav' => 'jv', 'http://lexvo.org/id/iso639-3/kat' => 'ka', 'http://lexvo.org/id/iso639-3/kon' => 'kg', 'http://lexvo.org/id/iso639-3/kik' => 'ki', 'http://lexvo.org/id/iso639-3/kua' => 'kj', 'http://lexvo.org/id/iso639-3/kaz' => 'kk', 'http://lexvo.org/id/iso639-3/kal' => 'kl', 'http://lexvo.org/id/iso639-3/khm' => 'km', 'http://lexvo.org/id/iso639-3/kan' => 'kn', 'http://lexvo.org/id/iso639-3/kor' => 'ko', 'http://lexvo.org/id/iso639-3/kau' => 'kr', 'http://lexvo.org/id/iso639-3/kas' => 'ks', 'http://lexvo.org/id/iso639-3/kur' => 'ku', 'http://lexvo.org/id/iso639-3/kom' => 'kv', 'http://lexvo.org/id/iso639-3/cor' => 'kw', 'http://lexvo.org/id/iso639-3/kir' => 'ky', 'http://lexvo.org/id/iso639-3/lat' => 'la', 'http://lexvo.org/id/iso639-3/ltz' => 'lb', 'http://lexvo.org/id/iso639-3/lug' => 'lg', 'http://lexvo.org/id/iso639-3/lim' => 'li', 'http://lexvo.org/id/iso639-3/lin' => 'ln', 'http://lexvo.org/id/iso639-3/lao' => 'lo', 'http://lexvo.org/id/iso639-3/lit' => 'lt', 'http://lexvo.org/id/iso639-3/lub' => 'lu', 'http://lexvo.org/id/iso639-3/lav' => 'lv', 'http://lexvo.org/id/iso639-3/mlg' => 'mg', 'http://lexvo.org/id/iso639-3/mah' => 'mh', 'http://lexvo.org/id/iso639-3/mri' => 'mi', 'http://lexvo.org/id/iso639-3/mkd' => 'mk', 'http://lexvo.org/id/iso639-3/mal' => 'ml', 'http://lexvo.org/id/iso639-3/mon' => 'mn', 'http://lexvo.org/id/iso639-3/mar' => 'mr', 'http://lexvo.org/id/iso639-3/msa' => 'ms', 'http://lexvo.org/id/iso639-3/mlt' => 'mt', 'http://lexvo.org/id/iso639-3/mya' => 'my', 'http://lexvo.org/id/iso639-3/nau' => 'na', 'http://lexvo.org/id/iso639-3/nob' => 'nb', 'http://lexvo.org/id/iso639-3/nde' => 'nd', 'http://lexvo.org/id/iso639-3/nep' => 'ne', 'http://lexvo.org/id/iso639-3/ndo' => 'ng', 'http://lexvo.org/id/iso639-3/nld' => 'nl', 'http://lexvo.org/id/iso639-3/nno' => 'nn', 'http://lexvo.org/id/iso639-3/nor' => 'no', 'http://lexvo.org/id/iso639-3/nbl' => 'nr', 'http://lexvo.org/id/iso639-3/nav' => 'nv', 'http://lexvo.org/id/iso639-3/nya' => 'ny', 'http://lexvo.org/id/iso639-3/oci' => 'oc', 'http://lexvo.org/id/iso639-3/oji' => 'oj', 'http://lexvo.org/id/iso639-3/orm' => 'om', 'http://lexvo.org/id/iso639-3/ori' => 'or', 'http://lexvo.org/id/iso639-3/oss' => 'os', 'http://lexvo.org/id/iso639-3/pan' => 'pa', 'http://lexvo.org/id/iso639-3/pli' => 'pi', 'http://lexvo.org/id/iso639-3/pol' => 'pl', 'http://lexvo.org/id/iso639-3/pus' => 'ps', 'http://lexvo.org/id/iso639-3/por' => 'pt', 'http://lexvo.org/id/iso639-3/que' => 'qu', 'http://lexvo.org/id/iso639-3/roh' => 'rm', 'http://lexvo.org/id/iso639-3/run' => 'rn', 'http://lexvo.org/id/iso639-3/ron' => 'ro', 'http://lexvo.org/id/iso639-3/rus' => 'ru', 'http://lexvo.org/id/iso639-3/kin' => 'rw', 'http://lexvo.org/id/iso639-3/san' => 'sa', 'http://lexvo.org/id/iso639-3/srd' => 'sc', 'http://lexvo.org/id/iso639-3/snd' => 'sd', 'http://lexvo.org/id/iso639-3/sme' => 'se', 'http://lexvo.org/id/iso639-3/sag' => 'sg', 'http://lexvo.org/id/iso639-3/hbs' => 'sh', 'http://lexvo.org/id/iso639-3/sin' => 'si', 'http://lexvo.org/id/iso639-3/slk' => 'sk', 'http://lexvo.org/id/iso639-3/slv' => 'sl', 'http://lexvo.org/id/iso639-3/smo' => 'sm', 'http://lexvo.org/id/iso639-3/sna' => 'sn', 'http://lexvo.org/id/iso639-3/som' => 'so', 'http://lexvo.org/id/iso639-3/sqi' => 'sq', 'http://lexvo.org/id/iso639-3/srp' => 'sr', 'http://lexvo.org/id/iso639-3/ssw' => 'ss', 'http://lexvo.org/id/iso639-3/sot' => 'st', 'http://lexvo.org/id/iso639-3/sun' => 'su', 'http://lexvo.org/id/iso639-3/swe' => 'sv', 'http://lexvo.org/id/iso639-3/swa' => 'sw', 'http://lexvo.org/id/iso639-3/tam' => 'ta', 'http://lexvo.org/id/iso639-3/tel' => 'te', 'http://lexvo.org/id/iso639-3/tgk' => 'tg', 'http://lexvo.org/id/iso639-3/tha' => 'th', 'http://lexvo.org/id/iso639-3/tir' => 'ti', 'http://lexvo.org/id/iso639-3/tuk' => 'tk', 'http://lexvo.org/id/iso639-3/tgl' => 'tl', 'http://lexvo.org/id/iso639-3/tsn' => 'tn', 'http://lexvo.org/id/iso639-3/ton' => 'to', 'http://lexvo.org/id/iso639-3/tur' => 'tr', 'http://lexvo.org/id/iso639-3/tso' => 'ts', 'http://lexvo.org/id/iso639-3/tat' => 'tt', 'http://lexvo.org/id/iso639-3/twi' => 'tw', 'http://lexvo.org/id/iso639-3/tah' => 'ty', 'http://lexvo.org/id/iso639-3/uig' => 'ug', 'http://lexvo.org/id/iso639-3/ukr' => 'uk', 'http://lexvo.org/id/iso639-3/urd' => 'ur', 'http://lexvo.org/id/iso639-3/uzb' => 'uz', 'http://lexvo.org/id/iso639-3/ven' => 've', 'http://lexvo.org/id/iso639-3/vie' => 'vi', 'http://lexvo.org/id/iso639-3/vol' => 'vo', 'http://lexvo.org/id/iso639-3/wln' => 'wa', 'http://lexvo.org/id/iso639-3/wol' => 'wo', 'http://lexvo.org/id/iso639-3/xho' => 'xh', 'http://lexvo.org/id/iso639-3/yid' => 'yi', 'http://lexvo.org/id/iso639-3/yor' => 'yo', 'http://lexvo.org/id/iso639-3/zha' => 'za', 'http://lexvo.org/id/iso639-3/zho' => 'zh', 'http://lexvo.org/id/iso639-3/zul' => 'zu' } + + + def initialize(value: ) + super + @lang_code = lang_codes_init(value) + end + + def lang_codes_init(lang) + if lang.to_s.eql?("en") || lang.to_s.eql?("eng") || lang.to_s.eql?("http://lexvo.org/id/iso639-3/eng") + lang_codes = "gb" + elsif lang.to_s.start_with?("http://lexvo.org") + lang_codes = LEXVO_TO_FLAG[lang] + else + lang_codes = lang + end + lang_codes + end +end diff --git a/app/components/language_field_component/language_field_component.html.haml b/app/components/language_field_component/language_field_component.html.haml new file mode 100644 index 000000000..a6b431565 --- /dev/null +++ b/app/components/language_field_component/language_field_component.html.haml @@ -0,0 +1,5 @@ +- if @lang_code.length == 2 + %div.f32 + %span.flag{:class => " #{@lang_code}", :style => "margin-right: 0.5em;"} +- else + = render ChipButtonComponent.new(text: @lang_code) \ No newline at end of file diff --git a/test/components/previews/language_field_component_preview.rb b/test/components/previews/language_field_component_preview.rb new file mode 100644 index 000000000..9c2f00ab1 --- /dev/null +++ b/test/components/previews/language_field_component_preview.rb @@ -0,0 +1,8 @@ +class LanguageFieldComponentPreview < ViewComponent::Preview + + # @param value text + def default(value: 'fr') + render LanguageFieldComponent.new(value: value) + end + +end \ No newline at end of file From f98de8f7e4b8194e53b55a2fd6148ce95930274d Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 8 Jun 2023 22:04:08 +0200 Subject: [PATCH 209/533] add link field component --- app/components/link_field_component.rb | 15 +++++++++++++++ .../link_field_component.html.haml | 6 ++++++ .../previews/link_field_component_preview.rb | 8 ++++++++ 3 files changed, 29 insertions(+) create mode 100644 app/components/link_field_component.rb create mode 100644 app/components/link_field_component/link_field_component.html.haml create mode 100644 test/components/previews/link_field_component_preview.rb diff --git a/app/components/link_field_component.rb b/app/components/link_field_component.rb new file mode 100644 index 000000000..8a499f8ad --- /dev/null +++ b/app/components/link_field_component.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class LinkFieldComponent < ViewComponent::Base + + def initialize(value:) + super + @value = value + end + + + def internal_link? + @value.to_s.include?(URI.parse($REST_URL).hostname) || @value.to_s.include?($UI_HOSTNAME) + end + +end diff --git a/app/components/link_field_component/link_field_component.html.haml b/app/components/link_field_component/link_field_component.html.haml new file mode 100644 index 000000000..4e7879a7c --- /dev/null +++ b/app/components/link_field_component/link_field_component.html.haml @@ -0,0 +1,6 @@ +- if internal_link? + = render ChipButtonComponent.new(url: @value.to_s.sub("data.", ""), text: @value.to_s.split("/").last, type: "clickable") +- elsif @value.to_s =~ /\A#{URI::regexp(%w[http https])}\z/ + = render ChipButtonComponent.new(url: @value.to_s, text: @value.to_s, type: "clickable") +- else + = render ChipButtonComponent.new( text: @value.to_s, type: "static") \ No newline at end of file diff --git a/test/components/previews/link_field_component_preview.rb b/test/components/previews/link_field_component_preview.rb new file mode 100644 index 000000000..f364b8e30 --- /dev/null +++ b/test/components/previews/link_field_component_preview.rb @@ -0,0 +1,8 @@ +class LinkFieldComponentPreview < ViewComponent::Preview + + # @param text text + def default(text: "https://agroportal.lirmm.fr/") + render LinkFieldComponent.new(value: text) + end + +end \ No newline at end of file From 97044e8a7bc9508a33b86294036f130b0e81c6b8 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 8 Jun 2023 22:00:59 +0200 Subject: [PATCH 210/533] add date_time field component --- app/components/date_time_field_component.rb | 15 +++++++++++++++ .../previews/date_time_field_component_preview.rb | 9 +++++++++ 2 files changed, 24 insertions(+) create mode 100644 app/components/date_time_field_component.rb create mode 100644 test/components/previews/date_time_field_component_preview.rb diff --git a/app/components/date_time_field_component.rb b/app/components/date_time_field_component.rb new file mode 100644 index 000000000..30ab80e67 --- /dev/null +++ b/app/components/date_time_field_component.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class DateTimeFieldComponent < ViewComponent::Base + + def initialize(value: , format: :monthfull_day_year) + super + @value = value + @format = format + end + + def call + l(Date.parse(@value), format: @format.to_sym) + end + +end diff --git a/test/components/previews/date_time_field_component_preview.rb b/test/components/previews/date_time_field_component_preview.rb new file mode 100644 index 000000000..f23e937a5 --- /dev/null +++ b/test/components/previews/date_time_field_component_preview.rb @@ -0,0 +1,9 @@ +class DateTimeFieldComponentPreview < ViewComponent::Preview + + # @param text text + # @param format select [year_month_day_concise, month_day_year, monthfull_day_year] + def default(text: "2022-10-01", format: 'monthfull_day_year') + render DateTimeFieldComponent.new(value: text, format: format.to_sym) + end + +end \ No newline at end of file From ac87d3b2aa4e55b206d1ef91e5311546175c4af4 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 8 Jun 2023 21:58:47 +0200 Subject: [PATCH 211/533] add license field component --- app/components/license_field_component.rb | 10 ++++++++++ .../license_field_component.html.haml | 8 ++++++++ .../previews/license_field_component_preview.rb | 8 ++++++++ 3 files changed, 26 insertions(+) create mode 100644 app/components/license_field_component.rb create mode 100644 app/components/license_field_component/license_field_component.html.haml create mode 100644 test/components/previews/license_field_component_preview.rb diff --git a/app/components/license_field_component.rb b/app/components/license_field_component.rb new file mode 100644 index 000000000..6baf0f86f --- /dev/null +++ b/app/components/license_field_component.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class LicenseFieldComponent < ViewComponent::Base + + def initialize(value: ) + super + @value = value + end + +end diff --git a/app/components/license_field_component/license_field_component.html.haml b/app/components/license_field_component/license_field_component.html.haml new file mode 100644 index 000000000..2969701a7 --- /dev/null +++ b/app/components/license_field_component/license_field_component.html.haml @@ -0,0 +1,8 @@ +- if @value.to_s.start_with?("http://creativecommons.org/licenses") || @value.to_s.start_with?("https://creativecommons.org/licenses") + %a{:rel => "license", :alt => "Creative Commons License", :href => "#{@value}", :target => "_blank", :style => "border-width:0", :title => "#{@value}"} + %img{:rel => "license", :alt => "Creative Commons License", :title => "#{@value}", :style => "border-width:0", :src => "https://i.creativecommons.org/l/by/4.0/88x31.png"} +- elsif @value.to_s.start_with?("http://opensource.org/licenses") || @value.to_s.start_with?("https://opensource.org/licenses") + %a{:rel => "license", :alt => "Open Source License", :href => "#{@value}", :title => "#{@value}", :target => "_blank", :style => "border-width:0;", :src => "https://opensource.org/files/osi_logo_bold_100X133_90ppi.png"} + %img{:rel => "license", :alt => "Open Source License", :title => "#{@value}", :style => "height: 80px; border-width:0;", :src => "https://opensource.org/files/osi_logo_bold_100X133_90ppi.png"} +- else + %a{:rel => "license", :href => "#{@value}", :target => "_blank"}= @value \ No newline at end of file diff --git a/test/components/previews/license_field_component_preview.rb b/test/components/previews/license_field_component_preview.rb new file mode 100644 index 000000000..8c3f8233b --- /dev/null +++ b/test/components/previews/license_field_component_preview.rb @@ -0,0 +1,8 @@ +class LicenseFieldComponentPreview < ViewComponent::Preview + + # @param value select [ CC-BY IGO 3.0, https://creativecommons.org/licenses/by/4.0/, http://www.gnu.org/licenses/gpl-3.0, https://opensource.org/licenses/MIT, http://www.apache.org/licenses/LICENSE-2.0 ] + def default(value: "https://creativecommons.org/licenses/by/4.0/") + render LicenseFieldComponent.new(value: value) + end + +end \ No newline at end of file From 223203579ddd2179f08672086eb293bf2beb908d Mon Sep 17 00:00:00 2001 From: DJEBABRIA Hiba Date: Mon, 15 May 2023 19:15:34 +0200 Subject: [PATCH 212/533] add text truncate stimulus controller --- app/javascript/controllers/application.js | 3 ++- app/javascript/controllers/index.js | 6 ++++++ .../controllers/text_truncate_controller.js | 21 +++++++++++++++++++ package.json | 3 ++- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 app/javascript/controllers/text_truncate_controller.js diff --git a/app/javascript/controllers/application.js b/app/javascript/controllers/application.js index 258ab85b4..185546806 100644 --- a/app/javascript/controllers/application.js +++ b/app/javascript/controllers/application.js @@ -12,7 +12,8 @@ import Flatpickr from "stimulus-flatpickr" application.register("flatpickr", Flatpickr); import NestedForm from 'stimulus-rails-nested-form' application.register('nested-form', NestedForm) - +import ReadMore from 'stimulus-read-more' +application.register('read-more', ReadMore) export { application } diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index da9148d6b..e2e8ee6f1 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -55,6 +55,12 @@ application.register("simple-tree", SimpleTreeController) import SkosCollectionColorsController from "./skos_collection_colors_controller" application.register("skos-collection-colors", SkosCollectionColorsController) +import TextTruncateController from "./text_truncate_controller" +application.register("text-truncate", TextTruncateController) + +import Ontology_viewer_tabs_controller from "./ontology_viewer_tabs_controller" +application.register("ontology-viewer-tabs", Ontology_viewer_tabs_controller) + import TooltipController from "./tooltip_controller" application.register("tooltip", TooltipController) diff --git a/app/javascript/controllers/text_truncate_controller.js b/app/javascript/controllers/text_truncate_controller.js new file mode 100644 index 000000000..b3c235e83 --- /dev/null +++ b/app/javascript/controllers/text_truncate_controller.js @@ -0,0 +1,21 @@ +import ReadMore from "stimulus-read-more"; + +// Connects to data-controller="text-truncate" +export default class extends ReadMore { + static targets = ['button'] + + connect() { + super.connect() + if (!this.#isTextClamped()) { + this.#hideButton() + } + } + + #isTextClamped() { + return this.contentTarget.scrollHeight > this.contentTarget.clientHeight + } + + #hideButton() { + this.buttonTarget.style.display = 'none' + } +} diff --git a/package.json b/package.json index d112843e7..f36f6676c 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "flatpickr": "^4.6.13", "split.js": "^1.6.5", "stimulus-flatpickr": "^3.0.0-0", - "stimulus-rails-nested-form": "^4.0.0" + "stimulus-rails-nested-form": "^4.0.0", + "stimulus-read-more": "^4.1.0", }, "scripts": { "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds" From 1c628b5b757921e3f67a9dce9606a847360308eb Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 8 Jun 2023 21:57:00 +0200 Subject: [PATCH 213/533] add text area field component --- app/assets/stylesheets/components/index.scss | 1 + .../stylesheets/components/text_area_field.scss | 14 ++++++++++++++ app/components/text_area_field_component.rb | 12 ++++++++++++ .../text_area_field_component.html.haml | 5 +++++ package.json | 2 +- .../previews/text_area_field_component_preview.rb | 13 +++++++++++++ yarn.lock | 5 +++++ 7 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/components/text_area_field.scss create mode 100644 app/components/text_area_field_component.rb create mode 100644 app/components/text_area_field_component/text_area_field_component.html.haml create mode 100644 test/components/previews/text_area_field_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index baf3f26d9..42de33c53 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -3,3 +3,4 @@ @import "notification"; @import 'chip_button'; @import 'rounded_button'; +@import 'text_area_field'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/text_area_field.scss b/app/assets/stylesheets/components/text_area_field.scss new file mode 100644 index 000000000..da0018b8a --- /dev/null +++ b/app/assets/stylesheets/components/text_area_field.scss @@ -0,0 +1,14 @@ +.text-content{ + overflow: hidden; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: var(--read-more-line-clamp, 5); +} + + +.see_more_text { + color: var(--primary-color); + font-size: 15px; + margin-top: 10px; + text-align: end; +} \ No newline at end of file diff --git a/app/components/text_area_field_component.rb b/app/components/text_area_field_component.rb new file mode 100644 index 000000000..f7963afce --- /dev/null +++ b/app/components/text_area_field_component.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class TextAreaFieldComponent < ViewComponent::Base + + def initialize(value: , see_more_text:'See more...' , see_less_text: 'See less...') + super + @value = value + @see_more_text = see_more_text + @see_less_text = see_less_text + end + +end diff --git a/app/components/text_area_field_component/text_area_field_component.html.haml b/app/components/text_area_field_component/text_area_field_component.html.haml new file mode 100644 index 000000000..40226b7e5 --- /dev/null +++ b/app/components/text_area_field_component/text_area_field_component.html.haml @@ -0,0 +1,5 @@ +%div{data:{controller:"text-truncate", 'text-truncate-more-text-value': @see_more_text , 'text-truncate-less-text-value': @see_less_text}} + %p.text-content{'data-text-truncate-target': 'content'} + = @value + %p.see_more_text{data:{'text-truncate-target': 'button', 'action':"click->text-truncate#toggle"}} + = @see_more_text \ No newline at end of file diff --git a/package.json b/package.json index f36f6676c..dbe55880b 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "split.js": "^1.6.5", "stimulus-flatpickr": "^3.0.0-0", "stimulus-rails-nested-form": "^4.0.0", - "stimulus-read-more": "^4.1.0", + "stimulus-read-more": "^4.1.0" }, "scripts": { "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds" diff --git a/test/components/previews/text_area_field_component_preview.rb b/test/components/previews/text_area_field_component_preview.rb new file mode 100644 index 000000000..2d6cfa7b7 --- /dev/null +++ b/test/components/previews/text_area_field_component_preview.rb @@ -0,0 +1,13 @@ +class TextAreaFieldComponentPreview < ViewComponent::Preview + + + # @param value textarea + def default(value: '') + render TextAreaFieldComponent.new(value: value.empty? ? (long_text + long_text) : value ) + end + + private + def long_text + "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum." + end +end \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index b3e75bb55..d1dfe0e17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -178,3 +178,8 @@ stimulus-rails-nested-form@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/stimulus-rails-nested-form/-/stimulus-rails-nested-form-4.1.0.tgz#bfce185cff908170a4eb9973875b72517c3bc83a" integrity sha512-ORqcTsg3sa4PGFEyUkbvcPG56F4K2fx1qJCUQIgngO1GaW5taKcvDkT0HvdTqtQAFe/1lN4CpJAqoSCt+nYF/Q== + +stimulus-read-more@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/stimulus-read-more/-/stimulus-read-more-4.1.0.tgz#f34efb2dcb33fd091936d84c569937bc100506c8" + integrity sha512-SJyCJqZrhDSKpfrepnhStBaxtyv6Jnvr+b84GDg3l+/BzL5HaFLYmc6QkSNCeR6y0x+Zw7lwKuzv+XzyAm1KzQ== From 4e25aa72eb0d3e9367c9e02a8603da6e06a818aa Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 7 Jun 2023 16:33:27 +0200 Subject: [PATCH 214/533] add summary section component --- app/components/summary_section_component.rb | 16 ++++++++++++++++ .../summary_section_component.html.haml | 10 ++++++++++ 2 files changed, 26 insertions(+) create mode 100644 app/components/summary_section_component.rb create mode 100644 app/components/summary_section_component/summary_section_component.html.haml diff --git a/app/components/summary_section_component.rb b/app/components/summary_section_component.rb new file mode 100644 index 000000000..bd292122d --- /dev/null +++ b/app/components/summary_section_component.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class SummarySectionComponent < ViewComponent::Base + + def initialize(title: , link: nil, link_title: nil, show_card: true) + super + @title = title + @link = link + @link_title = link_title + @show_card = show_card + end + + def show_card? + @show_card + end +end diff --git a/app/components/summary_section_component/summary_section_component.html.haml b/app/components/summary_section_component/summary_section_component.html.haml new file mode 100644 index 000000000..61719589d --- /dev/null +++ b/app/components/summary_section_component/summary_section_component.html.haml @@ -0,0 +1,10 @@ +%h2.card_title + %span.mr-2 + = @title + - if @link + %span + = link_to(@link, target: "_blank", "aria-label": @link_title , title: @link_title) do + %i.fas.fa-lg.fa-question-circle{style: "color: var(--primary-color)"} +%hr#section_focused_line_networkRelation/ +%div{class: show_card? ? 'Summary-page-card' : ''} + = content \ No newline at end of file From 6d3a9a44d9bc251ae2c87e0b1ae017117adcd526 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 8 Jun 2023 21:53:55 +0200 Subject: [PATCH 215/533] update summary section component style to fix underline width --- .../stylesheets/components/summary_section.scss | 12 ++++++++++++ .../summary_section_component.html.haml | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/components/summary_section.scss diff --git a/app/assets/stylesheets/components/summary_section.scss b/app/assets/stylesheets/components/summary_section.scss new file mode 100644 index 000000000..599b38ee5 --- /dev/null +++ b/app/assets/stylesheets/components/summary_section.scss @@ -0,0 +1,12 @@ +.card_title { + font-size: 18px; + margin-top: 40px; + margin-bottom: 20px; + + span:nth-child(1){ + text-decoration: underline; + text-underline-offset: 12px; + text-decoration-color: var(--primary-color); + text-decoration-thickness: 1px; + } +} \ No newline at end of file diff --git a/app/components/summary_section_component/summary_section_component.html.haml b/app/components/summary_section_component/summary_section_component.html.haml index 61719589d..b1090e54f 100644 --- a/app/components/summary_section_component/summary_section_component.html.haml +++ b/app/components/summary_section_component/summary_section_component.html.haml @@ -5,6 +5,5 @@ %span = link_to(@link, target: "_blank", "aria-label": @link_title , title: @link_title) do %i.fas.fa-lg.fa-question-circle{style: "color: var(--primary-color)"} -%hr#section_focused_line_networkRelation/ %div{class: show_card? ? 'Summary-page-card' : ''} = content \ No newline at end of file From 3fc82b4067ecc8629b81ad700a04127236481d35 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 9 Jun 2023 00:31:13 +0200 Subject: [PATCH 216/533] add summary section component preview --- app/assets/stylesheets/components/index.scss | 1 + .../components/summary_section.scss | 6 ++ .../component_preview_not_centred.html.erb | 56 +++++++++++++++++++ .../summary_section_component_preview.rb | 14 +++++ 4 files changed, 77 insertions(+) create mode 100644 app/views/layouts/component_preview_not_centred.html.erb create mode 100644 test/components/previews/summary_section_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 42de33c53..a927dcc56 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -3,4 +3,5 @@ @import "notification"; @import 'chip_button'; @import 'rounded_button'; +@import 'summary_section'; @import 'text_area_field'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/summary_section.scss b/app/assets/stylesheets/components/summary_section.scss index 599b38ee5..370da6ae4 100644 --- a/app/assets/stylesheets/components/summary_section.scss +++ b/app/assets/stylesheets/components/summary_section.scss @@ -9,4 +9,10 @@ text-decoration-color: var(--primary-color); text-decoration-thickness: 1px; } +} +.Summary-page-card { + border: 1px solid #dfdfdf; + border-radius: 5px; + padding: 20px 20px; + margin-top: 20px; } \ No newline at end of file diff --git a/app/views/layouts/component_preview_not_centred.html.erb b/app/views/layouts/component_preview_not_centred.html.erb new file mode 100644 index 000000000..b8c527da1 --- /dev/null +++ b/app/views/layouts/component_preview_not_centred.html.erb @@ -0,0 +1,56 @@ + + + Component Preview + + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "vendor" %> + + + + +<%= yield %> +<%= javascript_include_tag "application" %> + + \ No newline at end of file diff --git a/test/components/previews/summary_section_component_preview.rb b/test/components/previews/summary_section_component_preview.rb new file mode 100644 index 000000000..d29593c32 --- /dev/null +++ b/test/components/previews/summary_section_component_preview.rb @@ -0,0 +1,14 @@ +class SummarySectionComponentPreview < ViewComponent::Preview + layout 'component_preview_not_centred' + # @param title text + # @param content textarea + # @param link url + # @param link_title text + # @param show_card toggle + def default(title: 'title' , link: nil, link_title: nil, show_card: true, content: 'here is the content') + render SummarySectionComponent.new(title: title , link: link, link_title: link_title, show_card: show_card) do + content.html_safe + end + end + +end \ No newline at end of file From c5a7023b2a9ad15ea81018c9ba6d7b183daf7df7 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 7 Jun 2023 16:19:13 +0200 Subject: [PATCH 217/533] add dropdown component --- app/assets/images/summary/arrow-down.svg | 3 +++ app/assets/stylesheets/components/dropdown.scss | 17 +++++++++++++++++ app/assets/stylesheets/components/index.scss | 3 ++- app/components/dropdown_container_component.rb | 10 ++++++++++ .../dropdown_container_component.html.haml | 7 +++++++ .../dropdown_container_component_preview.rb | 15 +++++++++++++++ 6 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 app/assets/images/summary/arrow-down.svg create mode 100644 app/assets/stylesheets/components/dropdown.scss create mode 100644 app/components/dropdown_container_component.rb create mode 100644 app/components/dropdown_container_component/dropdown_container_component.html.haml create mode 100644 test/components/previews/dropdown_container_component_preview.rb diff --git a/app/assets/images/summary/arrow-down.svg b/app/assets/images/summary/arrow-down.svg new file mode 100644 index 000000000..b07860eea --- /dev/null +++ b/app/assets/images/summary/arrow-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/stylesheets/components/dropdown.scss b/app/assets/stylesheets/components/dropdown.scss new file mode 100644 index 000000000..d3221cc80 --- /dev/null +++ b/app/assets/stylesheets/components/dropdown.scss @@ -0,0 +1,17 @@ +.dropdown-title-bar { + display: flex; + align-items: center; + font-weight: 550; + justify-content: space-between; + font-size: 16px; + color: #000000; + cursor: pointer; +} + +.dropdown-container { + border: 1px solid #dfdfdf; + border-radius: 5px; + padding: 14px 20px; + margin-bottom: 20px; + margin-top: 20px; +} \ No newline at end of file diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index a927dcc56..662a738c0 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -4,4 +4,5 @@ @import 'chip_button'; @import 'rounded_button'; @import 'summary_section'; -@import 'text_area_field'; \ No newline at end of file +@import 'text_area_field'; +@import 'dropdown'; \ No newline at end of file diff --git a/app/components/dropdown_container_component.rb b/app/components/dropdown_container_component.rb new file mode 100644 index 000000000..c9d0f68bd --- /dev/null +++ b/app/components/dropdown_container_component.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class DropdownContainerComponent < ViewComponent::Base + + def initialize(title:, id:) + super + @title = title + @id = id + end +end diff --git a/app/components/dropdown_container_component/dropdown_container_component.html.haml b/app/components/dropdown_container_component/dropdown_container_component.html.haml new file mode 100644 index 000000000..f612f152b --- /dev/null +++ b/app/components/dropdown_container_component/dropdown_container_component.html.haml @@ -0,0 +1,7 @@ +.dropdown-container + .dropdown-title-bar{"data-toggle" => "collapse", "data-target" => "##{@id}"} + %p.mb-0 + = @title + %img{alt: "", src: asset_path("summary/arrow-down.svg")} + .collapse{id: @id} + = content \ No newline at end of file diff --git a/test/components/previews/dropdown_container_component_preview.rb b/test/components/previews/dropdown_container_component_preview.rb new file mode 100644 index 000000000..90753546c --- /dev/null +++ b/test/components/previews/dropdown_container_component_preview.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class DropdownContainerComponentPreview < ViewComponent::Preview + layout 'component_preview_not_centred' + + # @param title text + # @param content textarea + + def default(title: 'title', content: 'content') + render DropdownContainerComponent.new(id: 'id' , title: title) do + content.html_safe + end + end + +end From 06f7f0c57356fffb1788f0799f6422f9982f449e Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 9 Jun 2023 01:00:52 +0200 Subject: [PATCH 218/533] add field container component to show a label with it's value vertically --- .../components/field_container.scss | 26 +++++++++++++++++++ app/assets/stylesheets/components/index.scss | 3 ++- app/components/field_container_component.rb | 10 +++++++ .../field_container_component.html.haml | 6 +++++ .../field_container_component_preview.rb | 11 ++++++++ 5 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/components/field_container.scss create mode 100644 app/components/field_container_component.rb create mode 100644 app/components/field_container_component/field_container_component.html.haml create mode 100644 test/components/previews/field_container_component_preview.rb diff --git a/app/assets/stylesheets/components/field_container.scss b/app/assets/stylesheets/components/field_container.scss new file mode 100644 index 000000000..98e7cad87 --- /dev/null +++ b/app/assets/stylesheets/components/field_container.scss @@ -0,0 +1,26 @@ +.field-container { + display: flex; + flex-wrap: wrap; + align-items: center; +} + + +.field-description_text, +.field-description_text a { + color: #888888 !important; + font-size: 15px; + margin-top: 10px; + margin-bottom: 0; +} + +.field-description_text { + overflow: hidden; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: var(--read-more-line-clamp, 5); +} + +.field-normal_text { + font-size: 15px; + color: black; +} \ No newline at end of file diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 662a738c0..163a1203a 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -5,4 +5,5 @@ @import 'rounded_button'; @import 'summary_section'; @import 'text_area_field'; -@import 'dropdown'; \ No newline at end of file +@import 'dropdown'; +@import 'field_container'; \ No newline at end of file diff --git a/app/components/field_container_component.rb b/app/components/field_container_component.rb new file mode 100644 index 000000000..4769718ee --- /dev/null +++ b/app/components/field_container_component.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class FieldContainerComponent < ViewComponent::Base + + def initialize(label:, value:) + super + @label = label + @value = value + end +end diff --git a/app/components/field_container_component/field_container_component.html.haml b/app/components/field_container_component/field_container_component.html.haml new file mode 100644 index 000000000..dad407c18 --- /dev/null +++ b/app/components/field_container_component/field_container_component.html.haml @@ -0,0 +1,6 @@ +%div + .field-container + %p.field-description_text + = @label.humanize + %p.field-normal_text + = @value \ No newline at end of file diff --git a/test/components/previews/field_container_component_preview.rb b/test/components/previews/field_container_component_preview.rb new file mode 100644 index 000000000..17f01770a --- /dev/null +++ b/test/components/previews/field_container_component_preview.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class FieldContainerComponentPreview < ViewComponent::Preview + + # @param label text + # @param value text + # + def default(label: 'label' , value: 'value') + render FieldContainerComponent.new(label: label , value: value) + end +end From 53c900278c1f2a1eb29ccf346c8a266a8a94af18 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 9 Jun 2023 01:03:27 +0200 Subject: [PATCH 219/533] make lookbook work in production --- app/helpers/application_helper.rb | 12 ++++++++++++ app/views/layouts/ontology_viewer/_header.html.haml | 2 +- config/environments/appliance.rb | 2 +- config/routes.rb | 4 +--- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index dd37dfaee..e659ee0dc 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -7,6 +7,18 @@ module ApplicationHelper + RESOLVE_NAMESPACE = {:omv => "http://omv.ontoware.org/2005/05/ontology#", :skos => "http://www.w3.org/2004/02/skos/core#", :owl => "http://www.w3.org/2002/07/owl#", + :rdf => "http://www.w3.org/1999/02/22-rdf-syntax-ns#", :rdfs => "http://www.w3.org/2000/01/rdf-schema#", :metadata => "http://data.bioontology.org/metadata/", + :metadata_def => "http://data.bioontology.org/metadata/def/", :dc => "http://purl.org/dc/elements/1.1/", :xsd => "http://www.w3.org/2001/XMLSchema#", + :oboinowl_gen => "http://www.geneontology.org/formats/oboInOwl#", :obo_purl => "http://purl.obolibrary.org/obo/", + :umls => "http://bioportal.bioontology.org/ontologies/umls/", :door => "http://kannel.open.ac.uk/ontology#", :dct => "http://purl.org/dc/terms/", + :void => "http://rdfs.org/ns/void#", :foaf => "http://xmlns.com/foaf/0.1/", :vann => "http://purl.org/vocab/vann/", :adms => "http://www.w3.org/ns/adms#", + :voaf => "http://purl.org/vocommons/voaf#", :dcat => "http://www.w3.org/ns/dcat#", :mod => "http://www.isibang.ac.in/ns/mod#", :prov => "http://www.w3.org/ns/prov#", + :cc => "http://creativecommons.org/ns#", :schema => "http://schema.org/", :doap => "http://usefulinc.com/ns/doap#", :bibo => "http://purl.org/ontology/bibo/", + :wdrs => "http://www.w3.org/2007/05/powder-s#", :cito => "http://purl.org/spar/cito/", :pav => "http://purl.org/pav/", :nkos => "http://w3id.org/nkos/nkostype#", + :oboInOwl => "http://www.geneontology.org/formats/oboInOwl#", :idot => "http://identifiers.org/idot/", :sd => "http://www.w3.org/ns/sparql-service-description#", + :cclicense => "http://creativecommons.org/licenses/"} + def get_apikey unless session[:user].nil? return session[:user].apikey diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index bc5e094da..a77aa452b 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -26,7 +26,7 @@ = link_to(sub.documentation, "aria-label": "Ontology documentation", title: "Ontology documentation", target: "_blank") do %i.fas.fa-lg.fa-book-reader{"aria-hidden": true} - unless sub.publication.nil? - - sub.publication.each do |pub| + - Array(sub.publication).each do |pub| = link_to(pub, "aria-label": "Ontology publications", title: "Ontology publications", target: "_blank") do %i.fas.fa-lg.fa-book{"aria-hidden": true} - if @ontology.admin?(session[:user]) diff --git a/config/environments/appliance.rb b/config/environments/appliance.rb index db8739398..ec5f5e79f 100644 --- a/config/environments/appliance.rb +++ b/config/environments/appliance.rb @@ -87,7 +87,7 @@ # Add custom data attributes to sanitize allowed list config.action_view.sanitized_allowed_attributes = ['id', 'class', 'style', 'data-cls', 'data-ont'] - + config.view_component.show_previews = true # TODO: Fix this? # enable json logging format. Useful for logstash # require 'rackstash' diff --git a/config/routes.rb b/config/routes.rb index 5090016ec..85545167b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -214,8 +214,6 @@ get '/exhibit/:ontology/:id' => 'concepts#exhibit' - if Rails.env.development? - mount Lookbook::Engine, at: "/lookbook" - end + mount Lookbook::Engine, at: "/lookbook" end From 65d4750c871903ed01fdf59c0bbffa995eb52a2a Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Wed, 31 May 2023 15:51:42 +0200 Subject: [PATCH 220/533] Revert "add a pop-up with list of ontologies in group and category admin table" This reverts commit c4b391a9d3e5272703051922bcb9495ac35297c8. --- app/assets/javascripts/bp_admin.js | 10 ++----- app/controllers/ontologies_controller.rb | 10 ------- .../ontologies/_related_ontologies.html.haml | 30 ------------------- config/routes.rb | 1 - 4 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 app/views/ontologies/_related_ontologies.html.haml diff --git a/app/assets/javascripts/bp_admin.js b/app/assets/javascripts/bp_admin.js index 7506ae192..8114c1b50 100644 --- a/app/assets/javascripts/bp_admin.js +++ b/app/assets/javascripts/bp_admin.js @@ -1343,8 +1343,7 @@ function populateGroupRows(data) { ' ' + group['ontologies'].length + ' ', ]; let actions = [ - 'Edit Groups', - 'Edit Ontologies' + 'Edit', ] return [name, description, created, id , nb, actions.join('|')]; }) @@ -1352,10 +1351,6 @@ function populateGroupRows(data) { return allRows; } -function getOntologiesAcronyms(ontologies) { - return ontologies.map(ontology => ontology.substring(ontology.lastIndexOf('/') +1)) -} - function DeleteGroups() { } @@ -1511,8 +1506,7 @@ function populateCategoryRows(data) { ' ' + category['ontologies'].length + ' ', ]; let actions = [ - 'Edit Categories', - 'Edit Ontologies' + 'Edit', ] return [name, description, created, id , parentCategory, nb , actions.join('|')]; }) diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index dcc0e0b28..f37a0e2a3 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -436,11 +436,6 @@ def update end end - def related_ontologies - get_related_ontologies - render partial: 'related_ontologies' - end - def virtual redirect_new_api end @@ -490,9 +485,4 @@ def get_views(ontology) views.sort{ |a,b| a.acronym.downcase <=> b.acronym.downcase } end - def get_related_ontologies - ontologies_acronyms = params[:ontologies].split(',') - @onts = LinkedData::Client::Models::Ontology.all.select { |o| ontologies_acronyms.include?(o.acronym) } - end - end diff --git a/app/views/ontologies/_related_ontologies.html.haml b/app/views/ontologies/_related_ontologies.html.haml deleted file mode 100644 index 8eacf0751..000000000 --- a/app/views/ontologies/_related_ontologies.html.haml +++ /dev/null @@ -1,30 +0,0 @@ -= turbo_frame_tag 'application_modal_content' do - - if @onts.present? - %style - :plain - table { - border-collapse: collapse; - } - th, td { - border: 0px solid black; - padding: 5px; - } - %table - %tr - %th - N° - %th - Acronym - %th - Actions - - nb = 1 - - @onts.each do |o| - %tr - %td - = nb - - nb += 1 - %td - = o.acronym - %td - - else - %p There is no ontologies \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index df8605d49..4862b94cc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -148,7 +148,6 @@ get 'ajax/label_xl', to: "label_xl#show" get '/ajax/biomixer' => 'concepts#biomixer' get '/ajax/fair_score/html' => 'fair_score#details_html' - get '/ajax/ontologies/bygroup/bycategory' => 'ontologies#related_ontologies' get '/ajax/fair_score/json' => 'fair_score#details_json' get '/ajax/:ontology/instances' => 'instances#index_by_ontology' get '/ajax/:ontology/classes/:conceptid/instances' => 'instances#index_by_class', :constraints => { conceptid: /[^\/?]+/ } From 556205e30c36c49a75fd2927a8a1c3178e3f2e0c Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Fri, 9 Jun 2023 10:10:23 +0200 Subject: [PATCH 221/533] add a hide to SelectInputComponent --- app/assets/javascripts/bp_admin.js | 2 +- app/components/select_input_component.rb | 3 ++- .../select_input_component/select_input_component.html.haml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/bp_admin.js b/app/assets/javascripts/bp_admin.js index 8114c1b50..7e29b80be 100644 --- a/app/assets/javascripts/bp_admin.js +++ b/app/assets/javascripts/bp_admin.js @@ -1310,7 +1310,7 @@ function displayGroups(data, group) { "searchable": false, "orderable": false, "title": "Actions", - "width": "250px" + "width": "200px" } ], "autoWidth": false, diff --git a/app/components/select_input_component.rb b/app/components/select_input_component.rb index 872f7f41e..97e8f20b4 100644 --- a/app/components/select_input_component.rb +++ b/app/components/select_input_component.rb @@ -2,13 +2,14 @@ class SelectInputComponent < ViewComponent::Base - def initialize(id:, name:, values:, selected:, multiple: false) + def initialize(id:, name:, values:, selected:, multiple: false, hide: false) super @id = id @name = name @values = values @selected = selected @multiple = multiple + @hide = hide end def options_values diff --git a/app/components/select_input_component/select_input_component.html.haml b/app/components/select_input_component/select_input_component.html.haml index 2a9f7692c..6b7fcaf38 100644 --- a/app/components/select_input_component/select_input_component.html.haml +++ b/app/components/select_input_component/select_input_component.html.haml @@ -1,7 +1,7 @@ %div{:data => { controller: "select-input", 'select-input': {'multiple-value': @multiple.to_s}}} = select_tag(@name, options_values, { multiple: @multiple, class: "form-control", id: "select_#{@id}", data: { action: "select-input#toggleOtherValue", "select-input-target": "selectedValues" } }) - %div.d-flex.mt-1 + %div.d-flex.mt-1{style: "display:#{@hide ? 'none !important;' : 'block;'}"} = text_field_tag("add_#{@id}", nil, :style => "margin-right: 1em;width: 16em;display: none;", :placeholder => "Or provide the value", data: {action: "keydown.enter->select-input#addValue", "select-input-target": "inputValueField"}, class: 'metadataInput form-control form-control-sm') From bee8da3e627a93edd227551bc8cf7e805f1b9028 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Fri, 9 Jun 2023 10:15:32 +0200 Subject: [PATCH 222/533] add a select to update ontologies in the pop-up edit of group in admin table --- app/controllers/admin/groups_controller.rb | 31 ++++++++++++++++++++-- app/views/admin/groups/_form.html.haml | 5 ++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 842982957..04893dcc1 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -21,7 +21,13 @@ def new def edit @group = LinkedData::Client::Models::Group.find_by_acronym(params[:id]).first - + @acronyms = @group.ontologies.map { |url| url.match(/\/([^\/]+)$/)[1] } + @ontologies_group = LinkedData::Client::Models::Ontology.all.map {|o|[o.acronym, o.id] } + @id = "group_ontologies" + @name = "group[ontologies]" + @values = @ontologies_group + @selected = @group.ontologies + @multiple = true respond_to do |format| format.html { render "edit", :layout => false } end @@ -50,6 +56,8 @@ def update start = Time.now begin group = LinkedData::Client::Models::Group.find_by_acronym(params[:id]).first + add_ontologies_to_group(group_params[:ontologies],group) + delete_ontologies_from_group(group_params[:ontologies],group.ontologies,group) group.update_from_params(group_params) group_updated = group.update if response_error?(group_updated) @@ -88,7 +96,7 @@ def unescape_id end def group_params - params.require(:group).permit(:acronym, :name, :description).to_h() + params.require(:group).permit(:acronym, :name, :description, {ontologies:[]}).to_h() end def _groups @@ -104,4 +112,23 @@ def _groups end response end + + def add_ontologies_to_group(ontologies,group) + ontologies.each do |ont| + unless group.ontologies.include?(ont) + ontology = LinkedData::Client::Models::Ontology.find(ont) + ontology.group.push(group.id) + ontology.update + end + end + end + + def delete_ontologies_from_group(new_ontologies,old_ontologies,group) + ontologies = old_ontologies - new_ontologies + ontologies.each do |ont| + ontology = LinkedData::Client::Models::Ontology.find(ont) + ontology.group.delete(group.id) + ontology.update + end + end end diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 628f648ae..46159d75b 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -38,6 +38,11 @@ Created: %td.top = f.text_field :created, readonly: true, class: "form-control" + %tr + %th + Ontologies: + %td.top + = render SelectInputComponent.new(id: @id, name: @name, values: @values , selected: @selected , multiple: @multiple, hide: true) %div.mt-2 = f.submit button_text, class: "btn btn-primary mr-sm-2 group-form-accept" = link_to "Cancel", "javascript:;", class: "btn btn-primary dismiss-dialog" \ No newline at end of file From 7dec8016eeae7d82f6e7034d26aa63334a555b3e Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Fri, 9 Jun 2023 10:20:12 +0200 Subject: [PATCH 223/533] add a select to update ontologies in the pop-up edit of category in admin table --- .../admin/categories_controller.rb | 34 ++++++++++++++++--- app/views/admin/categories/_form.html.haml | 6 ++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb index 44a69eac2..0c2b89ea5 100644 --- a/app/controllers/admin/categories_controller.rb +++ b/app/controllers/admin/categories_controller.rb @@ -20,7 +20,13 @@ def new end def edit - @category = LinkedData::Client::Models::Category.find_by_acronym(params[:id]).first + @category = LinkedData::Client::Models::Category.find_by_acronym(params[:id], include:'name,acronym,created,description,parentCategory,ontologies' ).first + @ontologies_category = LinkedData::Client::Models::Ontology.all.map {|o|[o.acronym, o.id] } + @id = "category_ontologies" + @name = "category[ontologies]" + @values = @ontologies_category + @selected = @category.ontologies + @multiple = true respond_to do |format| format.html { render "edit", :layout => false } @@ -49,10 +55,11 @@ def update response = { errors: '', success: ''} start = Time.now begin - category = LinkedData::Client::Models::Category.find_by_acronym(params[:id]).first + category = LinkedData::Client::Models::Category.find_by_acronym(params[:id], include:'name,acronym,created,description,parentCategory,ontologies' ).first + add_ontologies_to_category(category_params[:ontologies],category) + delete_ontologies_from_category(category_params[:ontologies],category.ontologies,category) category.update_from_params(category_params) category_update = category.update - if response_error?(category_update) response[:errors] = response_errors(category_update) else @@ -89,7 +96,7 @@ def unescape_id end def category_params - params.require(:category).permit(:acronym, :name, :description, :parentCategory).to_h + params.require(:category).permit(:acronym, :name, :description, :parentCategory, {ontologies:[]}).to_h end def _categories @@ -105,4 +112,23 @@ def _categories end response end + + def add_ontologies_to_category(ontologies,hasDomain) + ontologies.each do |ont| + unless hasDomain.ontologies.include?(ont) + ontology = LinkedData::Client::Models::Ontology.find(ont) + ontology.hasDomain.push(hasDomain.id) + ontology.update + end + end + end + + def delete_ontologies_from_category(new_ontologies,old_ontologies,hasDomain) + ontologies = old_ontologies - new_ontologies + ontologies.each do |ont| + ontology = LinkedData::Client::Models::Ontology.find(ont) + ontology.hasDomain.delete(hasDomain.id) + ontology.update + end + end end diff --git a/app/views/admin/categories/_form.html.haml b/app/views/admin/categories/_form.html.haml index 1d72c6362..5f72bbc9d 100644 --- a/app/views/admin/categories/_form.html.haml +++ b/app/views/admin/categories/_form.html.haml @@ -38,6 +38,12 @@ Created: %td.top = f.text_field :created, readonly: true, class: "form-control" + %tr + %th + Ontologies: + %td.top + = render SelectInputComponent.new(id: @id, name: @name, values: @values , selected: @selected , multiple: @multiple, hide: true) + %div.d-flex.mt-1{:style => "display: none;"} %div.mt-2 = f.submit button_text, class: "btn btn-primary mr-sm-2 group-form-accept" = link_to "Cancel", "javascript:;", class: "btn btn-primary dismiss-dialog" \ No newline at end of file From e7de96f9764dcc3224434eccd8827c9cd1928012 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 9 Jun 2023 13:48:03 +0200 Subject: [PATCH 224/533] fix ontology viewer header responsiveness width --- .../components/tabs_container.scss | 19 ++++++++++++++++++- .../stylesheets/ontology_details_header.scss | 9 +++++++++ app/views/layouts/_ontology_viewer.html.haml | 4 ++-- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/components/tabs_container.scss b/app/assets/stylesheets/components/tabs_container.scss index 109842769..7f557baf7 100644 --- a/app/assets/stylesheets/components/tabs_container.scss +++ b/app/assets/stylesheets/components/tabs_container.scss @@ -1,6 +1,13 @@ -.ontology-details-tabs{ +.ontology-details-tabs { margin: 40px 0; border-bottom: 1px solid #DFDFDF; + display: flex; + justify-content: center; + & > div { + display: flex; + justify-content: space-between; + width: 65%; + } } .ontology-details-tabs hr{ @@ -43,4 +50,14 @@ display: block; border: 1px solid var(--primary-color); opacity: 100%; +} + +@media (max-width: 1900px){ + .ontology-details-tabs { + & > div { + width: 100%; + } + } + + } \ No newline at end of file diff --git a/app/assets/stylesheets/ontology_details_header.scss b/app/assets/stylesheets/ontology_details_header.scss index 33f912a30..f0bd0d570 100644 --- a/app/assets/stylesheets/ontology_details_header.scss +++ b/app/assets/stylesheets/ontology_details_header.scss @@ -1,5 +1,6 @@ .ontology-details-header-container{ margin: 40px; + width: 60%; } .ontology-details-path{ @@ -102,3 +103,11 @@ cursor: pointer; transition: background-color ease 0.3s; } + + +@media (max-width: 1900px){ + .ontology-details-header-container{ + width: 92%; + justify-content: space-between; + } +} \ No newline at end of file diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index eca148dbe..d7b38037b 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -42,7 +42,7 @@ = render partial: 'kgcl_dialogs' %div.row.pt-md-3.pb-md-2 - %div.col + %div.d-flex.w-100.justify-content-center = render partial: 'layouts/ontology_viewer/header' %div.row.pb-4{data: {controller: 'ontology-viewer-tabs', 'ontology-viewer-tabs-language-sections-value': ontology_data_sections }} @@ -50,7 +50,7 @@ - sections = sections_to_show %div %div.ontology-details-tabs - %div{style: "display: flex; justify-content: space-between;"} + %div %div.nav.nav-tabs.card-header-tabs.tab-items{id: "navbar-ontology", role: "tablist"} - sections.each do |section_title| %div{class: selected_section?(section_title) ? 'active show' : '', data: { action: 'click->ontology-viewer-tabs#selectTab', From fefd0f11bf7981d0a0f5191492617154500025d0 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Mon, 12 Jun 2023 13:34:47 +0200 Subject: [PATCH 225/533] resolve problem of delete all ontologies, restyle edit in category/group --- app/controllers/admin/categories_controller.rb | 2 +- app/controllers/admin/groups_controller.rb | 2 +- app/views/admin/categories/_form.html.haml | 10 +++++----- app/views/admin/categories/edit.html.haml | 2 +- app/views/admin/groups/_form.html.haml | 10 +++++----- app/views/admin/groups/edit.html.haml | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb index 0c2b89ea5..3d84498b4 100644 --- a/app/controllers/admin/categories_controller.rb +++ b/app/controllers/admin/categories_controller.rb @@ -56,7 +56,7 @@ def update start = Time.now begin category = LinkedData::Client::Models::Category.find_by_acronym(params[:id], include:'name,acronym,created,description,parentCategory,ontologies' ).first - add_ontologies_to_category(category_params[:ontologies],category) + add_ontologies_to_category(category_params[:ontologies],category) if category_params[:ontologies].size > 1 delete_ontologies_from_category(category_params[:ontologies],category.ontologies,category) category.update_from_params(category_params) category_update = category.update diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 04893dcc1..63513acdc 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -56,7 +56,7 @@ def update start = Time.now begin group = LinkedData::Client::Models::Group.find_by_acronym(params[:id]).first - add_ontologies_to_group(group_params[:ontologies],group) + add_ontologies_to_group(group_params[:ontologies],group) if group_params[:ontologies].size > 1 delete_ontologies_from_group(group_params[:ontologies],group.ontologies,group) group.update_from_params(group_params) group_updated = group.update diff --git a/app/views/admin/categories/_form.html.haml b/app/views/admin/categories/_form.html.haml index 5f72bbc9d..20ca8fbd2 100644 --- a/app/views/admin/categories/_form.html.haml +++ b/app/views/admin/categories/_form.html.haml @@ -14,7 +14,7 @@ %col{style: "width: 100%"} %tr %th - Acronym: + Acronym %span.asterik * %td.top - if new_record @@ -23,24 +23,24 @@ = f.text_field :acronym, class: "form-control", readonly: true %tr %th - Name: + Name %span.asterik * %td.top = f.text_field :name, class: "form-control" %tr %th - Description: + Description %td.top = f.text_area :description, class: "form-control" - unless new_record %tr %th - Created: + Created %td.top = f.text_field :created, readonly: true, class: "form-control" %tr %th - Ontologies: + Ontologies %td.top = render SelectInputComponent.new(id: @id, name: @name, values: @values , selected: @selected , multiple: @multiple, hide: true) %div.d-flex.mt-1{:style => "display: none;"} diff --git a/app/views/admin/categories/edit.html.haml b/app/views/admin/categories/edit.html.haml index b3706314d..b203c02ce 100644 --- a/app/views/admin/categories/edit.html.haml +++ b/app/views/admin/categories/edit.html.haml @@ -3,4 +3,4 @@ %div = form_for :category, url: admin_categories_path + "/" + escape(@category.acronym), method: "PATCH", remote: true, data: { collection: "categories"}, html: {class: "admin-collection-form" } do |f| = render partial: "form", locals: {f: f, title_text: "Edit category", - button_text: "Edit category", button_class: "edit-category"} + button_text: "Save", button_class: "edit-category"} diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 46159d75b..1b5af6ecf 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -14,7 +14,7 @@ %col{style: "width: 100%"} %tr %th - Acronym: + Acronym %span.asterik * %td.top - if new_record @@ -23,24 +23,24 @@ = f.text_field :acronym, class: "form-control", readonly: true %tr %th - Name: + Name %span.asterik * %td.top = f.text_field :name, class: "form-control" %tr %th - Description: + Description %td.top = f.text_area :description, class: "form-control" - unless new_record %tr %th - Created: + Created %td.top = f.text_field :created, readonly: true, class: "form-control" %tr %th - Ontologies: + Ontologies %td.top = render SelectInputComponent.new(id: @id, name: @name, values: @values , selected: @selected , multiple: @multiple, hide: true) %div.mt-2 diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml index d51cf7123..7269a374d 100644 --- a/app/views/admin/groups/edit.html.haml +++ b/app/views/admin/groups/edit.html.haml @@ -3,4 +3,4 @@ %div = form_for :group, url: admin_groups_path + "/" + escape(@group.acronym), method: "PATCH", remote: true, data: { collection: "groups"}, html: {class: "admin-collection-form" } do |f| = render partial: "form", locals: {f: f, title_text: "Edit group", - button_text: "Edit group", button_class: "edit-group"} + button_text: "Save", button_class: "edit-group"} From 094fd938db6d262e03fbf74008c33fb4f1a02965 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Wed, 14 Jun 2023 10:48:59 +0200 Subject: [PATCH 226/533] fix bug display of definitions in ANAEETHES ontology --- app/views/concepts/_details.html.haml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index 0d55f3130..c623008a8 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -29,7 +29,11 @@ %tr %td{nowrap: ""} Definitions %td - %p= @concept.definition.join(" ") + - @concept.definition.each do |definition| + - if definition.is_a?(String) + %p= definition + - elsif definition.respond_to?(:uri) && definition.uri + %p= definition.uri - if @concept.obsolete? %tr %td{nowrap: ""} Obsolete From e3c9d49ac15d3aa02f34365564cd2987e512d04e Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Thu, 15 Jun 2023 11:09:30 +0200 Subject: [PATCH 227/533] Refactor code into ontologies_helper --- app/helpers/ontologies_helper.rb | 12 ++++++++++++ app/views/concepts/_details.html.haml | 6 +----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 7a26747b1..41ad0c38a 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -477,6 +477,18 @@ def languages_options(submission = @submission || @submission_latest) options_for_select(submission_lang) end + def dispaly_complex_text(definitions) + html = "" + definitions.each do |definition| + if definition.is_a?(String) + html+= "

    " + definition + "

    " + elsif definition.respond_to?(:uri) && definition.uri + html+= "

    " + definition.uri + "

    " + end + end + return html.html_safe + end + private def submission_languages(submission = @submission) diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index c623008a8..ca7dbb2f0 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -29,11 +29,7 @@ %tr %td{nowrap: ""} Definitions %td - - @concept.definition.each do |definition| - - if definition.is_a?(String) - %p= definition - - elsif definition.respond_to?(:uri) && definition.uri - %p= definition.uri + = dispaly_complex_text(@concept.definition) - if @concept.obsolete? %tr %td{nowrap: ""} Obsolete From 50dec75fa4770adcd3743a4844688e1d578d6dca Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Thu, 15 Jun 2023 18:48:30 +0200 Subject: [PATCH 228/533] Refactor code --- .../admin/categories_controller.rb | 28 +++++-------------- app/controllers/admin/groups_controller.rb | 20 ++----------- .../concerns/submission_updater.rb | 9 ++++++ app/views/admin/categories/_form.html.haml | 2 +- app/views/admin/groups/_form.html.haml | 2 +- 5 files changed, 21 insertions(+), 40 deletions(-) diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb index 3d84498b4..20506efa2 100644 --- a/app/controllers/admin/categories_controller.rb +++ b/app/controllers/admin/categories_controller.rb @@ -1,10 +1,12 @@ class Admin::CategoriesController < ApplicationController + include SubmissionUpdater layout :determine_layout before_action :unescape_id, only: [:edit, :show, :update, :destroy] before_action :authorize_admin CATEGORIES_URL = "#{LinkedData::Client.settings.rest_url}/categories" + ATTRIBUTE_TO_INCLUDE = 'name,acronym,created,description,parentCategory,ontologies' def index response = _categories @@ -21,13 +23,7 @@ def new def edit @category = LinkedData::Client::Models::Category.find_by_acronym(params[:id], include:'name,acronym,created,description,parentCategory,ontologies' ).first - @ontologies_category = LinkedData::Client::Models::Ontology.all.map {|o|[o.acronym, o.id] } - @id = "category_ontologies" - @name = "category[ontologies]" - @values = @ontologies_category - @selected = @category.ontologies - @multiple = true - + @ontologies_category = LinkedData::Client::Models::Ontology.all(include: 'acronym').map {|o|[o.acronym, o.id] } respond_to do |format| format.html { render "edit", :layout => false } end @@ -55,9 +51,9 @@ def update response = { errors: '', success: ''} start = Time.now begin - category = LinkedData::Client::Models::Category.find_by_acronym(params[:id], include:'name,acronym,created,description,parentCategory,ontologies' ).first - add_ontologies_to_category(category_params[:ontologies],category) if category_params[:ontologies].size > 1 - delete_ontologies_from_category(category_params[:ontologies],category.ontologies,category) + category = LinkedData::Client::Models::Category.find_by_acronym(params[:id], include: ATTRIBUTE_TO_INCLUDE ).first + add_ontologies_to_object(category_params[:ontologies],category) if (category_params[:ontologies].size > 0 && category_params[:ontologies].first != '') + delete_ontologies_from_category(category_params[:ontologies],category.ontologies,category) category.update_from_params(category_params) category_update = category.update if response_error?(category_update) @@ -103,7 +99,7 @@ def _categories response = { categories: Hash.new, errors: '', success: '' } start = Time.now begin - response[:categories] = JSON.parse(LinkedData::Client::HTTP.get(CATEGORIES_URL, { include: 'ontologies,acronym,name,created,description,parentCategory' }, raw: true)) + response[:categories] = JSON.parse(LinkedData::Client::HTTP.get(CATEGORIES_URL, { include: ATTRIBUTE_TO_INCLUDE }, raw: true)) response[:success] = "categories successfully retrieved in #{Time.now - start}s" LOG.add :debug, "Categories - retrieved #{response[:categories].length} groups in #{Time.now - start}s" @@ -113,16 +109,6 @@ def _categories response end - def add_ontologies_to_category(ontologies,hasDomain) - ontologies.each do |ont| - unless hasDomain.ontologies.include?(ont) - ontology = LinkedData::Client::Models::Ontology.find(ont) - ontology.hasDomain.push(hasDomain.id) - ontology.update - end - end - end - def delete_ontologies_from_category(new_ontologies,old_ontologies,hasDomain) ontologies = old_ontologies - new_ontologies ontologies.each do |ont| diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 63513acdc..eaa40a8a5 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -1,4 +1,5 @@ class Admin::GroupsController < ApplicationController + include SubmissionUpdater layout :determine_layout before_action :unescape_id, only: [:edit, :show, :update, :destroy] @@ -22,12 +23,7 @@ def new def edit @group = LinkedData::Client::Models::Group.find_by_acronym(params[:id]).first @acronyms = @group.ontologies.map { |url| url.match(/\/([^\/]+)$/)[1] } - @ontologies_group = LinkedData::Client::Models::Ontology.all.map {|o|[o.acronym, o.id] } - @id = "group_ontologies" - @name = "group[ontologies]" - @values = @ontologies_group - @selected = @group.ontologies - @multiple = true + @ontologies_group = LinkedData::Client::Models::Ontology.all(include: 'acronym').map {|o|[o.acronym, o.id] } respond_to do |format| format.html { render "edit", :layout => false } end @@ -56,7 +52,7 @@ def update start = Time.now begin group = LinkedData::Client::Models::Group.find_by_acronym(params[:id]).first - add_ontologies_to_group(group_params[:ontologies],group) if group_params[:ontologies].size > 1 + add_ontologies_to_object(group_params[:ontologies],group) if (group_params[:ontologies].size > 0 && group_params[:ontologies].first != '') delete_ontologies_from_group(group_params[:ontologies],group.ontologies,group) group.update_from_params(group_params) group_updated = group.update @@ -113,16 +109,6 @@ def _groups response end - def add_ontologies_to_group(ontologies,group) - ontologies.each do |ont| - unless group.ontologies.include?(ont) - ontology = LinkedData::Client::Models::Ontology.find(ont) - ontology.group.push(group.id) - ontology.update - end - end - end - def delete_ontologies_from_group(new_ontologies,old_ontologies,group) ontologies = old_ontologies - new_ontologies ontologies.each do |ont| diff --git a/app/controllers/concerns/submission_updater.rb b/app/controllers/concerns/submission_updater.rb index 3b1218fc3..9d481d904 100644 --- a/app/controllers/concerns/submission_updater.rb +++ b/app/controllers/concerns/submission_updater.rb @@ -24,6 +24,15 @@ def update_submission(new_submission_hash) @submission.update(cache_refresh_all: false) end + def add_ontologies_to_object(ontologies,object) + ontologies.each do |ont| + next if object.ontologies.include?(ont) + ontology = LinkedData::Client::Models::Ontology.find(ont) + ontology.group.push(object.id) + ontology.update + end + end + private def update_ontology_summary_only diff --git a/app/views/admin/categories/_form.html.haml b/app/views/admin/categories/_form.html.haml index 20ca8fbd2..f1f365876 100644 --- a/app/views/admin/categories/_form.html.haml +++ b/app/views/admin/categories/_form.html.haml @@ -42,7 +42,7 @@ %th Ontologies %td.top - = render SelectInputComponent.new(id: @id, name: @name, values: @values , selected: @selected , multiple: @multiple, hide: true) + = render SelectInputComponent.new(id: "category_ontologies", name: "category[ontologies]", values: @ontologies_category, selected: @category.ontologies, multiple: true, hide: true) %div.d-flex.mt-1{:style => "display: none;"} %div.mt-2 = f.submit button_text, class: "btn btn-primary mr-sm-2 group-form-accept" diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 1b5af6ecf..046c49cc4 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -42,7 +42,7 @@ %th Ontologies %td.top - = render SelectInputComponent.new(id: @id, name: @name, values: @values , selected: @selected , multiple: @multiple, hide: true) + = render SelectInputComponent.new(id: "group_ontologies", name: "group[ontologies]", values: @ontologies_group , selected: @group.ontologies , multiple: true, hide: true) %div.mt-2 = f.submit button_text, class: "btn btn-primary mr-sm-2 group-form-accept" = link_to "Cancel", "javascript:;", class: "btn btn-primary dismiss-dialog" \ No newline at end of file From 4586043cc427acc62b5fc7131b3f22e15cda950f Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Fri, 16 Jun 2023 00:22:29 +0200 Subject: [PATCH 229/533] Rename hide in select input component --- app/components/select_input_component.rb | 4 ++-- .../select_input_component/select_input_component.html.haml | 2 +- app/views/admin/categories/_form.html.haml | 2 +- app/views/admin/groups/_form.html.haml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/components/select_input_component.rb b/app/components/select_input_component.rb index 97e8f20b4..9bcfe5d1d 100644 --- a/app/components/select_input_component.rb +++ b/app/components/select_input_component.rb @@ -2,14 +2,14 @@ class SelectInputComponent < ViewComponent::Base - def initialize(id:, name:, values:, selected:, multiple: false, hide: false) + def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_values: false) super @id = id @name = name @values = values @selected = selected @multiple = multiple - @hide = hide + @open_to_add_values = open_to_add_values end def options_values diff --git a/app/components/select_input_component/select_input_component.html.haml b/app/components/select_input_component/select_input_component.html.haml index 6b7fcaf38..a46f0ad29 100644 --- a/app/components/select_input_component/select_input_component.html.haml +++ b/app/components/select_input_component/select_input_component.html.haml @@ -1,7 +1,7 @@ %div{:data => { controller: "select-input", 'select-input': {'multiple-value': @multiple.to_s}}} = select_tag(@name, options_values, { multiple: @multiple, class: "form-control", id: "select_#{@id}", data: { action: "select-input#toggleOtherValue", "select-input-target": "selectedValues" } }) - %div.d-flex.mt-1{style: "display:#{@hide ? 'none !important;' : 'block;'}"} + %div.d-flex.mt-1{style: "display:#{@open_to_add_values ? 'none !important;' : 'block;'}"} = text_field_tag("add_#{@id}", nil, :style => "margin-right: 1em;width: 16em;display: none;", :placeholder => "Or provide the value", data: {action: "keydown.enter->select-input#addValue", "select-input-target": "inputValueField"}, class: 'metadataInput form-control form-control-sm') diff --git a/app/views/admin/categories/_form.html.haml b/app/views/admin/categories/_form.html.haml index f1f365876..34bd8e82a 100644 --- a/app/views/admin/categories/_form.html.haml +++ b/app/views/admin/categories/_form.html.haml @@ -42,7 +42,7 @@ %th Ontologies %td.top - = render SelectInputComponent.new(id: "category_ontologies", name: "category[ontologies]", values: @ontologies_category, selected: @category.ontologies, multiple: true, hide: true) + = render SelectInputComponent.new(id: "category_ontologies", name: "category[ontologies]", values: @ontologies_category, selected: @category.ontologies, multiple: true, open_to_add_values: true) %div.d-flex.mt-1{:style => "display: none;"} %div.mt-2 = f.submit button_text, class: "btn btn-primary mr-sm-2 group-form-accept" diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 046c49cc4..ce5c95827 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -42,7 +42,7 @@ %th Ontologies %td.top - = render SelectInputComponent.new(id: "group_ontologies", name: "group[ontologies]", values: @ontologies_group , selected: @group.ontologies , multiple: true, hide: true) + = render SelectInputComponent.new(id: "group_ontologies", name: "group[ontologies]", values: @ontologies_group , selected: @group.ontologies , multiple: true, open_to_add_values: true) %div.mt-2 = f.submit button_text, class: "btn btn-primary mr-sm-2 group-form-accept" = link_to "Cancel", "javascript:;", class: "btn btn-primary dismiss-dialog" \ No newline at end of file From 1edfd79d44669cbb5c54c36cb2687fa824ad7068 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Fri, 16 Jun 2023 00:22:59 +0200 Subject: [PATCH 230/533] refactor code and fix bug --- .../admin/categories_controller.rb | 11 +---------- app/controllers/admin/groups_controller.rb | 11 +---------- .../concerns/submission_updater.rb | 19 ++++++++++++++++++- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb index 20506efa2..df6fd128c 100644 --- a/app/controllers/admin/categories_controller.rb +++ b/app/controllers/admin/categories_controller.rb @@ -53,7 +53,7 @@ def update begin category = LinkedData::Client::Models::Category.find_by_acronym(params[:id], include: ATTRIBUTE_TO_INCLUDE ).first add_ontologies_to_object(category_params[:ontologies],category) if (category_params[:ontologies].size > 0 && category_params[:ontologies].first != '') - delete_ontologies_from_category(category_params[:ontologies],category.ontologies,category) + delete_ontologies_from_object(category_params[:ontologies],category.ontologies,category) category.update_from_params(category_params) category_update = category.update if response_error?(category_update) @@ -108,13 +108,4 @@ def _categories end response end - - def delete_ontologies_from_category(new_ontologies,old_ontologies,hasDomain) - ontologies = old_ontologies - new_ontologies - ontologies.each do |ont| - ontology = LinkedData::Client::Models::Ontology.find(ont) - ontology.hasDomain.delete(hasDomain.id) - ontology.update - end - end end diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index eaa40a8a5..17bc12511 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -53,7 +53,7 @@ def update begin group = LinkedData::Client::Models::Group.find_by_acronym(params[:id]).first add_ontologies_to_object(group_params[:ontologies],group) if (group_params[:ontologies].size > 0 && group_params[:ontologies].first != '') - delete_ontologies_from_group(group_params[:ontologies],group.ontologies,group) + delete_ontologies_from_object(group_params[:ontologies],group.ontologies,group) group.update_from_params(group_params) group_updated = group.update if response_error?(group_updated) @@ -108,13 +108,4 @@ def _groups end response end - - def delete_ontologies_from_group(new_ontologies,old_ontologies,group) - ontologies = old_ontologies - new_ontologies - ontologies.each do |ont| - ontology = LinkedData::Client::Models::Ontology.find(ont) - ontology.group.delete(group.id) - ontology.update - end - end end diff --git a/app/controllers/concerns/submission_updater.rb b/app/controllers/concerns/submission_updater.rb index 9d481d904..5967e23d2 100644 --- a/app/controllers/concerns/submission_updater.rb +++ b/app/controllers/concerns/submission_updater.rb @@ -28,11 +28,28 @@ def add_ontologies_to_object(ontologies,object) ontologies.each do |ont| next if object.ontologies.include?(ont) ontology = LinkedData::Client::Models::Ontology.find(ont) - ontology.group.push(object.id) + if object.type.match(/\/([^\/]+)$/)[1] == 'Group' + ontology.group.push(object.id) + else + ontology.hasDomain.push(object.id) + end ontology.update end end + def delete_ontologies_from_object(new_ontologies,old_ontologies,object) + ontologies = old_ontologies - new_ontologies + ontologies.each do |ont| + ontology = LinkedData::Client::Models::Ontology.find(ont) + if object.type.match(/\/([^\/]+)$/)[1] == 'Group' + ontology.group.delete(object.id) + else + ontology.hasDomain.delete(object.id) + end + ontology.update + end + end + private def update_ontology_summary_only From 301f7e6f9b1c9935a530fbfb820a4f00e5d6ff34 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Fri, 16 Jun 2023 12:55:35 +0200 Subject: [PATCH 231/533] fix problem in alphabetical sorting in the display of collections --- app/views/concepts/_list.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/concepts/_list.html.haml b/app/views/concepts/_list.html.haml index 83a4a27d3..6b67d002f 100644 --- a/app/views/concepts/_list.html.haml +++ b/app/views/concepts/_list.html.haml @@ -3,7 +3,7 @@ next_url: concept_list_url(@page.nextPage, request_collection_id, @ontology.acronym), current_page: @page.page, next_page: @page.nextPage, auto_click: @auto_click) do |c| - - concepts = c.collection.sort_by{|concept| [concept.prefLabel || concept.id]} + - concepts = c.collection.sort_by{|concept| [concept.prefLabel.capitalize || concept.id]} - if concepts && !concepts.empty? = raw tree_link_to_concept(child: concepts.shift, ontology_acronym: @ontology.acronym, active_style: c.auto_click? ? 'active' : '') - concepts.each do |concept| From b6b6e3f32ca709d24f3f48ed2cb4b72b6a12b7c5 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 19 Jun 2023 11:24:27 +0200 Subject: [PATCH 232/533] fix alert message component to show the content if used --- app/components/alert_message_component.rb | 2 +- .../alert_message_component/alert_message_component.html.haml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/components/alert_message_component.rb b/app/components/alert_message_component.rb index 1ef3b185c..09ece182b 100644 --- a/app/components/alert_message_component.rb +++ b/app/components/alert_message_component.rb @@ -2,7 +2,7 @@ class AlertMessageComponent < ViewComponent::Base include Turbo::FramesHelper - def initialize(id: '', message: '', type: 'info', closeable: true) + def initialize(id: '', message: nil, type: 'info', closeable: true) @id = id @message = message @type = "alert-#{type}" diff --git a/app/components/alert_message_component/alert_message_component.html.haml b/app/components/alert_message_component/alert_message_component.html.haml index 107ab14ac..e23cec627 100644 --- a/app/components/alert_message_component/alert_message_component.html.haml +++ b/app/components/alert_message_component/alert_message_component.html.haml @@ -1,5 +1,6 @@ .alert.alert-dismissible.fade.show{:role => "alert", class: "#{@type}", style: "text-align: left"} - = @message + = @message || content + - if @closeable %button.close{"aria-label": "Close", "data-dismiss": "alert", type: "button", style: "background: transparent"} From 806dd0457078626df929d604a24c08cd3b71671a Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 19 Jun 2023 11:25:03 +0200 Subject: [PATCH 233/533] add option to the select input to hide the add another value intput --- app/components/select_input_component.rb | 3 ++- .../select_input_component/select_input_component.html.haml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/components/select_input_component.rb b/app/components/select_input_component.rb index 872f7f41e..9bcfe5d1d 100644 --- a/app/components/select_input_component.rb +++ b/app/components/select_input_component.rb @@ -2,13 +2,14 @@ class SelectInputComponent < ViewComponent::Base - def initialize(id:, name:, values:, selected:, multiple: false) + def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_values: false) super @id = id @name = name @values = values @selected = selected @multiple = multiple + @open_to_add_values = open_to_add_values end def options_values diff --git a/app/components/select_input_component/select_input_component.html.haml b/app/components/select_input_component/select_input_component.html.haml index 2a9f7692c..a0eb6e0ff 100644 --- a/app/components/select_input_component/select_input_component.html.haml +++ b/app/components/select_input_component/select_input_component.html.haml @@ -1,7 +1,7 @@ %div{:data => { controller: "select-input", 'select-input': {'multiple-value': @multiple.to_s}}} = select_tag(@name, options_values, { multiple: @multiple, class: "form-control", id: "select_#{@id}", data: { action: "select-input#toggleOtherValue", "select-input-target": "selectedValues" } }) - %div.d-flex.mt-1 + %div.d-flex.mt-1{style: "display:#{@open_to_add_values ? 'block;': 'none !important;'}"} = text_field_tag("add_#{@id}", nil, :style => "margin-right: 1em;width: 16em;display: none;", :placeholder => "Or provide the value", data: {action: "keydown.enter->select-input#addValue", "select-input-target": "inputValueField"}, class: 'metadataInput form-control form-control-sm') From ea5188c3ed3cd4c6262271d8657cd865705bf483 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 19 Jun 2023 14:48:33 +0200 Subject: [PATCH 234/533] add agents controller, routes and views --- app/controllers/agents_controller.rb | 128 +++++++++++++++++++++++++ app/helpers/agent_helper.rb | 28 ++++++ app/views/agents/_form.html.haml | 81 ++++++++++++++++ app/views/agents/_show_line.html.haml | 14 +++ app/views/agents/_table_list.html.haml | 14 +++ app/views/agents/edit.html.haml | 3 + app/views/agents/index.html.haml | 9 ++ app/views/agents/new.html.haml | 3 + config/routes.rb | 3 +- 9 files changed, 282 insertions(+), 1 deletion(-) create mode 100644 app/controllers/agents_controller.rb create mode 100644 app/helpers/agent_helper.rb create mode 100644 app/views/agents/_form.html.haml create mode 100644 app/views/agents/_show_line.html.haml create mode 100644 app/views/agents/_table_list.html.haml create mode 100644 app/views/agents/edit.html.haml create mode 100644 app/views/agents/index.html.haml create mode 100644 app/views/agents/new.html.haml diff --git a/app/controllers/agents_controller.rb b/app/controllers/agents_controller.rb new file mode 100644 index 000000000..89b924263 --- /dev/null +++ b/app/controllers/agents_controller.rb @@ -0,0 +1,128 @@ +class AgentsController < ApplicationController + include TurboHelper + before_action :authorize_and_redirect, :only => [:edit, :update, :create, :new] + + def index + @agents = LinkedData::Client::Models::Agent.all + end + + def new + @agent = LinkedData::Client::Models::Agent.new + @agent.creator = session[:user].id + @agent.agentType = 'person' + end + + def create + new_agent = save_agent(agent_params) + if new_agent.errors + render_turbo_stream alert_error { JSON.pretty_generate(response_errors(new_agent)) } + else + success_message = 'New Agent added successfully' + render_turbo_stream(alert_success { success_message }, + prepend('agents_table_content', partial: 'agents/show_line', locals: { agent: new_agent })) + end + end + + def edit + @agent = LinkedData::Client::Models::Agent.find("#{REST_URI}/Agents/#{params[:id]}") + end + + def update + agent_update, agent = update_agent(params[:id].split('/').last, agent_params) + binding.pry + if response_error?(agent_update) + render_turbo_stream(alert_error { JSON.pretty_generate(response_errors(agent_update)) }) + else + success_message = 'Agent successfully updated' + render_turbo_stream(alert_success { success_message }, + replace(agent.id.split('/').last, partial: 'agents/show_line', locals: { agent: agent })) + end + end + + def destroy + error = nil + @agent = LinkedData::Client::Models::Agent.find("#{REST_URI}/Agents/#{params[:id]}") + success_text = '' + + if @agent.nil? + success_text = "Agent #{params[:id]} already deleted" + else + error_response = @agent.delete + + if response_error?(error_response) + error = response_errors(error_response) + else + success_text = "Agent #{params[:id]} deleted successfully" + end + end + + respond_to do |format| + format.turbo_stream do + if error.nil? + render turbo_stream: [ + alert(type: 'success') { success_text }, + turbo_stream.remove(params[:id]) + ] + + else + render alert(type: 'danger') { error } + end + end + format.html { render json: { success: success_text, error: error } } + end + + end + + private + + def save_agent(params) + agent = LinkedData::Client::Models::Agent.new(values: params) + agent.creator = session[:user].id + agent.save + end + + def update_agent(id = params[:id], params) + agent = LinkedData::Client::Models::Agent.find("#{REST_URI}/Agents/#{id}") + + affiliations = params.delete(:affiliations) + params[:affiliations] = [] + params[:creator] = session[:user].id if (agent.creator.nil? || agent.creator.empty?) && (params[:creator]|| '').empty? + + + Array(affiliations).each do |aff| + if aff[:id] + id = aff.delete :id + res, aff = update_agent(id.split('/').last, aff) + else + aff = save_agent(aff) + end + params[:affiliations] << {'id' => aff.id}.merge(aff.to_hash.stringify_keys) + end + + [agent.update(values: params) , agent.update_from_params(params)] + end + + def agent_params + p = params.permit(:agentType, :name, :acronym, :homepage, + :creator, + { identifiers: [:notation, :schemaAgency, :creator] }, + { affiliations: [:id, :agentType, :name, :homepage, :acronym,:creator, { identifiers: [:notation, :schemaAgency, :creator] }] } + ) + p = p.to_h + p.transform_values do |v| + if v.is_a? Hash + v.values.reject(&:empty?) + elsif v.is_a? Array + v.reject(&:empty?) + else + v + end + end + p[:identifiers] = (p[:identifiers] || {}).values + p[:affiliations] = (p[:affiliations] || {}).values + p[:affiliations].each do |affiliation| + affiliation[:identifiers] = (affiliation[:identifiers] || {}).values + end + p + end +end diff --git a/app/helpers/agent_helper.rb b/app/helpers/agent_helper.rb new file mode 100644 index 000000000..31820b499 --- /dev/null +++ b/app/helpers/agent_helper.rb @@ -0,0 +1,28 @@ +module AgentHelper + + + + def affiliation?(agent) + agent.agentType.eql?('organization') + end + + + def display_identifiers(identifiers) + Array(identifiers).map {|i| "#{i["schemaAgency"]} / #{i["notation"]}"}.join(', ') + end + + def agent_field_name(name, name_prefix='') + name_prefix.empty? ? name : "#{name_prefix}[#{name}]" + end + + def agent_identifier_name(index, name, name_prefix) + agent_field_name("[identifiers][#{index}][#{name}]", name_prefix) + end + + def new_affiliation_obj + a = LinkedData::Client::Models::Agent.new + a.agentType = 'organization' + a.creator = session[:user].id + a + end +end diff --git a/app/views/agents/_form.html.haml b/app/views/agents/_form.html.haml new file mode 100644 index 000000000..4691cf691 --- /dev/null +++ b/app/views/agents/_form.html.haml @@ -0,0 +1,81 @@ += render_alerts_container +%table.form.w-100 + %colgroup + %col + %col{style: "width: 100%"} + - if agent.id + = hidden_field_tag agent_field_name(:id, name_prefix), agent.id + - if affiliation?(agent) + = hidden_field_tag agent_field_name(:agentType, name_prefix), agent.agentType + - else + %tr + %th + Type + %span.asterik * + %td.top + %div.d-flex + %div.custom-control.custom-radio.mx-1 + = radio_button_tag agent_field_name(:agentType, name_prefix), :person, agent.agentType.eql?('person'), class: 'custom-control-input' + = label_tag :agentType_person, "Person", class: 'custom-control-label' + %div.custom-control.custom-radio.mx-1 + = radio_button_tag agent_field_name(:agentType, name_prefix), :organization,!agent.agentType.eql?('person'), class: 'custom-control-input' + = label_tag :agentType_organization, "Organization", class: 'custom-control-label' + %tr + %th + Name + %span.asterik * + %td.top + = text_field_tag agent_field_name(:name, name_prefix), agent.name, class: "form-control" + %tr + %th + Acronym + %span.asterik + %td.top + = text_field_tag agent_field_name(:acronym, name_prefix), agent.acronym,class: "form-control" + %tr + %th + Homepage + %td.top + = url_field_tag agent_field_name(:homepage, name_prefix), agent.homepage, class: "form-control" + %tr.d-none + %th + Creator + %td.top + = text_field_tag agent_field_name(:creator, name_prefix), agent.creator, class: "form-control" + %tr + %th + Identifiers + %td.top + %div + = render NestedFormInputsComponent.new do |c| + - c.template do + %div.d-flex{id: 'NEW_RECORD'} + = hidden_field_tag agent_identifier_name('NEW_RECORD' , :creator, name_prefix), session[:user].id + = text_field_tag agent_identifier_name('NEW_RECORD' , :notation, name_prefix), '', class: "form-control" + - values = %w[ORCID ROR ISNI GRID] + = render SelectInputComponent.new(id: "agent_identifiers_schemaAgency_NEW_RECORD", name: agent_identifier_name('NEW_RECORD', :schemaAgency, name_prefix), values: values, selected: 'ORCID') + + - Array(agent.identifiers).each_with_index do |identifier, i| + - c.row do + %div.d-flex{id: identifier.id} + = hidden_field_tag agent_identifier_name(i.to_s.upcase, :creator, name_prefix), session[:user].id + = text_field_tag agent_identifier_name(i.to_s.upcase, :notation, name_prefix), identifier.notation, class: "form-control" + - values = %w[ORCID ROR ISNI GRID] + = render SelectInputComponent.new(id: "#{name_prefix}_identifiers_schemaAgency_#{i.to_s.upcase}", name: agent_identifier_name(i.to_s.upcase, :schemaAgency, name_prefix), values: values, selected: identifier.schemaAgency) + - if new_agent + %tr + %th + Affiliations + %td.top + %div + = render NestedFormInputsComponent.new do |c| + - c.template do + %div.d-flex{id: 'NEW_RECORD'} + = render partial: 'agents/form', locals: {agent: new_affiliation_obj, name_prefix: "[affiliations][NEW_RECORD]", new_agent: false} + - Array(agent.affiliations).each_with_index do |affiliation, i| + - c.row do + %div.d-flex{id: affiliation.id} + = render partial: 'agents/form', locals: {agent: affiliation, name_prefix: "[affiliations][#{i}]", new_agent: false} +- if new_agent + %div.mt-2 + = submit_tag 'Save', class: "btn btn-primary mr-sm-2 group-form-accept" \ No newline at end of file diff --git a/app/views/agents/_show_line.html.haml b/app/views/agents/_show_line.html.haml new file mode 100644 index 000000000..7fbeeab08 --- /dev/null +++ b/app/views/agents/_show_line.html.haml @@ -0,0 +1,14 @@ +%tr.human{:id => (agent.id || '').split('/').last} + %td + = agent.name + %td + = display_identifiers(agent.identifiers) + %td + = agent.affiliations.map{|i| "#{i["name"]} ( #{display_identifiers(i["identifiers"])} )"}.join(', ') + %td + = agent.agentType + %td{:class => 'delete_mappings_column'} + - if agent.id && !agent.id.empty? && session[:user] && session[:user].admin? + %div.d-flex + = link_to_modal("Edit", edit_agent_path(agent.id.split('/').last), class: "btn btn-link", data: { show_modal_title_value: "Edit agent #{agent.id}"}) + = button_to "Delete", CGI.unescape(agent_path(agent.id.split('/').last)), method: :delete, class:'btn btn-link', form: {data: { turbo: true, turbo_confirm: "Are you sure?", turbo_frame: '_top'}} diff --git a/app/views/agents/_table_list.html.haml b/app/views/agents/_table_list.html.haml new file mode 100644 index 000000000..62dbc4626 --- /dev/null +++ b/app/views/agents/_table_list.html.haml @@ -0,0 +1,14 @@ += render_alerts_container(AgentsController) +%table#adminAgents.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"} + %thead + %tr + %th Name + %th Identifiers + %th Affiliations + %th Type + %th{:class => 'delete_mappings_column'} Actions + %tbody#agents_table_content + - agents.each do |agent| + = render partial: 'agents/show_line' , locals: {agent: agent} + %tr.empty-state + %td.text-center{:colspan => "6"} There are currently no agents. \ No newline at end of file diff --git a/app/views/agents/edit.html.haml b/app/views/agents/edit.html.haml new file mode 100644 index 000000000..14ca50ed5 --- /dev/null +++ b/app/views/agents/edit.html.haml @@ -0,0 +1,3 @@ += turbo_frame_tag 'application_modal_content' do + = form_with url: agent_path(@agent.id.split('/').last), method: 'post', data:{turbo: true} do + = render partial: 'form', locals: {agent: @agent, name_prefix: '', new_agent: true} diff --git a/app/views/agents/index.html.haml b/app/views/agents/index.html.haml new file mode 100644 index 000000000..83edbd239 --- /dev/null +++ b/app/views/agents/index.html.haml @@ -0,0 +1,9 @@ += turbo_frame_tag 'agents-list' do + = link_to_modal("Create New Agent", + new_agent_path, + id: "new_agent_btn", + role: "button", + class: "btn btn-default mb-3", + data: { show_modal_title_value: "Create a new agent", show_modal_size_value: 'modal-xl' }, + ) + = render partial: 'table_list', locals: {agents: @agents} \ No newline at end of file diff --git a/app/views/agents/new.html.haml b/app/views/agents/new.html.haml new file mode 100644 index 000000000..94c8ba616 --- /dev/null +++ b/app/views/agents/new.html.haml @@ -0,0 +1,3 @@ += turbo_frame_tag 'application_modal_content' do + = form_with url: agents_path, method: 'post', data:{turbo: true} do + = render partial: 'form', locals: {agent: @agent, name_prefix: '', new_agent: true} \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 85545167b..df75dfe93 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,8 @@ get '/notes/new_reply', to: 'notes#new_reply' delete '/notes', to: 'notes#destroy' resources :notes, constraints: { id: /.+/ } - + resources :agents, constraints: { id: /.+/ } + post 'agents/:id', to: 'agents#update', constraints: { id: /.+/ } resources :ontolobridge do post :save_new_term_instructions, on: :collection end From cc405f8e8ed46853a986b1eb9fb632624ea42720 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 19 Jun 2023 14:50:10 +0200 Subject: [PATCH 235/533] make the admin page save the current section when reloaded --- app/helpers/admin_helper.rb | 6 ++++++ app/views/admin/index.html.haml | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 app/helpers/admin_helper.rb diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb new file mode 100644 index 000000000..7553a567d --- /dev/null +++ b/app/helpers/admin_helper.rb @@ -0,0 +1,6 @@ +module AdminHelper + def selected_admin_section?(section_title) + current_section = params[:section] || 'site' + current_section.eql?(section_title) + end +end diff --git a/app/views/admin/index.html.haml b/app/views/admin/index.html.haml index a67c02674..e2840a5e2 100644 --- a/app/views/admin/index.html.haml +++ b/app/views/admin/index.html.haml @@ -15,23 +15,23 @@ %div.col %ul.nav.nav-tabs{id: "admin-tabs", role: "tablist"} %li.nav-item - =link_to("Site Administration", "#site-admin", id: "site-admin-tab", class: "nav-link active", role: "tab", data: { toggle: "tab" }, aria: { controls: "site-admin", selected: "true" }) + =link_to("Site Administration", "#site-admin", id: "site-admin-tab", class: "nav-link #{selected_admin_section?('site') ? 'active': ''}", role: "tab", data: { toggle: "tab" }, aria: { controls: "site-admin", selected: "true" }) %li.nav-item - =link_to("Ontology Administration", "#ontology-admin", id: "ontology-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab" }, aria: { controls: "ontology-admin", selected: "false" }) + =link_to("Ontology Administration", "#ontology-admin", id: "ontology-admin-tab", class: "nav-link #{selected_admin_section?('ontology') ? 'active': ''}", role: "tab", data: { toggle: "tab" }, aria: { controls: "ontology-admin", selected: "false" }) %li.nav-item - =link_to("Licensing", "#licensing", id: "licensing-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: admin_licenses_path() }, aria: { controls: "licensing", selected: "false" }) + =link_to("Licensing", "#licensing", id: "licensing-admin-tab", class: "nav-link #{selected_admin_section?('licensing') ? 'active': ''}", role: "tab", data: { toggle: "tab", href: admin_licenses_path() }, aria: { controls: "licensing", selected: "false" }) %li.nav-item - =link_to("Users", "#users", id: "users-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: users_path() }, aria: { controls: "users", selected: "false" }) + =link_to("Users", "#users", id: "users-admin-tab", class: "nav-link #{selected_admin_section?('users') ? 'active': ''}", role: "tab", data: { toggle: "tab", href: users_path() }, aria: { controls: "users", selected: "false" }) %li.nav-item - =link_to("Metadata Administration", "#ontologies_metadata_curator", id: "ontologies_metadata_curator-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab"}, aria: { controls: "ontologies_metadata_curator", selected: "false" }) + =link_to("Metadata Administration", "#ontologies_metadata_curator", id: "ontologies_metadata_curator-admin-tab", class: "nav-link #{selected_admin_section?('metadata') ? 'active': ''}", role: "tab", data: { toggle: "tab"}, aria: { controls: "ontologies_metadata_curator", selected: "false" }) %li.nav-item - =link_to("Groups", "#groups", id: "groups-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: "groups" }, aria: { controls: "groups", selected: "false" }) + =link_to("Groups", "#groups", id: "groups-admin-tab", class: "nav-link #{selected_admin_section?('groups') ? 'active': ''}", role: "tab", data: { toggle: "tab", href: "groups" }, aria: { controls: "groups", selected: "false" }) %li.nav-item - =link_to("Categories", "#categories", id: "categories-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: "categories" }, aria: { controls: "categories", selected: "false" }) + =link_to("Categories", "#categories", id: "categories-admin-tab", class: "nav-link #{selected_admin_section?('categories') ? 'active': ''}", role: "tab", data: { toggle: "tab", href: "categories" }, aria: { controls: "categories", selected: "false" }) %div#adminTabContent.tab-content -# Site Administration tab - %div.tab-pane.active.show.fade{id: "site-admin", role: "tabpanel", aria: { labelledby: "site-admin-tab" }} + %div.tab-pane.fade{id: "site-admin", role: "tabpanel", aria: { labelledby: "site-admin-tab" }, class: selected_admin_section?('site') ? 'show active': ''} -# Clear caches %div#site-admin-clear-caches.my-5 @@ -68,7 +68,7 @@ -# Ontology Administration tab - %div.tab-pane.fade{id: "ontology-admin", role: "tabpanel", aria: { labelledby: "ontology-admin-tab" }} + %div.tab-pane.fade{id: "ontology-admin", role: "tabpanel", aria: { labelledby: "ontology-admin-tab" }, class: selected_admin_section?('ontology') ? 'show active': ''} %div.ontologies_list_container.mt-3 %table{:style => "float:left;"} %tr @@ -81,7 +81,7 @@ %table#adminOntologies.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"} -# Licensing tab - %div.tab-pane.fade{id: "licensing", role: "tabpanel", aria: { labelledby: "licensing-admin-tab" }} + %div.tab-pane.fade{id: "licensing", role: "tabpanel", aria: { labelledby: "licensing-admin-tab" }, class: selected_admin_section?('licensing') ? 'show active': ''} %div#renew-license-notice %table.table.table-sm.table-bordered.mt-5#license-table @@ -99,21 +99,21 @@ %div.mb-5#renew-license-form -# Users tab - %div.tab-pane.fade{id: "users", role: "tabpanel", aria: { labelledby: "users-admin-tab" }} + %div.tab-pane.fade{id: "users", role: "tabpanel", aria: { labelledby: "users-admin-tab" }, class: selected_admin_section?('users') ? 'show active': ''} %div.ontologies_list_container.mt-3 %table#adminUsers.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"} -# metadata tab - %div.tab-pane.fade{id: "ontologies_metadata_curator", role: "tabpanel", aria: { labelledby: "ontologies_metadata_curator-admin-tab" }} + %div.tab-pane.fade{id: "ontologies_metadata_curator", role: "tabpanel", aria: { labelledby: "ontologies_metadata_curator-admin-tab" }, class: selected_admin_section?('metadata') ? 'show active': ''} = render partial: 'ontologies_metadata_curator/metadata_tab' -# Groups tab - %div.tab-pane.fade{id: "groups", role: "tabpanel", aria: { labelledby: "groups-admin-tab" }} + %div.tab-pane.fade{id: "groups", role: "tabpanel", aria: { labelledby: "groups-admin-tab" }, class: selected_admin_section?('groups') ? 'show active': ''} %div.ontologies_list_container.mt-3 %table#adminGroups.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"} -# Categories tab - %div.tab-pane.fade{id: "categories", role: "tabpanel", aria: { labelledby: "categories-admin-tab" }} + %div.tab-pane.fade{id: "categories", role: "tabpanel", aria: { labelledby: "categories-admin-tab" }, class: selected_admin_section?('categories') ? 'show active': ''} %div.ontologies_list_container.mt-3 %table#adminCategories.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"} From dcf3d4cbfea3bf68d126262fa9324fd973106dc1 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 19 Jun 2023 14:50:29 +0200 Subject: [PATCH 236/533] add Persons & Organizations tab in the admin page --- app/views/admin/index.html.haml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/views/admin/index.html.haml b/app/views/admin/index.html.haml index e2840a5e2..74b2a8c58 100644 --- a/app/views/admin/index.html.haml +++ b/app/views/admin/index.html.haml @@ -28,6 +28,8 @@ =link_to("Groups", "#groups", id: "groups-admin-tab", class: "nav-link #{selected_admin_section?('groups') ? 'active': ''}", role: "tab", data: { toggle: "tab", href: "groups" }, aria: { controls: "groups", selected: "false" }) %li.nav-item =link_to("Categories", "#categories", id: "categories-admin-tab", class: "nav-link #{selected_admin_section?('categories') ? 'active': ''}", role: "tab", data: { toggle: "tab", href: "categories" }, aria: { controls: "categories", selected: "false" }) + %li.nav-item + =link_to("Persons & Organizations", "#agents", id: "agents-admin-tab", class: "nav-link #{selected_admin_section?('agents') ? 'active': ''}", role: "tab", data: { toggle: "tab", href: "agents" }, aria: { controls: "agents", selected: "false" }) %div#adminTabContent.tab-content -# Site Administration tab @@ -117,6 +119,11 @@ %div.ontologies_list_container.mt-3 %table#adminCategories.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"} + -# Agents tab + %div.tab-pane.fade{id: "agents", role: "tabpanel", aria: { labelledby: "agents-admin-tab" }, class: selected_admin_section?('agents') ? 'show active': ''} + %div.ontologies_list_container.mt-3 + = render TurboFrameComponent.new(id: 'agents-list', src: '/agents', loading: 'lazy') + From 305a69697b437e14ad1324f7c0ea9e40e04e5782 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 20 Jun 2023 13:53:44 +0000 Subject: [PATCH 237/533] fix home page responsiveness issues --- app/assets/stylesheets/home.scss | 11 ++++++----- app/views/home/index.html.haml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 562a5575c..4f043c143 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -89,7 +89,7 @@ i.fa.fa-caret-square-o-down { .home-header-title{ position: absolute; z-index: 4; - width: 481px; + width: 500px; margin-right: 664px; margin-top: 123px; opacity: 0; @@ -97,7 +97,7 @@ i.fa.fa-caret-square-o-down { animation: slide-and-fade 1s ease forwards; } .home-header-title h4{ - font-size: 40px; + font-size: 38px; font-weight: 800; color: white; } @@ -129,8 +129,9 @@ i.fa.fa-caret-square-o-down { align-items: center; } .home-section{ + padding: 0 50px; margin-top: 70px; - width: 1138px; + width: 1248px; } .home-section > h4{ font-size: 20px; @@ -314,10 +315,10 @@ i.fa.fa-caret-square-o-down { justify-content: space-between; } .home-sub-section-left{ - width: 533px; + width: 550px; } .home-sub-section-right{ - width: 533px; + width: 550px; } .home-sub-section-left h4, .home-sub-section-right h4{ font-size: 20px; diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 2d999efcc..018f11da7 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -109,7 +109,7 @@ %h4 News %hr.home-section-line .home-card.home-twitter-news - %a.twitter-timeline{"data-height" => "349", "data-width" => "533", :href => "https://twitter.com/lagroportal?ref_src=twsrc%5Etfw"} Tweets by lagroportal + %a.twitter-timeline{"data-height" => "349", "data-width" => "550", :href => "https://twitter.com/lagroportal?ref_src=twsrc%5Etfw"} Tweets by lagroportal %script{:async => "", :charset => "utf-8", :src => "https://platform.twitter.com/widgets.js"} .home-section From 0d1989eb63c109bc7fb238b214f36269ea337ee3 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 20 Jun 2023 13:57:41 +0000 Subject: [PATCH 238/533] fix footer responsiveness --- app/assets/stylesheets/footer.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/footer.scss b/app/assets/stylesheets/footer.scss index dec58f53f..435b6a2f8 100644 --- a/app/assets/stylesheets/footer.scss +++ b/app/assets/stylesheets/footer.scss @@ -4,9 +4,9 @@ background-color: var(--primary-color); } footer{ - width: 1280px; + width: 1248px; background-color: var(--primary-color); - padding: 40px 100px; + padding: 40px 50px; } .footer-header{ From 00dc3bd4829227645c41cef6d4d9c50f6c0354b8 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 20 Jun 2023 15:52:25 +0000 Subject: [PATCH 239/533] fix nav bar responsiveness and add admin to nav items --- app/assets/stylesheets/nav_bar.scss | 26 +++++++++++++++++++++----- app/views/layouts/_topnav.html.haml | 5 ++++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss index 2e754b5e0..04ed02730 100644 --- a/app/assets/stylesheets/nav_bar.scss +++ b/app/assets/stylesheets/nav_bar.scss @@ -8,10 +8,10 @@ background-color: var(--primary-color); align-items: center; height: 62px; - padding: 8px 50px; - width: 60%; + padding: 8px 42px; + width: 1248px; } -.nav-responsiveness-container{ +.nav-responsiveness-container{ display: flex; justify-content: space-between; } @@ -30,12 +30,13 @@ display: flex; justify-content: space-between; align-items:center; - width: 85%; + width: 1020px; } .nav-items > ul { display: flex; list-style: none; margin-bottom: 0; + padding: 0; } .nav-items > ul > li { @@ -130,7 +131,7 @@ width: 228px !important; } -@media (max-width: 1200px){ +@media (max-width: 1300px){ .top-nav .menu-btn i{ display: block; } @@ -144,6 +145,14 @@ position: absolute; right: 40px; } + .right-nav-items{ + flex-direction: column; + align-items: baseline !important; + } + .nav-search-container .nav-input{ + margin-bottom: 0 !important; + + } } .top-nav.show-responsive { @@ -170,3 +179,10 @@ .supportMenuDropdownLink.show-responsive { margin-bottom: 15px; } + +.right-nav-items{ + display: flex; + align-items: center; + justify-content: space-between; + width: 50% +} diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 8ce7afe78..c7faf217b 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -13,7 +13,10 @@ - navitems.each do |navItem| %li.nav-ul-li %a{href: navItem[0], class: ("active" if current_page?(navItem[0]))} #{navItem[1]} - %div.d-flex.align-items-center.justify-content-between{style:'min-width: 40%'} + - if !session[:user].nil? && session[:user].admin? + %li.nav-ul-li + %a{href: "/admin", class: ("active" if current_page?("/admin"))} Admin + .right-nav-items - if current_page?('/') .nav-search-container{style:'visibility: hidden'} %input From ac8ac746d388cc046f4e53d5a32b6605142cafff Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 20 Jun 2023 15:57:12 +0000 Subject: [PATCH 240/533] fix home annotator/recommender section title --- app/views/home/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 018f11da7..9999e977e 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -77,7 +77,7 @@ Upload ontology .home-section %h4 - = portal_name+" services" + Recommender and annotator %hr.home-section-line/ .home-card %form{action: "/annotator_recommender_form", method: "post"} From dc59bd437e59d76cf0525c28f6529a3ffda74d25 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 20 Jun 2023 17:51:06 +0000 Subject: [PATCH 241/533] fix home responsiveness for small screens --- app/assets/stylesheets/home.scss | 46 +++++++++++++++++++++++++++-- app/views/home/index.html.haml | 2 +- app/views/layouts/_topnav.html.haml | 2 +- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 4f043c143..3f113af4c 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -148,7 +148,6 @@ i.fa.fa-caret-square-o-down { } .home-statistics{ display: flex; - justify-content: space-between; } .home-statistics-container{ border-radius: 8px; @@ -159,7 +158,7 @@ i.fa.fa-caret-square-o-down { .home-statistics-container > div { display: flex; align-items: center; - + flex-wrap: wrap; } .home-agroportal-figures{ margin-bottom: 20px; @@ -174,7 +173,10 @@ i.fa.fa-caret-square-o-down { .home-statistics-item{ display: flex; align-items: center; - + +} +.home-statistics> :not(:last-child){ + margin-right: 49px; } .home-statistics-item hr{ height: 83px; @@ -458,5 +460,43 @@ i.fa.fa-caret-square-o-down { to { opacity: 1; transform: translateY(0); } } +@media (max-width: 1300px) { + .home-section{ + width: 100%; + } + .home-section-sub-sections-container{ + flex-direction: column; + } + .home-random-bubbles{ + display: none; + } + .home-header-title{ + + margin:128px 50px; + width: 500px; + + opacity: 0; + transform: translateY(-100%); + animation: slide-and-fade 1s ease forwards; + } + .home-header-title-container{ + justify-content: start; + } + .home-sub-section-left { + width: 100%; + } + + .home-sub-section-right { + width: 100%; + margin-top: 50px; + } + .home-fair-scores div{ + padding: 0 10%; + } + .home-fair-scores{ + height: unset; + } +} + diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 9999e977e..04b94f0f7 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -109,7 +109,7 @@ %h4 News %hr.home-section-line .home-card.home-twitter-news - %a.twitter-timeline{"data-height" => "349", "data-width" => "550", :href => "https://twitter.com/lagroportal?ref_src=twsrc%5Etfw"} Tweets by lagroportal + %a.twitter-timeline{"data-height" => "349", :href => "https://twitter.com/lagroportal?ref_src=twsrc%5Etfw"} Tweets by lagroportal %script{:async => "", :charset => "utf-8", :src => "https://platform.twitter.com/widgets.js"} .home-section diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index c7faf217b..3ac505f20 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -47,7 +47,7 @@ - d.with_section do |s| - s.header do Recently Viewed - - for ont in session[:ontologies] + - for ont in Array(session[:ontologies]) - s.item do = link_to(ont.ontology_name, "/ontologies/#{ont.ontology_acronym}/?p=classes&conceptid=#{CGI.escape(ont.concept)}") - d.with_section do |s| From b1d0353e81c9d3bdbba3c990328adc201a0f1f73 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Tue, 27 Jun 2023 11:33:58 +0200 Subject: [PATCH 242/533] restyle text and change display text in a button --- app/helpers/ontologies_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 41ad0c38a..85649cd08 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -481,9 +481,9 @@ def dispaly_complex_text(definitions) html = "" definitions.each do |definition| if definition.is_a?(String) - html+= "

    " + definition + "

    " + html += '

    ' + definition + '

    ' elsif definition.respond_to?(:uri) && definition.uri - html+= "

    " + definition.uri + "

    " + html+= '' + definition.uri + '' end end return html.html_safe From e57cbc37e3db4feb2d4e80ae52c9381da4320428 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 27 Jun 2023 18:52:33 +0200 Subject: [PATCH 243/533] add search input component --- app/components/search_input_component.rb | 15 ++ .../search_input_component.html.haml | 19 ++ .../search_input_component_controller.js | 163 ++++++++++++++++++ app/javascript/component_controllers/index.js | 3 + 4 files changed, 200 insertions(+) create mode 100644 app/components/search_input_component.rb create mode 100644 app/components/search_input_component/search_input_component.html.haml create mode 100644 app/components/search_input_component/search_input_component_controller.js diff --git a/app/components/search_input_component.rb b/app/components/search_input_component.rb new file mode 100644 index 000000000..f0d71f460 --- /dev/null +++ b/app/components/search_input_component.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class SearchInputComponent < ViewComponent::Base + + renders_one :template + + def initialize(name: '', placeholder:'', actions_links: {}, scroll_down: true, use_cache: true) + super + @name = name + @placeholder = placeholder + @actions_links = actions_links + @use_cache = use_cache + @scroll_down = scroll_down + end +end diff --git a/app/components/search_input_component/search_input_component.html.haml b/app/components/search_input_component/search_input_component.html.haml new file mode 100644 index 000000000..617943392 --- /dev/null +++ b/app/components/search_input_component/search_input_component.html.haml @@ -0,0 +1,19 @@ +%div{'data-controller': 'search-input', + 'data-search-input-ajax-url-value': '/ajax/ontologies', + 'data-search-input-item-link-base-value': '/ontologies/', + 'data-search-input-id-key-value': 'acronym', + 'data-search-input-cache-value': @use_cache.to_s, + 'data-search-input-scroll-down-value': @scroll_down.to_s} + %input#home-search{:name => @name, :placeholder => @placeholder, + :type => "text", 'data-action': 'input->search-input#search blur->search-input#blur', + 'data-search-input-target': 'input'} + #home-search-drop-down{'data-search-input-target': 'dropDown', 'data-action': 'mousedown->search-input#prevent'} + - @actions_links.each do |key, value| + %a.home-search-ontology-content#home-search-ontology-content{href: value, 'data-turbo-frame': '_top', 'data-search-input-target': 'actionLink'} + %p.mb-0 + %div + %img{src: asset_path("loop.svg")}/ + %p + =key.to_s.humanize + %template{'data-search-input-target': 'template'} + = template \ No newline at end of file diff --git a/app/components/search_input_component/search_input_component_controller.js b/app/components/search_input_component/search_input_component_controller.js new file mode 100644 index 000000000..5804b3135 --- /dev/null +++ b/app/components/search_input_component/search_input_component_controller.js @@ -0,0 +1,163 @@ +import {Controller} from "@hotwired/stimulus" +import useAjax from "../../javascript/mixins/useAjax"; + +// Connects to data-controller="search-input" +export default class extends Controller { + static targets = ["input", "dropDown", "actionLink", "template"] + static values = { + items: Array, + ajaxUrl: String, + itemLinkBase: String, + idKey: String, + cache: {type: Boolean, default: true}, + scrollDown: {type: Boolean, default: true} + } + + connect() { + this.input = this.inputTarget + this.dropDown = this.dropDownTarget + this.actionLinks = this.actionLinkTargets + this.items = this.itemsValue + } + + search() { + this.#searchInput() + } + + prevent(event){ + event.preventDefault(); + } + blur() { + this.dropDown.style.display = "none"; + this.input.classList.remove("home-dropdown-active"); + } + + #inputValue() { + return this.input.value.trim() + } + + #useCache() { + return this.cacheValue + } + #scrollDownEnabled(){ + return this.scrollDownValue + } + + #scrollDown(currentScroll) { + const startPosition = window.pageYOffset; + const distance = 300 - currentScroll; + const duration = 1000; + let start = null; + + function scrollAnimation(timestamp) { + if (!start) start = timestamp; + const progress = timestamp - start; + const scrollPosition = startPosition + easeInOutCubic(progress, 0, distance, duration); + window.scrollTo(0, scrollPosition); + if (progress < duration) { + window.requestAnimationFrame(scrollAnimation); + } + } + + function easeInOutCubic(t, b, c, d) { + t /= d / 2; + if (t < 1) return c / 2 * t * t * t + b; + t -= 2; + return c / 2 * (t * t * t + 2) + b; + } + + window.requestAnimationFrame(scrollAnimation); + } + + #fetchItems() { + if (this.items.length !== 0 && this.#useCache()) { + this.#renderLines() + } else { + useAjax({ + type: "GET", + url: this.ajaxUrlValue + '?search=' + this.#inputValue(), + dataType: "json", + success: (data) => { + this.items = data.map(x => { return {...x, link: (this.itemLinkBaseValue + x[this.idKeyValue])}} ) + this.#renderLines() + }, + error: () => { + console.log("error") + //TODO show errors + } + }) + } + } + + #renderLines() { + const inputValue = this.#inputValue(); + let results_list = [] + if (inputValue.length > 0) { + + this.actionLinks.forEach(action => { + const content = action.querySelector('p') + content.innerHTML = inputValue + const currentURL = new URL(action.href, document.location) + currentURL.searchParams.set(currentURL.searchParams.keys().next().value, inputValue) + action.href = currentURL.pathname + currentURL.search + }) + + this.dropDown.innerHTML = "" + let breaker = 0 + for (let i = 0; i < this.items.length; i++) { + if (breaker === 4) { + break; + } + // Get the current item from the ontologies array + const item = this.items[i]; + + let text = Object.values(item).reduce((acc, value) => acc + value, "") + + + // Check if the item contains the substring + if (text.toLowerCase().includes(inputValue.toLowerCase())) { + results_list.push(item); + breaker = breaker + 1 + } + } + + results_list.forEach((item) => { + let link = this.#renderLine(item); + this.dropDown.appendChild(link); + }); + + this.actionLinks.forEach(x => this.dropDown.appendChild(x)) + this.dropDown.style.display = "block"; + + this.input.classList.add("home-dropdown-active"); + if ((window.scrollY < 300) && this.#scrollDownEnabled()) { + this.#scrollDown(window.scrollY); + } + + } else { + this.dropDown.style.display = "none"; + this.input.classList.remove("home-dropdown-active"); + } + + } + + #renderLine(item) { + let template = this.templateTarget.content + let newElement = template.firstElementChild + let string = newElement.outerHTML + + Object.entries(item).forEach( ([key, value]) => { + key = key.toString().toUpperCase() + if (key === 'TYPE'){ + value = value.toString().split('/').slice(-1) + } + string = string.replace(key, value.toString()) + }) + + return new DOMParser().parseFromString(string, "text/html").body.firstElementChild + } + + #searchInput() { + this.#fetchItems() + } +} diff --git a/app/javascript/component_controllers/index.js b/app/javascript/component_controllers/index.js index dc1edde16..269831935 100644 --- a/app/javascript/component_controllers/index.js +++ b/app/javascript/component_controllers/index.js @@ -10,9 +10,12 @@ import Metadata_selector_component_controller from "../../components/metadata_selector_component/metadata_selector_component_controller"; import Ontology_subscribe_button_component_controller from "../../components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller"; +import Search_input_component_controller + from "../../components/search_input_component/search_input_component_controller"; application.register("turbo-modal", TurboModalController) application.register("file-input", FileInputLoaderController) application.register("select-input", Select_input_component_controller) application.register("metadata-select", Metadata_selector_component_controller) application.register("subscribe-notes", Ontology_subscribe_button_component_controller) +application.register("search-input", Search_input_component_controller) From 08bcb0383686e8f68fa459fbe2ada5cd1f5e87f1 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 27 Jun 2023 18:53:26 +0200 Subject: [PATCH 244/533] add ontology search input component re-using search-input component --- app/components/ontology_search_input_component.rb | 10 ++++++++++ .../ontology_search_input_component.html.haml | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 app/components/ontology_search_input_component.rb create mode 100644 app/components/ontology_search_input_component/ontology_search_input_component.html.haml diff --git a/app/components/ontology_search_input_component.rb b/app/components/ontology_search_input_component.rb new file mode 100644 index 000000000..6a4895601 --- /dev/null +++ b/app/components/ontology_search_input_component.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class OntologySearchInputComponent < ViewComponent::Base + + def initialize(name: 'search', placeholder: 'Search for an ontology or concept (Ex: Agrovoc ...)', scroll_down: true) + @name = name + @placeholder = placeholder + @scroll_down = scroll_down + end +end diff --git a/app/components/ontology_search_input_component/ontology_search_input_component.html.haml b/app/components/ontology_search_input_component/ontology_search_input_component.html.haml new file mode 100644 index 000000000..5e13ea274 --- /dev/null +++ b/app/components/ontology_search_input_component/ontology_search_input_component.html.haml @@ -0,0 +1,10 @@ += render SearchInputComponent.new(placeholder: @placeholder, + name: @name, scroll_down: @scroll_down, + actions_links: {search_ontology_content: "/search?query=o", see_all_ontologies: "/ontologies?search=o"}) do |s| + + - s.template do + %a{href: "LINK", class: "home-search-ontology-content", 'data-turbo-frame': '_top'} + %p#seached-ontology.home-searched-ontology + NAME(ACRONYM) + %p.home-result-type + TYPE \ No newline at end of file From 203d249296eb725dde0a00a1171eba88274125d1 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 27 Jun 2023 18:54:20 +0200 Subject: [PATCH 245/533] re-use ontology search input component in the topnav --- app/assets/stylesheets/nav_bar.scss | 22 ++++++++++++---------- app/views/layouts/_topnav.html.haml | 17 +++-------------- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss index 2e754b5e0..db30a9245 100644 --- a/app/assets/stylesheets/nav_bar.scss +++ b/app/assets/stylesheets/nav_bar.scss @@ -60,7 +60,7 @@ .nav-search-container { width: 50% ; } -.nav-search-container > input { +.nav-search-container div > input { height: 33px; width: 100%; outline: none; @@ -72,18 +72,26 @@ font-size: 14px; padding: 0 10px; } -.nav-search-container > input:focus{ +.nav-search-container div > input:focus{ opacity: 100%; border-radius: 5px 5px 0 0; } -.nav-search-container > input::placeholder{ +.nav-search-container div > input::placeholder{ color: white; opacity: 60%; } -.nav-search-container > input::-ms-input-placeholder{ +.nav-search-container div > input::-ms-input-placeholder{ color: white; opacity: 60%; } + +.nav-search-container #home-search-drop-down{ + position: absolute; + z-index: 9999; + font-size: 12px !important; + width: 228px !important; +} + .nav-language{ background-color: transparent; width: 47px; @@ -123,12 +131,6 @@ padding: 0 !important; } -.nav-search-drop-down{ - position: absolute; - z-index: 9999; - font-size: 12px !important; - width: 228px !important; -} @media (max-width: 1200px){ .top-nav .menu-btn i{ diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 8ce7afe78..df82e0192 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -18,19 +18,8 @@ .nav-search-container{style:'visibility: hidden'} %input - else - .nav-search-container{'data-controller': "home-search"} - %input.nav-input{:placeholder => "Search in "+portal_name+" ...", :type => "text", :name => "search", 'data-home-search-target': 'input', 'data-action': 'input->home-search#search blur->home-search#blur'} - #home-search-drop-down.nav-search-drop-down{'data-home-search-target': 'dropDown', 'data-action': 'mousedown->home-search#prevent'} - %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} - %p#seached-ontology{'data-home-search-target': 'ontology'} - %div - %img{src: asset_path("loop.svg")}/ - %p Search ontology content - %a.home-search-ontology-content#home-search-ontologies{href: "#", 'data-home-search-target': 'homeSearchOntologies'} - %p#seached-ontologies{'data-home-search-target': 'searchedOntologies'} - %div - %img{src: asset_path("loop.svg")}/ - %p See all ontologies + .nav-search-container + = render OntologySearchInputComponent.new(placeholder: "Search in "+portal_name+" ...", scroll_down: false) - if session[:user].nil? %a.nav-a{:href => "/login"} Login @@ -44,7 +33,7 @@ - d.with_section do |s| - s.header do Recently Viewed - - for ont in session[:ontologies] + - for ont in Array(session[:ontologies]) - s.item do = link_to(ont.ontology_name, "/ontologies/#{ont.ontology_acronym}/?p=classes&conceptid=#{CGI.escape(ont.concept)}") - d.with_section do |s| From c8be55bf4b274fa1b9467f42221d2247a9089863 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 27 Jun 2023 18:54:37 +0200 Subject: [PATCH 246/533] re-use the ontology-search-input in the home --- app/views/home/index.html.haml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 2d999efcc..a6c330fca 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -43,18 +43,8 @@ = t('.welcome', site: $SITE) %p = t('.tagline') - %input#home-search{:name => "search", :placeholder => "Search for an ontology or concept (Ex: Agrovoc ...)", :type => "text", 'data-home-search-target': 'input', 'data-action': 'input->home-search#search blur->home-search#blur'} - #home-search-drop-down{'data-home-search-target': 'dropDown', 'data-action': 'mousedown->home-search#prevent'} - %a.home-search-ontology-content#home-search-ontology-content{href: "#", 'data-home-search-target': 'searchOntologyContent'} - %p#seached-ontology{'data-home-search-target': 'ontology'} - %div - %img{src: asset_path("loop.svg")}/ - %p Search ontology content - %a.home-search-ontology-content#home-search-ontologies{href: "#", 'data-home-search-target': 'homeSearchOntologies'} - %p#seached-ontologies{'data-home-search-target': 'searchedOntologies'} - %div - %img{src: asset_path("loop.svg")}/ - %p See all ontologies + = render OntologySearchInputComponent.new + .home-body-container .home-section %h4 Wanna upload an ontology? From fea1cf09cc8e1fbb856c785a3ef7ce24943a2f6f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 27 Jun 2023 19:09:29 +0200 Subject: [PATCH 247/533] update search-input component to make it more generic --- .../ontology_search_input_component.html.haml | 3 ++- app/components/search_input_component.rb | 9 ++++++++- .../search_input_component.html.haml | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/components/ontology_search_input_component/ontology_search_input_component.html.haml b/app/components/ontology_search_input_component/ontology_search_input_component.html.haml index 5e13ea274..a59f1879c 100644 --- a/app/components/ontology_search_input_component/ontology_search_input_component.html.haml +++ b/app/components/ontology_search_input_component/ontology_search_input_component.html.haml @@ -1,5 +1,6 @@ = render SearchInputComponent.new(placeholder: @placeholder, - name: @name, scroll_down: @scroll_down, + name: @name, scroll_down: @scroll_down, ajax_url: '/ajax/ontologies', + item_base_url: '/ontologies/', id_key:'acronym', actions_links: {search_ontology_content: "/search?query=o", see_all_ontologies: "/ontologies?search=o"}) do |s| - s.template do diff --git a/app/components/search_input_component.rb b/app/components/search_input_component.rb index f0d71f460..4a33ffa5c 100644 --- a/app/components/search_input_component.rb +++ b/app/components/search_input_component.rb @@ -4,12 +4,19 @@ class SearchInputComponent < ViewComponent::Base renders_one :template - def initialize(name: '', placeholder:'', actions_links: {}, scroll_down: true, use_cache: true) + def initialize(name: '', placeholder: '', actions_links: {}, + scroll_down: true, use_cache: true, + ajax_url:, + item_base_url:, + id_key:) super @name = name @placeholder = placeholder @actions_links = actions_links @use_cache = use_cache @scroll_down = scroll_down + @ajax_url = ajax_url + @item_base_url = item_base_url + @id_key = id_key end end diff --git a/app/components/search_input_component/search_input_component.html.haml b/app/components/search_input_component/search_input_component.html.haml index 617943392..e30e29533 100644 --- a/app/components/search_input_component/search_input_component.html.haml +++ b/app/components/search_input_component/search_input_component.html.haml @@ -1,7 +1,7 @@ %div{'data-controller': 'search-input', - 'data-search-input-ajax-url-value': '/ajax/ontologies', - 'data-search-input-item-link-base-value': '/ontologies/', - 'data-search-input-id-key-value': 'acronym', + 'data-search-input-ajax-url-value': @ajax_url, + 'data-search-input-item-link-base-value': @item_base_url, + 'data-search-input-id-key-value': @id_key, 'data-search-input-cache-value': @use_cache.to_s, 'data-search-input-scroll-down-value': @scroll_down.to_s} %input#home-search{:name => @name, :placeholder => @placeholder, From 8b2fc6ac6ee9857c199eba7b0460059a83678983 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 28 Jun 2023 01:23:28 +0200 Subject: [PATCH 248/533] make testportal color use the new green --- app/assets/stylesheets/theme-variables.scss.erb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/assets/stylesheets/theme-variables.scss.erb b/app/assets/stylesheets/theme-variables.scss.erb index 515b56d99..6389084ec 100644 --- a/app/assets/stylesheets/theme-variables.scss.erb +++ b/app/assets/stylesheets/theme-variables.scss.erb @@ -19,6 +19,15 @@ --hover-color: #6B96B7; --secondary-color: #ffc107; } + <% when "testportal" %> + :root{ + --primary-color: #3CB371; + --hover-color: #41C67C; + --secondary-color: #ffc107; + --light-color: #F0F5F6; + --admin-color: #145FF4; + } + <% when "ontoportal" %> :root{ --primary-color: #6E98A2; From 14e84d8e4c0bae7320dace4ba9153c23751cfcd2 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 28 Jun 2023 01:23:51 +0200 Subject: [PATCH 249/533] make testportal and stageportal color use the new green --- app/assets/stylesheets/theme-variables.scss.erb | 10 ++++++---- app/assets/stylesheets/themes/ontoportal/main.scss | 6 +++--- app/assets/stylesheets/themes/stageportal/main.scss | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/theme-variables.scss.erb b/app/assets/stylesheets/theme-variables.scss.erb index 6389084ec..7b169baa3 100644 --- a/app/assets/stylesheets/theme-variables.scss.erb +++ b/app/assets/stylesheets/theme-variables.scss.erb @@ -9,9 +9,11 @@ } <% when "stageportal" %> :root{ - --primary-color: #76A7CC; - --hover-color: #6B96B7; + --primary-color: #3CB371; + --hover-color: #41C67C; --secondary-color: #ffc107; + --light-color: #F1FAED; + --admin-color: #145FF4; } <% when "bioportal" %> :root{ @@ -30,8 +32,8 @@ <% when "ontoportal" %> :root{ - --primary-color: #6E98A2; - --hover-color: #7BABB6; + --primary-color: #3CB371; + --hover-color: #41C67C; --secondary-color: #ffc107; } <%# Here to add a new theme ... %> diff --git a/app/assets/stylesheets/themes/ontoportal/main.scss b/app/assets/stylesheets/themes/ontoportal/main.scss index 2130fbeb5..d84ce5ba2 100644 --- a/app/assets/stylesheets/themes/ontoportal/main.scss +++ b/app/assets/stylesheets/themes/ontoportal/main.scss @@ -1,6 +1,6 @@ -$color-primary: rgb(110, 152, 162); -$color-secondary: #F7FDFC; -$color-links: rgb(144, 188, 185); +$color-primary: #3CB371; +$color-secondary: #E4F1FB; +$color-links: #3CB371; $color-warning: #ffc107; @import "../lirmm/main"; @import "search"; \ No newline at end of file diff --git a/app/assets/stylesheets/themes/stageportal/main.scss b/app/assets/stylesheets/themes/stageportal/main.scss index a56992679..d84ce5ba2 100644 --- a/app/assets/stylesheets/themes/stageportal/main.scss +++ b/app/assets/stylesheets/themes/stageportal/main.scss @@ -1,6 +1,6 @@ -$color-primary: #76A7CC; +$color-primary: #3CB371; $color-secondary: #E4F1FB; -$color-links: #76A7CC; +$color-links: #3CB371; $color-warning: #ffc107; @import "../lirmm/main"; @import "search"; \ No newline at end of file From 4fa8fe920d75ce3e86d63538bd29a64dd89baa19 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 28 Jun 2023 01:27:49 +0200 Subject: [PATCH 250/533] make agroportal and bioportal use the new colors --- .../stylesheets/theme-variables.scss.erb | 18 +++++++++++------- .../stylesheets/themes/agroportal/main.scss | 4 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/theme-variables.scss.erb b/app/assets/stylesheets/theme-variables.scss.erb index 7b169baa3..5f5c65de2 100644 --- a/app/assets/stylesheets/theme-variables.scss.erb +++ b/app/assets/stylesheets/theme-variables.scss.erb @@ -6,6 +6,8 @@ --primary-color: #3CB371; --hover-color: #41C67C; --secondary-color: #ffc107; + --light-color: #F1FAED; + --admin-color: #145FF4; } <% when "stageportal" %> :root{ @@ -20,15 +22,17 @@ --primary-color: #76A7CC; --hover-color: #6B96B7; --secondary-color: #ffc107; + --light-color: #F0F5F6; + --admin-color: #145FF4; } <% when "testportal" %> - :root{ - --primary-color: #3CB371; - --hover-color: #41C67C; - --secondary-color: #ffc107; - --light-color: #F0F5F6; - --admin-color: #145FF4; - } + :root{ + --primary-color: #3CB371; + --hover-color: #41C67C; + --secondary-color: #ffc107; + --light-color: #F0F5F6; + --admin-color: #145FF4; + } <% when "ontoportal" %> :root{ diff --git a/app/assets/stylesheets/themes/agroportal/main.scss b/app/assets/stylesheets/themes/agroportal/main.scss index 4ada63be6..1a58350cb 100644 --- a/app/assets/stylesheets/themes/agroportal/main.scss +++ b/app/assets/stylesheets/themes/agroportal/main.scss @@ -1,6 +1,6 @@ -$color-primary: #31B404; +$color-primary: #3CB371; $color-secondary: #EFFFEF; -$color-links: #215B04; +$color-links: #3CB371; $color-warning: #ffc107; @import "../lirmm/main"; @import "search"; \ No newline at end of file From f08e5a96533e80a7fda679f532fe75f92c891006 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Wed, 28 Jun 2023 11:27:20 +0200 Subject: [PATCH 251/533] use the view component to restyle button --- app/helpers/ontologies_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 85649cd08..f2c3e0f3e 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -483,7 +483,7 @@ def dispaly_complex_text(definitions) if definition.is_a?(String) html += '

    ' + definition + '

    ' elsif definition.respond_to?(:uri) && definition.uri - html+= '' + definition.uri + '' + html+= '' + definition.uri + '' end end return html.html_safe From 6ee4e2760b04d31bc12fd5a30d3c463c9380fdd5 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Wed, 28 Jun 2023 14:23:11 +0200 Subject: [PATCH 252/533] use LinkFieldComponent to display uri in concept definitions --- app/helpers/ontologies_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index f2c3e0f3e..b2706d9eb 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -483,7 +483,7 @@ def dispaly_complex_text(definitions) if definition.is_a?(String) html += '

    ' + definition + '

    ' elsif definition.respond_to?(:uri) && definition.uri - html+= '' + definition.uri + '' + html += render LinkFieldComponent.new(value: definition.uri) end end return html.html_safe From d0212fd08b92947e89d3307fc8c94fa07e0bbaea Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 29 Jun 2023 21:42:58 +0200 Subject: [PATCH 253/533] update nested form input component design --- app/assets/images/icons/delete.svg | 3 ++ app/assets/images/icons/plus.svg | 3 ++ app/assets/stylesheets/components/index.scss | 3 +- .../stylesheets/components/nested_form.scss | 49 +++++++++++++++++++ .../nested_form_inputs_component.html.haml | 22 ++++----- 5 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 app/assets/images/icons/delete.svg create mode 100644 app/assets/images/icons/plus.svg create mode 100644 app/assets/stylesheets/components/nested_form.scss diff --git a/app/assets/images/icons/delete.svg b/app/assets/images/icons/delete.svg new file mode 100644 index 000000000..0c3ed5204 --- /dev/null +++ b/app/assets/images/icons/delete.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/icons/plus.svg b/app/assets/images/icons/plus.svg new file mode 100644 index 000000000..17afc626b --- /dev/null +++ b/app/assets/images/icons/plus.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 163a1203a..3f59a7e6d 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -6,4 +6,5 @@ @import 'summary_section'; @import 'text_area_field'; @import 'dropdown'; -@import 'field_container'; \ No newline at end of file +@import 'field_container'; +@import 'nested_form'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/nested_form.scss b/app/assets/stylesheets/components/nested_form.scss new file mode 100644 index 000000000..630ea0e9f --- /dev/null +++ b/app/assets/stylesheets/components/nested_form.scss @@ -0,0 +1,49 @@ +.nested-form-input-container .titles{ + display: flex; + font-size: 11px; + color: #666666; + margin-bottom: 5px; + width: 90%; +} + + +.nested-form-input-container input:focus{ + border: 1px solid #31B404 !important; +} + +.nested-form-input-container .delete{ + display: flex; + border: 1px dashed #BDBDBD; + justify-content: center; + align-items: center; + height: 43px; + width: 43px; + border-radius: 5px; + cursor: pointer; +} + +.nested-form-input-container .add-another-object{ + border: 1px dashed #BDBDBD; + border-radius: 5px; + display: flex; + justify-content: center; + align-items: center; + padding: 10px; + cursor: pointer; +} +.nested-form-input-container svg path{ + fill: #DADADA; +} +.nested-form-input-container .add-another-object div{ + color: #DADADA; + margin-left: 10px; +} + + + + + + + + + diff --git a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml index 986284231..f6c1314c8 100644 --- a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml +++ b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml @@ -1,21 +1,21 @@ -%div{data: {controller: "nested-form"}} +%div.nested-form-input-container{data: {controller: "nested-form"}} %template{'data-nested-form-target':"template"} - %div.d-flex.align-items-center.nested-form-wrapper{'data-new-record': 'true'} + %div.d-flex.align-items-center.nested-form-wrapper.my-1{'data-new-record': 'true'} %div{style: 'width: 90%'} = template %div.d-flex.justify-content-end{style: 'width: 10%'} - %button.btn.btn-danger{data: {action:"nested-form#remove"}} - %i.fas.fa-minus.fa-lg + %div.delete{data: {action:"click->nested-form#remove"}} + = inline_svg 'icons/delete.svg' - rows.each_with_index do |row , index| - %div.d-flex.align-items-center.nested-form-wrapper{'data-new-record': 'true'} + %div.d-flex.align-items-center.nested-form-wrapper.my-1{'data-new-record': 'true'} %div{style: 'width: 90%'} = row %div.d-flex.justify-content-end{style: 'width: 10%'} - - unless index == 0 - %button.btn.btn-danger{data: {action:"nested-form#remove"}} - %i.fas.fa-minus.fa-lg + %div.delete{data: {action:"click->nested-form#remove"}} + = inline_svg 'icons/delete.svg' %div{'data-nested-form-target': "target"} - %div.float-right - %button.btn.btn-success{data: {action:"nested-form#add"}} - %i.fas.fa-plus.fa-lg \ No newline at end of file + %div.add-another-object{data: {action:"click->nested-form#add"}} + = inline_svg 'icons/plus.svg' + %div + Add another #{@object_name} \ No newline at end of file From 43a9241d8bfeafee1d7efd9a20d9446474529760 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 29 Jun 2023 21:43:56 +0200 Subject: [PATCH 254/533] add header slot to the nested form input component --- app/components/nested_form_inputs_component.rb | 6 ++++++ .../nested_form_inputs_component.html.haml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/app/components/nested_form_inputs_component.rb b/app/components/nested_form_inputs_component.rb index 880cfe91d..e5cbabada 100644 --- a/app/components/nested_form_inputs_component.rb +++ b/app/components/nested_form_inputs_component.rb @@ -3,5 +3,11 @@ class NestedFormInputsComponent < ViewComponent::Base renders_one :template + renders_one :header renders_many :rows + + def initialize(object_name: '') + super + @object_name = object_name + end end diff --git a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml index f6c1314c8..33dff4ddd 100644 --- a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml +++ b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml @@ -6,6 +6,8 @@ %div.d-flex.justify-content-end{style: 'width: 10%'} %div.delete{data: {action:"click->nested-form#remove"}} = inline_svg 'icons/delete.svg' + %div.titles + = header - rows.each_with_index do |row , index| %div.d-flex.align-items-center.nested-form-wrapper.my-1{'data-new-record': 'true'} %div{style: 'width: 90%'} From 0d244b1cf875594ab1ab3fb6685b36d7c5a98234 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 29 Jun 2023 21:44:14 +0200 Subject: [PATCH 255/533] add nested form input component preview --- .../nested_form_input_component_preview.rb | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 test/components/previews/nested_form_input_component_preview.rb diff --git a/test/components/previews/nested_form_input_component_preview.rb b/test/components/previews/nested_form_input_component_preview.rb new file mode 100644 index 000000000..60249be58 --- /dev/null +++ b/test/components/previews/nested_form_input_component_preview.rb @@ -0,0 +1,24 @@ +class NestedFormInputComponentPreview < ViewComponent::Preview + + include ActionView::Helpers::TagHelper + include ActionView::Helpers::FormTagHelper + + # @param object_name text + def default(object_name: 'contact') + render NestedFormInputsComponent.new(object_name: object_name) do |c| + c.header do + content_tag(:div, 'Contact name', class: 'w-50 mx-1') + content_tag(:div, 'Contact email', class: 'w-50 mx-1') + end + + c.template do + raw "
    ".html_safe + end + end + end + + private + + def long_text + "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum." + end +end \ No newline at end of file From cdf366623913628e51ac0c672f29e5a25253296b Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 30 Jun 2023 08:19:48 +0000 Subject: [PATCH 256/533] add margin-top to the add new object button in nested form component --- app/assets/stylesheets/components/nested_form.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/components/nested_form.scss b/app/assets/stylesheets/components/nested_form.scss index 630ea0e9f..9f0ced278 100644 --- a/app/assets/stylesheets/components/nested_form.scss +++ b/app/assets/stylesheets/components/nested_form.scss @@ -30,6 +30,7 @@ align-items: center; padding: 10px; cursor: pointer; + margin-top: 10px; } .nested-form-input-container svg path{ fill: #DADADA; From f8db781a17839df3503f54695e0ca9c89a0315d9 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Tue, 4 Jul 2023 16:04:07 +0200 Subject: [PATCH 257/533] fix display list of views of ontologies in Submitted ontologies --- app/views/users/show.html.haml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index bf3657498..bc32a61ab 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -113,6 +113,10 @@ - @admin_ontologies.each do |ont| .account-page-submitted-ontology{data: {controller: 'tooltip'}, title: ont.name} %a{href: "/ontologies/#{ont.acronym}"}= ont.acronym + - unless ont.views.nil? || ont.views.empty? + - ont.views.each do |view| + .account-page-submitted-ontology{data: {controller: 'tooltip'}, title: ont.name} + %a{href: "/ontologies/#{view.match(/\/([^\/]+)$/)[1]}"}= view.match(/\/([^\/]+)$/)[1] - unless @user_projects.nil? || @user_projects.empty? - no_ontologies = false .account-page-card From b59cdf3373e937a80fb3cbe92902e545e8ab0ede Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Wed, 5 Jul 2023 11:24:57 +0200 Subject: [PATCH 258/533] verification of presence of orcid ID to fix the bug --- app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 319e2dc36..86d9a2e6a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -250,7 +250,7 @@ def validate_update(params) if params[:username].nil? || params[:username].length < 1 errors << "Last name field is required" end - if ((!params[:orcidId].match(/^\d{4}+(-\d{4})+$/)) || (params[:orcidId].length != 19)) && !(params[:orcidId].nil? || params[:orcidId].length < 1) + if params[:orcidId].present? && ((!params[:orcidId].match(/^\d{4}-\d{4}-\d{4}-\d{4}$/)) || (params[:orcidId].length != 19)) errors << "Please enter a valide orcide id" end if !params[:password].eql?(params[:password_confirmation]) From fcb5f18d512a8f6c06446427d99596c2017942e9 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 6 Jul 2023 09:11:57 +0000 Subject: [PATCH 259/533] add input field to lookbook --- app/assets/stylesheets/components/index.scss | 3 ++- .../stylesheets/components/input_field.scss | 19 +++++++++++++++++++ app/components/input_field_component.rb | 9 +++++++++ .../input_field_component.html.haml | 4 ++++ .../previews/input_field_component_preview.rb | 16 ++++++++++++++++ 5 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/components/input_field.scss create mode 100644 app/components/input_field_component.rb create mode 100644 app/components/input_field_component/input_field_component.html.haml create mode 100644 test/components/previews/input_field_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 163a1203a..d9dae8297 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -6,4 +6,5 @@ @import 'summary_section'; @import 'text_area_field'; @import 'dropdown'; -@import 'field_container'; \ No newline at end of file +@import 'field_container'; +@import 'input_field'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/input_field.scss b/app/assets/stylesheets/components/input_field.scss new file mode 100644 index 000000000..ad904a6d8 --- /dev/null +++ b/app/assets/stylesheets/components/input_field.scss @@ -0,0 +1,19 @@ +.input-field-component{ + margin-top: 5px; + width: 100%; + font-size: 13px; + padding: 10px; + border: 1px solid #BDBDBD; + border-radius: 5px; + outline: none; + resize: none; +} + +.input-field-component:focus{ + border: 1px solid var(--primary-color); +} + +.text-input-label{ + font-size: 12px; + color: #666666; +} \ No newline at end of file diff --git a/app/components/input_field_component.rb b/app/components/input_field_component.rb new file mode 100644 index 000000000..85130f375 --- /dev/null +++ b/app/components/input_field_component.rb @@ -0,0 +1,9 @@ +class InputFieldComponent < ViewComponent::Base + def initialize(label: , name:, type: "text", width: "100%", margin_bottom: "0px") + @label = label + @name = name + @type = type + @width = width + @margin_bottom = margin_bottom + end +end \ No newline at end of file diff --git a/app/components/input_field_component/input_field_component.html.haml b/app/components/input_field_component/input_field_component.html.haml new file mode 100644 index 000000000..148a20fe9 --- /dev/null +++ b/app/components/input_field_component/input_field_component.html.haml @@ -0,0 +1,4 @@ +%div + .text-input-label + = @label + %input.input-field-component.text-input{name: @name, type: @type, style: "margin-bottom: #{@margin_bottom}; width: #{@width};"} \ No newline at end of file diff --git a/test/components/previews/input_field_component_preview.rb b/test/components/previews/input_field_component_preview.rb new file mode 100644 index 000000000..3605b9054 --- /dev/null +++ b/test/components/previews/input_field_component_preview.rb @@ -0,0 +1,16 @@ +class InputFieldComponentPreview < ViewComponent::Preview + + # @param label text + + def default(label: "Label") + render InputFieldComponent.new(label: label, name: "name", type: "text", width: "100%", margin_bottom: "0") + end + + # @param label text + + def date(label: "Label") + render InputFieldComponent.new(label: label, name: "name", type: "text", width: "100%", margin_bottom: "0", type: "date") + end + + +end \ No newline at end of file From 8aa6195871203c3e09636d88858c49e535422a6d Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 6 Jul 2023 09:15:15 +0000 Subject: [PATCH 260/533] add select component to lookbook --- app/assets/stylesheets/components/index.scss | 3 ++- app/assets/stylesheets/components/select.scss | 18 ++++++++++++++++++ app/components/select_component.rb | 9 +++++++++ .../select_component.html.haml | 5 +++++ .../previews/select_component_preview.rb | 9 +++++++++ 5 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/components/select.scss create mode 100644 app/components/select_component.rb create mode 100644 app/components/select_component/select_component.html.haml create mode 100644 test/components/previews/select_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index d9dae8297..477ef2d2b 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -7,4 +7,5 @@ @import 'text_area_field'; @import 'dropdown'; @import 'field_container'; -@import 'input_field'; \ No newline at end of file +@import 'input_field'; +@import 'select'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/select.scss b/app/assets/stylesheets/components/select.scss new file mode 100644 index 000000000..10fe26e66 --- /dev/null +++ b/app/assets/stylesheets/components/select.scss @@ -0,0 +1,18 @@ +.select-component{ + margin-top: 5px; + width: 100%; + font-size: 13px; + padding: 10px; + border: 1px solid #BDBDBD; + border-radius: 5px; + outline: none; + cursor: pointer; +} +.select-component:focus { + border: 1px solid var(--primary-color); +} + +.select-label { + font-size: 12px; + color: #666666; +} \ No newline at end of file diff --git a/app/components/select_component.rb b/app/components/select_component.rb new file mode 100644 index 000000000..4f99f2523 --- /dev/null +++ b/app/components/select_component.rb @@ -0,0 +1,9 @@ +class SelectComponent < ViewComponent::Base + def initialize(label: , name:, choices:, width: "100%", margin_bottom: "0px" ) + @label = label + @name = name + @choices = choices + @width = width + @margin_bottom = margin_bottom + end +end \ No newline at end of file diff --git a/app/components/select_component/select_component.html.haml b/app/components/select_component/select_component.html.haml new file mode 100644 index 000000000..bdeb268fa --- /dev/null +++ b/app/components/select_component/select_component.html.haml @@ -0,0 +1,5 @@ +.select-label + = @label +%select.select-component{style: "margin-bottom: #{@margin_bottom}; width: #{@width};", name: @name} + - @choices.each do |choice| + %option{:value => choice}= choice \ No newline at end of file diff --git a/test/components/previews/select_component_preview.rb b/test/components/previews/select_component_preview.rb new file mode 100644 index 000000000..a5e2bbbdd --- /dev/null +++ b/test/components/previews/select_component_preview.rb @@ -0,0 +1,9 @@ +class SelectComponentPreview < ViewComponent::Preview + + # @param label text + + def default(label: "Label") + render SelectComponent.new(label: label, name: "name", choices: ["choice 1", "choice 2", "choice 3"], width: "100%", margin_bottom: "0") + end + +end \ No newline at end of file From b888400532f5f5c51cc64b0cf503700d4fdc03d1 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 6 Jul 2023 09:17:56 +0000 Subject: [PATCH 261/533] add text area component to lookbook --- .../stylesheets/components/text_area.scss | 21 +++++++++++++++++++ app/components/text_area_component.rb | 8 +++++++ .../text_area_component.html.haml | 4 ++++ .../previews/text_area_component_preview.rb | 9 ++++++++ 4 files changed, 42 insertions(+) create mode 100644 app/assets/stylesheets/components/text_area.scss create mode 100644 app/components/text_area_component.rb create mode 100644 app/components/text_area_component/text_area_component.html.haml create mode 100644 test/components/previews/text_area_component_preview.rb diff --git a/app/assets/stylesheets/components/text_area.scss b/app/assets/stylesheets/components/text_area.scss new file mode 100644 index 000000000..5ee4146c4 --- /dev/null +++ b/app/assets/stylesheets/components/text_area.scss @@ -0,0 +1,21 @@ +.text-area-component { + margin-top: 5px; + margin-bottom: 23px; + width: 100%; + font-size: 13px; + padding: 10px; + border: 1px solid #BDBDBD; + border-radius: 5px; + outline: none; + resize: none; + background-color: white; +} + +.text-area-component:focus { + border: 1px solid var(--primary-color); +} + +.text-area-label { + font-size: 12px; + color: #666666; +} \ No newline at end of file diff --git a/app/components/text_area_component.rb b/app/components/text_area_component.rb new file mode 100644 index 000000000..4582e6304 --- /dev/null +++ b/app/components/text_area_component.rb @@ -0,0 +1,8 @@ +class TextAreaComponent < ViewComponent::Base + def initialize(label: , name:, width: "100%", margin_bottom: "0px" ) + @label = label + @name = name + @width = width + @margin_bottom = margin_bottom + end +end \ No newline at end of file diff --git a/app/components/text_area_component/text_area_component.html.haml b/app/components/text_area_component/text_area_component.html.haml new file mode 100644 index 000000000..57e07a694 --- /dev/null +++ b/app/components/text_area_component/text_area_component.html.haml @@ -0,0 +1,4 @@ +%div + .text-area-label + = @label + %textarea.text-area-component{name: @name, rows: "5", style: "margin-bottom: #{@margin_bottom}; width: #{@width};"} \ No newline at end of file diff --git a/test/components/previews/text_area_component_preview.rb b/test/components/previews/text_area_component_preview.rb new file mode 100644 index 000000000..6d701b980 --- /dev/null +++ b/test/components/previews/text_area_component_preview.rb @@ -0,0 +1,9 @@ +class TextAreaComponentPreview < ViewComponent::Preview + + # @param label text + + def default(label: "Label") + render TextAreaComponent.new(label: label, name: "name", width: "100%", margin_bottom: "0") + end + +end \ No newline at end of file From a1a6ce604010fea2120739cd20595cd471b55d59 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 6 Jul 2023 09:22:21 +0000 Subject: [PATCH 262/533] remove old undesired text area input from lookbook --- app/assets/stylesheets/components/index.scss | 4 ++-- .../stylesheets/components/text_area_field.scss | 14 -------------- app/components/text_area_field_component.rb | 12 ------------ .../text_area_field_component.html.haml | 5 ----- .../previews/text_area_field_component_preview.rb | 13 ------------- 5 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 app/assets/stylesheets/components/text_area_field.scss delete mode 100644 app/components/text_area_field_component.rb delete mode 100644 app/components/text_area_field_component/text_area_field_component.html.haml delete mode 100644 test/components/previews/text_area_field_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 477ef2d2b..54d9c03eb 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -4,8 +4,8 @@ @import 'chip_button'; @import 'rounded_button'; @import 'summary_section'; -@import 'text_area_field'; @import 'dropdown'; @import 'field_container'; @import 'input_field'; -@import 'select'; \ No newline at end of file +@import 'select'; +@import 'text_area'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/text_area_field.scss b/app/assets/stylesheets/components/text_area_field.scss deleted file mode 100644 index da0018b8a..000000000 --- a/app/assets/stylesheets/components/text_area_field.scss +++ /dev/null @@ -1,14 +0,0 @@ -.text-content{ - overflow: hidden; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: var(--read-more-line-clamp, 5); -} - - -.see_more_text { - color: var(--primary-color); - font-size: 15px; - margin-top: 10px; - text-align: end; -} \ No newline at end of file diff --git a/app/components/text_area_field_component.rb b/app/components/text_area_field_component.rb deleted file mode 100644 index f7963afce..000000000 --- a/app/components/text_area_field_component.rb +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: true - -class TextAreaFieldComponent < ViewComponent::Base - - def initialize(value: , see_more_text:'See more...' , see_less_text: 'See less...') - super - @value = value - @see_more_text = see_more_text - @see_less_text = see_less_text - end - -end diff --git a/app/components/text_area_field_component/text_area_field_component.html.haml b/app/components/text_area_field_component/text_area_field_component.html.haml deleted file mode 100644 index 40226b7e5..000000000 --- a/app/components/text_area_field_component/text_area_field_component.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -%div{data:{controller:"text-truncate", 'text-truncate-more-text-value': @see_more_text , 'text-truncate-less-text-value': @see_less_text}} - %p.text-content{'data-text-truncate-target': 'content'} - = @value - %p.see_more_text{data:{'text-truncate-target': 'button', 'action':"click->text-truncate#toggle"}} - = @see_more_text \ No newline at end of file diff --git a/test/components/previews/text_area_field_component_preview.rb b/test/components/previews/text_area_field_component_preview.rb deleted file mode 100644 index 2d6cfa7b7..000000000 --- a/test/components/previews/text_area_field_component_preview.rb +++ /dev/null @@ -1,13 +0,0 @@ -class TextAreaFieldComponentPreview < ViewComponent::Preview - - - # @param value textarea - def default(value: '') - render TextAreaFieldComponent.new(value: value.empty? ? (long_text + long_text) : value ) - end - - private - def long_text - "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum." - end -end \ No newline at end of file From 217b804858e2afb3f3e8cd9365019cbe2280c244 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 6 Jul 2023 09:25:18 +0000 Subject: [PATCH 263/533] add margin to lookbook preview --- app/views/layouts/component_preview.html.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/component_preview.html.erb b/app/views/layouts/component_preview.html.erb index 745f4c563..f6fe9f26b 100644 --- a/app/views/layouts/component_preview.html.erb +++ b/app/views/layouts/component_preview.html.erb @@ -50,7 +50,10 @@ -<%= yield %> -<%= javascript_include_tag "application" %> +
    + <%= yield %> + <%= javascript_include_tag "application" %> +
    + \ No newline at end of file From 31e07358ac17300678dbe36f58f32c1d1c275483 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Thu, 6 Jul 2023 17:17:56 +0200 Subject: [PATCH 264/533] display the list of views ontologies in submitted ontologies --- app/controllers/home_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index c56da890e..69c0673bd 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -135,7 +135,7 @@ def account @user_ontologies = @user.customOntology @user_ontologies ||= [] - onts = LinkedData::Client::Models::Ontology.all + onts = LinkedData::Client::Models::Ontology.all(include_views: true); @admin_ontologies = onts.select { |o| o.administeredBy.include? @user.id } projects = LinkedData::Client::Models::Project.all From 3d426aa0afdc2740e2bf838cb2782ecd16f76bba Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 7 Jul 2023 14:37:39 +0200 Subject: [PATCH 265/533] add agents json search endpoint and action --- app/controllers/agents_controller.rb | 15 +++++++++++++++ config/routes.rb | 1 + 2 files changed, 16 insertions(+) diff --git a/app/controllers/agents_controller.rb b/app/controllers/agents_controller.rb index 89b924263..8fb6406e6 100644 --- a/app/controllers/agents_controller.rb +++ b/app/controllers/agents_controller.rb @@ -6,6 +6,21 @@ def index @agents = LinkedData::Client::Models::Agent.all end + + def ajax_agents + @agents = LinkedData::Client::Models::Agent.all(name: params[:name], agentType: params[:organization_only]&.eql?('true') ? 'organization' : '') + agents_json = @agents.map do |x| + { + id: x.id, + name: x.name, + type: x.agentType, + identifiers: x.identifiers.map { |i| i.schemaAgency + ':' + i.notation }.join(', ') + } + end + + render json: agents_json + end + def new @agent = LinkedData::Client::Models::Agent.new @agent.creator = session[:user].id diff --git a/config/routes.rb b/config/routes.rb index df75dfe93..b1d1967c6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -154,6 +154,7 @@ get '/ajax/:ontology/instances' => 'instances#index_by_ontology' get '/ajax/:ontology/classes/:conceptid/instances' => 'instances#index_by_class', :constraints => { conceptid: /[^\/?]+/ } get '/ajax/ontologies' , to:"ontologies#ajax_ontologies" + get '/ajax/agents' , to:"agents#ajax_agents" # User get '/logout' => 'login#destroy', :as => :logout From c4e8fccf858c45760fe4d5b57b46e142fcb54b62 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 7 Jul 2023 14:45:36 +0200 Subject: [PATCH 266/533] update search input component to handle custom link turbo targets --- app/components/search_input_component.rb | 12 +++++++++++- .../search_input_component.html.haml | 3 ++- .../search_input_component_controller.js | 5 +++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/components/search_input_component.rb b/app/components/search_input_component.rb index 4a33ffa5c..047b83b6b 100644 --- a/app/components/search_input_component.rb +++ b/app/components/search_input_component.rb @@ -8,7 +8,8 @@ def initialize(name: '', placeholder: '', actions_links: {}, scroll_down: true, use_cache: true, ajax_url:, item_base_url:, - id_key:) + id_key:, + links_target: '_top') super @name = name @placeholder = placeholder @@ -18,5 +19,14 @@ def initialize(name: '', placeholder: '', actions_links: {}, @ajax_url = ajax_url @item_base_url = item_base_url @id_key = id_key + @links_target = links_target + end + + def action_link_info(value) + if value.is_a?(Hash) + [value[:link] , value[:target]] + else + [value, '_top'] + end end end diff --git a/app/components/search_input_component/search_input_component.html.haml b/app/components/search_input_component/search_input_component.html.haml index e30e29533..c5da8112a 100644 --- a/app/components/search_input_component/search_input_component.html.haml +++ b/app/components/search_input_component/search_input_component.html.haml @@ -9,7 +9,8 @@ 'data-search-input-target': 'input'} #home-search-drop-down{'data-search-input-target': 'dropDown', 'data-action': 'mousedown->search-input#prevent'} - @actions_links.each do |key, value| - %a.home-search-ontology-content#home-search-ontology-content{href: value, 'data-turbo-frame': '_top', 'data-search-input-target': 'actionLink'} + - link, target = action_link_info(value) + %a.home-search-ontology-content#home-search-ontology-content{href: link, 'data-turbo-frame': target, 'data-search-input-target': 'actionLink'} %p.mb-0 %div %img{src: asset_path("loop.svg")}/ diff --git a/app/components/search_input_component/search_input_component_controller.js b/app/components/search_input_component/search_input_component_controller.js index 5804b3135..2d2e624e2 100644 --- a/app/components/search_input_component/search_input_component_controller.js +++ b/app/components/search_input_component/search_input_component_controller.js @@ -75,7 +75,7 @@ export default class extends Controller { } else { useAjax({ type: "GET", - url: this.ajaxUrlValue + '?search=' + this.#inputValue(), + url: this.ajaxUrlValue + this.#inputValue(), dataType: "json", success: (data) => { this.items = data.map(x => { return {...x, link: (this.itemLinkBaseValue + x[this.idKeyValue])}} ) @@ -151,7 +151,8 @@ export default class extends Controller { if (key === 'TYPE'){ value = value.toString().split('/').slice(-1) } - string = string.replace(key, value.toString()) + const regex = new RegExp('\\b' + key + '\\b', 'gi'); + string = string.replace(regex, value.toString()) }) return new DOMParser().parseFromString(string, "text/html").body.firstElementChild From 3dd749356fa8fb72b447271e40d58dde1f757ac7 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 7 Jul 2023 14:49:46 +0200 Subject: [PATCH 267/533] add agents search input component and show action --- app/components/agent_search_input_component.rb | 10 ++++++++++ .../agent_search_input_component.html.haml | 10 ++++++++++ app/controllers/agents_controller.rb | 5 +++++ app/views/agents/_agent_show.html.haml | 3 +++ app/views/agents/show.html.haml | 2 ++ 5 files changed, 30 insertions(+) create mode 100644 app/components/agent_search_input_component.rb create mode 100644 app/components/agent_search_input_component/agent_search_input_component.html.haml create mode 100644 app/views/agents/_agent_show.html.haml create mode 100644 app/views/agents/show.html.haml diff --git a/app/components/agent_search_input_component.rb b/app/components/agent_search_input_component.rb new file mode 100644 index 000000000..3cf7a2ec4 --- /dev/null +++ b/app/components/agent_search_input_component.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class AgentSearchInputComponent < ViewComponent::Base + + def initialize(id:, organization_only: false ) + super + @id = id + @organization_only = organization_only + end +end diff --git a/app/components/agent_search_input_component/agent_search_input_component.html.haml b/app/components/agent_search_input_component/agent_search_input_component.html.haml new file mode 100644 index 000000000..8f14ff5c2 --- /dev/null +++ b/app/components/agent_search_input_component/agent_search_input_component.html.haml @@ -0,0 +1,10 @@ += render SearchInputComponent.new(name:'agent' + @id, ajax_url: "/ajax/agents?organization_only=#{@organization_only}&name=", + item_base_url:"/agents/fake_id?parent_id=#{@id}&name=", id_key: 'name', + use_cache: false, + actions_links: {create_new_agent: {link: "/agents/new?name=&parent_id=#{@id}&new_agent=false&type=organization", target:'_self'}}) do |s| + - s.template do + %a{href: "LINK", class: "home-search-ontology-content", 'data-turbo-frame': '_self'} + %p#seached-ontology.home-searched-ontology + NAME (IDENTIFIERS) + %p.home-result-type + TYPE \ No newline at end of file diff --git a/app/controllers/agents_controller.rb b/app/controllers/agents_controller.rb index 8fb6406e6..ddd8122c9 100644 --- a/app/controllers/agents_controller.rb +++ b/app/controllers/agents_controller.rb @@ -6,6 +6,11 @@ def index @agents = LinkedData::Client::Models::Agent.all end + def show + id = params[:id]&.eql?('fake_id') ? params[:name] : params[:id] + @agent = LinkedData::Client::Models::Agent.all(name: id).find { |x| x.name.eql?(id) } + @name_prefix = params[:parent_id] ? "[affiliations][#{params[:parent_id]}]" : '' + end def ajax_agents @agents = LinkedData::Client::Models::Agent.all(name: params[:name], agentType: params[:organization_only]&.eql?('true') ? 'organization' : '') diff --git a/app/views/agents/_agent_show.html.haml b/app/views/agents/_agent_show.html.haml new file mode 100644 index 000000000..c73f15729 --- /dev/null +++ b/app/views/agents/_agent_show.html.haml @@ -0,0 +1,3 @@ +- if agent.id + = hidden_field_tag agent_field_name(:id, name_prefix), agent.id += text_field_tag '', agent.name + '(' + agent.identifiers.map {|i| i.schemaAgency+':'+i.notation}.join(', ') + ')', class: "form-control", disabled: true \ No newline at end of file diff --git a/app/views/agents/show.html.haml b/app/views/agents/show.html.haml new file mode 100644 index 000000000..e6385281a --- /dev/null +++ b/app/views/agents/show.html.haml @@ -0,0 +1,2 @@ += turbo_frame_tag params[:parent_id] || 'application_modal_content' do + = render partial: 'agents/agent_show', locals: {agent: @agent, name_prefix: @name_prefix} \ No newline at end of file From 9d8c5ad2c54e4bbaa1b632cd1a1af064dcd6a9a4 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 7 Jul 2023 15:03:45 +0200 Subject: [PATCH 268/533] add agents form style file --- app/assets/stylesheets/agents.scss | 3 +++ app/assets/stylesheets/application.css.scss.erb | 1 + 2 files changed, 4 insertions(+) create mode 100644 app/assets/stylesheets/agents.scss diff --git a/app/assets/stylesheets/agents.scss b/app/assets/stylesheets/agents.scss new file mode 100644 index 000000000..2c8d5a45e --- /dev/null +++ b/app/assets/stylesheets/agents.scss @@ -0,0 +1,3 @@ +.agents-affiliations input { + @extend .form-control !optional; +} \ No newline at end of file diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index 03a6c9d11..867fc0405 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -49,6 +49,7 @@ @import "login"; @import "components/index"; @import "account"; +@import "agents"; @import "nav_bar"; From 4f5bd978dc58d71d4e83d0a4e923bbe7232d7be1 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 7 Jul 2023 15:04:50 +0200 Subject: [PATCH 269/533] update new agent action to take default values from the request params --- app/controllers/agents_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/agents_controller.rb b/app/controllers/agents_controller.rb index ddd8122c9..729f8d17a 100644 --- a/app/controllers/agents_controller.rb +++ b/app/controllers/agents_controller.rb @@ -29,7 +29,9 @@ def ajax_agents def new @agent = LinkedData::Client::Models::Agent.new @agent.creator = session[:user].id - @agent.agentType = 'person' + @agent.agentType = params[:type] || 'person' + @agent.name = params[:name] + @new_agent = params[:new_agent].nil? || params[:new_agent].eql?('true') end def create From c053ee717154bb3e02849df0c9f103cfa8f8df7b Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 7 Jul 2023 15:06:26 +0200 Subject: [PATCH 270/533] update agent update action to not update agent affiliations separately --- app/controllers/agents_controller.rb | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/app/controllers/agents_controller.rb b/app/controllers/agents_controller.rb index 729f8d17a..3be5bfcd1 100644 --- a/app/controllers/agents_controller.rb +++ b/app/controllers/agents_controller.rb @@ -51,7 +51,7 @@ def edit def update agent_update, agent = update_agent(params[:id].split('/').last, agent_params) - binding.pry + if response_error?(agent_update) render_turbo_stream(alert_error { JSON.pretty_generate(response_errors(agent_update)) }) else @@ -106,29 +106,17 @@ def save_agent(params) def update_agent(id = params[:id], params) agent = LinkedData::Client::Models::Agent.find("#{REST_URI}/Agents/#{id}") - affiliations = params.delete(:affiliations) - params[:affiliations] = [] - params[:creator] = session[:user].id if (agent.creator.nil? || agent.creator.empty?) && (params[:creator]|| '').empty? - - - Array(affiliations).each do |aff| - if aff[:id] - id = aff.delete :id - res, aff = update_agent(id.split('/').last, aff) - else - aff = save_agent(aff) - end - params[:affiliations] << {'id' => aff.id}.merge(aff.to_hash.stringify_keys) - end + params[:creator] = session[:user].id if (agent.creator.nil? || agent.creator.empty?) && (params[:creator] || '').empty? - [agent.update(values: params) , agent.update_from_params(params)] + res = agent.update(values: params) + [res, agent.update_from_params(params)] end def agent_params p = params.permit(:agentType, :name, :acronym, :homepage, :creator, { identifiers: [:notation, :schemaAgency, :creator] }, - { affiliations: [:id, :agentType, :name, :homepage, :acronym,:creator, { identifiers: [:notation, :schemaAgency, :creator] }] } + { affiliations: [:id, :agentType, :name, :homepage, :acronym, :creator, { identifiers: [:notation, :schemaAgency, :creator] }] } ) p = p.to_h p.transform_values do |v| @@ -143,7 +131,7 @@ def agent_params p[:identifiers] = (p[:identifiers] || {}).values p[:affiliations] = (p[:affiliations] || {}).values p[:affiliations].each do |affiliation| - affiliation[:identifiers] = (affiliation[:identifiers] || {}).values + affiliation[:identifiers] = affiliation[:identifiers].values if affiliation.is_a?(Hash) && affiliation[:identifiers] end p end From cdbb08b72ea584bff2ded3e10662f288277f7873 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 7 Jul 2023 15:06:58 +0200 Subject: [PATCH 271/533] update the agent for to use the agents search component --- app/helpers/application_helper.rb | 4 ++++ app/views/agents/_form.html.haml | 14 +++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e659ee0dc..1f380ca7b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -71,6 +71,10 @@ def get_username(user_id) username end + def current_user + session[:user] + end + def current_user_admin? session[:user] && session[:user].admin? end diff --git a/app/views/agents/_form.html.haml b/app/views/agents/_form.html.haml index 4691cf691..6366df42c 100644 --- a/app/views/agents/_form.html.haml +++ b/app/views/agents/_form.html.haml @@ -66,16 +66,20 @@ %tr %th Affiliations - %td.top + %td.top.agents-affiliations %div = render NestedFormInputsComponent.new do |c| - c.template do - %div.d-flex{id: 'NEW_RECORD'} - = render partial: 'agents/form', locals: {agent: new_affiliation_obj, name_prefix: "[affiliations][NEW_RECORD]", new_agent: false} + = turbo_frame_tag 'NEW_RECORD' do + = render AgentSearchInputComponent.new(id: 'NEW_RECORD', organization_only: true) - Array(agent.affiliations).each_with_index do |affiliation, i| - c.row do - %div.d-flex{id: affiliation.id} - = render partial: 'agents/form', locals: {agent: affiliation, name_prefix: "[affiliations][#{i}]", new_agent: false} + - if current_user_admin? || affiliation.creator.eql?(current_user&.id.to_s) + %div{id: affiliation.id} + = render partial: 'agents/form', locals: {agent: affiliation, name_prefix: "[affiliations][#{i}]", new_agent: false} + - else + %div + = render partial: 'agents/agent_show', locals: {agent: affiliation, name_prefix: "[affiliations][#{i}]"} - if new_agent %div.mt-2 = submit_tag 'Save', class: "btn btn-primary mr-sm-2 group-form-accept" \ No newline at end of file From 2f10ccd37f56f0b69dcf5857052c7889460cbb36 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 7 Jul 2023 15:08:36 +0200 Subject: [PATCH 272/533] make the agent new partial turbo frame id parameterized --- Gemfile | 6 ++--- Gemfile.lock | 45 +++++++++++++++++----------------- app/views/agents/new.html.haml | 4 +-- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Gemfile b/Gemfile index 12069fa20..5e2d320bf 100644 --- a/Gemfile +++ b/Gemfile @@ -73,7 +73,7 @@ gem 'view_component', '~> 2.72' gem 'turnout' gem 'will_paginate', '~> 3.0' gem 'inline_svg' - +gem "lookbook", '~> 1.5.5' gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'development' @@ -106,7 +106,7 @@ group :development do # Use console on exceptions pages [https://github.com/rails/web-console] gem 'web-console' - gem "lookbook", '~> 1.5.5' + end group :test, :development do @@ -123,4 +123,4 @@ end gem "net-ftp", "~> 0.2.0", require: false gem "net-http" -gem 'inline_svg' + diff --git a/Gemfile.lock b/Gemfile.lock index 1b6b17dff..5d6053e73 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git - revision: ca20880499a737803120f18ce99c14d3f10bc071 + revision: f49cd49aee437c98221521f7763ecb8386855e17 branch: development specs: ontologies_api_client (2.2.0) @@ -115,7 +115,7 @@ GEM capistrano-bundler (>= 1.1, < 3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.39.1) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -133,7 +133,7 @@ GEM addressable cube-ruby (0.0.3) daemons (1.4.1) - dalli (3.2.4) + dalli (3.2.5) date (3.3.3) debug (1.8.0) irb (>= 1.5.0) @@ -145,7 +145,7 @@ GEM erubi (1.12.0) erubis (2.7.0) eventmachine (1.2.7) - excon (0.99.0) + excon (0.100.0) execjs (2.8.1) faraday (2.0.1) faraday-net_http (~> 2.0) @@ -177,17 +177,17 @@ GEM http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) - i18n (1.13.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) iconv (1.0.8) - importmap-rails (1.1.6) + importmap-rails (1.2.1) actionpack (>= 6.0.0) railties (>= 6.0.0) inline_svg (1.9.0) activesupport (>= 3.0) nokogiri (>= 1.6) io-console (0.6.0) - irb (1.6.4) + irb (1.7.0) reline (>= 0.3.0) jquery-rails (4.5.1) rails-dom-testing (>= 1, < 3) @@ -195,7 +195,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - jsbundling-rails (1.1.1) + jsbundling-rails (1.1.2) railties (>= 6.0.0) json (2.6.3) listen (3.8.0) @@ -231,7 +231,7 @@ GEM mime-types-data (3.2023.0218.1) mini_mime (1.1.2) mini_portile2 (2.8.2) - minitest (5.18.0) + minitest (5.18.1) msgpack (1.7.1) multi_json (1.15.0) multipart-post (2.3.0) @@ -241,7 +241,7 @@ GEM time net-http (0.3.2) uri - net-imap (0.3.4) + net-imap (0.3.6) date net-protocol net-pop (0.1.2) @@ -256,16 +256,17 @@ GEM netrc (0.11.0) newrelic_rpm (9.2.2) nio4r (2.5.9) - nokogiri (1.14.2-x86_64-linux) - racc (~> 1.4) nokogiri (1.15.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oj (3.14.3) + nokogiri (1.15.2-x86_64-linux) + racc (~> 1.4) + oj (3.15.0) open_uri_redirections (0.2.1) parallel (1.23.0) - parser (3.2.2.1) + parser (3.2.2.3) ast (~> 2.4.1) + racc popper_js (1.16.1) pry (0.14.2) coderay (~> 1.1) @@ -274,7 +275,7 @@ GEM public_suffix (5.0.1) puma (5.6.5) nio4r (~> 2.0) - racc (1.6.2) + racc (1.7.1) rack (2.2.7) rack-accept (0.4.5) rack (>= 0.4) @@ -325,8 +326,8 @@ GEM recaptcha (5.9.0) json redcarpet (3.6.0) - regexp_parser (2.8.0) - reline (0.3.4) + regexp_parser (2.8.1) + reline (0.3.5) io-console (~> 0.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -352,10 +353,10 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.0) - rubocop (1.51.0) + rubocop (1.52.1) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) @@ -366,7 +367,7 @@ GEM parser (>= 3.2.1.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - ruby_parser (3.20.1) + ruby_parser (3.20.2) sexp_processor (~> 4.16) rubyzip (2.3.2) sassc (2.4.0) @@ -405,7 +406,7 @@ GEM eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (1.2.2) - tilt (2.1.0) + tilt (2.2.0) time (0.2.2) date timeout (0.3.2) @@ -446,7 +447,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.34) - zeitwerk (2.6.7) + zeitwerk (2.6.8) PLATFORMS ruby diff --git a/app/views/agents/new.html.haml b/app/views/agents/new.html.haml index 94c8ba616..c5c8a0ae6 100644 --- a/app/views/agents/new.html.haml +++ b/app/views/agents/new.html.haml @@ -1,3 +1,3 @@ -= turbo_frame_tag 'application_modal_content' do += turbo_frame_tag params[:parent_id] || 'application_modal_content' do = form_with url: agents_path, method: 'post', data:{turbo: true} do - = render partial: 'form', locals: {agent: @agent, name_prefix: '', new_agent: true} \ No newline at end of file + = render partial: 'form', locals: {agent: @agent, name_prefix: '', new_agent: @new_agent} \ No newline at end of file From fc76c5e24f5ea40b76fa9ab443e420d00ab50d83 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 7 Jul 2023 15:15:05 +0200 Subject: [PATCH 273/533] add email field to the agents form --- Gemfile.lock | 33 +++++++++++++++------------- app/controllers/agents_controller.rb | 2 +- app/views/agents/_form.html.haml | 6 +++++ 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5d6053e73..eefea7fa9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,7 +110,7 @@ GEM capistrano (~> 3.0) capistrano-passenger (0.2.1) capistrano (~> 3.0) - capistrano-rails (1.6.2) + capistrano-rails (1.6.3) capistrano (~> 3.1) capistrano-bundler (>= 1.1, < 3) capistrano-yarn (2.0.2) @@ -160,7 +160,7 @@ GEM flamegraph (0.9.5) globalid (1.1.0) activesupport (>= 5.0) - graphql (2.0.22) + graphql (2.0.24) graphql-client (0.18.0) activesupport (>= 3.0) graphql @@ -187,9 +187,9 @@ GEM activesupport (>= 3.0) nokogiri (>= 1.6) io-console (0.6.0) - irb (1.7.0) + irb (1.7.1) reline (>= 0.3.0) - jquery-rails (4.5.1) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -198,6 +198,7 @@ GEM jsbundling-rails (1.1.2) railties (>= 6.0.0) json (2.6.3) + language_server-protocol (3.17.0.3) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -254,12 +255,12 @@ GEM net-protocol net-ssh (7.1.0) netrc (0.11.0) - newrelic_rpm (9.2.2) + newrelic_rpm (9.3.0) nio4r (2.5.9) - nokogiri (1.15.2) + nokogiri (1.15.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.2-x86_64-linux) + nokogiri (1.15.3-x86_64-linux) racc (~> 1.4) oj (3.15.0) open_uri_redirections (0.2.1) @@ -273,7 +274,7 @@ GEM method_source (~> 1.0) psych (3.3.4) public_suffix (5.0.1) - puma (5.6.5) + puma (5.6.6) nio4r (~> 2.0) racc (1.7.1) rack (2.2.7) @@ -297,8 +298,9 @@ GEM activesupport (= 7.0.3) bundler (>= 1.15.0) railties (= 7.0.3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-html-sanitizer (1.6.0) loofah (~> 2.21) @@ -352,9 +354,10 @@ GEM rspec-expectations (~> 3.12) rspec-mocks (~> 3.12) rspec-support (~> 3.12) - rspec-support (3.12.0) - rubocop (1.52.1) + rspec-support (3.12.1) + rubocop (1.54.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) @@ -392,7 +395,7 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sshkit (1.21.4) + sshkit (1.21.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) stackprof (0.2.25) @@ -409,7 +412,7 @@ GEM tilt (2.2.0) time (0.2.2) date - timeout (0.3.2) + timeout (0.4.0) turbo-rails (1.4.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) @@ -425,7 +428,7 @@ GEM unf_ext unf_ext (0.0.8.2) unicode-display_width (2.4.2) - uri (0.12.1) + uri (0.12.2) view_component (2.82.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) diff --git a/app/controllers/agents_controller.rb b/app/controllers/agents_controller.rb index 3be5bfcd1..b613cf87d 100644 --- a/app/controllers/agents_controller.rb +++ b/app/controllers/agents_controller.rb @@ -113,7 +113,7 @@ def update_agent(id = params[:id], params) end def agent_params - p = params.permit(:agentType, :name, :acronym, :homepage, + p = params.permit(:agentType, :name, :email, :acronym, :homepage, :creator, { identifiers: [:notation, :schemaAgency, :creator] }, { affiliations: [:id, :agentType, :name, :homepage, :acronym, :creator, { identifiers: [:notation, :schemaAgency, :creator] }] } diff --git a/app/views/agents/_form.html.haml b/app/views/agents/_form.html.haml index 6366df42c..b874cdb1d 100644 --- a/app/views/agents/_form.html.haml +++ b/app/views/agents/_form.html.haml @@ -26,6 +26,12 @@ %span.asterik * %td.top = text_field_tag agent_field_name(:name, name_prefix), agent.name, class: "form-control" + %tr + %th + Email + %span.asterik * + %td.top + = email_field_tag agent_field_name(:email, name_prefix), agent.name, class: "form-control" %tr %th Acronym From d86eaff1a97c843bea549cf6359d27724a9bf597 Mon Sep 17 00:00:00 2001 From: SirineMhedhbi <31127782+SirineMhedhbi@users.noreply.github.com> Date: Fri, 7 Jul 2023 15:19:40 +0200 Subject: [PATCH 274/533] Fix: bug of display list submitted ontologies of account setting (#286) * fix display list of views of ontologies in Submitted ontologies #270 --- app/controllers/home_controller.rb | 2 +- app/views/users/show.html.haml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index c56da890e..69c0673bd 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -135,7 +135,7 @@ def account @user_ontologies = @user.customOntology @user_ontologies ||= [] - onts = LinkedData::Client::Models::Ontology.all + onts = LinkedData::Client::Models::Ontology.all(include_views: true); @admin_ontologies = onts.select { |o| o.administeredBy.include? @user.id } projects = LinkedData::Client::Models::Project.all diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index bf3657498..bc32a61ab 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -113,6 +113,10 @@ - @admin_ontologies.each do |ont| .account-page-submitted-ontology{data: {controller: 'tooltip'}, title: ont.name} %a{href: "/ontologies/#{ont.acronym}"}= ont.acronym + - unless ont.views.nil? || ont.views.empty? + - ont.views.each do |view| + .account-page-submitted-ontology{data: {controller: 'tooltip'}, title: ont.name} + %a{href: "/ontologies/#{view.match(/\/([^\/]+)$/)[1]}"}= view.match(/\/([^\/]+)$/)[1] - unless @user_projects.nil? || @user_projects.empty? - no_ontologies = false .account-page-card From 9f172876caa12ec2bbd44c82ee7cb53228a8f0e5 Mon Sep 17 00:00:00 2001 From: SirineMhedhbi <31127782+SirineMhedhbi@users.noreply.github.com> Date: Fri, 7 Jul 2023 15:24:21 +0200 Subject: [PATCH 275/533] fix bug of display text in alert when there is no collections (#285) fix the alert message text that is wrapping and overflowing out #266 --- app/components/alert_message_component.rb | 2 +- .../alert_message_component/alert_message_component.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/alert_message_component.rb b/app/components/alert_message_component.rb index 1ef3b185c..09ece182b 100644 --- a/app/components/alert_message_component.rb +++ b/app/components/alert_message_component.rb @@ -2,7 +2,7 @@ class AlertMessageComponent < ViewComponent::Base include Turbo::FramesHelper - def initialize(id: '', message: '', type: 'info', closeable: true) + def initialize(id: '', message: nil, type: 'info', closeable: true) @id = id @message = message @type = "alert-#{type}" diff --git a/app/components/alert_message_component/alert_message_component.html.haml b/app/components/alert_message_component/alert_message_component.html.haml index 107ab14ac..c32ec7d3c 100644 --- a/app/components/alert_message_component/alert_message_component.html.haml +++ b/app/components/alert_message_component/alert_message_component.html.haml @@ -1,5 +1,5 @@ -.alert.alert-dismissible.fade.show{:role => "alert", class: "#{@type}", style: "text-align: left"} - = @message +.alert.alert-dismissible.fade.show{:role => "alert", class: "#{@type}", style: "text-align: left;white-space: normal;"} + = @message || content - if @closeable %button.close{"aria-label": "Close", "data-dismiss": "alert", type: "button", style: "background: transparent"} From f433f514756c319bfda5f67b403c6634d39b22a6 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Mon, 10 Jul 2023 10:10:31 +0200 Subject: [PATCH 276/533] refactor code to remove list of views ontologies --- app/views/users/show.html.haml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index bc32a61ab..bf3657498 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -113,10 +113,6 @@ - @admin_ontologies.each do |ont| .account-page-submitted-ontology{data: {controller: 'tooltip'}, title: ont.name} %a{href: "/ontologies/#{ont.acronym}"}= ont.acronym - - unless ont.views.nil? || ont.views.empty? - - ont.views.each do |view| - .account-page-submitted-ontology{data: {controller: 'tooltip'}, title: ont.name} - %a{href: "/ontologies/#{view.match(/\/([^\/]+)$/)[1]}"}= view.match(/\/([^\/]+)$/)[1] - unless @user_projects.nil? || @user_projects.empty? - no_ontologies = false .account-page-card From eb6504a8395fd0c79acde58d189de6b398b8697c Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 10 Jul 2023 14:41:26 +0000 Subject: [PATCH 277/533] add Upload file input component to lookbook --- .../stylesheets/application.css.scss.erb | 1 - .../components/file_input_loader.scss | 54 +++++++++++++++++++ app/assets/stylesheets/components/index.scss | 3 +- app/assets/stylesheets/file_uploader.scss | 53 ------------------ .../file_input_loader_component.html.haml | 9 ++-- .../file_input_loader_component_preview.rb | 9 ++++ 6 files changed, 70 insertions(+), 59 deletions(-) create mode 100644 app/assets/stylesheets/components/file_input_loader.scss delete mode 100644 app/assets/stylesheets/file_uploader.scss create mode 100644 test/components/previews/file_input_loader_component_preview.rb diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index 03a6c9d11..03650e79d 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -41,7 +41,6 @@ @import "ontolobridge"; @import "fair_assement"; @import "instances_table"; -@import "file_uploader"; @import "register"; @import "lostpassword"; @import "flatpickr/dist/themes/light"; diff --git a/app/assets/stylesheets/components/file_input_loader.scss b/app/assets/stylesheets/components/file_input_loader.scss new file mode 100644 index 000000000..029ab9f71 --- /dev/null +++ b/app/assets/stylesheets/components/file_input_loader.scss @@ -0,0 +1,54 @@ +.file_uploader { + color: #D7D7EF; + font-family: 'Lato', sans-serif; + border: 1px dashed #CFCFCF; + border-radius: 5px; +} + +.file-message { + display: flex; + margin-top: 10px; + font-size: 12px; + color: #888888; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.file_uploader>h2 { + margin: 50px 0; +} + +.file-drop-area { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + width: 100%; + padding: 25px; + transition: 0.2s; + position: relative; +} + +.choose-file-button { + flex-shrink: 0; + background-color: rgba(255, 255, 255, 0.04); + border: 1px solid rgba(255, 255, 255, 0.1); + border-radius: 3px; + padding: 8px 15px; + margin-right: 10px; + font-size: 12px; + text-transform: uppercase; +} + +.file-input { + height: 100%; + width: 100%; + cursor: pointer; + opacity: 0; + position: absolute; +} + +.file-drop-area svg path { + fill: #CECECE; +} \ No newline at end of file diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 54d9c03eb..d235e0cbc 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -8,4 +8,5 @@ @import 'field_container'; @import 'input_field'; @import 'select'; -@import 'text_area'; \ No newline at end of file +@import 'text_area'; +@import 'file_input_loader'; \ No newline at end of file diff --git a/app/assets/stylesheets/file_uploader.scss b/app/assets/stylesheets/file_uploader.scss deleted file mode 100644 index 96c03f823..000000000 --- a/app/assets/stylesheets/file_uploader.scss +++ /dev/null @@ -1,53 +0,0 @@ -.file_uploader { - color: #D7D7EF; - font-family: 'Lato', sans-serif; -} - -.file_uploader > h2 { - margin: 50px 0; -} - - -.file-drop-area { - position: relative; - display: flex; - align-items: center; - width: 450px; - max-width: 100%; - padding: 25px; - border: 1px dashed rgba(255, 255, 255, 0.4); - border-radius: 3px; - transition: 0.2s; - -} - -.choose-file-button { - flex-shrink: 0; - background-color: rgba(255, 255, 255, 0.04); - border: 1px solid rgba(255, 255, 255, 0.1); - border-radius: 3px; - padding: 8px 15px; - margin-right: 10px; - font-size: 12px; - text-transform: uppercase; -} - -.file-message { - font-size: small; - font-weight: 300; - line-height: 1.4; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.file-input { - position: absolute; - left: 0; - top: 0; - height: 100%; - width: 100%; - cursor: pointer; - opacity: 0; - -} \ No newline at end of file diff --git a/app/components/file_input_loader_component/file_input_loader_component.html.haml b/app/components/file_input_loader_component/file_input_loader_component.html.haml index 8c807b7e2..9c30c70d2 100644 --- a/app/components/file_input_loader_component/file_input_loader_component.html.haml +++ b/app/components/file_input_loader_component/file_input_loader_component.html.haml @@ -1,5 +1,6 @@ -.file_uploader.d-flex.justify-content-center.p-2.bg-secondary{data: {controller: "file-input"}} +.file_uploader{data: {controller: "file-input"}} .file-drop-area.w-100 - %span.choose-file-button Choose file - %span.file-message{data:{'file-input': {target: 'message'}}} or drag and drop file here - = file_field_tag @name, class: 'file-input', data:{'file-input-target': 'input', action: 'file-input#updateMessage'} + %svg{fill: "none", height: "47", viewbox: "0 0 64 47", width: "64", xmlns: "http://www.w3.org/2000/svg"} + %path{d: "M50.0074 46.568H36.2763V32.6931H40.8141C41.9649 32.6931 42.6449 31.3854 41.9649 30.4438L33.1377 18.2297C32.5754 17.445 31.4115 17.445 30.8492 18.2297L22.0221 30.4438C21.342 31.3854 22.009 32.6931 23.1729 32.6931H27.7107V46.568H12.3318C5.46629 46.1888 0 39.7679 0 32.8108C0 28.0114 2.60237 23.8267 6.46016 21.5644C6.10707 20.6097 5.92399 19.5897 5.92399 18.5174C5.92399 13.6134 9.88639 9.651 14.7904 9.651C15.8496 9.651 16.8696 9.83408 17.8243 10.1872C20.662 4.17164 26.7822 0 33.8962 0C43.1026 0.0130772 50.6874 7.06171 51.5505 16.0458C58.6253 17.262 64 23.8137 64 31.2284C64 39.1532 57.8275 46.0188 50.0074 46.568Z", fill: "#CECECE"} + %span.file-message{data:{'file-input': {target: 'message'}}} Drop your file here or, browse files on your device. + = file_field_tag @name, class: 'file-input', data:{'file-input-target': 'input', action: 'file-input#updateMessage'} \ No newline at end of file diff --git a/test/components/previews/file_input_loader_component_preview.rb b/test/components/previews/file_input_loader_component_preview.rb new file mode 100644 index 000000000..89986e4f5 --- /dev/null +++ b/test/components/previews/file_input_loader_component_preview.rb @@ -0,0 +1,9 @@ +class FileInputLoaderComponentPreview < ViewComponent::Preview + + + def default + render FileInputLoaderComponent.new(name: "file") + end + + +end \ No newline at end of file From 13d5e8d21e9709e80d8b6fecdb9d45da3a56758f Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 11 Jul 2023 19:30:09 +0000 Subject: [PATCH 278/533] combine all input components in one globale component --- app/assets/stylesheets/components/index.scss | 1 - app/assets/stylesheets/components/select.scss | 18 ------------------ app/components/input_field_component.rb | 3 ++- .../input_field_component.html.haml | 11 ++++++++++- app/components/select_component.rb | 9 --------- .../select_component.html.haml | 5 ----- .../previews/input_field_component_preview.rb | 8 +++++++- .../previews/select_component_preview.rb | 9 --------- 8 files changed, 19 insertions(+), 45 deletions(-) delete mode 100644 app/assets/stylesheets/components/select.scss delete mode 100644 app/components/select_component.rb delete mode 100644 app/components/select_component/select_component.html.haml delete mode 100644 test/components/previews/select_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index d235e0cbc..f70d94cdb 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -7,6 +7,5 @@ @import 'dropdown'; @import 'field_container'; @import 'input_field'; -@import 'select'; @import 'text_area'; @import 'file_input_loader'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/select.scss b/app/assets/stylesheets/components/select.scss deleted file mode 100644 index 10fe26e66..000000000 --- a/app/assets/stylesheets/components/select.scss +++ /dev/null @@ -1,18 +0,0 @@ -.select-component{ - margin-top: 5px; - width: 100%; - font-size: 13px; - padding: 10px; - border: 1px solid #BDBDBD; - border-radius: 5px; - outline: none; - cursor: pointer; -} -.select-component:focus { - border: 1px solid var(--primary-color); -} - -.select-label { - font-size: 12px; - color: #666666; -} \ No newline at end of file diff --git a/app/components/input_field_component.rb b/app/components/input_field_component.rb index 85130f375..b49da44f6 100644 --- a/app/components/input_field_component.rb +++ b/app/components/input_field_component.rb @@ -1,9 +1,10 @@ class InputFieldComponent < ViewComponent::Base - def initialize(label: , name:, type: "text", width: "100%", margin_bottom: "0px") + def initialize(label: , name:, type: "text", choices:[], width: "100%", margin_bottom: "0px") @label = label @name = name @type = type @width = width + @choices = choices @margin_bottom = margin_bottom end end \ No newline at end of file diff --git a/app/components/input_field_component/input_field_component.html.haml b/app/components/input_field_component/input_field_component.html.haml index 148a20fe9..fa2841231 100644 --- a/app/components/input_field_component/input_field_component.html.haml +++ b/app/components/input_field_component/input_field_component.html.haml @@ -1,4 +1,13 @@ %div .text-input-label = @label - %input.input-field-component.text-input{name: @name, type: @type, style: "margin-bottom: #{@margin_bottom}; width: #{@width};"} \ No newline at end of file + + - if @type == "select" + %select.select-component{style: "margin-bottom: #{@margin_bottom}; width: #{@width};", name: @name} + - @choices.each do |choice| + %option{:value => choice}= choice + - else + %input.input-field-component.text-input{name: @name, type: @type, style: "margin-bottom: #{@margin_bottom}; width: #{@width};"} + + + \ No newline at end of file diff --git a/app/components/select_component.rb b/app/components/select_component.rb deleted file mode 100644 index 4f99f2523..000000000 --- a/app/components/select_component.rb +++ /dev/null @@ -1,9 +0,0 @@ -class SelectComponent < ViewComponent::Base - def initialize(label: , name:, choices:, width: "100%", margin_bottom: "0px" ) - @label = label - @name = name - @choices = choices - @width = width - @margin_bottom = margin_bottom - end -end \ No newline at end of file diff --git a/app/components/select_component/select_component.html.haml b/app/components/select_component/select_component.html.haml deleted file mode 100644 index bdeb268fa..000000000 --- a/app/components/select_component/select_component.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -.select-label - = @label -%select.select-component{style: "margin-bottom: #{@margin_bottom}; width: #{@width};", name: @name} - - @choices.each do |choice| - %option{:value => choice}= choice \ No newline at end of file diff --git a/test/components/previews/input_field_component_preview.rb b/test/components/previews/input_field_component_preview.rb index 3605b9054..b0a52cd5a 100644 --- a/test/components/previews/input_field_component_preview.rb +++ b/test/components/previews/input_field_component_preview.rb @@ -9,7 +9,13 @@ def default(label: "Label") # @param label text def date(label: "Label") - render InputFieldComponent.new(label: label, name: "name", type: "text", width: "100%", margin_bottom: "0", type: "date") + render InputFieldComponent.new(label: label, name: "name", type: "date", width: "100%", margin_bottom: "0") + end + + # @param label text + + def select(label: "Label") + render InputFieldComponent.new(label: label, name: "name", type: "select", choices: ["bilel", "kihal", "best"], width: "100%", margin_bottom: "0") end diff --git a/test/components/previews/select_component_preview.rb b/test/components/previews/select_component_preview.rb deleted file mode 100644 index a5e2bbbdd..000000000 --- a/test/components/previews/select_component_preview.rb +++ /dev/null @@ -1,9 +0,0 @@ -class SelectComponentPreview < ViewComponent::Preview - - # @param label text - - def default(label: "Label") - render SelectComponent.new(label: label, name: "name", choices: ["choice 1", "choice 2", "choice 3"], width: "100%", margin_bottom: "0") - end - -end \ No newline at end of file From 192f73e33ba2c115d9ce64f5b4205c35914d7701 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 11 Jul 2023 19:37:19 +0000 Subject: [PATCH 279/533] remove style params from input field component --- app/components/input_field_component.rb | 4 +--- .../input_field_component/input_field_component.html.haml | 4 ++-- test/components/previews/input_field_component_preview.rb | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/components/input_field_component.rb b/app/components/input_field_component.rb index b49da44f6..ce1a40311 100644 --- a/app/components/input_field_component.rb +++ b/app/components/input_field_component.rb @@ -1,10 +1,8 @@ class InputFieldComponent < ViewComponent::Base - def initialize(label: , name:, type: "text", choices:[], width: "100%", margin_bottom: "0px") + def initialize(label: , name:, type: "text", choices:[]) @label = label @name = name @type = type - @width = width @choices = choices - @margin_bottom = margin_bottom end end \ No newline at end of file diff --git a/app/components/input_field_component/input_field_component.html.haml b/app/components/input_field_component/input_field_component.html.haml index fa2841231..1a646a595 100644 --- a/app/components/input_field_component/input_field_component.html.haml +++ b/app/components/input_field_component/input_field_component.html.haml @@ -3,11 +3,11 @@ = @label - if @type == "select" - %select.select-component{style: "margin-bottom: #{@margin_bottom}; width: #{@width};", name: @name} + %select.input-field-component{name: @name} - @choices.each do |choice| %option{:value => choice}= choice - else - %input.input-field-component.text-input{name: @name, type: @type, style: "margin-bottom: #{@margin_bottom}; width: #{@width};"} + %input.input-field-component.text-input{name: @name, type: @type} \ No newline at end of file diff --git a/test/components/previews/input_field_component_preview.rb b/test/components/previews/input_field_component_preview.rb index b0a52cd5a..08ffc5fbe 100644 --- a/test/components/previews/input_field_component_preview.rb +++ b/test/components/previews/input_field_component_preview.rb @@ -3,19 +3,19 @@ class InputFieldComponentPreview < ViewComponent::Preview # @param label text def default(label: "Label") - render InputFieldComponent.new(label: label, name: "name", type: "text", width: "100%", margin_bottom: "0") + render InputFieldComponent.new(label: label, name: "name", type: "text") end # @param label text def date(label: "Label") - render InputFieldComponent.new(label: label, name: "name", type: "date", width: "100%", margin_bottom: "0") + render InputFieldComponent.new(label: label, name: "name", type: "date") end # @param label text def select(label: "Label") - render InputFieldComponent.new(label: label, name: "name", type: "select", choices: ["bilel", "kihal", "best"], width: "100%", margin_bottom: "0") + render InputFieldComponent.new(label: label, name: "name", type: "select", choices: ["bilel", "kihal", "best"]) end From 8f565005efac4196fe21e9e980865625ef45b2b7 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 11 Jul 2023 19:47:05 +0000 Subject: [PATCH 280/533] recover text area field component (after deleting it by mistake in a previous commit --- app/assets/stylesheets/components/index.scss | 3 ++- .../stylesheets/components/text_area_field.scss | 14 ++++++++++++++ app/components/text_area_field_component.rb | 12 ++++++++++++ .../text_area_field_component.html.haml | 5 +++++ .../previews/text_area_field_component_preview.rb | 13 +++++++++++++ 5 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/components/text_area_field.scss create mode 100644 app/components/text_area_field_component.rb create mode 100644 app/components/text_area_field_component/text_area_field_component.html.haml create mode 100644 test/components/previews/text_area_field_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index f70d94cdb..929de0d53 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -8,4 +8,5 @@ @import 'field_container'; @import 'input_field'; @import 'text_area'; -@import 'file_input_loader'; \ No newline at end of file +@import 'file_input_loader'; +@import 'text_area_field'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/text_area_field.scss b/app/assets/stylesheets/components/text_area_field.scss new file mode 100644 index 000000000..6f50aa4bc --- /dev/null +++ b/app/assets/stylesheets/components/text_area_field.scss @@ -0,0 +1,14 @@ +.text-content { + overflow: hidden; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: var(--read-more-line-clamp, 5); +} + + +.see_more_text { + color: var(--primary-color); + font-size: 15px; + margin-top: 10px; + text-align: end; +} \ No newline at end of file diff --git a/app/components/text_area_field_component.rb b/app/components/text_area_field_component.rb new file mode 100644 index 000000000..5da424e33 --- /dev/null +++ b/app/components/text_area_field_component.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class TextAreaFieldComponent < ViewComponent::Base + + def initialize(value: , see_more_text:'See more...' , see_less_text: 'See less...') + super + @value = value + @see_more_text = see_more_text + @see_less_text = see_less_text + end + +end \ No newline at end of file diff --git a/app/components/text_area_field_component/text_area_field_component.html.haml b/app/components/text_area_field_component/text_area_field_component.html.haml new file mode 100644 index 000000000..40226b7e5 --- /dev/null +++ b/app/components/text_area_field_component/text_area_field_component.html.haml @@ -0,0 +1,5 @@ +%div{data:{controller:"text-truncate", 'text-truncate-more-text-value': @see_more_text , 'text-truncate-less-text-value': @see_less_text}} + %p.text-content{'data-text-truncate-target': 'content'} + = @value + %p.see_more_text{data:{'text-truncate-target': 'button', 'action':"click->text-truncate#toggle"}} + = @see_more_text \ No newline at end of file diff --git a/test/components/previews/text_area_field_component_preview.rb b/test/components/previews/text_area_field_component_preview.rb new file mode 100644 index 000000000..2d6cfa7b7 --- /dev/null +++ b/test/components/previews/text_area_field_component_preview.rb @@ -0,0 +1,13 @@ +class TextAreaFieldComponentPreview < ViewComponent::Preview + + + # @param value textarea + def default(value: '') + render TextAreaFieldComponent.new(value: value.empty? ? (long_text + long_text) : value ) + end + + private + def long_text + "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum." + end +end \ No newline at end of file From 225d3dc24ebad5ec648c855ce2166586da6782ad Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 11 Jul 2023 20:00:35 +0000 Subject: [PATCH 281/533] use inline svg in file input loader component --- app/assets/images/upload-file.svg | 3 +++ .../file_input_loader_component.html.haml | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 app/assets/images/upload-file.svg diff --git a/app/assets/images/upload-file.svg b/app/assets/images/upload-file.svg new file mode 100644 index 000000000..0693d1e9b --- /dev/null +++ b/app/assets/images/upload-file.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/components/file_input_loader_component/file_input_loader_component.html.haml b/app/components/file_input_loader_component/file_input_loader_component.html.haml index 9c30c70d2..47c406905 100644 --- a/app/components/file_input_loader_component/file_input_loader_component.html.haml +++ b/app/components/file_input_loader_component/file_input_loader_component.html.haml @@ -1,6 +1,5 @@ .file_uploader{data: {controller: "file-input"}} .file-drop-area.w-100 - %svg{fill: "none", height: "47", viewbox: "0 0 64 47", width: "64", xmlns: "http://www.w3.org/2000/svg"} - %path{d: "M50.0074 46.568H36.2763V32.6931H40.8141C41.9649 32.6931 42.6449 31.3854 41.9649 30.4438L33.1377 18.2297C32.5754 17.445 31.4115 17.445 30.8492 18.2297L22.0221 30.4438C21.342 31.3854 22.009 32.6931 23.1729 32.6931H27.7107V46.568H12.3318C5.46629 46.1888 0 39.7679 0 32.8108C0 28.0114 2.60237 23.8267 6.46016 21.5644C6.10707 20.6097 5.92399 19.5897 5.92399 18.5174C5.92399 13.6134 9.88639 9.651 14.7904 9.651C15.8496 9.651 16.8696 9.83408 17.8243 10.1872C20.662 4.17164 26.7822 0 33.8962 0C43.1026 0.0130772 50.6874 7.06171 51.5505 16.0458C58.6253 17.262 64 23.8137 64 31.2284C64 39.1532 57.8275 46.0188 50.0074 46.568Z", fill: "#CECECE"} + = inline_svg_tag "upload-file.svg" %span.file-message{data:{'file-input': {target: 'message'}}} Drop your file here or, browse files on your device. = file_field_tag @name, class: 'file-input', data:{'file-input-target': 'input', action: 'file-input#updateMessage'} \ No newline at end of file From 1595b69d5881da339dbdeed147b29a3035828b39 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 11 Jul 2023 21:00:36 +0000 Subject: [PATCH 282/533] add hint to text input component --- app/components/input_field_component.rb | 3 ++- .../input_field_component.html.haml | 7 ++++--- .../previews/input_field_component_preview.rb | 10 +++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/components/input_field_component.rb b/app/components/input_field_component.rb index ce1a40311..db407a673 100644 --- a/app/components/input_field_component.rb +++ b/app/components/input_field_component.rb @@ -1,8 +1,9 @@ class InputFieldComponent < ViewComponent::Base - def initialize(label: , name:, type: "text", choices:[]) + def initialize(label: "" , name:, type: "text", choices:[], hint: "") @label = label @name = name @type = type @choices = choices + @hint = hint end end \ No newline at end of file diff --git a/app/components/input_field_component/input_field_component.html.haml b/app/components/input_field_component/input_field_component.html.haml index 1a646a595..0027ac9a1 100644 --- a/app/components/input_field_component/input_field_component.html.haml +++ b/app/components/input_field_component/input_field_component.html.haml @@ -1,13 +1,14 @@ %div - .text-input-label - = @label + - unless @label == "" + .text-input-label + = @label - if @type == "select" %select.input-field-component{name: @name} - @choices.each do |choice| %option{:value => choice}= choice - else - %input.input-field-component.text-input{name: @name, type: @type} + %input.input-field-component.text-input{name: @name, type: @type, placeholder: @hint} \ No newline at end of file diff --git a/test/components/previews/input_field_component_preview.rb b/test/components/previews/input_field_component_preview.rb index 08ffc5fbe..d1588e0e3 100644 --- a/test/components/previews/input_field_component_preview.rb +++ b/test/components/previews/input_field_component_preview.rb @@ -1,17 +1,21 @@ class InputFieldComponentPreview < ViewComponent::Preview + # @param label text - - def default(label: "Label") - render InputFieldComponent.new(label: label, name: "name", type: "text") + # @param hint text + + def default(label: "Label", hint: "") + render InputFieldComponent.new(label: label, name: "name", type: "text", hint: hint) end + # @param label text def date(label: "Label") render InputFieldComponent.new(label: label, name: "name", type: "date") end + # @param label text def select(label: "Label") From 51eb8ba6f3c9a616fbbc68f253d9f63b11f75552 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 11 Jul 2023 22:02:29 +0000 Subject: [PATCH 283/533] add error state to input field component --- .../stylesheets/components/input_field.scss | 5 +++++ app/assets/stylesheets/theme-variables.scss.erb | 10 ++++++++++ app/components/input_field_component.rb | 3 ++- .../input_field_component.html.haml | 14 ++++++++++++-- .../previews/input_field_component_preview.rb | 15 +++++++++------ 5 files changed, 38 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/components/input_field.scss b/app/assets/stylesheets/components/input_field.scss index ad904a6d8..dbb0dc1b4 100644 --- a/app/assets/stylesheets/components/input_field.scss +++ b/app/assets/stylesheets/components/input_field.scss @@ -16,4 +16,9 @@ .text-input-label{ font-size: 12px; color: #666666; +} + +.error-text{ + font-size: 12px; + color: var(--error-color) } \ No newline at end of file diff --git a/app/assets/stylesheets/theme-variables.scss.erb b/app/assets/stylesheets/theme-variables.scss.erb index d442f5a8f..f7c8786d2 100644 --- a/app/assets/stylesheets/theme-variables.scss.erb +++ b/app/assets/stylesheets/theme-variables.scss.erb @@ -7,6 +7,7 @@ --hover-color: #40C811; --secondary-color: #ffc107; --light-color: #F1FAED; + --error-color: #EB4335; } <% when "stageportal" %> :root{ @@ -14,6 +15,7 @@ --hover-color: #6B96B7; --secondary-color: #ffc107; --light-color: #F1F6FA; + --error-color: #EB4335; } <% when "bioportal" %> :root{ @@ -21,6 +23,7 @@ --hover-color: #6B96B7; --secondary-color: #ffc107; --light-color: #F1F6FA; + --error-color: #EB4335; } <% when "ontoportal" %> :root{ @@ -28,7 +31,14 @@ --hover-color: #7BABB6; --secondary-color: #ffc107; --light-color: #F0F5F6; + --error-color: #EB4335; } <%# Here to add a new theme ... %> <% end %> <% end %> + + + + + + diff --git a/app/components/input_field_component.rb b/app/components/input_field_component.rb index db407a673..5fe68242f 100644 --- a/app/components/input_field_component.rb +++ b/app/components/input_field_component.rb @@ -1,9 +1,10 @@ class InputFieldComponent < ViewComponent::Base - def initialize(label: "" , name:, type: "text", choices:[], hint: "") + def initialize(label: "" , name:, type: "text", choices:[], hint: "", error_message: "") @label = label @name = name @type = type @choices = choices @hint = hint + @error_message = error_message end end \ No newline at end of file diff --git a/app/components/input_field_component/input_field_component.html.haml b/app/components/input_field_component/input_field_component.html.haml index 0027ac9a1..0df4a826c 100644 --- a/app/components/input_field_component/input_field_component.html.haml +++ b/app/components/input_field_component/input_field_component.html.haml @@ -3,12 +3,22 @@ .text-input-label = @label + - has_error = @error_message != "" + - if @type == "select" - %select.input-field-component{name: @name} + + %select.input-field-component{name: @name, style: "#{"border-color: var(--error-color);" if has_error}"} - @choices.each do |choice| %option{:value => choice}= choice + - if has_error + .error-text + = @error_message + - else - %input.input-field-component.text-input{name: @name, type: @type, placeholder: @hint} + %input.input-field-component.text-input{name: @name, type: @type, placeholder: @hint, style: "#{"border-color: var(--error-color);" if has_error}"} + - if has_error + .error-text + = @error_message \ No newline at end of file diff --git a/test/components/previews/input_field_component_preview.rb b/test/components/previews/input_field_component_preview.rb index d1588e0e3..f17125667 100644 --- a/test/components/previews/input_field_component_preview.rb +++ b/test/components/previews/input_field_component_preview.rb @@ -3,23 +3,26 @@ class InputFieldComponentPreview < ViewComponent::Preview # @param label text # @param hint text + # @param error_message text - def default(label: "Label", hint: "") - render InputFieldComponent.new(label: label, name: "name", type: "text", hint: hint) + def default(label: "Label", hint: "", error_message: "") + render InputFieldComponent.new(label: label, name: "name", type: "text", hint: hint, error_message: error_message) end # @param label text + # @param error_message text - def date(label: "Label") - render InputFieldComponent.new(label: label, name: "name", type: "date") + def date(label: "Label", error_message: "") + render InputFieldComponent.new(label: label, name: "name", type: "date", error_message: error_message) end # @param label text + # @param error_message text - def select(label: "Label") - render InputFieldComponent.new(label: label, name: "name", type: "select", choices: ["bilel", "kihal", "best"]) + def select(label: "Label", error_message: "") + render InputFieldComponent.new(label: label, name: "name", type: "select", choices: ["choice 1", "choice 2", "choice 3"], error_message: error_message) end From b44eaae1826350d111d8c9bc8d698754629d0d0b Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 11 Jul 2023 22:15:05 +0000 Subject: [PATCH 284/533] add helper text to input field component --- .../stylesheets/components/input_field.scss | 8 +++++++- app/components/input_field_component.rb | 3 ++- .../input_field_component.html.haml | 10 ++++++++-- .../previews/input_field_component_preview.rb | 17 ++++++++++------- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/components/input_field.scss b/app/assets/stylesheets/components/input_field.scss index dbb0dc1b4..80edf8da7 100644 --- a/app/assets/stylesheets/components/input_field.scss +++ b/app/assets/stylesheets/components/input_field.scss @@ -18,7 +18,13 @@ color: #666666; } -.error-text{ +.text-input-error-text{ font-size: 12px; color: var(--error-color) +} + +.text-input-helper-text{ + font-size: 12px; + color: #666666; + margin-top: 5px; } \ No newline at end of file diff --git a/app/components/input_field_component.rb b/app/components/input_field_component.rb index 5fe68242f..f12bfb83a 100644 --- a/app/components/input_field_component.rb +++ b/app/components/input_field_component.rb @@ -1,10 +1,11 @@ class InputFieldComponent < ViewComponent::Base - def initialize(label: "" , name:, type: "text", choices:[], hint: "", error_message: "") + def initialize(label: "" , name:, type: "text", choices:[], hint: "", error_message: "", helper_text: "") @label = label @name = name @type = type @choices = choices @hint = hint @error_message = error_message + @helper_text = helper_text end end \ No newline at end of file diff --git a/app/components/input_field_component/input_field_component.html.haml b/app/components/input_field_component/input_field_component.html.haml index 0df4a826c..a5a841665 100644 --- a/app/components/input_field_component/input_field_component.html.haml +++ b/app/components/input_field_component/input_field_component.html.haml @@ -11,14 +11,20 @@ - @choices.each do |choice| %option{:value => choice}= choice - if has_error - .error-text + .text-input-error-text = @error_message + - unless @helper_text == "" + .text-input-helper-text + = @helper_text - else %input.input-field-component.text-input{name: @name, type: @type, placeholder: @hint, style: "#{"border-color: var(--error-color);" if has_error}"} - if has_error - .error-text + .text-input-error-text = @error_message + - unless @helper_text == "" + .text-input-helper-text + = @helper_text \ No newline at end of file diff --git a/test/components/previews/input_field_component_preview.rb b/test/components/previews/input_field_component_preview.rb index f17125667..599e1e09c 100644 --- a/test/components/previews/input_field_component_preview.rb +++ b/test/components/previews/input_field_component_preview.rb @@ -4,25 +4,28 @@ class InputFieldComponentPreview < ViewComponent::Preview # @param label text # @param hint text # @param error_message text + # @param helper_text text - def default(label: "Label", hint: "", error_message: "") - render InputFieldComponent.new(label: label, name: "name", type: "text", hint: hint, error_message: error_message) + def default(label: "Label", hint: "", error_message: "", helper_text: "") + render InputFieldComponent.new(label: label, name: "name", type: "text", hint: hint, error_message: error_message, helper_text: helper_text) end # @param label text - # @param error_message text + # @param error_message text + # @param helper_text text - def date(label: "Label", error_message: "") - render InputFieldComponent.new(label: label, name: "name", type: "date", error_message: error_message) + def date(label: "Label", error_message: "", helper_text: "") + render InputFieldComponent.new(label: label, name: "name", type: "date", error_message: error_message, helper_text: helper_text) end # @param label text # @param error_message text + # @param helper_text text - def select(label: "Label", error_message: "") - render InputFieldComponent.new(label: label, name: "name", type: "select", choices: ["choice 1", "choice 2", "choice 3"], error_message: error_message) + def select(label: "Label", error_message: "", helper_text: "") + render InputFieldComponent.new(label: label, name: "name", type: "select", choices: ["choice 1", "choice 2", "choice 3"], error_message: error_message, helper_text: helper_text) end From 602caee13e5b3d07dd99e01182babe0edef2d44f Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 11 Jul 2023 22:24:41 +0000 Subject: [PATCH 285/533] add notes to input field component to explain how to use it --- .../previews/input_field_component_preview.rb | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/test/components/previews/input_field_component_preview.rb b/test/components/previews/input_field_component_preview.rb index 599e1e09c..af077d296 100644 --- a/test/components/previews/input_field_component_preview.rb +++ b/test/components/previews/input_field_component_preview.rb @@ -1,6 +1,14 @@ class InputFieldComponentPreview < ViewComponent::Preview + + + + # This is a text input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. # @param label text # @param hint text # @param error_message text @@ -10,7 +18,10 @@ def default(label: "Label", hint: "", error_message: "", helper_text: "") render InputFieldComponent.new(label: label, name: "name", type: "text", hint: hint, error_message: error_message, helper_text: helper_text) end - + # This is a date input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. # @param label text # @param error_message text # @param helper_text text @@ -19,7 +30,10 @@ def date(label: "Label", error_message: "", helper_text: "") render InputFieldComponent.new(label: label, name: "name", type: "date", error_message: error_message, helper_text: helper_text) end - + # This is a text input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. # @param label text # @param error_message text # @param helper_text text From 4034e71f54437c53588e339a23ca05ccc4c046ab Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 11 Jul 2023 22:53:09 +0000 Subject: [PATCH 286/533] combine text area input component with input field component --- app/assets/stylesheets/components/index.scss | 1 - .../stylesheets/components/text_area.scss | 21 ------------------- .../input_field_component.html.haml | 19 +++++++++++++++-- app/components/text_area_component.rb | 8 ------- .../text_area_component.html.haml | 4 ---- .../previews/input_field_component_preview.rb | 17 +++++++++++++++ .../previews/text_area_component_preview.rb | 9 -------- 7 files changed, 34 insertions(+), 45 deletions(-) delete mode 100644 app/assets/stylesheets/components/text_area.scss delete mode 100644 app/components/text_area_component.rb delete mode 100644 app/components/text_area_component/text_area_component.html.haml delete mode 100644 test/components/previews/text_area_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 929de0d53..18898f533 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -7,6 +7,5 @@ @import 'dropdown'; @import 'field_container'; @import 'input_field'; -@import 'text_area'; @import 'file_input_loader'; @import 'text_area_field'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/text_area.scss b/app/assets/stylesheets/components/text_area.scss deleted file mode 100644 index 5ee4146c4..000000000 --- a/app/assets/stylesheets/components/text_area.scss +++ /dev/null @@ -1,21 +0,0 @@ -.text-area-component { - margin-top: 5px; - margin-bottom: 23px; - width: 100%; - font-size: 13px; - padding: 10px; - border: 1px solid #BDBDBD; - border-radius: 5px; - outline: none; - resize: none; - background-color: white; -} - -.text-area-component:focus { - border: 1px solid var(--primary-color); -} - -.text-area-label { - font-size: 12px; - color: #666666; -} \ No newline at end of file diff --git a/app/components/input_field_component/input_field_component.html.haml b/app/components/input_field_component/input_field_component.html.haml index a5a841665..309e7ac20 100644 --- a/app/components/input_field_component/input_field_component.html.haml +++ b/app/components/input_field_component/input_field_component.html.haml @@ -5,8 +5,8 @@ - has_error = @error_message != "" - - if @type == "select" - + - case @type + - when "select" %select.input-field-component{name: @name, style: "#{"border-color: var(--error-color);" if has_error}"} - @choices.each do |choice| %option{:value => choice}= choice @@ -16,6 +16,15 @@ - unless @helper_text == "" .text-input-helper-text = @helper_text + + - when "textarea" + %textarea.input-field-component{name: @name, rows: "5", placeholder: @hint, style: "#{"border-color: var(--error-color);" if has_error}"} + - if has_error + .text-input-error-text + = @error_message + - unless @helper_text == "" + .text-input-helper-text + = @helper_text - else %input.input-field-component.text-input{name: @name, type: @type, placeholder: @hint, style: "#{"border-color: var(--error-color);" if has_error}"} @@ -27,4 +36,10 @@ = @helper_text + + + + + + \ No newline at end of file diff --git a/app/components/text_area_component.rb b/app/components/text_area_component.rb deleted file mode 100644 index 4582e6304..000000000 --- a/app/components/text_area_component.rb +++ /dev/null @@ -1,8 +0,0 @@ -class TextAreaComponent < ViewComponent::Base - def initialize(label: , name:, width: "100%", margin_bottom: "0px" ) - @label = label - @name = name - @width = width - @margin_bottom = margin_bottom - end -end \ No newline at end of file diff --git a/app/components/text_area_component/text_area_component.html.haml b/app/components/text_area_component/text_area_component.html.haml deleted file mode 100644 index 57e07a694..000000000 --- a/app/components/text_area_component/text_area_component.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -%div - .text-area-label - = @label - %textarea.text-area-component{name: @name, rows: "5", style: "margin-bottom: #{@margin_bottom}; width: #{@width};"} \ No newline at end of file diff --git a/test/components/previews/input_field_component_preview.rb b/test/components/previews/input_field_component_preview.rb index af077d296..0d9e023c3 100644 --- a/test/components/previews/input_field_component_preview.rb +++ b/test/components/previews/input_field_component_preview.rb @@ -18,6 +18,23 @@ def default(label: "Label", hint: "", error_message: "", helper_text: "") render InputFieldComponent.new(label: label, name: "name", type: "text", hint: hint, error_message: error_message, helper_text: helper_text) end + + # This is a textarea field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + # @param label text + # @param hint text + # @param error_message text + # @param helper_text text + + def textarea(label: "Label", hint: "", error_message: "", helper_text: "") + render InputFieldComponent.new(label: label, name: "name", type: "textarea", hint: hint, error_message: error_message, helper_text: helper_text) + end + + + # This is a date input field: # - To use it without a label: don't give a value to the param label or leave it empty. # - To put it in error state: define the param error_message with the error message you want to be displayed. diff --git a/test/components/previews/text_area_component_preview.rb b/test/components/previews/text_area_component_preview.rb deleted file mode 100644 index 6d701b980..000000000 --- a/test/components/previews/text_area_component_preview.rb +++ /dev/null @@ -1,9 +0,0 @@ -class TextAreaComponentPreview < ViewComponent::Preview - - # @param label text - - def default(label: "Label") - render TextAreaComponent.new(label: label, name: "name", width: "100%", margin_bottom: "0") - end - -end \ No newline at end of file From a59d056c6c55e2777db93c1158dfca41d595c7d7 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 11 Jul 2023 22:59:53 +0000 Subject: [PATCH 287/533] groupe inputs in one folder in the lookbook --- .../{ => inputs}/file_input_loader_component_preview.rb | 2 +- .../previews/{ => inputs}/input_field_component_preview.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename test/components/previews/{ => inputs}/file_input_loader_component_preview.rb (56%) rename test/components/previews/{ => inputs}/input_field_component_preview.rb (96%) diff --git a/test/components/previews/file_input_loader_component_preview.rb b/test/components/previews/inputs/file_input_loader_component_preview.rb similarity index 56% rename from test/components/previews/file_input_loader_component_preview.rb rename to test/components/previews/inputs/file_input_loader_component_preview.rb index 89986e4f5..7015495ff 100644 --- a/test/components/previews/file_input_loader_component_preview.rb +++ b/test/components/previews/inputs/file_input_loader_component_preview.rb @@ -1,4 +1,4 @@ -class FileInputLoaderComponentPreview < ViewComponent::Preview +class Inputs::FileInputLoaderComponentPreview < ViewComponent::Preview def default diff --git a/test/components/previews/input_field_component_preview.rb b/test/components/previews/inputs/input_field_component_preview.rb similarity index 96% rename from test/components/previews/input_field_component_preview.rb rename to test/components/previews/inputs/input_field_component_preview.rb index 0d9e023c3..4767f4cf2 100644 --- a/test/components/previews/input_field_component_preview.rb +++ b/test/components/previews/inputs/input_field_component_preview.rb @@ -1,4 +1,4 @@ -class InputFieldComponentPreview < ViewComponent::Preview +class Inputs::InputFieldComponentPreview < ViewComponent::Preview From 76c4f61745d19f3d5a4a866d6fd7a489485a7e28 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 11 Jul 2023 23:43:27 +0000 Subject: [PATCH 288/533] fix style issues in input field component --- app/assets/stylesheets/components/input_field.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/components/input_field.scss b/app/assets/stylesheets/components/input_field.scss index 80edf8da7..2ca9a7e74 100644 --- a/app/assets/stylesheets/components/input_field.scss +++ b/app/assets/stylesheets/components/input_field.scss @@ -1,5 +1,4 @@ .input-field-component{ - margin-top: 5px; width: 100%; font-size: 13px; padding: 10px; @@ -16,6 +15,7 @@ .text-input-label{ font-size: 12px; color: #666666; + margin-bottom: 5px; } .text-input-error-text{ From 4179b78f302e99aede7987afd1c3dfb1bff6bd6c Mon Sep 17 00:00:00 2001 From: SirineMhedhbi <31127782+SirineMhedhbi@users.noreply.github.com> Date: Wed, 12 Jul 2023 10:25:20 +0200 Subject: [PATCH 289/533] Fix bug of select list view of ontology (#289) * Add Chosen.js functionality to fix bug of select views of ontolgy * Add Chosen.js functionality for list views ontologies * fix bug of update ontology where there is no view * Refactor code * Delete ponse = @ontology.update --- app/controllers/ontologies_controller.rb | 1 + app/views/shared/_ontology_picker_single.html.erb | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index c8d38d335..c1d76eab6 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -418,6 +418,7 @@ def update # Note: find_by_acronym includes ontology views @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology][:acronym] || params[:id]).first @ontology.update_from_params(ontology_params) + @ontology.viewOf = nil if @ontology.isView.eql? "0" error_response = @ontology.update if response_error?(error_response) @categories = LinkedData::Client::Models::Category.all diff --git a/app/views/shared/_ontology_picker_single.html.erb b/app/views/shared/_ontology_picker_single.html.erb index dbcb73125..53e2b4f9d 100644 --- a/app/views/shared/_ontology_picker_single.html.erb +++ b/app/views/shared/_ontology_picker_single.html.erb @@ -10,8 +10,17 @@ <%disabled ||= nil%> From a46e007e9bf5e30bdb0ff36a44b30b546506d953 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 12 Jul 2023 12:00:17 +0000 Subject: [PATCH 290/533] refactor input field component code to remove repetition --- app/components/input_field_component.rb | 4 ++- .../input_field_component.html.haml | 34 ++++++------------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/app/components/input_field_component.rb b/app/components/input_field_component.rb index f12bfb83a..0d628ab8d 100644 --- a/app/components/input_field_component.rb +++ b/app/components/input_field_component.rb @@ -8,4 +8,6 @@ def initialize(label: "" , name:, type: "text", choices:[], hint: "", error_mess @error_message = error_message @helper_text = helper_text end -end \ No newline at end of file +end + + diff --git a/app/components/input_field_component/input_field_component.html.haml b/app/components/input_field_component/input_field_component.html.haml index 309e7ac20..ea03b1d47 100644 --- a/app/components/input_field_component/input_field_component.html.haml +++ b/app/components/input_field_component/input_field_component.html.haml @@ -4,36 +4,24 @@ = @label - has_error = @error_message != "" + - border_style = "#{"border-color: var(--error-color);" if has_error}" - case @type - when "select" - %select.input-field-component{name: @name, style: "#{"border-color: var(--error-color);" if has_error}"} + %select.input-field-component{name: @name, style: border_style} - @choices.each do |choice| %option{:value => choice}= choice - - if has_error - .text-input-error-text - = @error_message - - unless @helper_text == "" - .text-input-helper-text - = @helper_text - - when "textarea" - %textarea.input-field-component{name: @name, rows: "5", placeholder: @hint, style: "#{"border-color: var(--error-color);" if has_error}"} - - if has_error - .text-input-error-text - = @error_message - - unless @helper_text == "" - .text-input-helper-text - = @helper_text - + %textarea.input-field-component{name: @name, rows: "5", placeholder: @hint, style: border_style} - else - %input.input-field-component.text-input{name: @name, type: @type, placeholder: @hint, style: "#{"border-color: var(--error-color);" if has_error}"} - - if has_error - .text-input-error-text - = @error_message - - unless @helper_text == "" - .text-input-helper-text - = @helper_text + %input.input-field-component.text-input{name: @name, type: @type, placeholder: @hint, style: border_style} + - if has_error + .text-input-error-text + = @error_message + - unless @helper_text == "" + .text-input-helper-text + = @helper_text + From cfd373a42fd93174bc2ac02ef32830538337f5c2 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 12 Jul 2023 19:11:25 +0200 Subject: [PATCH 291/533] remove the duplicated alert component preview --- test/components/previews/alert_component_preview.rb | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 test/components/previews/alert_component_preview.rb diff --git a/test/components/previews/alert_component_preview.rb b/test/components/previews/alert_component_preview.rb deleted file mode 100644 index 23e6bb3a7..000000000 --- a/test/components/previews/alert_component_preview.rb +++ /dev/null @@ -1,12 +0,0 @@ -class AlertComponentPreview < ViewComponent::Preview - - # @param message text - # @param type select [primary, danger, success, info, light] - - def default(type: "success", message: "Here we can type a success or failure message to the user") - render AlertMessageComponent.new(id: '', type: type) do - message - end - end - -end \ No newline at end of file From 7e01a59be31343b6434a66a92dd9105e624cf69c Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 12 Jul 2023 19:22:11 +0200 Subject: [PATCH 292/533] make the input field component generic using a the content slot --- app/components/input_field_component.rb | 25 ++++++-- .../input_field_component.html.haml | 39 +++++------- .../inputs/input_field_component_preview.rb | 63 ------------------- 3 files changed, 38 insertions(+), 89 deletions(-) delete mode 100644 test/components/previews/inputs/input_field_component_preview.rb diff --git a/app/components/input_field_component.rb b/app/components/input_field_component.rb index 0d628ab8d..d455109ea 100644 --- a/app/components/input_field_component.rb +++ b/app/components/input_field_component.rb @@ -1,12 +1,29 @@ class InputFieldComponent < ViewComponent::Base - def initialize(label: "" , name:, type: "text", choices:[], hint: "", error_message: "", helper_text: "") + def initialize(label: "" , name:, value: 'Syphax', type: 'text', placeholder: "", error_message: "", helper_text: "") @label = label @name = name - @type = type - @choices = choices - @hint = hint + @placeholder = placeholder @error_message = error_message @helper_text = helper_text + @value = value + @type = type + end + + + def error_style + "border-color: var(--error-color);" if error? + end + + def error? + !@error_message.empty? + end + + def help? + !@helper_text.empty? + end + + def label? + !@label.empty? end end diff --git a/app/components/input_field_component/input_field_component.html.haml b/app/components/input_field_component/input_field_component.html.haml index ea03b1d47..76c104509 100644 --- a/app/components/input_field_component/input_field_component.html.haml +++ b/app/components/input_field_component/input_field_component.html.haml @@ -1,26 +1,21 @@ %div - - unless @label == "" - .text-input-label - = @label - - - has_error = @error_message != "" - - border_style = "#{"border-color: var(--error-color);" if has_error}" - - - case @type - - when "select" - %select.input-field-component{name: @name, style: border_style} - - @choices.each do |choice| - %option{:value => choice}= choice - - when "textarea" - %textarea.input-field-component{name: @name, rows: "5", placeholder: @hint, style: border_style} - - else - %input.input-field-component.text-input{name: @name, type: @type, placeholder: @hint, style: border_style} - - if has_error - .text-input-error-text - = @error_message - - unless @helper_text == "" - .text-input-helper-text - = @helper_text + - if label? + .text-input-label + = @label + + - if content + = content + - else + %input.input-field-component.text-input{name: @name, type: @type, placeholder: @placeholder, style: error_style, value: @value} + + + + - if error? + .text-input-error-text + = @error_message + - if help? + .text-input-helper-text + = @helper_text diff --git a/test/components/previews/inputs/input_field_component_preview.rb b/test/components/previews/inputs/input_field_component_preview.rb deleted file mode 100644 index 4767f4cf2..000000000 --- a/test/components/previews/inputs/input_field_component_preview.rb +++ /dev/null @@ -1,63 +0,0 @@ -class Inputs::InputFieldComponentPreview < ViewComponent::Preview - - - - - - # This is a text input field: - # - To use it without a label: don't give a value to the param label or leave it empty. - # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed. - # - To put it in error state: define the param error_message with the error message you want to be displayed. - # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. - # @param label text - # @param hint text - # @param error_message text - # @param helper_text text - - def default(label: "Label", hint: "", error_message: "", helper_text: "") - render InputFieldComponent.new(label: label, name: "name", type: "text", hint: hint, error_message: error_message, helper_text: helper_text) - end - - - # This is a textarea field: - # - To use it without a label: don't give a value to the param label or leave it empty. - # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed. - # - To put it in error state: define the param error_message with the error message you want to be displayed. - # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. - # @param label text - # @param hint text - # @param error_message text - # @param helper_text text - - def textarea(label: "Label", hint: "", error_message: "", helper_text: "") - render InputFieldComponent.new(label: label, name: "name", type: "textarea", hint: hint, error_message: error_message, helper_text: helper_text) - end - - - - # This is a date input field: - # - To use it without a label: don't give a value to the param label or leave it empty. - # - To put it in error state: define the param error_message with the error message you want to be displayed. - # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. - # @param label text - # @param error_message text - # @param helper_text text - - def date(label: "Label", error_message: "", helper_text: "") - render InputFieldComponent.new(label: label, name: "name", type: "date", error_message: error_message, helper_text: helper_text) - end - - # This is a text input field: - # - To use it without a label: don't give a value to the param label or leave it empty. - # - To put it in error state: define the param error_message with the error message you want to be displayed. - # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. - # @param label text - # @param error_message text - # @param helper_text text - - def select(label: "Label", error_message: "", helper_text: "") - render InputFieldComponent.new(label: label, name: "name", type: "select", choices: ["choice 1", "choice 2", "choice 3"], error_message: error_message, helper_text: helper_text) - end - - -end \ No newline at end of file From 351b1a4a3f61e434c92924ce93dfba08d90a1fa4 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 12 Jul 2023 19:22:39 +0200 Subject: [PATCH 293/533] implement form date component --- app/components/form/date_component.rb | 7 +++++++ .../date_component/date_component.html.haml | 1 + .../previews/form/date_component_preview.rb | 17 +++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 app/components/form/date_component.rb create mode 100644 app/components/form/date_component/date_component.html.haml create mode 100644 test/components/previews/form/date_component_preview.rb diff --git a/app/components/form/date_component.rb b/app/components/form/date_component.rb new file mode 100644 index 000000000..143b1733f --- /dev/null +++ b/app/components/form/date_component.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class Form::DateComponent < InputFieldComponent + def initialize(label: '', name:, value: Date.today, placeholder: '', error_message: '', helper_text: '') + super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end +end diff --git a/app/components/form/date_component/date_component.html.haml b/app/components/form/date_component/date_component.html.haml new file mode 100644 index 000000000..ee412e9d0 --- /dev/null +++ b/app/components/form/date_component/date_component.html.haml @@ -0,0 +1 @@ += render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: 'date') \ No newline at end of file diff --git a/test/components/previews/form/date_component_preview.rb b/test/components/previews/form/date_component_preview.rb new file mode 100644 index 000000000..193bc3cf9 --- /dev/null +++ b/test/components/previews/form/date_component_preview.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class Form::DateComponentPreview < ViewComponent::Preview + def default + # This is a date input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + # @param label text + # @param error_message text + # @param helper_text text + + def default(label: "Label", placeholder: "", error_message: "", helper_text: "") + render Form::DateComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end + end +end From 8d7f47f3fd5339210a3383ecc7199ef341b13dd3 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 12 Jul 2023 19:23:15 +0200 Subject: [PATCH 294/533] implement form text area component --- app/components/form/text_area_component.rb | 8 ++++++++ .../text_area_component.html.haml | 2 ++ .../form/text_area_component_preview.rb | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 app/components/form/text_area_component.rb create mode 100644 app/components/form/text_area_component/text_area_component.html.haml create mode 100644 test/components/previews/form/text_area_component_preview.rb diff --git a/app/components/form/text_area_component.rb b/app/components/form/text_area_component.rb new file mode 100644 index 000000000..a9aa3041e --- /dev/null +++ b/app/components/form/text_area_component.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class Form::TextAreaComponent < InputFieldComponent + def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '', rows: "5") + super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) + @rows = rows + end +end diff --git a/app/components/form/text_area_component/text_area_component.html.haml b/app/components/form/text_area_component/text_area_component.html.haml new file mode 100644 index 000000000..e8d960a90 --- /dev/null +++ b/app/components/form/text_area_component/text_area_component.html.haml @@ -0,0 +1,2 @@ += render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text) do + %textarea.input-field-component{name: @name, rows: @rows, placeholder: @placeholder, style: error_style, value: @value} \ No newline at end of file diff --git a/test/components/previews/form/text_area_component_preview.rb b/test/components/previews/form/text_area_component_preview.rb new file mode 100644 index 000000000..36d21e577 --- /dev/null +++ b/test/components/previews/form/text_area_component_preview.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class Form::TextAreaComponentPreview < ViewComponent::Preview + # This is a textarea field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + + # @param label text + # @param placeholder text + # @param error_message text + # @param helper_text text + # @param rows number + + def default(label: "Label", placeholder: "", error_message: "", helper_text: "", rows: 5) + render Form::TextAreaComponent.new(label: label, name: "name",value: '', placeholder: placeholder, error_message: error_message, helper_text: helper_text, rows: rows) + end +end From c1f1db87ef9e0dbbd78eeede5fcf5954d9e53bf4 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 12 Jul 2023 19:23:38 +0200 Subject: [PATCH 295/533] implement form text input component --- app/components/form/text_input_component.rb | 7 +++++++ .../text_input_component.html.haml | 1 + .../form/text_input_component_preview.rb | 17 +++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 app/components/form/text_input_component.rb create mode 100644 app/components/form/text_input_component/text_input_component.html.haml create mode 100644 test/components/previews/form/text_input_component_preview.rb diff --git a/app/components/form/text_input_component.rb b/app/components/form/text_input_component.rb new file mode 100644 index 000000000..94fa720fe --- /dev/null +++ b/app/components/form/text_input_component.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class Form::TextInputComponent < InputFieldComponent + def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '') + super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end +end diff --git a/app/components/form/text_input_component/text_input_component.html.haml b/app/components/form/text_input_component/text_input_component.html.haml new file mode 100644 index 000000000..b68e5e790 --- /dev/null +++ b/app/components/form/text_input_component/text_input_component.html.haml @@ -0,0 +1 @@ += render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: 'text') diff --git a/test/components/previews/form/text_input_component_preview.rb b/test/components/previews/form/text_input_component_preview.rb new file mode 100644 index 000000000..9511f2374 --- /dev/null +++ b/test/components/previews/form/text_input_component_preview.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class Form::TextInputComponentPreview < ViewComponent::Preview + # This is a text input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + # @param label text + # @param placeholder text + # @param error_message text + # @param helper_text text + + def default(label: "Label", placeholder: "", error_message: "", helper_text: "") + render Form::TextInputComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end +end From d173a9b82dfb57e6cfb602e08cfa4a2dcc93fd1d Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 12 Jul 2023 19:24:25 +0200 Subject: [PATCH 296/533] duplicate the select component to be in the "form" namespace --- app/components/form/select_component.rb | 8 ++++++++ .../select_component/select_component.html.haml | 1 + .../previews/form/select_component_preview.rb | 15 +++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 app/components/form/select_component.rb create mode 100644 app/components/form/select_component/select_component.html.haml create mode 100644 test/components/previews/form/select_component_preview.rb diff --git a/app/components/form/select_component.rb b/app/components/form/select_component.rb new file mode 100644 index 000000000..bac0cecbc --- /dev/null +++ b/app/components/form/select_component.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class Form::SelectComponent < SelectInputComponent + + def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_values: false) + super(id: id, name: name, values: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values) + end +end diff --git a/app/components/form/select_component/select_component.html.haml b/app/components/form/select_component/select_component.html.haml new file mode 100644 index 000000000..3d3fa1ec7 --- /dev/null +++ b/app/components/form/select_component/select_component.html.haml @@ -0,0 +1 @@ += render SelectInputComponent.new(id: @id, name: @name, values: @values , selected: @selected , multiple: @multiple, open_to_add_values: @open_to_add_values ) \ No newline at end of file diff --git a/test/components/previews/form/select_component_preview.rb b/test/components/previews/form/select_component_preview.rb new file mode 100644 index 000000000..1a1fab70d --- /dev/null +++ b/test/components/previews/form/select_component_preview.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class Form::SelectComponentPreview < ViewComponent::Preview + def default(id: "", name: "", values: ["choices 1", "choices 2", "choices 3"], selected: "choices 2", multiple: false, open_to_add_values: false) + render Form::SelectComponent.new(id: id, name: name, values: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values) + end + + def multiple(id: "", name: "", values: ["choices 1", "choices 2", "choices 3"], selected: "choices 2", multiple: true, open_to_add_values: false) + render Form::SelectComponent.new(id: id, name: name, values: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values) + end + + def open_to_add(id: "", name: "", values: ["choices 1", "choices 2", "choices 3"], selected: "choices 2", multiple: true , open_to_add_values: true) + render Form::SelectComponent.new(id: id, name: name, values: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values) + end +end From 6694a187cc994df5e0c921c5f551731fdecff7f7 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 12 Jul 2023 19:27:02 +0200 Subject: [PATCH 297/533] fix select input component inversed open_to_add_values argument usage --- app/components/select_input_component.rb | 2 +- .../select_input_component/select_input_component.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/select_input_component.rb b/app/components/select_input_component.rb index 9bcfe5d1d..e757304d6 100644 --- a/app/components/select_input_component.rb +++ b/app/components/select_input_component.rb @@ -2,7 +2,7 @@ class SelectInputComponent < ViewComponent::Base - def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_values: false) + def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_values: true) super @id = id @name = name diff --git a/app/components/select_input_component/select_input_component.html.haml b/app/components/select_input_component/select_input_component.html.haml index a46f0ad29..00fd00cfe 100644 --- a/app/components/select_input_component/select_input_component.html.haml +++ b/app/components/select_input_component/select_input_component.html.haml @@ -1,7 +1,7 @@ %div{:data => { controller: "select-input", 'select-input': {'multiple-value': @multiple.to_s}}} = select_tag(@name, options_values, { multiple: @multiple, class: "form-control", id: "select_#{@id}", data: { action: "select-input#toggleOtherValue", "select-input-target": "selectedValues" } }) - %div.d-flex.mt-1{style: "display:#{@open_to_add_values ? 'none !important;' : 'block;'}"} + %div.d-flex.mt-1{style: "display:#{!@open_to_add_values ? 'none !important;' : 'block;'}"} = text_field_tag("add_#{@id}", nil, :style => "margin-right: 1em;width: 16em;display: none;", :placeholder => "Or provide the value", data: {action: "keydown.enter->select-input#addValue", "select-input-target": "inputValueField"}, class: 'metadataInput form-control form-control-sm') From 93f66f9c543f7851e7d78cb62cf81746a84ad8ee Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 12 Jul 2023 19:21:05 +0200 Subject: [PATCH 298/533] move and rename file input loader component to be in the form module --- .../file_input_component.rb} | 2 +- .../file_input_component.html.haml} | 0 .../file_input_loader_component_controller.js | 0 app/javascript/component_controllers/index.js | 2 +- app/views/mappings/bulk_loader/_loader.html.haml | 2 +- .../file_input_loader_component_spec.rb | 15 --------------- .../previews/form/file_input_component_preview.rb | 9 +++++++++ .../inputs/file_input_loader_component_preview.rb | 9 --------- 8 files changed, 12 insertions(+), 27 deletions(-) rename app/components/{file_input_loader_component.rb => form/file_input_component.rb} (71%) rename app/components/{file_input_loader_component/file_input_loader_component.html.haml => form/file_input_component/file_input_component.html.haml} (100%) rename app/components/{file_input_loader_component => form/file_input_component}/file_input_loader_component_controller.js (100%) delete mode 100644 spec/components/file_input_loader_component_spec.rb create mode 100644 test/components/previews/form/file_input_component_preview.rb delete mode 100644 test/components/previews/inputs/file_input_loader_component_preview.rb diff --git a/app/components/file_input_loader_component.rb b/app/components/form/file_input_component.rb similarity index 71% rename from app/components/file_input_loader_component.rb rename to app/components/form/file_input_component.rb index a7e960ade..189a3db5c 100644 --- a/app/components/file_input_loader_component.rb +++ b/app/components/form/file_input_component.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class FileInputLoaderComponent < ViewComponent::Base +class Form::FileInputComponent < ViewComponent::Base def initialize(name:, html_options: '') @name = name @html_options = html_options diff --git a/app/components/file_input_loader_component/file_input_loader_component.html.haml b/app/components/form/file_input_component/file_input_component.html.haml similarity index 100% rename from app/components/file_input_loader_component/file_input_loader_component.html.haml rename to app/components/form/file_input_component/file_input_component.html.haml diff --git a/app/components/file_input_loader_component/file_input_loader_component_controller.js b/app/components/form/file_input_component/file_input_loader_component_controller.js similarity index 100% rename from app/components/file_input_loader_component/file_input_loader_component_controller.js rename to app/components/form/file_input_component/file_input_loader_component_controller.js diff --git a/app/javascript/component_controllers/index.js b/app/javascript/component_controllers/index.js index dc1edde16..8cc79c545 100644 --- a/app/javascript/component_controllers/index.js +++ b/app/javascript/component_controllers/index.js @@ -2,7 +2,7 @@ import {application} from "../controllers/application"; import TurboModalController from "../../components/turbo_modal_component/turbo_modal_component_controller" import FileInputLoaderController - from "../../components/file_input_loader_component/file_input_loader_component_controller"; + from "../../components/form/file_input_component/file_input_loader_component_controller"; import Select_input_component_controller from "../../components/select_input_component/select_input_component_controller"; diff --git a/app/views/mappings/bulk_loader/_loader.html.haml b/app/views/mappings/bulk_loader/_loader.html.haml index 14a556b23..eb50fa54d 100644 --- a/app/views/mappings/bulk_loader/_loader.html.haml +++ b/app/views/mappings/bulk_loader/_loader.html.haml @@ -14,6 +14,6 @@ = JSON.pretty_generate @example_code = form_with url: '/mappings/loader', method: :post, multipart: true, data: { turbo: true} do %div - = render FileInputLoaderComponent.new(name: :file) + = render Form::FileInputComponent.new(name: :file) %button.btn.btn-secondary.btn-block.mt-2{type:'submit'} Save diff --git a/spec/components/file_input_loader_component_spec.rb b/spec/components/file_input_loader_component_spec.rb deleted file mode 100644 index 9e5190e86..000000000 --- a/spec/components/file_input_loader_component_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -require "rails_helper" - -RSpec.describe FileInputLoaderComponent, type: :component do - pending "add some examples to (or delete) #{__FILE__}" - - # it "renders something useful" do - # expect( - # render_inline(described_class.new(attr: "value")) { "Hello, components!" }.css("p").to_html - # ).to include( - # "Hello, components!" - # ) - # end -end diff --git a/test/components/previews/form/file_input_component_preview.rb b/test/components/previews/form/file_input_component_preview.rb new file mode 100644 index 000000000..ef8000a6d --- /dev/null +++ b/test/components/previews/form/file_input_component_preview.rb @@ -0,0 +1,9 @@ +class Form::FileInputComponentPreview < ViewComponent::Preview + + + def default + render Form::FileInputComponent.new(name: "file") + end + + +end \ No newline at end of file diff --git a/test/components/previews/inputs/file_input_loader_component_preview.rb b/test/components/previews/inputs/file_input_loader_component_preview.rb deleted file mode 100644 index 7015495ff..000000000 --- a/test/components/previews/inputs/file_input_loader_component_preview.rb +++ /dev/null @@ -1,9 +0,0 @@ -class Inputs::FileInputLoaderComponentPreview < ViewComponent::Preview - - - def default - render FileInputLoaderComponent.new(name: "file") - end - - -end \ No newline at end of file From 106b79c1dab67491f7ad4b3db874040d8d906436 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 12 Jul 2023 19:55:57 +0200 Subject: [PATCH 299/533] update select component to use InputFieldComponent to have a label --- app/components/form/select_component.rb | 11 ++++++++--- .../form/select_component/select_component.html.haml | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/components/form/select_component.rb b/app/components/form/select_component.rb index bac0cecbc..19a89a670 100644 --- a/app/components/form/select_component.rb +++ b/app/components/form/select_component.rb @@ -1,8 +1,13 @@ # frozen_string_literal: true -class Form::SelectComponent < SelectInputComponent +class Form::SelectComponent < InputFieldComponent - def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_values: false) - super(id: id, name: name, values: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values) + def initialize(id: nil, label: '', name:, value: [], selected: '', placeholder: '', error_message: '', helper_text: '', multiple: false, open_to_add_values: false) + super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) + @values = value + @selected = selected + @open_to_add_values = open_to_add_values + @multiple = multiple + @id = id end end diff --git a/app/components/form/select_component/select_component.html.haml b/app/components/form/select_component/select_component.html.haml index 3d3fa1ec7..e8399b659 100644 --- a/app/components/form/select_component/select_component.html.haml +++ b/app/components/form/select_component/select_component.html.haml @@ -1 +1,2 @@ -= render SelectInputComponent.new(id: @id, name: @name, values: @values , selected: @selected , multiple: @multiple, open_to_add_values: @open_to_add_values ) \ No newline at end of file += render InputFieldComponent.new(name: @name, error_message: @error_message, helper_text: @helper_text) do + = render SelectInputComponent.new(id: @id, name: @name, values: @values , selected: @selected , multiple: @multiple, open_to_add_values: @open_to_add_values ) \ No newline at end of file From 9c5456c884d0203daf4a69fdf7bd99566e8b1f81 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Wed, 12 Jul 2023 20:03:32 +0200 Subject: [PATCH 300/533] remove unsed text in NestedFormInputComponentPreview --- .../previews/nested_form_input_component_preview.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/components/previews/nested_form_input_component_preview.rb b/test/components/previews/nested_form_input_component_preview.rb index 60249be58..20ef1783e 100644 --- a/test/components/previews/nested_form_input_component_preview.rb +++ b/test/components/previews/nested_form_input_component_preview.rb @@ -15,10 +15,4 @@ def default(object_name: 'contact') end end end - - private - - def long_text - "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum." - end end \ No newline at end of file From 4c86671745c0214fb16b69394aeee71e7befa0f4 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 11 Jul 2023 04:52:50 +0200 Subject: [PATCH 301/533] fix agents search input style --- app/assets/stylesheets/agents.scss | 2 +- app/views/agents/_form.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/agents.scss b/app/assets/stylesheets/agents.scss index 2c8d5a45e..c469fae57 100644 --- a/app/assets/stylesheets/agents.scss +++ b/app/assets/stylesheets/agents.scss @@ -1,3 +1,3 @@ -.agents-affiliations input { +.agents-inputs input { @extend .form-control !optional; } \ No newline at end of file diff --git a/app/views/agents/_form.html.haml b/app/views/agents/_form.html.haml index b874cdb1d..ab229120a 100644 --- a/app/views/agents/_form.html.haml +++ b/app/views/agents/_form.html.haml @@ -72,7 +72,7 @@ %tr %th Affiliations - %td.top.agents-affiliations + %td.top.agents-affiliations.agents-inputs %div = render NestedFormInputsComponent.new do |c| - c.template do From 11ce30526cb2baeae458251b4e3c76b59f19ebca Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 15 Jul 2023 18:55:17 +0200 Subject: [PATCH 302/533] add search input style --- app/assets/stylesheets/components/index.scss | 3 +- .../stylesheets/components/search_input.scss | 42 +++++++++++++++++++ app/components/search_input_component.rb | 4 +- 3 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 app/assets/stylesheets/components/search_input.scss diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 3f59a7e6d..61b65369f 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -7,4 +7,5 @@ @import 'text_area_field'; @import 'dropdown'; @import 'field_container'; -@import 'nested_form'; \ No newline at end of file +@import 'nested_form'; +@import 'search_input'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/search_input.scss b/app/assets/stylesheets/components/search_input.scss new file mode 100644 index 000000000..325969cfd --- /dev/null +++ b/app/assets/stylesheets/components/search_input.scss @@ -0,0 +1,42 @@ +#home-search-drop-down{ + display: none; + font-size: 16px; + background: white; + width: 100%; + border-radius: 0 0 14px 14px; + border: none; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); +} + +.home-search-ontology-content{ + display: flex; + color: #777777 !important; + justify-content: space-between; + padding: 20px 20px; + cursor: pointer; + border-top: 1px solid #f7f7f7 +} +.home-search-ontology-content:hover{ + background-color: rgba(0, 0, 0, 0.01); +} +.home-search-ontology-content div{ + display: flex; +} +.home-search-ontology-content div img{ + width: 12px; +} +.home-search-ontology-content div p{ + font-weight: 300; + margin-left: 10px; + margin-bottom: 0; +} + +.home-dropdown-active{ + box-shadow: none !important; +} +#seached-ontology{ + margin-bottom: 0; +} +#seached-ontologies{ + margin-bottom: 0; +} \ No newline at end of file diff --git a/app/components/search_input_component.rb b/app/components/search_input_component.rb index 047b83b6b..46ace3739 100644 --- a/app/components/search_input_component.rb +++ b/app/components/search_input_component.rb @@ -8,8 +8,7 @@ def initialize(name: '', placeholder: '', actions_links: {}, scroll_down: true, use_cache: true, ajax_url:, item_base_url:, - id_key:, - links_target: '_top') + id_key:) super @name = name @placeholder = placeholder @@ -19,7 +18,6 @@ def initialize(name: '', placeholder: '', actions_links: {}, @ajax_url = ajax_url @item_base_url = item_base_url @id_key = id_key - @links_target = links_target end def action_link_info(value) From 66396fd7fdc6908e3af6ada3684d086af200c8f3 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 15 Jul 2023 18:55:34 +0200 Subject: [PATCH 303/533] include all latest_submission attributes in the summary page action --- app/controllers/ontologies_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index c8d38d335..4796675b1 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -336,7 +336,8 @@ def show #@ob_instructions = helpers.ontolobridge_instructions_template(@ontology) # Get the latest submission (not necessarily the latest 'ready' submission) - @submission_latest = @ontology.explore.latest_submission rescue @ontology.explore.latest_submission(include: '') + @submission_latest = @ontology.explore.latest_submission(include: 'all') rescue @ontology.explore.latest_submission(include: '') + # Is the ontology downloadable? @ont_restricted = ontology_restricted?(@ontology.acronym) From 89869051da5193f9dd6406991a0f83be89ed96e6 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 11 Jul 2023 04:55:07 +0200 Subject: [PATCH 304/533] add hasCreator and publisher displayer for the summary page --- app/helpers/ontologies_helper.rb | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 41ad0c38a..d91ee3a1e 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -77,16 +77,15 @@ def additional_metadata(sub) metadata_list = {} # Get extracted metadata and put them in a hash with their label, if one, as value json_metadata.each do |metadata| - if metadata["extracted"] == true - metadata_list[metadata["attribute"]] = metadata["label"] - end + metadata_list[metadata["attribute"]] = metadata["label"] end metadata_list = metadata_list.sort html = [] - metadata_not_displayed = ["status", "description", "documentation", "publication", "homepage", "openSearchDescription", "dataDump", "includedInDataCatalog", "logo", "depiction"] - + metadata_not_displayed = ["status", "description", "documentation", "publication", "homepage", + "openSearchDescription", "dataDump", "includedInDataCatalog", "logo", + "depiction", "submissionId", "submissionStatus", 'ontology', 'contact'] begin metadata_list.each do |metadata, label| @@ -129,6 +128,22 @@ def additional_metadata(sub) end) end + elsif metadata.eql?("hasCreator") || metadata.eql?("publisher") + html << content_tag(:tr) do + if label.nil? + concat(content_tag(:td, metadata.gsub(/(?=[A-Z])/, " "))) + else + concat(content_tag(:td, label)) + end + + metadata_array = [] + + sub.send(metadata).each do |metadata_value| + metadata_array << display_agent(metadata_value) + end + + concat(content_tag(:td, raw(metadata_array.join(", ")))) + end else html << content_tag(:tr) do if label.nil? From f269c6bdaa8aedb06b58b6900cac3bf19e95b846 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 11 Jul 2023 04:56:29 +0200 Subject: [PATCH 305/533] add margin top and bottom for the nested form component From 0fb86014984bcc27e07b4328c4f4589130b0913f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 15 Jul 2023 18:56:25 +0200 Subject: [PATCH 306/533] enable turbo for the submission form --- app/views/submissions/edit.html.haml | 4 ++-- app/views/submissions/new.html.haml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/submissions/edit.html.haml b/app/views/submissions/edit.html.haml index 172a4f761..27fc27849 100644 --- a/app/views/submissions/edit.html.haml +++ b/app/views/submissions/edit.html.haml @@ -1,6 +1,6 @@ %div.container.py-4.py-md-5 %h3.text-center.mb-4 Edit submission information - %small.text-muted for #{@submission.ontology.acronym} - = form_for :submission, url: ontology_submission_path(@ontology.acronym, @submission.submissionId), html: { id: "ontology_submission_form", method: :put, multipart: true } do |f| + %small.text-muted for #{@ontology.acronym} + = form_for :submission, url: ontology_submission_path(@ontology.acronym, @submission.submissionId), html: { id: "ontology_submission_form", method: :put, multipart: true, 'data-turbo': true } do |f| = render partial: "form", locals: {f: f, button_text: "Save submission"} diff --git a/app/views/submissions/new.html.haml b/app/views/submissions/new.html.haml index 21d83e669..505a7e3cb 100644 --- a/app/views/submissions/new.html.haml +++ b/app/views/submissions/new.html.haml @@ -5,5 +5,5 @@ Add new submission - if !(@submission.ontology.nil? || (@submission.ontology.is_a? String)) %small.text-muted for #{@submission.ontology.acronym} - = form_for :submission, url: {action: "create"}, html: {id: "ontology_submission_form", multipart: true} do |f| + = form_for :submission, url: {action: "create"}, html: {id: "ontology_submission_form", multipart: true, 'data-turbo': true} do |f| = render partial: "form", locals: {f: f, button_text: "Add submission"} From e25496faf0b8b0c898f9c5cd3046d960283e3a79 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 11 Jul 2023 04:59:46 +0200 Subject: [PATCH 307/533] update submission updated to make it work with publisher and hasCreator --- app/controllers/concerns/submission_updater.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/concerns/submission_updater.rb b/app/controllers/concerns/submission_updater.rb index 3b1218fc3..1c67d182e 100644 --- a/app/controllers/concerns/submission_updater.rb +++ b/app/controllers/concerns/submission_updater.rb @@ -91,7 +91,7 @@ def submission_params(params) end end p = params.permit(attributes.uniq) - p.to_h.transform_values do |v| + p = p.to_h.transform_values do |v| if v.is_a? Hash v.values.reject(&:empty?) elsif v.is_a? Array @@ -100,5 +100,9 @@ def submission_params(params) v end end + + p[:hasCreator] = p[:hasCreator].map(&:values).flatten.uniq if p[:hasCreator] + p[:publisher] = p[:publisher].map(&:values).flatten.uniq if p[:publisher] + p end end From 7c86299f28ea30f8a27db511050b1430b14fac10 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 11 Jul 2023 05:01:03 +0200 Subject: [PATCH 308/533] add nested agent search input component --- .../nested_agent_search_input_component.rb | 15 +++++++++++++++ .../nested_agent_search_input_component.html.haml | 8 ++++++++ 2 files changed, 23 insertions(+) create mode 100644 app/components/nested_agent_search_input_component.rb create mode 100644 app/components/nested_agent_search_input_component/nested_agent_search_input_component.html.haml diff --git a/app/components/nested_agent_search_input_component.rb b/app/components/nested_agent_search_input_component.rb new file mode 100644 index 000000000..092e6ed36 --- /dev/null +++ b/app/components/nested_agent_search_input_component.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class NestedAgentSearchInputComponent < ViewComponent::Base + + include Turbo::FramesHelper, AgentHelper + + def initialize(agents:, agent_type:, name_prefix:, edit_on_modal: false, parent_id: nil) + super + @agents = agents + @agent_type = agent_type + @name_prefix = name_prefix + @edit_on_modal = edit_on_modal + @parent_id = parent_id + end +end diff --git a/app/components/nested_agent_search_input_component/nested_agent_search_input_component.html.haml b/app/components/nested_agent_search_input_component/nested_agent_search_input_component.html.haml new file mode 100644 index 000000000..7cccaef4d --- /dev/null +++ b/app/components/nested_agent_search_input_component/nested_agent_search_input_component.html.haml @@ -0,0 +1,8 @@ += render NestedFormInputsComponent.new do |c| + - c.template do + = render TurboFrameComponent.new(id: agent_id_frame_id('NEW_RECORD', @parent_id)) do + = render AgentSearchInputComponent.new(id: 'NEW_RECORD', agent_type: @agent_type, name_prefix: @name_prefix, + parent_id: @parent_id, edit_on_modal: @edit_on_modal) + - Array(@agents).each_with_index do |agent, i| + - c.row do + = render partial: 'agents/agent_show', locals: {agent: agent, name_prefix: @name_prefix+"[#{i}]", edit_on_modal: @edit_on_modal, parent_id: @parent_id} \ No newline at end of file From e1fd0c60f700578571a352d2694c8ff8df0dd059 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 11 Jul 2023 05:01:48 +0200 Subject: [PATCH 309/533] update search input component to use its internal variables From a78ef1d88b7c9f5dd19a74495dc21a3c597cfdf8 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 11 Jul 2023 05:21:15 +0200 Subject: [PATCH 310/533] update and finalize agents controller actions --- app/controllers/agents_controller.rb | 63 ++++++++++++++++++++------ app/helpers/agent_helper.rb | 58 ++++++++++++++++++++++-- app/views/agents/_agent_show.html.haml | 15 ++++-- app/views/agents/_form.html.haml | 33 ++++++-------- app/views/agents/_show_line.html.haml | 4 +- app/views/agents/edit.html.haml | 6 +-- app/views/agents/new.html.haml | 4 +- app/views/agents/show.html.haml | 4 +- 8 files changed, 137 insertions(+), 50 deletions(-) diff --git a/app/controllers/agents_controller.rb b/app/controllers/agents_controller.rb index b613cf87d..21edf743a 100644 --- a/app/controllers/agents_controller.rb +++ b/app/controllers/agents_controller.rb @@ -1,5 +1,5 @@ class AgentsController < ApplicationController - include TurboHelper + include TurboHelper, AgentHelper before_action :authorize_and_redirect, :only => [:edit, :update, :create, :new] def index @@ -7,19 +7,22 @@ def index end def show - id = params[:id]&.eql?('fake_id') ? params[:name] : params[:id] - @agent = LinkedData::Client::Models::Agent.all(name: id).find { |x| x.name.eql?(id) } - @name_prefix = params[:parent_id] ? "[affiliations][#{params[:parent_id]}]" : '' + @agent = LinkedData::Client::Models::Agent.all(name: params[:name]).find { |x| x.name.eql?(params[:name]) } + @agent_id = params[:id] || agent_id(@agent) + @name_prefix = params[:name_prefix] ? "#{params[:name_prefix]}[#{params[:id]}]" : '' + @edit_on_modal = params[:edit_on_modal]&.eql?('true') end def ajax_agents - @agents = LinkedData::Client::Models::Agent.all(name: params[:name], agentType: params[:organization_only]&.eql?('true') ? 'organization' : '') + filters = { name: params[:name] } + filters[:agentType] = params[:agent_type] if params[:agent_type] + @agents = LinkedData::Client::Models::Agent.all(filters) agents_json = @agents.map do |x| { id: x.id, name: x.name, type: x.agentType, - identifiers: x.identifiers.map { |i| i.schemaAgency + ':' + i.notation }.join(', ') + identifiers: x.identifiers.map { |i| "#{i.schemaAgency}:#{i.notation}" }.join(', ') } end @@ -28,36 +31,59 @@ def ajax_agents def new @agent = LinkedData::Client::Models::Agent.new + @agent.id = params[:id] @agent.creator = session[:user].id @agent.agentType = params[:type] || 'person' @agent.name = params[:name] @new_agent = params[:new_agent].nil? || params[:new_agent].eql?('true') + @name_prefix = params[:name_prefix] || '' + @show_affiliations = params[:show_affiliations]&.eql?('true') end def create new_agent = save_agent(agent_params) + parent_id = params[:parent_id] + name_prefix = params[:name_prefix] + alert_id = agent_id_alert_container_id(params[:id], parent_id) + if new_agent.errors - render_turbo_stream alert_error { JSON.pretty_generate(response_errors(new_agent)) } + render_turbo_stream alert_error(id: alert_id) { JSON.pretty_generate(response_errors(new_agent)) } else success_message = 'New Agent added successfully' - render_turbo_stream(alert_success { success_message }, - prepend('agents_table_content', partial: 'agents/show_line', locals: { agent: new_agent })) + streams = [alert_success(id: alert_id) { success_message }] + + streams << prepend('agents_table_content', partial: 'agents/show_line', locals: { agent: new_agent }) + + streams << replace_agent_form(new_agent, frame_id: params[:id], parent_id: parent_id, name_prefix: name_prefix) if params[:parent_id] + + render_turbo_stream(*streams) end end def edit @agent = LinkedData::Client::Models::Agent.find("#{REST_URI}/Agents/#{params[:id]}") + @name_prefix = params[:parent_id] || '' + @show_affiliations = params[:show_affiliations].nil? || params[:show_affiliations].eql?('true') end def update agent_update, agent = update_agent(params[:id].split('/').last, agent_params) + parent_id = params[:parent_id] + alert_id = agent_alert_container_id(agent, parent_id) if response_error?(agent_update) - render_turbo_stream(alert_error { JSON.pretty_generate(response_errors(agent_update)) }) + render_turbo_stream(alert_error(id: alert_id) { JSON.pretty_generate(response_errors(agent_update)) }) else success_message = 'Agent successfully updated' - render_turbo_stream(alert_success { success_message }, - replace(agent.id.split('/').last, partial: 'agents/show_line', locals: { agent: agent })) + table_line_id = agent_table_line_id(agent_id(agent)) + + streams = [alert_success(id: alert_id) { success_message }, + replace(table_line_id, partial: 'agents/show_line', locals: { agent: agent }) + ] + + streams << replace_agent_form(agent, parent_id: parent_id) if params[:parent_id] + + render_turbo_stream(*streams) end end @@ -83,7 +109,7 @@ def destroy if error.nil? render turbo_stream: [ alert(type: 'success') { success_text }, - turbo_stream.remove(params[:id]) + turbo_stream.remove(agent_table_line_id(params[:id])) ] else @@ -97,6 +123,14 @@ def destroy private + def replace_agent_form(agent, frame_id: nil, parent_id:, partial: 'agents/agent_show', name_prefix: '') + + frame_id = frame_id ? agent_id_frame_id(frame_id, parent_id) : agent_frame_id(agent, parent_id) + + replace(frame_id, partial: partial, + locals: { agent: agent, name_prefix: name_prefix, parent_id: parent_id, edit_on_modal: false }) + end + def save_agent(params) agent = LinkedData::Client::Models::Agent.new(values: params) agent.creator = session[:user].id @@ -113,8 +147,7 @@ def update_agent(id = params[:id], params) end def agent_params - p = params.permit(:agentType, :name, :email, :acronym, :homepage, - :creator, + p = params.permit(:agentType, :name, :email, :acronym, :homepage, :creator, { identifiers: [:notation, :schemaAgency, :creator] }, { affiliations: [:id, :agentType, :name, :homepage, :acronym, :creator, { identifiers: [:notation, :schemaAgency, :creator] }] } ) diff --git a/app/helpers/agent_helper.rb b/app/helpers/agent_helper.rb index 31820b499..0a00eddc3 100644 --- a/app/helpers/agent_helper.rb +++ b/app/helpers/agent_helper.rb @@ -1,18 +1,68 @@ module AgentHelper + def agent_id_alert_container_id(agent_id, parent_id) + "agents_alerts_#{agent_id_frame_id(agent_id, parent_id)}" + end + + def agent_alert_container_id(agent, parent_id) + agent_id_alert_container_id(agent_id(agent), parent_id) + end + + def agent_alert_container(agent, parent_id) + render_alerts_container(agent_alert_container_id(agent, parent_id)) + end + + def agent_id_alert_container(agent_id, parent_id) + render_alerts_container(agent_alert_container_id(agent, parent_id)) + end + + def agent_table_line_id(id) + "#{id}_table_item" + end + + def agent_frame_id(agent, parent_id) + agent_id_frame_id(agent_id(agent), parent_id) + end + + def agent_id_frame_id(agent_id, parent_id) + return 'application_modal_content' if parent_id.nil? + return agent_id if parent_id.empty? + + "#{parent_id}_#{agent_id}" + end + + def agent_id(agent) + agent_id = agent.id + agent_id ? agent.id.split('/').last : '' + end + + def link_to_agent_edit_modal(agent, parent_id = nil) + + link_to_modal(nil, edit_agent_path(agent_id(agent), parent_id: parent_id, show_affiliations: parent_id.nil? || parent_id.empty?), class: 'btn btn-sm btn-light', data: { show_modal_title_value: "Edit agent #{agent.id}" }) do + content_tag(:i, '', class: 'far fa-edit') + end + end + + def link_to_agent_edit(agent, parent_id = nil) + link_to(edit_agent_path(agent_id(agent), parent_id: parent_id, show_affiliations: parent_id.nil? || parent_id.empty?), class: 'btn btn-sm btn-light') do + content_tag(:i, '', class: 'far fa-edit') + end + end def affiliation?(agent) agent.agentType.eql?('organization') end - def display_identifiers(identifiers) - Array(identifiers).map {|i| "#{i["schemaAgency"]} / #{i["notation"]}"}.join(', ') + Array(identifiers).map { |i| "#{i["schemaAgency"]}:#{i["notation"]}" }.join(', ') end - def agent_field_name(name, name_prefix='') - name_prefix.empty? ? name : "#{name_prefix}[#{name}]" + def display_agent(agent) + agent.name + '(' + display_identifiers(agent.identifiers) + ')' + end + def agent_field_name(name, name_prefix = '') + name_prefix&.empty? ? name : "#{name_prefix}[#{name}]" end def agent_identifier_name(index, name, name_prefix) diff --git a/app/views/agents/_agent_show.html.haml b/app/views/agents/_agent_show.html.haml index c73f15729..c35dcea30 100644 --- a/app/views/agents/_agent_show.html.haml +++ b/app/views/agents/_agent_show.html.haml @@ -1,3 +1,12 @@ -- if agent.id - = hidden_field_tag agent_field_name(:id, name_prefix), agent.id -= text_field_tag '', agent.name + '(' + agent.identifiers.map {|i| i.schemaAgency+':'+i.notation}.join(', ') + ')', class: "form-control", disabled: true \ No newline at end of file += render TurboFrameComponent.new(id: agent_frame_id(agent, parent_id)) do + %div.d-flex + - if agent.id + = hidden_field_tag agent_field_name(:id, name_prefix), agent.id + + = text_field_tag '', display_agent(agent), class: "form-control", disabled: true + + - if current_user_admin? || agent.creator.eql?(current_user&.id.to_s) + - if edit_on_modal + = link_to_agent_edit_modal(agent, parent_id) + - else + = link_to_agent_edit(agent, parent_id) \ No newline at end of file diff --git a/app/views/agents/_form.html.haml b/app/views/agents/_form.html.haml index ab229120a..d50f1f9fa 100644 --- a/app/views/agents/_form.html.haml +++ b/app/views/agents/_form.html.haml @@ -1,10 +1,17 @@ -= render_alerts_container += agent_alert_container(@agent, params[:parent_id]) %table.form.w-100 %colgroup %col %col{style: "width: 100%"} + - if params[:parent_id] + = hidden_field_tag :parent_id, params[:parent_id] + + - if params[:name_prefix] + = hidden_field_tag :name_prefix, params[:name_prefix] + - if agent.id = hidden_field_tag agent_field_name(:id, name_prefix), agent.id + - if affiliation?(agent) = hidden_field_tag agent_field_name(:agentType, name_prefix), agent.agentType - else @@ -31,7 +38,7 @@ Email %span.asterik * %td.top - = email_field_tag agent_field_name(:email, name_prefix), agent.name, class: "form-control" + = email_field_tag agent_field_name(:email, name_prefix), agent.email, class: "form-control" %tr %th Acronym @@ -68,24 +75,12 @@ = text_field_tag agent_identifier_name(i.to_s.upcase, :notation, name_prefix), identifier.notation, class: "form-control" - values = %w[ORCID ROR ISNI GRID] = render SelectInputComponent.new(id: "#{name_prefix}_identifiers_schemaAgency_#{i.to_s.upcase}", name: agent_identifier_name(i.to_s.upcase, :schemaAgency, name_prefix), values: values, selected: identifier.schemaAgency) - - if new_agent + - if show_affiliations %tr %th Affiliations %td.top.agents-affiliations.agents-inputs - %div - = render NestedFormInputsComponent.new do |c| - - c.template do - = turbo_frame_tag 'NEW_RECORD' do - = render AgentSearchInputComponent.new(id: 'NEW_RECORD', organization_only: true) - - Array(agent.affiliations).each_with_index do |affiliation, i| - - c.row do - - if current_user_admin? || affiliation.creator.eql?(current_user&.id.to_s) - %div{id: affiliation.id} - = render partial: 'agents/form', locals: {agent: affiliation, name_prefix: "[affiliations][#{i}]", new_agent: false} - - else - %div - = render partial: 'agents/agent_show', locals: {agent: affiliation, name_prefix: "[affiliations][#{i}]"} -- if new_agent - %div.mt-2 - = submit_tag 'Save', class: "btn btn-primary mr-sm-2 group-form-accept" \ No newline at end of file + = render NestedAgentSearchInputComponent.new(agents: agent.affiliations, agent_type: 'organization', + name_prefix: '[affiliations]', parent_id: agent_id(agent)) +%div.mt-2 + = submit_tag 'Save', class: "btn btn-primary mr-sm-2 group-form-accept" \ No newline at end of file diff --git a/app/views/agents/_show_line.html.haml b/app/views/agents/_show_line.html.haml index 7fbeeab08..f7958ca53 100644 --- a/app/views/agents/_show_line.html.haml +++ b/app/views/agents/_show_line.html.haml @@ -1,4 +1,4 @@ -%tr.human{:id => (agent.id || '').split('/').last} +%tr.human{:id => agent_table_line_id(agent_id(agent))} %td = agent.name %td @@ -10,5 +10,5 @@ %td{:class => 'delete_mappings_column'} - if agent.id && !agent.id.empty? && session[:user] && session[:user].admin? %div.d-flex - = link_to_modal("Edit", edit_agent_path(agent.id.split('/').last), class: "btn btn-link", data: { show_modal_title_value: "Edit agent #{agent.id}"}) + = link_to_agent_edit_modal(agent) = button_to "Delete", CGI.unescape(agent_path(agent.id.split('/').last)), method: :delete, class:'btn btn-link', form: {data: { turbo: true, turbo_confirm: "Are you sure?", turbo_frame: '_top'}} diff --git a/app/views/agents/edit.html.haml b/app/views/agents/edit.html.haml index 14ca50ed5..49df71fc3 100644 --- a/app/views/agents/edit.html.haml +++ b/app/views/agents/edit.html.haml @@ -1,3 +1,3 @@ -= turbo_frame_tag 'application_modal_content' do - = form_with url: agent_path(@agent.id.split('/').last), method: 'post', data:{turbo: true} do - = render partial: 'form', locals: {agent: @agent, name_prefix: '', new_agent: true} += render TurboFrameComponent.new(id: agent_frame_id(@agent, params[:parent_id])) do + = form_with url: agent_path(agent_id(@agent)), method: 'post', data:{turbo: true} do + = render partial: 'form', locals: {agent: @agent, name_prefix: '', show_affiliations: @show_affiliations} diff --git a/app/views/agents/new.html.haml b/app/views/agents/new.html.haml index c5c8a0ae6..283691602 100644 --- a/app/views/agents/new.html.haml +++ b/app/views/agents/new.html.haml @@ -1,3 +1,3 @@ -= turbo_frame_tag params[:parent_id] || 'application_modal_content' do += render TurboFrameComponent.new(id: agent_frame_id(@agent, params[:parent_id])) do = form_with url: agents_path, method: 'post', data:{turbo: true} do - = render partial: 'form', locals: {agent: @agent, name_prefix: '', new_agent: @new_agent} \ No newline at end of file + = render partial: 'form', locals: {agent: @agent, name_prefix: '', show_affiliations: @new_agent} \ No newline at end of file diff --git a/app/views/agents/show.html.haml b/app/views/agents/show.html.haml index e6385281a..a6a5bd754 100644 --- a/app/views/agents/show.html.haml +++ b/app/views/agents/show.html.haml @@ -1,2 +1,2 @@ -= turbo_frame_tag params[:parent_id] || 'application_modal_content' do - = render partial: 'agents/agent_show', locals: {agent: @agent, name_prefix: @name_prefix} \ No newline at end of file += render TurboFrameComponent.new(id: agent_id_frame_id(@agent_id, params[:parent_id])) do + = render partial: 'agents/agent_show', locals: {agent: @agent, name_prefix: @name_prefix, parent_id: params[:parent_id], edit_on_modal: @edit_on_modal} \ No newline at end of file From 16e3e931dfb14b8b533806740431d06e17d6479d Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 11 Jul 2023 05:03:22 +0200 Subject: [PATCH 311/533] update agent search input to be more customizable --- app/components/agent_search_input_component.rb | 7 +++++-- .../agent_search_input_component.html.haml | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/components/agent_search_input_component.rb b/app/components/agent_search_input_component.rb index 3cf7a2ec4..3bebfa565 100644 --- a/app/components/agent_search_input_component.rb +++ b/app/components/agent_search_input_component.rb @@ -2,9 +2,12 @@ class AgentSearchInputComponent < ViewComponent::Base - def initialize(id:, organization_only: false ) + def initialize(id:, agent_type: nil, name_prefix: nil, parent_id: , edit_on_modal: false) super @id = id - @organization_only = organization_only + @agent_type = agent_type + @name_prefix = name_prefix + @parent_id = parent_id + @edit_on_modal = edit_on_modal end end diff --git a/app/components/agent_search_input_component/agent_search_input_component.html.haml b/app/components/agent_search_input_component/agent_search_input_component.html.haml index 8f14ff5c2..08345d3a1 100644 --- a/app/components/agent_search_input_component/agent_search_input_component.html.haml +++ b/app/components/agent_search_input_component/agent_search_input_component.html.haml @@ -1,7 +1,7 @@ -= render SearchInputComponent.new(name:'agent' + @id, ajax_url: "/ajax/agents?organization_only=#{@organization_only}&name=", - item_base_url:"/agents/fake_id?parent_id=#{@id}&name=", id_key: 'name', += render SearchInputComponent.new(name:'agent' + @id, ajax_url: "/ajax/agents?agent_type=#{@agent_type}&name=", + item_base_url:"/agents/#{@id}?parent_id=#{@parent_id}&edit_on_modal=#{@edit_on_modal}&name_prefix=#{@name_prefix}&name=", id_key: 'name', use_cache: false, - actions_links: {create_new_agent: {link: "/agents/new?name=&parent_id=#{@id}&new_agent=false&type=organization", target:'_self'}}) do |s| + actions_links: {create_new_agent: {link: "/agents/new?name=&id=#{@id}&parent_id=#{@parent_id}&new_agent=false&type=#{@agent_type}&show_affiliations=false&edit_on_modal=#{@edit_on_modal}&name_prefix=#{@name_prefix}[#{@id}]", target:'_self'}}) do |s| - s.template do %a{href: "LINK", class: "home-search-ontology-content", 'data-turbo-frame': '_self'} %p#seached-ontology.home-searched-ontology From f5b898d44b4975cd54834106baeefd1c0168bbf7 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 15 Jul 2023 18:57:43 +0200 Subject: [PATCH 312/533] add hasCreator and publisher attribut to submission edit form --- app/views/submissions/_form_content.html.haml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/views/submissions/_form_content.html.haml b/app/views/submissions/_form_content.html.haml index 0eeaa8d3f..4697663a4 100644 --- a/app/views/submissions/_form_content.html.haml +++ b/app/views/submissions/_form_content.html.haml @@ -16,9 +16,17 @@ = attribute_form_group_container('location', required: true) do = render partial: 'submissions/submission_location_form' - %div#key-properties-card.mt-4 + %div#key-properties-card.mt-4.agents-inputs = metadata_section('key-properties', 'Key properties', collapsed: false) do - = form_group_attribute("URI") + = form_group_attribute("URI", required: true) + = form_group_attribute("identifier", required: true) + = attribute_form_group_container("hasCreator", required: true) do + = render NestedAgentSearchInputComponent.new(agents: @submission.hasCreator , agent_type: 'person', name_prefix: object_name+'[hasCreator]', + parent_id: '') + = attribute_form_group_container("publisher", required: true) do + = render NestedAgentSearchInputComponent.new(agents: @submission.publisher , agent_type: '', name_prefix: object_name+'[publisher]', + parent_id: '') + = form_group_attribute("deprecated") = form_group_attribute("hasOntologySyntax") do %p From 44d029f74893aceb49fab0af5f552604bfa8c016 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Wed, 19 Jul 2023 11:43:08 +0200 Subject: [PATCH 313/533] Add a dynamic Submenu activation --- app/javascript/controllers/chosen_controller.js | 4 ++++ .../concepts_browsers/_concepts_browser.html.haml | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/javascript/controllers/chosen_controller.js b/app/javascript/controllers/chosen_controller.js index 3293c985f..6a6317ece 100644 --- a/app/javascript/controllers/chosen_controller.js +++ b/app/javascript/controllers/chosen_controller.js @@ -10,6 +10,10 @@ export default class extends Controller { connect() { useChosen(this.element, {width: '100%', allow_single_deselect: true}, this.#onChange.bind(this)) + if (this.element.name=="collections" && this.element.value ){ + var event = new Event('change'); + this.element.dispatchEvent(event); + } } #onChange(event) { diff --git a/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml b/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml index 967c93e8c..962df5466 100644 --- a/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml +++ b/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml @@ -15,4 +15,11 @@ #concepts-list-container.tab-pane.fade = render partial: 'ontologies/concepts_browsers/concepts_list' #concepts-date-sort-container.tab-pane.fade - = render partial: 'ontologies/concepts_browsers/concepts_date_sort' \ No newline at end of file + = render partial: 'ontologies/concepts_browsers/concepts_date_sort' + +:javascript + jQuery(document).ready(function(){ + const urlParams = new URLSearchParams(window.location.search); + const getSubMenu = urlParams.get('sub_menu'); + $('#'+getSubMenu).click() + }) \ No newline at end of file From 20d69e49fb5c31bee73841d27fb980150f739921 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Wed, 19 Jul 2023 11:43:57 +0200 Subject: [PATCH 314/533] Display members count with link to concepts list "Display Members Count with Link to Concepts List" --- app/views/collections/_collection.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/collections/_collection.html.haml b/app/views/collections/_collection.html.haml index a3310e726..fa941e40b 100644 --- a/app/views/collections/_collection.html.haml +++ b/app/views/collections/_collection.html.haml @@ -18,7 +18,8 @@ %tr %td{nowrap: ""} Members count %td - %p= collection["memberCount"] + %a{href: "/ontologies/" + @ontology.acronym + "/?p=classes&sub_menu=concepts-list-tab&concept_collections=" + collection["@id"], target: '_blank'} + %p= collection["memberCount"] %tr %td.label Type From 8c0a294b75df77a02d88ac08f8721af63e6620ef Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 19 Jul 2023 15:44:28 +0000 Subject: [PATCH 315/533] add primary button to lookbook --- app/assets/stylesheets/components/index.scss | 1 + .../components/primary_button.scss | 99 +++++++++++++++++++ app/assets/stylesheets/login.scss | 21 +--- app/assets/stylesheets/register.scss | 14 +-- .../buttons/primary_button_component.rb | 10 ++ .../primary_button_component.html.haml | 23 +++++ app/views/layouts/component_preview.html.erb | 4 +- app/views/login/index.html.haml | 3 +- app/views/users/_form.html.haml | 3 +- .../primary_button_component_preview.rb | 11 +++ 10 files changed, 156 insertions(+), 33 deletions(-) create mode 100644 app/assets/stylesheets/components/primary_button.scss create mode 100644 app/components/buttons/primary_button_component.rb create mode 100644 app/components/buttons/primary_button_component/primary_button_component.html.haml create mode 100644 test/components/previews/buttons/primary_button_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 8c01c27e2..64763a740 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -10,4 +10,5 @@ @import 'input_field'; @import 'file_input_loader'; @import 'text_area_field'; +@import 'primary_button'; diff --git a/app/assets/stylesheets/components/primary_button.scss b/app/assets/stylesheets/components/primary_button.scss new file mode 100644 index 000000000..8af119a00 --- /dev/null +++ b/app/assets/stylesheets/components/primary_button.scss @@ -0,0 +1,99 @@ + +.primary-button { + width: 100%; + display: flex; + justify-content: center; + align-items: center; + font-size: 16px; + color: white; + height: 60px; + background-color: var(--primary-color); + border: none; + border-radius: 9px; + transition: background-color ease 0.3s; +} +.primary-button:hover { + background-color: var(--hover-color); + cursor: pointer; +} + + +.animation-container{ + width: 100%; + height: 60px; + font-size: 16px; + background-color: var(--hover-color); + border: none; + border-radius: 9px; + justify-content: center; + align-items: center; + display: none; + +} +.lds-ellipsis { + display: inline-block; + position: relative; + margin-top: 50px; + width: 80px; + height: 80px; + transform: scale(0.7); +} + +.lds-ellipsis div { + position: absolute; + width: 13px; + height: 13px; + border-radius: 50%; + background: white; + animation-timing-function: cubic-bezier(0, 1, 1, 0); +} + +.lds-ellipsis div:nth-child(1) { + left: 8px; + animation: lds-ellipsis1 0.6s infinite; +} + +.lds-ellipsis div:nth-child(2) { + left: 8px; + animation: lds-ellipsis2 0.6s infinite; +} + +.lds-ellipsis div:nth-child(3) { + left: 32px; + animation: lds-ellipsis2 0.6s infinite; +} + +.lds-ellipsis div:nth-child(4) { + left: 56px; + animation: lds-ellipsis3 0.6s infinite; +} + +@keyframes lds-ellipsis1 { + 0% { + transform: scale(0); + } + + 100% { + transform: scale(1); + } +} + +@keyframes lds-ellipsis3 { + 0% { + transform: scale(1); + } + + 100% { + transform: scale(0); + } +} + +@keyframes lds-ellipsis2 { + 0% { + transform: translate(0, 0); + } + + 100% { + transform: translate(24px, 0); + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index f2d68c91d..f26d33e6a 100644 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -41,24 +41,13 @@ text-decoration:none; font-size: 13px; } -.login-button{ - margin-top: 10px; - width: 357px; - font-size: 16px; - color: white; - padding: 17px; - background-color: var(--primary-color); - border: none; - border-radius: 9px; - margin-bottom: 20px; -} -.login-button:hover{ - background-color: var(--hover-color); - cursor: pointer; -} - .dont-have-account{ font-size: 15px; font-weight: 600; text-align: center; } +.login-button-container{ + margin-top: 10px; + margin-bottom: 20px; + width: 357px; +} \ No newline at end of file diff --git a/app/assets/stylesheets/register.scss b/app/assets/stylesheets/register.scss index 6db658b3a..2f9f1b305 100644 --- a/app/assets/stylesheets/register.scss +++ b/app/assets/stylesheets/register.scss @@ -83,22 +83,10 @@ margin-top: 14px; } -.register-button{ +.register-button-container{ margin-top: 20px; - width: 363px; - font-size: 16px; - color: white; - padding: 17px; - background-color: var(--primary-color); - border: none; - border-radius: 9px; - } -.register-button:hover{ - background-color: var(--hover-color); - cursor: pointer; -} #user_register_mail_list{ margin-top: 14px; accent-color: #8E8E8E; diff --git a/app/components/buttons/primary_button_component.rb b/app/components/buttons/primary_button_component.rb new file mode 100644 index 000000000..fb92497e3 --- /dev/null +++ b/app/components/buttons/primary_button_component.rb @@ -0,0 +1,10 @@ +class Buttons::PrimaryButtonComponent < ViewComponent::Base + def initialize(name: "", value: , type: "regular", style: "regular", color: "primary", onclick: "") + @name = name + @value = value + @type = type + @style = style + @color = color + @onclick = onclick + end +end diff --git a/app/components/buttons/primary_button_component/primary_button_component.html.haml b/app/components/buttons/primary_button_component/primary_button_component.html.haml new file mode 100644 index 000000000..8e574d671 --- /dev/null +++ b/app/components/buttons/primary_button_component/primary_button_component.html.haml @@ -0,0 +1,23 @@ +- if @type == "submit" + %button-container{onclick: "displayAnimation()"} + %input.primary-button{:name => @name, :type => "submit", :value => @value, id: "primary-button", oncklick: @onclick}/ +- else + %button-container + .primary-button{:name => @name, onclick: "displayAnimation()", id: "primary-button", oncklick: @onclick} + = @value + +.animation-container#loading-animation + .lds-ellipsis + %div + %div + %div + %div + +:javascript + const button = document.getElementById("primary-button") + const loading = document.getElementById("loading-animation") + function displayAnimation(){ + console.log("working") + button.style.display = 'none'; + loading.style.display = 'flex'; + } \ No newline at end of file diff --git a/app/views/layouts/component_preview.html.erb b/app/views/layouts/component_preview.html.erb index f6fe9f26b..f937c7c9b 100644 --- a/app/views/layouts/component_preview.html.erb +++ b/app/views/layouts/component_preview.html.erb @@ -48,9 +48,9 @@ jQuery(document).data().bp.ont_chart = {}; - + -
    +
    <%= yield %> <%= javascript_include_tag "application" %>
    diff --git a/app/views/login/index.html.haml b/app/views/login/index.html.haml index 16d6b495a..a8b986b0d 100644 --- a/app/views/login/index.html.haml +++ b/app/views/login/index.html.haml @@ -14,7 +14,8 @@ = password_field 'user','password', :autocomplete => "off", class: "login-input password-input", placeholder: "Enter your password" %a.login-forgot-password{:href => "/lost_pass"} %p Forgot password? - %input.login-button{"data-disable-with" => "Login", :name => "commit", :type => "submit", :value => "Login"}/ + .login-button-container + = render Buttons::PrimaryButtonComponent.new(value: "Login", name: "commit", type: "submit") %p.dont-have-account Don't have an account? %a.text-decoration-none{:href => new_user_path} Register diff --git a/app/views/users/_form.html.haml b/app/views/users/_form.html.haml index 4697bc2d8..e70512e62 100644 --- a/app/views/users/_form.html.haml +++ b/app/views/users/_form.html.haml @@ -50,4 +50,5 @@ .d-flex %input#user_register_mail_list{:checked => "checked", :name => "user[register_mail_list]", :type => "checkbox", :value => "1"}/ %p#register-check-text Register for the AgroPortal's mailing list - %input.register-button{:type => "submit", :value => "Register"}/ + .register-button-container + = render Buttons::PrimaryButtonComponent.new(type: "submit", value: "Register") diff --git a/test/components/previews/buttons/primary_button_component_preview.rb b/test/components/previews/buttons/primary_button_component_preview.rb new file mode 100644 index 000000000..1884c8978 --- /dev/null +++ b/test/components/previews/buttons/primary_button_component_preview.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true +class Buttons::PrimaryButtonComponentPreview < ViewComponent::Preview + def default + + + + def default() + render Buttons::PrimaryButtonComponent.new(value: "Login", name: "login", type: "regular") + end + end +end \ No newline at end of file From 0359dd6806d37664f94f99687ba45e675fa0fce6 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Thu, 20 Jul 2023 11:21:25 +0200 Subject: [PATCH 316/533] Display the list of concepts --- app/views/collections/_collection.html.haml | 2 +- .../concepts_browsers/_concepts_browser.html.haml | 8 ++++---- .../ontologies/concepts_browsers/_concepts_list.html.haml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/collections/_collection.html.haml b/app/views/collections/_collection.html.haml index fa941e40b..b915ef1b6 100644 --- a/app/views/collections/_collection.html.haml +++ b/app/views/collections/_collection.html.haml @@ -18,7 +18,7 @@ %tr %td{nowrap: ""} Members count %td - %a{href: "/ontologies/" + @ontology.acronym + "/?p=classes&sub_menu=concepts-list-tab&concept_collections=" + collection["@id"], target: '_blank'} + %a{href: "/ontologies/" + @ontology.acronym + "/?p=classes&sub_menu=concepts-list-tab&concept_collections=" + collection["@id"]} %p= collection["memberCount"] %tr %td.label diff --git a/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml b/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml index 962df5466..410a18dee 100644 --- a/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml +++ b/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml @@ -1,18 +1,18 @@ %nav .nav.nav-tabs.text-center{:role => "tablist", style:"background-color: rgba(0, 0, 0, 0.03);"} - %a#concepts-tree-tab.nav-item.nav-link.active.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-tree-container", title: 'Hierarchy view', 'data-controller': "tooltip"} + %a#concepts-tree-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-tree-container", title: 'Hierarchy view', 'data-controller': "tooltip", class: ("active" if !skos?) } %img{src: asset_path('list-tree.svg') , style:'width: 25px; height: 25px'} - if skos? - %a#concepts-list-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-list-container", title: 'Collection view', 'data-controller': "tooltip"} + %a#concepts-list-tab.nav-item.nav-link.active.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-list-container", title: 'Collection view', 'data-controller': "tooltip"} %i.fas.fa-list.text-dark{style:'font-size: 25px'} %a#concepts-date-sort-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-date-sort-container", title: 'Date view', 'data-controller': "tooltip"} %i.far.fa-calendar-alt.text-dark{style:'font-size: 25px'} .tab-content.px-1.py-2 - #concepts-tree-container.tab-pane.fade.show.active + #concepts-tree-container.tab-pane.fade{class: ("show active" if !skos?)} = render partial: 'ontologies/concepts_browsers/concepts_tree' - if skos? - #concepts-list-container.tab-pane.fade + #concepts-list-container.tab-pane.fade.show.active = render partial: 'ontologies/concepts_browsers/concepts_list' #concepts-date-sort-container.tab-pane.fade = render partial: 'ontologies/concepts_browsers/concepts_date_sort' diff --git a/app/views/ontologies/concepts_browsers/_concepts_list.html.haml b/app/views/ontologies/concepts_browsers/_concepts_list.html.haml index f6d49f174..eeb1d43e6 100644 --- a/app/views/ontologies/concepts_browsers/_concepts_list.html.haml +++ b/app/views/ontologies/concepts_browsers/_concepts_list.html.haml @@ -13,5 +13,5 @@ data: {action: 'changed->turbo-frame#updateFrame'}} %div#sd_content.card.p-1{style: 'overflow-y: scroll; height: 60vh;'} - = render TurboFrameComponent.new(id: 'concepts_list_view-page-1', data: {'turbo-frame-target': 'frame'}) do + = render TurboFrameComponent.new(id: 'concepts_list_view-page-1', data: {'turbo-frame-target': 'frame'}, src:"/ajax/classes/list?ontology_id=#{@ontology.acronym}&collection_id=#{params[:concept_collections]}") do Please select a collection to display \ No newline at end of file From 5f1bdb9ce63a838bd88ee8c4d74b3a477f2a918a Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Thu, 20 Jul 2023 11:24:35 +0200 Subject: [PATCH 317/533] Remove the js code of submenu --- app/javascript/controllers/chosen_controller.js | 4 ---- .../concepts_browsers/_concepts_browser.html.haml | 9 +-------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/app/javascript/controllers/chosen_controller.js b/app/javascript/controllers/chosen_controller.js index 6a6317ece..3293c985f 100644 --- a/app/javascript/controllers/chosen_controller.js +++ b/app/javascript/controllers/chosen_controller.js @@ -10,10 +10,6 @@ export default class extends Controller { connect() { useChosen(this.element, {width: '100%', allow_single_deselect: true}, this.#onChange.bind(this)) - if (this.element.name=="collections" && this.element.value ){ - var event = new Event('change'); - this.element.dispatchEvent(event); - } } #onChange(event) { diff --git a/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml b/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml index 410a18dee..bd8daabd2 100644 --- a/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml +++ b/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml @@ -15,11 +15,4 @@ #concepts-list-container.tab-pane.fade.show.active = render partial: 'ontologies/concepts_browsers/concepts_list' #concepts-date-sort-container.tab-pane.fade - = render partial: 'ontologies/concepts_browsers/concepts_date_sort' - -:javascript - jQuery(document).ready(function(){ - const urlParams = new URLSearchParams(window.location.search); - const getSubMenu = urlParams.get('sub_menu'); - $('#'+getSubMenu).click() - }) \ No newline at end of file + = render partial: 'ontologies/concepts_browsers/concepts_date_sort' \ No newline at end of file From bd3d57dfee358d93855e3387e9eb648a86df78c1 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 21 Jul 2023 20:16:37 +0200 Subject: [PATCH 318/533] rename view components "form" namespace to "input" --- app/components/{form => input}/date_component.rb | 2 +- .../date_component/date_component.html.haml | 0 app/components/{form => input}/file_input_component.rb | 2 +- .../file_input_component/file_input_component.html.haml | 0 .../file_input_loader_component_controller.js | 0 app/components/{form => input}/select_component.rb | 2 +- .../select_component/select_component.html.haml | 0 app/components/{form => input}/text_area_component.rb | 2 +- .../text_area_component/text_area_component.html.haml | 0 app/components/{form => input}/text_input_component.rb | 2 +- .../text_input_component/text_input_component.html.haml | 0 app/views/mappings/bulk_loader/_loader.html.haml | 2 +- .../previews/form/file_input_component_preview.rb | 9 --------- .../previews/{ => input}/chips_component_preview.rb | 2 +- .../previews/{form => input}/date_component_preview.rb | 4 ++-- .../previews/input/file_input_component_preview.rb | 9 +++++++++ .../{ => input}/nested_form_input_component_preview.rb | 2 +- .../previews/{form => input}/select_component_preview.rb | 8 ++++---- .../{form => input}/text_area_component_preview.rb | 4 ++-- .../{form => input}/text_input_component_preview.rb | 4 ++-- 20 files changed, 27 insertions(+), 27 deletions(-) rename app/components/{form => input}/date_component.rb (85%) rename app/components/{form => input}/date_component/date_component.html.haml (100%) rename app/components/{form => input}/file_input_component.rb (71%) rename app/components/{form => input}/file_input_component/file_input_component.html.haml (100%) rename app/components/{form => input}/file_input_component/file_input_loader_component_controller.js (100%) rename app/components/{form => input}/select_component.rb (90%) rename app/components/{form => input}/select_component/select_component.html.haml (100%) rename app/components/{form => input}/text_area_component.rb (85%) rename app/components/{form => input}/text_area_component/text_area_component.html.haml (100%) rename app/components/{form => input}/text_input_component.rb (83%) rename app/components/{form => input}/text_input_component/text_input_component.html.haml (100%) delete mode 100644 test/components/previews/form/file_input_component_preview.rb rename test/components/previews/{ => input}/chips_component_preview.rb (74%) rename test/components/previews/{form => input}/date_component_preview.rb (75%) create mode 100644 test/components/previews/input/file_input_component_preview.rb rename test/components/previews/{ => input}/nested_form_input_component_preview.rb (88%) rename test/components/previews/{form => input}/select_component_preview.rb (75%) rename test/components/previews/{form => input}/text_area_component_preview.rb (76%) rename test/components/previews/{form => input}/text_input_component_preview.rb (76%) diff --git a/app/components/form/date_component.rb b/app/components/input/date_component.rb similarity index 85% rename from app/components/form/date_component.rb rename to app/components/input/date_component.rb index 143b1733f..3240562f3 100644 --- a/app/components/form/date_component.rb +++ b/app/components/input/date_component.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Form::DateComponent < InputFieldComponent +class Input::DateComponent < InputFieldComponent def initialize(label: '', name:, value: Date.today, placeholder: '', error_message: '', helper_text: '') super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) end diff --git a/app/components/form/date_component/date_component.html.haml b/app/components/input/date_component/date_component.html.haml similarity index 100% rename from app/components/form/date_component/date_component.html.haml rename to app/components/input/date_component/date_component.html.haml diff --git a/app/components/form/file_input_component.rb b/app/components/input/file_input_component.rb similarity index 71% rename from app/components/form/file_input_component.rb rename to app/components/input/file_input_component.rb index 189a3db5c..41de28bce 100644 --- a/app/components/form/file_input_component.rb +++ b/app/components/input/file_input_component.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Form::FileInputComponent < ViewComponent::Base +class Input::FileInputComponent < ViewComponent::Base def initialize(name:, html_options: '') @name = name @html_options = html_options diff --git a/app/components/form/file_input_component/file_input_component.html.haml b/app/components/input/file_input_component/file_input_component.html.haml similarity index 100% rename from app/components/form/file_input_component/file_input_component.html.haml rename to app/components/input/file_input_component/file_input_component.html.haml diff --git a/app/components/form/file_input_component/file_input_loader_component_controller.js b/app/components/input/file_input_component/file_input_loader_component_controller.js similarity index 100% rename from app/components/form/file_input_component/file_input_loader_component_controller.js rename to app/components/input/file_input_component/file_input_loader_component_controller.js diff --git a/app/components/form/select_component.rb b/app/components/input/select_component.rb similarity index 90% rename from app/components/form/select_component.rb rename to app/components/input/select_component.rb index 19a89a670..44d0de23b 100644 --- a/app/components/form/select_component.rb +++ b/app/components/input/select_component.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Form::SelectComponent < InputFieldComponent +class Input::SelectComponent < InputFieldComponent def initialize(id: nil, label: '', name:, value: [], selected: '', placeholder: '', error_message: '', helper_text: '', multiple: false, open_to_add_values: false) super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) diff --git a/app/components/form/select_component/select_component.html.haml b/app/components/input/select_component/select_component.html.haml similarity index 100% rename from app/components/form/select_component/select_component.html.haml rename to app/components/input/select_component/select_component.html.haml diff --git a/app/components/form/text_area_component.rb b/app/components/input/text_area_component.rb similarity index 85% rename from app/components/form/text_area_component.rb rename to app/components/input/text_area_component.rb index a9aa3041e..b493347c2 100644 --- a/app/components/form/text_area_component.rb +++ b/app/components/input/text_area_component.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Form::TextAreaComponent < InputFieldComponent +class Input::TextAreaComponent < InputFieldComponent def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '', rows: "5") super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) @rows = rows diff --git a/app/components/form/text_area_component/text_area_component.html.haml b/app/components/input/text_area_component/text_area_component.html.haml similarity index 100% rename from app/components/form/text_area_component/text_area_component.html.haml rename to app/components/input/text_area_component/text_area_component.html.haml diff --git a/app/components/form/text_input_component.rb b/app/components/input/text_input_component.rb similarity index 83% rename from app/components/form/text_input_component.rb rename to app/components/input/text_input_component.rb index 94fa720fe..ad5b2f5ef 100644 --- a/app/components/form/text_input_component.rb +++ b/app/components/input/text_input_component.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Form::TextInputComponent < InputFieldComponent +class Input::TextInputComponent < InputFieldComponent def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '') super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) end diff --git a/app/components/form/text_input_component/text_input_component.html.haml b/app/components/input/text_input_component/text_input_component.html.haml similarity index 100% rename from app/components/form/text_input_component/text_input_component.html.haml rename to app/components/input/text_input_component/text_input_component.html.haml diff --git a/app/views/mappings/bulk_loader/_loader.html.haml b/app/views/mappings/bulk_loader/_loader.html.haml index eb50fa54d..efc06170b 100644 --- a/app/views/mappings/bulk_loader/_loader.html.haml +++ b/app/views/mappings/bulk_loader/_loader.html.haml @@ -14,6 +14,6 @@ = JSON.pretty_generate @example_code = form_with url: '/mappings/loader', method: :post, multipart: true, data: { turbo: true} do %div - = render Form::FileInputComponent.new(name: :file) + = render Input::FileInputComponent.new(name: :file) %button.btn.btn-secondary.btn-block.mt-2{type:'submit'} Save diff --git a/test/components/previews/form/file_input_component_preview.rb b/test/components/previews/form/file_input_component_preview.rb deleted file mode 100644 index ef8000a6d..000000000 --- a/test/components/previews/form/file_input_component_preview.rb +++ /dev/null @@ -1,9 +0,0 @@ -class Form::FileInputComponentPreview < ViewComponent::Preview - - - def default - render Form::FileInputComponent.new(name: "file") - end - - -end \ No newline at end of file diff --git a/test/components/previews/chips_component_preview.rb b/test/components/previews/input/chips_component_preview.rb similarity index 74% rename from test/components/previews/chips_component_preview.rb rename to test/components/previews/input/chips_component_preview.rb index 8f806211c..76e10ec28 100644 --- a/test/components/previews/chips_component_preview.rb +++ b/test/components/previews/input/chips_component_preview.rb @@ -1,4 +1,4 @@ -class ChipsComponentPreview < ViewComponent::Preview +class Input::ChipsComponentPreview < ViewComponent::Preview # @param name text # @param value text diff --git a/test/components/previews/form/date_component_preview.rb b/test/components/previews/input/date_component_preview.rb similarity index 75% rename from test/components/previews/form/date_component_preview.rb rename to test/components/previews/input/date_component_preview.rb index 193bc3cf9..07cb53fb8 100644 --- a/test/components/previews/form/date_component_preview.rb +++ b/test/components/previews/input/date_component_preview.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Form::DateComponentPreview < ViewComponent::Preview +class Input::DateComponentPreview < ViewComponent::Preview def default # This is a date input field: # - To use it without a label: don't give a value to the param label or leave it empty. @@ -11,7 +11,7 @@ def default # @param helper_text text def default(label: "Label", placeholder: "", error_message: "", helper_text: "") - render Form::DateComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) + render Input::DateComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) end end end diff --git a/test/components/previews/input/file_input_component_preview.rb b/test/components/previews/input/file_input_component_preview.rb new file mode 100644 index 000000000..94638bf57 --- /dev/null +++ b/test/components/previews/input/file_input_component_preview.rb @@ -0,0 +1,9 @@ +class Input::FileInputComponentPreview < ViewComponent::Preview + + + def default + render Input::FileInputComponent.new(name: "file") + end + + +end \ No newline at end of file diff --git a/test/components/previews/nested_form_input_component_preview.rb b/test/components/previews/input/nested_form_input_component_preview.rb similarity index 88% rename from test/components/previews/nested_form_input_component_preview.rb rename to test/components/previews/input/nested_form_input_component_preview.rb index 20ef1783e..ec9329466 100644 --- a/test/components/previews/nested_form_input_component_preview.rb +++ b/test/components/previews/input/nested_form_input_component_preview.rb @@ -1,4 +1,4 @@ -class NestedFormInputComponentPreview < ViewComponent::Preview +class Input::NestedFormInputComponentPreview < ViewComponent::Preview include ActionView::Helpers::TagHelper include ActionView::Helpers::FormTagHelper diff --git a/test/components/previews/form/select_component_preview.rb b/test/components/previews/input/select_component_preview.rb similarity index 75% rename from test/components/previews/form/select_component_preview.rb rename to test/components/previews/input/select_component_preview.rb index 1a1fab70d..95ba3e5ec 100644 --- a/test/components/previews/form/select_component_preview.rb +++ b/test/components/previews/input/select_component_preview.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true -class Form::SelectComponentPreview < ViewComponent::Preview +class Input::SelectComponentPreview < ViewComponent::Preview def default(id: "", name: "", values: ["choices 1", "choices 2", "choices 3"], selected: "choices 2", multiple: false, open_to_add_values: false) - render Form::SelectComponent.new(id: id, name: name, values: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values) + render Input::SelectComponent.new(id: id, name: name, value: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values) end def multiple(id: "", name: "", values: ["choices 1", "choices 2", "choices 3"], selected: "choices 2", multiple: true, open_to_add_values: false) - render Form::SelectComponent.new(id: id, name: name, values: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values) + render Input::SelectComponent.new(id: id, name: name, value: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values) end def open_to_add(id: "", name: "", values: ["choices 1", "choices 2", "choices 3"], selected: "choices 2", multiple: true , open_to_add_values: true) - render Form::SelectComponent.new(id: id, name: name, values: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values) + render Input::SelectComponent.new(id: id, name: name, value: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values) end end diff --git a/test/components/previews/form/text_area_component_preview.rb b/test/components/previews/input/text_area_component_preview.rb similarity index 76% rename from test/components/previews/form/text_area_component_preview.rb rename to test/components/previews/input/text_area_component_preview.rb index 36d21e577..3af24aa3b 100644 --- a/test/components/previews/form/text_area_component_preview.rb +++ b/test/components/previews/input/text_area_component_preview.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Form::TextAreaComponentPreview < ViewComponent::Preview +class Input::TextAreaComponentPreview < ViewComponent::Preview # This is a textarea field: # - To use it without a label: don't give a value to the param label or leave it empty. # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed. @@ -14,6 +14,6 @@ class Form::TextAreaComponentPreview < ViewComponent::Preview # @param rows number def default(label: "Label", placeholder: "", error_message: "", helper_text: "", rows: 5) - render Form::TextAreaComponent.new(label: label, name: "name",value: '', placeholder: placeholder, error_message: error_message, helper_text: helper_text, rows: rows) + render Input::TextAreaComponent.new(label: label, name: "name",value: '', placeholder: placeholder, error_message: error_message, helper_text: helper_text, rows: rows) end end diff --git a/test/components/previews/form/text_input_component_preview.rb b/test/components/previews/input/text_input_component_preview.rb similarity index 76% rename from test/components/previews/form/text_input_component_preview.rb rename to test/components/previews/input/text_input_component_preview.rb index 9511f2374..e5e5f9a87 100644 --- a/test/components/previews/form/text_input_component_preview.rb +++ b/test/components/previews/input/text_input_component_preview.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Form::TextInputComponentPreview < ViewComponent::Preview +class Input::TextInputComponentPreview < ViewComponent::Preview # This is a text input field: # - To use it without a label: don't give a value to the param label or leave it empty. # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed. @@ -12,6 +12,6 @@ class Form::TextInputComponentPreview < ViewComponent::Preview # @param helper_text text def default(label: "Label", placeholder: "", error_message: "", helper_text: "") - render Form::TextInputComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) + render Input::TextInputComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) end end From dea0fb5c25278a6d2bb31639ba32251cd2f45e37 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 21 Jul 2023 20:17:09 +0200 Subject: [PATCH 319/533] create the display namespace for the data display components --- .../previews/{ => display}/chip_button_component_preview.rb | 2 +- .../previews/{ => display}/date_time_field_component_preview.rb | 2 +- .../previews/{ => display}/field_container_component_preview.rb | 2 +- .../previews/{ => display}/language_field_component_preview.rb | 2 +- .../previews/{ => display}/license_field_component_preview.rb | 2 +- .../previews/{ => display}/link_field_component_preview.rb | 2 +- .../previews/{ => display}/text_area_field_component_preview.rb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename test/components/previews/{ => display}/chip_button_component_preview.rb (84%) rename test/components/previews/{ => display}/date_time_field_component_preview.rb (78%) rename test/components/previews/{ => display}/field_container_component_preview.rb (74%) rename test/components/previews/{ => display}/language_field_component_preview.rb (61%) rename test/components/previews/{ => display}/license_field_component_preview.rb (83%) rename test/components/previews/{ => display}/link_field_component_preview.rb (66%) rename test/components/previews/{ => display}/text_area_field_component_preview.rb (91%) diff --git a/test/components/previews/chip_button_component_preview.rb b/test/components/previews/display/chip_button_component_preview.rb similarity index 84% rename from test/components/previews/chip_button_component_preview.rb rename to test/components/previews/display/chip_button_component_preview.rb index ab5dedab2..8ee442987 100644 --- a/test/components/previews/chip_button_component_preview.rb +++ b/test/components/previews/display/chip_button_component_preview.rb @@ -1,4 +1,4 @@ -class ChipButtonComponentPreview < ViewComponent::Preview +class Display::ChipButtonComponentPreview < ViewComponent::Preview # @param url text # @param text text diff --git a/test/components/previews/date_time_field_component_preview.rb b/test/components/previews/display/date_time_field_component_preview.rb similarity index 78% rename from test/components/previews/date_time_field_component_preview.rb rename to test/components/previews/display/date_time_field_component_preview.rb index f23e937a5..04071bc8c 100644 --- a/test/components/previews/date_time_field_component_preview.rb +++ b/test/components/previews/display/date_time_field_component_preview.rb @@ -1,4 +1,4 @@ -class DateTimeFieldComponentPreview < ViewComponent::Preview +class Display::DateTimeFieldComponentPreview < ViewComponent::Preview # @param text text # @param format select [year_month_day_concise, month_day_year, monthfull_day_year] diff --git a/test/components/previews/field_container_component_preview.rb b/test/components/previews/display/field_container_component_preview.rb similarity index 74% rename from test/components/previews/field_container_component_preview.rb rename to test/components/previews/display/field_container_component_preview.rb index 17f01770a..0f04e8222 100644 --- a/test/components/previews/field_container_component_preview.rb +++ b/test/components/previews/display/field_container_component_preview.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class FieldContainerComponentPreview < ViewComponent::Preview +class Display::FieldContainerComponentPreview < ViewComponent::Preview # @param label text # @param value text diff --git a/test/components/previews/language_field_component_preview.rb b/test/components/previews/display/language_field_component_preview.rb similarity index 61% rename from test/components/previews/language_field_component_preview.rb rename to test/components/previews/display/language_field_component_preview.rb index 9c2f00ab1..29cd56d3a 100644 --- a/test/components/previews/language_field_component_preview.rb +++ b/test/components/previews/display/language_field_component_preview.rb @@ -1,4 +1,4 @@ -class LanguageFieldComponentPreview < ViewComponent::Preview +class Display::LanguageFieldComponentPreview < ViewComponent::Preview # @param value text def default(value: 'fr') diff --git a/test/components/previews/license_field_component_preview.rb b/test/components/previews/display/license_field_component_preview.rb similarity index 83% rename from test/components/previews/license_field_component_preview.rb rename to test/components/previews/display/license_field_component_preview.rb index 8c3f8233b..203318a0b 100644 --- a/test/components/previews/license_field_component_preview.rb +++ b/test/components/previews/display/license_field_component_preview.rb @@ -1,4 +1,4 @@ -class LicenseFieldComponentPreview < ViewComponent::Preview +class Display::LicenseFieldComponentPreview < ViewComponent::Preview # @param value select [ CC-BY IGO 3.0, https://creativecommons.org/licenses/by/4.0/, http://www.gnu.org/licenses/gpl-3.0, https://opensource.org/licenses/MIT, http://www.apache.org/licenses/LICENSE-2.0 ] def default(value: "https://creativecommons.org/licenses/by/4.0/") diff --git a/test/components/previews/link_field_component_preview.rb b/test/components/previews/display/link_field_component_preview.rb similarity index 66% rename from test/components/previews/link_field_component_preview.rb rename to test/components/previews/display/link_field_component_preview.rb index f364b8e30..3b6d3a85a 100644 --- a/test/components/previews/link_field_component_preview.rb +++ b/test/components/previews/display/link_field_component_preview.rb @@ -1,4 +1,4 @@ -class LinkFieldComponentPreview < ViewComponent::Preview +class Display::LinkFieldComponentPreview < ViewComponent::Preview # @param text text def default(text: "https://agroportal.lirmm.fr/") diff --git a/test/components/previews/text_area_field_component_preview.rb b/test/components/previews/display/text_area_field_component_preview.rb similarity index 91% rename from test/components/previews/text_area_field_component_preview.rb rename to test/components/previews/display/text_area_field_component_preview.rb index 2d6cfa7b7..efa508ab2 100644 --- a/test/components/previews/text_area_field_component_preview.rb +++ b/test/components/previews/display/text_area_field_component_preview.rb @@ -1,4 +1,4 @@ -class TextAreaFieldComponentPreview < ViewComponent::Preview +class Display::TextAreaFieldComponentPreview < ViewComponent::Preview # @param value textarea From 11f10d8e0f33e83f1dc3a5792b65c44bacd4bf41 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 21 Jul 2023 20:18:02 +0200 Subject: [PATCH 320/533] create the layout namespace for view component that structure content --- .../previews/{ => layout}/card_message_component_preview.rb | 2 +- .../{ => layout}/dropdown_container_component_preview.rb | 2 +- .../previews/{ => layout}/summary_section_component_preview.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename test/components/previews/{ => layout}/card_message_component_preview.rb (94%) rename test/components/previews/{ => layout}/dropdown_container_component_preview.rb (79%) rename test/components/previews/{ => layout}/summary_section_component_preview.rb (86%) diff --git a/test/components/previews/card_message_component_preview.rb b/test/components/previews/layout/card_message_component_preview.rb similarity index 94% rename from test/components/previews/card_message_component_preview.rb rename to test/components/previews/layout/card_message_component_preview.rb index 522031669..4b28bf40f 100644 --- a/test/components/previews/card_message_component_preview.rb +++ b/test/components/previews/layout/card_message_component_preview.rb @@ -1,4 +1,4 @@ -class CardMessageComponentPreview < ViewComponent::Preview +class Layout::CardMessageComponentPreview < ViewComponent::Preview # @param message text # @param button_text text diff --git a/test/components/previews/dropdown_container_component_preview.rb b/test/components/previews/layout/dropdown_container_component_preview.rb similarity index 79% rename from test/components/previews/dropdown_container_component_preview.rb rename to test/components/previews/layout/dropdown_container_component_preview.rb index 90753546c..7d66eb5df 100644 --- a/test/components/previews/dropdown_container_component_preview.rb +++ b/test/components/previews/layout/dropdown_container_component_preview.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class DropdownContainerComponentPreview < ViewComponent::Preview +class Layout::DropdownContainerComponentPreview < ViewComponent::Preview layout 'component_preview_not_centred' # @param title text diff --git a/test/components/previews/summary_section_component_preview.rb b/test/components/previews/layout/summary_section_component_preview.rb similarity index 86% rename from test/components/previews/summary_section_component_preview.rb rename to test/components/previews/layout/summary_section_component_preview.rb index d29593c32..626770b14 100644 --- a/test/components/previews/summary_section_component_preview.rb +++ b/test/components/previews/layout/summary_section_component_preview.rb @@ -1,4 +1,4 @@ -class SummarySectionComponentPreview < ViewComponent::Preview +class Layout::SummarySectionComponentPreview < ViewComponent::Preview layout 'component_preview_not_centred' # @param title text # @param content textarea From a7e3574f413b5a4cf62986191abb8fef2a20151d Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 22 Jul 2023 01:39:21 +0200 Subject: [PATCH 321/533] add tab container component --- app/assets/stylesheets/components/index.scss | 1 + .../components/tabs_container.scss | 52 +++++++++++++++++++ app/components/tab_item_component.rb | 39 ++++++++++++++ app/components/tabs_container_component.rb | 12 +++++ .../tabs_container_component.html.haml | 12 +++++ .../tabs_container_component_preview.rb | 24 +++++++++ 6 files changed, 140 insertions(+) create mode 100644 app/assets/stylesheets/components/tabs_container.scss create mode 100644 app/components/tab_item_component.rb create mode 100644 app/components/tabs_container_component.rb create mode 100644 app/components/tabs_container_component/tabs_container_component.html.haml create mode 100644 test/components/previews/layout/tabs_container_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 8c01c27e2..3d29f0f6d 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -10,4 +10,5 @@ @import 'input_field'; @import 'file_input_loader'; @import 'text_area_field'; +@import 'tabs_container'; diff --git a/app/assets/stylesheets/components/tabs_container.scss b/app/assets/stylesheets/components/tabs_container.scss new file mode 100644 index 000000000..0baf56f18 --- /dev/null +++ b/app/assets/stylesheets/components/tabs_container.scss @@ -0,0 +1,52 @@ +.tabs-container { + border-bottom: 1px solid #DFDFDF; + display: flex; + justify-content: center; + & > div { + display: flex; + justify-content: space-between; + padding: 0 50px; + } +} + +.tabs-container hr{ + border: 1px solid #f3f3f3; + width: 100%; + margin: 0; +} +.tabs-container .tab-items{ + display: flex; + margin: 0; +} +.tabs-container .tab-items div{ + font-size: 16px; + font-weight: 400; + color: #5e5e5e; + margin-right: 50px; + cursor: pointer; + opacity: 60%; + transition: opacity 0.3s ease; + a { + color: #5e5e5e !important; + } +} + +.tabs-container .tab-items div:hover{ + + opacity: 100%; +} + +.tabs-container .tab-items div hr{ + display: none; + margin-top: 10px; +} +.tabs-container .tab-items .active{ + font-weight: 500; + color: black; + opacity: 100%; +} +.tabs-container .tab-items .active hr{ + display: block; + border: 1px solid var(--primary-color); + opacity: 100%; +} diff --git a/app/components/tab_item_component.rb b/app/components/tab_item_component.rb new file mode 100644 index 000000000..cebb54a11 --- /dev/null +++ b/app/components/tab_item_component.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +class TabItemComponent < ViewComponent::Base + + include ActionView::Helpers::UrlHelper + + def initialize(title:, path:, page_name: '', selected: false) + super + @title = title + @path = path + @page_name = page_name + @selected = selected + end + + def selected_item? + @selected + end + + def item_id + @title.parameterize.underscore + end + + def target_id + "#{item_id}_content" + end + + def target + "##{target_id}" + end + + def active_class + selected_item? ? 'active show' : '' + end + + def call + link_to(@title.humanize, "#hello", id: "#{item_id}_tab") + end + +end diff --git a/app/components/tabs_container_component.rb b/app/components/tabs_container_component.rb new file mode 100644 index 000000000..90f48194b --- /dev/null +++ b/app/components/tabs_container_component.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class TabsContainerComponent < ViewComponent::Base + + renders_many :items, TabItemComponent + renders_many :item_contents + + def initialize + super + end + +end diff --git a/app/components/tabs_container_component/tabs_container_component.html.haml b/app/components/tabs_container_component/tabs_container_component.html.haml new file mode 100644 index 000000000..c456eb04f --- /dev/null +++ b/app/components/tabs_container_component/tabs_container_component.html.haml @@ -0,0 +1,12 @@ +.tabs-container + .tab-items.nav-tabs.nav + - items.each do |item| + %div{data: { toggle: 'tab', target: item.target}, class: item.active_class} + = item + %hr + +.tab-content + - item_contents.each_with_index do |item_content, index| + %div.tab-pane{id: items[index].target_id, class: items[index].active_class} + = item_content + diff --git a/test/components/previews/layout/tabs_container_component_preview.rb b/test/components/previews/layout/tabs_container_component_preview.rb new file mode 100644 index 000000000..ca25263ae --- /dev/null +++ b/test/components/previews/layout/tabs_container_component_preview.rb @@ -0,0 +1,24 @@ +class Layout::TabsContainerComponentPreview < ViewComponent::Preview + + include ActionView::Helpers::TagHelper + include ActionView::Context + + def default + render TabsContainerComponent.new do |c| + sections = ['section 1', 'section 2', 'section 3', 'section 4'] + + sections.each do |section_title| + c.item(title: section_title, + path: "#{section_title}path", + selected: section_title.eql?('section 2'), + page_name: "#{section_title}path") + + c.item_content do + section_title + end + end + + end + end + +end \ No newline at end of file From 81970530cd06d09a7a1d67fde2b10b0196faf5b9 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 22 Jul 2023 02:11:41 +0200 Subject: [PATCH 322/533] use the new tabs component in the administration page --- app/views/admin/index.html.haml | 65 +++++++++------------------------ 1 file changed, 18 insertions(+), 47 deletions(-) diff --git a/app/views/admin/index.html.haml b/app/views/admin/index.html.haml index a67c02674..91b174eb5 100644 --- a/app/views/admin/index.html.haml +++ b/app/views/admin/index.html.haml @@ -13,27 +13,14 @@ %div.row %div.col - %ul.nav.nav-tabs{id: "admin-tabs", role: "tablist"} - %li.nav-item - =link_to("Site Administration", "#site-admin", id: "site-admin-tab", class: "nav-link active", role: "tab", data: { toggle: "tab" }, aria: { controls: "site-admin", selected: "true" }) - %li.nav-item - =link_to("Ontology Administration", "#ontology-admin", id: "ontology-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab" }, aria: { controls: "ontology-admin", selected: "false" }) - %li.nav-item - =link_to("Licensing", "#licensing", id: "licensing-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: admin_licenses_path() }, aria: { controls: "licensing", selected: "false" }) - %li.nav-item - =link_to("Users", "#users", id: "users-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: users_path() }, aria: { controls: "users", selected: "false" }) - %li.nav-item - =link_to("Metadata Administration", "#ontologies_metadata_curator", id: "ontologies_metadata_curator-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab"}, aria: { controls: "ontologies_metadata_curator", selected: "false" }) - %li.nav-item - =link_to("Groups", "#groups", id: "groups-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: "groups" }, aria: { controls: "groups", selected: "false" }) - %li.nav-item - =link_to("Categories", "#categories", id: "categories-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: "categories" }, aria: { controls: "categories", selected: "false" }) - %div#adminTabContent.tab-content - - -# Site Administration tab - %div.tab-pane.active.show.fade{id: "site-admin", role: "tabpanel", aria: { labelledby: "site-admin-tab" }} - - -# Clear caches + - sections = ['Site Administration','Ontology Administration', 'Licensing', 'Users', 'Metadata Administration', 'Groups', 'Categories'] + = render TabsContainerComponent.new do |t| + - sections.each do |section_title| + - t.item(title: section_title, + path: '', + selected: section_title.eql?(sections.first), + page_name: '') + - t.item_content do %div#site-admin-clear-caches.my-5 %div.site-admin-page-header CACHE MANAGEMENT @@ -42,33 +29,27 @@ = link_to("Reset UI cache connection", "#", id: "reset_memcache_connection_action", class: "btn btn-outline-secondary btn-sm admin-action-item", role: "button") = link_to("Flush GOO cache", "#", id: "flush_goo_cache_action", class: "btn btn-outline-secondary btn-sm admin-action-item", role: "button") = link_to("Flush HTTP cache", "#", id: "flush_http_cache_action", class: "btn btn-outline-secondary btn-sm", role: "button") - - -# Check for updates + %div#site-admin-update-check.mb-5 %div.site-admin-page-header VERSION MANAGEMENT %dive.site-admin-page-section = link_to("Check for updates", "#", id: "update_check_action", class: "btn btn-outline-secondary btn-sm", role: "button") - -# View appliance ID %div#site-admin-appliance-id.mb-5 %div.site-admin-page-header APPLIANCE ID %dive.site-admin-page-section %div#appliance-id %span - - -# Clear caches + %div#site-admin-clear-caches.my-5 %div.site-admin-page-header MONITORING LINKS %dive.site-admin-page-section = link_to("Newrelic", "https://login.newrelic.com/login", target: '_blank', id: "newrelic_link", class: "btn btn-outline-secondary btn-sm admin-action-item", role: "button") = link_to("StatusCake", "https://app.statuscake.com/Login", target: '_blank', id: "statuscake_link", class: "btn btn-outline-secondary btn-sm admin-action-item", role: "button") - - - -# Ontology Administration tab - %div.tab-pane.fade{id: "ontology-admin", role: "tabpanel", aria: { labelledby: "ontology-admin-tab" }} + - t.item_content do %div.ontologies_list_container.mt-3 %table{:style => "float:left;"} %tr @@ -79,9 +60,8 @@ %span.ui-button-text{:class => "report_date_generated_button"} %p.tab_description{:style => "clear:both;"} %table#adminOntologies.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"} + - t.item_content do - -# Licensing tab - %div.tab-pane.fade{id: "licensing", role: "tabpanel", aria: { labelledby: "licensing-admin-tab" }} %div#renew-license-notice %table.table.table-sm.table-bordered.mt-5#license-table @@ -89,35 +69,26 @@ %tr %th{scope: "col"} Licensed to %th{scope: "col"} Appliance ID - %th{scope: "col"} Valid till + %th{scope: "col"} Valid till %th{scope: "col"} Days remaining %tbody %div.mb-5#renew-license-button - = link_to("Renew license", new_admin_license_path(), class: "btn btn-primary", role: "button", remote: "true") + = link_to("Renew license", new_admin_license_path, class: "btn btn-primary", role: "button", remote: "true") %div.mb-5#renew-license-form - - -# Users tab - %div.tab-pane.fade{id: "users", role: "tabpanel", aria: { labelledby: "users-admin-tab" }} + - t.item_content do %div.ontologies_list_container.mt-3 %table#adminUsers.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"} - - -# metadata tab - %div.tab-pane.fade{id: "ontologies_metadata_curator", role: "tabpanel", aria: { labelledby: "ontologies_metadata_curator-admin-tab" }} + - t.item_content do = render partial: 'ontologies_metadata_curator/metadata_tab' - - -# Groups tab - %div.tab-pane.fade{id: "groups", role: "tabpanel", aria: { labelledby: "groups-admin-tab" }} + - t.item_content do %div.ontologies_list_container.mt-3 %table#adminGroups.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"} - - -# Categories tab - %div.tab-pane.fade{id: "categories", role: "tabpanel", aria: { labelledby: "categories-admin-tab" }} + - t.item_content do %div.ontologies_list_container.mt-3 %table#adminCategories.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"} - \ No newline at end of file From 78aa0b89130fe3e09697c853bdd04c00d2ef7e72 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 22 Jul 2023 20:13:37 +0200 Subject: [PATCH 323/533] implement tabs container stimulus controller tu update URL on tab change --- app/components/tab_item_component.rb | 11 +++++- app/components/tabs_container_component.rb | 14 ++++++- .../tabs_container_component.html.haml | 4 +- .../tabs_container_component_controller.js | 39 +++++++++++++++++++ app/javascript/component_controllers/index.js | 4 ++ 5 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 app/components/tabs_container_component/tabs_container_component_controller.js diff --git a/app/components/tab_item_component.rb b/app/components/tab_item_component.rb index cebb54a11..e7728cc09 100644 --- a/app/components/tab_item_component.rb +++ b/app/components/tab_item_component.rb @@ -17,7 +17,7 @@ def selected_item? end def item_id - @title.parameterize.underscore + id.parameterize.underscore end def target_id @@ -28,12 +28,19 @@ def target "##{target_id}" end + def id + @title + end + def title + @title.humanize + end + def active_class selected_item? ? 'active show' : '' end def call - link_to(@title.humanize, "#hello", id: "#{item_id}_tab") + link_to(title, @path, id: "#{item_id}_tab") end end diff --git a/app/components/tabs_container_component.rb b/app/components/tabs_container_component.rb index 90f48194b..f911eee1c 100644 --- a/app/components/tabs_container_component.rb +++ b/app/components/tabs_container_component.rb @@ -5,8 +5,20 @@ class TabsContainerComponent < ViewComponent::Base renders_many :items, TabItemComponent renders_many :item_contents - def initialize + def initialize(url_parameter: nil) super + @url_parameter = url_parameter + end + + def tabs_container_data(item) + { + toggle: 'tab', + target: item.target, + 'tab-id': item.id, + 'tab-title': item.title, + 'url-parameter': @url_parameter, + action: 'click->tabs-container#selectTab' + } end end diff --git a/app/components/tabs_container_component/tabs_container_component.html.haml b/app/components/tabs_container_component/tabs_container_component.html.haml index c456eb04f..db2d49873 100644 --- a/app/components/tabs_container_component/tabs_container_component.html.haml +++ b/app/components/tabs_container_component/tabs_container_component.html.haml @@ -1,7 +1,7 @@ -.tabs-container +.tabs-container{data: {controller:'tabs-container'}} .tab-items.nav-tabs.nav - items.each do |item| - %div{data: { toggle: 'tab', target: item.target}, class: item.active_class} + %div{data: tabs_container_data(item), class: item.active_class} = item %hr diff --git a/app/components/tabs_container_component/tabs_container_component_controller.js b/app/components/tabs_container_component/tabs_container_component_controller.js new file mode 100644 index 000000000..a1d99677e --- /dev/null +++ b/app/components/tabs_container_component/tabs_container_component_controller.js @@ -0,0 +1,39 @@ +import { Controller } from "@hotwired/stimulus"; +import {HistoryService} from "../../javascript/mixins/useHistory"; + +export default class extends Controller { + + connect() { + this.event = null + } + + + selectTab(event) { + this.event = event + if(this.#parameter()){ + this.#updateURL() + } + } + + #pageId(){ + return this.event.currentTarget.getAttribute("data-tab-id") + } + + #title(){ + return this.event.currentTarget.getAttribute("data-tab-title") + } + + #parameter(){ + return this.event.currentTarget.getAttribute("data-url-parameter") + } + + + #url(){ + return `?${this.#parameter()}=${this.#pageId()}` + } + + #updateURL(){ + (new HistoryService()).pushState({[this.#parameter()]: this.#pageId()}, this.#title(), this.#url()); + } + +} diff --git a/app/javascript/component_controllers/index.js b/app/javascript/component_controllers/index.js index b9968423b..cb96f8b3e 100644 --- a/app/javascript/component_controllers/index.js +++ b/app/javascript/component_controllers/index.js @@ -13,9 +13,13 @@ import Ontology_subscribe_button_component_controller import Search_input_component_controller from "../../components/search_input_component/search_input_component_controller"; +import Tabs_container_component_controller + from "../../components/tabs_container_component/tabs_container_component_controller"; + application.register("turbo-modal", TurboModalController) application.register("file-input", FileInputLoaderController) application.register("select-input", Select_input_component_controller) application.register("metadata-select", Metadata_selector_component_controller) application.register("subscribe-notes", Ontology_subscribe_button_component_controller) application.register("search-input", Search_input_component_controller) +application.register("tabs-container", Tabs_container_component_controller) From 2c08b69e0b53fb1194c463245850818495d72aca Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 22 Jul 2023 20:14:04 +0200 Subject: [PATCH 324/533] implement the new tabs container component in the ontology viewer --- app/assets/stylesheets/ontologies.scss | 3 ++ app/views/layouts/_ontology_viewer.html.haml | 29 ++++++++------------ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/ontologies.scss b/app/assets/stylesheets/ontologies.scss index 4de56daa7..101797fef 100644 --- a/app/assets/stylesheets/ontologies.scss +++ b/app/assets/stylesheets/ontologies.scss @@ -272,3 +272,6 @@ $ont-show-bg-color: #e9ecef; } +.ontologies-tabs-container .tabs-container { + justify-content: flex-start; +} diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index d2ad4caea..8a0d27104 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -41,28 +41,23 @@ = render partial: 'kgcl_dialogs' - %div.row.pt-md-3.pb-md-2 + %div.row.pt-md-3.pb-md-2.p-2 %div.col = render partial: 'layouts/ontology_viewer/header' - %div.row.pb-4{data: {controller: 'ontology-viewer-tabs', 'ontology-viewer-tabs-language-sections-value': ontology_data_sections }} + %div.row.pb-4.p-2.bg-white{data: {controller: '', 'ontology-viewer-tabs-language-sections-value': ontology_data_sections }} %div.col - sections = sections_to_show - %div.card - %div.card-header - %div{style: "display: flex; justify-content: space-between;"} - %ul.nav.nav-tabs.card-header-tabs{id: "navbar-ontology", role: "tablist"} - - sections.each do |section| - %li.nav-item - = link_to_section(section) - %div - = language_selector_tag(:language_selector) - %div.card-body - %div.tab-content - - sections.each do |section| - %div.tab-pane{id: "ont_#{section}_content", class: selected_section?(section) ? 'active show' : '', data: section_data(section)} - = language_selector_hidden_tag(section) if ontology_data_section?(section) - = lazy_load_section(section) { yield } + %div.ontologies-tabs-container + = render TabsContainerComponent.new(url_parameter: 'p') do |t| + - sections.each do |section_title| + - t.item(title: section_title, + path: ontology_path(@ontology.acronym, p: section_title), + selected: selected_section?(section_title), + page_name: ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section_title)) + - t.item_content do + %div.p-1 + = lazy_load_section(section_title) { yield } = render partial: "layouts/footer" From de2e5d0f50137a6b6848ffa33c219ea8b8db94d8 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 22 Jul 2023 21:49:31 +0200 Subject: [PATCH 325/533] extract modal helpers into a helper file --- app/helpers/application_helper.rb | 31 ++--------------------- app/helpers/modal_helper.rb | 42 +++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 29 deletions(-) create mode 100644 app/helpers/modal_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e659ee0dc..91e2ed705 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -7,6 +7,8 @@ module ApplicationHelper + include ModalHelper + RESOLVE_NAMESPACE = {:omv => "http://omv.ontoware.org/2005/05/ontology#", :skos => "http://www.w3.org/2004/02/skos/core#", :owl => "http://www.w3.org/2002/07/owl#", :rdf => "http://www.w3.org/1999/02/22-rdf-syntax-ns#", :rdfs => "http://www.w3.org/2000/01/rdf-schema#", :metadata => "http://data.bioontology.org/metadata/", :metadata_def => "http://data.bioontology.org/metadata/def/", :dc => "http://purl.org/dc/elements/1.1/", :xsd => "http://www.w3.org/2001/XMLSchema#", @@ -565,36 +567,7 @@ def ontology_viewer_page_name(ontology_name, concept_name_title , page) ontology_name + " | " +concept_name_title + " - #{page.capitalize}" end - def link_to_modal(name, options = nil, html_options = nil, &block) - - new_data = { - controller: 'show-modal', turbo: true, - turbo_frame: 'application_modal_content', - action: 'click->show-modal#show' - } - - html_options[:data].merge!(new_data) do |_, old, new| - "#{old} #{new}" - end - if name.nil? - link_to(options, html_options, &block) - else - link_to(name, options, html_options) - end - end - def submit_to_modal(name, html_options = nil, &block) - new_data = { - controller: 'show-modal', turbo: true, - turbo_frame: 'application_modal_content', - action: 'click->show-modal#show' - } - - html_options[:data].merge!(new_data) do |_, old, new| - "#{old} #{new}" - end - submit_tag(name || "save", html_options) - end def uri?(url) url =~ /\A#{URI::DEFAULT_PARSER.make_regexp(%w[http https])}\z/ diff --git a/app/helpers/modal_helper.rb b/app/helpers/modal_helper.rb new file mode 100644 index 000000000..068d9b7f7 --- /dev/null +++ b/app/helpers/modal_helper.rb @@ -0,0 +1,42 @@ +module ModalHelper + + def link_to_modal(name, options = nil, html_options = nil, &block) + html_options = modal_controller_data(html_options) + if name.nil? + link_to(options, html_options, &block) + else + link_to(name, options, html_options) + end + end + + def submit_to_modal(name, html_options = nil) + html_options = modal_controller_data(html_options) + + submit_tag(name || 'save', html_options) + end + + def modal_frame_container(id = 'application_modal') + render TurboModalComponent.new(id: id) + end + + def render_in_modal(id = 'application_modal', &block) + render TurboFrameComponent.new(id: "#{id}_content") do + block.call.html_safe if block_given? + end + end + + private + + def modal_controller_data(html_options) + new_data = { + controller: 'show-modal', turbo: true, + turbo_frame: 'application_modal_content', + action: 'click->show-modal#show' + } + + html_options[:data].merge!(new_data) do |_, old, new| + "#{old} #{new}" + end + html_options + end +end From f8e95ecf9f464045cd8c50e0c1ba29287812e907 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 22 Jul 2023 21:51:02 +0200 Subject: [PATCH 326/533] use the new modal helpers instead of writing the view component or frame --- app/views/fair_score/_details.html.haml | 2 +- app/views/label_xl/show.html.haml | 2 +- app/views/layouts/_ontology_viewer.html.haml | 2 +- app/views/layouts/appliance.html.haml | 3 ++- app/views/layouts/application.html.erb | 2 +- app/views/layouts/ontology.html.erb | 2 +- app/views/mappings/bulk_loader/_loader.html.haml | 2 +- app/views/mappings/edit.html.haml | 2 +- app/views/mappings/new.html.haml | 2 +- app/views/notes/_new_comment.html.haml | 2 +- app/views/notes/_new_proposal.html.haml | 2 +- app/views/notes/show.html.haml | 2 +- app/views/ontologies_metadata_curator/_form_edit.html.haml | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/views/fair_score/_details.html.haml b/app/views/fair_score/_details.html.haml index 7d3181b59..b75d6fef2 100644 --- a/app/views/fair_score/_details.html.haml +++ b/app/views/fair_score/_details.html.haml @@ -1,4 +1,4 @@ -= turbo_frame_tag 'application_modal_content' do += render_in_modal do :javascript var scrollY = window.getScrollTop() $(document).ready(function(){ diff --git a/app/views/label_xl/show.html.haml b/app/views/label_xl/show.html.haml index 7b94c4971..4f2c9e833 100644 --- a/app/views/label_xl/show.html.haml +++ b/app/views/label_xl/show.html.haml @@ -1,4 +1,4 @@ -= turbo_frame_tag 'application_modal_content' do += render_in_modal do - if @label_xl && !@label_xl.empty? = render ConceptDetailsComponent.new(id:'skos-xl-label', acronym: @ontology_acronym, properties: @label_xl.properties, diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index d2ad4caea..7b7094dd6 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -35,7 +35,7 @@ - = render TurboModalComponent.new(id: 'application_modal') + = modal_frame_container = render partial: 'concepts/perma_link_modal' diff --git a/app/views/layouts/appliance.html.haml b/app/views/layouts/appliance.html.haml index 9bf582dbb..5794e4865 100644 --- a/app/views/layouts/appliance.html.haml +++ b/app/views/layouts/appliance.html.haml @@ -30,7 +30,8 @@ %div.container-fluid.flex-grow-1 = render partial: "layouts/notices" - = render TurboModalComponent.new(id: 'application_modal') + = modal_frame_container + = yield = render partial: "layouts/footer" diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5ff643c32..8b025f31a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,7 +8,7 @@ <%= javascript_include_tag "application"%> -<%= render TurboModalComponent.new(id: 'application_modal') %> +<%= modal_frame_container %> <%= yield %> diff --git a/app/views/layouts/ontology.html.erb b/app/views/layouts/ontology.html.erb index 78c31664c..b3d793d23 100644 --- a/app/views/layouts/ontology.html.erb +++ b/app/views/layouts/ontology.html.erb @@ -1,6 +1,6 @@ <%=render partial: 'layouts/header'%>
    - <%= render TurboModalComponent.new(id: 'application_modal')%> + <%= modal_frame_container%> <%=yield%>
    <%=render partial: 'layouts/footer'%> diff --git a/app/views/mappings/bulk_loader/_loader.html.haml b/app/views/mappings/bulk_loader/_loader.html.haml index efc06170b..242a50b71 100644 --- a/app/views/mappings/bulk_loader/_loader.html.haml +++ b/app/views/mappings/bulk_loader/_loader.html.haml @@ -1,4 +1,4 @@ -= turbo_frame_tag 'application_modal_content' do += render_in_modal do %div.d-flex.flex-column{:style => "overflow: auto; max-height: 600px;"} = render TurboFrameComponent.new(id: 'file_loader_result') do %div.my-2 diff --git a/app/views/mappings/edit.html.haml b/app/views/mappings/edit.html.haml index 21bdd3f7c..4e37b31fc 100644 --- a/app/views/mappings/edit.html.haml +++ b/app/views/mappings/edit.html.haml @@ -1,2 +1,2 @@ -= turbo_frame_tag 'application_modal_content' do += render_in_modal do = render partial: 'form', locals: {form_url: mapping_path} diff --git a/app/views/mappings/new.html.haml b/app/views/mappings/new.html.haml index 05cf6fb89..48e195b10 100644 --- a/app/views/mappings/new.html.haml +++ b/app/views/mappings/new.html.haml @@ -1,2 +1,2 @@ -= turbo_frame_tag 'application_modal_content' do += render_in_modal do = render partial: 'form', locals: {form_url: mappings_path} diff --git a/app/views/notes/_new_comment.html.haml b/app/views/notes/_new_comment.html.haml index 885115ebe..95b8b0804 100644 --- a/app/views/notes/_new_comment.html.haml +++ b/app/views/notes/_new_comment.html.haml @@ -1,4 +1,4 @@ -= turbo_frame_tag "application_modal_content" do += render_in_modal do = render_alerts_container = form_with url: notes_path, method: 'post', data:{turbo: true, 'turbo-frame': '_top'} do = hidden_field_tag 'parent', parent_id diff --git a/app/views/notes/_new_proposal.html.haml b/app/views/notes/_new_proposal.html.haml index 9a3abbd8c..64e0976a0 100644 --- a/app/views/notes/_new_proposal.html.haml +++ b/app/views/notes/_new_proposal.html.haml @@ -1,4 +1,4 @@ -= render TurboFrameComponent.new(id: 'application_modal_content') do += render_in_modal do :javascript function updateProposalForm(event){ let frame = document.getElementById('application_modal_content') diff --git a/app/views/notes/show.html.haml b/app/views/notes/show.html.haml index 30214eaac..2bec34432 100644 --- a/app/views/notes/show.html.haml +++ b/app/views/notes/show.html.haml @@ -1,4 +1,4 @@ -= turbo_frame_tag 'application_modal_content' do += render_in_modal do - ontology_name = @ontology ? " on #{@ontology.name}" : "" - @title = "Note#{ontology_name} | #{@note.subject}" #note_container{:style => "padding: 1em;"} diff --git a/app/views/ontologies_metadata_curator/_form_edit.html.haml b/app/views/ontologies_metadata_curator/_form_edit.html.haml index 24ed94da2..533cbde3b 100644 --- a/app/views/ontologies_metadata_curator/_form_edit.html.haml +++ b/app/views/ontologies_metadata_curator/_form_edit.html.haml @@ -1,4 +1,4 @@ -= turbo_frame_tag 'application_modal_content' do += render_in_modal do :javascript function saveSelectedTab(value){ const input = document.getElementById("active_ontology") From 4afb0f9c08aa81d0cc24e15f4d8605acad20203c Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 22 Jul 2023 21:51:52 +0200 Subject: [PATCH 327/533] add option to modal to show in connect alone --- app/components/turbo_modal_component.rb | 3 ++- .../turbo_modal_component.html.haml | 4 ++-- .../turbo_modal_component_controller.js | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/components/turbo_modal_component.rb b/app/components/turbo_modal_component.rb index 24356efef..3cb4af778 100644 --- a/app/components/turbo_modal_component.rb +++ b/app/components/turbo_modal_component.rb @@ -3,11 +3,12 @@ class TurboModalComponent < ViewComponent::Base include Turbo::FramesHelper - def initialize(id: '', title:'', size: 'modal-lg') + def initialize(id: '', title: '', size: 'modal-lg', show: false) super @id = id @title = title @size = size + @show = show end end diff --git a/app/components/turbo_modal_component/turbo_modal_component.html.haml b/app/components/turbo_modal_component/turbo_modal_component.html.haml index 0d4490921..e5ad17503 100644 --- a/app/components/turbo_modal_component/turbo_modal_component.html.haml +++ b/app/components/turbo_modal_component/turbo_modal_component.html.haml @@ -1,11 +1,11 @@ -%div.modal{id: @id, 'data-controller':"turbo-modal"} +%div.modal{id: @id, 'data-controller':"turbo-modal", 'data-turbo-modal-show-value': @show.to_s} %div.modal-dialog{class: @size} %div.modal-content %div.modal-header %h5.modal-title = @title %button.close{type:'button', data: { action: "turbo-modal#hide" }} - %span × + %span.shape.btn.btn-primary.p-1 × %div.modal-body = render TurboFrameComponent.new(id: 'application_modal_content', data: { 'turbo-modal-target': 'content'}) do = content diff --git a/app/components/turbo_modal_component/turbo_modal_component_controller.js b/app/components/turbo_modal_component/turbo_modal_component_controller.js index acc493a83..2942770ed 100644 --- a/app/components/turbo_modal_component/turbo_modal_component_controller.js +++ b/app/components/turbo_modal_component/turbo_modal_component_controller.js @@ -4,6 +4,16 @@ import ShowModalController from "../../javascript/controllers/show_modal_control export default class extends ShowModalController { static targets = ["content"] + static values = { + show: Boolean + } + + connect() { + super.connect(); + if (this.showValue) { + this.show() + } + } show() { this.modal.showModal(this.element) From ccb378169a4014b936b402eb1ffdd8aa48284f6b Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 22 Jul 2023 21:52:12 +0200 Subject: [PATCH 328/533] add modal component style --- app/assets/stylesheets/components/index.scss | 2 +- app/assets/stylesheets/components/modal.scss | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/components/modal.scss diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 8c01c27e2..8ced6b5cc 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -6,7 +6,7 @@ @import 'summary_section'; @import 'dropdown'; @import 'field_container'; -@import 'nested_form'; +@import 'modal'; @import 'input_field'; @import 'file_input_loader'; @import 'text_area_field'; diff --git a/app/assets/stylesheets/components/modal.scss b/app/assets/stylesheets/components/modal.scss new file mode 100644 index 000000000..2997e12e7 --- /dev/null +++ b/app/assets/stylesheets/components/modal.scss @@ -0,0 +1,20 @@ +.modal-content{ + border-radius: 20px !important; +} + +.modal-title { + text-align: center; + flex: 1px; +} + +.close { + margin-left: 0px; + &:focus{ + outline: none; + } +} + +.shape { + border-radius: 50% !important; + width: 35px; +} \ No newline at end of file From 9cd1b41946e12486bde2746969f14915c3ffd464 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 22 Jul 2023 21:52:26 +0200 Subject: [PATCH 329/533] add modal component preview --- .../previews/turbo_modal_component_preview.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 test/components/previews/turbo_modal_component_preview.rb diff --git a/test/components/previews/turbo_modal_component_preview.rb b/test/components/previews/turbo_modal_component_preview.rb new file mode 100644 index 000000000..933aaf020 --- /dev/null +++ b/test/components/previews/turbo_modal_component_preview.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class TurboModalComponentPreview < ViewComponent::Preview + layout 'component_preview_not_centred' + + include ActionView::Helpers::TagHelper + include ActionView::Context + + # @param title text + # @param message text + def default(message: 'hello you !', title: 'title') + render TurboModalComponent.new(title: title, show: true) do + content_tag(:div, message, class: 'p-5') + end + end +end From 7adae03aa6fba81ad26f98e60da789174bb5c7bc Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 22 Jul 2023 21:58:45 +0200 Subject: [PATCH 330/533] move the modal component preview into the layout namespace --- .../previews/{ => layout}/turbo_modal_component_preview.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename test/components/previews/{ => layout}/turbo_modal_component_preview.rb (85%) diff --git a/test/components/previews/turbo_modal_component_preview.rb b/test/components/previews/layout/turbo_modal_component_preview.rb similarity index 85% rename from test/components/previews/turbo_modal_component_preview.rb rename to test/components/previews/layout/turbo_modal_component_preview.rb index 933aaf020..bf976326d 100644 --- a/test/components/previews/turbo_modal_component_preview.rb +++ b/test/components/previews/layout/turbo_modal_component_preview.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class TurboModalComponentPreview < ViewComponent::Preview +class Layout::TurboModalComponentPreview < ViewComponent::Preview layout 'component_preview_not_centred' include ActionView::Helpers::TagHelper From 6979fb7633ba53d90828a1582dbbb0dc1cb8465a Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 22 Jul 2023 23:41:00 +0200 Subject: [PATCH 331/533] Update the design of the switch component --- app/assets/stylesheets/components/index.scss | 2 +- app/assets/stylesheets/components/switch.scss | 64 +++++++++++++++++++ app/components/switch_input_component.rb | 2 +- .../switch_input_component.html.haml | 11 ++-- 4 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 app/assets/stylesheets/components/switch.scss diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 8c01c27e2..37d41e07e 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -10,4 +10,4 @@ @import 'input_field'; @import 'file_input_loader'; @import 'text_area_field'; - +@import "switch"; \ No newline at end of file diff --git a/app/assets/stylesheets/components/switch.scss b/app/assets/stylesheets/components/switch.scss new file mode 100644 index 000000000..5a70e0fe9 --- /dev/null +++ b/app/assets/stylesheets/components/switch.scss @@ -0,0 +1,64 @@ + +.switch-filter{ + display:flex; + align-items: center; + justify-content: space-between; + margin-bottom: 20px; +} +.switch-filter p{ + font-size: 16px; + color: #666666; + margin-bottom: 0; + margin-right: 10px; +} + + + +/* Toggle switch css */ +.switch { + position: relative; + display: inline-block; + width: 40px; + height: 20px; + margin-bottom: 0; +} +.switch input { + opacity: 0; + width: 0; + height: 0; +} +.slider { + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: #ccc; + -webkit-transition: .4s; + transition: .4s; + border-radius: 34px; +} +.slider:before { + position: absolute; + content: ""; + height: 13px; + width: 13px; + left: 4px; + bottom: 4px; + background-color: white; + -webkit-transition: .4s; + transition: .4s; + border-radius: 50%; +} +input:checked + .slider { + background-color: var(--primary-color); +} +input:focus + .slider { + box-shadow: 0 0 1px var(--primary-color); +} +input:checked + .slider:before { + -webkit-transform: translateX(19px); + -ms-transform: translateX(19px); + transform: translateX(19px); +} \ No newline at end of file diff --git a/app/components/switch_input_component.rb b/app/components/switch_input_component.rb index e8ba66431..3b7f67781 100644 --- a/app/components/switch_input_component.rb +++ b/app/components/switch_input_component.rb @@ -3,7 +3,7 @@ class SwitchInputComponent < ViewComponent::Base - def initialize(id:, name: , label: nil, value: '', checked: false, boolean_switch: false) + def initialize(id:, name: , label: '', value: '', checked: false, boolean_switch: false) super @id = id @name = name diff --git a/app/components/switch_input_component/switch_input_component.html.haml b/app/components/switch_input_component/switch_input_component.html.haml index 1f74a7c24..4fe4ccbac 100644 --- a/app/components/switch_input_component/switch_input_component.html.haml +++ b/app/components/switch_input_component/switch_input_component.html.haml @@ -1,6 +1,9 @@ -%div.custom-control.custom-switch +%div.switch-filter - if @boolean_switch = hidden_field_tag @name, @value - = check_box_tag check_box_name, @value, @checked, class: 'custom-control-input', id: check_box_id, onChange: "#{boolean_switch_action}" - %label.custom-control-label{for: check_box_id} - = content || @label \ No newline at end of file + - if content || !@label.empty? + %p + = content || @label + %label.switch{for: check_box_id} + = check_box_tag check_box_name, @value, @checked, class: '', id: check_box_id, onChange: "#{boolean_switch_action}" + %span.slider \ No newline at end of file From 2d073753108a5ea94827b849841f5371d39f68a0 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 22 Jul 2023 23:57:16 +0200 Subject: [PATCH 332/533] add switch input component preview --- .../previews/input/switch_input_component_preview.rb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 test/components/previews/input/switch_input_component_preview.rb diff --git a/test/components/previews/input/switch_input_component_preview.rb b/test/components/previews/input/switch_input_component_preview.rb new file mode 100644 index 000000000..fd40bd6ae --- /dev/null +++ b/test/components/previews/input/switch_input_component_preview.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class Input::SwitchInputComponentPreview < ViewComponent::Preview + + # @param label text + def default(label: 'Label') + render SwitchInputComponent.new(id: 'id', name: 'selected_metadata[]', value: '', label: label) + end +end From f676245a808c640b82fc14a505b2dfa034d605a5 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 7 May 2023 23:13:10 +0200 Subject: [PATCH 333/533] migrate the fair score js code to stimulus to make it work with turbo --- .../controllers/fair_score_home_controller.js | 21 + .../fair_score_landscape_controller.js | 20 + .../fair_score_summary_controller.js | 12 + app/javascript/controllers/index.js | 12 +- app/javascript/mixins/useFairScore.js | 631 ++++++++++++++++++ app/views/home/_fair_score_home.html.haml | 2 +- app/views/home/index.html.haml | 2 +- .../landscape/_fair_score_landscape.html.haml | 2 +- app/views/ontologies/_fairs_score.html.haml | 2 +- 9 files changed, 697 insertions(+), 7 deletions(-) create mode 100644 app/javascript/controllers/fair_score_home_controller.js create mode 100644 app/javascript/controllers/fair_score_landscape_controller.js create mode 100644 app/javascript/controllers/fair_score_summary_controller.js create mode 100644 app/javascript/mixins/useFairScore.js diff --git a/app/javascript/controllers/fair_score_home_controller.js b/app/javascript/controllers/fair_score_home_controller.js new file mode 100644 index 000000000..8b4883ad9 --- /dev/null +++ b/app/javascript/controllers/fair_score_home_controller.js @@ -0,0 +1,21 @@ +import { Controller } from "@hotwired/stimulus" +import {FairScorePrincipleBar, FairScoreCriteriaRadar, FairScoreChartContainer} from "../mixins/useFairScore"; +// Connects to data-controller="fair-score-home" +export default class extends Controller { + connect() { + let fairScoreBar = new FairScorePrincipleBar( 'ont-fair-scores-canvas') + let fairScoreRadar = new FairScoreCriteriaRadar( 'ont-fair-criteria-scores-canvas') + let fairContainer = new FairScoreChartContainer('fair-score-charts-container' , [ fairScoreRadar , fairScoreBar]) + let ontologies = jQuery("#ontology_ontologyId"); + + fairContainer.getFairScoreData("all") + ontologies.change( (e) => { + if(ontologies.val() !== null){ + fairContainer.getFairScoreData(ontologies.val().join(',')) + } else if(ontologies.val() === null){ + fairContainer.getFairScoreData("all") + } + e.preventDefault() + }) + } +} diff --git a/app/javascript/controllers/fair_score_landscape_controller.js b/app/javascript/controllers/fair_score_landscape_controller.js new file mode 100644 index 000000000..e093f68ea --- /dev/null +++ b/app/javascript/controllers/fair_score_landscape_controller.js @@ -0,0 +1,20 @@ +import { Controller } from "@hotwired/stimulus" +import { FairScoreChartContainer, FairScoreCriteriaBar } from "../mixins/useFairScore"; +// Connects to data-controller="fair-score-landscape" +export default class extends Controller { + connect() { + let fairCriteriaBars = new FairScoreCriteriaBar('ont-fair-scores-criteria-bars-canvas') + let fairContainer = new FairScoreChartContainer('fair-score-charts-container' , [fairCriteriaBars]) + let ontologies = jQuery("#ontology_ontologyId"); + + fairContainer.getFairScoreData("all") + ontologies.change( (e) => { + if(ontologies.val() !== null){ + fairContainer.getFairScoreData(ontologies.val().join(',')) + } else if(ontologies.val() === null){ + fairContainer.getFairScoreData("all") + } + e.preventDefault() + }) + } +} diff --git a/app/javascript/controllers/fair_score_summary_controller.js b/app/javascript/controllers/fair_score_summary_controller.js new file mode 100644 index 000000000..883e2cde6 --- /dev/null +++ b/app/javascript/controllers/fair_score_summary_controller.js @@ -0,0 +1,12 @@ +import { Controller } from "@hotwired/stimulus" +import {FairScorePrincipleBar, FairScoreCriteriaRadar, FairScoreChartContainer} from "../mixins/useFairScore"; +// Connects to data-controller="fair-score-summary" +export default class extends Controller { + connect() { + let fairScoreBar = new FairScorePrincipleBar( 'ont-fair-scores-canvas') + let fairScoreRadar = new FairScoreCriteriaRadar( 'ont-fair-criteria-scores-canvas') + let fairContainer = new FairScoreChartContainer('fair-score-charts-container' , [ fairScoreRadar , fairScoreBar]) + + fairContainer.getFairScoreData(window.location.pathname.split('/')[2]) + } +} diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index e2e8ee6f1..86120c7b6 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -13,6 +13,15 @@ application.register("class-search-auto-complete", ClassSearchAutoCompleteContro import ContainerSplitterController from "./container_splitter_controller" application.register("container-splitter", ContainerSplitterController) +import FairScoreHomeController from "./fair_score_home_controller" +application.register("fair-score-home", FairScoreHomeController) + +import FairScoreLandscapeController from "./fair_score_landscape_controller" +application.register("fair-score-landscape", FairScoreLandscapeController) + +import FairScoreSummaryController from "./fair_score_summary_controller" +application.register("fair-score-summary", FairScoreSummaryController) + import FormAutoCompleteController from "./form_auto_complete_controller" application.register("form-auto-complete", FormAutoCompleteController) @@ -58,9 +67,6 @@ application.register("skos-collection-colors", SkosCollectionColorsController) import TextTruncateController from "./text_truncate_controller" application.register("text-truncate", TextTruncateController) -import Ontology_viewer_tabs_controller from "./ontology_viewer_tabs_controller" -application.register("ontology-viewer-tabs", Ontology_viewer_tabs_controller) - import TooltipController from "./tooltip_controller" application.register("tooltip", TooltipController) diff --git a/app/javascript/mixins/useFairScore.js b/app/javascript/mixins/useFairScore.js new file mode 100644 index 000000000..82aa51664 --- /dev/null +++ b/app/javascript/mixins/useFairScore.js @@ -0,0 +1,631 @@ +function round(val , base = 1){ + return Math.floor( val * 100 * base) / 100 +} + +function getObtainedNotObtainedNA(scoresIn, portalMax , max , normalize = true){ + const delimiter = (val) => (normalize ? val : 1) + const notObtained = portalMax.map((x,i) => { + return round((x - scoresIn[i]) / delimiter(max[i]) ,(normalize ? 100 : 1)) + }) + const na = max.map((x,i) => { + return round((x - portalMax[i]) / delimiter(max[i]), (normalize ? 100 : 1)) + }) + + const scores = scoresIn.map((x, i ) => { + return round(x / delimiter(max[i]), (normalize ? 100 : 1)) + }) + return {scores , notObtained , na} +} + +function printScore(score, normalizedScore){ + return score +" "+'('+normalizedScore+"%)" +} + + +class FairScoreChartContainer{ + constructor(fairChartsContainerId , charts) { + this.fairChartsContainer = jQuery("#"+fairChartsContainerId) + this.fairAverageScoreSpan = jQuery("#fair-score-average") + this.fairMinScoreSpan = jQuery("#fair-score-min") + + this.fairMaxScoreSpan = jQuery("#fair-score-max") + + + this.fairMedianScoreSpan = jQuery("#fair-score-median") + + + this.requestLink = jQuery("#fairness-service-url") + this.requestHrefBase = (this.requestLink != null ?this.requestLink.attr("href") : "") + + this.fairSpinner = jQuery("
    ") + this.fairMsgErr = jQuery("
    We could not collect the data from the fairness service
    ") + this.fairMsgErr.hide() + this.fairChartsContainer.before(this.fairSpinner) + this.fairChartsContainer.before(this.fairMsgErr) + this.charts = charts + } + + + ajaxCall(ontologies){ + return new Promise( (resolve ,reject) => { + $.get( "/ajax/fair_score/json/?ontologies="+ontologies, (data) => { + if(data) { + resolve(data) + }else { + reject("error") + } + }).fail(function(err) { + reject("error") + }) + }) + } + getFairScoreData(ontologies) { + if(this.fairChartsContainer){ + this.hideMsgError() + this.showLoader(); + this.#updateLink(ontologies) + this.ajaxCall(ontologies).then(data => { + this.hideLoader() + this.charts.forEach( x => x.setFairScoreData(data)) + this.#fillScoreSpans(data) + }).catch(err => { + this.hideLoader() + this.showMsgError() + }) + } + + + } + + showMsgError(){ + this.fairChartsContainer.hide() + this.fairMsgErr.show() + } + + hideMsgError(){ + this.fairMsgErr.hide() + this.fairChartsContainer.show() + } + showLoader(){ + this.fairChartsContainer.hide() + this.fairSpinner.show() + } + hideLoader(){ + this.fairSpinner.hide() + this.fairChartsContainer.show() + } + + #updateLink(ontologies){ + if(this.requestLink){ + this.requestLink.attr("href" , this.requestHrefBase + "&ontologies=" + ontologies + + (ontologies==="all" || ontologies.includes(",") ? "&combined": "")) + + } + } + #fillScoreSpans(data){ + + if(this.fairAverageScoreSpan){ + this.fairAverageScoreSpan.html(printScore(data.score,data.normalizedScore)) + } + + if(data.resourceCount > 1){ + this.#showScoreLabel(this.fairMinScoreSpan, data.minScore, data.maxCredits) + this.#showScoreLabel(this.fairMaxScoreSpan, data.maxScore, data.maxCredits) + this.#showScoreLabel(this.fairMedianScoreSpan, data.medianScore, data.maxCredits) + + }else { + this.#hideScoreLabel((this.fairMinScoreSpan)) + this.#hideScoreLabel((this.fairMaxScoreSpan)) + this.#hideScoreLabel((this.fairMedianScoreSpan)) + } + + + } + + #showScoreLabel(elem, score , maxCredits){ + if(elem){ + elem.parent().parent().show() + elem.html(printScore(score,round(score/maxCredits , 100))) + } + + } + + #hideScoreLabel(elem){ + if(elem) + elem.parent().parent().hide() + } +} + +class FairScoreChart{ + constructor(fairCanvasId , dataField) { + this.dataField = dataField + this.fairScoreChartCanvas = jQuery("#"+fairCanvasId) + this.chart= null + } + + setFairScoreData(data){ + if(this.fairScoreChartCanvas){ + Object.entries(data[this.dataField]).forEach( ([key, value]) => this.fairScoreChartCanvas.data(key , value)) + this.fairScoreChartCanvas.data("resourceCount" , data["resourceCount"]) + if(this.chart === null) + this.chart = this.initChart() + else { + this.chart.data.datasets = this.getFairScoreDataSet() + this.chart.update() + } + } + + } + + getFairScoreDataSet(){ + return [] + } + + initChart(){ + return new Chart(this.fairScoreChartCanvas , {}) + } + +} + +class FairScorePrincipleBar extends FairScoreChart{ + + constructor(fairCanvasId) { + super(fairCanvasId , 'principles'); + } + initChart() { + const labels = this.fairScoreChartCanvas.data('labels') + const data = { + labels: labels, + datasets: this.getFairScoreDataSet() + }; + const config = { + type: 'horizontalBar', + data: data, + options: { + title: { + display: false, + text: 'FAIRness Scores' + }, + elements: { + bar: { + borderWidth: 2, + } + }, + indexAxis: 'y', + legend: { + display: true + }, + scales: { + xAxes: [{ + stacked: true, + ticks: { + beginAtZero: true + } + }], + yAxes: [{ + stacked: true, + ticks: { + beginAtZero: true + } + }] + }, + tooltips: { + callbacks: { + label: function (tooltipItem, data) { + let score =jQuery(this._chart.canvas).data("scores")[tooltipItem.index] + let maxScore =jQuery(this._chart.canvas).data("maxCredits")[tooltipItem.index] + let portalMaxScore =jQuery(this._chart.canvas).data("portalMaxCredits")[tooltipItem.index] + + let normalizedScore = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index] + let na = maxScore - portalMaxScore + let notObtained = portalMaxScore - score + return printScore([score, notObtained, na][tooltipItem.datasetIndex], normalizedScore) + }, + + } + } + } + } + + return new Chart(this.fairScoreChartCanvas, config); + } + getFairScoreDataSet(){ + const maxCredits = this.fairScoreChartCanvas.data('maxCredits') + const portalMaxCredits = this.fairScoreChartCanvas.data('portalMaxCredits') + const {scores, notObtained , na } = getObtainedNotObtainedNA( this.fairScoreChartCanvas.data('scores') , portalMaxCredits , maxCredits ) + return [ + { + label: 'Obtained score', + data: scores, + fill: true, + backgroundColor: 'rgba(102, 187, 106, 0.2)', + borderColor: 'rgba(102, 187, 106, 1)', + pointBorderColor: 'rgba(102, 187, 106, 1)', + pointBackgroundColor: 'rgba(102, 187, 106, 1)' + }, + { + label: 'Not obtained score', + data: notObtained, + fill: true, + backgroundColor: 'rgba(251, 192, 45, 0.2)', + borderColor: 'rgba(251, 192, 45, 1)', + pointBorderColor: 'rgba(251, 192, 45, 1)', + pointBackgroundColor: 'rgba(251, 192, 45, 1)' + }, + { + label: 'N/A score', + data: na, + fill: true, + backgroundColor: 'rgba(176, 190, 197, 0.2)', + borderColor: 'rgba(176, 190, 197, 1)', + pointBorderColor: 'rgba(176, 190, 197, 1)', + pointBackgroundColor: 'rgba(176, 190, 197, 1)' + } + ] + } +} + +class FairScoreCriteriaRadar extends FairScoreChart{ + + constructor(fairCanvasId) { + super( fairCanvasId , 'criteria'); + } + + customTooltips(){ + return function (tooltipModel) { + // Tooltip Element + let tooltipEl = document.getElementById('chartjs-tooltip'); + let canvas = jQuery(this._chart.canvas) + let descriptions = canvas.data("descriptions") + // Create element on first render + if (!tooltipEl) { + tooltipEl = document.createElement('div'); + tooltipEl.id = 'chartjs-tooltip'; + tooltipEl.innerHTML = '
    '; + document.body.appendChild(tooltipEl); + } + + // Hide if no tooltip + if (tooltipModel.opacity === 0) { + tooltipEl.style.opacity = 0; + return; + } + + // Set caret Position + tooltipEl.classList.remove('above', 'below', 'no-transform'); + if (tooltipModel.yAlign) { + tooltipEl.classList.add(tooltipModel.yAlign); + } else { + tooltipEl.classList.add('no-transform'); + } + + function getBody(bodyItem) { + return bodyItem.lines; + } + // Set Text + if (tooltipModel.body) { + let titleLines = tooltipModel.title || []; + let bodyLines = tooltipModel.body.map(getBody); + + let innerHtml = ''; + + titleLines.forEach(function(title ,index) { + innerHtml += '' + title + ' : '+ descriptions[tooltipModel.dataPoints[0].index] + ''; + }); + innerHtml += ''; + + bodyLines.forEach(function(body, i) { + let colors = tooltipModel.labelColors[i]; + let style = 'background:' + colors.backgroundColor; + style += '; border-color:' + colors.borderColor; + style += '; border-width: 2px;'; + style += '; font-size: 12px;'; + innerHtml += '' + body + ''; + }); + innerHtml += ''; + + let tableRoot = tooltipEl.querySelector('table'); + tableRoot.innerHTML = innerHtml; + } + + // `this` will be the overall tooltip + let position = this._chart.canvas.getBoundingClientRect(); + + // Display, position, and set styles for font + tooltipEl.style.background = 'rgba(0, 0, 0, 0.7)'; + tooltipEl.style.borderRadius = '3px'; + tooltipEl.style.color = 'white'; + tooltipEl.style.opacity = 1; + tooltipEl.style.position = 'absolute'; + tooltipEl.style.left = position.left + window.pageXOffset + tooltipModel.caretX + 'px'; + tooltipEl.style.top = position.top + window.pageYOffset + tooltipModel.caretY + 'px'; + tooltipEl.style.fontFamily = tooltipModel._bodyFontFamily; + tooltipEl.style.fontSize = tooltipModel.bodyFontSize + 'px'; + tooltipEl.style.fontStyle = tooltipModel._bodyFontStyle; + tooltipEl.style.padding = tooltipModel.yPadding + 'px ' + tooltipModel.xPadding + 'px'; + tooltipEl.style.pointerEvents = 'none'; + } + } + + initChart() { + const labels = this.fairScoreChartCanvas.data('labels') + + const data = { + labels: labels, + datasets: this.getFairScoreDataSet() + }; + const config = { + type: 'radar', + data: data, + options: { + title: { + display: false, + text: 'FAIRness Wheel' + }, + legend: { + display: false + }, + elements: { + line: { + borderWidth: 3 + } + }, + tooltips: { + enabled: false, + custom: this.customTooltips(), + callbacks: { + label: function (tooltipItem, data) { + let scores =jQuery(this._chart.canvas).data("scores") + let normalizedScore = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index] + let score = scores[tooltipItem.index] + return printScore(score, normalizedScore) + }, + + } + } + } + } + + return new Chart(this.fairScoreChartCanvas, config); + } + + getFairScoreDataSet() { + const scores = this.fairScoreChartCanvas.data('normalizedScores') + return [ + { + label: 'Fair score', + data: scores, + fill: true, + backgroundColor: 'rgba(151, 187, 205, 0.2)', + borderColor: 'rgba(151, 187, 205, 1)', + pointBorderColor: 'rgba(151, 187, 205, 1)', + pointBackgroundColor: 'rgba(151, 187, 205, 1)' + } + ] + } + + + +} +class FairScoreCriteriaBar extends FairScoreChart{ + constructor(fairCanvasId) { + super(fairCanvasId , 'criteria'); + this.questions = [] + } + customTooltips(){ + return function (tooltipModel) { + let tooltipContainer = document.getElementById('chartjs-tooltip-container') + // Tooltip Element + let tooltipEl = document.getElementById('chartjs-tooltip') + let canvas = jQuery(this._chart.canvas) + let questions = canvas.data("questions") + let descriptions = canvas.data("descriptions") + let resourceCount = canvas.data("resourceCount") + + // Create element on first render + if (!tooltipEl) { + tooltipEl = document.createElement('div'); + tooltipEl.id = 'chartjs-tooltip'; + tooltipEl.innerHTML = '
    '; + tooltipContainer.appendChild(tooltipEl); + } + + // Hide if no tooltip + if (tooltipModel.opacity === 0) { + tooltipEl.style.opacity = 1; + return; + } + + // Set caret Position + tooltipEl.classList.remove('above', 'below', 'no-transform'); + if (tooltipModel.yAlign) { + tooltipEl.classList.add(tooltipModel.yAlign); + } else { + tooltipEl.classList.add('no-transform'); + } + + function getBody(bodyItem) { + return bodyItem.lines; + } + + // Set Text + if (tooltipModel.body) { + let titleLines = tooltipModel.title || []; + let bodyLines = tooltipModel.body.map(getBody); + + let innerHtml = '
    '; + + titleLines.forEach(function(title ,index) { + innerHtml += '
    ' + title + ' : '+ descriptions[tooltipModel.dataPoints[0].index] + '
    '; + }); + + innerHtml += "
    " + bodyLines.forEach(function(body, i) { + let colors = tooltipModel.labelColors[i]; + let style = 'background:' + colors.backgroundColor; + style += '; border-color:' + colors.borderColor; + style += '; border-width: 2px'; + style += '; width: 100%'; + innerHtml += '' + body + ''; + }); + + innerHtml+='
      ' + + + for (const [key, value] of Object.entries(questions[tooltipModel.dataPoints[0].index])) { + let count = (value.state ? (value.state.success + value.state.average) : (value.score === value.maxCredits ? 1: 0) ) + innerHtml+=`
    • + ${printScore(count,round((count / resourceCount) * 100))} + responded successfully to: ${key}: + "${value.question}"
    • ` + } + innerHtml += '
    '; + + let tableRoot = tooltipEl.querySelector('div'); + tableRoot.innerHTML = innerHtml; + } + + // `this` will be the overall tooltip + let position = this._chart.canvas.getBoundingClientRect() + let topOffset = tooltipModel.caretY - (tooltipEl.clientHeight / 2) + + + if (topOffset <= 0) + topOffset = 0 + else if( (topOffset + tooltipEl.clientHeight) >= position.height) + topOffset = position.height - tooltipEl.clientHeight + + // Display, position, and set styles for font + tooltipEl.style.opacity = 1; + tooltipEl.style.position = 'absolute'; + tooltipEl.style.top = topOffset +'px'; + //tooltipEl.style.fontFamily = tooltipModel._bodyFontFamily; + tooltipEl.style.fontSize = tooltipModel.bodyFontSize + 'px'; + tooltipEl.style.fontStyle = tooltipModel._bodyFontStyle; + tooltipEl.style.padding = tooltipModel.yPadding + 'px ' + tooltipModel.xPadding + 'px'; + tooltipEl.style.pointerEvents = 'none'; + } + } + initChart() { + const labels = this.fairScoreChartCanvas.data('labels') + const data = { + labels: labels, + datasets: this.getFairScoreDataSet() + }; + const config = { + type: 'horizontalBar', + data: data, + options: { + title: { + display: false, + text: 'FAIRness Scores' + }, + elements: { + bar: { + borderWidth: 2, + } + }, + indexAxis: 'y', + legend: { + display: true + }, + scales: { + xAxes: [{ + stacked: true, + ticks: { + beginAtZero: true, + + } + }], + yAxes: [{ + stacked: true, + ticks: { + beginAtZero: true, + + } + }] + }, + tooltips: { + enabled: false, + mode: 'index', + position: 'nearest', + intersect: false, + custom: this.customTooltips(), + callbacks: { + label: function (tooltipItem, data) { + const canvas = jQuery(this._chart.canvas) + const max = canvas.data('maxCredits') + const scores = canvas.data('scores') + const portalMax = canvas.data("portalMaxCredits") + + const label = data.datasets[tooltipItem.datasetIndex].label + const score = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index] + const normalizedScore =Object.values(getObtainedNotObtainedNA(scores ,portalMax , max , false))[tooltipItem.datasetIndex][tooltipItem.index] + + return label +': '+ printScore(score, normalizedScore) + + } + } + } + + } + } + + return new Chart(this.fairScoreChartCanvas, config); + } + getFairScoreDataSet(){ + const maxCredits = this.fairScoreChartCanvas.data('maxCredits') + const portalMaxCredits = this.fairScoreChartCanvas.data('portalMaxCredits') + const {scores , notObtained , na } = getObtainedNotObtainedNA(this.fairScoreChartCanvas.data('scores'), portalMaxCredits ,maxCredits , true) + return [ + { + label: 'Obtained score', + data: scores , + fill: true, + backgroundColor: 'rgba(102, 187, 106, 0.2)', + borderColor: 'rgba(102, 187, 106, 1)', + pointBorderColor: 'rgba(102, 187, 106, 1)', + pointBackgroundColor: 'rgba(102, 187, 106, 1)' + }, + { + label: 'Not obtained score', + data: notObtained, + fill: true, + backgroundColor: 'rgba(251, 192, 45, 0.2)', + borderColor: 'rgba(251, 192, 45, 1)', + pointBorderColor: 'rgba(251, 192, 45, 1)', + pointBackgroundColor: 'rgba(251, 192, 45, 1)', + }, + { + label: 'N/A score', + data: na, + fill: true, + backgroundColor: 'rgba(176, 190, 197, 0.2)', + borderColor: 'rgba(176, 190, 197, 1)', + pointBorderColor: 'rgba(176, 190, 197, 1)', + pointBackgroundColor: 'rgba(176, 190, 197, 1)' + } + ] + } + setFairScoreData(data) { + super.setFairScoreData(data); + if(this.chart){ + this.showFirstToolTip() + } + } + + showFirstToolTip(){ + let meta = this.chart.getDatasetMeta(0), + rect = this.chart.canvas.getBoundingClientRect(), + point = meta.data[0].getCenterPoint(), + evt = new MouseEvent('mousemove', { + clientX: rect.left + point.x, + clientY: rect.top + point.y + }), + node = this.chart.canvas; + node.dispatchEvent(evt); + } +} + +export {round, getObtainedNotObtainedNA, FairScoreChartContainer, FairScoreChart, FairScorePrincipleBar, FairScoreCriteriaRadar, FairScoreCriteriaBar} + diff --git a/app/views/home/_fair_score_home.html.haml b/app/views/home/_fair_score_home.html.haml index 519e62cf3..3cd697f76 100644 --- a/app/views/home/_fair_score_home.html.haml +++ b/app/views/home/_fair_score_home.html.haml @@ -1,4 +1,4 @@ -%div.col +%div.col{data:{controller:"fair-score-home"}} %div.card.mb-3 %div.card-header.d-flex.justify-content-between %span diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index a6c330fca..7ed1dbaec 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -89,7 +89,7 @@ %hr.home-section-line/ .home-card.home-fair-scores - if fairness_service_enabled? - %div#fair-home + %div#fair-home{data:{controller:"fair-score-home"}} = render partial: "shared/fair_score_bars", locals: {data: nil} %a{:href => "#fairDetails"} %div.home-fair-details diff --git a/app/views/landscape/_fair_score_landscape.html.haml b/app/views/landscape/_fair_score_landscape.html.haml index 7abc353f8..adac53509 100644 --- a/app/views/landscape/_fair_score_landscape.html.haml +++ b/app/views/landscape/_fair_score_landscape.html.haml @@ -31,7 +31,7 @@ This interface shows how an ontology or a group responded successfully to O’FAIRe FAIRness assessment questions %div See details for each ontologies on the specific ontology summary pages - %div.card-body + %div.card-body{data:{controller:"fair-score-landscape"}} %div#fair-score-charts-container.row %div.col %span.text-secondary.mt-4 diff --git a/app/views/ontologies/_fairs_score.html.haml b/app/views/ontologies/_fairs_score.html.haml index e3c29dd32..26a98885c 100644 --- a/app/views/ontologies/_fairs_score.html.haml +++ b/app/views/ontologies/_fairs_score.html.haml @@ -12,7 +12,7 @@ class: "btn btn-primary w-100", data: { show_modal_title_value: "FAIRness assessment questions", show_modal_size_value: 'modal-xl' }, ) - %div.statistics_container + %div.statistics_container{data:{controller:"fair-score-summary"}} %div = render partial: "shared/fair_score_radar" , locals: {data: @fair_scores_data} %div From 53ac9bf50bd33ceaba35f5934a2d4beffd3e7e8f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 00:12:41 +0200 Subject: [PATCH 334/533] remove the old fair_score.js code --- app/assets/javascripts/application.js | 1 - app/assets/javascripts/fair_score.js | 689 -------------------------- 2 files changed, 690 deletions(-) delete mode 100644 app/assets/javascripts/fair_score.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f73139ead..0d0fe33cb 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -26,7 +26,6 @@ //= require bp_property_tree //= require concepts //= require home -//= require fair_score //= require_tree ./helpers //= require_tree ./components //= require ontologies diff --git a/app/assets/javascripts/fair_score.js b/app/assets/javascripts/fair_score.js deleted file mode 100644 index c9186984d..000000000 --- a/app/assets/javascripts/fair_score.js +++ /dev/null @@ -1,689 +0,0 @@ - -function round(val , base = 1){ - return Math.floor( val * 100 * base) / 100 -} -function getObtainedNotObtainedNA(scoresIn, portalMax , max , normalize = true){ - const delimiter = (val) => (normalize ? val : 1) - const notObtained = portalMax.map((x,i) => { - return round((x - scoresIn[i]) / delimiter(max[i]) ,(normalize ? 100 : 1)) - }) - const na = max.map((x,i) => { - return round((x - portalMax[i]) / delimiter(max[i]), (normalize ? 100 : 1)) - }) - - const scores = scoresIn.map((x, i ) => { - return round(x / delimiter(max[i]), (normalize ? 100 : 1)) - }) - return {scores , notObtained , na} -} - -function printScore(score, normalizedScore){ - return score +" "+'('+normalizedScore+"%)" -} - - -class FairScoreChartContainer{ - constructor(fairChartsContainerId , charts) { - this.fairChartsContainer = jQuery("#"+fairChartsContainerId) - this.fairAverageScoreSpan = jQuery("#fair-score-average") - this.fairMinScoreSpan = jQuery("#fair-score-min") - - this.fairMaxScoreSpan = jQuery("#fair-score-max") - - - this.fairMedianScoreSpan = jQuery("#fair-score-median") - - - this.requestLink = jQuery("#fairness-service-url") - this.requestHrefBase = (this.requestLink != null ?this.requestLink.attr("href") : "") - - this.fairSpinner = jQuery("
    ") - this.fairMsgErr = jQuery("
    We could not collect the data from the fairness service
    ") - this.fairMsgErr.hide() - this.fairChartsContainer.before(this.fairSpinner) - this.fairChartsContainer.before(this.fairMsgErr) - this.charts = charts - } - - - ajaxCall(ontologies){ - return new Promise( (resolve ,reject) => { - $.get( "/ajax/fair_score/json/?ontologies="+ontologies, (data) => { - if(data) { - resolve(data) - }else { - reject("error") - } - }).fail(function(err) { - reject("error") - }) - }) - } - getFairScoreData(ontologies) { - if(this.fairChartsContainer){ - this.hideMsgError() - this.showLoader(); - this.#updateLink(ontologies) - this.ajaxCall(ontologies).then(data => { - this.hideLoader() - this.charts.forEach( x => x.setFairScoreData(data)) - this.#fillScoreSpans(data) - }).catch(err => { - this.hideLoader() - this.showMsgError() - }) - } - - - } - - showMsgError(){ - this.fairChartsContainer.hide() - this.fairMsgErr.show() - } - - hideMsgError(){ - this.fairMsgErr.hide() - this.fairChartsContainer.show() - } - showLoader(){ - this.fairChartsContainer.hide() - this.fairSpinner.show() - } - hideLoader(){ - this.fairSpinner.hide() - this.fairChartsContainer.show() - } - - #updateLink(ontologies){ - if(this.requestLink){ - this.requestLink.attr("href" , this.requestHrefBase + "&ontologies=" + ontologies - + (ontologies==="all" || ontologies.includes(",") ? "&combined": "")) - - } - } - #fillScoreSpans(data){ - - if(this.fairAverageScoreSpan){ - this.fairAverageScoreSpan.html(printScore(data.score,data.normalizedScore)) - } - - if(data.resourceCount > 1){ - this.#showScoreLabel(this.fairMinScoreSpan, data.minScore, data.maxCredits) - this.#showScoreLabel(this.fairMaxScoreSpan, data.maxScore, data.maxCredits) - this.#showScoreLabel(this.fairMedianScoreSpan, data.medianScore, data.maxCredits) - - }else { - this.#hideScoreLabel((this.fairMinScoreSpan)) - this.#hideScoreLabel((this.fairMaxScoreSpan)) - this.#hideScoreLabel((this.fairMedianScoreSpan)) - } - - - } - - #showScoreLabel(elem, score , maxCredits){ - if(elem){ - elem.parent().parent().show() - elem.html(printScore(score,round(score/maxCredits , 100))) - } - - } - - #hideScoreLabel(elem){ - if(elem) - elem.parent().parent().hide() - } -} - -class FairScoreChart{ - constructor(fairCanvasId , dataField) { - this.dataField = dataField - this.fairScoreChartCanvas = jQuery("#"+fairCanvasId) - this.chart= null - } - - setFairScoreData(data){ - if(this.fairScoreChartCanvas){ - Object.entries(data[this.dataField]).forEach( ([key, value]) => this.fairScoreChartCanvas.data(key , value)) - this.fairScoreChartCanvas.data("resourceCount" , data["resourceCount"]) - if(this.chart === null) - this.chart = this.initChart() - else { - this.chart.data.datasets = this.getFairScoreDataSet() - this.chart.update() - } - } - - } - - getFairScoreDataSet(){ - return [] - } - - initChart(){ - return new Chart(this.fairScoreChartCanvas , {}) - } - -} - -class FairScorePrincipleBar extends FairScoreChart{ - - constructor(fairCanvasId) { - super(fairCanvasId , 'principles'); - } - initChart() { - const labels = this.fairScoreChartCanvas.data('labels') - const data = { - labels: labels, - datasets: this.getFairScoreDataSet() - }; - const config = { - type: 'horizontalBar', - data: data, - options: { - title: { - display: false, - text: 'FAIRness Scores' - }, - elements: { - bar: { - borderWidth: 2, - } - }, - indexAxis: 'y', - legend: { - display: true - }, - scales: { - xAxes: [{ - stacked: true, - ticks: { - beginAtZero: true - } - }], - yAxes: [{ - stacked: true, - ticks: { - beginAtZero: true - } - }] - }, - tooltips: { - callbacks: { - label: function (tooltipItem, data) { - let score =jQuery(this._chart.canvas).data("scores")[tooltipItem.index] - let maxScore =jQuery(this._chart.canvas).data("maxCredits")[tooltipItem.index] - let portalMaxScore =jQuery(this._chart.canvas).data("portalMaxCredits")[tooltipItem.index] - - let normalizedScore = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index] - let na = maxScore - portalMaxScore - let notObtained = portalMaxScore - score - return printScore([score, notObtained, na][tooltipItem.datasetIndex], normalizedScore) - }, - - } - } - } - } - - return new Chart(this.fairScoreChartCanvas, config); - } - getFairScoreDataSet(){ - const maxCredits = this.fairScoreChartCanvas.data('maxCredits') - const portalMaxCredits = this.fairScoreChartCanvas.data('portalMaxCredits') - const {scores, notObtained , na } = getObtainedNotObtainedNA( this.fairScoreChartCanvas.data('scores') , portalMaxCredits , maxCredits ) - return [ - { - label: 'Obtained score', - data: scores, - fill: true, - backgroundColor: 'rgba(102, 187, 106, 0.2)', - borderColor: 'rgba(102, 187, 106, 1)', - pointBorderColor: 'rgba(102, 187, 106, 1)', - pointBackgroundColor: 'rgba(102, 187, 106, 1)' - }, - { - label: 'Not obtained score', - data: notObtained, - fill: true, - backgroundColor: 'rgba(251, 192, 45, 0.2)', - borderColor: 'rgba(251, 192, 45, 1)', - pointBorderColor: 'rgba(251, 192, 45, 1)', - pointBackgroundColor: 'rgba(251, 192, 45, 1)' - }, - { - label: 'N/A score', - data: na, - fill: true, - backgroundColor: 'rgba(176, 190, 197, 0.2)', - borderColor: 'rgba(176, 190, 197, 1)', - pointBorderColor: 'rgba(176, 190, 197, 1)', - pointBackgroundColor: 'rgba(176, 190, 197, 1)' - } - ] - } -} - -class FairScoreCriteriaRadar extends FairScoreChart{ - - constructor(fairCanvasId) { - super( fairCanvasId , 'criteria'); - } - - customTooltips(){ - return function (tooltipModel) { - // Tooltip Element - let tooltipEl = document.getElementById('chartjs-tooltip'); - let canvas = jQuery(this._chart.canvas) - let descriptions = canvas.data("descriptions") - // Create element on first render - if (!tooltipEl) { - tooltipEl = document.createElement('div'); - tooltipEl.id = 'chartjs-tooltip'; - tooltipEl.innerHTML = '
    '; - document.body.appendChild(tooltipEl); - } - - // Hide if no tooltip - if (tooltipModel.opacity === 0) { - tooltipEl.style.opacity = 0; - return; - } - - // Set caret Position - tooltipEl.classList.remove('above', 'below', 'no-transform'); - if (tooltipModel.yAlign) { - tooltipEl.classList.add(tooltipModel.yAlign); - } else { - tooltipEl.classList.add('no-transform'); - } - - function getBody(bodyItem) { - return bodyItem.lines; - } - // Set Text - if (tooltipModel.body) { - let titleLines = tooltipModel.title || []; - let bodyLines = tooltipModel.body.map(getBody); - - let innerHtml = ''; - - titleLines.forEach(function(title ,index) { - innerHtml += '' + title + ' : '+ descriptions[tooltipModel.dataPoints[0].index] + ''; - }); - innerHtml += ''; - - bodyLines.forEach(function(body, i) { - let colors = tooltipModel.labelColors[i]; - let style = 'background:' + colors.backgroundColor; - style += '; border-color:' + colors.borderColor; - style += '; border-width: 2px;'; - style += '; font-size: 12px;'; - innerHtml += '' + body + ''; - }); - innerHtml += ''; - - let tableRoot = tooltipEl.querySelector('table'); - tableRoot.innerHTML = innerHtml; - } - - // `this` will be the overall tooltip - let position = this._chart.canvas.getBoundingClientRect(); - - // Display, position, and set styles for font - tooltipEl.style.background = 'rgba(0, 0, 0, 0.7)'; - tooltipEl.style.borderRadius = '3px'; - tooltipEl.style.color = 'white'; - tooltipEl.style.opacity = 1; - tooltipEl.style.position = 'absolute'; - tooltipEl.style.left = position.left + window.pageXOffset + tooltipModel.caretX + 'px'; - tooltipEl.style.top = position.top + window.pageYOffset + tooltipModel.caretY + 'px'; - tooltipEl.style.fontFamily = tooltipModel._bodyFontFamily; - tooltipEl.style.fontSize = tooltipModel.bodyFontSize + 'px'; - tooltipEl.style.fontStyle = tooltipModel._bodyFontStyle; - tooltipEl.style.padding = tooltipModel.yPadding + 'px ' + tooltipModel.xPadding + 'px'; - tooltipEl.style.pointerEvents = 'none'; - } - } - - initChart() { - const labels = this.fairScoreChartCanvas.data('labels') - - const data = { - labels: labels, - datasets: this.getFairScoreDataSet() - }; - const config = { - type: 'radar', - data: data, - options: { - title: { - display: false, - text: 'FAIRness Wheel' - }, - legend: { - display: false - }, - elements: { - line: { - borderWidth: 3 - } - }, - tooltips: { - enabled: false, - custom: this.customTooltips(), - callbacks: { - label: function (tooltipItem, data) { - let scores =jQuery(this._chart.canvas).data("scores") - let normalizedScore = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index] - let score = scores[tooltipItem.index] - return printScore(score, normalizedScore) - }, - - } - } - } - } - - return new Chart(this.fairScoreChartCanvas, config); - } - - getFairScoreDataSet() { - const scores = this.fairScoreChartCanvas.data('normalizedScores') - return [ - { - label: 'Fair score', - data: scores, - fill: true, - backgroundColor: 'rgba(151, 187, 205, 0.2)', - borderColor: 'rgba(151, 187, 205, 1)', - pointBorderColor: 'rgba(151, 187, 205, 1)', - pointBackgroundColor: 'rgba(151, 187, 205, 1)' - } - ] - } - - - -} -class FairScoreCriteriaBar extends FairScoreChart{ - constructor(fairCanvasId) { - super(fairCanvasId , 'criteria'); - this.questions = [] - } - customTooltips(){ - return function (tooltipModel) { - let tooltipContainer = document.getElementById('chartjs-tooltip-container') - // Tooltip Element - let tooltipEl = document.getElementById('chartjs-tooltip') - let canvas = jQuery(this._chart.canvas) - let questions = canvas.data("questions") - let descriptions = canvas.data("descriptions") - let resourceCount = canvas.data("resourceCount") - - // Create element on first render - if (!tooltipEl) { - tooltipEl = document.createElement('div'); - tooltipEl.id = 'chartjs-tooltip'; - tooltipEl.innerHTML = '
    '; - tooltipContainer.appendChild(tooltipEl); - } - - // Hide if no tooltip - if (tooltipModel.opacity === 0) { - tooltipEl.style.opacity = 1; - return; - } - - // Set caret Position - tooltipEl.classList.remove('above', 'below', 'no-transform'); - if (tooltipModel.yAlign) { - tooltipEl.classList.add(tooltipModel.yAlign); - } else { - tooltipEl.classList.add('no-transform'); - } - - function getBody(bodyItem) { - return bodyItem.lines; - } - - // Set Text - if (tooltipModel.body) { - let titleLines = tooltipModel.title || []; - let bodyLines = tooltipModel.body.map(getBody); - - let innerHtml = '
    '; - - titleLines.forEach(function(title ,index) { - innerHtml += '
    ' + title + ' : '+ descriptions[tooltipModel.dataPoints[0].index] + '
    '; - }); - - innerHtml += "
    " - bodyLines.forEach(function(body, i) { - let colors = tooltipModel.labelColors[i]; - let style = 'background:' + colors.backgroundColor; - style += '; border-color:' + colors.borderColor; - style += '; border-width: 2px'; - style += '; width: 100%'; - innerHtml += '' + body + ''; - }); - - innerHtml+='
      ' - - - for (const [key, value] of Object.entries(questions[tooltipModel.dataPoints[0].index])) { - let count = (value.state ? (value.state.success + value.state.average) : (value.score === value.maxCredits ? 1: 0) ) - innerHtml+=`
    • - ${printScore(count,round((count / resourceCount) * 100))} - responded successfully to: ${key}: - "${value.question}"
    • ` - } - innerHtml += '
    '; - - let tableRoot = tooltipEl.querySelector('div'); - tableRoot.innerHTML = innerHtml; - } - - // `this` will be the overall tooltip - let position = this._chart.canvas.getBoundingClientRect() - let topOffset = tooltipModel.caretY - (tooltipEl.clientHeight / 2) - - - if (topOffset <= 0) - topOffset = 0 - else if( (topOffset + tooltipEl.clientHeight) >= position.height) - topOffset = position.height - tooltipEl.clientHeight - - // Display, position, and set styles for font - tooltipEl.style.opacity = 1; - tooltipEl.style.position = 'absolute'; - tooltipEl.style.top = topOffset +'px'; - //tooltipEl.style.fontFamily = tooltipModel._bodyFontFamily; - tooltipEl.style.fontSize = tooltipModel.bodyFontSize + 'px'; - tooltipEl.style.fontStyle = tooltipModel._bodyFontStyle; - tooltipEl.style.padding = tooltipModel.yPadding + 'px ' + tooltipModel.xPadding + 'px'; - tooltipEl.style.pointerEvents = 'none'; - } - } - initChart() { - const labels = this.fairScoreChartCanvas.data('labels') - const data = { - labels: labels, - datasets: this.getFairScoreDataSet() - }; - const config = { - type: 'horizontalBar', - data: data, - options: { - title: { - display: false, - text: 'FAIRness Scores' - }, - elements: { - bar: { - borderWidth: 2, - } - }, - indexAxis: 'y', - legend: { - display: true - }, - scales: { - xAxes: [{ - stacked: true, - ticks: { - beginAtZero: true, - - } - }], - yAxes: [{ - stacked: true, - ticks: { - beginAtZero: true, - - } - }] - }, - tooltips: { - enabled: false, - mode: 'index', - position: 'nearest', - intersect: false, - custom: this.customTooltips(), - callbacks: { - label: function (tooltipItem, data) { - const canvas = jQuery(this._chart.canvas) - const max = canvas.data('maxCredits') - const scores = canvas.data('scores') - const portalMax = canvas.data("portalMaxCredits") - - const label = data.datasets[tooltipItem.datasetIndex].label - const score = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index] - const normalizedScore =Object.values(getObtainedNotObtainedNA(scores ,portalMax , max , false))[tooltipItem.datasetIndex][tooltipItem.index] - - return label +': '+ printScore(score, normalizedScore) - - } - } - } - - } - } - - return new Chart(this.fairScoreChartCanvas, config); - } - getFairScoreDataSet(){ - const maxCredits = this.fairScoreChartCanvas.data('maxCredits') - const portalMaxCredits = this.fairScoreChartCanvas.data('portalMaxCredits') - const {scores , notObtained , na } = getObtainedNotObtainedNA(this.fairScoreChartCanvas.data('scores'), portalMaxCredits ,maxCredits , true) - return [ - { - label: 'Obtained score', - data: scores , - fill: true, - backgroundColor: 'rgba(102, 187, 106, 0.2)', - borderColor: 'rgba(102, 187, 106, 1)', - pointBorderColor: 'rgba(102, 187, 106, 1)', - pointBackgroundColor: 'rgba(102, 187, 106, 1)' - }, - { - label: 'Not obtained score', - data: notObtained, - fill: true, - backgroundColor: 'rgba(251, 192, 45, 0.2)', - borderColor: 'rgba(251, 192, 45, 1)', - pointBorderColor: 'rgba(251, 192, 45, 1)', - pointBackgroundColor: 'rgba(251, 192, 45, 1)', - }, - { - label: 'N/A score', - data: na, - fill: true, - backgroundColor: 'rgba(176, 190, 197, 0.2)', - borderColor: 'rgba(176, 190, 197, 1)', - pointBorderColor: 'rgba(176, 190, 197, 1)', - pointBackgroundColor: 'rgba(176, 190, 197, 1)' - } - ] - } - setFairScoreData(data) { - super.setFairScoreData(data); - if(this.chart){ - this.showFirstToolTip() - } - } - - showFirstToolTip(){ - let meta = this.chart.getDatasetMeta(0), - rect = this.chart.canvas.getBoundingClientRect(), - point = meta.data[0].getCenterPoint(), - evt = new MouseEvent('mousemove', { - clientX: rect.left + point.x, - clientY: rect.top + point.y - }), - node = this.chart.canvas; - node.dispatchEvent(evt); - } -} - - -/* - For landscape - */ -jQuery('#fairness_assessment').ready(()=> { - let fairCriteriaBars = new FairScoreCriteriaBar('ont-fair-scores-criteria-bars-canvas') - let fairContainer = new FairScoreChartContainer('fair-score-charts-container' , [fairCriteriaBars]) - let ontologies = jQuery("#ontology_ontologyId"); - - fairContainer.getFairScoreData("all") - ontologies.change( (e) => { - if(ontologies.val() !== null){ - fairContainer.getFairScoreData(ontologies.val().join(',')) - } else if(ontologies.val() === null){ - fairContainer.getFairScoreData("all") - } - e.preventDefault() - }) - return false -}) - - - -/* - For the home - */ -jQuery('#fair-home').ready( function (e) { - - let fairScoreBar = new FairScorePrincipleBar( 'ont-fair-scores-canvas') - let fairScoreRadar = new FairScoreCriteriaRadar( 'ont-fair-criteria-scores-canvas') - let fairContainer = new FairScoreChartContainer('fair-score-charts-container' , [ fairScoreRadar , fairScoreBar]) - let ontologies = jQuery("#ontology_ontologyId"); - - fairContainer.getFairScoreData("all") - ontologies.change( (e) => { - if(ontologies.val() !== null){ - fairContainer.getFairScoreData(ontologies.val().join(',')) - } else if(ontologies.val() === null){ - fairContainer.getFairScoreData("all") - } - e.preventDefault() - }) - return false -}) - -/* - For the summary -*/ -jQuery('#fair-summary').ready( function (e) { - - let fairScoreBar = new FairScorePrincipleBar( 'ont-fair-scores-canvas') - let fairScoreRadar = new FairScoreCriteriaRadar( 'ont-fair-criteria-scores-canvas') - let fairContainer = new FairScoreChartContainer('fair-score-charts-container' , [ fairScoreRadar , fairScoreBar]) - - fairContainer.getFairScoreData(window.location.pathname.split('/')[2]) - - return false -}) - - From 968ae90764e2118dffecb4cc6a158dd080380932 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 01:33:43 +0200 Subject: [PATCH 335/533] add pill button component --- app/assets/stylesheets/components/index.scss | 1 + .../stylesheets/components/pill_button.scss | 33 +++++++++++++++++++ app/components/pill_button_component.rb | 9 +++++ .../pill_button_component.html.haml | 2 ++ .../button/pill_button_component_preview.rb | 8 +++++ 5 files changed, 53 insertions(+) create mode 100644 app/assets/stylesheets/components/pill_button.scss create mode 100644 app/components/pill_button_component.rb create mode 100644 app/components/pill_button_component/pill_button_component.html.haml create mode 100644 test/components/previews/button/pill_button_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 8c01c27e2..1430ef1ec 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -10,4 +10,5 @@ @import 'input_field'; @import 'file_input_loader'; @import 'text_area_field'; +@import 'pill_button'; diff --git a/app/assets/stylesheets/components/pill_button.scss b/app/assets/stylesheets/components/pill_button.scss new file mode 100644 index 000000000..a7060d77f --- /dev/null +++ b/app/assets/stylesheets/components/pill_button.scss @@ -0,0 +1,33 @@ +.pill-button { + color: var(--primary-color); + font-size: 15px; + display: flex; + align-items: center; + border: 1px solid var(--primary-color); + border-radius: 32px; + padding: 10px 20px; + cursor: pointer; + margin-left: 10px; + transition: background-color ease 0.3s; + white-space: nowrap; + background-color: transparent; + &:focus{ + outline: none; + } +} + +.pill-button:hover { + background-color: var(--primary-color); + color: white !important; + a { + color: white !important; + } +} + +.pill-button:hover svg path { + fill: white; +} + +.pill-button svg { + margin-right: 10px; +} \ No newline at end of file diff --git a/app/components/pill_button_component.rb b/app/components/pill_button_component.rb new file mode 100644 index 000000000..5371bee43 --- /dev/null +++ b/app/components/pill_button_component.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class PillButtonComponent < ViewComponent::Base + + def initialize(text: nil) + super + @text = text + end +end diff --git a/app/components/pill_button_component/pill_button_component.html.haml b/app/components/pill_button_component/pill_button_component.html.haml new file mode 100644 index 000000000..ffcb9ff34 --- /dev/null +++ b/app/components/pill_button_component/pill_button_component.html.haml @@ -0,0 +1,2 @@ +%button.pill-button + = @text || content \ No newline at end of file diff --git a/test/components/previews/button/pill_button_component_preview.rb b/test/components/previews/button/pill_button_component_preview.rb new file mode 100644 index 000000000..1c599ee30 --- /dev/null +++ b/test/components/previews/button/pill_button_component_preview.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class Button::PillButtonComponentPreview < ViewComponent::Preview + # @param text text + def default(text: 'hello') + render PillButtonComponent.new(text: text) + end +end From d38e63df23cec97a0ff4757737adc831cb00fb17 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 01:39:14 +0200 Subject: [PATCH 336/533] add loader component small option and previews --- app/components/loader_component.rb | 11 ++++++++++- test/components/previews/loader_component_preview.rb | 12 ++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 test/components/previews/loader_component_preview.rb diff --git a/app/components/loader_component.rb b/app/components/loader_component.rb index 493b76dbd..6d3a217f6 100644 --- a/app/components/loader_component.rb +++ b/app/components/loader_component.rb @@ -3,9 +3,18 @@ class LoaderComponent < ViewComponent::Base include ActionView::Helpers::TagHelper + def initialize(small: false) + super + @small = small + end + + def small_class + @small ? 'spinner-border-sm' : '' + end + def call content_tag(:div, class: 'd-flex align-items-center flex-column') do - content_tag(:div, class:'spinner-border') do + content_tag(:div, class: "spinner-border #{small_class}") do content_tag(:span) do 'Loading' end diff --git a/test/components/previews/loader_component_preview.rb b/test/components/previews/loader_component_preview.rb new file mode 100644 index 000000000..78e55ca33 --- /dev/null +++ b/test/components/previews/loader_component_preview.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class LoaderComponentPreview < ViewComponent::Preview + def default + render LoaderComponent.new + end + + def small + render LoaderComponent.new(small: true) + end + +end From 1bab1a1296ab5b3df2aa87b9b5d150f97e711943 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 01:40:24 +0200 Subject: [PATCH 337/533] update ontology subscribe component design and add preview --- app/assets/images/eye.svg | 4 ++++ .../ontology_subscribe_button_component.rb | 12 +++++++----- ...tology_subscribe_button_component.html.haml | 18 +++++++++++++----- ...gy_subscribe_button_component_controller.js | 11 +++++++---- ...ology_subscribe_button_component_preview.rb | 7 +++++++ 5 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 app/assets/images/eye.svg create mode 100644 test/components/previews/ontology_subscribe_button_component_preview.rb diff --git a/app/assets/images/eye.svg b/app/assets/images/eye.svg new file mode 100644 index 000000000..28889ecc3 --- /dev/null +++ b/app/assets/images/eye.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/components/ontology_subscribe_button_component.rb b/app/components/ontology_subscribe_button_component.rb index 282c569a3..e300c0efa 100644 --- a/app/components/ontology_subscribe_button_component.rb +++ b/app/components/ontology_subscribe_button_component.rb @@ -1,17 +1,19 @@ # frozen_string_literal: true class OntologySubscribeButtonComponent < ViewComponent::Base - def initialize(ontology_id: , subscribed: , user_id:) + def initialize(ontology_id:, subscribed:, user_id:, count: 0, link: 'javascript:void(0);') super - @sub_text = subscribed ? "Unsubscribe" : "Subscribe" - @controller_params = { + @sub_text = subscribed ? 'UnWatch' : 'Watch' + @controller_params = { data: { controller: 'subscribe-notes', - 'subscribe-notes-ontology-id-value': ontology_id, + 'subscribe-notes-ontology-id-value': ontology_id, 'subscribe-notes-is-subbed-value': subscribed.to_s, - 'subscribe-notes-user-id-value': user_id, + 'subscribe-notes-user-id-value': user_id, action: 'click->subscribe-notes#subscribeToNotes' } } + @link = link + @count = count end end diff --git a/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml index 6eb97097e..45236a517 100644 --- a/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml +++ b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml @@ -1,6 +1,14 @@ -%span{@controller_params} - %a.subscribe_to_notes.btn.btn-primary{href:'javascript:void(0);'} - #{@sub_text} to notes emails - %span{style:"display: none;", 'data-subscribe-notes-target': 'loader'} - = image_tag("spinners/spinner_000000_16px.gif", style: "vertical-align: text-bottom; background: transparent") +%div{@controller_params} + = render PillButtonComponent.new do + %a.d-flex.align-items-center{href: @link} + = inline_svg_tag "eye.svg" + %div + %span{'data-subscribe-notes-target': 'text'} + #{@sub_text} + ( + %span{'data-subscribe-notes-target': 'count'} + #{@count} + ) + %span{style:"display: none;", class: 'px-1', 'data-subscribe-notes-target': 'loader'} + = render LoaderComponent.new(small: true) %span.notes_sub_error{style:'color: red; display: none', 'data-subscribe-notes-target': 'error'} \ No newline at end of file diff --git a/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller.js b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller.js index 99b8e190f..94cdaf900 100644 --- a/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller.js +++ b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller.js @@ -8,7 +8,7 @@ export default class extends Controller { isSubbed: Boolean, userId: String } - static targets = ["error", "loader"] + static targets = ["error", "loader", "text" ,"count"] subscribeToNotes() { let ontologyId = this.ontologyIdValue @@ -30,9 +30,12 @@ export default class extends Controller { this.isSubbedValue = !isSubbed // Change button text - let txt = linkElement.html(); - let newButtonText = txt.match("Unsubscribe") ? txt.replace("Unsubscribe", "Subscribe") : txt.replace("Subscribe", "Unsubscribe"); - linkElement.html(newButtonText); + let txt = this.textTarget.innerHTML + let count = parseInt(this.countTarget.innerHTML) + + let newButtonText = txt.match("UnWatch") ? txt.replace("UnWatch", "Watch") : txt.replace("Watch", "UnWatch"); + this.textTarget.innerHTML = newButtonText + this.countTarget.innerHTML = newButtonText.match("UnWatch") ? (count + 1) : (count - 1) }, error: () => { this.#hideSpinner() diff --git a/test/components/previews/ontology_subscribe_button_component_preview.rb b/test/components/previews/ontology_subscribe_button_component_preview.rb new file mode 100644 index 000000000..68acbd8e9 --- /dev/null +++ b/test/components/previews/ontology_subscribe_button_component_preview.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class OntologySubscribeButtonComponentPreview < ViewComponent::Preview + def default + render OntologySubscribeButtonComponent.new(ontology_id: '', subscribed: true, user_id: '') + end +end From 513d05873e94131dd11023f322220596e5ae69f6 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 01:45:04 +0200 Subject: [PATCH 338/533] move rounded button preview to the button namespace --- .../previews/{ => button}/rounded_button_component_preview.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename test/components/previews/{ => button}/rounded_button_component_preview.rb (78%) diff --git a/test/components/previews/rounded_button_component_preview.rb b/test/components/previews/button/rounded_button_component_preview.rb similarity index 78% rename from test/components/previews/rounded_button_component_preview.rb rename to test/components/previews/button/rounded_button_component_preview.rb index 1ba6584f1..06837779f 100644 --- a/test/components/previews/rounded_button_component_preview.rb +++ b/test/components/previews/button/rounded_button_component_preview.rb @@ -1,4 +1,4 @@ -class RoundedButtonComponentPreview < ViewComponent::Preview +class Button::RoundedButtonComponentPreview < ViewComponent::Preview # @param icon text # @param link text From 638b9e877983c67237a6ea4f55c6e75e95a21507 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 03:45:49 +0200 Subject: [PATCH 339/533] add link text component --- app/components/link_text_component.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 app/components/link_text_component.rb diff --git a/app/components/link_text_component.rb b/app/components/link_text_component.rb new file mode 100644 index 000000000..c589f8787 --- /dev/null +++ b/app/components/link_text_component.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class LinkTextComponent < ViewComponent::Base + + def initialize(text:, icon: 'open-popup') + @text = text + @icon = icon + end + + def call + "#{@text}#{inline_svg(@icon)}".html_safe + end +end From 601235d20f0834e6743488a17778e7239c11a91f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 03:46:29 +0200 Subject: [PATCH 340/533] use link text component to implement popup link component --- app/assets/images/icons/popup-link.svg | 3 +++ app/components/popup_link_text_component.rb | 9 +++++++++ 2 files changed, 12 insertions(+) create mode 100644 app/assets/images/icons/popup-link.svg create mode 100644 app/components/popup_link_text_component.rb diff --git a/app/assets/images/icons/popup-link.svg b/app/assets/images/icons/popup-link.svg new file mode 100644 index 000000000..d094245c5 --- /dev/null +++ b/app/assets/images/icons/popup-link.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/components/popup_link_text_component.rb b/app/components/popup_link_text_component.rb new file mode 100644 index 000000000..c1fa3412b --- /dev/null +++ b/app/components/popup_link_text_component.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class PopupLinkTextComponent < LinkTextComponent + + def initialize(text:) + super(text: text, icon: 'icons/popup-link') + end + +end From 11eaffb961f6de561c069ea866d7654ef6bdce94 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 03:46:49 +0200 Subject: [PATCH 341/533] use link text component to implement external link component --- app/assets/images/icons/external-link.svg | 25 +++++++++++++++++++ .../external_link_text_component.rb | 8 ++++++ 2 files changed, 33 insertions(+) create mode 100644 app/assets/images/icons/external-link.svg create mode 100644 app/components/external_link_text_component.rb diff --git a/app/assets/images/icons/external-link.svg b/app/assets/images/icons/external-link.svg new file mode 100644 index 000000000..60697ff5e --- /dev/null +++ b/app/assets/images/icons/external-link.svg @@ -0,0 +1,25 @@ + + + + + + + + + diff --git a/app/components/external_link_text_component.rb b/app/components/external_link_text_component.rb new file mode 100644 index 000000000..3bb0babb4 --- /dev/null +++ b/app/components/external_link_text_component.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class ExternalLinkTextComponent < LinkTextComponent + + def initialize(text:) + super(text: text, icon: 'icons/external-link') + end +end From 882d39e44a6ed88b7fdfbea44384353af8042594 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 03:47:07 +0200 Subject: [PATCH 342/533] use link text component to implement internal link component --- app/assets/images/icons/internal-link.svg | 5 +++++ app/components/internal_link_text_component.rb | 7 +++++++ 2 files changed, 12 insertions(+) create mode 100644 app/assets/images/icons/internal-link.svg create mode 100644 app/components/internal_link_text_component.rb diff --git a/app/assets/images/icons/internal-link.svg b/app/assets/images/icons/internal-link.svg new file mode 100644 index 000000000..eb5daea9d --- /dev/null +++ b/app/assets/images/icons/internal-link.svg @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/app/components/internal_link_text_component.rb b/app/components/internal_link_text_component.rb new file mode 100644 index 000000000..308eb4b38 --- /dev/null +++ b/app/components/internal_link_text_component.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class InternalLinkTextComponent < LinkTextComponent + def initialize(text:) + super(text: text, icon: 'icons/internal-link') + end +end From a20fb3122674c6b922ea5b96fc83fd44c72c8a36 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 03:49:07 +0200 Subject: [PATCH 343/533] use internal and external links component in the label link component --- app/assets/images/icons/external-link.svg | 26 ++--------------------- app/components/label_link_component.rb | 6 +++--- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/app/assets/images/icons/external-link.svg b/app/assets/images/icons/external-link.svg index 60697ff5e..4d615c4cd 100644 --- a/app/assets/images/icons/external-link.svg +++ b/app/assets/images/icons/external-link.svg @@ -1,25 +1,3 @@ - - - - - - - - + + diff --git a/app/components/label_link_component.rb b/app/components/label_link_component.rb index 77a3642a6..dd00d289e 100644 --- a/app/components/label_link_component.rb +++ b/app/components/label_link_component.rb @@ -2,7 +2,7 @@ class LabelLinkComponent < ViewComponent::Base - def initialize(id:, text:, icon: 'fas fa-external-link-alt') + def initialize(id:, text:, icon: 'open-popup') @id = id @text = text @icon = icon @@ -10,9 +10,9 @@ def initialize(id:, text:, icon: 'fas fa-external-link-alt') def call if @id.eql?(@text) - @text + ExternalLinkTextComponent.new(text: @text).call else - @text + "" + InternalLinkTextComponent.new(text: @text).call end end From a6bc28033401a80471ea7673d8e0d2a1a7629879 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 03:47:27 +0200 Subject: [PATCH 344/533] add previews to link text components --- app/assets/images/icons/internal-link.svg | 2 +- app/components/link_text_component.rb | 5 ++-- .../display/link_text_component_preview.rb | 25 +++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 test/components/previews/display/link_text_component_preview.rb diff --git a/app/assets/images/icons/internal-link.svg b/app/assets/images/icons/internal-link.svg index eb5daea9d..0345e25ee 100644 --- a/app/assets/images/icons/internal-link.svg +++ b/app/assets/images/icons/internal-link.svg @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/app/components/link_text_component.rb b/app/components/link_text_component.rb index c589f8787..ffd3b8b08 100644 --- a/app/components/link_text_component.rb +++ b/app/components/link_text_component.rb @@ -2,12 +2,13 @@ class LinkTextComponent < ViewComponent::Base - def initialize(text:, icon: 'open-popup') + def initialize(text:, icon: nil) @text = text @icon = icon end def call - "#{@text}#{inline_svg(@icon)}".html_safe + svg_icon = !@icon&.empty? ? inline_svg(@icon) : '' + "#{@text}#{svg_icon}".html_safe end end diff --git a/test/components/previews/display/link_text_component_preview.rb b/test/components/previews/display/link_text_component_preview.rb new file mode 100644 index 000000000..d041c5c95 --- /dev/null +++ b/test/components/previews/display/link_text_component_preview.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +class Display::LinkTextComponentPreview < ViewComponent::Preview + + # @param text text + # @param icon text + def default(text: 'link text', icon: '') + render ChipButtonComponent.new(text: LinkTextComponent.new(text: text, icon: icon).call, type: 'clickable') + end + + # @param text text + def internal(text: 'redirect inside the site') + render ChipButtonComponent.new(text: InternalLinkTextComponent.new(text: text).call, type: 'clickable') + end + + # @param text text + def external(text: 'go out of the site') + render ChipButtonComponent.new(text: ExternalLinkTextComponent.new(text: text).call, type: 'clickable') + end + + # @param text text + def popup(text: 'open popup') + render ChipButtonComponent.new(text: PopupLinkTextComponent.new(text: text).call, type: 'clickable') + end +end From 6493683aa77c70a685af856567af91440ee0f29f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 06:08:33 +0200 Subject: [PATCH 345/533] use the table component in the ontology mappings tab --- app/views/mappings/_count.html.haml | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/views/mappings/_count.html.haml b/app/views/mappings/_count.html.haml index 149d59d7a..a0a244cec 100644 --- a/app/views/mappings/_count.html.haml +++ b/app/views/mappings/_count.html.haml @@ -1,19 +1,19 @@ -%table#mapping_count_table.zebra{cellpadding: "0", cellspacing: "0"} - %thead - %tr - %th Ontology - %th Mappings - %tbody - - if @mapping_counts.blank? - %tr - %td There are no mappings to or from this ontology - %td   - - else - - for mapping_count in @mapping_counts - %tr - %td - %a.facebox{href: "/mappings/show_mappings?id=#{@ontology_acronym}&target=#{mapping_count[:target_ontology].id}&height=600&width=800"}= mapping_count[:target_ontology].name - %td= number_with_delimiter(mapping_count[:count], delimiter: ',') += render TableComponent.new(id: 'mapping_count_table') do |t| + - t.header do |h| + - h.th {'Ontology'} + - h.th {'Mappings'} + + - if @mapping_counts.blank? + - t.row do |r| + - r.td {'There are no mappings to or from this ontology'} + - r.td {' '} + - else + - @mapping_counts.each do |mapping_count| + - t.row do |r| + - r.td do + %a.facebox{href: "/mappings/show_mappings?id=#{@ontology_acronym}&target=#{mapping_count[:target_ontology].id}&height=600&width=800"}= mapping_count[:target_ontology].name + - r.td do + = number_with_delimiter(mapping_count[:count], delimiter: ',') :javascript $(document).ready(() => { From 33d3833fb6e79788517eda81854597bb4788f55f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 23 Jul 2023 06:03:41 +0200 Subject: [PATCH 346/533] add table component (style, preview and code) --- app/assets/stylesheets/components/index.scss | 2 +- app/assets/stylesheets/components/table.scss | 30 +++++++++++++ app/components/table_cell_component.rb | 16 +++++++ app/components/table_component.rb | 21 +++++++++ .../table_component/table_component.html.haml | 6 +++ app/components/table_row_component.rb | 22 +++++++++ .../table_row_component.html.haml | 4 ++ .../layout/table_component_preview.rb | 45 +++++++++++++++++++ 8 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/components/table.scss create mode 100644 app/components/table_cell_component.rb create mode 100644 app/components/table_component.rb create mode 100644 app/components/table_component/table_component.html.haml create mode 100644 app/components/table_row_component.rb create mode 100644 app/components/table_row_component/table_row_component.html.haml create mode 100644 test/components/previews/layout/table_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 8c01c27e2..d158420ae 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -10,4 +10,4 @@ @import 'input_field'; @import 'file_input_loader'; @import 'text_area_field'; - +@import "table"; diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss new file mode 100644 index 000000000..c132a4c31 --- /dev/null +++ b/app/assets/stylesheets/components/table.scss @@ -0,0 +1,30 @@ +.table-content{ + border-collapse: collapse; + width: 100%; + border-spacing: 0; +} + +.table-content thead th{ + background-color: hsl(0, 0%, 100%); + border-bottom: 1px solid hsl(240, 4%, 85%); + font-weight: 700; + color: hsl(230, 13%, 9%); +} + + +.table-content td, .table-content th{ + padding: 12px 24px; + vertical-align: top; +} + + +.table-content-stripped tbody tr:nth-child(odd) { + background-color: #FAFAFA; +} + +.table-content tbody th:first-child { + color: #888888; + font-weight: 400; +} + + diff --git a/app/components/table_cell_component.rb b/app/components/table_cell_component.rb new file mode 100644 index 000000000..b51fc7d79 --- /dev/null +++ b/app/components/table_cell_component.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class TableCellComponent < ViewComponent::Base + + def initialize(width: nil, type: 'td') + super + @width = width + @type = type + end + + def call + options = {} + options[:width] = @width if @width + content_tag(@type, content&.html_safe, options) + end +end diff --git a/app/components/table_component.rb b/app/components/table_component.rb new file mode 100644 index 000000000..a056cefb4 --- /dev/null +++ b/app/components/table_component.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class TableComponent < ViewComponent::Base + + renders_one :header, TableRowComponent + renders_many :rows, TableRowComponent + + def initialize(id: '', stripped: false) + super + @id = id + @stripped = stripped + end + + def stripped_class + @stripped ? 'table-content-stripped' : '' + end + + def add_row(*array, &block) + self.row.create(*array, &block) + end +end diff --git a/app/components/table_component/table_component.html.haml b/app/components/table_component/table_component.html.haml new file mode 100644 index 000000000..354e87fe9 --- /dev/null +++ b/app/components/table_component/table_component.html.haml @@ -0,0 +1,6 @@ +%table.table-content{id: @id, class: stripped_class} + %thead + = header + %tbody + - rows.each do |row| + = row diff --git a/app/components/table_row_component.rb b/app/components/table_row_component.rb new file mode 100644 index 000000000..236196519 --- /dev/null +++ b/app/components/table_row_component.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +class TableRowComponent < ViewComponent::Base + + renders_many :cells, TableCellComponent + + def create(*array, &block) + array.each do |key_value| + key, value = key_value.to_a.first + self.cell(type: key) { value&.to_s } + end + block.call(self) if block_given? + end + + def th(width: nil, &block) + self.cell(type: 'th', width: width, &block) + end + + def td(width: nil, &block) + self.cell(type: 'td', width: width, &block) + end +end diff --git a/app/components/table_row_component/table_row_component.html.haml b/app/components/table_row_component/table_row_component.html.haml new file mode 100644 index 000000000..282048188 --- /dev/null +++ b/app/components/table_row_component/table_row_component.html.haml @@ -0,0 +1,4 @@ +%tr + - cells.each do |cell| + = cell + = content \ No newline at end of file diff --git a/test/components/previews/layout/table_component_preview.rb b/test/components/previews/layout/table_component_preview.rb new file mode 100644 index 000000000..b38a7cd0f --- /dev/null +++ b/test/components/previews/layout/table_component_preview.rb @@ -0,0 +1,45 @@ +# frozen_string_literal: true + +class Layout::TableComponentPreview < ViewComponent::Preview + + include ActionView::Helpers::UrlHelper + + def default + render TableComponent.new do |t| + table_content(t) + end + end + + def stripped + render TableComponent.new(stripped: true) do |t| + table_content(t) + end + end + + private + + def table_content(t) + headers = 5.times.map { |i| "header #{i}" } + rows = 6.times.map { |row| 5.times.map { |i| "line #{row} :#{i} " } } + + t.header do |h| + headers.each do |header| + h.th { header } + end + h.th { 'Action' } + end + + rows.each do |row| + t.row do |r| + row.each do |col| + r.td { col } + end + + r.td do + link_to('Edit', '', class: 'mr-3') + link_to('Delete', '') + end + end + end + + end +end From 32109e20f9345e72d8463fcddf5e96b93a9a2df1 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 04:00:53 +0200 Subject: [PATCH 347/533] make dropdown content. with no default padding --- app/assets/stylesheets/components/dropdown.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/components/dropdown.scss b/app/assets/stylesheets/components/dropdown.scss index d3221cc80..d923eae5c 100644 --- a/app/assets/stylesheets/components/dropdown.scss +++ b/app/assets/stylesheets/components/dropdown.scss @@ -6,12 +6,12 @@ font-size: 16px; color: #000000; cursor: pointer; + padding: 14px 20px; } .dropdown-container { border: 1px solid #dfdfdf; border-radius: 5px; - padding: 14px 20px; margin-bottom: 20px; margin-top: 20px; } \ No newline at end of file From 2b87dc6594856f43ef770ea333004e8c7fd9febe Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 04:02:41 +0200 Subject: [PATCH 348/533] update concept details component to use the Table and dropdown component --- .../components/concept_details.scss | 11 +++++ app/components/concept_details_component.rb | 40 +++++++++++-------- .../concept_details_component.html.haml | 39 +++++++++--------- 3 files changed, 56 insertions(+), 34 deletions(-) create mode 100644 app/assets/stylesheets/components/concept_details.scss diff --git a/app/assets/stylesheets/components/concept_details.scss b/app/assets/stylesheets/components/concept_details.scss new file mode 100644 index 000000000..7ae6fef43 --- /dev/null +++ b/app/assets/stylesheets/components/concept_details.scss @@ -0,0 +1,11 @@ + +.concept_details_component .raw-table .dropdown-title-bar p { + padding: 10px 0px; + color: rgb(136, 136, 136); + font-weight: 400; +} + + +.concept_details_component table th { + width: 220px; +} \ No newline at end of file diff --git a/app/components/concept_details_component.rb b/app/components/concept_details_component.rb index 86074870e..a6d1ee737 100644 --- a/app/components/concept_details_component.rb +++ b/app/components/concept_details_component.rb @@ -3,8 +3,8 @@ class ConceptDetailsComponent < ViewComponent::Base include ApplicationHelper - renders_one :header - renders_many :sections + renders_one :header, TableComponent + renders_many :sections, TableRowComponent attr_reader :concept_properties @@ -19,8 +19,20 @@ def initialize(id:, acronym:, properties:, top_keys:, bottom_keys:, exclude_keys @concept_properties = concept_properties2hash(@properties) if @properties end - def render_properties(properties_set, ontology_acronym, &block) - out = '' + def add_sections(keys, &block) + scheme_set = properties_set_by_keys(keys, concept_properties) + rows = row_hash_properties(scheme_set, concept_properties, &block) + + rows.each do |row| + section do |table_row| + table_row.create(*row) + end + end + + end + + def row_hash_properties(properties_set, ontology_acronym, &block) + out = [] properties_set&.each do |key, data| next if exclude_relation?(key) || !data[:values] @@ -35,17 +47,12 @@ def render_properties(properties_set, ontology_acronym, &block) end end - line = <<-EOS - - - #{remove_owl_notation(key)} - - #{"

    #{ajax_links.join('

    ')}".html_safe} - - EOS - out += line + out << [ + { th: "#{remove_owl_notation(key)}".html_safe }, + { td: "

    #{"

    #{ajax_links.join('

    ')}"}

    ".html_safe } + ] end - raw out + out end def properties_set_by_keys(keys, concept_properties, exclude_keys = []) @@ -64,10 +71,11 @@ def filter_properties(top_keys, bottom_keys, exclude_keys, concept_properties) end private + def concept_properties2hash(properties) # NOTE: example properties # - #properties + # properties #=> # "#collapse-#{@id}", "data-toggle" => "collapse"} - %div Raw data - %img{src: asset_path("arrow-down.svg")} - .collapse{id: "collapse-#{@id}", "data-parent" => "#accordion-#{@id}"} - %table#concepts-content.concepts-content - - top_set, leftover_set, bottom_set = filter_properties(@top_keys, @bottom_keys, @exclude_keys, @concept_properties) - = render_properties(top_set, @acronym) - = render_properties(leftover_set, @acronym) - - sections&.each do |section| - = section - = render_properties(bottom_set, @acronym) + %div.raw-table + = render DropdownContainerComponent.new(title: 'Raw data', id: "accordion-#{@id}") do + - top_set, leftover_set, bottom_set = filter_properties(@top_keys, @bottom_keys, @exclude_keys, @concept_properties) + = render TableComponent.new(stripped: true) do |t| + + - row_hash_properties(top_set, @acronym).each do |row| + - t.add_row(*row) + + - row_hash_properties(leftover_set, @acronym).each do |row| + - t.add_row(*row) + + + - sections.each do |section| + - t.row do + = section + + + - row_hash_properties(bottom_set, @acronym).each do |row| + - t.add_row(*row) From 2bab64dfa50ce8331a073f116e77033418da5397 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 04:10:59 +0200 Subject: [PATCH 349/533] add concept details component preview --- app/assets/stylesheets/concepts.scss | 25 -------------- .../concept_details_component_preview.rb | 33 +++++++++++++++++++ 2 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 test/components/previews/concept_details_component_preview.rb diff --git a/app/assets/stylesheets/concepts.scss b/app/assets/stylesheets/concepts.scss index 0c8c7a08d..87627bd5c 100644 --- a/app/assets/stylesheets/concepts.scss +++ b/app/assets/stylesheets/concepts.scss @@ -97,32 +97,7 @@ div.synonym-change-request button { .concepts-json:hover svg path{ fill: white; } -.concepts-content{ - border-collapse: collapse; - width: 100%; - border-spacing: 0; - -} -.concepts-content td{ - padding: 12px 24px; - vertical-align: top; -} -.concepts-content tr:nth-child(odd) { - background-color: #FAFAFA; -} -.concepts-content td:first-child { - color: #888888; - width: 220px; -} -.concepts-content td:first-child { - color: #888888; - width: 220px; -} -.concepts-content a{ - text-decoration: underline; - color: #888888; -} .concepts-content div{ margin-bottom: 5px; } diff --git a/test/components/previews/concept_details_component_preview.rb b/test/components/previews/concept_details_component_preview.rb new file mode 100644 index 000000000..3d486535a --- /dev/null +++ b/test/components/previews/concept_details_component_preview.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +class ConceptDetailsComponentPreview < ViewComponent::Preview + def default + properties = { links: nil, + context: nil, + "http://www.w3.org/2004/02/skos/core#narrower": ["http://opendata.inrae.fr/thesaurusINRAE/d_0101", + "http://opendata.inrae.fr/thesaurusINRAE/d_0103", + "http://opendata.inrae.fr/thesaurusINRAE/d_0102", + "http://opendata.inrae.fr/thesaurusINRAE/d_0104", + "http://opendata.inrae.fr/thesaurusINRAE/d_0105"], + "http://www.w3.org/1999/02/22-rdf-syntax-ns#type": ["http://www.w3.org/2004/02/skos/core#Concept", + "http://www.w3.org/2002/07/owl#NamedIndividual"], + "http://www.w3.org/2004/02/skos/core#topConceptOf": ["http://opendata.inrae.fr/thesaurusINRAE/thesaurusINRAE"], + "http://www.w3.org/2004/02/skos/core#prefLabel": ["01. ENVIRONMENT [domain]"], + "http://www.w3.org/2004/02/skos/core#inScheme": ["http://opendata.inrae.fr/thesaurusINRAE/thesaurusINRAE"], + "http://purl.org/dc/terms/modified": ["2021-02-24T15:25:56"] + } + schemes_keys = %w[hasTopConcept topConceptOf] + label_xl_set = %w[skos-xl#prefLabel skos-xl#altLabel skos-xl#hiddenLabel] + render ConceptDetailsComponent.new(id: 'concept-details', acronym: "Ontology", + properties: OpenStruct.new(properties), + top_keys: %w[description comment], + bottom_keys: %w[disjoint subclass is_a has_part], + exclude_keys: schemes_keys + label_xl_set + ['inScheme']) do |c| + c.header(stripped: true) do |table| + table.add_row({ th: 'ID' }, { td: "http://opendata.inrae.fr/thesaurusINRAE/d_1" }) + table.add_row({ th: 'Preferred Name' }, { td: "01. ENVIRONMENT [domain]" }) + table.add_row({ th: 'Type' }, { td: "http://www.w3.org/2004/02/skos/core#Concept" }) + end + end + end +end From 4829de8fe093d9bbeea37c32acf903af78cc66aa Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 04:12:55 +0200 Subject: [PATCH 350/533] update collection, concept, label_xl and scheme views with the new concept details component --- app/views/collections/_collection.html.haml | 26 ++---- app/views/concepts/_details.html.haml | 89 +++++++++------------ app/views/label_xl/show.html.haml | 19 +---- app/views/schemes/_scheme.html.haml | 19 +---- 4 files changed, 52 insertions(+), 101 deletions(-) diff --git a/app/views/collections/_collection.html.haml b/app/views/collections/_collection.html.haml index a3310e726..580c0b74e 100644 --- a/app/views/collections/_collection.html.haml +++ b/app/views/collections/_collection.html.haml @@ -4,24 +4,8 @@ top_keys: %w[created modified comment note], bottom_keys: [], exclude_keys: %w[member]) do |c| - = c.header do - %tr - %td.label - ID - %td - %p - = collection["@id"] - %tr - %td{nowrap: ""} Preferred Name - %td - %p= get_collection_label(collection) - %tr - %td{nowrap: ""} Members count - %td - %p= collection["memberCount"] - %tr - %td.label - Type - %td - %p - = collection["@type"] \ No newline at end of file + - c.header(stripped: true) do |t| + - t.add_row({th: 'ID'}, {td: collection["@id"]}) + - t.add_row({th: 'Preferred Name'}, {td: get_collection_label(collection)}) + - t.add_row({th: 'Members count'}, {td: collection["memberCount"]}) + - t.add_row({th: 'Type'}, {td: collection["@type"]}) \ No newline at end of file diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index 4a9fb9c3c..a83f051fa 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -1,73 +1,62 @@ = turbo_frame_tag 'concept_details' do - schemes_keys = %w[hasTopConcept topConceptOf] - label_xl_set = %w[skos-xl#prefLabel skos-xl#altLabel skos-xl#hiddenLabel] - - if @concept.prefLabel.nil? %div.py-3.px-2 = render(AlertMessageComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language'), type: "warning", closeable: true)) - + = render ConceptDetailsComponent.new(id:'concept-details', acronym: @ontology.acronym, properties: @concept.properties, top_keys: %w[description comment], bottom_keys: %w[disjoint subclass is_a has_part], exclude_keys: schemes_keys + label_xl_set + ['inScheme']) do |c| - - - c.header do - %tr - %td{nowrap: ""}= t('ontology_details.concept.id') - %td - = @concept.id - %tr - %td{nowrap: ""}= t('ontology_details.concept.preferred_name') - %td - = @concept.prefLabel({:use_html => true}).html_safe + + - c.header(stripped: true) do |t| + - t.add_row({th: t('ontology_details.concept.id')}, {td:@concept.id}) + - t.add_row({th: t('ontology_details.concept.preferred_name')}, {td:@concept.prefLabel({:use_html => true}).html_safe}) + - unless @concept.synonym.nil? || @concept.synonym.empty? - %tr - %td{nowrap: ""}= t('ontology_details.concept.synonyms') - %td - - for synonym in @concept.synonym - = synonym - %td - %div.synonym-change-request - = add_synonym_button - = remove_synonym_button - - + - t.add_row({th: t('ontology_details.concept.synonyms')}) do |h| + - h.td do + %div.d-flex + %div + - for synonym in @concept.synonym + = synonym + %div.synonym-change-request + = add_synonym_button + = remove_synonym_button + + - unless @concept.definition.nil? || @concept.definition.empty? - %tr - %td{nowrap: ""}= t('ontology_details.concept.definitions') - %td - = dispaly_complex_text(@concept.definition) + - t.add_row({th: t('ontology_details.concept.definitions')}, {td:dispaly_complex_text(@concept.definition)}) + - if @concept.obsolete? - %tr - %td{nowrap: ""}= t('ontology_details.concept.obsolete') - %td - true + - t.add_row({th: t('ontology_details.concept.obsolete')}, {td: 'true'}) + - if skos? - unless @concept.memberOf.nil? || @concept.memberOf.empty? - %tr - %td{nowrap: ""}= t('ontology_details.concept.member_of') - %td + - t.add_row({th: t('ontology_details.concept.member_of')}) do |h| + - h.td do %div.my-1 - @concept.memberOf.each do |v| = raw get_link_for_collection_ajax(v, @ontology.acronym, '_blank') + - unless @concept.inScheme.nil? || @concept.inScheme.empty? - %tr - %td{nowrap: ""}= t('ontology_details.concept.in_schemes') - %td + - t.add_row({th: t('ontology_details.concept.in_schemes')}) do |h| + - h.td do %div.my-1 - @concept.inScheme.each do |v| = raw get_link_for_scheme_ajax(v, @ontology.acronym, '_blank') - %tr - %td{nowrap: ""}= t('ontology_details.concept.type') - %td - = @concept.type - - - scheme_set = c.properties_set_by_keys(schemes_keys, c.concept_properties) - - label_xl_set = c.properties_set_by_keys(label_xl_set, c.concept_properties) - - c.section do - = c.render_properties(scheme_set, c.concept_properties) do |v| - - get_link_for_scheme_ajax(v, @ontology.acronym, '_blank') - - c.section do - = c.render_properties(label_xl_set, c.concept_properties) do |v| - - get_link_for_label_xl_ajax(v, @ontology.acronym, @concept.id) + + - t.add_row({th: t('ontology_details.concept.type')} , {td: @concept.type}) + + + - c.add_sections(schemes_keys) do |v| + - get_link_for_scheme_ajax(v, @ontology.acronym, '_blank') + + - c.add_sections(label_xl_set) do |v| + - get_link_for_label_xl_ajax(v, @ontology.acronym, @concept.id) + + + + diff --git a/app/views/label_xl/show.html.haml b/app/views/label_xl/show.html.haml index 7b94c4971..424b9e4e2 100644 --- a/app/views/label_xl/show.html.haml +++ b/app/views/label_xl/show.html.haml @@ -5,18 +5,7 @@ top_keys: %w[description comment], bottom_keys: %w[disjoint subclass is_a has_part], exclude_keys: []) do |c| - - c.header do - %tr - %td.label - ID - %td - %p - = @label_xl["@id"] - %tr - %td{nowrap: ""} Preferred Name - %td - %p= get_label_xl_label(@label_xl) - %tr - %td{nowrap: ""} Type - %td - %p= @label_xl["@type"] + - c.header(stripped: true) do |t| + - t.add_row({th: 'ID'}, {td: @label_xl["@id"]}) + - t.add_row({th: 'Preferred Name'}, {td: get_label_xl_label(@label_xl)}) + - t.add_row({th: 'Type'}, {td: @label_xl["@type"]}) diff --git a/app/views/schemes/_scheme.html.haml b/app/views/schemes/_scheme.html.haml index 91607bf91..2fcf310c9 100644 --- a/app/views/schemes/_scheme.html.haml +++ b/app/views/schemes/_scheme.html.haml @@ -5,19 +5,8 @@ top_keys: %w[description comment], bottom_keys: %w[disjoint subclass is_a has_part], exclude_keys: []) do |c| - = c.header do - %tr - %td.label - ID - %td - %p= scheme["@id"] - %tr - %td{nowrap: ""} Preferred Name - %td - %p= get_scheme_label(scheme) - %tr - %td.label - Type - %td - %p= scheme["@type"] + - c.header(stripped: true) do |t| + - t.add_row({th: 'ID'} , {td: scheme["@id"]}) + - t.add_row({th: 'Preferred Name'} , {td: get_scheme_label(scheme)}) + - t.add_row({th: 'Type'} , {td: scheme["@type"]}) From 8937ae4d0fa5d2ce259fddfbaf687ab1d6e04a6e Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 04:44:04 +0200 Subject: [PATCH 351/533] migrate notes table to use Table component --- app/assets/stylesheets/components/index.scss | 1 + app/components/table_cell_component.rb | 4 +- app/components/table_component.rb | 2 +- .../table_component/table_component.html.haml | 3 +- app/components/table_row_component.rb | 13 ++++-- .../table_row_component.html.haml | 2 +- app/controllers/notes_controller.rb | 2 +- app/views/notes/_note_line.html.haml | 25 +++++------ app/views/notes/_notes.html.haml | 44 +++++++------------ 9 files changed, 44 insertions(+), 52 deletions(-) diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index d158420ae..fd221d5d7 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -11,3 +11,4 @@ @import 'file_input_loader'; @import 'text_area_field'; @import "table"; +@import "concept_details"; \ No newline at end of file diff --git a/app/components/table_cell_component.rb b/app/components/table_cell_component.rb index b51fc7d79..2e459cb32 100644 --- a/app/components/table_cell_component.rb +++ b/app/components/table_cell_component.rb @@ -2,15 +2,17 @@ class TableCellComponent < ViewComponent::Base - def initialize(width: nil, type: 'td') + def initialize(width: nil, colspan: nil,type: 'td') super @width = width @type = type + @colspan = colspan end def call options = {} options[:width] = @width if @width + options[:colspan] = @colspan if @colspan content_tag(@type, content&.html_safe, options) end end diff --git a/app/components/table_component.rb b/app/components/table_component.rb index a056cefb4..05a2f3a7c 100644 --- a/app/components/table_component.rb +++ b/app/components/table_component.rb @@ -5,7 +5,7 @@ class TableComponent < ViewComponent::Base renders_one :header, TableRowComponent renders_many :rows, TableRowComponent - def initialize(id: '', stripped: false) + def initialize(id: '', stripped: true) super @id = id @stripped = stripped diff --git a/app/components/table_component/table_component.html.haml b/app/components/table_component/table_component.html.haml index 354e87fe9..089870b44 100644 --- a/app/components/table_component/table_component.html.haml +++ b/app/components/table_component/table_component.html.haml @@ -1,6 +1,7 @@ %table.table-content{id: @id, class: stripped_class} %thead = header - %tbody + %tbody{id: "#{@id}_table_body"} - rows.each do |row| = row + = content \ No newline at end of file diff --git a/app/components/table_row_component.rb b/app/components/table_row_component.rb index 236196519..90c995a2a 100644 --- a/app/components/table_row_component.rb +++ b/app/components/table_row_component.rb @@ -4,6 +4,11 @@ class TableRowComponent < ViewComponent::Base renders_many :cells, TableCellComponent + def initialize(id: '') + super + @id = id + end + def create(*array, &block) array.each do |key_value| key, value = key_value.to_a.first @@ -12,11 +17,11 @@ def create(*array, &block) block.call(self) if block_given? end - def th(width: nil, &block) - self.cell(type: 'th', width: width, &block) + def th(width: nil, colspan: nil, &block) + self.cell(type: 'th', width: width, colspan: colspan, &block) end - def td(width: nil, &block) - self.cell(type: 'td', width: width, &block) + def td(width: nil, colspan: nil, &block) + self.cell(type: 'td', width: width, colspan: colspan, &block) end end diff --git a/app/components/table_row_component/table_row_component.html.haml b/app/components/table_row_component/table_row_component.html.haml index 282048188..55dad8c73 100644 --- a/app/components/table_row_component/table_row_component.html.haml +++ b/app/components/table_row_component/table_row_component.html.haml @@ -1,4 +1,4 @@ -%tr +%tr{id: @id} - cells.each do |cell| = cell = content \ No newline at end of file diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 83051c4e1..b47208ac2 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -103,7 +103,7 @@ def create success_message = 'New comment added successfully' locals = { note: new_note, ontology_acronym: ontology_acronym, parent_type: parent_type } partial = 'notes/note_line' - container_id = "#{parent_type}_notes_table_content" + container_id = "#{parent_type}_notes_table_body" alerts_container_id = nil end diff --git a/app/views/notes/_note_line.html.haml b/app/views/notes/_note_line.html.haml index 77823dd57..ce50b99ba 100644 --- a/app/views/notes/_note_line.html.haml +++ b/app/views/notes/_note_line.html.haml @@ -1,29 +1,26 @@ -%tr{id: "#{note.id}_tr_#{parent_type}"} - %td += render TableRowComponent.new(id: "#{note.id}_tr_#{parent_type}") do |row| + - row.td do - if current_user_admin? - alert_text = "Are you sure you want to delete the note ''" + (note.subject || '') + "'' created by " + note.creator.split('/')[-1] + "?
    This action CAN NOT be undone!!!" = button_to "Delete", notes_path(noteid: note.id, parent_type: parent_type), method: :delete, class:'btn btn-sm btn-link', form: {data: { turbo: true, turbo_confirm: alert_text, turbo_frame: '_top'}} - %td + - row.td do - note_link = "/ontologies/#{ontology_acronym}/notes/" - note_link = "#{note_link}?noteid=#{CGI.escape(note.id)}" = link_to_modal note.subject || note_link , note_link, id:"row_#{note.id}", - class: "ont_notes_list_link notes_list_link", - data: { show_modal_title_value: ""} + class: "ont_notes_list_link notes_list_link", + data: { show_modal_title_value: ""}     %span{:id => "#{note.id}_row_archived", :style => "font-size: x-small; color: grey;"} - if note.archived archived - %td.d-none - = note.subject - %td.d-none - = note.archived || "false" - %td + - row.td do = note.creator.split('/')[-1] - %td + + - row.td do = note.proposal ? get_note_type_text(note.proposal.type) : "Comment" - if parent_type.eql?('ontology') - %td + - row.td do - if note.relatedClass && note.relatedClass.length > 0 - %a{href: "/ontologies/#{ontology_acronym}?p=classes&conceptid=#{CGI.escape(note.relatedClass.first)}"}= note.relatedClass.first - %td + %a{href: "/ontologies/#{ontology_acronym}?p=classes&conceptid=#{CGI.escape(note.relatedClass.first)}", 'data-turbo': 'false'}= note.relatedClass.first + - row.td do = DateTime.parse(note.created).strftime("%Y-%m-%d") \ No newline at end of file diff --git a/app/views/notes/_notes.html.haml b/app/views/notes/_notes.html.haml index d7a13e4a6..57b77791a 100644 --- a/app/views/notes/_notes.html.haml +++ b/app/views/notes/_notes.html.haml @@ -17,35 +17,21 @@ = render_alerts_container("notes_#{parent_type}_list_table_alerts") .ont_notes_table_container - %table.zebra.notes_ont_list_table{:id => "#{notes_table_id}", :style => "width: 100%;", :width => "100%"} - %thead - %tr - %th - Delete - %th - Subject - %th.d-none - Subject Sort - %th.d-none - Archive Sort - %th - Author - %th - Type - - if parent_type.eql?('ontology') - %th - Class - %th - Created - %tbody{id: "#{parent_type}_notes_table_content"} - - if @notes.nil? || @notes.empty? - %tr#ont_no_notes - %td{colspan: colspan} No notes to display - - (colspan-1).times.each do - %td - - else - - @notes.each do |note| - = render partial: 'notes/note_line', locals: {note: note, ontology_acronym: @ontology.acronym, parent_type: parent_type} + - cols = ['Action', 'Subject', 'Author', 'Type', (parent_type.eql?('ontology') ? 'Class' : nil),'Created'].compact + = render TableComponent.new(id:"#{parent_type}_notes") do |t| + - t.header do |row| + - row.create(*cols.map{|col| {th: col}}) + + - if @notes.nil? || @notes.empty? + - t.row do |row| + - row.td(colspan: colspan) do + %div.text-center + No notes to display + + - else + - @notes.each do |note| + = render partial: 'notes/note_line', locals: {note: note, ontology_acronym: @ontology.acronym, parent_type: parent_type} + :javascript jQuery(".ontologies.show").ready(function(){ jQuery("#hide_archived_ont").click(function(){ From 68587822647e823baa1b2635e9e47ac2de43fc01 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 07:19:53 +0200 Subject: [PATCH 352/533] add pills version for the tabs component --- app/assets/stylesheets/components/index.scss | 1 + .../components/pill_tabs_container.scss | 21 +++++ .../components/tabs_container.scss | 87 +++++++++++-------- app/components/tab_item_component.rb | 16 +++- app/components/tabs_container_component.rb | 9 +- .../tabs_container_component.html.haml | 9 +- .../tabs_container_component_preview.rb | 18 ++++ 7 files changed, 113 insertions(+), 48 deletions(-) create mode 100644 app/assets/stylesheets/components/pill_tabs_container.scss diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 3d29f0f6d..9339757d5 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -11,4 +11,5 @@ @import 'file_input_loader'; @import 'text_area_field'; @import 'tabs_container'; +@import 'pill_tabs_container'; diff --git a/app/assets/stylesheets/components/pill_tabs_container.scss b/app/assets/stylesheets/components/pill_tabs_container.scss new file mode 100644 index 000000000..db13f79b3 --- /dev/null +++ b/app/assets/stylesheets/components/pill_tabs_container.scss @@ -0,0 +1,21 @@ +.pill-tabs-container { + display: flex; +} + +.pill-tabs-container .tab-items{ + margin-bottom: 10px; +} + +.pill-tabs-container .nav-item { + display: block; + padding: 0.5rem 1rem; +} + +.pill-tabs-container .nav-item.active { + border-radius: 5px; + background-color: var(--primary-color); + color: white !important; + a { + color: white !important; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/components/tabs_container.scss b/app/assets/stylesheets/components/tabs_container.scss index 0baf56f18..cfa52689d 100644 --- a/app/assets/stylesheets/components/tabs_container.scss +++ b/app/assets/stylesheets/components/tabs_container.scss @@ -1,52 +1,63 @@ .tabs-container { - border-bottom: 1px solid #DFDFDF; + border-bottom: 1px solid #DFDFDF; + display: flex; + + & > div { display: flex; - justify-content: center; - & > div { - display: flex; - justify-content: space-between; - padding: 0 50px; - } + justify-content: space-between; + padding: 0 50px; + } } -.tabs-container hr{ - border: 1px solid #f3f3f3; - width: 100%; - margin: 0; +.tabs-container hr { + border: 1px solid #f3f3f3; + width: 100%; + margin: 0; } -.tabs-container .tab-items{ - display: flex; - margin: 0; + +.tabs-container .tab-items { + display: flex; + margin: 0; + position: relative; + + .tab-pinned-right { + position: absolute; + right: 40px; + } } -.tabs-container .tab-items div{ - font-size: 16px; - font-weight: 400; - color: #5e5e5e; - margin-right: 50px; - cursor: pointer; - opacity: 60%; - transition: opacity 0.3s ease; - a { - color: #5e5e5e !important; - } + +.tabs-container .tab-items div { + font-size: 16px; + font-weight: 400; + color: #5e5e5e; + margin-right: 50px; + cursor: pointer; + opacity: 60%; + transition: opacity 0.3s ease; + + a { + color: #5e5e5e !important; + } } -.tabs-container .tab-items div:hover{ +.tabs-container .tab-items div:hover { - opacity: 100%; + opacity: 100%; } -.tabs-container .tab-items div hr{ - display: none; - margin-top: 10px; +.tabs-container .tab-items div hr { + display: none; + margin-top: 10px; } -.tabs-container .tab-items .active{ - font-weight: 500; - color: black; - opacity: 100%; + +.tabs-container .tab-items .active { + font-weight: 500; + color: black; + opacity: 100%; } -.tabs-container .tab-items .active hr{ - display: block; - border: 1px solid var(--primary-color); - opacity: 100%; + +.tabs-container .tab-items .active hr { + display: block; + border: 1px solid var(--primary-color); + opacity: 100%; } diff --git a/app/components/tab_item_component.rb b/app/components/tab_item_component.rb index e7728cc09..99dc732cd 100644 --- a/app/components/tab_item_component.rb +++ b/app/components/tab_item_component.rb @@ -4,8 +4,9 @@ class TabItemComponent < ViewComponent::Base include ActionView::Helpers::UrlHelper - def initialize(title:, path:, page_name: '', selected: false) + def initialize(id: nil, title: nil, path: nil, page_name: '', selected: false) super + @id = id @title = title @path = path @page_name = page_name @@ -29,10 +30,11 @@ def target end def id - @title + @title || @id end + def title - @title.humanize + @title&.humanize end def active_class @@ -40,7 +42,13 @@ def active_class end def call - link_to(title, @path, id: "#{item_id}_tab") + if title && !title.empty? + link_to(title, @path, id: "#{item_id}_tab", class: "#{active_class} tab-link") + else + link_to(@path, id: "#{item_id}_tab", class: "#{active_class} tab-link") do + content + end + end end end diff --git a/app/components/tabs_container_component.rb b/app/components/tabs_container_component.rb index f911eee1c..b65c9467e 100644 --- a/app/components/tabs_container_component.rb +++ b/app/components/tabs_container_component.rb @@ -4,10 +4,16 @@ class TabsContainerComponent < ViewComponent::Base renders_many :items, TabItemComponent renders_many :item_contents + renders_one :pinned_right - def initialize(url_parameter: nil) + def initialize(url_parameter: nil, pill: false) super @url_parameter = url_parameter + @pill = pill + end + + def container_class + @pill ? 'pill-tabs-container' : 'tabs-container' end def tabs_container_data(item) @@ -20,5 +26,4 @@ def tabs_container_data(item) action: 'click->tabs-container#selectTab' } end - end diff --git a/app/components/tabs_container_component/tabs_container_component.html.haml b/app/components/tabs_container_component/tabs_container_component.html.haml index db2d49873..e476be38f 100644 --- a/app/components/tabs_container_component/tabs_container_component.html.haml +++ b/app/components/tabs_container_component/tabs_container_component.html.haml @@ -1,9 +1,10 @@ -.tabs-container{data: {controller:'tabs-container'}} - .tab-items.nav-tabs.nav +%div{data: {controller:'tabs-container'}, class: container_class} + .tab-items.nav - items.each do |item| - %div{data: tabs_container_data(item), class: item.active_class} + %div{data: tabs_container_data(item), class: item.active_class + ' nav-item'} = item - %hr + - unless @pill + %hr .tab-content - item_contents.each_with_index do |item_content, index| diff --git a/test/components/previews/layout/tabs_container_component_preview.rb b/test/components/previews/layout/tabs_container_component_preview.rb index ca25263ae..8c04ffdd4 100644 --- a/test/components/previews/layout/tabs_container_component_preview.rb +++ b/test/components/previews/layout/tabs_container_component_preview.rb @@ -21,4 +21,22 @@ def default end end + def pill + render TabsContainerComponent.new(pill: true) do |c| + sections = ['section 1', 'section 2', 'section 3', 'section 4'] + + sections.each do |section_title| + c.item(title: section_title, + path: "#{section_title}path", + selected: section_title.eql?('section 2'), + page_name: "#{section_title}path") + + c.item_content do + section_title + end + end + + end + end + end \ No newline at end of file From 15432cfea55e651856b6654405e74d5fe34527f1 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 07:20:44 +0200 Subject: [PATCH 353/533] migrate concept show to use the pill version of the tab component --- .../components/pill_tabs_container.scss | 2 +- app/views/concepts/_show.html.haml | 70 +++++++++---------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/app/assets/stylesheets/components/pill_tabs_container.scss b/app/assets/stylesheets/components/pill_tabs_container.scss index db13f79b3..05d144cff 100644 --- a/app/assets/stylesheets/components/pill_tabs_container.scss +++ b/app/assets/stylesheets/components/pill_tabs_container.scss @@ -8,7 +8,7 @@ .pill-tabs-container .nav-item { display: block; - padding: 0.5rem 1rem; + padding: 0.2rem 1rem; } .pill-tabs-container .nav-item.active { diff --git a/app/views/concepts/_show.html.haml b/app/views/concepts/_show.html.haml index af69f8f2e..311b873b6 100644 --- a/app/views/concepts/_show.html.haml +++ b/app/views/concepts/_show.html.haml @@ -3,58 +3,54 @@ %div{:style => "padding: 100px 0; font-size: larger; font-weight: bold; text-align: center;"} Use the "Jump To" to find a class and display details, visualization, notes, and mappings - else + = render TabsContainerComponent.new(pill: true) do |c| + + - c.item(title: 'Details', path: '#details', selected: true) - %ul.nav.tabs - %li#details_top.nav-item - %a.nav-link.active.py-1{:href => "#details" , data:{toggle: 'tab', target: '#details_content'}} Details - unless skos? - %li#instances_top.nav-item - %a.nav-link.py-1{:href => "#instances" , data:{toggle: 'tab', target: '#instances_content'}} - Instances - ( - %span#instances_count - ) - %li#visualization_top.nav-item - %a.nav-link.py-1{:href => "#visualization", data:{toggle: 'tab', target: '#visualization_content'}} Visualization - %li#notes_top.nav-item - %a.nav-link.py-1{:href => "#notes", data:{toggle: 'tab', target: '#notes_content'}} - Notes - %span#note_count_wrapper - ( - %span#note_count= @notes.length - ) - %li#mappings_top.nav-item - %a.nav-link.py-1{:href => "#mappings", data:{toggle: 'tab', target: '#mappings_content'}} - #{concept_label_to_show(submission: @submission)} Mappings ( - %span#mapping_count= 'loading' + - c.item(id: 'instances', path: '#instances') do + Instances + ( + %span#instances_count ) - %a.concepts-json{:href => "#{@ontology.id}/classes/#{escape(@concept.id)}?display=all&apikey=#{get_apikey}", target: '_blank'} - = inline_svg_tag "json.svg" + - c.item(title: 'Visualization', path: '#visualization') + + - c.item(id: 'notes', path: '#notes') do + Notes + %span#note_count_wrapper + ( + %span#note_count= @notes.length + ) + + - c.item(id: 'mappings', path: '#mappings') do + #{concept_label_to_show(submission: @submission)} Mappings ( + %span#mapping_count= 'loading' + ) - if @enable_ontolobridge - %li#request_term_top.nav-item - %a.nav-link.py-1{:href => "#request_term", data:{toggle: 'tab', target: '#request_term'}} - New Term Requests - - if $PURL_ENABLED - = link_to("#classPermalinkModal", class: "class-permalink nav-link", title: "Get a permanent link to this class", aria: {label: "Get a permanent link to this class"}, data: {toggle: "modal", current_purl: "#{@current_purl}"}) do - %i{class: "fas fa-link", aria: {hidden: "true"}} - #contents.tab-content - #details_content.tab-pane.active.show + - c.item(title: ' New Term Requests', path: '#request_term') + + - c.item_content do = render :partial =>'/concepts/details' + - unless skos? - #instances_content.tab-pane + - c.item_content do = render :partial =>'instances/instances' , locals: {id: "class-instances-data-table"} - #visualization_content.tab-pane + - c.item_content do = render :partial =>'/concepts/biomixer' - #notes_content.tab-pane + + - c.item_content do = render :partial =>'/notes/list' - #mappings_content.tab-pane + + - c.item_content do = render TurboFrameComponent.new(id:'concept_mappings', src:"/ajax/mappings/get_concept_table?ontologyid=#{@ontology.acronym}&conceptid=#{CGI.escape(@concept.id)}") + - if @enable_ontolobridge - #request_term_content.tab-pane + - c.item_content do = render :partial =>'/concepts/request_term' + :javascript jQuery(document).ready(function(){ From 2e7232a8ff09cf3b2647737def374f14710fef2f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 07:46:07 +0200 Subject: [PATCH 354/533] add circle progress bar component (style, JS, code and preview) --- .../components/circle_progress_bar.scss | 26 +++++++++++++ app/assets/stylesheets/components/index.scss | 1 + .../circle_progress_bar_component.rb | 14 +++++++ .../circle_progress_bar_component.html.haml | 7 ++++ ...ircle_progress_bar_component_controller.js | 37 +++++++++++++++++++ app/javascript/component_controllers/index.js | 2 + .../circle_progress_bar_component_preview.rb | 10 +++++ 7 files changed, 97 insertions(+) create mode 100644 app/assets/stylesheets/components/circle_progress_bar.scss create mode 100644 app/components/circle_progress_bar_component.rb create mode 100644 app/components/circle_progress_bar_component/circle_progress_bar_component.html.haml create mode 100644 app/components/circle_progress_bar_component/circle_progress_bar_component_controller.js create mode 100644 test/components/previews/display/circle_progress_bar_component_preview.rb diff --git a/app/assets/stylesheets/components/circle_progress_bar.scss b/app/assets/stylesheets/components/circle_progress_bar.scss new file mode 100644 index 000000000..7c5095a64 --- /dev/null +++ b/app/assets/stylesheets/components/circle_progress_bar.scss @@ -0,0 +1,26 @@ +:root { + --circle-progress-bar-width: 50px; + --circle-progress-bar-height: 50px; +} + +.circular-progress { + width: var(--circle-progress-bar-width); + height: var(--circle-progress-bar-height); + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + position: relative; +} +.inner-circle { + position: absolute; + width: 85%; + height: 85%; + border-radius: 50%; +} + +.percentage { + position: relative; + color: rgba(0, 0, 0, 0.8); + margin-bottom: 0; +} \ No newline at end of file diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 8c01c27e2..3bdbfd44a 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -7,6 +7,7 @@ @import 'dropdown'; @import 'field_container'; @import 'nested_form'; +@import 'circle_progress_bar'; @import 'input_field'; @import 'file_input_loader'; @import 'text_area_field'; diff --git a/app/components/circle_progress_bar_component.rb b/app/components/circle_progress_bar_component.rb new file mode 100644 index 000000000..e3e746b60 --- /dev/null +++ b/app/components/circle_progress_bar_component.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class CircleProgressBarComponent < ViewComponent::Base + + def initialize(count: , max: ) + super + @count = count + @max = max + end + + def value + ((@count.to_f / @max) * 100).to_i + end +end diff --git a/app/components/circle_progress_bar_component/circle_progress_bar_component.html.haml b/app/components/circle_progress_bar_component/circle_progress_bar_component.html.haml new file mode 100644 index 000000000..a319fba65 --- /dev/null +++ b/app/components/circle_progress_bar_component/circle_progress_bar_component.html.haml @@ -0,0 +1,7 @@ +.circular-progress{ data: { controller: 'circle-progress-bar', 'circle-progress-bar': { + 'circle-color-value': 'white', 'percentage-value': value, + 'progress-color-value': "var(--primary-color)", 'bg-color-value': 'white' +}}} + .inner-circle{'data-circle-progress-bar-target': 'innerCircle'} + %p.percentage{'data-circle-progress-bar-target': 'percentage'} + 0% diff --git a/app/components/circle_progress_bar_component/circle_progress_bar_component_controller.js b/app/components/circle_progress_bar_component/circle_progress_bar_component_controller.js new file mode 100644 index 000000000..932b1d82a --- /dev/null +++ b/app/components/circle_progress_bar_component/circle_progress_bar_component_controller.js @@ -0,0 +1,37 @@ +import { Controller } from "@hotwired/stimulus" + +// Connects to data-controller="circle-progress-bar" +export default class extends Controller { + static targets = ['percentage', 'innerCircle'] + static values = { + percentage: Number, + progressColor: String, + bgColor: String, + circleColor: String + } + + connect() { + const progressBar = this.element; + const progressValue = this.percentageTarget; + const innerCircle = this.innerCircleTarget; + let startValue = 0, + endValue = this.percentageValue, + speed = 30, + progressColor = this.progressColorValue; + + const progress = setInterval(() => { + startValue++; + progressValue.textContent = `${startValue}%`; + progressValue.style.color = `${progressColor}`; + + innerCircle.style.backgroundColor = `${this.circleColorValue}`; + + progressBar.style.background = `conic-gradient(${progressColor} ${ + startValue * 3.6 + }deg,${this.bgColorValue} 0deg)`; + if (startValue === endValue) { + clearInterval(progress); + } + }, speed); + } +} diff --git a/app/javascript/component_controllers/index.js b/app/javascript/component_controllers/index.js index b9968423b..484130fa8 100644 --- a/app/javascript/component_controllers/index.js +++ b/app/javascript/component_controllers/index.js @@ -13,6 +13,8 @@ import Ontology_subscribe_button_component_controller import Search_input_component_controller from "../../components/search_input_component/search_input_component_controller"; +import CircleProgressBarComponentController from "../../components/circle_progress_bar_component/circle_progress_bar_component_controller" +application.register("circle-progress-bar", CircleProgressBarComponentController) application.register("turbo-modal", TurboModalController) application.register("file-input", FileInputLoaderController) application.register("select-input", Select_input_component_controller) diff --git a/test/components/previews/display/circle_progress_bar_component_preview.rb b/test/components/previews/display/circle_progress_bar_component_preview.rb new file mode 100644 index 000000000..f22677437 --- /dev/null +++ b/test/components/previews/display/circle_progress_bar_component_preview.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class Display::CircleProgressBarComponentPreview < ViewComponent::Preview + + # @param count number + # @param max number + def default(count: 63, max: 100) + render CircleProgressBarComponent.new(count: count, max: max) + end +end From 5fb90b6e9925c49705166da8fe0f280754938c2d Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 09:48:49 +0200 Subject: [PATCH 355/533] add option to the tabs container to have pinned right action buttons --- .../components/pill_tabs_container.scss | 1 + .../components/tabs_container.scss | 9 ++------ app/components/tab_item_component.rb | 3 --- app/components/tabs_container_component.rb | 13 +++++++++-- .../tabs_container_component.html.haml | 5 ++++- .../tabs_container_component_preview.rb | 22 +++++++++++++++++-- 6 files changed, 38 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/components/pill_tabs_container.scss b/app/assets/stylesheets/components/pill_tabs_container.scss index 05d144cff..e03697544 100644 --- a/app/assets/stylesheets/components/pill_tabs_container.scss +++ b/app/assets/stylesheets/components/pill_tabs_container.scss @@ -1,5 +1,6 @@ .pill-tabs-container { display: flex; + justify-content: space-between; } .pill-tabs-container .tab-items{ diff --git a/app/assets/stylesheets/components/tabs_container.scss b/app/assets/stylesheets/components/tabs_container.scss index cfa52689d..0c02285b3 100644 --- a/app/assets/stylesheets/components/tabs_container.scss +++ b/app/assets/stylesheets/components/tabs_container.scss @@ -1,11 +1,10 @@ .tabs-container { border-bottom: 1px solid #DFDFDF; display: flex; - + justify-content: space-between; & > div { display: flex; justify-content: space-between; - padding: 0 50px; } } @@ -19,11 +18,7 @@ display: flex; margin: 0; position: relative; - - .tab-pinned-right { - position: absolute; - right: 40px; - } + padding: 0 50px; } .tabs-container .tab-items div { diff --git a/app/components/tab_item_component.rb b/app/components/tab_item_component.rb index 99dc732cd..b6612bb5b 100644 --- a/app/components/tab_item_component.rb +++ b/app/components/tab_item_component.rb @@ -25,9 +25,6 @@ def target_id "#{item_id}_content" end - def target - "##{target_id}" - end def id @title || @id diff --git a/app/components/tabs_container_component.rb b/app/components/tabs_container_component.rb index b65c9467e..8265c1ab0 100644 --- a/app/components/tabs_container_component.rb +++ b/app/components/tabs_container_component.rb @@ -6,20 +6,29 @@ class TabsContainerComponent < ViewComponent::Base renders_many :item_contents renders_one :pinned_right - def initialize(url_parameter: nil, pill: false) + def initialize(id: '', url_parameter: nil, pill: false) super @url_parameter = url_parameter @pill = pill + @id = id end def container_class @pill ? 'pill-tabs-container' : 'tabs-container' end + def item_target(item) + "##{@id}#{item.target_id}" + end + + def item_content_id(item) + @id + item.target_id + end + def tabs_container_data(item) { toggle: 'tab', - target: item.target, + target: item_target(item), 'tab-id': item.id, 'tab-title': item.title, 'url-parameter': @url_parameter, diff --git a/app/components/tabs_container_component/tabs_container_component.html.haml b/app/components/tabs_container_component/tabs_container_component.html.haml index e476be38f..dfc2f2d39 100644 --- a/app/components/tabs_container_component/tabs_container_component.html.haml +++ b/app/components/tabs_container_component/tabs_container_component.html.haml @@ -5,9 +5,12 @@ = item - unless @pill %hr + - if pinned_right? + %div.d-flex + = pinned_right .tab-content - item_contents.each_with_index do |item_content, index| - %div.tab-pane{id: items[index].target_id, class: items[index].active_class} + %div.tab-pane{id: item_content_id(items[index]), class: items[index].active_class} = item_content diff --git a/test/components/previews/layout/tabs_container_component_preview.rb b/test/components/previews/layout/tabs_container_component_preview.rb index 8c04ffdd4..96f7bcfbb 100644 --- a/test/components/previews/layout/tabs_container_component_preview.rb +++ b/test/components/previews/layout/tabs_container_component_preview.rb @@ -1,7 +1,5 @@ class Layout::TabsContainerComponentPreview < ViewComponent::Preview - include ActionView::Helpers::TagHelper - include ActionView::Context def default render TabsContainerComponent.new do |c| @@ -39,4 +37,24 @@ def pill end end + def with_action_links + render TabsContainerComponent.new do |c| + sections = ['section 1', 'section 2', 'section 3', 'section 4'] + + sections.each do |section_title| + c.item(title: section_title, + path: "#{section_title}path", + selected: section_title.eql?('section 2'), + page_name: "#{section_title}path") + + c.item_content do + section_title + end + end + c.pinned_right do + RoundedButtonComponent.new(icon: 'check.svg').render_in(c) + ''.html_safe + RoundedButtonComponent.new.render_in(c) + end + end + end + end \ No newline at end of file From 72cf4009ec0fa0122113f615100d45aeb23337b2 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 09:50:25 +0200 Subject: [PATCH 356/533] add the concept show tabs go to json and purl buttons pinned to in right --- app/assets/stylesheets/ontologies.scss | 4 --- app/components/rounded_button_component.rb | 29 ++++++++++--------- .../rounded_button_component.html.haml | 2 +- app/views/concepts/_show.html.haml | 8 +++++ 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/assets/stylesheets/ontologies.scss b/app/assets/stylesheets/ontologies.scss index 101797fef..d4b694adb 100644 --- a/app/assets/stylesheets/ontologies.scss +++ b/app/assets/stylesheets/ontologies.scss @@ -271,7 +271,3 @@ $ont-show-bg-color: #e9ecef; flex-direction: row; } - -.ontologies-tabs-container .tabs-container { - justify-content: flex-start; -} diff --git a/app/components/rounded_button_component.rb b/app/components/rounded_button_component.rb index 65a11dd0a..47983fce1 100644 --- a/app/components/rounded_button_component.rb +++ b/app/components/rounded_button_component.rb @@ -1,19 +1,20 @@ class RoundedButtonComponent < ViewComponent::Base - def initialize(icon: "json.svg", link: "#", size: "small") - @icon = icon - @link = link - @size = size - end + def initialize(icon: "json.svg", link: "#", size: "small", target: '') + @icon = icon + @link = link + @size = size + @target = target + end - def size - case @size - when "small" - ["32px", "1", "16px"] - when "medium" - ["64px", "2", "32px"] - when "big" - ["100px", "2.5", "50px"] - end + def size + case @size + when "small" + ["32px", "1", "16px"] + when "medium" + ["64px", "2", "32px"] + when "big" + ["100px", "2.5", "50px"] end + end end \ No newline at end of file diff --git a/app/components/rounded_button_component/rounded_button_component.html.haml b/app/components/rounded_button_component/rounded_button_component.html.haml index 7eb803aff..4baa20df9 100644 --- a/app/components/rounded_button_component/rounded_button_component.html.haml +++ b/app/components/rounded_button_component/rounded_button_component.html.haml @@ -1,2 +1,2 @@ -%a.rounded-button{:href => @link, style: "height:"+size[0]+"; width:"+size[0]+"; border-radius:"+size[2]+";"} +%a.rounded-button{:href => @link, style: "height:"+size[0]+"; width:"+size[0]+"; border-radius:"+size[2]+";", target:@target} = inline_svg_tag @icon, style: "transform: scale("+size[1]+");" diff --git a/app/views/concepts/_show.html.haml b/app/views/concepts/_show.html.haml index 311b873b6..ff1d28fd1 100644 --- a/app/views/concepts/_show.html.haml +++ b/app/views/concepts/_show.html.haml @@ -5,6 +5,14 @@ - else = render TabsContainerComponent.new(pill: true) do |c| + - c.pinned_right do + - if $PURL_ENABLED + %div.mx-1 + = link_to("#classPermalinkModal", class: "class-permalink nav-link", title: "Get a permanent link to this class", aria: {label: "Get a permanent link to this class"}, data: {toggle: "modal", current_purl: "#{@current_purl}"}) do + %i{class: "fas fa-link", aria: {hidden: "true"}} + %div + = render RoundedButtonComponent.new(link: "#{@ontology.id}/classes/#{escape(@concept.id)}?display=all&apikey=#{get_apikey}", target:'_blank') + - c.item(title: 'Details', path: '#details', selected: true) - unless skos? From 5cbff05340f2739668e9d5e6fafe5fbd1703616d Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 09:52:52 +0200 Subject: [PATCH 357/533] add to the ontology viewer tabs a language selector pinned to the right --- .../tabs_container_component_controller.js | 52 ++++++++++--------- app/helpers/ontologies_helper.rb | 2 +- .../ontology_viewer_tabs_controller.js | 13 ++--- app/views/layouts/_ontology_viewer.html.haml | 11 ++-- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/app/components/tabs_container_component/tabs_container_component_controller.js b/app/components/tabs_container_component/tabs_container_component_controller.js index a1d99677e..9991b699f 100644 --- a/app/components/tabs_container_component/tabs_container_component_controller.js +++ b/app/components/tabs_container_component/tabs_container_component_controller.js @@ -1,39 +1,43 @@ -import { Controller } from "@hotwired/stimulus"; +import {Controller} from "@hotwired/stimulus"; import {HistoryService} from "../../javascript/mixins/useHistory"; export default class extends Controller { - connect() { - this.event = null - } + connect() { + this.event = null + } - selectTab(event) { - this.event = event - if(this.#parameter()){ - this.#updateURL() + selectTab(event) { + this.event = event + if (this.#parameter()) { + this.#updateURL() + } + this.element.dispatchEvent(new CustomEvent("tab-selected", { + bubbles: true, + detail: {data: {selectedTab: this.#pageId()}} + })) } - } - #pageId(){ - return this.event.currentTarget.getAttribute("data-tab-id") - } + #pageId() { + return this.event.currentTarget.getAttribute("data-tab-id") + } - #title(){ - return this.event.currentTarget.getAttribute("data-tab-title") - } + #title() { + return this.event.currentTarget.getAttribute("data-tab-title") + } - #parameter(){ - return this.event.currentTarget.getAttribute("data-url-parameter") - } + #parameter() { + return this.event.currentTarget.getAttribute("data-url-parameter") + } - #url(){ - return `?${this.#parameter()}=${this.#pageId()}` - } + #url() { + return `?${this.#parameter()}=${this.#pageId()}` + } - #updateURL(){ - (new HistoryService()).pushState({[this.#parameter()]: this.#pageId()}, this.#title(), this.#url()); - } + #updateURL() { + (new HistoryService()).pushState({[this.#parameter()]: this.#pageId()}, this.#title(), this.#url()); + } } diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index b2706d9eb..dfbcf251a 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -457,7 +457,7 @@ def language_selector_tag(name) end end else - select_tag name, languages_options, class: 'custom-select', disabled: !ontology_data_section?, style: "visibility: #{ontology_data_section? ? 'visible' : 'hidden'}; margin-bottom: -10px;", data: {'ontology-viewer-tabs-target': 'languageSelector'} + select_tag name, languages_options, class: '', disabled: !ontology_data_section?, style: "visibility: #{ontology_data_section? ? 'visible' : 'hidden'}; border: none; outline: none;", data: {'ontology-viewer-tabs-target': 'languageSelector'} end end diff --git a/app/javascript/controllers/ontology_viewer_tabs_controller.js b/app/javascript/controllers/ontology_viewer_tabs_controller.js index f8cb2a310..6ddf9b71b 100644 --- a/app/javascript/controllers/ontology_viewer_tabs_controller.js +++ b/app/javascript/controllers/ontology_viewer_tabs_controller.js @@ -26,16 +26,9 @@ export default class extends Controller { this.changeEvent.removeEventListener() } - selectTab(event) { - this.#updateURL(event) - } - - #updateURL(event){ - const page = event.target.getAttribute("data-bp-ont-page"); - const page_name = event.target.getAttribute("data-bp-ont-page-name"); - - (new HistoryService()).pushState({p: page}, page_name + " | " + jQuery(document).data().bp.ont_viewer.org_site, "?p=" + page); - + updateLanguageSelector(event) { + console.log('language selector update') + let page = event.detail.data.selectedTab this.#disableLanguageSelector(page) } diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index 8a0d27104..930f5f4eb 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -45,18 +45,21 @@ %div.col = render partial: 'layouts/ontology_viewer/header' - %div.row.pb-4.p-2.bg-white{data: {controller: '', 'ontology-viewer-tabs-language-sections-value': ontology_data_sections }} + %div.row.pb-4.p-2.bg-white{data: {controller: 'ontology-viewer-tabs', 'ontology-viewer-tabs-language-sections-value': ontology_data_sections }} %div.col - sections = sections_to_show - %div.ontologies-tabs-container - = render TabsContainerComponent.new(url_parameter: 'p') do |t| + %div.ontologies-tabs-container{data:{action: 'tab-selected->ontology-viewer-tabs#updateLanguageSelector'}} + = render TabsContainerComponent.new(id: 'ontology_viewer', url_parameter: 'p') do |t| - sections.each do |section_title| - t.item(title: section_title, path: ontology_path(@ontology.acronym, p: section_title), selected: selected_section?(section_title), page_name: ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section_title)) + - t.pinned_right do + = language_selector_tag(:language_selector) - t.item_content do - %div.p-1 + %div.p-1{data: section_data(section_title)} + = language_selector_hidden_tag(section_title) if ontology_data_section?(section_title) = lazy_load_section(section_title) { yield } From c5999772fdb01f5948ad6a0ccedcdff515c5777a Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 24 Jul 2023 20:27:06 +0000 Subject: [PATCH 358/533] change internal link icon in link text component --- app/assets/images/icons/internal-link.svg | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/assets/images/icons/internal-link.svg b/app/assets/images/icons/internal-link.svg index 0345e25ee..316ccdb76 100644 --- a/app/assets/images/icons/internal-link.svg +++ b/app/assets/images/icons/internal-link.svg @@ -1,5 +1,3 @@ - \ No newline at end of file + + + From 06bce492b0a803c03685ad47f66ef1ef5b588103 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 27 Jul 2023 12:21:05 +0000 Subject: [PATCH 359/533] fix button component in lookbook --- .../previews/buttons/primary_button_component_preview.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/components/previews/buttons/primary_button_component_preview.rb b/test/components/previews/buttons/primary_button_component_preview.rb index 1884c8978..1ce890277 100644 --- a/test/components/previews/buttons/primary_button_component_preview.rb +++ b/test/components/previews/buttons/primary_button_component_preview.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true class Buttons::PrimaryButtonComponentPreview < ViewComponent::Preview + layout 'component_preview_not_centred' def default - - - def default() render Buttons::PrimaryButtonComponent.new(value: "Login", name: "login", type: "regular") end From fe1b93440000068b9500c870e66c714c7d5476bc Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 27 Jul 2023 12:37:34 +0000 Subject: [PATCH 360/533] add secondary button to lookbook --- app/assets/stylesheets/components/index.scss | 1 + .../components/secondary_button.scss | 100 ++++++++++++++++++ .../buttons/secondary_button_component.rb | 10 ++ .../secondary_button_component.html.haml | 23 ++++ .../secondary_button_component_preview.rb | 8 ++ 5 files changed, 142 insertions(+) create mode 100644 app/assets/stylesheets/components/secondary_button.scss create mode 100644 app/components/buttons/secondary_button_component.rb create mode 100644 app/components/buttons/secondary_button_component/secondary_button_component.html.haml create mode 100644 test/components/previews/buttons/secondary_button_component_preview.rb diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 64763a740..09e250b96 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -11,4 +11,5 @@ @import 'file_input_loader'; @import 'text_area_field'; @import 'primary_button'; +@import 'secondary_button'; diff --git a/app/assets/stylesheets/components/secondary_button.scss b/app/assets/stylesheets/components/secondary_button.scss new file mode 100644 index 000000000..86a35cc6b --- /dev/null +++ b/app/assets/stylesheets/components/secondary_button.scss @@ -0,0 +1,100 @@ +.secondary-button { + width: 100%; + display: flex; + justify-content: center; + align-items: center; + font-size: 16px; + color: var(--primary-color); + height: 60px; + border: 1px solid var(--primary-color); + border-radius: 9px; + transition: background-color ease 0.3s; +} + +.secondary-button:hover { + background-color: var(--primary-color); + cursor: pointer; + color: white; +} + + +.animation-container { + width: 100%; + height: 60px; + font-size: 16px; + background-color: var(--primary-color); + border: none; + border-radius: 9px; + justify-content: center; + align-items: center; + display: none; + +} + +.lds-ellipsis-secondary { + display: inline-block; + position: relative; + margin-top: 50px; + width: 80px; + height: 80px; + transform: scale(0.7); +} + +.lds-ellipsis-secondary div { + position: absolute; + width: 13px; + height: 13px; + border-radius: 50%; + background: white; + animation-timing-function: cubic-bezier(0, 1, 1, 0); +} + +.lds-ellipsis-secondary div:nth-child(1) { + left: 8px; + animation: lds-ellipsis-secondary1 0.6s infinite; +} + +.lds-ellipsis-secondary div:nth-child(2) { + left: 8px; + animation: lds-ellipsis-secondary2 0.6s infinite; +} + +.lds-ellipsis-secondary div:nth-child(3) { + left: 32px; + animation: lds-ellipsis-secondary2 0.6s infinite; +} + +.lds-ellipsis-secondary div:nth-child(4) { + left: 56px; + animation: lds-ellipsis-secondary3 0.6s infinite; +} + +@keyframes lds-ellipsis-secondary1 { + 0% { + transform: scale(0); + } + + 100% { + transform: scale(1); + } +} + +@keyframes lds-ellipsis-secondary3 { + 0% { + transform: scale(1); + } + + 100% { + transform: scale(0); + } +} + +@keyframes lds-ellipsis-secondary2 { + 0% { + transform: translate(0, 0); + } + + 100% { + transform: translate(24px, 0); + } +} \ No newline at end of file diff --git a/app/components/buttons/secondary_button_component.rb b/app/components/buttons/secondary_button_component.rb new file mode 100644 index 000000000..91f527b8a --- /dev/null +++ b/app/components/buttons/secondary_button_component.rb @@ -0,0 +1,10 @@ +class Buttons::SecondaryButtonComponent < ViewComponent::Base + def initialize(name: "", value: , type: "regular", style: "regular", color: "primary", onclick: "") + @name = name + @value = value + @type = type + @style = style + @color = color + @onclick = onclick + end +end \ No newline at end of file diff --git a/app/components/buttons/secondary_button_component/secondary_button_component.html.haml b/app/components/buttons/secondary_button_component/secondary_button_component.html.haml new file mode 100644 index 000000000..fe4de70c9 --- /dev/null +++ b/app/components/buttons/secondary_button_component/secondary_button_component.html.haml @@ -0,0 +1,23 @@ +- if @type == "submit" + %button-container{onclick: "displaySecondaryAnimation()"} + %input.secondary-button{:name => @name, :type => "submit", :value => @value, id: "secondary-button", oncklick: @onclick}/ +- else + %button-container{onclick: "displaySecondaryAnimation()"} + .secondary-button{:name => @name, id: "secondary-button", oncklick: @onclick} + = @value + +.animation-container#secondary-loading-animation + .lds-ellipsis-secondary + %div + %div + %div + %div + +:javascript + const button = document.getElementById("secondary-button") + const loading = document.getElementById("secondary-loading-animation") + function displaySecondaryAnimation(){ + console.log("working") + button.style.display = 'none'; + loading.style.display = 'flex'; + } \ No newline at end of file diff --git a/test/components/previews/buttons/secondary_button_component_preview.rb b/test/components/previews/buttons/secondary_button_component_preview.rb new file mode 100644 index 000000000..5fbad6e66 --- /dev/null +++ b/test/components/previews/buttons/secondary_button_component_preview.rb @@ -0,0 +1,8 @@ +class Buttons::SecondaryButtonComponentPreview < ViewComponent::Preview + layout 'component_preview_not_centred' + def default + def default() + render Buttons::SecondaryButtonComponent.new(value: "Login", name: "login", type: "regular") + end + end +end \ No newline at end of file From 6f52c9f4c9b55a764c60fe5b7217ebfe0fb12021 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 22:47:17 +0200 Subject: [PATCH 361/533] update search input component to have form-control style by default --- app/assets/stylesheets/components/search_input.scss | 4 ++++ .../search_input_component/search_input_component.html.haml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/components/search_input.scss b/app/assets/stylesheets/components/search_input.scss index 325969cfd..8f2d88ef1 100644 --- a/app/assets/stylesheets/components/search_input.scss +++ b/app/assets/stylesheets/components/search_input.scss @@ -39,4 +39,8 @@ } #seached-ontologies{ margin-bottom: 0; +} + +.search-inputs input { + @extend .form-control !optional; } \ No newline at end of file diff --git a/app/components/search_input_component/search_input_component.html.haml b/app/components/search_input_component/search_input_component.html.haml index c5da8112a..db7a61881 100644 --- a/app/components/search_input_component/search_input_component.html.haml +++ b/app/components/search_input_component/search_input_component.html.haml @@ -1,4 +1,4 @@ -%div{'data-controller': 'search-input', +%div.search-inputs{'data-controller': 'search-input', 'data-search-input-ajax-url-value': @ajax_url, 'data-search-input-item-link-base-value': @item_base_url, 'data-search-input-id-key-value': @id_key, From 16e039b8db9da30a9a9e4013db00202bd4b1d433 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 02:21:44 +0200 Subject: [PATCH 362/533] change agent search input to use it's Id instead of name to find it --- .../agent_search_input_component.html.haml | 2 +- app/controllers/agents_controller.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/components/agent_search_input_component/agent_search_input_component.html.haml b/app/components/agent_search_input_component/agent_search_input_component.html.haml index 08345d3a1..04ff9fbd4 100644 --- a/app/components/agent_search_input_component/agent_search_input_component.html.haml +++ b/app/components/agent_search_input_component/agent_search_input_component.html.haml @@ -1,5 +1,5 @@ = render SearchInputComponent.new(name:'agent' + @id, ajax_url: "/ajax/agents?agent_type=#{@agent_type}&name=", - item_base_url:"/agents/#{@id}?parent_id=#{@parent_id}&edit_on_modal=#{@edit_on_modal}&name_prefix=#{@name_prefix}&name=", id_key: 'name', + item_base_url:"/agents/#{@id}?parent_id=#{@parent_id}&edit_on_modal=#{@edit_on_modal}&name_prefix=#{@name_prefix}&agent_id=", id_key: 'id', use_cache: false, actions_links: {create_new_agent: {link: "/agents/new?name=&id=#{@id}&parent_id=#{@parent_id}&new_agent=false&type=#{@agent_type}&show_affiliations=false&edit_on_modal=#{@edit_on_modal}&name_prefix=#{@name_prefix}[#{@id}]", target:'_self'}}) do |s| - s.template do diff --git a/app/controllers/agents_controller.rb b/app/controllers/agents_controller.rb index 21edf743a..9029a989f 100644 --- a/app/controllers/agents_controller.rb +++ b/app/controllers/agents_controller.rb @@ -7,7 +7,9 @@ def index end def show - @agent = LinkedData::Client::Models::Agent.all(name: params[:name]).find { |x| x.name.eql?(params[:name]) } + @agent = LinkedData::Client::Models::Agent.find(params[:agent_id]) + not_found("Agent with id #{@agent.id}") if @agent.nil? + @agent_id = params[:id] || agent_id(@agent) @name_prefix = params[:name_prefix] ? "#{params[:name_prefix]}[#{params[:id]}]" : '' @edit_on_modal = params[:edit_on_modal]&.eql?('true') From f81885890f62b70791691c2548a9d513a2e041bb Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 02:19:31 +0200 Subject: [PATCH 363/533] add Jquery data table to the admin agents table --- app/views/agents/_table_list.html.haml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/agents/_table_list.html.haml b/app/views/agents/_table_list.html.haml index 62dbc4626..6fe4555cd 100644 --- a/app/views/agents/_table_list.html.haml +++ b/app/views/agents/_table_list.html.haml @@ -11,4 +11,8 @@ - agents.each do |agent| = render partial: 'agents/show_line' , locals: {agent: agent} %tr.empty-state - %td.text-center{:colspan => "6"} There are currently no agents. \ No newline at end of file + %td.text-center{:colspan => "6"} There are currently no agents. +:javascript + $.fn.dataTable.ext.errMode = 'none'; + + $("#adminAgents").dataTable() \ No newline at end of file From 9c6af226ad3173d516124b664f4a2cbbac2f9823 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 02:21:44 +0200 Subject: [PATCH 364/533] change agent search input to use it's Id instead of name to find it From fd51d3861cb5d005fe67a32bbd0a7203b7d89a80 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 11:08:14 +0200 Subject: [PATCH 365/533] update nested form component to have an empty state to send to the back --- .../nested_agent_search_input_component.html.haml | 8 ++++++-- app/components/nested_form_inputs_component.rb | 1 + .../nested_form_inputs_component.html.haml | 2 ++ app/helpers/submissions_helper.rb | 11 ++++++++--- app/views/agents/_form.html.haml | 3 ++- app/views/submissions/_form_content.html.haml | 2 ++ 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/components/nested_agent_search_input_component/nested_agent_search_input_component.html.haml b/app/components/nested_agent_search_input_component/nested_agent_search_input_component.html.haml index 7cccaef4d..fb057218d 100644 --- a/app/components/nested_agent_search_input_component/nested_agent_search_input_component.html.haml +++ b/app/components/nested_agent_search_input_component/nested_agent_search_input_component.html.haml @@ -3,6 +3,10 @@ = render TurboFrameComponent.new(id: agent_id_frame_id('NEW_RECORD', @parent_id)) do = render AgentSearchInputComponent.new(id: 'NEW_RECORD', agent_type: @agent_type, name_prefix: @name_prefix, parent_id: @parent_id, edit_on_modal: @edit_on_modal) + + - c.empty_state do + = hidden_field_tag agent_field_name('', @name_prefix+"[#{Array(@agents).size}]") - Array(@agents).each_with_index do |agent, i| - - c.row do - = render partial: 'agents/agent_show', locals: {agent: agent, name_prefix: @name_prefix+"[#{i}]", edit_on_modal: @edit_on_modal, parent_id: @parent_id} \ No newline at end of file + - if agent + - c.row do + = render partial: 'agents/agent_show', locals: {agent: agent, name_prefix: @name_prefix+"[#{i}]", edit_on_modal: @edit_on_modal, parent_id: @parent_id} diff --git a/app/components/nested_form_inputs_component.rb b/app/components/nested_form_inputs_component.rb index e5cbabada..39a9be53e 100644 --- a/app/components/nested_form_inputs_component.rb +++ b/app/components/nested_form_inputs_component.rb @@ -5,6 +5,7 @@ class NestedFormInputsComponent < ViewComponent::Base renders_one :template renders_one :header renders_many :rows + renders_one :empty_state def initialize(object_name: '') super diff --git a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml index 33dff4ddd..82778a86c 100644 --- a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml +++ b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml @@ -8,6 +8,8 @@ = inline_svg 'icons/delete.svg' %div.titles = header + %div.d-none + = empty_state - rows.each_with_index do |row , index| %div.d-flex.align-items-center.nested-form-wrapper.my-1{'data-new-record': 'true'} %div{style: 'width: 90%'} diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb index a9dc3d8b9..bf2a48bb4 100644 --- a/app/helpers/submissions_helper.rb +++ b/app/helpers/submissions_helper.rb @@ -49,11 +49,11 @@ def metadata_section(id, label, collapsed: true, parent_id: nil, &block) def attribute_container(attr, required: false, &block) if show_attribute?(attr, required) - content_tag(:div) do - capture(&block) - end + content_tag(:div) do + capture(&block) end end + end def inline_save? !@inline_save.nil? && @inline_save @@ -355,6 +355,11 @@ def generate_list_field_input(attr, name, values, field_func) c.template do method(field_func).call("#{name}[NEW_RECORD]", '', :id => attr["attribute"].to_s + "_" + @ontology.acronym, class: "metadataInput form-control my-1") end + + c.empty_state do + hidden_field_tag "#{name}[#{values.size}]" + end + values.each_with_index do |metadata_val, i| c.row do method(field_func).call("#{name}[#{i}]", metadata_val, :id => "submission_#{attr["attribute"].to_s}" + "_" + @ontology.acronym, class: "metadataInput my-1 form-control") diff --git a/app/views/agents/_form.html.haml b/app/views/agents/_form.html.haml index d50f1f9fa..71b9369e5 100644 --- a/app/views/agents/_form.html.haml +++ b/app/views/agents/_form.html.haml @@ -67,7 +67,8 @@ = text_field_tag agent_identifier_name('NEW_RECORD' , :notation, name_prefix), '', class: "form-control" - values = %w[ORCID ROR ISNI GRID] = render SelectInputComponent.new(id: "agent_identifiers_schemaAgency_NEW_RECORD", name: agent_identifier_name('NEW_RECORD', :schemaAgency, name_prefix), values: values, selected: 'ORCID') - + - c.empty_state do + = hidden_field_tag agent_field_name('', name_prefix+"[#{Array(agent.identifiers).size}]") - Array(agent.identifiers).each_with_index do |identifier, i| - c.row do %div.d-flex{id: identifier.id} diff --git a/app/views/submissions/_form_content.html.haml b/app/views/submissions/_form_content.html.haml index 4697663a4..9a39f11c4 100644 --- a/app/views/submissions/_form_content.html.haml +++ b/app/views/submissions/_form_content.html.haml @@ -113,6 +113,8 @@ = render NestedFormInputsComponent.new do |c| - c.template do = render partial: "submissions/submission_contact_form", locals: {contact: nil, index: 'NEW_RECORD'} + - c.empty_state do + = hidden_field_tag object_name+"[contact][#{index.to_s.upcase}][email]" - @submission.contact.each_with_index do |contact, i| - c.row do = render partial: "submissions/submission_contact_form", locals: {contact: contact, index: i} From 757941492fd659a488f32dc2d46e742ba54a010d Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 11:09:40 +0200 Subject: [PATCH 366/533] fix metadata curator not save agent update (bug still in changed_values) --- .../concerns/submission_updater.rb | 23 ++++++++++++++----- app/controllers/submissions_controller.rb | 12 ++++++---- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/app/controllers/concerns/submission_updater.rb b/app/controllers/concerns/submission_updater.rb index b647b5d00..f8f323174 100644 --- a/app/controllers/concerns/submission_updater.rb +++ b/app/controllers/concerns/submission_updater.rb @@ -18,10 +18,15 @@ def update_submission(new_submission_hash) @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(new_submission_hash[:ontology]).first @submission = @ontology.explore.submissions({ display: 'all' }, new_submission_hash[:id]) - @submission.update_from_params(submission_params(new_submission_hash)) + new_values = submission_params(new_submission_hash) + new_values.each do |key, values| + @submission.send("#{key}=", values) + rescue StandardError + next + end update_ontology_summary_only - @submission.update(cache_refresh_all: false) + @submission.update(values: new_values, cache_refresh_all: false) end def add_ontologies_to_object(ontologies,object) @@ -52,8 +57,8 @@ def delete_ontologies_from_object(new_ontologies,old_ontologies,object) private - def update_ontology_summary_only - @ontology.summaryOnly = @submission.isRemote.eql?('3') + def update_ontology_summary_only(is_remote = @submission.isRemote) + @ontology.summaryOnly = is_remote&.eql?('3') @ontology.update end @@ -127,8 +132,14 @@ def submission_params(params) end end - p[:hasCreator] = p[:hasCreator].map(&:values).flatten.uniq if p[:hasCreator] - p[:publisher] = p[:publisher].map(&:values).flatten.uniq if p[:publisher] + @metadata.each do |m| + m_attr = m['attribute'].to_sym + if p[m_attr] && m['enforce'].include?('list') + p[m_attr] = Array(p[m_attr]) unless p[m_attr].is_a?(Array) + p[m_attr] = p[m_attr].map { |x| x.is_a?(Hash) ? x.values.reject(&:empty?) : x.reject(&:empty?) }.flatten.uniq if m['enforce'].include?('Agent') + end + end + p end end diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb index 639eee192..3eba20aba 100644 --- a/app/controllers/submissions_controller.rb +++ b/app/controllers/submissions_controller.rb @@ -63,16 +63,20 @@ def edit def update error_responses = [] _, submission_params = params[:submission].each.first - @required_only = !params['required-only'].nil? - @filters_disabled = true - + error_responses << update_submission(submission_params) if error_responses.compact.any? { |x| x.status != 204 } @errors = error_responses.map { |error_response| response_errors(error_response) } end - if params[:attribute] + if @errors && !params[:attribute] + @required_only = !params['required-only'].nil? + @filters_disabled = true + reset_agent_attributes + render 'edit', status: 422 + elsif params[:attribute] + reset_agent_attributes render_submission_attribute(params[:attribute]) else redirect_to "/ontologies/#{@ontology.acronym}" From 3eae4cd821d1eaece57876a69f9ab6e95db3033e Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 02:24:50 +0200 Subject: [PATCH 367/533] add display agent in the metadata curator --- .../_attribute_inline.html.haml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/ontologies_metadata_curator/_attribute_inline.html.haml b/app/views/ontologies_metadata_curator/_attribute_inline.html.haml index a58abd501..58d6c0244 100644 --- a/app/views/ontologies_metadata_curator/_attribute_inline.html.haml +++ b/app/views/ontologies_metadata_curator/_attribute_inline.html.haml @@ -21,7 +21,13 @@ - elsif attribute == "ontology" = acronym - else - - if submission.instance_values[attribute.to_s].class == String && submission.instance_values[attribute.to_s][0..3] == "http" + - if submission.instance_values[attribute.to_s].is_a?(String) && %w[http https].include?(submission.instance_values[attribute.to_s][0..3]) %a{:href=> ""+ submission.instance_values[attribute.to_s] +""}= submission.instance_values[attribute.to_s] - else - = submission.instance_values[attribute.to_s] \ No newline at end of file + - Array(submission.instance_values[attribute.to_s]).each do |value| + - if value.is_a?(LinkedData::Client::Models::Agent) + %div + = display_agent(value, link: false) + - else + %p + = value \ No newline at end of file From aa7fc3289390b1c827ee243bcee73dfe3ca32ecb Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 02:26:13 +0200 Subject: [PATCH 368/533] handle the display of no array agents in summary page --- app/helpers/ontologies_helper.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 77040e369..7091e58a9 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -178,7 +178,18 @@ def additional_metadata(sub) else # SINGLE METADATA - if !sub.send(metadata).nil? + if agent?(json_metadata, metadata) + next if sub.send(metadata).nil? + + html << content_tag(:tr) do + if label.nil? + concat(content_tag(:td, metadata.gsub(/(?=[A-Z])/, " "))) + else + concat(content_tag(:td, label)) + end + concat(content_tag(:td, raw("
    #{display_agent(sub.send(metadata))}
    "))) + end + elsif !sub.send(metadata).nil? html << content_tag(:tr) do if label.nil? concat(content_tag(:td, metadata.gsub(/(?=[A-Z])/, " "))) From 5ddbca0cfaca1decd1e475d953770d8111328e7c Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 24 Jul 2023 23:36:30 +0200 Subject: [PATCH 369/533] add generate_agent_input helper to the submission helpers --- app/controllers/ontologies_controller.rb | 9 ++++--- app/helpers/submissions_helper.rb | 31 ++++++++++++++++++------ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index 2e2cccdc7..9531998a9 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -22,6 +22,11 @@ class OntologiesController < ApplicationController EXTERNAL_MAPPINGS_GRAPH = "http://data.bioontology.org/metadata/ExternalMappings" INTERPORTAL_MAPPINGS_GRAPH = "http://data.bioontology.org/metadata/InterportalMappings" + $LEXVO_TO_FLAG = { 'http://lexvo.org/id/iso639-3/aar' => 'aa', 'http://lexvo.org/id/iso639-3/abk' => 'ab', + 'http://lexvo.org/id/iso639-3/ave' => 'ae', 'http://lexvo.org/id/iso639-3/afr' => 'af', + 'http://lexvo.org/id/iso639-3/aka' => 'ak', 'http://lexvo.org/id/iso639-3/amh' => 'am', + 'http://lexvo.org/id/iso639-3/arg' => 'an', 'http://lexvo.org/id/iso639-3/ara' => 'ar', 'http://lexvo.org/id/iso639-3/asm' => 'as', 'http://lexvo.org/id/iso639-3/ava' => 'av', 'http://lexvo.org/id/iso639-3/aym' => 'ay', 'http://lexvo.org/id/iso639-3/aze' => 'az', 'http://lexvo.org/id/iso639-3/bak' => 'ba', 'http://lexvo.org/id/iso639-3/bel' => 'be', 'http://lexvo.org/id/iso639-3/bul' => 'bg', 'http://lexvo.org/id/iso639-3/bis' => 'bi', 'http://lexvo.org/id/iso639-3/bam' => 'bm', 'http://lexvo.org/id/iso639-3/ben' => 'bn', 'http://lexvo.org/id/iso639-3/bod' => 'bo', 'http://lexvo.org/id/iso639-3/bre' => 'br', 'http://lexvo.org/id/iso639-3/bos' => 'bs', 'http://lexvo.org/id/iso639-3/cat' => 'ca', 'http://lexvo.org/id/iso639-3/che' => 'ce', 'http://lexvo.org/id/iso639-3/cha' => 'ch', 'http://lexvo.org/id/iso639-3/cos' => 'co', 'http://lexvo.org/id/iso639-3/cre' => 'cr', 'http://lexvo.org/id/iso639-3/ces' => 'cs', 'http://lexvo.org/id/iso639-3/chu' => 'cu', 'http://lexvo.org/id/iso639-3/chv' => 'cv', 'http://lexvo.org/id/iso639-3/cym' => 'cy', 'http://lexvo.org/id/iso639-3/dan' => 'da', 'http://lexvo.org/id/iso639-3/deu' => 'de', 'http://lexvo.org/id/iso639-3/div' => 'dv', 'http://lexvo.org/id/iso639-3/dzo' => 'dz', 'http://lexvo.org/id/iso639-3/ewe' => 'ee', 'http://lexvo.org/id/iso639-3/ell' => 'el', 'http://lexvo.org/id/iso639-3/eng' => 'en', 'http://lexvo.org/id/iso639-3/epo' => 'eo', 'http://lexvo.org/id/iso639-3/spa' => 'es', 'http://lexvo.org/id/iso639-3/est' => 'et', 'http://lexvo.org/id/iso639-3/eus' => 'eu', 'http://lexvo.org/id/iso639-3/fas' => 'fa', 'http://lexvo.org/id/iso639-3/ful' => 'ff', 'http://lexvo.org/id/iso639-3/fin' => 'fi', 'http://lexvo.org/id/iso639-3/fij' => 'fj', 'http://lexvo.org/id/iso639-3/fao' => 'fo', 'http://lexvo.org/id/iso639-3/fra' => 'fr', 'http://lexvo.org/id/iso639-3/fry' => 'fy', 'http://lexvo.org/id/iso639-3/gle' => 'ga', 'http://lexvo.org/id/iso639-3/gla' => 'gd', 'http://lexvo.org/id/iso639-3/glg' => 'gl', 'http://lexvo.org/id/iso639-3/grn' => 'gn', 'http://lexvo.org/id/iso639-3/guj' => 'gu', 'http://lexvo.org/id/iso639-3/glv' => 'gv', 'http://lexvo.org/id/iso639-3/hau' => 'ha', 'http://lexvo.org/id/iso639-3/heb' => 'he', 'http://lexvo.org/id/iso639-3/hin' => 'hi', 'http://lexvo.org/id/iso639-3/hmo' => 'ho', 'http://lexvo.org/id/iso639-3/hrv' => 'hr', 'http://lexvo.org/id/iso639-3/hat' => 'ht', 'http://lexvo.org/id/iso639-3/hun' => 'hu', 'http://lexvo.org/id/iso639-3/hye' => 'hy', 'http://lexvo.org/id/iso639-3/her' => 'hz', 'http://lexvo.org/id/iso639-3/ina' => 'ia', 'http://lexvo.org/id/iso639-3/ind' => 'id', 'http://lexvo.org/id/iso639-3/ile' => 'ie', 'http://lexvo.org/id/iso639-3/ibo' => 'ig', 'http://lexvo.org/id/iso639-3/iii' => 'ii', 'http://lexvo.org/id/iso639-3/ipk' => 'ik', 'http://lexvo.org/id/iso639-3/ido' => 'io', 'http://lexvo.org/id/iso639-3/isl' => 'is', 'http://lexvo.org/id/iso639-3/ita' => 'it', 'http://lexvo.org/id/iso639-3/iku' => 'iu', 'http://lexvo.org/id/iso639-3/jpn' => 'ja', 'http://lexvo.org/id/iso639-3/jav' => 'jv', 'http://lexvo.org/id/iso639-3/kat' => 'ka', 'http://lexvo.org/id/iso639-3/kon' => 'kg', 'http://lexvo.org/id/iso639-3/kik' => 'ki', 'http://lexvo.org/id/iso639-3/kua' => 'kj', 'http://lexvo.org/id/iso639-3/kaz' => 'kk', 'http://lexvo.org/id/iso639-3/kal' => 'kl', 'http://lexvo.org/id/iso639-3/khm' => 'km', 'http://lexvo.org/id/iso639-3/kan' => 'kn', 'http://lexvo.org/id/iso639-3/kor' => 'ko', 'http://lexvo.org/id/iso639-3/kau' => 'kr', 'http://lexvo.org/id/iso639-3/kas' => 'ks', 'http://lexvo.org/id/iso639-3/kur' => 'ku', 'http://lexvo.org/id/iso639-3/kom' => 'kv', 'http://lexvo.org/id/iso639-3/cor' => 'kw', 'http://lexvo.org/id/iso639-3/kir' => 'ky', 'http://lexvo.org/id/iso639-3/lat' => 'la', 'http://lexvo.org/id/iso639-3/ltz' => 'lb', 'http://lexvo.org/id/iso639-3/lug' => 'lg', 'http://lexvo.org/id/iso639-3/lim' => 'li', 'http://lexvo.org/id/iso639-3/lin' => 'ln', 'http://lexvo.org/id/iso639-3/lao' => 'lo', 'http://lexvo.org/id/iso639-3/lit' => 'lt', 'http://lexvo.org/id/iso639-3/lub' => 'lu', 'http://lexvo.org/id/iso639-3/lav' => 'lv', 'http://lexvo.org/id/iso639-3/mlg' => 'mg', 'http://lexvo.org/id/iso639-3/mah' => 'mh', 'http://lexvo.org/id/iso639-3/mri' => 'mi', 'http://lexvo.org/id/iso639-3/mkd' => 'mk', 'http://lexvo.org/id/iso639-3/mal' => 'ml', 'http://lexvo.org/id/iso639-3/mon' => 'mn', 'http://lexvo.org/id/iso639-3/mar' => 'mr', 'http://lexvo.org/id/iso639-3/msa' => 'ms', 'http://lexvo.org/id/iso639-3/mlt' => 'mt', 'http://lexvo.org/id/iso639-3/mya' => 'my', 'http://lexvo.org/id/iso639-3/nau' => 'na', 'http://lexvo.org/id/iso639-3/nob' => 'nb', 'http://lexvo.org/id/iso639-3/nde' => 'nd', 'http://lexvo.org/id/iso639-3/nep' => 'ne', 'http://lexvo.org/id/iso639-3/ndo' => 'ng', 'http://lexvo.org/id/iso639-3/nld' => 'nl', 'http://lexvo.org/id/iso639-3/nno' => 'nn', 'http://lexvo.org/id/iso639-3/nor' => 'no', 'http://lexvo.org/id/iso639-3/nbl' => 'nr', 'http://lexvo.org/id/iso639-3/nav' => 'nv', 'http://lexvo.org/id/iso639-3/nya' => 'ny', 'http://lexvo.org/id/iso639-3/oci' => 'oc', 'http://lexvo.org/id/iso639-3/oji' => 'oj', 'http://lexvo.org/id/iso639-3/orm' => 'om', 'http://lexvo.org/id/iso639-3/ori' => 'or', 'http://lexvo.org/id/iso639-3/oss' => 'os', 'http://lexvo.org/id/iso639-3/pan' => 'pa', 'http://lexvo.org/id/iso639-3/pli' => 'pi', 'http://lexvo.org/id/iso639-3/pol' => 'pl', 'http://lexvo.org/id/iso639-3/pus' => 'ps', 'http://lexvo.org/id/iso639-3/por' => 'pt', 'http://lexvo.org/id/iso639-3/que' => 'qu', 'http://lexvo.org/id/iso639-3/roh' => 'rm', 'http://lexvo.org/id/iso639-3/run' => 'rn', 'http://lexvo.org/id/iso639-3/ron' => 'ro', 'http://lexvo.org/id/iso639-3/rus' => 'ru', 'http://lexvo.org/id/iso639-3/kin' => 'rw', 'http://lexvo.org/id/iso639-3/san' => 'sa', 'http://lexvo.org/id/iso639-3/srd' => 'sc', 'http://lexvo.org/id/iso639-3/snd' => 'sd', 'http://lexvo.org/id/iso639-3/sme' => 'se', 'http://lexvo.org/id/iso639-3/sag' => 'sg', 'http://lexvo.org/id/iso639-3/hbs' => 'sh', 'http://lexvo.org/id/iso639-3/sin' => 'si', 'http://lexvo.org/id/iso639-3/slk' => 'sk', 'http://lexvo.org/id/iso639-3/slv' => 'sl', 'http://lexvo.org/id/iso639-3/smo' => 'sm', 'http://lexvo.org/id/iso639-3/sna' => 'sn', 'http://lexvo.org/id/iso639-3/som' => 'so', 'http://lexvo.org/id/iso639-3/sqi' => 'sq', 'http://lexvo.org/id/iso639-3/srp' => 'sr', 'http://lexvo.org/id/iso639-3/ssw' => 'ss', 'http://lexvo.org/id/iso639-3/sot' => 'st', 'http://lexvo.org/id/iso639-3/sun' => 'su', 'http://lexvo.org/id/iso639-3/swe' => 'sv', 'http://lexvo.org/id/iso639-3/swa' => 'sw', 'http://lexvo.org/id/iso639-3/tam' => 'ta', 'http://lexvo.org/id/iso639-3/tel' => 'te', 'http://lexvo.org/id/iso639-3/tgk' => 'tg', 'http://lexvo.org/id/iso639-3/tha' => 'th', 'http://lexvo.org/id/iso639-3/tir' => 'ti', 'http://lexvo.org/id/iso639-3/tuk' => 'tk', 'http://lexvo.org/id/iso639-3/tgl' => 'tl', 'http://lexvo.org/id/iso639-3/tsn' => 'tn', 'http://lexvo.org/id/iso639-3/ton' => 'to', 'http://lexvo.org/id/iso639-3/tur' => 'tr', 'http://lexvo.org/id/iso639-3/tso' => 'ts', 'http://lexvo.org/id/iso639-3/tat' => 'tt', 'http://lexvo.org/id/iso639-3/twi' => 'tw', 'http://lexvo.org/id/iso639-3/tah' => 'ty', 'http://lexvo.org/id/iso639-3/uig' => 'ug', 'http://lexvo.org/id/iso639-3/ukr' => 'uk', 'http://lexvo.org/id/iso639-3/urd' => 'ur', 'http://lexvo.org/id/iso639-3/uzb' => 'uz', 'http://lexvo.org/id/iso639-3/ven' => 've', 'http://lexvo.org/id/iso639-3/vie' => 'vi', 'http://lexvo.org/id/iso639-3/vol' => 'vo', 'http://lexvo.org/id/iso639-3/wln' => 'wa', 'http://lexvo.org/id/iso639-3/wol' => 'wo', 'http://lexvo.org/id/iso639-3/xho' => 'xh', 'http://lexvo.org/id/iso639-3/yid' => 'yi', 'http://lexvo.org/id/iso639-3/yor' => 'yo', 'http://lexvo.org/id/iso639-3/zha' => 'za', 'http://lexvo.org/id/iso639-3/zho' => 'zh', 'http://lexvo.org/id/iso639-3/zul' => 'zu' } + # GET /ontologies def index @@ -295,10 +300,6 @@ def show params[:ontology] = params[:ontology].nil? ? params[:id] : params[:ontology] # Hash to convert Lexvo URI to flag code - $LEXVO_TO_FLAG = { 'http://lexvo.org/id/iso639-3/aar' => 'aa', 'http://lexvo.org/id/iso639-3/abk' => 'ab', - 'http://lexvo.org/id/iso639-3/ave' => 'ae', 'http://lexvo.org/id/iso639-3/afr' => 'af', - 'http://lexvo.org/id/iso639-3/aka' => 'ak', 'http://lexvo.org/id/iso639-3/amh' => 'am', - 'http://lexvo.org/id/iso639-3/arg' => 'an', 'http://lexvo.org/id/iso639-3/ara' => 'ar', 'http://lexvo.org/id/iso639-3/asm' => 'as', 'http://lexvo.org/id/iso639-3/ava' => 'av', 'http://lexvo.org/id/iso639-3/aym' => 'ay', 'http://lexvo.org/id/iso639-3/aze' => 'az', 'http://lexvo.org/id/iso639-3/bak' => 'ba', 'http://lexvo.org/id/iso639-3/bel' => 'be', 'http://lexvo.org/id/iso639-3/bul' => 'bg', 'http://lexvo.org/id/iso639-3/bis' => 'bi', 'http://lexvo.org/id/iso639-3/bam' => 'bm', 'http://lexvo.org/id/iso639-3/ben' => 'bn', 'http://lexvo.org/id/iso639-3/bod' => 'bo', 'http://lexvo.org/id/iso639-3/bre' => 'br', 'http://lexvo.org/id/iso639-3/bos' => 'bs', 'http://lexvo.org/id/iso639-3/cat' => 'ca', 'http://lexvo.org/id/iso639-3/che' => 'ce', 'http://lexvo.org/id/iso639-3/cha' => 'ch', 'http://lexvo.org/id/iso639-3/cos' => 'co', 'http://lexvo.org/id/iso639-3/cre' => 'cr', 'http://lexvo.org/id/iso639-3/ces' => 'cs', 'http://lexvo.org/id/iso639-3/chu' => 'cu', 'http://lexvo.org/id/iso639-3/chv' => 'cv', 'http://lexvo.org/id/iso639-3/cym' => 'cy', 'http://lexvo.org/id/iso639-3/dan' => 'da', 'http://lexvo.org/id/iso639-3/deu' => 'de', 'http://lexvo.org/id/iso639-3/div' => 'dv', 'http://lexvo.org/id/iso639-3/dzo' => 'dz', 'http://lexvo.org/id/iso639-3/ewe' => 'ee', 'http://lexvo.org/id/iso639-3/ell' => 'el', 'http://lexvo.org/id/iso639-3/eng' => 'en', 'http://lexvo.org/id/iso639-3/epo' => 'eo', 'http://lexvo.org/id/iso639-3/spa' => 'es', 'http://lexvo.org/id/iso639-3/est' => 'et', 'http://lexvo.org/id/iso639-3/eus' => 'eu', 'http://lexvo.org/id/iso639-3/fas' => 'fa', 'http://lexvo.org/id/iso639-3/ful' => 'ff', 'http://lexvo.org/id/iso639-3/fin' => 'fi', 'http://lexvo.org/id/iso639-3/fij' => 'fj', 'http://lexvo.org/id/iso639-3/fao' => 'fo', 'http://lexvo.org/id/iso639-3/fra' => 'fr', 'http://lexvo.org/id/iso639-3/fry' => 'fy', 'http://lexvo.org/id/iso639-3/gle' => 'ga', 'http://lexvo.org/id/iso639-3/gla' => 'gd', 'http://lexvo.org/id/iso639-3/glg' => 'gl', 'http://lexvo.org/id/iso639-3/grn' => 'gn', 'http://lexvo.org/id/iso639-3/guj' => 'gu', 'http://lexvo.org/id/iso639-3/glv' => 'gv', 'http://lexvo.org/id/iso639-3/hau' => 'ha', 'http://lexvo.org/id/iso639-3/heb' => 'he', 'http://lexvo.org/id/iso639-3/hin' => 'hi', 'http://lexvo.org/id/iso639-3/hmo' => 'ho', 'http://lexvo.org/id/iso639-3/hrv' => 'hr', 'http://lexvo.org/id/iso639-3/hat' => 'ht', 'http://lexvo.org/id/iso639-3/hun' => 'hu', 'http://lexvo.org/id/iso639-3/hye' => 'hy', 'http://lexvo.org/id/iso639-3/her' => 'hz', 'http://lexvo.org/id/iso639-3/ina' => 'ia', 'http://lexvo.org/id/iso639-3/ind' => 'id', 'http://lexvo.org/id/iso639-3/ile' => 'ie', 'http://lexvo.org/id/iso639-3/ibo' => 'ig', 'http://lexvo.org/id/iso639-3/iii' => 'ii', 'http://lexvo.org/id/iso639-3/ipk' => 'ik', 'http://lexvo.org/id/iso639-3/ido' => 'io', 'http://lexvo.org/id/iso639-3/isl' => 'is', 'http://lexvo.org/id/iso639-3/ita' => 'it', 'http://lexvo.org/id/iso639-3/iku' => 'iu', 'http://lexvo.org/id/iso639-3/jpn' => 'ja', 'http://lexvo.org/id/iso639-3/jav' => 'jv', 'http://lexvo.org/id/iso639-3/kat' => 'ka', 'http://lexvo.org/id/iso639-3/kon' => 'kg', 'http://lexvo.org/id/iso639-3/kik' => 'ki', 'http://lexvo.org/id/iso639-3/kua' => 'kj', 'http://lexvo.org/id/iso639-3/kaz' => 'kk', 'http://lexvo.org/id/iso639-3/kal' => 'kl', 'http://lexvo.org/id/iso639-3/khm' => 'km', 'http://lexvo.org/id/iso639-3/kan' => 'kn', 'http://lexvo.org/id/iso639-3/kor' => 'ko', 'http://lexvo.org/id/iso639-3/kau' => 'kr', 'http://lexvo.org/id/iso639-3/kas' => 'ks', 'http://lexvo.org/id/iso639-3/kur' => 'ku', 'http://lexvo.org/id/iso639-3/kom' => 'kv', 'http://lexvo.org/id/iso639-3/cor' => 'kw', 'http://lexvo.org/id/iso639-3/kir' => 'ky', 'http://lexvo.org/id/iso639-3/lat' => 'la', 'http://lexvo.org/id/iso639-3/ltz' => 'lb', 'http://lexvo.org/id/iso639-3/lug' => 'lg', 'http://lexvo.org/id/iso639-3/lim' => 'li', 'http://lexvo.org/id/iso639-3/lin' => 'ln', 'http://lexvo.org/id/iso639-3/lao' => 'lo', 'http://lexvo.org/id/iso639-3/lit' => 'lt', 'http://lexvo.org/id/iso639-3/lub' => 'lu', 'http://lexvo.org/id/iso639-3/lav' => 'lv', 'http://lexvo.org/id/iso639-3/mlg' => 'mg', 'http://lexvo.org/id/iso639-3/mah' => 'mh', 'http://lexvo.org/id/iso639-3/mri' => 'mi', 'http://lexvo.org/id/iso639-3/mkd' => 'mk', 'http://lexvo.org/id/iso639-3/mal' => 'ml', 'http://lexvo.org/id/iso639-3/mon' => 'mn', 'http://lexvo.org/id/iso639-3/mar' => 'mr', 'http://lexvo.org/id/iso639-3/msa' => 'ms', 'http://lexvo.org/id/iso639-3/mlt' => 'mt', 'http://lexvo.org/id/iso639-3/mya' => 'my', 'http://lexvo.org/id/iso639-3/nau' => 'na', 'http://lexvo.org/id/iso639-3/nob' => 'nb', 'http://lexvo.org/id/iso639-3/nde' => 'nd', 'http://lexvo.org/id/iso639-3/nep' => 'ne', 'http://lexvo.org/id/iso639-3/ndo' => 'ng', 'http://lexvo.org/id/iso639-3/nld' => 'nl', 'http://lexvo.org/id/iso639-3/nno' => 'nn', 'http://lexvo.org/id/iso639-3/nor' => 'no', 'http://lexvo.org/id/iso639-3/nbl' => 'nr', 'http://lexvo.org/id/iso639-3/nav' => 'nv', 'http://lexvo.org/id/iso639-3/nya' => 'ny', 'http://lexvo.org/id/iso639-3/oci' => 'oc', 'http://lexvo.org/id/iso639-3/oji' => 'oj', 'http://lexvo.org/id/iso639-3/orm' => 'om', 'http://lexvo.org/id/iso639-3/ori' => 'or', 'http://lexvo.org/id/iso639-3/oss' => 'os', 'http://lexvo.org/id/iso639-3/pan' => 'pa', 'http://lexvo.org/id/iso639-3/pli' => 'pi', 'http://lexvo.org/id/iso639-3/pol' => 'pl', 'http://lexvo.org/id/iso639-3/pus' => 'ps', 'http://lexvo.org/id/iso639-3/por' => 'pt', 'http://lexvo.org/id/iso639-3/que' => 'qu', 'http://lexvo.org/id/iso639-3/roh' => 'rm', 'http://lexvo.org/id/iso639-3/run' => 'rn', 'http://lexvo.org/id/iso639-3/ron' => 'ro', 'http://lexvo.org/id/iso639-3/rus' => 'ru', 'http://lexvo.org/id/iso639-3/kin' => 'rw', 'http://lexvo.org/id/iso639-3/san' => 'sa', 'http://lexvo.org/id/iso639-3/srd' => 'sc', 'http://lexvo.org/id/iso639-3/snd' => 'sd', 'http://lexvo.org/id/iso639-3/sme' => 'se', 'http://lexvo.org/id/iso639-3/sag' => 'sg', 'http://lexvo.org/id/iso639-3/hbs' => 'sh', 'http://lexvo.org/id/iso639-3/sin' => 'si', 'http://lexvo.org/id/iso639-3/slk' => 'sk', 'http://lexvo.org/id/iso639-3/slv' => 'sl', 'http://lexvo.org/id/iso639-3/smo' => 'sm', 'http://lexvo.org/id/iso639-3/sna' => 'sn', 'http://lexvo.org/id/iso639-3/som' => 'so', 'http://lexvo.org/id/iso639-3/sqi' => 'sq', 'http://lexvo.org/id/iso639-3/srp' => 'sr', 'http://lexvo.org/id/iso639-3/ssw' => 'ss', 'http://lexvo.org/id/iso639-3/sot' => 'st', 'http://lexvo.org/id/iso639-3/sun' => 'su', 'http://lexvo.org/id/iso639-3/swe' => 'sv', 'http://lexvo.org/id/iso639-3/swa' => 'sw', 'http://lexvo.org/id/iso639-3/tam' => 'ta', 'http://lexvo.org/id/iso639-3/tel' => 'te', 'http://lexvo.org/id/iso639-3/tgk' => 'tg', 'http://lexvo.org/id/iso639-3/tha' => 'th', 'http://lexvo.org/id/iso639-3/tir' => 'ti', 'http://lexvo.org/id/iso639-3/tuk' => 'tk', 'http://lexvo.org/id/iso639-3/tgl' => 'tl', 'http://lexvo.org/id/iso639-3/tsn' => 'tn', 'http://lexvo.org/id/iso639-3/ton' => 'to', 'http://lexvo.org/id/iso639-3/tur' => 'tr', 'http://lexvo.org/id/iso639-3/tso' => 'ts', 'http://lexvo.org/id/iso639-3/tat' => 'tt', 'http://lexvo.org/id/iso639-3/twi' => 'tw', 'http://lexvo.org/id/iso639-3/tah' => 'ty', 'http://lexvo.org/id/iso639-3/uig' => 'ug', 'http://lexvo.org/id/iso639-3/ukr' => 'uk', 'http://lexvo.org/id/iso639-3/urd' => 'ur', 'http://lexvo.org/id/iso639-3/uzb' => 'uz', 'http://lexvo.org/id/iso639-3/ven' => 've', 'http://lexvo.org/id/iso639-3/vie' => 'vi', 'http://lexvo.org/id/iso639-3/vol' => 'vo', 'http://lexvo.org/id/iso639-3/wln' => 'wa', 'http://lexvo.org/id/iso639-3/wol' => 'wo', 'http://lexvo.org/id/iso639-3/xho' => 'xh', 'http://lexvo.org/id/iso639-3/yid' => 'yi', 'http://lexvo.org/id/iso639-3/yor' => 'yo', 'http://lexvo.org/id/iso639-3/zha' => 'za', 'http://lexvo.org/id/iso639-3/zho' => 'zh', 'http://lexvo.org/id/iso639-3/zul' => 'zu' } # PURL-specific redirect to handle /ontologies/{ACR}/{CLASS_ID} paths if params[:purl_conceptid] diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb index bf2a48bb4..cc338b994 100644 --- a/app/helpers/submissions_helper.rb +++ b/app/helpers/submissions_helper.rb @@ -40,7 +40,7 @@ def metadata_section(id, label, collapsed: true, parent_id: nil, &block) capture(&block) end else - collapsed = false unless @selected_attributes.nil? + collapsed = false if !@selected_attributes.nil? || !@errors.nil? render CollapsableBlockComponent.new(id: id, parent_id: (parent_id || "#{id}-card"), title: label, collapsed: collapsed) do capture(&block) end @@ -297,10 +297,11 @@ def generate_attribute_label(attr_label, label_tag_sym: :label) attr = attribute_infos(attr_label) return attr_label if attr.nil? + label_html = ''.html_safe + # label_html = if !attr["extracted"].nil? && attr["extracted"] == true + # extractable_metadatum_tooltip({ content: 'Extractable metadatum' }) + # end.to_s.html_safe - label_html = if !attr["extracted"].nil? && attr["extracted"] == true - extractable_metadatum_tooltip({ content: 'Extractable metadatum' }) - end.to_s.html_safe label = attr["label"].nil? ? attr_label.underscore.humanize : attr["label"] @@ -330,6 +331,10 @@ def generate_integer_input(attr) number_field object_name, attr["attribute"].to_s.to_sym, value: @submission.send(attr["attribute"]), class: 'metadataInput form-control' end + def generate_agent_input(attr, type: 'person') + render NestedAgentSearchInputComponent.new(agents: @submission.send(attr["attribute"]), agent_type: type, name_prefix: object_name + "[#{attr['attribute']}]", parent_id: '') + end + def generate_date_input(attr) field_id = [:submission, attr["attribute"].to_s, @ontology.acronym].join('_') date_value = @submission.send(attr["attribute"]).presence @@ -377,7 +382,7 @@ def generate_list_text_input(attr, name, values) end def generate_boolean_input(attr, name) - value = attribute_values(attr) + value = attribute_values(attr) value = value.to_s unless value.nil? render SwitchInputComponent.new(id: name, name: name, label: "", checked: value.eql?('true') , value: value, boolean_switch: true) @@ -399,6 +404,9 @@ def attribute_values(attr) end end + def agent_attributes + submission_metadata.select{|x| x["enforce"].include?('Agent')}.map{|x| x["attribute"]} + end # Generate the HTML input for every attributes. def generate_attribute_input(attr_label, options = {}) input_html = ''.html_safe @@ -408,11 +416,20 @@ def generate_attribute_input(attr_label, options = {}) object_name, name = attribute_input_name(attr["attribute"]) - if input_type?(attr, 'integer') + if input_type?(attr, 'Agent') + type = if input_type?(attr, 'is_person') + 'person' + elsif input_type?(attr, 'is_organization') + 'organization' + else + '' + end + generate_agent_input(attr, type: type) + elsif input_type?(attr, 'integer') generate_integer_input(attr) elsif input_type?(attr, 'date_time') generate_date_input(attr) - elsif input_type?(attr, 'textarea') + elsif input_type?(attr, 'textaclrea') generate_textarea_input(attr) elsif enforce_values?(attr) metadata_values, select_values = selected_values(attr, enforced_values(attr)) From ce249cd448d86cba719d6592a765494f94105239 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 11:11:38 +0200 Subject: [PATCH 370/533] fix submission save/update error state --- app/controllers/submissions_controller.rb | 16 +++++++++++++++- app/views/submissions/_form.html.haml | 15 --------------- app/views/submissions/_form_content.html.haml | 12 ++++++++++++ 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb index 3eba20aba..2bea30bd3 100644 --- a/app/controllers/submissions_controller.rb +++ b/app/controllers/submissions_controller.rb @@ -45,7 +45,8 @@ def create @errors = ["Please enter a contact"] end - render "new" + reset_agent_attributes + render 'new', status: 422 else redirect_to "/ontologies/success/#{@ontology.acronym}" end @@ -84,4 +85,17 @@ def update end + private + + def reset_agent_attributes + helpers.agent_attributes.each do |attr| + current_val = @submission.send(attr) + new_values = Array(current_val).map { |x| LinkedData::Client::Models::Agent.find(x) } + + new_values = new_values.first unless current_val.is_a?(Array) + + @submission.send("#{attr}=", new_values) + end + end + end diff --git a/app/views/submissions/_form.html.haml b/app/views/submissions/_form.html.haml index 75f859318..152656cd2 100644 --- a/app/views/submissions/_form.html.haml +++ b/app/views/submissions/_form.html.haml @@ -15,21 +15,6 @@ frame.src = "?properties=" + selectedProperties + "&required=" + required.checked + "&show_sections=true" } -- unless @errors.nil? - %div.form-group.row - %div.col-sm-8.offset-sm-2.enable-lists{style: "color:red;"} - %strong Errors On Form - %ul - - for error in @errors - - if error.is_a? Array - %ul - - error[1].each do |key, message| - %li - = message - - else - %li - = error - %div#editMetadataDiv %div{:style => "width: 50%;margin: 3em auto;"} %p{:style => "text-align: center;"} diff --git a/app/views/submissions/_form_content.html.haml b/app/views/submissions/_form_content.html.haml index 9a39f11c4..f87326825 100644 --- a/app/views/submissions/_form_content.html.haml +++ b/app/views/submissions/_form_content.html.haml @@ -1,4 +1,16 @@ = render TurboFrameComponent.new(id:id) do + - unless @errors.nil? + %div + %div.enable-lists{style: "color:red;"} + %strong Errors On Form + %ul + - Array(@errors).each do |error| + - error = error[:error] if error.is_a?(Hash) && error[:error] + - error.each do |key, value| + %li + - value = value.values if value.is_a?(Hash) + #{key}: #{Array(value).join(', ')} + = hidden_field object_name, :ontology, value: acronym = hidden_field object_name, :id, value: submissionId %div#general-card.mt-4 From 211b5a4e83c175acdd7dff47b32841f4731bb7e7 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 11:13:21 +0200 Subject: [PATCH 371/533] update display agent to show agent affiliations --- app/helpers/agent_helper.rb | 38 ++++++++++++++++++++++---- app/helpers/ontologies_helper.rb | 11 ++++++-- app/views/agents/_agent_show.html.haml | 2 +- app/views/agents/_show_line.html.haml | 4 +-- 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/app/helpers/agent_helper.rb b/app/helpers/agent_helper.rb index 0a00eddc3..ea8c46c6a 100644 --- a/app/helpers/agent_helper.rb +++ b/app/helpers/agent_helper.rb @@ -33,8 +33,10 @@ def agent_id_frame_id(agent_id, parent_id) end def agent_id(agent) - agent_id = agent.id - agent_id ? agent.id.split('/').last : '' + return if agent.nil? + + agent_id = agent.is_a?(String) ? agent : agent.id + agent_id ? agent_id.split('/').last : '' end def link_to_agent_edit_modal(agent, parent_id = nil) @@ -54,13 +56,37 @@ def affiliation?(agent) agent.agentType.eql?('organization') end - def display_identifiers(identifiers) - Array(identifiers).map { |i| "#{i["schemaAgency"]}:#{i["notation"]}" }.join(', ') + def identifier_link(link, link_to: true) + if link_to + link_to(link, link, target: '_blank') + else + link + end + + end + + def display_identifiers(identifiers, link: true) + schemes_urls = { ORCID: 'https://orcid.org/', ISNI: 'https://isni.org/', ROR: 'https://ror.org/', GRID: 'https://www.grid.ac/' } + Array(identifiers).map do |i| + if i["schemaAgency"] + schema_agency, notation = [i["schemaAgency"], i["notation"]] + else + schema_agency, notation = (i["id"] || i["@id"]).split('Identifiers/').last.delete(' ').split(':') + end + value = "#{schemes_urls[schema_agency.to_sym]}#{notation}" + identifier_link(value, link_to: link) + end.join(', ') end - def display_agent(agent) - agent.name + '(' + display_identifiers(agent.identifiers) + ')' + def display_agent(agent, link: true) + out = agent.name.to_s.humanize + identifiers = display_identifiers(agent.identifiers, link: link) + out = "#{out} (#{identifiers})" unless identifiers.empty? + affiliations = agent.affiliations.map { |a| display_agent(a, link: link) }.join(', ') + out = "#{out} (affiliations: #{affiliations})" unless affiliations.empty? + out end + def agent_field_name(name, name_prefix = '') name_prefix&.empty? ? name : "#{name_prefix}[#{name}]" end diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 7091e58a9..9e17aaae0 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -45,6 +45,11 @@ def display_data_catalog(sub) end end + def agent?(sub_metadata, attr) + metadata = sub_metadata.select{ |x| x['@id'][attr] }.first + metadata && Array(metadata['enforce']).include?('Agent') + end + # Display data catalog metadata under visits (in _metadata.html.haml) def display_logo(sub) logo_attributes = ["logo", "depiction"] @@ -128,7 +133,7 @@ def additional_metadata(sub) end) end - elsif metadata.eql?("hasCreator") || metadata.eql?("publisher") + elsif agent?(json_metadata, metadata) html << content_tag(:tr) do if label.nil? concat(content_tag(:td, metadata.gsub(/(?=[A-Z])/, " "))) @@ -139,10 +144,10 @@ def additional_metadata(sub) metadata_array = [] sub.send(metadata).each do |metadata_value| - metadata_array << display_agent(metadata_value) + metadata_array << "
    #{display_agent(metadata_value)}
    " end - concat(content_tag(:td, raw(metadata_array.join(", ")))) + concat(content_tag(:td, raw(metadata_array.join("")))) end else html << content_tag(:tr) do diff --git a/app/views/agents/_agent_show.html.haml b/app/views/agents/_agent_show.html.haml index c35dcea30..9173925c6 100644 --- a/app/views/agents/_agent_show.html.haml +++ b/app/views/agents/_agent_show.html.haml @@ -3,7 +3,7 @@ - if agent.id = hidden_field_tag agent_field_name(:id, name_prefix), agent.id - = text_field_tag '', display_agent(agent), class: "form-control", disabled: true + = text_field_tag '', display_agent(agent, link: false), class: "form-control", disabled: true - if current_user_admin? || agent.creator.eql?(current_user&.id.to_s) - if edit_on_modal diff --git a/app/views/agents/_show_line.html.haml b/app/views/agents/_show_line.html.haml index f7958ca53..c0806f981 100644 --- a/app/views/agents/_show_line.html.haml +++ b/app/views/agents/_show_line.html.haml @@ -2,9 +2,9 @@ %td = agent.name %td - = display_identifiers(agent.identifiers) + = raw display_identifiers(agent.identifiers) %td - = agent.affiliations.map{|i| "#{i["name"]} ( #{display_identifiers(i["identifiers"])} )"}.join(', ') + = raw agent.affiliations.map{|i| "#{i["name"]} ( #{display_identifiers(i["identifiers"])} )"}.join(', ') %td = agent.agentType %td{:class => 'delete_mappings_column'} From 1bbd1db5f623276b50ba70a066f1eecdf0dcc58b Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 11:19:14 +0200 Subject: [PATCH 372/533] make select input by default not open to add values --- app/components/select_input_component.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/select_input_component.rb b/app/components/select_input_component.rb index e757304d6..9bcfe5d1d 100644 --- a/app/components/select_input_component.rb +++ b/app/components/select_input_component.rb @@ -2,7 +2,7 @@ class SelectInputComponent < ViewComponent::Base - def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_values: true) + def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_values: false) super @id = id @name = name From f88e8d1fdd02cd9acb122f8b7754a22ec478997b Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 11:21:05 +0200 Subject: [PATCH 373/533] fix text field component not using the required argument --- .../text_field_component/text_field_component.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/text_field_component/text_field_component.html.haml b/app/components/text_field_component/text_field_component.html.haml index 9b9c8e686..48353e691 100644 --- a/app/components/text_field_component/text_field_component.html.haml +++ b/app/components/text_field_component/text_field_component.html.haml @@ -1,4 +1,4 @@ -= render FormGroupComponent.new(object: @object, name: @name, method: @method_name, label: @label_text, inline: @inline) do |c| += render FormGroupComponent.new(object: @object, name: @name, method: @method_name, label: @label_text, inline: @inline, required: @required) do |c| = text_field c.name, c.method_name , value: c.value, class: "form-control" - c.help do = help From ce7dae58316ed59282b1c45fde098fb1f82aaf18 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 11:32:02 +0200 Subject: [PATCH 374/533] remove the hardcoded hasCreator and publisher inputs in submission from --- app/views/submissions/_form_content.html.haml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/views/submissions/_form_content.html.haml b/app/views/submissions/_form_content.html.haml index f87326825..6c91baefc 100644 --- a/app/views/submissions/_form_content.html.haml +++ b/app/views/submissions/_form_content.html.haml @@ -28,17 +28,9 @@ = attribute_form_group_container('location', required: true) do = render partial: 'submissions/submission_location_form' - %div#key-properties-card.mt-4.agents-inputs + %div#key-properties-card.mt-4 = metadata_section('key-properties', 'Key properties', collapsed: false) do = form_group_attribute("URI", required: true) - = form_group_attribute("identifier", required: true) - = attribute_form_group_container("hasCreator", required: true) do - = render NestedAgentSearchInputComponent.new(agents: @submission.hasCreator , agent_type: 'person', name_prefix: object_name+'[hasCreator]', - parent_id: '') - = attribute_form_group_container("publisher", required: true) do - = render NestedAgentSearchInputComponent.new(agents: @submission.publisher , agent_type: '', name_prefix: object_name+'[publisher]', - parent_id: '') - = form_group_attribute("deprecated") = form_group_attribute("hasOntologySyntax") do %p From 64e5246cfe62f569c9716b7b1e2255086516f2f7 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Fri, 28 Jul 2023 13:49:56 +0200 Subject: [PATCH 375/533] add concept sub_menu helpers --- app/helpers/concepts_helper.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/helpers/concepts_helper.rb b/app/helpers/concepts_helper.rb index 252db950d..6e62862da 100644 --- a/app/helpers/concepts_helper.rb +++ b/app/helpers/concepts_helper.rb @@ -26,6 +26,22 @@ def get_concept_id(params, concept, root) end end + def sub_menu_active?(section) + params["sub_menu"]&.eql? section + end + + def sub_menu_active_class(section) + "active show" if sub_menu_active?(section) + end + + def default_sub_menu? + !sub_menu_active?('list') && !sub_menu_active?('date') + end + + def default_sub_menu_class + "active show" if default_sub_menu? + end + def concept_label(ont_id, cls_id) @ontology = LinkedData::Client::Models::Ontology.find(ont_id) @ontology ||= LinkedData::Client::Models::Ontology.find_by_acronym(ont_id).first From 04e20d4d2cd8f797747a90eabf42a30bb6ad8c4e Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Fri, 28 Jul 2023 13:50:42 +0200 Subject: [PATCH 376/533] use sub_menu helpers in the concept browser --- app/controllers/ontologies_controller.rb | 2 +- .../concepts_browsers/_concepts_browser.html.haml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index c1d76eab6..364d347c5 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -4,7 +4,7 @@ class OntologiesController < ApplicationController include InstancesHelper include ActionView::Helpers::NumberHelper include OntologiesHelper - include SchemesHelper + include SchemesHelper, ConceptsHelper include CollectionsHelper include MappingStatistics diff --git a/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml b/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml index bd8daabd2..1c4c5128c 100644 --- a/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml +++ b/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml @@ -1,18 +1,18 @@ %nav .nav.nav-tabs.text-center{:role => "tablist", style:"background-color: rgba(0, 0, 0, 0.03);"} - %a#concepts-tree-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-tree-container", title: 'Hierarchy view', 'data-controller': "tooltip", class: ("active" if !skos?) } + %a#concepts-tree-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-tree-container", title: 'Hierarchy view', 'data-controller': "tooltip", class: default_sub_menu_class} %img{src: asset_path('list-tree.svg') , style:'width: 25px; height: 25px'} - if skos? - %a#concepts-list-tab.nav-item.nav-link.active.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-list-container", title: 'Collection view', 'data-controller': "tooltip"} + %a#concepts-list-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-list-container", title: 'Collection view', 'data-controller': "tooltip", class: sub_menu_active_class('list')} %i.fas.fa-list.text-dark{style:'font-size: 25px'} - %a#concepts-date-sort-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-date-sort-container", title: 'Date view', 'data-controller': "tooltip"} + %a#concepts-date-sort-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-date-sort-container", title: 'Date view', 'data-controller': "tooltip", class: sub_menu_active_class('date')} %i.far.fa-calendar-alt.text-dark{style:'font-size: 25px'} .tab-content.px-1.py-2 - #concepts-tree-container.tab-pane.fade{class: ("show active" if !skos?)} + #concepts-tree-container.tab-pane.fade{class: default_sub_menu_class} = render partial: 'ontologies/concepts_browsers/concepts_tree' - if skos? - #concepts-list-container.tab-pane.fade.show.active + #concepts-list-container.tab-pane.fade{class: sub_menu_active_class('list')} = render partial: 'ontologies/concepts_browsers/concepts_list' - #concepts-date-sort-container.tab-pane.fade + #concepts-date-sort-container.tab-pane.fade{class: sub_menu_active_class('date')} = render partial: 'ontologies/concepts_browsers/concepts_date_sort' \ No newline at end of file From b61e600fa7c4c31f3ae6bb913a312f5d38a43094 Mon Sep 17 00:00:00 2001 From: Sirine Mhedhbi Date: Fri, 28 Jul 2023 13:51:24 +0200 Subject: [PATCH 377/533] update collection member count redirection sub_menu to use list --- app/views/collections/_collection.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/collections/_collection.html.haml b/app/views/collections/_collection.html.haml index b915ef1b6..1abcc8de6 100644 --- a/app/views/collections/_collection.html.haml +++ b/app/views/collections/_collection.html.haml @@ -18,7 +18,7 @@ %tr %td{nowrap: ""} Members count %td - %a{href: "/ontologies/" + @ontology.acronym + "/?p=classes&sub_menu=concepts-list-tab&concept_collections=" + collection["@id"]} + %a{href: "/ontologies/" + @ontology.acronym + "/?p=classes&sub_menu=list&concept_collections=" + collection["@id"]} %p= collection["memberCount"] %tr %td.label From 0ccc9edc765940314938df18d0c885339c862a62 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 28 Jul 2023 14:23:10 +0000 Subject: [PATCH 378/533] install tom select --- package.json | 3 ++- yarn.lock | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index dbe55880b..94282d913 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "split.js": "^1.6.5", "stimulus-flatpickr": "^3.0.0-0", "stimulus-rails-nested-form": "^4.0.0", - "stimulus-read-more": "^4.1.0" + "stimulus-read-more": "^4.1.0", + "tom-select": "^2.2.2" }, "scripts": { "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds" diff --git a/yarn.lock b/yarn.lock index d1dfe0e17..8d77bcaa5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25,6 +25,18 @@ resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.2.4.tgz#0d35541be32cfae3b4f78c6ab9138f5b21f28a21" integrity sha512-c3xlOroHp/cCZHDOuLp6uzQYEbvXBUVaal0puXoGJ9M8L/KHwZ3hQozD4dVeSN9msHWLxxtmPT1TlCN7gFhj4w== +"@orchidjs/sifter@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@orchidjs/sifter/-/sifter-1.0.3.tgz#43f42519472282eb632d0a1589184f044d64129b" + integrity sha512-zCZbwKegHytfsPm8Amcfh7v/4vHqTAaOu6xFswBYcn8nznBOuseu6COB2ON7ez0tFV0mKL0nRNnCiZZA+lU9/g== + dependencies: + "@orchidjs/unicode-variants" "^1.0.4" + +"@orchidjs/unicode-variants@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@orchidjs/unicode-variants/-/unicode-variants-1.0.4.tgz#6d2f812e3b19545bba2d81caffff1204de9a6a58" + integrity sha512-NvVBRnZNE+dugiXERFsET1JlKZfM5lJDEpSMilKW4bToYJ7pxf0Zne78xyXB2ny2c2aHfJ6WLnz1AaTNHAmQeQ== + "@rails/actioncable@^7.0": version "7.0.4" resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.4.tgz#70a3ca56809f7aaabb80af2f9c01ae51e1a8ed41" @@ -183,3 +195,11 @@ stimulus-read-more@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/stimulus-read-more/-/stimulus-read-more-4.1.0.tgz#f34efb2dcb33fd091936d84c569937bc100506c8" integrity sha512-SJyCJqZrhDSKpfrepnhStBaxtyv6Jnvr+b84GDg3l+/BzL5HaFLYmc6QkSNCeR6y0x+Zw7lwKuzv+XzyAm1KzQ== + +tom-select@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/tom-select/-/tom-select-2.2.2.tgz#8e5f9296e6d80254feccb57f0986bd6c44d126e2" + integrity sha512-igGah1yY6yhrnN2h/Ky8I5muw/nE/YQxIsEZoYu5qaA4bsRibvKto3s8QZZosKpOd0uO8fNYhRfAwgHB4IAYew== + dependencies: + "@orchidjs/sifter" "^1.0.3" + "@orchidjs/unicode-variants" "^1.0.4" From 981605a21b28790ec2d8fe69641c8f634fcbed78 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 28 Jul 2023 14:50:14 +0000 Subject: [PATCH 379/533] update select component with tom select --- .../stylesheets/application.css.scss.erb | 1 + .../stylesheets/components/input_field.scss | 49 ++++++- .../select_input_component.html.haml | 16 +- .../select_input_component_controller.js | 137 +----------------- 4 files changed, 59 insertions(+), 144 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index 03650e79d..8e531e211 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -44,6 +44,7 @@ @import "register"; @import "lostpassword"; @import "flatpickr/dist/themes/light"; +@import "tom-select/dist/scss/tom-select"; @import "feedback"; @import "login"; @import "components/index"; diff --git a/app/assets/stylesheets/components/input_field.scss b/app/assets/stylesheets/components/input_field.scss index 2ca9a7e74..9a5ad99c9 100644 --- a/app/assets/stylesheets/components/input_field.scss +++ b/app/assets/stylesheets/components/input_field.scss @@ -1,4 +1,4 @@ -.input-field-component{ +.input-field-component { width: 100%; font-size: 13px; padding: 10px; @@ -8,23 +8,62 @@ resize: none; } -.input-field-component:focus{ +.input-field-component:focus { border: 1px solid var(--primary-color); } -.text-input-label{ +.text-input-label { font-size: 12px; color: #666666; margin-bottom: 5px; } -.text-input-error-text{ +.text-input-error-text { font-size: 12px; color: var(--error-color) } -.text-input-helper-text{ +.text-input-helper-text { font-size: 12px; color: #666666; margin-top: 5px; +} + +.ts-control { + padding: 12px; + border-radius: 5px; + border-color: #BDBDBD; +} + +.ts-dropdown-content .option { + padding: 12px; +} + +.ts-dropdown .active { + background-color: #f8f8f8; + +} + +.ts-dropdown { + margin: 0; + color: #666666; +} + +.chosen-container { + padding: 0; + border-radius: 5px; +} + +.ts-wrapper.single .ts-control:after { + border-color: #343a40 transparent transparent; + border-style: solid; + border-width: 5px 5px 0; + content: " "; + display: block; + height: 0; + margin-top: -3px; + position: absolute; + right: calc(0.75rem + 5px); + top: 50%; + width: 0; } \ No newline at end of file diff --git a/app/components/select_input_component/select_input_component.html.haml b/app/components/select_input_component/select_input_component.html.haml index 00fd00cfe..c7ac32bbc 100644 --- a/app/components/select_input_component/select_input_component.html.haml +++ b/app/components/select_input_component/select_input_component.html.haml @@ -1,10 +1,6 @@ -%div{:data => { controller: "select-input", 'select-input': {'multiple-value': @multiple.to_s}}} - = select_tag(@name, options_values, { multiple: @multiple, class: "form-control", id: "select_#{@id}", data: { action: "select-input#toggleOtherValue", "select-input-target": "selectedValues" } }) - - %div.d-flex.mt-1{style: "display:#{!@open_to_add_values ? 'none !important;' : 'block;'}"} - = text_field_tag("add_#{@id}", nil, :style => "margin-right: 1em;width: 16em;display: none;", :placeholder => "Or provide the value", - data: {action: "keydown.enter->select-input#addValue", "select-input-target": "inputValueField"}, class: 'metadataInput form-control form-control-sm') - - %button.btn.btn-primary.btn-sm.add-value-btn{id: "btnAdd#{@id}", style: "display: none;", - data: { action: "select-input#addValue", "select-input-target": "btnValueField"}} - Add new value \ No newline at end of file +%select#upload-ontology-visibility{autocomplete:"off", multiple: @multiple ,data: {controller: "select-input", 'select-input':{'multiple-value':@multiple, 'open-add-value':@open_to_add_values}}} + - @values.each do |value| + - is_selected_value = value == @selected + %option{value:@value, selected:is_selected_value} + = value + \ No newline at end of file diff --git a/app/components/select_input_component/select_input_component_controller.js b/app/components/select_input_component/select_input_component_controller.js index 7fb94e380..45c50a4d4 100644 --- a/app/components/select_input_component/select_input_component_controller.js +++ b/app/components/select_input_component/select_input_component_controller.js @@ -1,137 +1,16 @@ -import {Controller} from "@hotwired/stimulus" -import {useChosen} from "../../javascript/mixins/useChosen"; +import { Controller } from "@hotwired/stimulus" +import TomSelect from "tom-select" export default class extends Controller { - - static values = { - other: {type: Boolean, default: true}, - multiple: {type: Boolean, default: false} - } - - static targets = ["btnValueField", "inputValueField", "selectedValues"] - connect() { - this.initMultipleSelect() - this.#displayOtherValueField() - } - - toggleOtherValue() { - if (this.otherValue && !this.multipleValue) { - this.#toggle() + let myOptions = {} + if (this.data.get("multipleValue")) { + myOptions['plugins'] = ['remove_button']; } - } - - addValue(event) { - event.preventDefault() - - if (this.inputValueFieldTarget.value) { - let newOption = this.inputValueFieldTarget.value; - this.#addNewOption(newOption) - this.#selectNewOption(newOption) - if (!this.multipleValue) { - this.#hideOtherValueField() - } + if (this.data.get("openAddValue")) { + myOptions['create'] = true; } + new TomSelect(this.element, myOptions); } - - initMultipleSelect() { - this.#addEmptyOption() - useChosen(this.selectedValuesTarget, { - width: '100%', - search_contains: true, - allow_single_deselect: !this.multipleValue, - }, (event) => { - if(this.multipleValue){ - let selected = event.target.selectedOptions - if (selected.length === 0) { - this.#selectEmptyOption() - } else { - this.#unSelectEmptyOption() - } - } - }) - } - - #selectEmptyOption() { - this.emptyOption.selected = true - this.emptyOption.disabled = false - } - - #unSelectEmptyOption() { - this.emptyOption.selected = false - this.emptyOption.disabled = true - } - - #addEmptyOption() { - this.emptyOption = document.createElement("option") - this.emptyOption.innerHTML = '' - this.emptyOption.value = '' - this.selectedValuesTarget.prepend(this.emptyOption) - } - - #selectNewOption(newOption) { - let selectedOptions = this.#selectedOptions(); - - - if (Array.isArray(selectedOptions)) { - selectedOptions.push(newOption); - } else { - selectedOptions = []; - selectedOptions.push(newOption) - } - - this.selectedValuesTarget.value = selectedOptions - if (this.multipleValue) { - const options = this.selectedValuesTarget.options - for (const element of options) { - element.selected = selectedOptions.indexOf(element.value) >= 0; - } - jQuery(this.selectedValuesTarget).trigger("chosen:updated") - } - - } - - #addNewOption(newOption) { - let option = document.createElement("option"); - option.value = newOption; - option.text = newOption; - this.selectedValuesTarget.add(option) - } - - #selectedOptions() { - if (this.multipleValue) { - const selectedOptions = []; - for (let option of this.selectedValuesTarget.options) { - if (option.selected) { - selectedOptions.push(option.value); - } - } - return selectedOptions - } else { - return this.selectedValuesTarget.value - } - } - - #toggle() { - if (this.selectedValuesTarget.value === 'other') { - this.#displayOtherValueField() - } else { - this.#hideOtherValueField() - } - } - - #displayOtherValueField() { - this.inputValueFieldTarget.value = "" - this.btnValueFieldTarget.style.display = 'block' - this.inputValueFieldTarget.style.display = 'block' - } - - #hideOtherValueField() { - this.inputValueFieldTarget.value = "" - this.btnValueFieldTarget.style.display = 'none' - this.inputValueFieldTarget.style.display = 'none' - } - - } \ No newline at end of file From 30e4dffb79d6945d9c95b7fa0062d8601cb43e42 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 7 Jul 2023 14:45:36 +0200 Subject: [PATCH 380/533] update search input component to handle custom link turbo targets --- app/components/search_input_component.rb | 12 +++++++++++- .../search_input_component.html.haml | 3 ++- .../search_input_component_controller.js | 5 +++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/components/search_input_component.rb b/app/components/search_input_component.rb index 4a33ffa5c..047b83b6b 100644 --- a/app/components/search_input_component.rb +++ b/app/components/search_input_component.rb @@ -8,7 +8,8 @@ def initialize(name: '', placeholder: '', actions_links: {}, scroll_down: true, use_cache: true, ajax_url:, item_base_url:, - id_key:) + id_key:, + links_target: '_top') super @name = name @placeholder = placeholder @@ -18,5 +19,14 @@ def initialize(name: '', placeholder: '', actions_links: {}, @ajax_url = ajax_url @item_base_url = item_base_url @id_key = id_key + @links_target = links_target + end + + def action_link_info(value) + if value.is_a?(Hash) + [value[:link] , value[:target]] + else + [value, '_top'] + end end end diff --git a/app/components/search_input_component/search_input_component.html.haml b/app/components/search_input_component/search_input_component.html.haml index e30e29533..c5da8112a 100644 --- a/app/components/search_input_component/search_input_component.html.haml +++ b/app/components/search_input_component/search_input_component.html.haml @@ -9,7 +9,8 @@ 'data-search-input-target': 'input'} #home-search-drop-down{'data-search-input-target': 'dropDown', 'data-action': 'mousedown->search-input#prevent'} - @actions_links.each do |key, value| - %a.home-search-ontology-content#home-search-ontology-content{href: value, 'data-turbo-frame': '_top', 'data-search-input-target': 'actionLink'} + - link, target = action_link_info(value) + %a.home-search-ontology-content#home-search-ontology-content{href: link, 'data-turbo-frame': target, 'data-search-input-target': 'actionLink'} %p.mb-0 %div %img{src: asset_path("loop.svg")}/ diff --git a/app/components/search_input_component/search_input_component_controller.js b/app/components/search_input_component/search_input_component_controller.js index 5804b3135..2d2e624e2 100644 --- a/app/components/search_input_component/search_input_component_controller.js +++ b/app/components/search_input_component/search_input_component_controller.js @@ -75,7 +75,7 @@ export default class extends Controller { } else { useAjax({ type: "GET", - url: this.ajaxUrlValue + '?search=' + this.#inputValue(), + url: this.ajaxUrlValue + this.#inputValue(), dataType: "json", success: (data) => { this.items = data.map(x => { return {...x, link: (this.itemLinkBaseValue + x[this.idKeyValue])}} ) @@ -151,7 +151,8 @@ export default class extends Controller { if (key === 'TYPE'){ value = value.toString().split('/').slice(-1) } - string = string.replace(key, value.toString()) + const regex = new RegExp('\\b' + key + '\\b', 'gi'); + string = string.replace(regex, value.toString()) }) return new DOMParser().parseFromString(string, "text/html").body.firstElementChild From c98380133c0067cdad32525387a7fa69cd4b80d2 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 17:41:35 +0200 Subject: [PATCH 381/533] update search input component to have form-control style by default --- .../stylesheets/components/search_input.scss | 46 +++++++++++++++++++ .../search_input_component.html.haml | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/components/search_input.scss diff --git a/app/assets/stylesheets/components/search_input.scss b/app/assets/stylesheets/components/search_input.scss new file mode 100644 index 000000000..8f2d88ef1 --- /dev/null +++ b/app/assets/stylesheets/components/search_input.scss @@ -0,0 +1,46 @@ +#home-search-drop-down{ + display: none; + font-size: 16px; + background: white; + width: 100%; + border-radius: 0 0 14px 14px; + border: none; + box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); +} + +.home-search-ontology-content{ + display: flex; + color: #777777 !important; + justify-content: space-between; + padding: 20px 20px; + cursor: pointer; + border-top: 1px solid #f7f7f7 +} +.home-search-ontology-content:hover{ + background-color: rgba(0, 0, 0, 0.01); +} +.home-search-ontology-content div{ + display: flex; +} +.home-search-ontology-content div img{ + width: 12px; +} +.home-search-ontology-content div p{ + font-weight: 300; + margin-left: 10px; + margin-bottom: 0; +} + +.home-dropdown-active{ + box-shadow: none !important; +} +#seached-ontology{ + margin-bottom: 0; +} +#seached-ontologies{ + margin-bottom: 0; +} + +.search-inputs input { + @extend .form-control !optional; +} \ No newline at end of file diff --git a/app/components/search_input_component/search_input_component.html.haml b/app/components/search_input_component/search_input_component.html.haml index c5da8112a..db7a61881 100644 --- a/app/components/search_input_component/search_input_component.html.haml +++ b/app/components/search_input_component/search_input_component.html.haml @@ -1,4 +1,4 @@ -%div{'data-controller': 'search-input', +%div.search-inputs{'data-controller': 'search-input', 'data-search-input-ajax-url-value': @ajax_url, 'data-search-input-item-link-base-value': @item_base_url, 'data-search-input-id-key-value': @id_key, From 629adb69edac0f827589638d1105806d5df8054a Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 17:44:09 +0200 Subject: [PATCH 382/533] remove no used home search controller replaced with search input --- .../controllers/home_search_controller.js | 154 ------------------ app/javascript/controllers/index.js | 3 - app/views/home/index.html.haml | 2 +- 3 files changed, 1 insertion(+), 158 deletions(-) delete mode 100644 app/javascript/controllers/home_search_controller.js diff --git a/app/javascript/controllers/home_search_controller.js b/app/javascript/controllers/home_search_controller.js deleted file mode 100644 index f2db88044..000000000 --- a/app/javascript/controllers/home_search_controller.js +++ /dev/null @@ -1,154 +0,0 @@ -import { Controller } from "@hotwired/stimulus" -import useAjax from "../../javascript/mixins/useAjax"; -// Connects to data-controller="home-search" -export default class extends Controller { - static targets = [ "input", "dropDown", "ontology", "searchedOntologies", "searchOntologyContent", "homeSearchOntologies" ] - static values = { - ontologies: Array - } - connect() { - - this.input = this.inputTarget - this.dropDown = this.dropDownTarget - this.ontology = this.ontologyTarget - this.searchedOntologies = this.searchedOntologiesTarget - this.searchOntologyContent = this.searchOntologyContentTarget - this.homeSearchOntologies = this.homeSearchOntologiesTarget - } - - search(){ - this.#searchInput() - } - - prevent(event){ - event.preventDefault(); - } - blur(){ - this.dropDown.style.display = "none"; - this.input.classList.remove("home-dropdown-active"); - } - - - #scrollDown(currentScroll) { - const startPosition = window.pageYOffset; - const distance = 300 - currentScroll; - const duration = 1000; - let start = null; - - function scrollAnimation(timestamp) { - if (!start) start = timestamp; - const progress = timestamp - start; - const scrollPosition = startPosition + easeInOutCubic(progress, 0, distance, duration); - window.scrollTo(0, scrollPosition); - if (progress < duration) { - window.requestAnimationFrame(scrollAnimation); - } - } - - function easeInOutCubic(t, b, c, d) { - t /= d / 2; - if (t < 1) return c / 2 * t * t * t + b; - t -= 2; - return c / 2 * (t * t * t + 2) + b; - } - - window.requestAnimationFrame(scrollAnimation); - } - #fetchOntologies(){ - - if(this.ontologies !== undefined){ - this.#renderLines() - } else{ - useAjax({ - type: "GET", - url: "/ajax/ontologies", - dataType: "json", - success: (data) => { - - - this.ontologies = data.map(ont => [`${ont.name} (${ont.acronym})`, ont.acronym]); - this.#renderLines() - - }, - error: () => { - console.log("error") - } - }) - } - - - } - - - #renderLines(){ - const inputValue = this.input.value.trim(); - let results_list = [] - const class_search_path = "/search?query=" - const browse_search_path = "/ontologies?search=" - if (inputValue.length > 0) { - - this.ontology.innerHTML = inputValue; - this.searchedOntologies.innerHTML = inputValue; - this.searchOntologyContent.href = class_search_path+inputValue; - this.homeSearchOntologies.href = browse_search_path+inputValue; - this.dropDown.innerHTML = "" - let breaker = 0 - for (var i = 0; i < this.ontologies.length; i++) { - if (breaker == 4){ - break; - } - // Get the current item from the ontologies array - var item = this.ontologies[i]; - - // Check if the item contains the substring - if (item[0].toLowerCase().includes(inputValue.toLowerCase()) || item[1].toLowerCase().includes(inputValue.toLowerCase())) { - results_list.push(item); - breaker = breaker + 1 - } - } - - results_list.forEach((item)=> { - let link = document.createElement("a"); - link.href = "/ontologies/"+item[1]; - link.className = "home-search-ontology-content"; - - let p1 = document.createElement("p"); - p1.id = "seached-ontology"; - p1.className = "home-searched-ontology"; - p1.textContent = item[0]; - - let p2 = document.createElement("p"); - p2.className = "home-result-type"; - p2.textContent = "Ontology"; - - link.appendChild(p1); - link.appendChild(p2); - - this.dropDown.appendChild(link); - - }); - this.dropDown.appendChild(this.homeSearchOntologies); - this.dropDown.appendChild(this.searchOntologyContent); - this.dropDown.style.display = "block"; - this.input.classList.add("home-dropdown-active"); - if ((window.scrollY < 300) && (!this.input.className.includes("nav-input"))) { - this.#scrollDown(window.scrollY); - } - - - - - - } else { - this.dropDown.style.display = "none"; - this.input.classList.remove("home-dropdown-active"); - } - - - - } - - #searchInput() { - this.#fetchOntologies() - } -} diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index e2e8ee6f1..bea11dc82 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -19,9 +19,6 @@ application.register("form-auto-complete", FormAutoCompleteController) import HistoryController from "./history_controller" application.register("history", HistoryController) -import HomeSearchController from "./home_search_controller" -application.register("home-search", HomeSearchController) - import LabelAjaxController from "./label_ajax_controller" application.register("label-ajax", LabelAjaxController) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index a6c330fca..a6ee5d80a 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -37,7 +37,7 @@ %a.home-bubble.home-bubble-four{:href => "/visits"} %h5 ... - .home-header-title-container{'data-controller': "home-search"} + .home-header-title-container .home-header-title %h4 = t('.welcome', site: $SITE) From ade8967428ac2ae6bcae54339fb603e23de014b6 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 17:47:20 +0200 Subject: [PATCH 383/533] fix. ontology search input component ajax_url argument to add ?acronym= --- .../ontology_search_input_component.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/ontology_search_input_component/ontology_search_input_component.html.haml b/app/components/ontology_search_input_component/ontology_search_input_component.html.haml index a59f1879c..13cbbb291 100644 --- a/app/components/ontology_search_input_component/ontology_search_input_component.html.haml +++ b/app/components/ontology_search_input_component/ontology_search_input_component.html.haml @@ -1,5 +1,5 @@ = render SearchInputComponent.new(placeholder: @placeholder, - name: @name, scroll_down: @scroll_down, ajax_url: '/ajax/ontologies', + name: @name, scroll_down: @scroll_down, ajax_url: '/ajax/ontologies?acronym=', item_base_url: '/ontologies/', id_key:'acronym', actions_links: {search_ontology_content: "/search?query=o", see_all_ontologies: "/ontologies?search=o"}) do |s| From 5d47da785e10d790d626392550ea62ffbb3b7b9a Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 17:47:36 +0200 Subject: [PATCH 384/533] fix home page search input style --- app/assets/stylesheets/home.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 562a5575c..7c6976569 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -108,17 +108,18 @@ i.fa.fa-caret-square-o-down { color: white; } -.home-header-title input{ +.home-header-title .search-inputs input{ font-size: 16px; outline: none; padding: 20px; width: 100%; + height: 100%; margin-top: 20px; border-radius: 14px; border: none; box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); } -.home-header-title input:focus{ +.home-header-title .search-inputs input:focus{ box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.15); } From 871aebda730dce610d9175d3ac32c43e6d518a21 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 18:00:32 +0200 Subject: [PATCH 385/533] migrate search input style from home.scss to search_input.scss --- app/assets/stylesheets/components/index.scss | 3 +- .../stylesheets/components/search_input.scss | 20 +++++---- app/assets/stylesheets/home.scss | 43 ------------------- .../ontology_search_input_component.html.haml | 4 +- .../search_input_component.html.haml | 4 +- 5 files changed, 17 insertions(+), 57 deletions(-) diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 163a1203a..8490b22e7 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -6,4 +6,5 @@ @import 'summary_section'; @import 'text_area_field'; @import 'dropdown'; -@import 'field_container'; \ No newline at end of file +@import 'field_container'; +@import 'search_input'; \ No newline at end of file diff --git a/app/assets/stylesheets/components/search_input.scss b/app/assets/stylesheets/components/search_input.scss index 8f2d88ef1..e54d877ea 100644 --- a/app/assets/stylesheets/components/search_input.scss +++ b/app/assets/stylesheets/components/search_input.scss @@ -1,4 +1,4 @@ -#home-search-drop-down{ +.search-container{ display: none; font-size: 16px; background: white; @@ -8,7 +8,7 @@ box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); } -.home-search-ontology-content{ +.search-content{ display: flex; color: #777777 !important; justify-content: space-between; @@ -16,28 +16,30 @@ cursor: pointer; border-top: 1px solid #f7f7f7 } -.home-search-ontology-content:hover{ +.search-content:hover{ background-color: rgba(0, 0, 0, 0.01); } -.home-search-ontology-content div{ +.search-content div{ display: flex; } -.home-search-ontology-content div img{ +.search-content div img{ width: 12px; } -.home-search-ontology-content div p{ +.search-content div p{ font-weight: 300; margin-left: 10px; margin-bottom: 0; } -.home-dropdown-active{ +.search-dropdown-active{ box-shadow: none !important; } -#seached-ontology{ + +.search-element{ margin-bottom: 0; } -#seached-ontologies{ + +.searched-elements{ margin-bottom: 0; } diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 7c6976569..68efd4e42 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -363,49 +363,6 @@ i.fa.fa-caret-square-o-down { margin-left: 60px; } -#home-search-drop-down{ - display: none; - font-size: 16px; - background: white; - width: 100%; - border-radius: 0 0 14px 14px; - border: none; - box-shadow: 2px 30px 60px rgba(0, 0, 0, 0.1); -} - -.home-search-ontology-content{ - display: flex; - color: #777777 !important; - justify-content: space-between; - padding: 20px 20px; - cursor: pointer; - border-top: 1px solid #f7f7f7 -} -.home-search-ontology-content:hover{ - background-color: rgba(0, 0, 0, 0.01); -} -.home-search-ontology-content div{ - display: flex; - margin-left: 20px; -} -.home-search-ontology-content div img{ - width: 12px; -} -.home-search-ontology-content div p{ - font-weight: 300; - margin-left: 10px; - margin-bottom: 0; -} - -.home-dropdown-active{ - box-shadow: none !important; -} -#seached-ontology{ - margin-bottom: 0; -} -#seached-ontologies{ - margin-bottom: 0; -} .home-support-title{ display: flex; diff --git a/app/components/ontology_search_input_component/ontology_search_input_component.html.haml b/app/components/ontology_search_input_component/ontology_search_input_component.html.haml index 13cbbb291..74ca0d36c 100644 --- a/app/components/ontology_search_input_component/ontology_search_input_component.html.haml +++ b/app/components/ontology_search_input_component/ontology_search_input_component.html.haml @@ -4,8 +4,8 @@ actions_links: {search_ontology_content: "/search?query=o", see_all_ontologies: "/ontologies?search=o"}) do |s| - s.template do - %a{href: "LINK", class: "home-search-ontology-content", 'data-turbo-frame': '_top'} - %p#seached-ontology.home-searched-ontology + %a{href: "LINK", class: "search-content", 'data-turbo-frame': '_top'} + %p.search-element.home-searched-ontology NAME(ACRONYM) %p.home-result-type TYPE \ No newline at end of file diff --git a/app/components/search_input_component/search_input_component.html.haml b/app/components/search_input_component/search_input_component.html.haml index db7a61881..6a0a5657a 100644 --- a/app/components/search_input_component/search_input_component.html.haml +++ b/app/components/search_input_component/search_input_component.html.haml @@ -7,10 +7,10 @@ %input#home-search{:name => @name, :placeholder => @placeholder, :type => "text", 'data-action': 'input->search-input#search blur->search-input#blur', 'data-search-input-target': 'input'} - #home-search-drop-down{'data-search-input-target': 'dropDown', 'data-action': 'mousedown->search-input#prevent'} + .search-container{'data-search-input-target': 'dropDown', 'data-action': 'mousedown->search-input#prevent'} - @actions_links.each do |key, value| - link, target = action_link_info(value) - %a.home-search-ontology-content#home-search-ontology-content{href: link, 'data-turbo-frame': target, 'data-search-input-target': 'actionLink'} + %a.search-content#search-content{href: link, 'data-turbo-frame': target, 'data-search-input-target': 'actionLink'} %p.mb-0 %div %img{src: asset_path("loop.svg")}/ From 65e3629349395c93b6e21410a2860ff83b1d30e9 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 18:10:13 +0200 Subject: [PATCH 386/533] handle for agent show the case they are string --- app/views/agents/_agent_show.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/agents/_agent_show.html.haml b/app/views/agents/_agent_show.html.haml index 9173925c6..607ab630f 100644 --- a/app/views/agents/_agent_show.html.haml +++ b/app/views/agents/_agent_show.html.haml @@ -1,5 +1,6 @@ = render TurboFrameComponent.new(id: agent_frame_id(agent, parent_id)) do %div.d-flex + - return agent if agent.is_a? String - if agent.id = hidden_field_tag agent_field_name(:id, name_prefix), agent.id From 4fcf11d4cf400abdf11f3e44c1ed3aa357c5c913 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 18:12:25 +0200 Subject: [PATCH 387/533] handle contact nested form empty state --- app/controllers/concerns/submission_updater.rb | 2 +- app/views/submissions/_form_content.html.haml | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/controllers/concerns/submission_updater.rb b/app/controllers/concerns/submission_updater.rb index f8f323174..43746c38e 100644 --- a/app/controllers/concerns/submission_updater.rb +++ b/app/controllers/concerns/submission_updater.rb @@ -132,7 +132,7 @@ def submission_params(params) end end - @metadata.each do |m| + submission_metadata.each do |m| m_attr = m['attribute'].to_sym if p[m_attr] && m['enforce'].include?('list') p[m_attr] = Array(p[m_attr]) unless p[m_attr].is_a?(Array) diff --git a/app/views/submissions/_form_content.html.haml b/app/views/submissions/_form_content.html.haml index 6c91baefc..dccea1993 100644 --- a/app/views/submissions/_form_content.html.haml +++ b/app/views/submissions/_form_content.html.haml @@ -58,19 +58,16 @@ = text_area c.name, c.method_name, rows: 5, value: @submission.description, required: true, class: "form-control" -# Home page - = attribute_text_field_container('homepage') do |c| - - c.help do - Enter a URL for the main page of your ontology. + = form_group_attribute('homepage') do + Enter a URL for the main page of your ontology. -# Documentation page - = attribute_text_field_container('documentation') do |c| - - c.help do - Enter a URL for a page that provides ontology documentation. + = form_group_attribute('documentation') do + Enter a URL for a page that provides ontology documentation. -# Publications page - = attribute_text_field_container('publication') do |c| - - c.help do - Enter a URL for a page that lists publications about your ontology. + = form_group_attribute('publication') do + Enter a URL for a page that lists publications about your ontology. -# Used ontology engineering tool = form_group_attribute("usedOntologyEngineeringTool") @@ -118,7 +115,8 @@ - c.template do = render partial: "submissions/submission_contact_form", locals: {contact: nil, index: 'NEW_RECORD'} - c.empty_state do - = hidden_field_tag object_name+"[contact][#{index.to_s.upcase}][email]" + = hidden_field_tag object_name+"[contact][#{@submission.contact.size}][email]" + = hidden_field_tag object_name+"[contact][#{@submission.contact.size}][name]" - @submission.contact.each_with_index do |contact, i| - c.row do = render partial: "submissions/submission_contact_form", locals: {contact: contact, index: i} From 7f0702fde1b386cb4b9e84ccb81be73663e522d9 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 11 Jul 2023 04:56:29 +0200 Subject: [PATCH 388/533] add margin top and bottom for the nested form component From 9ce277c6b54d15f56a5def035b46f4dab64fbc80 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 18:20:46 +0200 Subject: [PATCH 389/533] update nested form component to have an empty state to send to the back --- app/components/nested_form_inputs_component.rb | 1 + .../nested_form_inputs_component.html.haml | 2 ++ app/helpers/submissions_helper.rb | 11 ++++++++--- app/views/submissions/_form_content.html.haml | 2 ++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/components/nested_form_inputs_component.rb b/app/components/nested_form_inputs_component.rb index e5cbabada..39a9be53e 100644 --- a/app/components/nested_form_inputs_component.rb +++ b/app/components/nested_form_inputs_component.rb @@ -5,6 +5,7 @@ class NestedFormInputsComponent < ViewComponent::Base renders_one :template renders_one :header renders_many :rows + renders_one :empty_state def initialize(object_name: '') super diff --git a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml index 33dff4ddd..82778a86c 100644 --- a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml +++ b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml @@ -8,6 +8,8 @@ = inline_svg 'icons/delete.svg' %div.titles = header + %div.d-none + = empty_state - rows.each_with_index do |row , index| %div.d-flex.align-items-center.nested-form-wrapper.my-1{'data-new-record': 'true'} %div{style: 'width: 90%'} diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb index a9dc3d8b9..bf2a48bb4 100644 --- a/app/helpers/submissions_helper.rb +++ b/app/helpers/submissions_helper.rb @@ -49,11 +49,11 @@ def metadata_section(id, label, collapsed: true, parent_id: nil, &block) def attribute_container(attr, required: false, &block) if show_attribute?(attr, required) - content_tag(:div) do - capture(&block) - end + content_tag(:div) do + capture(&block) end end + end def inline_save? !@inline_save.nil? && @inline_save @@ -355,6 +355,11 @@ def generate_list_field_input(attr, name, values, field_func) c.template do method(field_func).call("#{name}[NEW_RECORD]", '', :id => attr["attribute"].to_s + "_" + @ontology.acronym, class: "metadataInput form-control my-1") end + + c.empty_state do + hidden_field_tag "#{name}[#{values.size}]" + end + values.each_with_index do |metadata_val, i| c.row do method(field_func).call("#{name}[#{i}]", metadata_val, :id => "submission_#{attr["attribute"].to_s}" + "_" + @ontology.acronym, class: "metadataInput my-1 form-control") diff --git a/app/views/submissions/_form_content.html.haml b/app/views/submissions/_form_content.html.haml index 0eeaa8d3f..119e21293 100644 --- a/app/views/submissions/_form_content.html.haml +++ b/app/views/submissions/_form_content.html.haml @@ -105,6 +105,8 @@ = render NestedFormInputsComponent.new do |c| - c.template do = render partial: "submissions/submission_contact_form", locals: {contact: nil, index: 'NEW_RECORD'} + - c.empty_state do + = hidden_field_tag object_name+"[contact][#{index.to_s.upcase}][email]" - @submission.contact.each_with_index do |contact, i| - c.row do = render partial: "submissions/submission_contact_form", locals: {contact: contact, index: i} From e41cdca13e5c388f3cbac8b5c05d475031657519 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 28 Jul 2023 18:21:41 +0200 Subject: [PATCH 390/533] handle contact nested form empty state --- app/views/submissions/_form_content.html.haml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/views/submissions/_form_content.html.haml b/app/views/submissions/_form_content.html.haml index 119e21293..94ee6a22a 100644 --- a/app/views/submissions/_form_content.html.haml +++ b/app/views/submissions/_form_content.html.haml @@ -46,19 +46,16 @@ = text_area c.name, c.method_name, rows: 5, value: @submission.description, required: true, class: "form-control" -# Home page - = attribute_text_field_container('homepage') do |c| - - c.help do - Enter a URL for the main page of your ontology. + = form_group_attribute('homepage') do + Enter a URL for the main page of your ontology. -# Documentation page - = attribute_text_field_container('documentation') do |c| - - c.help do - Enter a URL for a page that provides ontology documentation. + = form_group_attribute('documentation') do + Enter a URL for a page that provides ontology documentation. -# Publications page - = attribute_text_field_container('publication') do |c| - - c.help do - Enter a URL for a page that lists publications about your ontology. + = form_group_attribute('publication') do + Enter a URL for a page that lists publications about your ontology. -# Used ontology engineering tool = form_group_attribute("usedOntologyEngineeringTool") @@ -106,7 +103,8 @@ - c.template do = render partial: "submissions/submission_contact_form", locals: {contact: nil, index: 'NEW_RECORD'} - c.empty_state do - = hidden_field_tag object_name+"[contact][#{index.to_s.upcase}][email]" + = hidden_field_tag object_name+"[contact][#{@submission.contact.size}][email]" + = hidden_field_tag object_name+"[contact][#{@submission.contact.size}][name]" - @submission.contact.each_with_index do |contact, i| - c.row do = render partial: "submissions/submission_contact_form", locals: {contact: contact, index: i} From e05a417323ea4fdcdc34bed559cd8089591cec63 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 31 Jul 2023 08:10:36 +0000 Subject: [PATCH 391/533] fix select component id --- .../select_input_component/select_input_component.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/select_input_component/select_input_component.html.haml b/app/components/select_input_component/select_input_component.html.haml index c7ac32bbc..1310e92f6 100644 --- a/app/components/select_input_component/select_input_component.html.haml +++ b/app/components/select_input_component/select_input_component.html.haml @@ -1,4 +1,4 @@ -%select#upload-ontology-visibility{autocomplete:"off", multiple: @multiple ,data: {controller: "select-input", 'select-input':{'multiple-value':@multiple, 'open-add-value':@open_to_add_values}}} +%select{id: "select_#{@id}", autocomplete:"off", multiple: @multiple ,data: {controller: "select-input", 'select-input':{'multiple-value':@multiple, 'open-add-value':@open_to_add_values}}} - @values.each do |value| - is_selected_value = value == @selected %option{value:@value, selected:is_selected_value} From 9f23b77c6781e6b253228b8cd3e205f723d00120 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 31 Jul 2023 10:12:30 +0200 Subject: [PATCH 392/533] use not centred layout for the select input previews --- test/components/previews/input/select_component_preview.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/components/previews/input/select_component_preview.rb b/test/components/previews/input/select_component_preview.rb index 95ba3e5ec..61599fb78 100644 --- a/test/components/previews/input/select_component_preview.rb +++ b/test/components/previews/input/select_component_preview.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class Input::SelectComponentPreview < ViewComponent::Preview + layout 'component_preview_not_centred' + def default(id: "", name: "", values: ["choices 1", "choices 2", "choices 3"], selected: "choices 2", multiple: false, open_to_add_values: false) render Input::SelectComponent.new(id: id, name: name, value: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values) end From 9f3789a430df7c76d9a5b75ea7c2f3d7ba13da56 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 31 Jul 2023 10:13:32 +0200 Subject: [PATCH 393/533] remove the select id in the select input component template --- .../select_input_component/select_input_component.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/select_input_component/select_input_component.html.haml b/app/components/select_input_component/select_input_component.html.haml index c7ac32bbc..34e3753dc 100644 --- a/app/components/select_input_component/select_input_component.html.haml +++ b/app/components/select_input_component/select_input_component.html.haml @@ -1,4 +1,4 @@ -%select#upload-ontology-visibility{autocomplete:"off", multiple: @multiple ,data: {controller: "select-input", 'select-input':{'multiple-value':@multiple, 'open-add-value':@open_to_add_values}}} +%select{autocomplete:"off", multiple: @multiple ,data: {controller: "select-input", 'select-input':{'multiple-value':@multiple, 'open-add-value':@open_to_add_values}}} - @values.each do |value| - is_selected_value = value == @selected %option{value:@value, selected:is_selected_value} From 8ff1fd5fb9ff549b0c3f13502994d518bb10bddb Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 31 Jul 2023 10:14:22 +0200 Subject: [PATCH 394/533] remove is_selected_value variable in the select input component --- .../select_input_component/select_input_component.html.haml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/components/select_input_component/select_input_component.html.haml b/app/components/select_input_component/select_input_component.html.haml index 34e3753dc..067add66f 100644 --- a/app/components/select_input_component/select_input_component.html.haml +++ b/app/components/select_input_component/select_input_component.html.haml @@ -1,6 +1,5 @@ %select{autocomplete:"off", multiple: @multiple ,data: {controller: "select-input", 'select-input':{'multiple-value':@multiple, 'open-add-value':@open_to_add_values}}} - @values.each do |value| - - is_selected_value = value == @selected - %option{value:@value, selected:is_selected_value} + %option{value:@value, selected: value.eql?(@selected)} = value \ No newline at end of file From 2ab26065b1642e559cf59bef9c72d08414755bda Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 31 Jul 2023 11:02:52 +0200 Subject: [PATCH 395/533] make concept list frame not load if concept_collections param is empty --- app/views/ontologies/concepts_browsers/_concepts_list.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/ontologies/concepts_browsers/_concepts_list.html.haml b/app/views/ontologies/concepts_browsers/_concepts_list.html.haml index eeb1d43e6..1da3381d3 100644 --- a/app/views/ontologies/concepts_browsers/_concepts_list.html.haml +++ b/app/views/ontologies/concepts_browsers/_concepts_list.html.haml @@ -13,5 +13,5 @@ data: {action: 'changed->turbo-frame#updateFrame'}} %div#sd_content.card.p-1{style: 'overflow-y: scroll; height: 60vh;'} - = render TurboFrameComponent.new(id: 'concepts_list_view-page-1', data: {'turbo-frame-target': 'frame'}, src:"/ajax/classes/list?ontology_id=#{@ontology.acronym}&collection_id=#{params[:concept_collections]}") do + = render TurboFrameComponent.new(id: 'concepts_list_view-page-1', data: {'turbo-frame-target': 'frame'}, src:params[:concept_collections] ? "/ajax/classes/list?ontology_id=#{@ontology.acronym}&collection_id=#{params[:concept_collections]}" : '') do Please select a collection to display \ No newline at end of file From 1b94b4cb6eeff8015bd2056d57a383571213c9fc Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 31 Jul 2023 11:04:21 +0200 Subject: [PATCH 396/533] add 'data-turbo-frame':'_top' to member count link to show top loader --- app/views/collections/_collection.html.haml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/collections/_collection.html.haml b/app/views/collections/_collection.html.haml index 6c19cb995..7876e63a4 100644 --- a/app/views/collections/_collection.html.haml +++ b/app/views/collections/_collection.html.haml @@ -8,8 +8,7 @@ - t.add_row({th: 'ID'}, {td: collection["@id"]}) - t.add_row({th: 'Preferred Name'}, {td: get_collection_label(collection)}) - t.add_row({th: 'Members count'}) do |r| - - r.td do - %a{href: "/ontologies/" + @ontology.acronym + "/?p=classes&sub_menu=list&concept_collections=" + collection["@id"]} - %p= collection["memberCount"] + - r.td do + = link_to collection["memberCount"], "/ontologies/" + @ontology.acronym + "/?p=classes&sub_menu=list&concept_collections=" + collection["@id"], 'data-turbo-frame':'_top' - t.add_row({th: 'Type'}, {td: collection["@type"]}) From e5c8974ae4eb077229d638e1d9acb48d3fe99f5d Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 1 Aug 2023 03:38:29 +0200 Subject: [PATCH 397/533] remove container class from the new and edit submission views --- app/views/submissions/edit.html.haml | 2 +- app/views/submissions/new.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/submissions/edit.html.haml b/app/views/submissions/edit.html.haml index 27fc27849..5c46f3099 100644 --- a/app/views/submissions/edit.html.haml +++ b/app/views/submissions/edit.html.haml @@ -1,4 +1,4 @@ -%div.container.py-4.py-md-5 +%div.py-4.py-md-5.flex-column.w-100 %h3.text-center.mb-4 Edit submission information %small.text-muted for #{@ontology.acronym} diff --git a/app/views/submissions/new.html.haml b/app/views/submissions/new.html.haml index 505a7e3cb..d6413ca0a 100644 --- a/app/views/submissions/new.html.haml +++ b/app/views/submissions/new.html.haml @@ -1,6 +1,6 @@ - @title = "Add new ontology submission" -%div.container.py-4.py-md-5 +%div.py-4.py-md-5 %h3.text-center.mb-4 Add new submission - if !(@submission.ontology.nil? || (@submission.ontology.is_a? String)) From 4f36ca61d9b9eabc21c801044876339fb253950a Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 1 Aug 2023 03:39:06 +0200 Subject: [PATCH 398/533] handle string errors (location file not given ) in the submission form --- app/views/submissions/_form_content.html.haml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/views/submissions/_form_content.html.haml b/app/views/submissions/_form_content.html.haml index dccea1993..695a941b0 100644 --- a/app/views/submissions/_form_content.html.haml +++ b/app/views/submissions/_form_content.html.haml @@ -6,10 +6,13 @@ %ul - Array(@errors).each do |error| - error = error[:error] if error.is_a?(Hash) && error[:error] - - error.each do |key, value| - %li - - value = value.values if value.is_a?(Hash) - #{key}: #{Array(value).join(', ')} + - if error.is_a?(String) + = error + - else + - error.each do |key, value| + %li + - value = value.values if value.is_a?(Hash) + #{key}: #{Array(value).join(', ')} = hidden_field object_name, :ontology, value: acronym = hidden_field object_name, :id, value: submissionId From 6376d3fe53f5294b95ffec8df62dce5dfe96d208 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 1 Aug 2023 13:07:54 +0000 Subject: [PATCH 399/533] merge primary and secondary button in one component --- .../buttons/primary_button_component.rb | 3 ++- .../primary_button_component.html.haml | 9 ++++---- .../buttons/secondary_button_component.rb | 10 -------- .../secondary_button_component.html.haml | 23 ------------------- .../primary_button_component_preview.rb | 17 +++++++++++--- .../secondary_button_component_preview.rb | 8 ------- 6 files changed, 21 insertions(+), 49 deletions(-) delete mode 100644 app/components/buttons/secondary_button_component.rb delete mode 100644 app/components/buttons/secondary_button_component/secondary_button_component.html.haml delete mode 100644 test/components/previews/buttons/secondary_button_component_preview.rb diff --git a/app/components/buttons/primary_button_component.rb b/app/components/buttons/primary_button_component.rb index fb92497e3..f46c2ccb2 100644 --- a/app/components/buttons/primary_button_component.rb +++ b/app/components/buttons/primary_button_component.rb @@ -1,7 +1,8 @@ class Buttons::PrimaryButtonComponent < ViewComponent::Base - def initialize(name: "", value: , type: "regular", style: "regular", color: "primary", onclick: "") + def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "primary", onclick: "") @name = name @value = value + @variant = variant @type = type @style = style @color = color diff --git a/app/components/buttons/primary_button_component/primary_button_component.html.haml b/app/components/buttons/primary_button_component/primary_button_component.html.haml index 8e574d671..f35765f30 100644 --- a/app/components/buttons/primary_button_component/primary_button_component.html.haml +++ b/app/components/buttons/primary_button_component/primary_button_component.html.haml @@ -1,9 +1,10 @@ + - if @type == "submit" - %button-container{onclick: "displayAnimation()"} - %input.primary-button{:name => @name, :type => "submit", :value => @value, id: "primary-button", oncklick: @onclick}/ + .button-container{onclick: "displayAnimation()"} + %input{:name => @name, :type => "submit", :value => @value, id: "primary-button", oncklick: @onclick, class: "#{@variant}-button"}/ - else - %button-container - .primary-button{:name => @name, onclick: "displayAnimation()", id: "primary-button", oncklick: @onclick} + .button-container + %div{:name => @name, onclick: "displayAnimation()", id: "primary-button", oncklick: @onclick, class: "#{@variant}-button"} = @value .animation-container#loading-animation diff --git a/app/components/buttons/secondary_button_component.rb b/app/components/buttons/secondary_button_component.rb deleted file mode 100644 index 91f527b8a..000000000 --- a/app/components/buttons/secondary_button_component.rb +++ /dev/null @@ -1,10 +0,0 @@ -class Buttons::SecondaryButtonComponent < ViewComponent::Base - def initialize(name: "", value: , type: "regular", style: "regular", color: "primary", onclick: "") - @name = name - @value = value - @type = type - @style = style - @color = color - @onclick = onclick - end -end \ No newline at end of file diff --git a/app/components/buttons/secondary_button_component/secondary_button_component.html.haml b/app/components/buttons/secondary_button_component/secondary_button_component.html.haml deleted file mode 100644 index fe4de70c9..000000000 --- a/app/components/buttons/secondary_button_component/secondary_button_component.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -- if @type == "submit" - %button-container{onclick: "displaySecondaryAnimation()"} - %input.secondary-button{:name => @name, :type => "submit", :value => @value, id: "secondary-button", oncklick: @onclick}/ -- else - %button-container{onclick: "displaySecondaryAnimation()"} - .secondary-button{:name => @name, id: "secondary-button", oncklick: @onclick} - = @value - -.animation-container#secondary-loading-animation - .lds-ellipsis-secondary - %div - %div - %div - %div - -:javascript - const button = document.getElementById("secondary-button") - const loading = document.getElementById("secondary-loading-animation") - function displaySecondaryAnimation(){ - console.log("working") - button.style.display = 'none'; - loading.style.display = 'flex'; - } \ No newline at end of file diff --git a/test/components/previews/buttons/primary_button_component_preview.rb b/test/components/previews/buttons/primary_button_component_preview.rb index 1ce890277..4d9a04222 100644 --- a/test/components/previews/buttons/primary_button_component_preview.rb +++ b/test/components/previews/buttons/primary_button_component_preview.rb @@ -1,9 +1,20 @@ # frozen_string_literal: true class Buttons::PrimaryButtonComponentPreview < ViewComponent::Preview layout 'component_preview_not_centred' - def default - def default() - render Buttons::PrimaryButtonComponent.new(value: "Login", name: "login", type: "regular") + + + def primary + def primary() + render Buttons::PrimaryButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary") end end + + + def secondary + def secondary() + render Buttons::PrimaryButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "secondary") + end + end + + end \ No newline at end of file diff --git a/test/components/previews/buttons/secondary_button_component_preview.rb b/test/components/previews/buttons/secondary_button_component_preview.rb deleted file mode 100644 index 5fbad6e66..000000000 --- a/test/components/previews/buttons/secondary_button_component_preview.rb +++ /dev/null @@ -1,8 +0,0 @@ -class Buttons::SecondaryButtonComponentPreview < ViewComponent::Preview - layout 'component_preview_not_centred' - def default - def default() - render Buttons::SecondaryButtonComponent.new(value: "Login", name: "login", type: "regular") - end - end -end \ No newline at end of file From 26e83172537b4f4ddccf09b034d2f87be0299d5b Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 1 Aug 2023 14:39:12 +0000 Subject: [PATCH 400/533] remove undesired secondary button css file --- app/assets/stylesheets/components/index.scss | 4 +- ...rimary_button.scss => regular_button.scss} | 20 +++- .../components/secondary_button.scss | 100 ------------------ .../primary_button_component.html.haml | 5 +- 4 files changed, 23 insertions(+), 106 deletions(-) rename app/assets/stylesheets/components/{primary_button.scss => regular_button.scss} (80%) delete mode 100644 app/assets/stylesheets/components/secondary_button.scss diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 09e250b96..d22c15713 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -10,6 +10,6 @@ @import 'input_field'; @import 'file_input_loader'; @import 'text_area_field'; -@import 'primary_button'; -@import 'secondary_button'; +@import 'regular_button'; + diff --git a/app/assets/stylesheets/components/primary_button.scss b/app/assets/stylesheets/components/regular_button.scss similarity index 80% rename from app/assets/stylesheets/components/primary_button.scss rename to app/assets/stylesheets/components/regular_button.scss index 8af119a00..649c4b1b3 100644 --- a/app/assets/stylesheets/components/primary_button.scss +++ b/app/assets/stylesheets/components/regular_button.scss @@ -1,4 +1,3 @@ - .primary-button { width: 100%; display: flex; @@ -17,6 +16,25 @@ cursor: pointer; } +.secondary-button { + width: 100%; + display: flex; + justify-content: center; + align-items: center; + font-size: 16px; + color: var(--primary-color); + height: 60px; + border: 1px solid var(--primary-color); + border-radius: 9px; + transition: background-color ease 0.3s; +} + +.secondary-button:hover { + background-color: var(--primary-color); + cursor: pointer; + color: white; +} + .animation-container{ width: 100%; diff --git a/app/assets/stylesheets/components/secondary_button.scss b/app/assets/stylesheets/components/secondary_button.scss deleted file mode 100644 index 86a35cc6b..000000000 --- a/app/assets/stylesheets/components/secondary_button.scss +++ /dev/null @@ -1,100 +0,0 @@ -.secondary-button { - width: 100%; - display: flex; - justify-content: center; - align-items: center; - font-size: 16px; - color: var(--primary-color); - height: 60px; - border: 1px solid var(--primary-color); - border-radius: 9px; - transition: background-color ease 0.3s; -} - -.secondary-button:hover { - background-color: var(--primary-color); - cursor: pointer; - color: white; -} - - -.animation-container { - width: 100%; - height: 60px; - font-size: 16px; - background-color: var(--primary-color); - border: none; - border-radius: 9px; - justify-content: center; - align-items: center; - display: none; - -} - -.lds-ellipsis-secondary { - display: inline-block; - position: relative; - margin-top: 50px; - width: 80px; - height: 80px; - transform: scale(0.7); -} - -.lds-ellipsis-secondary div { - position: absolute; - width: 13px; - height: 13px; - border-radius: 50%; - background: white; - animation-timing-function: cubic-bezier(0, 1, 1, 0); -} - -.lds-ellipsis-secondary div:nth-child(1) { - left: 8px; - animation: lds-ellipsis-secondary1 0.6s infinite; -} - -.lds-ellipsis-secondary div:nth-child(2) { - left: 8px; - animation: lds-ellipsis-secondary2 0.6s infinite; -} - -.lds-ellipsis-secondary div:nth-child(3) { - left: 32px; - animation: lds-ellipsis-secondary2 0.6s infinite; -} - -.lds-ellipsis-secondary div:nth-child(4) { - left: 56px; - animation: lds-ellipsis-secondary3 0.6s infinite; -} - -@keyframes lds-ellipsis-secondary1 { - 0% { - transform: scale(0); - } - - 100% { - transform: scale(1); - } -} - -@keyframes lds-ellipsis-secondary3 { - 0% { - transform: scale(1); - } - - 100% { - transform: scale(0); - } -} - -@keyframes lds-ellipsis-secondary2 { - 0% { - transform: translate(0, 0); - } - - 100% { - transform: translate(24px, 0); - } -} \ No newline at end of file diff --git a/app/components/buttons/primary_button_component/primary_button_component.html.haml b/app/components/buttons/primary_button_component/primary_button_component.html.haml index f35765f30..0a4fea578 100644 --- a/app/components/buttons/primary_button_component/primary_button_component.html.haml +++ b/app/components/buttons/primary_button_component/primary_button_component.html.haml @@ -1,10 +1,9 @@ - - if @type == "submit" .button-container{onclick: "displayAnimation()"} - %input{:name => @name, :type => "submit", :value => @value, id: "primary-button", oncklick: @onclick, class: "#{@variant}-button"}/ + %input{:name => @name, :type => "submit", :value => @value, id: "primary-button", class: "#{@variant}-button"}/ - else .button-container - %div{:name => @name, onclick: "displayAnimation()", id: "primary-button", oncklick: @onclick, class: "#{@variant}-button"} + %div{:name => @name, onclick: "displayAnimation()", id: "primary-button", class: "#{@variant}-button"} = @value .animation-container#loading-animation From 5f0dee2d52a4d03251a33b5218eee555292bb6e5 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 1 Aug 2023 15:13:28 +0000 Subject: [PATCH 401/533] add icon property to regular button component --- .../components/regular_button.scss | 38 ++++++++++++++----- .../primary_button_component.html.haml | 23 ----------- ...mponent.rb => regular_button_component.rb} | 7 ++-- .../regular_button_component.html.haml | 23 +++++++++++ .../primary_button_component_preview.rb | 20 ---------- .../regular_button_component_preview.rb | 20 ++++++++++ 6 files changed, 75 insertions(+), 56 deletions(-) delete mode 100644 app/components/buttons/primary_button_component/primary_button_component.html.haml rename app/components/buttons/{primary_button_component.rb => regular_button_component.rb} (53%) create mode 100644 app/components/buttons/regular_button_component/regular_button_component.html.haml delete mode 100644 test/components/previews/buttons/primary_button_component_preview.rb create mode 100644 test/components/previews/buttons/regular_button_component_preview.rb diff --git a/app/assets/stylesheets/components/regular_button.scss b/app/assets/stylesheets/components/regular_button.scss index 649c4b1b3..323bec3c1 100644 --- a/app/assets/stylesheets/components/regular_button.scss +++ b/app/assets/stylesheets/components/regular_button.scss @@ -1,38 +1,56 @@ -.primary-button { +.regular-button{ width: 100%; display: flex; justify-content: center; align-items: center; font-size: 16px; - color: white; height: 60px; + border-radius: 9px; +} + +.primary-button { + color: white; background-color: var(--primary-color); border: none; - border-radius: 9px; transition: background-color ease 0.3s; } +.primary-button:focus{ + outline: none; +} .primary-button:hover { background-color: var(--hover-color); cursor: pointer; } .secondary-button { - width: 100%; - display: flex; - justify-content: center; - align-items: center; - font-size: 16px; color: var(--primary-color); - height: 60px; border: 1px solid var(--primary-color); - border-radius: 9px; transition: background-color ease 0.3s; + background-color: rgba(0, 0, 0, 0); +} +.secondary-button:focus { + outline: none; } .secondary-button:hover { background-color: var(--primary-color); cursor: pointer; color: white; + .secondary-button-icon path { + fill: white; + } +} +.left-button-icon{ + margin-right: 10px; +} +.right-button-icon { + margin-left: 10px; +} +.secondary-button-icon path { + fill: var(--primary-color); +} +.primary-button-icon path{ + fill: white; } diff --git a/app/components/buttons/primary_button_component/primary_button_component.html.haml b/app/components/buttons/primary_button_component/primary_button_component.html.haml deleted file mode 100644 index 0a4fea578..000000000 --- a/app/components/buttons/primary_button_component/primary_button_component.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -- if @type == "submit" - .button-container{onclick: "displayAnimation()"} - %input{:name => @name, :type => "submit", :value => @value, id: "primary-button", class: "#{@variant}-button"}/ -- else - .button-container - %div{:name => @name, onclick: "displayAnimation()", id: "primary-button", class: "#{@variant}-button"} - = @value - -.animation-container#loading-animation - .lds-ellipsis - %div - %div - %div - %div - -:javascript - const button = document.getElementById("primary-button") - const loading = document.getElementById("loading-animation") - function displayAnimation(){ - console.log("working") - button.style.display = 'none'; - loading.style.display = 'flex'; - } \ No newline at end of file diff --git a/app/components/buttons/primary_button_component.rb b/app/components/buttons/regular_button_component.rb similarity index 53% rename from app/components/buttons/primary_button_component.rb rename to app/components/buttons/regular_button_component.rb index f46c2ccb2..19630a929 100644 --- a/app/components/buttons/primary_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -1,11 +1,12 @@ -class Buttons::PrimaryButtonComponent < ViewComponent::Base - def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "primary", onclick: "") +class Buttons::RegularButtonComponent < ViewComponent::Base + def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "primary", icon: "", icon_type:"left") @name = name @value = value @variant = variant @type = type @style = style @color = color - @onclick = onclick + @icon = icon + @icon_type = icon_type end end diff --git a/app/components/buttons/regular_button_component/regular_button_component.html.haml b/app/components/buttons/regular_button_component/regular_button_component.html.haml new file mode 100644 index 000000000..190fc5047 --- /dev/null +++ b/app/components/buttons/regular_button_component/regular_button_component.html.haml @@ -0,0 +1,23 @@ +.button-container + %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button", type: "#{"submit" if @type == "submit"}"} + - if @icon != "" && @icon_type == "left" + = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" + = @value + - if @icon != "" && @icon_type == "right" + = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" + +.animation-container#loading-animation + .lds-ellipsis + %div + %div + %div + %div + +:javascript + const button = document.getElementById("button-animation-id") + const loading = document.getElementById("loading-animation") + function displayAnimation(){ + console.log("working") + button.style.display = 'none'; + loading.style.display = 'flex'; + } \ No newline at end of file diff --git a/test/components/previews/buttons/primary_button_component_preview.rb b/test/components/previews/buttons/primary_button_component_preview.rb deleted file mode 100644 index 4d9a04222..000000000 --- a/test/components/previews/buttons/primary_button_component_preview.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true -class Buttons::PrimaryButtonComponentPreview < ViewComponent::Preview - layout 'component_preview_not_centred' - - - def primary - def primary() - render Buttons::PrimaryButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary") - end - end - - - def secondary - def secondary() - render Buttons::PrimaryButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "secondary") - end - end - - -end \ No newline at end of file diff --git a/test/components/previews/buttons/regular_button_component_preview.rb b/test/components/previews/buttons/regular_button_component_preview.rb new file mode 100644 index 000000000..355f3d086 --- /dev/null +++ b/test/components/previews/buttons/regular_button_component_preview.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true +class Buttons::RegularButtonComponentPreview < ViewComponent::Preview + layout 'component_preview_not_centred' + + + def primary + def primary() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "submit", variant: "primary") + end + end + + + def secondary + def secondary() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "submit", variant: "secondary") + end + end + + +end \ No newline at end of file From e8842b4dacaac8d85491385485d770ddecfb3996 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 1 Aug 2023 15:27:07 +0000 Subject: [PATCH 402/533] add link type for regular button component --- .../components/regular_button.scss | 4 ++-- .../buttons/regular_button_component.rb | 3 ++- .../regular_button_component.html.haml | 20 +++++++++++++------ .../regular_button_component_preview.rb | 4 ++-- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/components/regular_button.scss b/app/assets/stylesheets/components/regular_button.scss index 323bec3c1..6e7bbe69b 100644 --- a/app/assets/stylesheets/components/regular_button.scss +++ b/app/assets/stylesheets/components/regular_button.scss @@ -9,7 +9,7 @@ } .primary-button { - color: white; + color: white !important; background-color: var(--primary-color); border: none; transition: background-color ease 0.3s; @@ -35,7 +35,7 @@ .secondary-button:hover { background-color: var(--primary-color); cursor: pointer; - color: white; + color: white !important; .secondary-button-icon path { fill: white; } diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index 19630a929..f1f17bd76 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -1,5 +1,5 @@ class Buttons::RegularButtonComponent < ViewComponent::Base - def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "primary", icon: "", icon_type:"left") + def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "primary", icon: "", icon_type:"left", href: "#") @name = name @value = value @variant = variant @@ -8,5 +8,6 @@ def initialize(name: "", value: ,variant: "primary", type: "regular", style: "re @color = color @icon = icon @icon_type = icon_type + @href = href end end diff --git a/app/components/buttons/regular_button_component/regular_button_component.html.haml b/app/components/buttons/regular_button_component/regular_button_component.html.haml index 190fc5047..887ddf381 100644 --- a/app/components/buttons/regular_button_component/regular_button_component.html.haml +++ b/app/components/buttons/regular_button_component/regular_button_component.html.haml @@ -1,10 +1,18 @@ .button-container - %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button", type: "#{"submit" if @type == "submit"}"} - - if @icon != "" && @icon_type == "left" - = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" - = @value - - if @icon != "" && @icon_type == "right" - = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" + - if @type == "link" + %a.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button", href: @href} + - if @icon != "" && @icon_type == "left" + = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" + = @value + - if @icon != "" && @icon_type == "right" + = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" + - else + %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button", type: "#{"submit" if @type == "submit"}"} + - if @icon != "" && @icon_type == "left" + = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" + = @value + - if @icon != "" && @icon_type == "right" + = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" .animation-container#loading-animation .lds-ellipsis diff --git a/test/components/previews/buttons/regular_button_component_preview.rb b/test/components/previews/buttons/regular_button_component_preview.rb index 355f3d086..453952217 100644 --- a/test/components/previews/buttons/regular_button_component_preview.rb +++ b/test/components/previews/buttons/regular_button_component_preview.rb @@ -5,14 +5,14 @@ class Buttons::RegularButtonComponentPreview < ViewComponent::Preview def primary def primary() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "submit", variant: "primary") + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "link", variant: "primary", href: "https://www.google.com") end end def secondary def secondary() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "submit", variant: "secondary") + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "link", variant: "secondary",href: "https://www.google.com") end end From c3be314fb677a48d57ab07af71adf301a0d90290 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 4 Aug 2023 08:50:54 +0200 Subject: [PATCH 403/533] install and configure omniauth gems --- Gemfile | 9 +- Gemfile.lock | 152 +++++++++++++++++--------- config/bioportal_config_env.rb.sample | 28 +++++ config/initializers/omniauth.rb | 5 + 4 files changed, 143 insertions(+), 51 deletions(-) create mode 100644 config/initializers/omniauth.rb diff --git a/Gemfile b/Gemfile index 12069fa20..788d61707 100644 --- a/Gemfile +++ b/Gemfile @@ -76,6 +76,13 @@ gem 'inline_svg' gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'development' +# Multi-Provider Authentication +gem 'omniauth' +gem "omniauth-rails_csrf_protection" +gem 'omniauth-github' +gem 'omniauth-google-oauth2' +gem 'omniauth-orcid' +gem 'omniauth-keycloak' group :staging, :production, :appliance do # application monitoring @@ -123,4 +130,4 @@ end gem "net-ftp", "~> 0.2.0", require: false gem "net-http" -gem 'inline_svg' + diff --git a/Gemfile.lock b/Gemfile.lock index 1b6b17dff..72a708d4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git - revision: ca20880499a737803120f18ce99c14d3f10bc071 + revision: f49cd49aee437c98221521f7763ecb8386855e17 branch: development specs: ontologies_api_client (2.2.0) @@ -84,12 +84,14 @@ GEM tzinfo (~> 2.0) addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) + aes_key_wrap (1.1.0) airbrussh (1.4.1) sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) autoprefixer-rails (10.4.13.0) execjs (~> 2) bcrypt_pbkdf (1.1.0) + bindata (2.4.15) bindex (0.8.1) bootsnap (1.16.0) msgpack (~> 1.2) @@ -110,12 +112,12 @@ GEM capistrano (~> 3.0) capistrano-passenger (0.2.1) capistrano (~> 3.0) - capistrano-rails (1.6.2) + capistrano-rails (1.6.3) capistrano (~> 3.1) capistrano-bundler (>= 1.1, < 3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.39.1) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -133,7 +135,7 @@ GEM addressable cube-ruby (0.0.3) daemons (1.4.1) - dalli (3.2.4) + dalli (3.2.5) date (3.3.3) debug (1.8.0) irb (>= 1.5.0) @@ -145,7 +147,7 @@ GEM erubi (1.12.0) erubis (2.7.0) eventmachine (1.2.7) - excon (0.99.0) + excon (0.100.0) execjs (2.8.1) faraday (2.0.1) faraday-net_http (~> 2.0) @@ -153,6 +155,8 @@ GEM faraday-excon (2.0.0) excon (>= 0.27.4) faraday (~> 2.0.0.alpha.pre.2) + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) faraday-multipart (1.0.4) multipart-post (~> 2) faraday-net_http (2.1.0) @@ -160,13 +164,14 @@ GEM flamegraph (0.9.5) globalid (1.1.0) activesupport (>= 5.0) - graphql (2.0.22) + graphql (2.0.24) graphql-client (0.18.0) activesupport (>= 3.0) graphql haml (5.2.2) temple (>= 0.8.0) tilt + hashie (5.0.0) html2haml (2.3.0) erubis (~> 2.7.0) haml (>= 4.0) @@ -177,27 +182,35 @@ GEM http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) - i18n (1.13.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) iconv (1.0.8) - importmap-rails (1.1.6) + importmap-rails (1.2.1) actionpack (>= 6.0.0) railties (>= 6.0.0) inline_svg (1.9.0) activesupport (>= 3.0) nokogiri (>= 1.6) io-console (0.6.0) - irb (1.6.4) - reline (>= 0.3.0) - jquery-rails (4.5.1) + irb (1.7.4) + reline (>= 0.3.6) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - jsbundling-rails (1.1.1) + jsbundling-rails (1.1.2) railties (>= 6.0.0) json (2.6.3) + json-jwt (1.16.3) + activesupport (>= 4.2) + aes_key_wrap + bindata + faraday (~> 2.0) + faraday-follow_redirects + jwt (2.7.1) + language_server-protocol (3.17.0.3) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -230,10 +243,10 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) mini_mime (1.1.2) - mini_portile2 (2.8.2) - minitest (5.18.0) - msgpack (1.7.1) + minitest (5.19.0) + msgpack (1.7.2) multi_json (1.15.0) + multi_xml (0.6.0) multipart-post (2.3.0) mysql2 (0.5.3) net-ftp (0.2.0) @@ -241,7 +254,7 @@ GEM time net-http (0.3.2) uri - net-imap (0.3.4) + net-imap (0.3.7) date net-protocol net-pop (0.1.2) @@ -252,33 +265,63 @@ GEM net-ssh (>= 2.6.5, < 8.0.0) net-smtp (0.3.3) net-protocol - net-ssh (7.1.0) + net-ssh (7.2.0) netrc (0.11.0) - newrelic_rpm (9.2.2) + newrelic_rpm (9.3.1) nio4r (2.5.9) - nokogiri (1.14.2-x86_64-linux) + nokogiri (1.15.3-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.2) - mini_portile2 (~> 2.8.2) + nokogiri (1.15.3-x86_64-linux) racc (~> 1.4) - oj (3.14.3) + oauth2 (1.4.11) + faraday (>= 0.17.3, < 3.0) + jwt (>= 1.0, < 3.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 4) + oj (3.15.1) + omniauth (1.9.2) + hashie (>= 3.4.6) + rack (>= 1.6.2, < 3) + omniauth-github (1.4.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-google-oauth2 (0.8.2) + jwt (>= 2.0) + oauth2 (~> 1.1) + omniauth (~> 1.1) + omniauth-oauth2 (>= 1.6) + omniauth-keycloak (1.2.1) + json-jwt (~> 1.12) + omniauth (~> 1.9.0) + omniauth-oauth2 (~> 1.6.0) + omniauth-oauth2 (1.6.0) + oauth2 (~> 1.1) + omniauth (~> 1.9) + omniauth-orcid (2.1.1) + omniauth-oauth2 (~> 1.3) + ruby_dig (~> 0.0.2) + omniauth-rails_csrf_protection (0.1.2) + actionpack (>= 4.2) + omniauth (>= 1.3.1) open_uri_redirections (0.2.1) parallel (1.23.0) - parser (3.2.2.1) + parser (3.2.2.3) ast (~> 2.4.1) + racc popper_js (1.16.1) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) psych (3.3.4) - public_suffix (5.0.1) - puma (5.6.5) + public_suffix (5.0.3) + puma (5.6.6) nio4r (~> 2.0) - racc (1.6.2) - rack (2.2.7) + racc (1.7.1) + rack (2.2.8) rack-accept (0.4.5) rack (>= 0.4) - rack-mini-profiler (3.1.0) + rack-mini-profiler (3.1.1) rack (>= 1.2.0) rack-test (2.1.0) rack (>= 1.3) @@ -296,8 +339,9 @@ GEM activesupport (= 7.0.3) bundler (>= 1.15.0) railties (= 7.0.3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-html-sanitizer (1.6.0) loofah (~> 2.21) @@ -325,22 +369,22 @@ GEM recaptcha (5.9.0) json redcarpet (3.6.0) - regexp_parser (2.8.0) - reline (0.3.4) + regexp_parser (2.8.1) + reline (0.3.7) io-console (~> 0.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) - rouge (4.1.2) + rexml (3.2.6) + rouge (4.1.3) rspec-core (3.12.2) rspec-support (~> 3.12.0) rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.5) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-rails (6.0.3) @@ -351,22 +395,24 @@ GEM rspec-expectations (~> 3.12) rspec-mocks (~> 3.12) rspec-support (~> 3.12) - rspec-support (3.12.0) - rubocop (1.51.0) + rspec-support (3.12.1) + rubocop (1.55.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - ruby_parser (3.20.1) + ruby_dig (0.0.2) + ruby_parser (3.20.3) sexp_processor (~> 4.16) rubyzip (2.3.2) sassc (2.4.0) @@ -391,24 +437,24 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sshkit (1.21.4) + sshkit (1.21.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) stackprof (0.2.25) stimulus-rails (1.2.1) railties (>= 6.0.0) temple (0.10.2) - terser (1.1.16) + terser (1.1.17) execjs (>= 0.3.0, < 3) thin (1.8.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (1.2.2) - tilt (2.1.0) + tilt (2.2.0) time (0.2.2) date - timeout (0.3.2) + timeout (0.4.0) turbo-rails (1.4.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) @@ -424,7 +470,7 @@ GEM unf_ext unf_ext (0.0.8.2) unicode-display_width (2.4.2) - uri (0.12.1) + uri (0.12.2) view_component (2.82.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) @@ -434,22 +480,22 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webdrivers (5.2.0) + webdrivers (5.3.1) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (~> 4.0) + selenium-webdriver (~> 4.0, < 4.11) websocket (1.2.9) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.1) xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.34) - zeitwerk (2.6.7) + zeitwerk (2.6.11) PLATFORMS - ruby + x86_64-darwin-21 x86_64-linux DEPENDENCIES @@ -488,6 +534,12 @@ DEPENDENCIES net-http newrelic_rpm oj + omniauth + omniauth-github + omniauth-google-oauth2 + omniauth-keycloak + omniauth-orcid + omniauth-rails_csrf_protection ontologies_api_client! open_uri_redirections pry diff --git a/config/bioportal_config_env.rb.sample b/config/bioportal_config_env.rb.sample index 4c83979d0..0f747779c 100644 --- a/config/bioportal_config_env.rb.sample +++ b/config/bioportal_config_env.rb.sample @@ -61,6 +61,34 @@ $ANNOUNCE_LIST||= "users-list@test" # Where "ncbo" is the namespace used as key in the interportal_hash $INTERPORTAL_HASH = {} +# OAuth2 authentication +$OMNIAUTH_PROVIDERS = { + github: { + client_id: 'CLIENT_ID', + client_secret: 'CLIENT_SECRET', + icon: 'icons/github.svg', + }, + google: { + strategy: :google_oauth2, + client_id: 'CLIENT_ID', + client_secret: 'CLIENT_SECRET', + icon: 'icons/google.svg', + }, + orcid: { + client_id: 'CLIENT_SECRET', + client_secret: 'CLIENT_SECRET', + icon: 'icons/orcid.svg' + }, + keycloak: { + strategy: :keycloak_openid, + client_id: 'YOUR_KEYCLOAK_CLIENT_ID', + client_secret: 'YOUR_KEYCLOAK_CLIENT_SECRET', + client_options: { site: 'KEYCLOAK_SITE', realm: 'KEYCLOAK_REALM' }, + name: 'keycloak', + icon: 'icons/keycloak.svg' + } +}.freeze + # Don't load and don't display recent mappings if false, in case of too many mappings (take longer to load homepage) $DISPLAY_RECENT = false diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb new file mode 100644 index 000000000..af53788f9 --- /dev/null +++ b/config/initializers/omniauth.rb @@ -0,0 +1,5 @@ +Rails.application.config.middleware.use OmniAuth::Builder do + $OMNIAUTH_PROVIDERS.each do |provider, config| + provider config[:strategy] || provider, config[:client_id], config[:client_secret], client_options: {}.merge(config[:client_options].to_h) + end +end \ No newline at end of file From 70cb7ce665bfe4897c062874835ae33cb339e68f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 4 Aug 2023 08:51:46 +0200 Subject: [PATCH 404/533] add a helper to get omniauth_providers details --- app/helpers/application_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 91e2ed705..0c92e5030 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -29,6 +29,10 @@ def get_apikey end end + def omniauth_providers_info + $OMNIAUTH_PROVIDERS + end + def isOwner?(id) unless session[:user].nil? if session[:user].admin? From fa9f56ddf6ce8d83955777f869f3b2c89ea180b2 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 4 Aug 2023 09:17:59 +0200 Subject: [PATCH 405/533] add external auth providers icons in the login in page --- app/assets/images/icons/github.svg | 4 ++++ app/assets/images/icons/google.svg | 4 ++++ app/assets/images/icons/keycloak.svg | 6 ++++++ app/assets/images/icons/orcid.svg | 4 ++++ app/assets/stylesheets/login.scss | 9 +++++---- app/views/login/index.html.haml | 27 ++++++++++++++++++--------- 6 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 app/assets/images/icons/github.svg create mode 100644 app/assets/images/icons/google.svg create mode 100644 app/assets/images/icons/keycloak.svg create mode 100644 app/assets/images/icons/orcid.svg diff --git a/app/assets/images/icons/github.svg b/app/assets/images/icons/github.svg new file mode 100644 index 000000000..0e0143ed1 --- /dev/null +++ b/app/assets/images/icons/github.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/app/assets/images/icons/google.svg b/app/assets/images/icons/google.svg new file mode 100644 index 000000000..004ab7934 --- /dev/null +++ b/app/assets/images/icons/google.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/app/assets/images/icons/keycloak.svg b/app/assets/images/icons/keycloak.svg new file mode 100644 index 000000000..8b3cfb86c --- /dev/null +++ b/app/assets/images/icons/keycloak.svg @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/assets/images/icons/orcid.svg b/app/assets/images/icons/orcid.svg new file mode 100644 index 000000000..71db88dae --- /dev/null +++ b/app/assets/images/icons/orcid.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index f2d68c91d..6733c0027 100644 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -1,8 +1,9 @@ .login-form{ - margin-top: 30px; - padding: 37px 41px; - box-shadow: rgba(0, 0, 0, 0.08) 0px 20px 50px; - border-radius: 14px; + margin-top: 30px; + padding: 37px 41px; + box-shadow: rgba(0, 0, 0, 0.08) 0px 20px 50px; + border-radius: 14px; + max-width: 439px; } .login-input{ diff --git a/app/views/login/index.html.haml b/app/views/login/index.html.haml index 16d6b495a..f276e7759 100644 --- a/app/views/login/index.html.haml +++ b/app/views/login/index.html.haml @@ -1,13 +1,13 @@ - @title = "Login" -= form_for(:user, :url => {:controller => 'login',:action=>'create'}) do |f| - - unless @errors.nil? - %div{:style => "color:red;"} - Errors On Form - %ul - - for error in @errors - %li= error - .d-flex.justify-content-center - .login-form +- unless @errors.nil? + %div{:style => "color:red;"} + Errors On Form + %ul + - for error in @errors + %li= error +.d-flex.justify-content-center + .login-form + = form_for(:user, :url => {:controller => 'login',:action=>'create'}) do |f| %p.login-input-title Username or Email = text_field 'user', 'username', class: "login-input email-input", placeholder: "Enter your email" %p.login-input-title Password @@ -18,3 +18,12 @@ %p.dont-have-account Don't have an account? %a.text-decoration-none{:href => new_user_path} Register + %hr.divider.w-100 + %div.d-flex.justify-content-center.flew-wrap + - omniauth_providers_info.each do |provider, config| + = button_to "/auth/#{config[:name] || config[:strategy] || provider}", + class: 'btn btn-lg', style:'width: 70px', title: "Login with #{provider.to_s.humanize}", 'data-turbo': false do + - if config[:icon] + = inline_svg config[:icon] + - else + = provider.to_s.humanize \ No newline at end of file From 69a17c76a5388b2ded8c1b07b4487ad4e9744af1 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 4 Aug 2023 10:57:35 +0200 Subject: [PATCH 406/533] add oauth login action --- app/controllers/login_controller.rb | 21 +++++++++++++++++++ app/javascript/component_controllers/index.js | 2 +- config/routes.rb | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb index bae176851..795326da8 100755 --- a/app/controllers/login_controller.rb +++ b/app/controllers/login_controller.rb @@ -38,6 +38,27 @@ def create end end + + def create_omniauth + auth_data = request.env['omniauth.auth'] + auth_code = auth_data.credentials.token + binding.pry + logged_in_user = LinkedData::Client::HTTP.post("#{LinkedData::Client.settings.rest_url}/users/authenticate", { access_token: auth_code , token_provider: params[:provider] }) + if logged_in_user && !logged_in_user.errors + login(logged_in_user) + redirect = "/" + + if session[:redirect] + redirect = CGI.unescape(session[:redirect]) + end + + redirect_to redirect + else + @errors = ["#{params[:provider]} authentication failed"] + render :action => 'index' + end + end + # Login as the provided username (only for admin users) def login_as unless session[:user] && session[:user].admin? diff --git a/app/javascript/component_controllers/index.js b/app/javascript/component_controllers/index.js index b9968423b..54719f4a3 100644 --- a/app/javascript/component_controllers/index.js +++ b/app/javascript/component_controllers/index.js @@ -2,7 +2,7 @@ import {application} from "../controllers/application"; import TurboModalController from "../../components/turbo_modal_component/turbo_modal_component_controller" import FileInputLoaderController - from "../../components/form/file_input_component/file_input_loader_component_controller"; + from "../../components/input/file_input_component/file_input_loader_component_controller"; import Select_input_component_controller from "../../components/select_input_component/select_input_component_controller"; diff --git a/config/routes.rb b/config/routes.rb index 85545167b..212c4a039 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,7 @@ root to: 'home#index' + get 'auth/:provider/callback', to: 'login#create_omniauth' get 'locale/:language', to: 'language#set_locale_language' get '/notes/new_comment', to: 'notes#new_comment' From 5a8f1a2bbcfb028d9c0ee29e28c7001966126428 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 6 Aug 2023 02:57:03 +0200 Subject: [PATCH 407/533] add omniauth_token_provider helper --- app/controllers/login_controller.rb | 5 +++-- app/helpers/application_helper.rb | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb index 795326da8..aa50c31b9 100755 --- a/app/controllers/login_controller.rb +++ b/app/controllers/login_controller.rb @@ -42,8 +42,9 @@ def create def create_omniauth auth_data = request.env['omniauth.auth'] auth_code = auth_data.credentials.token - binding.pry - logged_in_user = LinkedData::Client::HTTP.post("#{LinkedData::Client.settings.rest_url}/users/authenticate", { access_token: auth_code , token_provider: params[:provider] }) + token_provider = helpers.omniauth_token_provider(params[:provider]) + + logged_in_user = LinkedData::Client::HTTP.post("#{LinkedData::Client.settings.rest_url}/users/authenticate", { access_token: auth_code , token_provider: token_provider}) if logged_in_user && !logged_in_user.errors login(logged_in_user) redirect = "/" diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0c92e5030..82cfae666 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -33,6 +33,14 @@ def omniauth_providers_info $OMNIAUTH_PROVIDERS end + def omniauth_provider_info(strategy) + omniauth_providers_info.select {|k,v| v[:strategy].eql?(strategy.to_sym)} + end + + def omniauth_token_provider(strategy) + omniauth_provider_info(strategy).keys.first + end + def isOwner?(id) unless session[:user].nil? if session[:user].admin? From f6d0c5ecfcbc40eb2e9b49f4e494c118c83dbe8b Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 6 Aug 2023 05:42:55 +0200 Subject: [PATCH 408/533] add outline state to the tabs component --- app/assets/stylesheets/components/index.scss | 1 + .../components/outline_tabs_container.scss | 27 +++++++++++++++++++ .../components/tabs_container.scss | 2 -- app/components/tabs_container_component.rb | 15 ++++++++--- .../tabs_container_component.html.haml | 2 +- .../tabs_container_component_preview.rb | 20 +++++++++++++- 6 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 app/assets/stylesheets/components/outline_tabs_container.scss diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 9339757d5..cc4356cfd 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -12,4 +12,5 @@ @import 'text_area_field'; @import 'tabs_container'; @import 'pill_tabs_container'; +@import 'outline_tabs_container'; diff --git a/app/assets/stylesheets/components/outline_tabs_container.scss b/app/assets/stylesheets/components/outline_tabs_container.scss new file mode 100644 index 000000000..76c390d92 --- /dev/null +++ b/app/assets/stylesheets/components/outline_tabs_container.scss @@ -0,0 +1,27 @@ + +.outline-tabs{ + border: 1px solid rgba(0, 0, 0, 0.125); + border-radius: 0.25rem 0.25rem 0 0; + padding-top: 1rem; +} +.outline-tabs .tab-items .nav-item{ + margin-right: 0; + +} + +.outline-tabs .tab-items .nav-item.active a{ + color: var(--primary-color) !important; +} + +.outline-tabs .nav-item .tab-link{ + display: block; + padding: 0 1rem 0.2rem 1rem; +} + +.outline-tabs + .tab-content { + .tab-pane{ + border: 1px solid rgba(0, 0, 0, 0.125); + border-top: none ; + border-radius: 0 0 0.25rem 0.25rem; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/components/tabs_container.scss b/app/assets/stylesheets/components/tabs_container.scss index 0c02285b3..87ef9291c 100644 --- a/app/assets/stylesheets/components/tabs_container.scss +++ b/app/assets/stylesheets/components/tabs_container.scss @@ -18,7 +18,6 @@ display: flex; margin: 0; position: relative; - padding: 0 50px; } .tabs-container .tab-items div { @@ -47,7 +46,6 @@ .tabs-container .tab-items .active { font-weight: 500; - color: black; opacity: 100%; } diff --git a/app/components/tabs_container_component.rb b/app/components/tabs_container_component.rb index 8265c1ab0..bb9ecaa21 100644 --- a/app/components/tabs_container_component.rb +++ b/app/components/tabs_container_component.rb @@ -6,15 +6,24 @@ class TabsContainerComponent < ViewComponent::Base renders_many :item_contents renders_one :pinned_right - def initialize(id: '', url_parameter: nil, pill: false) + def initialize(id: '', url_parameter: nil, type: 'primary') super @url_parameter = url_parameter - @pill = pill + @type = type @id = id end def container_class - @pill ? 'pill-tabs-container' : 'tabs-container' + case @type + when 'primary' + 'tabs-container' + when 'outline' + 'tabs-container outline-tabs' + when 'pill' + 'pill-tabs-container' + else + 'tabs-container' + end end def item_target(item) diff --git a/app/components/tabs_container_component/tabs_container_component.html.haml b/app/components/tabs_container_component/tabs_container_component.html.haml index dfc2f2d39..2ee9f8818 100644 --- a/app/components/tabs_container_component/tabs_container_component.html.haml +++ b/app/components/tabs_container_component/tabs_container_component.html.haml @@ -6,7 +6,7 @@ - unless @pill %hr - if pinned_right? - %div.d-flex + %div.d-flex.mx-1 = pinned_right .tab-content diff --git a/test/components/previews/layout/tabs_container_component_preview.rb b/test/components/previews/layout/tabs_container_component_preview.rb index 96f7bcfbb..b82e09f32 100644 --- a/test/components/previews/layout/tabs_container_component_preview.rb +++ b/test/components/previews/layout/tabs_container_component_preview.rb @@ -20,7 +20,25 @@ def default end def pill - render TabsContainerComponent.new(pill: true) do |c| + render TabsContainerComponent.new(type: 'pill') do |c| + sections = ['section 1', 'section 2', 'section 3', 'section 4'] + + sections.each do |section_title| + c.item(title: section_title, + path: "#{section_title}path", + selected: section_title.eql?('section 2'), + page_name: "#{section_title}path") + + c.item_content do + section_title + end + end + + end + end + + def outline + render TabsContainerComponent.new(type: 'outline') do |c| sections = ['section 1', 'section 2', 'section 3', 'section 4'] sections.each do |section_title| From 7786dc8c7645d676524f6c7d0db80b3f01ea1ce1 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 6 Aug 2023 05:45:06 +0200 Subject: [PATCH 409/533] migrate concept show to use tabs outline --- app/assets/stylesheets/concepts.scss | 20 ++++++++++++++------ app/views/concepts/_show.html.haml | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/concepts.scss b/app/assets/stylesheets/concepts.scss index 0c8c7a08d..ae83c9df4 100644 --- a/app/assets/stylesheets/concepts.scss +++ b/app/assets/stylesheets/concepts.scss @@ -14,7 +14,7 @@ } a.btn.btn-link { - padding: 0; + padding: 0; } } @@ -55,7 +55,7 @@ div.synonym-change-request button { justify-content: space-between; align-items: center; } -.concepts-tabs{ +.concepts-tabs{ display: flex; justify-content: space-between; width: 589px; @@ -101,7 +101,7 @@ div.synonym-change-request button { border-collapse: collapse; width: 100%; border-spacing: 0; - + } .concepts-content td{ padding: 12px 24px; @@ -130,7 +130,7 @@ div.synonym-change-request button { margin-top: 20px; border-radius: 5px; border: 1px solid #DFDFDF; - + } .concepts-raw-title{ display: flex; @@ -144,6 +144,14 @@ div.synonym-change-request button { .concepts-raw-title div{ padding: 10px 0px; } + #details_content{ - margin-top: 15px; -} \ No newline at end of file + border: none !important; +} + +#details_content .card{ + border-top: none !important; + border-top-left-radius: 0; + border-top-right-radius: 0; +} + diff --git a/app/views/concepts/_show.html.haml b/app/views/concepts/_show.html.haml index ff1d28fd1..1988ec900 100644 --- a/app/views/concepts/_show.html.haml +++ b/app/views/concepts/_show.html.haml @@ -3,7 +3,7 @@ %div{:style => "padding: 100px 0; font-size: larger; font-weight: bold; text-align: center;"} Use the "Jump To" to find a class and display details, visualization, notes, and mappings - else - = render TabsContainerComponent.new(pill: true) do |c| + = render TabsContainerComponent.new(type:'outline') do |c| - c.pinned_right do - if $PURL_ENABLED From bc6545ef2f5a3ac81fb228c7e4cc63507aff1995 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sun, 6 Aug 2023 05:45:55 +0200 Subject: [PATCH 410/533] migrate concept browser to use tabs outline --- app/assets/images/icons/calendar.svg | 3 ++ app/assets/images/icons/list-tree.svg | 3 ++ app/assets/images/icons/list.svg | 6 +++ app/assets/images/list-tree.svg | 1 - app/assets/stylesheets/concepts.scss | 20 ++++++++++ app/assets/stylesheets/ontologies.scss | 1 - app/views/layouts/_ontology_viewer.html.haml | 8 ++-- .../_concepts_browser.html.haml | 40 +++++++++++-------- .../ontologies/sections/visualize.html.haml | 4 +- 9 files changed, 62 insertions(+), 24 deletions(-) create mode 100644 app/assets/images/icons/calendar.svg create mode 100644 app/assets/images/icons/list-tree.svg create mode 100644 app/assets/images/icons/list.svg delete mode 100644 app/assets/images/list-tree.svg diff --git a/app/assets/images/icons/calendar.svg b/app/assets/images/icons/calendar.svg new file mode 100644 index 000000000..7ad6a2f7a --- /dev/null +++ b/app/assets/images/icons/calendar.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/icons/list-tree.svg b/app/assets/images/icons/list-tree.svg new file mode 100644 index 000000000..eac310be4 --- /dev/null +++ b/app/assets/images/icons/list-tree.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/icons/list.svg b/app/assets/images/icons/list.svg new file mode 100644 index 000000000..4c1b3ded2 --- /dev/null +++ b/app/assets/images/icons/list.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/assets/images/list-tree.svg b/app/assets/images/list-tree.svg deleted file mode 100644 index 4180dac32..000000000 --- a/app/assets/images/list-tree.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/stylesheets/concepts.scss b/app/assets/stylesheets/concepts.scss index ae83c9df4..d5e331b16 100644 --- a/app/assets/stylesheets/concepts.scss +++ b/app/assets/stylesheets/concepts.scss @@ -155,3 +155,23 @@ div.synonym-change-request button { border-top-right-radius: 0; } +#concept_browser{ + .outline-tabs .tab-items{ + width: 100%; + } + .outline-tabs .tab-items .nav-item { + flex: 1; + } + .outline-tabs .tab-items .nav-item a { + display: flex; + justify-content: center; + svg path { + fill: #5e5e5e !important; + } + } + .outline-tabs .tab-items .nav-item.active a { + svg path { + fill: var(--primary-color) !important; + } + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/ontologies.scss b/app/assets/stylesheets/ontologies.scss index d4b694adb..ffd00d9aa 100644 --- a/app/assets/stylesheets/ontologies.scss +++ b/app/assets/stylesheets/ontologies.scss @@ -11,7 +11,6 @@ $ont-show-bg-color: #e9ecef; } .ontologies.show .gutter { - background-color: rgba(0, 0, 0, 0.03); background-repeat: no-repeat; background-position: center; diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index 930f5f4eb..218f75f2c 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -41,12 +41,12 @@ = render partial: 'kgcl_dialogs' - %div.row.pt-md-3.pb-md-2.p-2 - %div.col + %div.pt-md-3.pb-md-2.p-2 + %div = render partial: 'layouts/ontology_viewer/header' - %div.row.pb-4.p-2.bg-white{data: {controller: 'ontology-viewer-tabs', 'ontology-viewer-tabs-language-sections-value': ontology_data_sections }} - %div.col + %div.pb-4.p-2.bg-white{data: {controller: 'ontology-viewer-tabs', 'ontology-viewer-tabs-language-sections-value': ontology_data_sections }} + %div - sections = sections_to_show %div.ontologies-tabs-container{data:{action: 'tab-selected->ontology-viewer-tabs#updateLanguageSelector'}} = render TabsContainerComponent.new(id: 'ontology_viewer', url_parameter: 'p') do |t| diff --git a/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml b/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml index 967c93e8c..ba3cfcd77 100644 --- a/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml +++ b/app/views/ontologies/concepts_browsers/_concepts_browser.html.haml @@ -1,18 +1,26 @@ -%nav - .nav.nav-tabs.text-center{:role => "tablist", style:"background-color: rgba(0, 0, 0, 0.03);"} +%div#concept_browser + = render TabsContainerComponent.new(type:'outline') do |c| + - c.item(id: 'tree-tab', selected: true) do + %span{title: 'Hierarchy view', 'data-controller': "tooltip"} + = inline_svg('icons/list-tree.svg', style:'width: 18px; height: 18px') - %a#concepts-tree-tab.nav-item.nav-link.active.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-tree-container", title: 'Hierarchy view', 'data-controller': "tooltip"} - %img{src: asset_path('list-tree.svg') , style:'width: 25px; height: 25px'} - if skos? - %a#concepts-list-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-list-container", title: 'Collection view', 'data-controller': "tooltip"} - %i.fas.fa-list.text-dark{style:'font-size: 25px'} - %a#concepts-date-sort-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-date-sort-container", title: 'Date view', 'data-controller': "tooltip"} - %i.far.fa-calendar-alt.text-dark{style:'font-size: 25px'} -.tab-content.px-1.py-2 - #concepts-tree-container.tab-pane.fade.show.active - = render partial: 'ontologies/concepts_browsers/concepts_tree' - - if skos? - #concepts-list-container.tab-pane.fade - = render partial: 'ontologies/concepts_browsers/concepts_list' - #concepts-date-sort-container.tab-pane.fade - = render partial: 'ontologies/concepts_browsers/concepts_date_sort' \ No newline at end of file + - c.item(id: 'list-tab') do + %span{title: 'Collection view', 'data-controller': "tooltip"} + = inline_svg('icons/list.svg', style:'width: 18px; height: 18px') + + - c.item(id: 'date-tab') do + %span{title: 'Date view', 'data-controller': "tooltip"} + = inline_svg('icons/calendar.svg', style:'width: 18px; height: 18px') + + - c.item_content do + %div.p-1 + = render partial: 'ontologies/concepts_browsers/concepts_tree' + - if skos? + - c.item_content do + %div.p-1 + = render partial: 'ontologies/concepts_browsers/concepts_list' + - c.item_content do + %div.p-1 + = render partial: 'ontologies/concepts_browsers/concepts_date_sort' + diff --git a/app/views/ontologies/sections/visualize.html.haml b/app/views/ontologies/sections/visualize.html.haml index fcaa805f2..3851db29d 100644 --- a/app/views/ontologies/sections/visualize.html.haml +++ b/app/views/ontologies/sections/visualize.html.haml @@ -5,9 +5,9 @@ - @enable_ontolobridge = !$NEW_TERM_REQUEST_ONTOLOGIES.nil? && $NEW_TERM_REQUEST_ONTOLOGIES.include?(@ontology.acronym) %div.tooltip %div#bd_content.bd_content.explore{data:{controller: 'container-splitter'}} - %div.sidebar.d-flex.flex-column.mr-2.card{data:{'container-splitter-target': 'container'}} + %div.sidebar.d-flex.flex-column.p-1.mr-1{data:{'container-splitter-target': 'container'}} = render partial: 'ontologies/concepts_browsers/concepts_browser' - %div#concept_content.d-flex.flex-column.p-1.ml-2{data:{'container-splitter-target': 'container'}} + %div#concept_content.d-flex.flex-column.p-1.ml-1{data:{'container-splitter-target': 'container'}} = render partial: 'concepts/show' - form_for(:search, :url => {:controller =>'search',:action=>'fetch_results'},:html=>{:id=>'search_form'}) do |f| From 1fe967214dc4a73aebfb0f33d9c66ef9bdffd7a1 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 7 Aug 2023 01:03:58 +0200 Subject: [PATCH 411/533] Add the checked property to the chips component --- app/components/chips_component.rb | 8 +++++++- app/components/chips_component/chips_component.html.haml | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/components/chips_component.rb b/app/components/chips_component.rb index ced043f2e..83ad63f6c 100644 --- a/app/components/chips_component.rb +++ b/app/components/chips_component.rb @@ -1,6 +1,12 @@ class ChipsComponent < ViewComponent::Base - def initialize(name:, value:) + def initialize(id: '', name:, value:, checked: false) + @id = id || name @name = name @value = value + @checked = checked + end + + def checked? + @checked end end \ No newline at end of file diff --git a/app/components/chips_component/chips_component.html.haml b/app/components/chips_component/chips_component.html.haml index 3e260e431..28f62c5d3 100644 --- a/app/components/chips_component/chips_component.html.haml +++ b/app/components/chips_component/chips_component.html.haml @@ -1,7 +1,7 @@ .chips-container %div - %label{:for => "chips-#{@name}-check"} - %input{:id => "chips-#{@name}-check", :name => @name, :type => "checkbox", :value => @value}/ + %label{:for => "chips-#{@id}-check"} + %input{:id => "chips-#{@id}-check", :name => @name, :type => "checkbox", :value => @value, checked: checked?} %span %svg.chips-check-icon{:fill => "none", :height => "8", :viewbox => "0 0 10 8", :width => "10", :xmlns => "http://www.w3.org/2000/svg"} %path{:d => "M9.76764 0.232287C9.45824 -0.0775267 8.95582 -0.0773313 8.646 0.232287L3.59787 5.28062L1.35419 3.03696C1.04438 2.72714 0.542174 2.72714 0.23236 3.03696C-0.0774534 3.34677 -0.0774534 3.84897 0.23236 4.15879L3.03684 6.96326C3.19165 7.11807 3.39464 7.19567 3.59765 7.19567C3.80067 7.19567 4.00386 7.11827 4.15867 6.96326L9.76764 1.3541C10.0775 1.0445 10.0775 0.542081 9.76764 0.232287Z"} From 527f9a2c401a898c5493796ec0d6375e4c578a79 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 7 Aug 2023 01:08:07 +0200 Subject: [PATCH 412/533] show by default one row in the nested from input component --- app/assets/stylesheets/components/nested_form.scss | 2 +- .../nested_form_inputs_component.html.haml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/components/nested_form.scss b/app/assets/stylesheets/components/nested_form.scss index 9f0ced278..137efc358 100644 --- a/app/assets/stylesheets/components/nested_form.scss +++ b/app/assets/stylesheets/components/nested_form.scss @@ -8,7 +8,7 @@ .nested-form-input-container input:focus{ - border: 1px solid #31B404 !important; + border: 1px solid var(--primary-color) !important; } .nested-form-input-container .delete{ diff --git a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml index 82778a86c..78a23641d 100644 --- a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml +++ b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml @@ -6,6 +6,7 @@ %div.d-flex.justify-content-end{style: 'width: 10%'} %div.delete{data: {action:"click->nested-form#remove"}} = inline_svg 'icons/delete.svg' + %div.titles = header %div.d-none @@ -18,6 +19,14 @@ %div.delete{data: {action:"click->nested-form#remove"}} = inline_svg 'icons/delete.svg' + - if rows.empty? + %div.d-flex.align-items-center.nested-form-wrapper.my-1{'data-new-record': 'true'} + %div{style: 'width: 90%'} + = template + %div.d-flex.justify-content-end{style: 'width: 10%'} + %div.delete{data: {action:"click->nested-form#remove"}} + = inline_svg 'icons/delete.svg' + %div{'data-nested-form-target': "target"} %div.add-another-object{data: {action:"click->nested-form#add"}} = inline_svg 'icons/plus.svg' From 205bb52ce687faa8668416a077b4e280a5822aa7 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Fri, 4 Aug 2023 13:23:09 +0000 Subject: [PATCH 413/533] Add email, password, url components to lookbook --- app/components/input/email_component.rb | 7 +++++++ .../email_component/email_component.html.haml | 1 + app/components/input/password_component.rb | 7 +++++++ .../password_component.html.haml | 1 + app/components/input/url_component.rb | 7 +++++++ .../input/url_component/url_component.html.haml | 1 + .../previews/input/email_component_preview.rb | 17 +++++++++++++++++ .../input/password_component_preview.rb | 17 +++++++++++++++++ .../previews/input/url_component_preview.rb | 17 +++++++++++++++++ 9 files changed, 75 insertions(+) create mode 100644 app/components/input/email_component.rb create mode 100644 app/components/input/email_component/email_component.html.haml create mode 100644 app/components/input/password_component.rb create mode 100644 app/components/input/password_component/password_component.html.haml create mode 100644 app/components/input/url_component.rb create mode 100644 app/components/input/url_component/url_component.html.haml create mode 100644 test/components/previews/input/email_component_preview.rb create mode 100644 test/components/previews/input/password_component_preview.rb create mode 100644 test/components/previews/input/url_component_preview.rb diff --git a/app/components/input/email_component.rb b/app/components/input/email_component.rb new file mode 100644 index 000000000..ca4c4e65c --- /dev/null +++ b/app/components/input/email_component.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class Input::EmailComponent < InputFieldComponent + def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '') + super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end +end diff --git a/app/components/input/email_component/email_component.html.haml b/app/components/input/email_component/email_component.html.haml new file mode 100644 index 000000000..f2cc534c4 --- /dev/null +++ b/app/components/input/email_component/email_component.html.haml @@ -0,0 +1 @@ += render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: "email") \ No newline at end of file diff --git a/app/components/input/password_component.rb b/app/components/input/password_component.rb new file mode 100644 index 000000000..5407c4d99 --- /dev/null +++ b/app/components/input/password_component.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class Input::PasswordComponent < InputFieldComponent + def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '') + super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end +end diff --git a/app/components/input/password_component/password_component.html.haml b/app/components/input/password_component/password_component.html.haml new file mode 100644 index 000000000..cbb66342b --- /dev/null +++ b/app/components/input/password_component/password_component.html.haml @@ -0,0 +1 @@ += render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: "password") \ No newline at end of file diff --git a/app/components/input/url_component.rb b/app/components/input/url_component.rb new file mode 100644 index 000000000..b4b9100b7 --- /dev/null +++ b/app/components/input/url_component.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class Input::UrlComponent < InputFieldComponent + def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '') + super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end +end diff --git a/app/components/input/url_component/url_component.html.haml b/app/components/input/url_component/url_component.html.haml new file mode 100644 index 000000000..721ab6d8f --- /dev/null +++ b/app/components/input/url_component/url_component.html.haml @@ -0,0 +1 @@ += render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: "url") \ No newline at end of file diff --git a/test/components/previews/input/email_component_preview.rb b/test/components/previews/input/email_component_preview.rb new file mode 100644 index 000000000..a67a5e178 --- /dev/null +++ b/test/components/previews/input/email_component_preview.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class Input::EmailComponentPreview < ViewComponent::Preview + def default + # This is a url input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + # @param label text + # @param error_message text + # @param helper_text text + + def default(label: "Label", placeholder: "", error_message: "", helper_text: "") + render Input::EmailComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end + end +end diff --git a/test/components/previews/input/password_component_preview.rb b/test/components/previews/input/password_component_preview.rb new file mode 100644 index 000000000..86e1eda80 --- /dev/null +++ b/test/components/previews/input/password_component_preview.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class Input::PasswordComponentPreview < ViewComponent::Preview + def default + # This is a url input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + # @param label text + # @param error_message text + # @param helper_text text + + def default(label: "Label", placeholder: "", error_message: "", helper_text: "") + render Input::PasswordComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end + end +end diff --git a/test/components/previews/input/url_component_preview.rb b/test/components/previews/input/url_component_preview.rb new file mode 100644 index 000000000..53b4c8a10 --- /dev/null +++ b/test/components/previews/input/url_component_preview.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class Input::UrlComponentPreview < ViewComponent::Preview + def default + # This is a url input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + # @param label text + # @param error_message text + # @param helper_text text + + def default(label: "Label", placeholder: "", error_message: "", helper_text: "") + render Input::UrlComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end + end +end From 591e0db55a53a829a34fa9220c70d1a0bec46b29 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 1 Aug 2023 10:48:32 +0000 Subject: [PATCH 414/533] refactor select input component template to use the rails helper --- app/components/select_input_component.rb | 30 ++++++++++++++----- .../select_input_component.html.haml | 5 ---- 2 files changed, 23 insertions(+), 12 deletions(-) delete mode 100644 app/components/select_input_component/select_input_component.html.haml diff --git a/app/components/select_input_component.rb b/app/components/select_input_component.rb index e757304d6..611cd3bdc 100644 --- a/app/components/select_input_component.rb +++ b/app/components/select_input_component.rb @@ -4,19 +4,35 @@ class SelectInputComponent < ViewComponent::Base def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_values: true) super - @id = id + @id = id || "" @name = name @values = values @selected = selected @multiple = multiple @open_to_add_values = open_to_add_values end + + def call + select_input_tag(@id, @values, @selected, multiple: @multiple, open_to_add_values: @open_to_add_values) + end + + private + + def select_input_tag(id, values, selected, options = {}) + multiple = options[:multiple] || false + open_to_add_values = options[:open_to_add_values] || false - def options_values - if @selected.nil? || @selected.empty? - @selected = 0 - @values.unshift('') - end - options_for_select(@values, @selected) + select_html_options = { + id: "select_#{id}", + autocomplete: "off", + multiple: multiple, + data: { + controller: "select-input", + 'select-input-multiple-value': multiple, + 'select-input-open-add-value': open_to_add_values + } + } + #binding.pry + select_tag(id, options_for_select(values, selected), select_html_options) end end diff --git a/app/components/select_input_component/select_input_component.html.haml b/app/components/select_input_component/select_input_component.html.haml deleted file mode 100644 index 7c16a2ca8..000000000 --- a/app/components/select_input_component/select_input_component.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -%select{id: "select_#{@id}", autocomplete:"off", multiple: @multiple ,data: {controller: "select-input", 'select-input':{'multiple-value':@multiple, 'open-add-value':@open_to_add_values}}} - - @values.each do |value| - %option{value:@value, selected: value.eql?(@selected)} - = value - \ No newline at end of file From 32108379ac530c4ee944b3d887ff4f19e621e2a2 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Tue, 1 Aug 2023 10:49:03 +0000 Subject: [PATCH 415/533] use stimulus values in select input component controller --- .../select_input_component_controller.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/components/select_input_component/select_input_component_controller.js b/app/components/select_input_component/select_input_component_controller.js index 45c50a4d4..5002e90ea 100644 --- a/app/components/select_input_component/select_input_component_controller.js +++ b/app/components/select_input_component/select_input_component_controller.js @@ -2,12 +2,16 @@ import { Controller } from "@hotwired/stimulus" import TomSelect from "tom-select" export default class extends Controller { + static values = { + multiple: Boolean, + openAdd : Boolean + } connect() { let myOptions = {} - if (this.data.get("multipleValue")) { + if (this.multipleValue) { myOptions['plugins'] = ['remove_button']; } - if (this.data.get("openAddValue")) { + if (this.openAddValue) { myOptions['create'] = true; } new TomSelect(this.element, myOptions); From 62786dccdd347e81cba152a146c826244719daf3 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 7 Aug 2023 01:28:59 +0200 Subject: [PATCH 416/533] migrate date, email, password, url and text component to inline call --- app/components/input/date_component.rb | 6 +++++- .../input/date_component/date_component.html.haml | 1 - app/components/input/email_component.rb | 6 +++++- .../input/email_component/email_component.html.haml | 1 - app/components/input/password_component.rb | 6 +++++- .../input/password_component/password_component.html.haml | 1 - app/components/input/text_input_component.rb | 6 +++++- .../text_input_component/text_input_component.html.haml | 1 - app/components/input/url_component.rb | 6 +++++- app/components/input/url_component/url_component.html.haml | 1 - 10 files changed, 25 insertions(+), 10 deletions(-) delete mode 100644 app/components/input/date_component/date_component.html.haml delete mode 100644 app/components/input/email_component/email_component.html.haml delete mode 100644 app/components/input/password_component/password_component.html.haml delete mode 100644 app/components/input/text_input_component/text_input_component.html.haml delete mode 100644 app/components/input/url_component/url_component.html.haml diff --git a/app/components/input/date_component.rb b/app/components/input/date_component.rb index 3240562f3..fe85fa892 100644 --- a/app/components/input/date_component.rb +++ b/app/components/input/date_component.rb @@ -1,7 +1,11 @@ # frozen_string_literal: true -class Input::DateComponent < InputFieldComponent +class Input::DateComponent < Input::InputFieldComponent def initialize(label: '', name:, value: Date.today, placeholder: '', error_message: '', helper_text: '') super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) end + + def call + render Input::InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: 'date') + end end diff --git a/app/components/input/date_component/date_component.html.haml b/app/components/input/date_component/date_component.html.haml deleted file mode 100644 index ee412e9d0..000000000 --- a/app/components/input/date_component/date_component.html.haml +++ /dev/null @@ -1 +0,0 @@ -= render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: 'date') \ No newline at end of file diff --git a/app/components/input/email_component.rb b/app/components/input/email_component.rb index ca4c4e65c..8d68ba3bc 100644 --- a/app/components/input/email_component.rb +++ b/app/components/input/email_component.rb @@ -1,7 +1,11 @@ # frozen_string_literal: true -class Input::EmailComponent < InputFieldComponent +class Input::EmailComponent < Input::InputFieldComponent def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '') super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) end + + def call + render Input::InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: "email") + end end diff --git a/app/components/input/email_component/email_component.html.haml b/app/components/input/email_component/email_component.html.haml deleted file mode 100644 index f2cc534c4..000000000 --- a/app/components/input/email_component/email_component.html.haml +++ /dev/null @@ -1 +0,0 @@ -= render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: "email") \ No newline at end of file diff --git a/app/components/input/password_component.rb b/app/components/input/password_component.rb index 5407c4d99..435692a5b 100644 --- a/app/components/input/password_component.rb +++ b/app/components/input/password_component.rb @@ -1,7 +1,11 @@ # frozen_string_literal: true -class Input::PasswordComponent < InputFieldComponent +class Input::PasswordComponent < Input::InputFieldComponent def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '') super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) end + + def call + render Input::InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: "password") + end end diff --git a/app/components/input/password_component/password_component.html.haml b/app/components/input/password_component/password_component.html.haml deleted file mode 100644 index cbb66342b..000000000 --- a/app/components/input/password_component/password_component.html.haml +++ /dev/null @@ -1 +0,0 @@ -= render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: "password") \ No newline at end of file diff --git a/app/components/input/text_input_component.rb b/app/components/input/text_input_component.rb index ad5b2f5ef..7a38b3de0 100644 --- a/app/components/input/text_input_component.rb +++ b/app/components/input/text_input_component.rb @@ -1,7 +1,11 @@ # frozen_string_literal: true -class Input::TextInputComponent < InputFieldComponent +class Input::TextInputComponent < Input::InputFieldComponent def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '') super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) end + + def call + render Input::InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: @type) + end end diff --git a/app/components/input/text_input_component/text_input_component.html.haml b/app/components/input/text_input_component/text_input_component.html.haml deleted file mode 100644 index b68e5e790..000000000 --- a/app/components/input/text_input_component/text_input_component.html.haml +++ /dev/null @@ -1 +0,0 @@ -= render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: 'text') diff --git a/app/components/input/url_component.rb b/app/components/input/url_component.rb index b4b9100b7..01db0eb68 100644 --- a/app/components/input/url_component.rb +++ b/app/components/input/url_component.rb @@ -1,7 +1,11 @@ # frozen_string_literal: true -class Input::UrlComponent < InputFieldComponent +class Input::UrlComponent < Input::InputFieldComponent def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '') super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) end + + def call + render Input::InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: "url") + end end diff --git a/app/components/input/url_component/url_component.html.haml b/app/components/input/url_component/url_component.html.haml deleted file mode 100644 index 721ab6d8f..000000000 --- a/app/components/input/url_component/url_component.html.haml +++ /dev/null @@ -1 +0,0 @@ -= render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: "url") \ No newline at end of file From 6cffad8d142ed6f6b253e90eda19e41af7c49d4e Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 13 Jul 2023 13:07:44 +0200 Subject: [PATCH 417/533] fix text area component not showing the value given as argument --- .../input/text_area_component/text_area_component.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/components/input/text_area_component/text_area_component.html.haml b/app/components/input/text_area_component/text_area_component.html.haml index e8d960a90..26f5c4113 100644 --- a/app/components/input/text_area_component/text_area_component.html.haml +++ b/app/components/input/text_area_component/text_area_component.html.haml @@ -1,2 +1,3 @@ = render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text) do - %textarea.input-field-component{name: @name, rows: @rows, placeholder: @placeholder, style: error_style, value: @value} \ No newline at end of file + %textarea.input-field-component{name: @name, rows: @rows, placeholder: @placeholder, style: error_style} + = @value \ No newline at end of file From 03a106a956b798d6926ddc3b29681e1582f47e60 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 7 Aug 2023 01:32:37 +0200 Subject: [PATCH 418/533] move date, file,text_area,text,password,url, email to one preview file --- .../previews/input/date_component_preview.rb | 17 ---- .../previews/input/email_component_preview.rb | 17 ---- .../input/file_input_component_preview.rb | 9 -- .../input/input_field_component_preview.rb | 90 +++++++++++++++++++ .../input/password_component_preview.rb | 17 ---- .../input/text_area_component_preview.rb | 19 ---- .../input/text_input_component_preview.rb | 17 ---- .../previews/input/url_component_preview.rb | 17 ---- 8 files changed, 90 insertions(+), 113 deletions(-) delete mode 100644 test/components/previews/input/date_component_preview.rb delete mode 100644 test/components/previews/input/email_component_preview.rb delete mode 100644 test/components/previews/input/file_input_component_preview.rb create mode 100644 test/components/previews/input/input_field_component_preview.rb delete mode 100644 test/components/previews/input/password_component_preview.rb delete mode 100644 test/components/previews/input/text_area_component_preview.rb delete mode 100644 test/components/previews/input/text_input_component_preview.rb delete mode 100644 test/components/previews/input/url_component_preview.rb diff --git a/test/components/previews/input/date_component_preview.rb b/test/components/previews/input/date_component_preview.rb deleted file mode 100644 index 07cb53fb8..000000000 --- a/test/components/previews/input/date_component_preview.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class Input::DateComponentPreview < ViewComponent::Preview - def default - # This is a date input field: - # - To use it without a label: don't give a value to the param label or leave it empty. - # - To put it in error state: define the param error_message with the error message you want to be displayed. - # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. - # @param label text - # @param error_message text - # @param helper_text text - - def default(label: "Label", placeholder: "", error_message: "", helper_text: "") - render Input::DateComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) - end - end -end diff --git a/test/components/previews/input/email_component_preview.rb b/test/components/previews/input/email_component_preview.rb deleted file mode 100644 index a67a5e178..000000000 --- a/test/components/previews/input/email_component_preview.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class Input::EmailComponentPreview < ViewComponent::Preview - def default - # This is a url input field: - # - To use it without a label: don't give a value to the param label or leave it empty. - # - To put it in error state: define the param error_message with the error message you want to be displayed. - # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. - # @param label text - # @param error_message text - # @param helper_text text - - def default(label: "Label", placeholder: "", error_message: "", helper_text: "") - render Input::EmailComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) - end - end -end diff --git a/test/components/previews/input/file_input_component_preview.rb b/test/components/previews/input/file_input_component_preview.rb deleted file mode 100644 index 94638bf57..000000000 --- a/test/components/previews/input/file_input_component_preview.rb +++ /dev/null @@ -1,9 +0,0 @@ -class Input::FileInputComponentPreview < ViewComponent::Preview - - - def default - render Input::FileInputComponent.new(name: "file") - end - - -end \ No newline at end of file diff --git a/test/components/previews/input/input_field_component_preview.rb b/test/components/previews/input/input_field_component_preview.rb new file mode 100644 index 000000000..49849e984 --- /dev/null +++ b/test/components/previews/input/input_field_component_preview.rb @@ -0,0 +1,90 @@ +# frozen_string_literal: true + +class Input::InputFieldComponentPreview < ViewComponent::Preview + + # This is a date input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + # @param label text + # @param error_message text + # @param helper_text text + + def date(label: "Label", placeholder: "", error_message: "", helper_text: "") + render Input::DateComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end + + + # This is a url input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + # @param label text + # @param error_message text + # @param helper_text text + + def email(label: "Label", placeholder: "", error_message: "", helper_text: "") + render Input::EmailComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end + + + def file + render Input::FileInputComponent.new(name: "file") + end + + + # This is a url input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + # @param label text + # @param error_message text + # @param helper_text text + + def password(label: "Label", placeholder: "", error_message: "", helper_text: "") + render Input::PasswordComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end + + + # This is a url input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + # @param label text + # @param error_message text + # @param helper_text text + + def url(label: "Label", placeholder: "", error_message: "", helper_text: "") + render Input::UrlComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end + + # This is a text input field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + # @param label text + # @param placeholder text + # @param error_message text + # @param helper_text text + + def text(label: "Label", placeholder: "", error_message: "", helper_text: "") + render Input::TextInputComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) + end + + # This is a textarea field: + # - To use it without a label: don't give a value to the param label or leave it empty. + # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed. + # - To put it in error state: define the param error_message with the error message you want to be displayed. + # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. + + # @param label text + # @param placeholder text + # @param error_message text + # @param helper_text text + # @param rows number + + def text_area(label: "Label", placeholder: "", error_message: "", helper_text: "", rows: 5) + render Input::TextAreaComponent.new(label: label, name: "name",value: '', placeholder: placeholder, error_message: error_message, helper_text: helper_text, rows: rows) + end +end diff --git a/test/components/previews/input/password_component_preview.rb b/test/components/previews/input/password_component_preview.rb deleted file mode 100644 index 86e1eda80..000000000 --- a/test/components/previews/input/password_component_preview.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class Input::PasswordComponentPreview < ViewComponent::Preview - def default - # This is a url input field: - # - To use it without a label: don't give a value to the param label or leave it empty. - # - To put it in error state: define the param error_message with the error message you want to be displayed. - # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. - # @param label text - # @param error_message text - # @param helper_text text - - def default(label: "Label", placeholder: "", error_message: "", helper_text: "") - render Input::PasswordComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) - end - end -end diff --git a/test/components/previews/input/text_area_component_preview.rb b/test/components/previews/input/text_area_component_preview.rb deleted file mode 100644 index 3af24aa3b..000000000 --- a/test/components/previews/input/text_area_component_preview.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -class Input::TextAreaComponentPreview < ViewComponent::Preview - # This is a textarea field: - # - To use it without a label: don't give a value to the param label or leave it empty. - # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed. - # - To put it in error state: define the param error_message with the error message you want to be displayed. - # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. - - # @param label text - # @param placeholder text - # @param error_message text - # @param helper_text text - # @param rows number - - def default(label: "Label", placeholder: "", error_message: "", helper_text: "", rows: 5) - render Input::TextAreaComponent.new(label: label, name: "name",value: '', placeholder: placeholder, error_message: error_message, helper_text: helper_text, rows: rows) - end -end diff --git a/test/components/previews/input/text_input_component_preview.rb b/test/components/previews/input/text_input_component_preview.rb deleted file mode 100644 index e5e5f9a87..000000000 --- a/test/components/previews/input/text_input_component_preview.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class Input::TextInputComponentPreview < ViewComponent::Preview - # This is a text input field: - # - To use it without a label: don't give a value to the param label or leave it empty. - # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed. - # - To put it in error state: define the param error_message with the error message you want to be displayed. - # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. - # @param label text - # @param placeholder text - # @param error_message text - # @param helper_text text - - def default(label: "Label", placeholder: "", error_message: "", helper_text: "") - render Input::TextInputComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) - end -end diff --git a/test/components/previews/input/url_component_preview.rb b/test/components/previews/input/url_component_preview.rb deleted file mode 100644 index 53b4c8a10..000000000 --- a/test/components/previews/input/url_component_preview.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class Input::UrlComponentPreview < ViewComponent::Preview - def default - # This is a url input field: - # - To use it without a label: don't give a value to the param label or leave it empty. - # - To put it in error state: define the param error_message with the error message you want to be displayed. - # - To give it a helper text (a text displayed under the input field): define the param helper_text with the helper text you want to be displayed. - # @param label text - # @param error_message text - # @param helper_text text - - def default(label: "Label", placeholder: "", error_message: "", helper_text: "") - render Input::UrlComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text) - end - end -end From 3295d078a77c4605bd43e37c08166fe16162f94f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 7 Aug 2023 01:25:44 +0200 Subject: [PATCH 419/533] move input field component to input namespace --- app/components/{ => input}/input_field_component.rb | 2 +- .../input_field_component/input_field_component.html.haml | 6 +++--- app/components/input/select_component.rb | 2 +- .../input/select_component/select_component.html.haml | 2 +- app/components/input/text_area_component.rb | 2 +- .../input/text_area_component/text_area_component.html.haml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename app/components/{ => input}/input_field_component.rb (87%) rename app/components/{ => input}/input_field_component/input_field_component.html.haml (89%) diff --git a/app/components/input_field_component.rb b/app/components/input/input_field_component.rb similarity index 87% rename from app/components/input_field_component.rb rename to app/components/input/input_field_component.rb index d455109ea..01ed85ef6 100644 --- a/app/components/input_field_component.rb +++ b/app/components/input/input_field_component.rb @@ -1,4 +1,4 @@ -class InputFieldComponent < ViewComponent::Base +class Input::InputFieldComponent < ViewComponent::Base def initialize(label: "" , name:, value: 'Syphax', type: 'text', placeholder: "", error_message: "", helper_text: "") @label = label @name = name diff --git a/app/components/input_field_component/input_field_component.html.haml b/app/components/input/input_field_component/input_field_component.html.haml similarity index 89% rename from app/components/input_field_component/input_field_component.html.haml rename to app/components/input/input_field_component/input_field_component.html.haml index 76c104509..0bd9f9a10 100644 --- a/app/components/input_field_component/input_field_component.html.haml +++ b/app/components/input/input_field_component/input_field_component.html.haml @@ -20,9 +20,9 @@ - - - \ No newline at end of file + + + diff --git a/app/components/input/select_component.rb b/app/components/input/select_component.rb index 44d0de23b..e9f8e9b33 100644 --- a/app/components/input/select_component.rb +++ b/app/components/input/select_component.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Input::SelectComponent < InputFieldComponent +class Input::SelectComponent < Input::InputFieldComponent def initialize(id: nil, label: '', name:, value: [], selected: '', placeholder: '', error_message: '', helper_text: '', multiple: false, open_to_add_values: false) super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) diff --git a/app/components/input/select_component/select_component.html.haml b/app/components/input/select_component/select_component.html.haml index e8399b659..242f79405 100644 --- a/app/components/input/select_component/select_component.html.haml +++ b/app/components/input/select_component/select_component.html.haml @@ -1,2 +1,2 @@ -= render InputFieldComponent.new(name: @name, error_message: @error_message, helper_text: @helper_text) do += render Input::InputFieldComponent.new(name: @name, error_message: @error_message, helper_text: @helper_text, label: @label) do = render SelectInputComponent.new(id: @id, name: @name, values: @values , selected: @selected , multiple: @multiple, open_to_add_values: @open_to_add_values ) \ No newline at end of file diff --git a/app/components/input/text_area_component.rb b/app/components/input/text_area_component.rb index b493347c2..940a8b935 100644 --- a/app/components/input/text_area_component.rb +++ b/app/components/input/text_area_component.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Input::TextAreaComponent < InputFieldComponent +class Input::TextAreaComponent < Input::InputFieldComponent def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '', rows: "5") super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) @rows = rows diff --git a/app/components/input/text_area_component/text_area_component.html.haml b/app/components/input/text_area_component/text_area_component.html.haml index 26f5c4113..d2dd1b5d8 100644 --- a/app/components/input/text_area_component/text_area_component.html.haml +++ b/app/components/input/text_area_component/text_area_component.html.haml @@ -1,3 +1,3 @@ -= render InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text) do += render Input::InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text) do %textarea.input-field-component{name: @name, rows: @rows, placeholder: @placeholder, style: error_style} = @value \ No newline at end of file From 9c74a9c6c2aff78a4b4f92e06df2a0121c93d1a2 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 05:23:54 +0200 Subject: [PATCH 420/533] remove internal-link icon default height --- app/assets/images/icons/internal-link.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/images/icons/internal-link.svg b/app/assets/images/icons/internal-link.svg index 316ccdb76..9e0a7bd5c 100644 --- a/app/assets/images/icons/internal-link.svg +++ b/app/assets/images/icons/internal-link.svg @@ -1,3 +1,3 @@ - + From 8a47eb8f5b5010d42142e256fb1ad0e073128856 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 05:25:14 +0200 Subject: [PATCH 421/533] add count slot to the chips components --- app/assets/stylesheets/components/chips.scss | 11 ++++------- app/components/chips_component.rb | 1 + .../chips_component/chips_component.html.haml | 4 +++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/components/chips.scss b/app/assets/stylesheets/components/chips.scss index 63811c9d1..d0539b6a0 100644 --- a/app/assets/stylesheets/components/chips.scss +++ b/app/assets/stylesheets/components/chips.scss @@ -1,7 +1,3 @@ -.chips-container div{ - margin-right: 10px; -} - .chips-container svg path{ fill: var(--primary-color); } @@ -19,13 +15,14 @@ } .chips-container div label span{ position: relative; - display: inline-block; + display: flex; + align-items: center; background:white; border: 0.5px solid #BDBDBD; color: #a7a7a7; - padding: 8px; + padding: 3px; border-radius: 5px; - font-size: 13px; + font-size: 12px; user-select: none; } diff --git a/app/components/chips_component.rb b/app/components/chips_component.rb index 83ad63f6c..ee414b369 100644 --- a/app/components/chips_component.rb +++ b/app/components/chips_component.rb @@ -1,4 +1,5 @@ class ChipsComponent < ViewComponent::Base + renders_one :count def initialize(id: '', name:, value:, checked: false) @id = id || name @name = name diff --git a/app/components/chips_component/chips_component.html.haml b/app/components/chips_component/chips_component.html.haml index 28f62c5d3..1d4c2fb02 100644 --- a/app/components/chips_component/chips_component.html.haml +++ b/app/components/chips_component/chips_component.html.haml @@ -5,4 +5,6 @@ %span %svg.chips-check-icon{:fill => "none", :height => "8", :viewbox => "0 0 10 8", :width => "10", :xmlns => "http://www.w3.org/2000/svg"} %path{:d => "M9.76764 0.232287C9.45824 -0.0775267 8.95582 -0.0773313 8.646 0.232287L3.59787 5.28062L1.35419 3.03696C1.04438 2.72714 0.542174 2.72714 0.23236 3.03696C-0.0774534 3.34677 -0.0774534 3.84897 0.23236 4.15879L3.03684 6.96326C3.19165 7.11807 3.39464 7.19567 3.59765 7.19567C3.80067 7.19567 4.00386 7.11827 4.15867 6.96326L9.76764 1.3541C10.0775 1.0445 10.0775 0.542081 9.76764 0.232287Z"} - = @value + %div.ml-1 + = @value + = count From 64270677320a9652fb26381796a5f4e500922713 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 05:26:06 +0200 Subject: [PATCH 422/533] add ontology viewer style file , for tabs responsiveness --- .../stylesheets/application.css.scss.erb | 2 +- app/assets/stylesheets/ontology_viewer.scss | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/ontology_viewer.scss diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index 194bae3e5..d6361b993 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -52,7 +52,7 @@ @import "agents"; @import "nav_bar"; - +@import "ontology_viewer"; /* Bootstrap and Font Awesome */ @import "bootstrap"; @import "bootstrap_overrides"; diff --git a/app/assets/stylesheets/ontology_viewer.scss b/app/assets/stylesheets/ontology_viewer.scss new file mode 100644 index 000000000..3a53ef21a --- /dev/null +++ b/app/assets/stylesheets/ontology_viewer.scss @@ -0,0 +1,20 @@ +.ontologies-tabs-container { + & > .tabs-container { + justify-content: center; + } + + & > .tabs-container > div { + width: 1248px; + padding: 0 50px; + } + + & > .tab-content { + display: flex; + justify-content: center; + + & > .tab-pane { + width: 1248px; + padding: 0 50px; + } + } +} \ No newline at end of file From ec9b2c7f79a2c8f4507b0eddcd8b2505586dd22f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 05:00:19 +0200 Subject: [PATCH 423/533] fix a min width for the concept browser --- app/assets/stylesheets/ontologies.scss | 1 + .../ontologies/concepts_browsers/_concepts_tree.html.haml | 2 +- app/views/ontologies/sections/visualize.html.haml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/ontologies.scss b/app/assets/stylesheets/ontologies.scss index ffd00d9aa..41edd683d 100644 --- a/app/assets/stylesheets/ontologies.scss +++ b/app/assets/stylesheets/ontologies.scss @@ -175,6 +175,7 @@ $ont-show-bg-color: #e9ecef; #bd_content .sidebar { overflow-x: auto; white-space: nowrap; + min-width: 35%; } #search_box:focus { diff --git a/app/views/ontologies/concepts_browsers/_concepts_tree.html.haml b/app/views/ontologies/concepts_browsers/_concepts_tree.html.haml index ce58d04fb..426146e22 100644 --- a/app/views/ontologies/concepts_browsers/_concepts_tree.html.haml +++ b/app/views/ontologies/concepts_browsers/_concepts_tree.html.haml @@ -15,7 +15,7 @@ data: {action: 'changed->skos-collection-colors#updateCollectionTags' , 'chosen-enable-colors-value': 'true'}} -# Class tree - %div#sd_content.card.p-1.py-3{style: 'overflow-y: scroll; height: 60vh;'} + %div#sd_content.py-3{style: 'overflow-y: scroll; height: 60vh;'} = render TurboFrameComponent.new(id: 'concepts_tree_view', src: "/ajax/classes/treeview?ontology=#{@ontology.acronym}&conceptid=#{escape(@concept.id)}&concept_schemes=#{params[:concept_schemes]}&auto_click=false&language=#{request_lang}", data: {'turbo-frame-target': 'frame'}) \ No newline at end of file diff --git a/app/views/ontologies/sections/visualize.html.haml b/app/views/ontologies/sections/visualize.html.haml index 3851db29d..c030fee29 100644 --- a/app/views/ontologies/sections/visualize.html.haml +++ b/app/views/ontologies/sections/visualize.html.haml @@ -5,9 +5,9 @@ - @enable_ontolobridge = !$NEW_TERM_REQUEST_ONTOLOGIES.nil? && $NEW_TERM_REQUEST_ONTOLOGIES.include?(@ontology.acronym) %div.tooltip %div#bd_content.bd_content.explore{data:{controller: 'container-splitter'}} - %div.sidebar.d-flex.flex-column.p-1.mr-1{data:{'container-splitter-target': 'container'}} + %div.sidebar{data:{'container-splitter-target': 'container'}} = render partial: 'ontologies/concepts_browsers/concepts_browser' - %div#concept_content.d-flex.flex-column.p-1.ml-1{data:{'container-splitter-target': 'container'}} + %div#concept_content.d-flex.flex-column{data:{'container-splitter-target': 'container'}} = render partial: 'concepts/show' - form_for(:search, :url => {:controller =>'search',:action=>'fetch_results'},:html=>{:id=>'search_form'}) do |f| From bacf94c936335ef0b23dca44403fc7709282548e Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 05:29:44 +0200 Subject: [PATCH 424/533] update chips component to add label attribute --- app/components/chips_component.rb | 4 +++- app/components/chips_component/chips_component.html.haml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/components/chips_component.rb b/app/components/chips_component.rb index ee414b369..b62de77f6 100644 --- a/app/components/chips_component.rb +++ b/app/components/chips_component.rb @@ -1,10 +1,12 @@ class ChipsComponent < ViewComponent::Base + renders_one :count - def initialize(id: '', name:, value:, checked: false) + def initialize(id: '', name:, label: nil, value:, checked: false) @id = id || name @name = name @value = value @checked = checked + @label = label || @value end def checked? diff --git a/app/components/chips_component/chips_component.html.haml b/app/components/chips_component/chips_component.html.haml index 1d4c2fb02..48a0b88a4 100644 --- a/app/components/chips_component/chips_component.html.haml +++ b/app/components/chips_component/chips_component.html.haml @@ -6,5 +6,5 @@ %svg.chips-check-icon{:fill => "none", :height => "8", :viewbox => "0 0 10 8", :width => "10", :xmlns => "http://www.w3.org/2000/svg"} %path{:d => "M9.76764 0.232287C9.45824 -0.0775267 8.95582 -0.0773313 8.646 0.232287L3.59787 5.28062L1.35419 3.03696C1.04438 2.72714 0.542174 2.72714 0.23236 3.03696C-0.0774534 3.34677 -0.0774534 3.84897 0.23236 4.15879L3.03684 6.96326C3.19165 7.11807 3.39464 7.19567 3.59765 7.19567C3.80067 7.19567 4.00386 7.11827 4.15867 6.96326L9.76764 1.3541C10.0775 1.0445 10.0775 0.542081 9.76764 0.232287Z"} %div.ml-1 - = @value + = @label = count From fa7f749f47e8553df62bca06507ab93cddfea910 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 05:31:59 +0200 Subject: [PATCH 425/533] fix ontology viewer header not centred --- app/views/layouts/_ontology_viewer.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml index 5b826f311..2d6d23e49 100644 --- a/app/views/layouts/_ontology_viewer.html.haml +++ b/app/views/layouts/_ontology_viewer.html.haml @@ -42,7 +42,7 @@ = render partial: 'kgcl_dialogs' %div.pt-md-3.pb-md-2.p-2 - %div + %div.d-flex.w-100.justify-content-center = render partial: 'layouts/ontology_viewer/header' %div.pb-4.p-2.bg-white{data: {controller: 'ontology-viewer-tabs', 'ontology-viewer-tabs-language-sections-value': ontology_data_sections }} From 23106a0684d7c9950db64962e78854a70f50d79a Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 05:32:53 +0200 Subject: [PATCH 426/533] handle date time field exception when value is nil --- app/components/date_time_field_component.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/date_time_field_component.rb b/app/components/date_time_field_component.rb index 30ab80e67..35ec91b38 100644 --- a/app/components/date_time_field_component.rb +++ b/app/components/date_time_field_component.rb @@ -9,7 +9,7 @@ def initialize(value: , format: :monthfull_day_year) end def call - l(Date.parse(@value), format: @format.to_sym) + l(Date.parse(@value), format: @format.to_sym) if @value end end From 4de22d80dd80dd6fb3da6bbe3319f9da133f8989 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 05:33:39 +0200 Subject: [PATCH 427/533] fix tabs container component type check --- app/assets/stylesheets/concepts.scss | 2 +- .../tabs_container_component.html.haml | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/concepts.scss b/app/assets/stylesheets/concepts.scss index 783cf2097..eabea59c8 100644 --- a/app/assets/stylesheets/concepts.scss +++ b/app/assets/stylesheets/concepts.scss @@ -131,7 +131,7 @@ div.synonym-change-request button { } #concept_browser{ - .outline-tabs .tab-items{ + .outline-tabs div, .outline-tabs .tab-items{ width: 100%; } .outline-tabs .tab-items .nav-item { diff --git a/app/components/tabs_container_component/tabs_container_component.html.haml b/app/components/tabs_container_component/tabs_container_component.html.haml index 2ee9f8818..f1a952814 100644 --- a/app/components/tabs_container_component/tabs_container_component.html.haml +++ b/app/components/tabs_container_component/tabs_container_component.html.haml @@ -1,13 +1,14 @@ %div{data: {controller:'tabs-container'}, class: container_class} - .tab-items.nav - - items.each do |item| - %div{data: tabs_container_data(item), class: item.active_class + ' nav-item'} - = item - - unless @pill - %hr - - if pinned_right? - %div.d-flex.mx-1 - = pinned_right + %div + .tab-items.nav + - items.each do |item| + %div{data: tabs_container_data(item), class: item.active_class + ' nav-item'} + = item + - unless @type.eql?('pill') + %hr + - if pinned_right? + %div.d-flex.mx-1 + = pinned_right .tab-content - item_contents.each_with_index do |item_content, index| From 980a17639ab3617fab9e1d6c6ce7ad2e05414c96 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 05:40:57 +0200 Subject: [PATCH 428/533] update chip button style --- .../stylesheets/components/chip_button.scss | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/components/chip_button.scss b/app/assets/stylesheets/components/chip_button.scss index 943bb48bb..232163645 100644 --- a/app/assets/stylesheets/components/chip_button.scss +++ b/app/assets/stylesheets/components/chip_button.scss @@ -1,18 +1,17 @@ .chip_button_container { - background-color: #F6F6F6; - padding: 10px; - border-radius: 5px; - color: #777777 !important; - font-weight: 500; - font-size: 15px; + background-color: #f6f6f6; + padding: 10px; + border-radius: 5px; + color: #777777 !important; + font-weight: 500; + font-size: 15px; } -.chip_button_container_clickable{ - background-color: var(--light-color); - padding: 10px; - border-radius: 5px; - color: var(--primary-color); - font-weight: 500; - font-size: 15px; +.chip_button_container_clickable { + background-color: var(--light-color); + line-height: 44px; + padding: 10px; + border-radius: 5px; + color: var(--primary-color); + font-weight: 500; + font-size: 15px; } - - From f629c48f5b55e6713123b1c2faa9034eb797cf30 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Thu, 1 Jun 2023 20:09:32 +0200 Subject: [PATCH 429/533] override bootstrap text-primary color --- app/assets/stylesheets/themes/lirmm/bootstrap_overrides.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/themes/lirmm/bootstrap_overrides.scss b/app/assets/stylesheets/themes/lirmm/bootstrap_overrides.scss index 6ddd0549b..b64901b6a 100644 --- a/app/assets/stylesheets/themes/lirmm/bootstrap_overrides.scss +++ b/app/assets/stylesheets/themes/lirmm/bootstrap_overrides.scss @@ -8,6 +8,10 @@ a { a i { color: $color-primary; } +.text-primary { + color: $color-primary !important; +} + .btn-info, .btn-outline-primary:hover, .btn-primary , .nav-pills .nav-link.active{ background-color: $color-primary !important; From 40e748029a33bfd63b360994e4ca19641bfa07fc Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 20 Jun 2023 18:18:09 +0200 Subject: [PATCH 430/533] update chips button component to have optional html attributes --- app/components/chip_button_component.rb | 3 ++- .../chip_button_component/chip_button_component.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/components/chip_button_component.rb b/app/components/chip_button_component.rb index 059e80379..6cdfa4632 100644 --- a/app/components/chip_button_component.rb +++ b/app/components/chip_button_component.rb @@ -1,7 +1,8 @@ class ChipButtonComponent < ViewComponent::Base - def initialize(url: nil, text:, type: "static") + def initialize(url: nil, text:, type: "static", **html_options) @url = url @text = text @type = type + @html_options = html_options.merge({href: @url}) end end \ No newline at end of file diff --git a/app/components/chip_button_component/chip_button_component.html.haml b/app/components/chip_button_component/chip_button_component.html.haml index f735a6833..9b342ee24 100644 --- a/app/components/chip_button_component/chip_button_component.html.haml +++ b/app/components/chip_button_component/chip_button_component.html.haml @@ -1,5 +1,5 @@ - if @type == "static" - %span.chip_button_container + %span.chip_button_container{@html_options} = @text - else - %a.chip_button_container_clickable{href: @url}= @text + %a.chip_button_container_clickable{@html_options}= @text From 2263993a68820cfa8afa92ab251ff85ed2a8822c Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 06:17:54 +0200 Subject: [PATCH 431/533] replace open-popup icon with popup-link icon --- app/assets/images/open-popup.svg | 4 ---- app/components/label_link_component.rb | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 app/assets/images/open-popup.svg diff --git a/app/assets/images/open-popup.svg b/app/assets/images/open-popup.svg deleted file mode 100644 index f8ceee84b..000000000 --- a/app/assets/images/open-popup.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/components/label_link_component.rb b/app/components/label_link_component.rb index dd00d289e..3d8ecee98 100644 --- a/app/components/label_link_component.rb +++ b/app/components/label_link_component.rb @@ -2,7 +2,7 @@ class LabelLinkComponent < ViewComponent::Base - def initialize(id:, text:, icon: 'open-popup') + def initialize(id:, text:, icon: 'popup-link') @id = id @text = text @icon = icon From f28278328c7d72383b8b033ad3bd9f866c13027c Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 06:42:00 +0200 Subject: [PATCH 432/533] update ontology viewer header style and template --- .../stylesheets/application.css.scss.erb | 1 + app/assets/stylesheets/nav_bar.scss | 1 + .../stylesheets/ontology_details_header.scss | 12 ++--- .../layouts/ontology_viewer/_header.html.haml | 47 ++++++++----------- 4 files changed, 25 insertions(+), 36 deletions(-) mode change 100644 => 100755 app/assets/stylesheets/application.css.scss.erb diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb old mode 100644 new mode 100755 index d6361b993..a3e69e6ab --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -52,6 +52,7 @@ @import "agents"; @import "nav_bar"; +@import "ontology_details_header"; @import "ontology_viewer"; /* Bootstrap and Font Awesome */ @import "bootstrap"; diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss index 9a9d373da..35ff36fb1 100644 --- a/app/assets/stylesheets/nav_bar.scss +++ b/app/assets/stylesheets/nav_bar.scss @@ -7,6 +7,7 @@ display: flex !important; background-color: var(--primary-color); align-items: center; + justify-content: space-between; height: 62px; padding: 8px 42px; width: 1248px; diff --git a/app/assets/stylesheets/ontology_details_header.scss b/app/assets/stylesheets/ontology_details_header.scss index f0bd0d570..1d4ec22f3 100644 --- a/app/assets/stylesheets/ontology_details_header.scss +++ b/app/assets/stylesheets/ontology_details_header.scss @@ -1,6 +1,7 @@ .ontology-details-header-container{ - margin: 40px; - width: 60%; + padding: 0 50px; + margin: 20px 0; + width: 1248px; } .ontology-details-path{ @@ -74,6 +75,7 @@ cursor: pointer; margin-left: 10px; transition: background-color ease 0.3s; + white-space: nowrap; } @@ -105,9 +107,3 @@ } -@media (max-width: 1900px){ - .ontology-details-header-container{ - width: 92%; - justify-content: space-between; - } -} \ No newline at end of file diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index d3fbb1689..2cf6bae6a 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -11,37 +11,28 @@ %div = @ontology.acronym .ontology-details-header-sub-container - .ontology-details-header-left-container{style:'width: 80%'} + .ontology-details-header-left-container{style:'width: 70%'} .ontology-details-name-bar %div{style:'max-width: 60%'} = @ontology.name %span = "("+ @ontology.acronym+")" - .ontology-details-licence - %div - = attribute_enforced_values('hasLicense')[sub.hasLicense] || sub.hasLicense - = inline_svg_tag "open-popup.svg" + - unless sub.hasLicense.nil? + .ontology-details-licence + %div + - value = attribute_enforced_values('hasLicense')[sub.hasLicense] || sub.hasLicense + = link_to_modal(value, "/ajax/submission/show_licenses/#{@ontology.acronym}",data: { show_modal_title_value: "More licenses", show_modal_size_value: 'modal-xl' }) + = inline_svg_tag "icons/popup-link.svg" - if (details_available && !sub.released.nil?) - %span.text-muted - = t('ontology_details.header.last_uploaded') - = l(Date.parse(sub.creationDate), format: :monthfull_day_year) - %div.ont-info-links - - unless (@ontology.summaryOnly || @ont_restricted || @submission_latest.nil?) - = link_to(@submission_latest.id + "/download?apikey=#{get_apikey}", "aria-label": "Download latest version", title: "Download latest version") do - %i.fas.fa-lg.fa-download{"aria-hidden": true} - - if details_available - - if $PURL_ENABLED - = link_to(@ontology.purl, "aria-label": "BioPortal PURL", title: "BioPortal PURL", target: "_blank") do - %i.fas.fa-lg.fa-link{"aria-hidden": true} - = link_to(sub.homepage, "aria-label": "Ontology home page", title: "Ontology home page", target: "_blank") do - %i.fas.fa-lg.fa-home{"aria-hidden": true} - - unless sub.documentation.nil? - = link_to(sub.documentation, "aria-label": "Ontology documentation", title: "Ontology documentation", target: "_blank") do - %i.fas.fa-lg.fa-book-reader{"aria-hidden": true} - - unless sub.publication.nil? - - Array(sub.publication).each do |pub| - = link_to(pub, "aria-label": "Ontology publications", title: "Ontology publications", target: "_blank") do - %i.fas.fa-lg.fa-book{"aria-hidden": true} - - if @ontology.admin?(session[:user]) - = link_to(edit_ontology_path(@ontology.acronym), "aria-label": "Edit ontology details", title: "Edit ontology details") do - %i.fas.fa-lg.fa-user-edit \ No newline at end of file + .ontology-details-last-update + %img{src: asset_path("update.svg")}/ + %div + = t('ontology_details.header.last_uploaded') + = l(Date.parse(sub.creationDate), format: :monthfull_day_year) + .ontology-details-header-right-container.justify-content-end{style: 'min-width: 20%;'} + %a.mx-1.ontology-details-edit-button{href: "#{(@submission_latest || @ontology).id}?display=all", :target => '_blank'} + = inline_svg_tag "json.svg" + - if @ontology.admin?(session[:user]) + %a.mx-1.ontology-details-edit-button{href: edit_ontology_path(@ontology.acronym)} + = inline_svg_tag "edit.svg" + = subscribe_button(@ontology.id) From c992253a8cc65c40a145f9a7e5ff93239a55c7b0 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 06:43:53 +0200 Subject: [PATCH 433/533] add ontology count_subscriptions helper --- app/helpers/ontologies_helper.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 80ee8ad33..ab2d66cd6 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -519,6 +519,11 @@ def dispaly_complex_text(definitions) return html.html_safe end + + def count_subscriptions(ontology_id) + users = LinkedData::Client::Models::User.all(include: 'subscription', display_context: false, display_links: false ) + users.select{ |u| u.subscription.find{ |s| s.ontology.eql?(ontology_id)} }.count + end private def submission_languages(submission = @submission) From 1f5756107092947c81b590bf4a4cb1e5a54233a7 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 06:44:46 +0200 Subject: [PATCH 434/533] add show licence details popup action --- app/controllers/ontologies_controller.rb | 20 +++++++++---------- app/views/ontologies/_licenses.html.haml | 6 ++++++ .../ontologies/sections/_licenses.html.haml | 10 ++++++++++ config/routes.rb | 1 + 4 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 app/views/ontologies/_licenses.html.haml create mode 100644 app/views/ontologies/sections/_licenses.html.haml diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index cdf4af3e6..f7b9ae2fb 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -454,6 +454,15 @@ def widgets render partial: 'ontologies/sections/widgets', layout: 'ontology_viewer' end end + + def show_licenses + + @metadata = submission_metadata + @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:id]).first + @licenses= ["hasLicense","morePermissions","copyrightHolder"] + @submission_latest = @ontology.explore.latest_submission(include: @licenses.join(",")) + render partial: 'ontologies/sections/licenses' + end def ajax_ontologies @@ -476,16 +485,7 @@ def ontology_params p[:group].reject!(&:blank?) p.to_h end - - def determine_layout - case action_name - when 'index' - 'angular' - else - super - end - end - + def get_views(ontology) views = ontology.explore.views || [] views.select!{ |view| view.access?(session[:user]) } diff --git a/app/views/ontologies/_licenses.html.haml b/app/views/ontologies/_licenses.html.haml new file mode 100644 index 000000000..6056c9ed3 --- /dev/null +++ b/app/views/ontologies/_licenses.html.haml @@ -0,0 +1,6 @@ +-# Additional Metadata pane +%section.ont-metadata-card.ont-additional-metadata-card + %header.pb-2.font-weight-bold + = t('ontology_details.metadata.dates') + %table.table.table-sm + = raw dates(@submission_latest) unless @submission_latest.nil? \ No newline at end of file diff --git a/app/views/ontologies/sections/_licenses.html.haml b/app/views/ontologies/sections/_licenses.html.haml new file mode 100644 index 000000000..b9899f6dd --- /dev/null +++ b/app/views/ontologies/sections/_licenses.html.haml @@ -0,0 +1,10 @@ += turbo_frame_tag 'application_modal_content' do + - @licenses.each do |attribute| + - attr = attribute_infos(attribute) + - value = Array(@submission_latest.send(attribute)) + .creation_info + %p.description_text + = attr["label"] || attribute + %p.normal_text + = value.join(", ") + diff --git a/config/routes.rb b/config/routes.rb index df58258b0..13e035de2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -151,6 +151,7 @@ get 'ajax/label_xl', to: "label_xl#show" get '/ajax/biomixer' => 'concepts#biomixer' get '/ajax/fair_score/html' => 'fair_score#details_html' + get '/ajax/submission/show_licenses/:id' => 'ontologies#show_licenses' get '/ajax/fair_score/json' => 'fair_score#details_json' get '/ajax/:ontology/instances' => 'instances#index_by_ontology' get '/ajax/:ontology/classes/:conceptid/instances' => 'instances#index_by_class', :constraints => { conceptid: /[^\/?]+/ } From 4b6a0ffac0dd9285bf74806bb9e94bb507f75dec Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 06:47:55 +0200 Subject: [PATCH 435/533] add attribute_enforced_values helper to enforced values of an attribute --- app/helpers/application_helper.rb | 4 +++- app/helpers/ontologies_helper.rb | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 44da7886d..323f301f1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -656,5 +656,7 @@ def navitems items = [["/ontologies", "Browse"],["/mappings", "Mappings"],["/recommender", "Recommender"],["/annotator", "Annotator"], ["/landscape", "Landscape"]] end - + def attribute_enforced_values(attr) + submission_metadata.select {|x| x['@id'][attr]}.first['enforcedValues'] + end end diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index ab2d66cd6..0233a7e82 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -418,9 +418,10 @@ def current_section def link_to_section(section_title) link_to(section_name(section_title) , ontology_path(@ontology.acronym, p: section_title), - id: "ont-#{section_title}-tab", - class: "#{selected_section?(section_title) ? 'active show' : ''}") - + id: "ont-#{section_title}-tab", class: "nav-link #{selected_section?(section_title) ? 'active show' : ''}", + data: { action: 'click->ontology-viewer-tabs#selectTab', + toggle: "tab", target: "#ont_#{section_title}_content", 'bp-ont-page': section_title , + 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section_title) }) end def selected_section?(section_title) From cbbf99ff75a826d510e9ce2e9cab18f516f90afa Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 07:14:44 +0200 Subject: [PATCH 436/533] use date time field component to display the uploaded date in the header --- app/views/layouts/ontology_viewer/_header.html.haml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 2cf6bae6a..636c9993d 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -20,15 +20,15 @@ - unless sub.hasLicense.nil? .ontology-details-licence %div - - value = attribute_enforced_values('hasLicense')[sub.hasLicense] || sub.hasLicense - = link_to_modal(value, "/ajax/submission/show_licenses/#{@ontology.acronym}",data: { show_modal_title_value: "More licenses", show_modal_size_value: 'modal-xl' }) - = inline_svg_tag "icons/popup-link.svg" - - if (details_available && !sub.released.nil?) + = link_to_modal(nil, "/ajax/submission/show_licenses/#{@ontology.acronym}",data: { show_modal_title_value: "More licenses", show_modal_size_value: 'modal-xl' }) do + = attribute_enforced_values('hasLicense')[sub.hasLicense] || sub.hasLicense + = inline_svg_tag "icons/popup-link.svg" + - if details_available && !sub.creationDate.nil? .ontology-details-last-update %img{src: asset_path("update.svg")}/ %div = t('ontology_details.header.last_uploaded') - = l(Date.parse(sub.creationDate), format: :monthfull_day_year) + = render DateTimeFieldComponent.new(value: sub.creationDate) .ontology-details-header-right-container.justify-content-end{style: 'min-width: 20%;'} %a.mx-1.ontology-details-edit-button{href: "#{(@submission_latest || @ontology).id}?display=all", :target => '_blank'} = inline_svg_tag "json.svg" From d1d05c5591cb394e6636f5ff948c952c35ca48da Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 07:08:54 +0200 Subject: [PATCH 437/533] use rounded button components in the header page for the json and edit --- app/components/rounded_button_component.rb | 2 +- app/helpers/ontologies_helper.rb | 9 +++++++++ .../layouts/ontology_viewer/_header.html.haml | 15 ++++++--------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/components/rounded_button_component.rb b/app/components/rounded_button_component.rb index 47983fce1..d964d0b5a 100644 --- a/app/components/rounded_button_component.rb +++ b/app/components/rounded_button_component.rb @@ -11,7 +11,7 @@ def size when "small" ["32px", "1", "16px"] when "medium" - ["64px", "2", "32px"] + ["45px", "1", "23px"] when "big" ["100px", "2.5", "50px"] end diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 0233a7e82..b421e5ae4 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -525,6 +525,15 @@ def count_subscriptions(ontology_id) users = LinkedData::Client::Models::User.all(include: 'subscription', display_context: false, display_links: false ) users.select{ |u| u.subscription.find{ |s| s.ontology.eql?(ontology_id)} }.count end + + def ontology_edit_button + return unless @ontology.admin?(session[:user]) + render RoundedButtonComponent.new(link: edit_ontology_path(@ontology.acronym), icon: 'edit.svg', size: 'medium') + end + + def submission_json_button + render RoundedButtonComponent.new(link: "#{(@submission_latest || @ontology).id}?display=all", target: '_blank', size: 'medium') + end private def submission_languages(submission = @submission) diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 636c9993d..8cf4d8cd8 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -1,7 +1,5 @@ - sub = @submission_latest -- details_available = true -- if sub.nil? || (sub.respond_to?(:status) && sub.status == 404) - - details_available = false + -# A header of sorts to display ontology name and subset of details. .ontology-details-header-container @@ -23,16 +21,15 @@ = link_to_modal(nil, "/ajax/submission/show_licenses/#{@ontology.acronym}",data: { show_modal_title_value: "More licenses", show_modal_size_value: 'modal-xl' }) do = attribute_enforced_values('hasLicense')[sub.hasLicense] || sub.hasLicense = inline_svg_tag "icons/popup-link.svg" - - if details_available && !sub.creationDate.nil? + - unless sub.creationDate.nil? .ontology-details-last-update %img{src: asset_path("update.svg")}/ %div = t('ontology_details.header.last_uploaded') = render DateTimeFieldComponent.new(value: sub.creationDate) .ontology-details-header-right-container.justify-content-end{style: 'min-width: 20%;'} - %a.mx-1.ontology-details-edit-button{href: "#{(@submission_latest || @ontology).id}?display=all", :target => '_blank'} - = inline_svg_tag "json.svg" - - if @ontology.admin?(session[:user]) - %a.mx-1.ontology-details-edit-button{href: edit_ontology_path(@ontology.acronym)} - = inline_svg_tag "edit.svg" + %span.mx-1 + = submission_json_button + %span + = ontology_edit_button = subscribe_button(@ontology.id) From 74339896612c553cb972d24167a93aadcab8d3b3 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Tue, 8 Aug 2023 07:37:10 +0200 Subject: [PATCH 438/533] use chip button component for license button to popup in the header --- app/assets/stylesheets/components/chip_button.scss | 6 ++++++ app/components/chip_button_component.rb | 2 +- .../chip_button_component.html.haml | 4 ++-- app/views/layouts/ontology_viewer/_header.html.haml | 10 +++++----- app/views/ontologies/_licenses.html.haml | 6 ------ 5 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 app/views/ontologies/_licenses.html.haml diff --git a/app/assets/stylesheets/components/chip_button.scss b/app/assets/stylesheets/components/chip_button.scss index 232163645..70c385ddd 100644 --- a/app/assets/stylesheets/components/chip_button.scss +++ b/app/assets/stylesheets/components/chip_button.scss @@ -6,6 +6,12 @@ font-weight: 500; font-size: 15px; } + +.chip_button_small{ + font-size: 10px; + padding: 5px; +} + .chip_button_container_clickable { background-color: var(--light-color); line-height: 44px; diff --git a/app/components/chip_button_component.rb b/app/components/chip_button_component.rb index 6cdfa4632..64e9e5672 100644 --- a/app/components/chip_button_component.rb +++ b/app/components/chip_button_component.rb @@ -1,5 +1,5 @@ class ChipButtonComponent < ViewComponent::Base - def initialize(url: nil, text:, type: "static", **html_options) + def initialize(url: nil, text: nil, type: "static", **html_options) @url = url @text = text @type = type diff --git a/app/components/chip_button_component/chip_button_component.html.haml b/app/components/chip_button_component/chip_button_component.html.haml index 9b342ee24..d68869447 100644 --- a/app/components/chip_button_component/chip_button_component.html.haml +++ b/app/components/chip_button_component/chip_button_component.html.haml @@ -1,5 +1,5 @@ - if @type == "static" %span.chip_button_container{@html_options} - = @text + = @text || content - else - %a.chip_button_container_clickable{@html_options}= @text + %a.chip_button_container_clickable{@html_options}= @text || content diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 8cf4d8cd8..41173aaf9 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -16,11 +16,11 @@ %span = "("+ @ontology.acronym+")" - unless sub.hasLicense.nil? - .ontology-details-licence - %div - = link_to_modal(nil, "/ajax/submission/show_licenses/#{@ontology.acronym}",data: { show_modal_title_value: "More licenses", show_modal_size_value: 'modal-xl' }) do - = attribute_enforced_values('hasLicense')[sub.hasLicense] || sub.hasLicense - = inline_svg_tag "icons/popup-link.svg" + = render ChipButtonComponent.new(class: 'chip_button_small') do + = link_to_modal(nil, "/ajax/submission/show_licenses/#{@ontology.acronym}",data: { show_modal_title_value: "More licenses", show_modal_size_value: 'modal-xl' }) do + = attribute_enforced_values('hasLicense')[sub.hasLicense] || sub.hasLicense + = inline_svg_tag "icons/popup-link.svg" + - unless sub.creationDate.nil? .ontology-details-last-update %img{src: asset_path("update.svg")}/ diff --git a/app/views/ontologies/_licenses.html.haml b/app/views/ontologies/_licenses.html.haml deleted file mode 100644 index 6056c9ed3..000000000 --- a/app/views/ontologies/_licenses.html.haml +++ /dev/null @@ -1,6 +0,0 @@ --# Additional Metadata pane -%section.ont-metadata-card.ont-additional-metadata-card - %header.pb-2.font-weight-bold - = t('ontology_details.metadata.dates') - %table.table.table-sm - = raw dates(@submission_latest) unless @submission_latest.nil? \ No newline at end of file From 89c124120c7e2853658c1d927b2d18ee11604f33 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 9 Aug 2023 09:07:46 +0000 Subject: [PATCH 439/533] Add icon button variation to regular button component --- app/views/login/index.html.haml | 2 +- .../buttons/regular_button_component_preview.rb | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/views/login/index.html.haml b/app/views/login/index.html.haml index a8b986b0d..ae71c1c1f 100644 --- a/app/views/login/index.html.haml +++ b/app/views/login/index.html.haml @@ -15,7 +15,7 @@ %a.login-forgot-password{:href => "/lost_pass"} %p Forgot password? .login-button-container - = render Buttons::PrimaryButtonComponent.new(value: "Login", name: "commit", type: "submit") + = render Buttons::RegularButtonComponent.new(value: "Login", name: "commit", type: "submit") %p.dont-have-account Don't have an account? %a.text-decoration-none{:href => new_user_path} Register diff --git a/test/components/previews/buttons/regular_button_component_preview.rb b/test/components/previews/buttons/regular_button_component_preview.rb index 453952217..a209bd379 100644 --- a/test/components/previews/buttons/regular_button_component_preview.rb +++ b/test/components/previews/buttons/regular_button_component_preview.rb @@ -5,14 +5,26 @@ class Buttons::RegularButtonComponentPreview < ViewComponent::Preview def primary def primary() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "link", variant: "primary", href: "https://www.google.com") + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary") end end def secondary def secondary() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "link", variant: "secondary",href: "https://www.google.com") + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "secondary") + end + end + + def icon_left + def icon_left() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", icon: "check.svg") + end + end + + def icon_right + def icon_right() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", icon: "check.svg", icon_type: "right") end end From e9c473b8610bbb929453260732870bffe691f219 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 10 Aug 2023 17:41:00 +0000 Subject: [PATCH 440/533] update the design of page not found --- Gemfile.lock | 2 +- app/assets/images/errors/agroportal.svg | 91 +++++++++++++++++++++++++ app/assets/stylesheets/account.scss | 8 +-- app/views/errors/not_found.html.erb | 5 -- app/views/errors/not_found.html.haml | 12 ++++ config/environments/development.rb | 2 +- 6 files changed, 108 insertions(+), 12 deletions(-) create mode 100644 app/assets/images/errors/agroportal.svg delete mode 100644 app/views/errors/not_found.html.erb create mode 100644 app/views/errors/not_found.html.haml diff --git a/Gemfile.lock b/Gemfile.lock index 2ae2ec315..6e4f2b162 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -243,7 +243,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) mini_mime (1.1.2) - mini_portile2 (2.8.4) minitest (5.19.0) msgpack (1.7.2) multi_json (1.15.0) @@ -496,6 +495,7 @@ GEM zeitwerk (2.6.11) PLATFORMS + ruby x86_64-darwin-21 x86_64-linux diff --git a/app/assets/images/errors/agroportal.svg b/app/assets/images/errors/agroportal.svg new file mode 100644 index 000000000..f56db244a --- /dev/null +++ b/app/assets/images/errors/agroportal.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/stylesheets/account.scss b/app/assets/stylesheets/account.scss index 3112a95d4..775a8a89c 100644 --- a/app/assets/stylesheets/account.scss +++ b/app/assets/stylesheets/account.scss @@ -3,7 +3,9 @@ display: flex; justify-content: center; margin: 30px 0; - +} +.account-page-center svg path{ + fill: var(--primary-color) } .account-page-title{ font-size: 18px; @@ -131,10 +133,6 @@ margin-left: 10px; margin-bottom: 5px; } -svg path{ - fill: var(--primary-color); -} - .account-page-subscribe-button{ border: 1px solid var(--primary-color); text-decoration: none; diff --git a/app/views/errors/not_found.html.erb b/app/views/errors/not_found.html.erb deleted file mode 100644 index 2a0701060..000000000 --- a/app/views/errors/not_found.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<%= content_tag :div, id: "bd", style: "clear: both; text-align: center; margin-top: 100px; margin-bottom: 100px;" do -%> -

    - <%= @error_message || "The page you are looking for wasn't found. Please try again." %> -

    -<% end -%> \ No newline at end of file diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml new file mode 100644 index 000000000..62e23e16b --- /dev/null +++ b/app/views/errors/not_found.html.haml @@ -0,0 +1,12 @@ +.d-flex.align-items-center.flex-column.position-relative + = inline_svg("errors/agroportal.svg") + .position-absolute{style: "top: 442px; font-size: 30px; font-weight: 800; color: #263238;"} + Page not found + .buttons.d-flex.justify-content-center.mt-3 + %div{style: "width: 216px;"} + = render Buttons::RegularButtonComponent.new(value: "Go to home", name: "home", type: "link", variant: "secondary", href: "/") + %div{style: "width: 216px; margin-left: 22px"} + = render Buttons::RegularButtonComponent.new(value: "Send a feedback", name: "feedback", type: "link", variant: "primary", href: "/") + + + diff --git a/config/environments/development.rb b/config/environments/development.rb index b595b87cd..eb5289b53 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -12,7 +12,7 @@ config.eager_load = false # Show full error reports. - config.consider_all_requests_local = true + config.consider_all_requests_local = false # Enable server timing config.server_timing = true From 98bc1ec3eb286b044815dc401bc9dce75b7e41f7 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 03:32:20 +0200 Subject: [PATCH 441/533] add info tooltip component --- app/assets/images/icons/info.svg | 4 ++++ app/components/display/info_tooltip_component.rb | 13 +++++++++++++ .../display/info_tooltip_component_preview.rb | 9 +++++++++ 3 files changed, 26 insertions(+) create mode 100644 app/assets/images/icons/info.svg create mode 100644 app/components/display/info_tooltip_component.rb create mode 100644 test/components/previews/display/info_tooltip_component_preview.rb diff --git a/app/assets/images/icons/info.svg b/app/assets/images/icons/info.svg new file mode 100644 index 000000000..4232099d0 --- /dev/null +++ b/app/assets/images/icons/info.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/components/display/info_tooltip_component.rb b/app/components/display/info_tooltip_component.rb new file mode 100644 index 000000000..12c3bf93d --- /dev/null +++ b/app/components/display/info_tooltip_component.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class Display::InfoTooltipComponent < ViewComponent::Base + + def initialize(text: ) + super + @text = text + end + def call + image_tag("icons/info.svg", data:{controller:'tooltip'}, title: @text) + end + +end diff --git a/test/components/previews/display/info_tooltip_component_preview.rb b/test/components/previews/display/info_tooltip_component_preview.rb new file mode 100644 index 000000000..44f844972 --- /dev/null +++ b/test/components/previews/display/info_tooltip_component_preview.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class Display::InfoTooltipComponentPreview < ViewComponent::Preview + + # @param text text + def default(text: 'tooltip text') + render Display::InfoTooltipComponent.new(text: text) + end +end From 54c918eb48ba1b19a692af4dc26f58acbcdaecf4 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 03:33:44 +0200 Subject: [PATCH 442/533] add header text component --- app/assets/stylesheets/components/header.scss | 15 ++++++++++++ app/assets/stylesheets/components/index.scss | 3 ++- app/components/display/header_component.rb | 23 +++++++++++++++++++ .../display/header_component_preview.rb | 10 ++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/components/header.scss create mode 100644 app/components/display/header_component.rb create mode 100644 test/components/previews/display/header_component_preview.rb diff --git a/app/assets/stylesheets/components/header.scss b/app/assets/stylesheets/components/header.scss new file mode 100644 index 000000000..30e464aba --- /dev/null +++ b/app/assets/stylesheets/components/header.scss @@ -0,0 +1,15 @@ +.header-component { + display: flex; + align-items: center; + margin-bottom: 5px; + font-weight: 550; + justify-content: space-between; + font-size: 16px; + color: #000000; + cursor: pointer; + width: 100%; + padding: 14px 20px; + p { + margin-bottom: 0; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 55d9f7348..05b6ff8fe 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -19,4 +19,5 @@ @import 'pill_button'; @import "switch"; @import "table"; -@import "concept_details"; \ No newline at end of file +@import "concept_details"; +@import "header"; \ No newline at end of file diff --git a/app/components/display/header_component.rb b/app/components/display/header_component.rb new file mode 100644 index 000000000..b814f55fc --- /dev/null +++ b/app/components/display/header_component.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +class Display::HeaderComponent < ViewComponent::Base + + renders_one :text + + def initialize(text: nil, tooltip: nil) + super + @text = text + @info = tooltip + end + + def call + content_tag(:div, class: 'header-component') do + out = content_tag(:p, text || @text) + if @info && !@info.empty? + out = out + render(Display::InfoTooltipComponent.new(text: @info)) + end + out + end + end + +end diff --git a/test/components/previews/display/header_component_preview.rb b/test/components/previews/display/header_component_preview.rb new file mode 100644 index 000000000..491190896 --- /dev/null +++ b/test/components/previews/display/header_component_preview.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class Display::HeaderComponentPreview < ViewComponent::Preview + + # @param text text + # @param tooltip text + def default(text: 'header text' , tooltip: 'text tooltip') + render Display::HeaderComponent.new(text: text, tooltip: tooltip) + end +end From 550fc1fc8d9d779427ba447edec8927b667b0511 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 03:35:23 +0200 Subject: [PATCH 443/533] disable by default

    bottom margin every where --- app/assets/stylesheets/bioportal.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/bioportal.scss b/app/assets/stylesheets/bioportal.scss index 1003395d0..e20991b0c 100644 --- a/app/assets/stylesheets/bioportal.scss +++ b/app/assets/stylesheets/bioportal.scss @@ -1,6 +1,10 @@ -a{ +a { text-decoration: none !important; } +p { + margin-bottom: 0; +} + .alignright { float:right; } From 579e9d5adbc1927a310a9b2142643ce2fe848866 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 03:42:14 +0200 Subject: [PATCH 444/533] add card component --- app/assets/stylesheets/components/card.scss | 5 +++++ app/assets/stylesheets/components/index.scss | 1 + app/components/layout/card_component.rb | 13 +++++++++++++ .../previews/layout/card_component_preview.rb | 10 ++++++++++ 4 files changed, 29 insertions(+) create mode 100644 app/assets/stylesheets/components/card.scss create mode 100644 app/components/layout/card_component.rb create mode 100644 test/components/previews/layout/card_component_preview.rb diff --git a/app/assets/stylesheets/components/card.scss b/app/assets/stylesheets/components/card.scss new file mode 100644 index 000000000..825f227cf --- /dev/null +++ b/app/assets/stylesheets/components/card.scss @@ -0,0 +1,5 @@ +.summary-card { + border: 1px solid #dfdfdf; + border-radius: 5px; + margin-top: 20px; +} \ No newline at end of file diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 05b6ff8fe..cafa1ecfd 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -20,4 +20,5 @@ @import "switch"; @import "table"; @import "concept_details"; +@import "card"; @import "header"; \ No newline at end of file diff --git a/app/components/layout/card_component.rb b/app/components/layout/card_component.rb new file mode 100644 index 000000000..ceebc820c --- /dev/null +++ b/app/components/layout/card_component.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class Layout::CardComponent < ViewComponent::Base + renders_one :header, Display::HeaderComponent + + def call + content_tag(:div, class: 'summary-card') do + out = '' + out = header if header? + raw(out.to_s + content) + end + end +end diff --git a/test/components/previews/layout/card_component_preview.rb b/test/components/previews/layout/card_component_preview.rb new file mode 100644 index 000000000..23f07a2d8 --- /dev/null +++ b/test/components/previews/layout/card_component_preview.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class Layout::CardComponentPreview < ViewComponent::Preview + # @param text textarea + def default(text: 'text here') + render Layout::CardComponent.new do + text.html_safe + end + end +end From fb2541f21215a40cb694f555722f33276b62d9f2 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 04:05:30 +0200 Subject: [PATCH 445/533] add image component --- app/assets/images/icons/loop.svg | 4 +++ app/assets/stylesheets/components/image.scss | 22 ++++++++++++ app/assets/stylesheets/components/index.scss | 3 +- app/components/display/image_component.rb | 34 +++++++++++++++++++ app/controllers/application_controller.rb | 4 +++ app/views/layouts/component_preview.html.erb | 2 +- .../component_preview_not_centred.html.erb | 6 ++-- config/routes.rb | 2 +- .../display/image_component_preview.rb | 7 ++++ 9 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 app/assets/images/icons/loop.svg create mode 100644 app/assets/stylesheets/components/image.scss create mode 100644 app/components/display/image_component.rb create mode 100644 test/components/previews/display/image_component_preview.rb diff --git a/app/assets/images/icons/loop.svg b/app/assets/images/icons/loop.svg new file mode 100644 index 000000000..38a8ac694 --- /dev/null +++ b/app/assets/images/icons/loop.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/components/image.scss b/app/assets/stylesheets/components/image.scss new file mode 100644 index 000000000..97414ab03 --- /dev/null +++ b/app/assets/stylesheets/components/image.scss @@ -0,0 +1,22 @@ +.image-container { + position: relative; + .image-content{ + width: 100%; + object-fit: scale-down; + margin-bottom: 30px; + } + .loop_icon { + position: absolute; + width: 50px; + background-color: white; + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1), 0 1px 3px rgba(0, 0, 0, 0.08); + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + height: 50px; + padding: 10px; + bottom: 0; + right: 0; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index cafa1ecfd..3f0b11557 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -21,4 +21,5 @@ @import "table"; @import "concept_details"; @import "card"; -@import "header"; \ No newline at end of file +@import "header"; +@import "image"; \ No newline at end of file diff --git a/app/components/display/image_component.rb b/app/components/display/image_component.rb new file mode 100644 index 000000000..36bcb10fe --- /dev/null +++ b/app/components/display/image_component.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +class Display::ImageComponent < ViewComponent::Base + include ModalHelper + + def initialize(src: , title: '', enable_zoom: true) + super + @src = src + @title = title + @enable_zoom = enable_zoom + end + + def call + content_tag(:div, class: 'image-container ') do + depiction_with_modal(@src) + end + end + + def depiction_with_modal(depiction_url) + img_tag = image_tag(depiction_url, class: 'image-content') + loop_icon_tag = content_tag(:span , image_tag('icons/loop.svg'), class: 'loop_icon') + modal_url = "/ajax/images/show?url=#{depiction_url}" + modal_options = { data: { show_modal_title_value: @title, show_modal_size_value: 'modal-xl' } } + + if @enable_zoom + link_to_modal(nil, modal_url, modal_options) do + loop_icon_tag + img_tag + end + else + img_tag + end + + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4da5f4a67..7ce8b03e2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -85,6 +85,10 @@ def detect_locale before_action :set_global_thread_values, :domain_ontology_set, :authorize_miniprofiler, :clean_empty_strings_from_params_arrays, :init_trial_license + def show_image_modal + url = params[:url] + render turbo_stream: helpers.prepend('application_modal_content') { helpers.image_tag(url, style:'width: 100%') } + end def set_global_thread_values Thread.current[:session] = session diff --git a/app/views/layouts/component_preview.html.erb b/app/views/layouts/component_preview.html.erb index f6fe9f26b..5369cd053 100644 --- a/app/views/layouts/component_preview.html.erb +++ b/app/views/layouts/component_preview.html.erb @@ -49,7 +49,7 @@ - + <%= modal_frame_container %>

    <%= yield %> <%= javascript_include_tag "application" %> diff --git a/app/views/layouts/component_preview_not_centred.html.erb b/app/views/layouts/component_preview_not_centred.html.erb index b8c527da1..81b1c2964 100644 --- a/app/views/layouts/component_preview_not_centred.html.erb +++ b/app/views/layouts/component_preview_not_centred.html.erb @@ -49,8 +49,8 @@ - -<%= yield %> -<%= javascript_include_tag "application" %> + <%= modal_frame_container %> + <%= yield %> + <%= javascript_include_tag "application" %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 13e035de2..589464523 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -157,7 +157,7 @@ get '/ajax/:ontology/classes/:conceptid/instances' => 'instances#index_by_class', :constraints => { conceptid: /[^\/?]+/ } get '/ajax/ontologies' , to:"ontologies#ajax_ontologies" get '/ajax/agents' , to:"agents#ajax_agents" - + get '/ajax/images/show' => 'application#show_image_modal' # User get '/logout' => 'login#destroy', :as => :logout get '/lost_pass' => 'login#lost_password' diff --git a/test/components/previews/display/image_component_preview.rb b/test/components/previews/display/image_component_preview.rb new file mode 100644 index 000000000..d6caa1f9a --- /dev/null +++ b/test/components/previews/display/image_component_preview.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class Display::ImageComponentPreview < ViewComponent::Preview + def default + render Display::ImageComponent.new(src: "empty-box.svg", title: 'Image popup') + end +end From 09478557ef0c80f69cfe3ea7291fa8d02878fa84 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 04:13:17 +0200 Subject: [PATCH 446/533] add list layout component --- .../layout/horizontal_list_component.rb | 18 +++++++++++++++++ app/components/layout/list_component.rb | 20 +++++++++++++++++++ .../previews/layout/list_component_preview.rb | 19 ++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 app/components/layout/horizontal_list_component.rb create mode 100644 app/components/layout/list_component.rb create mode 100644 test/components/previews/layout/list_component_preview.rb diff --git a/app/components/layout/horizontal_list_component.rb b/app/components/layout/horizontal_list_component.rb new file mode 100644 index 000000000..aed504b7a --- /dev/null +++ b/app/components/layout/horizontal_list_component.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class Layout::HorizontalListComponent < ViewComponent::Base + renders_many :elements + + def call + return if elements.empty? + + content_tag(:div, class: 'd-flex flex-wrap') do + out = '' + elements.each do |element| + out = out + content_tag(:div, element, class: 'mr-1 mb-1 text-truncate overflow-hidden') + end + raw out + end + end + +end diff --git a/app/components/layout/list_component.rb b/app/components/layout/list_component.rb new file mode 100644 index 000000000..edf75b865 --- /dev/null +++ b/app/components/layout/list_component.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +class Layout::ListComponent < ViewComponent::Base + + renders_many :rows + + def call + return if rows.map(&:to_s).reject(&:empty?).empty? + + content_tag(:div, style: 'padding: 0px 20px 20px 20px;') do + out = "" + rows.each do |row| + next if row.nil? || row.to_s.empty? + out = out + content_tag(:div, row.to_s, class: 'mb-1') + end + out.html_safe + end + end + +end diff --git a/test/components/previews/layout/list_component_preview.rb b/test/components/previews/layout/list_component_preview.rb new file mode 100644 index 000000000..ea57e5836 --- /dev/null +++ b/test/components/previews/layout/list_component_preview.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class Layout::ListComponentPreview < ViewComponent::Preview + def vertical + render Layout::ListComponent.new do |l| + 4.times.each do |i| + l.row {content_tag(:div , "element #{i}", class: 'p-1 border')} + end + end + end + + def horizontal + render Layout::HorizontalListComponent.new do |l| + 4.times.each do |i| + l.element {content_tag(:div , "element #{i}", class: 'p-1 border')} + end + end + end +end From 54650df1941d3284ab7af4ec09528aa548937a5b Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 04:15:13 +0200 Subject: [PATCH 447/533] add borderless and layout fixed states for the table component --- app/assets/stylesheets/components/table.scss | 9 ++++++++- .../stylesheets/components/tabs_container.scss | 1 + app/components/table_component.rb | 12 +++++++++++- .../table_component/table_component.html.haml | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss index c132a4c31..27869d6ee 100644 --- a/app/assets/stylesheets/components/table.scss +++ b/app/assets/stylesheets/components/table.scss @@ -4,6 +4,10 @@ border-spacing: 0; } +.table-layout-fixed{ + table-layout: fixed; +} + .table-content thead th{ background-color: hsl(0, 0%, 100%); border-bottom: 1px solid hsl(240, 4%, 85%); @@ -11,9 +15,12 @@ color: hsl(230, 13%, 9%); } +.table-content-borderless thead th { + border-bottom: none !important; +} .table-content td, .table-content th{ - padding: 12px 24px; + padding: 0.75rem; vertical-align: top; } diff --git a/app/assets/stylesheets/components/tabs_container.scss b/app/assets/stylesheets/components/tabs_container.scss index 87ef9291c..422a29872 100644 --- a/app/assets/stylesheets/components/tabs_container.scss +++ b/app/assets/stylesheets/components/tabs_container.scss @@ -5,6 +5,7 @@ & > div { display: flex; justify-content: space-between; + width: 100%; } } diff --git a/app/components/table_component.rb b/app/components/table_component.rb index 05a2f3a7c..9670464db 100644 --- a/app/components/table_component.rb +++ b/app/components/table_component.rb @@ -5,16 +5,26 @@ class TableComponent < ViewComponent::Base renders_one :header, TableRowComponent renders_many :rows, TableRowComponent - def initialize(id: '', stripped: true) + def initialize(id: '', stripped: true, borderless: false, layout_fixed: false ) super @id = id @stripped = stripped + @borderless = borderless + @layout_fixed = layout_fixed end def stripped_class @stripped ? 'table-content-stripped' : '' end + def borderless_class + @borderless ? 'table-content-borderless' : '' + end + + def layout_fixed_class + @layout_fixed ? 'table-layout-fixed' : '' + end + def add_row(*array, &block) self.row.create(*array, &block) end diff --git a/app/components/table_component/table_component.html.haml b/app/components/table_component/table_component.html.haml index 089870b44..ed479fb66 100644 --- a/app/components/table_component/table_component.html.haml +++ b/app/components/table_component/table_component.html.haml @@ -1,4 +1,4 @@ -%table.table-content{id: @id, class: stripped_class} +%table.table-content{id: @id, class: stripped_class + ' ' + borderless_class + ' ' + layout_fixed_class} %thead = header %tbody{id: "#{@id}_table_body"} From dcb376a15b7e79e593c04aa7d74dc1871f82165e Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 04:24:24 +0200 Subject: [PATCH 448/533] add to summary section action links and info tooltip slots --- .../components/summary_section.scss | 9 ++------- app/components/summary_section_component.rb | 1 + .../summary_section_component.html.haml | 18 ++++++++++++++---- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/components/summary_section.scss b/app/assets/stylesheets/components/summary_section.scss index 370da6ae4..9592f305b 100644 --- a/app/assets/stylesheets/components/summary_section.scss +++ b/app/assets/stylesheets/components/summary_section.scss @@ -1,4 +1,5 @@ .card_title { + display: flex; font-size: 18px; margin-top: 40px; margin-bottom: 20px; @@ -7,12 +8,6 @@ text-decoration: underline; text-underline-offset: 12px; text-decoration-color: var(--primary-color); - text-decoration-thickness: 1px; + text-decoration-thickness: 2px; } } -.Summary-page-card { - border: 1px solid #dfdfdf; - border-radius: 5px; - padding: 20px 20px; - margin-top: 20px; -} \ No newline at end of file diff --git a/app/components/summary_section_component.rb b/app/components/summary_section_component.rb index bd292122d..0ca33932f 100644 --- a/app/components/summary_section_component.rb +++ b/app/components/summary_section_component.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true class SummarySectionComponent < ViewComponent::Base + renders_many :action_links def initialize(title: , link: nil, link_title: nil, show_card: true) super diff --git a/app/components/summary_section_component/summary_section_component.html.haml b/app/components/summary_section_component/summary_section_component.html.haml index b1090e54f..c43356866 100644 --- a/app/components/summary_section_component/summary_section_component.html.haml +++ b/app/components/summary_section_component/summary_section_component.html.haml @@ -3,7 +3,17 @@ = @title - if @link %span - = link_to(@link, target: "_blank", "aria-label": @link_title , title: @link_title) do - %i.fas.fa-lg.fa-question-circle{style: "color: var(--primary-color)"} -%div{class: show_card? ? 'Summary-page-card' : ''} - = content \ No newline at end of file + = link_to(@link, target: "_blank") do + = render Display::InfoTooltipComponent.new(text: @link_title) + + - if action_links? + %span + = render Layout::HorizontalListComponent.new do |l| + - action_links.each { |link| l.element { raw link }} + +- if show_card? + = render Layout::CardComponent.new do + = content +- else + %div + = content \ No newline at end of file From 83e08289f352e7f29089303174d422113daae558 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 04:20:10 +0200 Subject: [PATCH 449/533] update dropdown to add empty state and use header & list components --- app/assets/stylesheets/components/dropdown.scss | 2 +- app/components/dropdown_container_component.rb | 4 ++-- .../dropdown_container_component.html.haml | 13 +++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/components/dropdown.scss b/app/assets/stylesheets/components/dropdown.scss index d923eae5c..b9c73b7f4 100644 --- a/app/assets/stylesheets/components/dropdown.scss +++ b/app/assets/stylesheets/components/dropdown.scss @@ -6,7 +6,7 @@ font-size: 16px; color: #000000; cursor: pointer; - padding: 14px 20px; + padding: 0 14px 0 0; } .dropdown-container { diff --git a/app/components/dropdown_container_component.rb b/app/components/dropdown_container_component.rb index c9d0f68bd..897d708b9 100644 --- a/app/components/dropdown_container_component.rb +++ b/app/components/dropdown_container_component.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true class DropdownContainerComponent < ViewComponent::Base - - def initialize(title:, id:) + renders_one :empty_state + def initialize(title:, id:, tooltip:nil) super @title = title @id = id diff --git a/app/components/dropdown_container_component/dropdown_container_component.html.haml b/app/components/dropdown_container_component/dropdown_container_component.html.haml index f612f152b..11c0dd2ee 100644 --- a/app/components/dropdown_container_component/dropdown_container_component.html.haml +++ b/app/components/dropdown_container_component/dropdown_container_component.html.haml @@ -1,7 +1,12 @@ .dropdown-container .dropdown-title-bar{"data-toggle" => "collapse", "data-target" => "##{@id}"} - %p.mb-0 - = @title - %img{alt: "", src: asset_path("summary/arrow-down.svg")} + = render Display::HeaderComponent.new(text: @title, tooltip: @tooltip) + = image_tag("summary/arrow-down.svg", class: 'ml-2') + .collapse{id: @id} - = content \ No newline at end of file + - if content && !content.empty? + = content + - else + = render Layout::ListComponent.new do |l| + - l.row do + = empty_state || 'no data' From baffda122c1addebcba21431d9490fe0045bcc52 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 04:27:16 +0200 Subject: [PATCH 450/533] add for field container component an html content label slot --- .../stylesheets/components/field_container.scss | 5 +---- app/components/field_container_component.rb | 7 ++++++- .../field_container_component.html.haml | 13 ++++++++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/components/field_container.scss b/app/assets/stylesheets/components/field_container.scss index 98e7cad87..cd2b46ea7 100644 --- a/app/assets/stylesheets/components/field_container.scss +++ b/app/assets/stylesheets/components/field_container.scss @@ -1,7 +1,5 @@ .field-container { - display: flex; - flex-wrap: wrap; - align-items: center; + margin-bottom: 0.5rem; } @@ -9,7 +7,6 @@ .field-description_text a { color: #888888 !important; font-size: 15px; - margin-top: 10px; margin-bottom: 0; } diff --git a/app/components/field_container_component.rb b/app/components/field_container_component.rb index 4769718ee..d45e42e0e 100644 --- a/app/components/field_container_component.rb +++ b/app/components/field_container_component.rb @@ -2,9 +2,14 @@ class FieldContainerComponent < ViewComponent::Base - def initialize(label:, value:) + renders_one :label + def initialize(label: nil, value: nil) super @label = label @value = value end + + def show? + content && !content.strip.empty? || (!@value.nil? && !@value.strip.empty?) + end end diff --git a/app/components/field_container_component/field_container_component.html.haml b/app/components/field_container_component/field_container_component.html.haml index dad407c18..c7da1e602 100644 --- a/app/components/field_container_component/field_container_component.html.haml +++ b/app/components/field_container_component/field_container_component.html.haml @@ -1,6 +1,9 @@ -%div - .field-container +- if show? + %div.field-container %p.field-description_text - = @label.humanize - %p.field-normal_text - = @value \ No newline at end of file + = label || @label.humanize + - if content + = content + - else + %span.field-normal_text + = @value From c8d38b936141173b89d1a1eca6620c54ce29244f Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 04:29:52 +0200 Subject: [PATCH 451/533] update text area field to use span instead of p, to have less padding --- .../text_area_field_component.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/text_area_field_component/text_area_field_component.html.haml b/app/components/text_area_field_component/text_area_field_component.html.haml index 40226b7e5..6a58213be 100644 --- a/app/components/text_area_field_component/text_area_field_component.html.haml +++ b/app/components/text_area_field_component/text_area_field_component.html.haml @@ -1,5 +1,5 @@ %div{data:{controller:"text-truncate", 'text-truncate-more-text-value': @see_more_text , 'text-truncate-less-text-value': @see_less_text}} - %p.text-content{'data-text-truncate-target': 'content'} + %span.text-content{'data-text-truncate-target': 'content'} = @value - %p.see_more_text{data:{'text-truncate-target': 'button', 'action':"click->text-truncate#toggle"}} + %span.see_more_text{data:{'text-truncate-target': 'button', 'action':"click->text-truncate#toggle"}} = @see_more_text \ No newline at end of file From 85017c1e40b0adf6f79178f571522aee7413d889 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 04:35:17 +0200 Subject: [PATCH 452/533] add to table row component an optional css class argument --- app/components/table_row_component.rb | 3 ++- .../table_row_component/table_row_component.html.haml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/components/table_row_component.rb b/app/components/table_row_component.rb index 90c995a2a..68620a05c 100644 --- a/app/components/table_row_component.rb +++ b/app/components/table_row_component.rb @@ -4,9 +4,10 @@ class TableRowComponent < ViewComponent::Base renders_many :cells, TableCellComponent - def initialize(id: '') + def initialize(id: '', class_css: '') super @id = id + @class_css = class_css end def create(*array, &block) diff --git a/app/components/table_row_component/table_row_component.html.haml b/app/components/table_row_component/table_row_component.html.haml index 55dad8c73..c25e45eee 100644 --- a/app/components/table_row_component/table_row_component.html.haml +++ b/app/components/table_row_component/table_row_component.html.haml @@ -1,4 +1,4 @@ -%tr{id: @id} +%tr{id: @id, class: @class_css} - cells.each do |cell| = cell = content \ No newline at end of file From 476e4e8447652076f75cbf6d4bfb124712ded1d2 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 04:37:19 +0200 Subject: [PATCH 453/533] update chip button style to have the same line height in all the states --- app/assets/stylesheets/components/chip_button.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/components/chip_button.scss b/app/assets/stylesheets/components/chip_button.scss index 70c385ddd..e795c43cc 100644 --- a/app/assets/stylesheets/components/chip_button.scss +++ b/app/assets/stylesheets/components/chip_button.scss @@ -5,11 +5,14 @@ color: #777777 !important; font-weight: 500; font-size: 15px; + line-height: 44px; + display: inline; } .chip_button_small{ font-size: 10px; padding: 5px; + line-height: unset; } .chip_button_container_clickable { @@ -20,4 +23,5 @@ color: var(--primary-color); font-weight: 500; font-size: 15px; + cursor: grab; } From dcd1ac819fd3bc40a48202d485e3b7568312f5dd Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 04:37:51 +0200 Subject: [PATCH 454/533] make link to modal helper use PopupLinkText component --- app/helpers/modal_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/modal_helper.rb b/app/helpers/modal_helper.rb index 068d9b7f7..568c0f866 100644 --- a/app/helpers/modal_helper.rb +++ b/app/helpers/modal_helper.rb @@ -5,7 +5,7 @@ def link_to_modal(name, options = nil, html_options = nil, &block) if name.nil? link_to(options, html_options, &block) else - link_to(name, options, html_options) + link_to(PopupLinkTextComponent.new(text: name).call, options, html_options) end end From 050b28dc697268e0c3d4c5e3d7a897ed53339204 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Aug 2023 04:44:16 +0200 Subject: [PATCH 455/533] add components helper file, regrouping helper to use component easily --- app/helpers/components_helper.rb | 80 ++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 app/helpers/components_helper.rb diff --git a/app/helpers/components_helper.rb b/app/helpers/components_helper.rb new file mode 100644 index 000000000..3b931cb31 --- /dev/null +++ b/app/helpers/components_helper.rb @@ -0,0 +1,80 @@ +module ComponentsHelper + def info_tooltip(text) + render Display::InfoTooltipComponent.new(text: text) + end + + def empty_state_message(message) + content_tag(:p, message.html_safe, class: 'font-italic field-description_text') + end + + def properties_list_component(c, properties, &block) + properties.each do |k, v| + c.row do + content = if block_given? + capture(v, &block) + else + v + end + render FieldContainerComponent.new(label: attr_label(k)) do + content + end + end + end + + end + + + def horizontal_list_container(values, &block) + return if Array(values).empty? + + render Layout::HorizontalListComponent.new do |l| + Array(values).each do |v| + l.element do + capture(v, &block) + end + end + end + end + + def list_container(values, &block) + return if Array(values).empty? + + render Layout::ListComponent.new do |l| + Array(values).each do |v| + l.row do + capture(v, &block) + end + end + end + end + + def properties_card(title, tooltip, properties, &block) + render Layout::CardComponent.new do |d| + d.header(text: title, tooltip: tooltip) + render(Layout::ListComponent.new) do |c| + if properties + properties_list_component(c, properties, &block) + else + capture(c, &block) + end + end + end + end + + def properties_dropdown(id, title, tooltip, properties, &block) + render DropdownContainerComponent.new(title: title, id: id, tooltip: tooltip) do |d| + d.empty_state do + properties_string = properties.keys[0..4].map{|key| "#{attr_label(key)}" }.join(', ')+'... ' if properties + empty_state_message "The fields #{properties_string} are empty" + end + + render Layout::ListComponent.new do |c| + if properties + properties_list_component(c, properties, &block) + else + capture(c, &block) + end + end + end + end +end From 98f512475d19ac84dc5effd0e74e072cf5248302 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 10 Aug 2023 10:38:44 +0000 Subject: [PATCH 456/533] Add size parameter to button component --- app/components/buttons/regular_button_component.rb | 3 ++- .../regular_button_component.html.haml | 5 +++-- .../previews/buttons/regular_button_component_preview.rb | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index f1f17bd76..b5ea12f63 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -1,5 +1,5 @@ class Buttons::RegularButtonComponent < ViewComponent::Base - def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "primary", icon: "", icon_type:"left", href: "#") + def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "primary", icon: "", icon_type:"left", href: "#", size: "normal") @name = name @value = value @variant = variant @@ -9,5 +9,6 @@ def initialize(name: "", value: ,variant: "primary", type: "regular", style: "re @icon = icon @icon_type = icon_type @href = href + @size = size end end diff --git a/app/components/buttons/regular_button_component/regular_button_component.html.haml b/app/components/buttons/regular_button_component/regular_button_component.html.haml index 887ddf381..ba92234d4 100644 --- a/app/components/buttons/regular_button_component/regular_button_component.html.haml +++ b/app/components/buttons/regular_button_component/regular_button_component.html.haml @@ -1,13 +1,14 @@ +- style = @size == "slim" ? "height: 42px;" : "height: 60px;" .button-container - if @type == "link" - %a.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button", href: @href} + %a.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button", href: @href, style: style} - if @icon != "" && @icon_type == "left" = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" = @value - if @icon != "" && @icon_type == "right" = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" - else - %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button", type: "#{"submit" if @type == "submit"}"} + %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button", type: "#{"submit" if @type == "submit"}", style: style} - if @icon != "" && @icon_type == "left" = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" = @value diff --git a/test/components/previews/buttons/regular_button_component_preview.rb b/test/components/previews/buttons/regular_button_component_preview.rb index a209bd379..e1e54f846 100644 --- a/test/components/previews/buttons/regular_button_component_preview.rb +++ b/test/components/previews/buttons/regular_button_component_preview.rb @@ -16,6 +16,12 @@ def secondary() end end + def slim + def slim() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", size: "slim") + end + end + def icon_left def icon_left() render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", icon: "check.svg") From e261c860b432743481f8b4c6fad0b4f878177801 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 10 Aug 2023 11:17:08 +0000 Subject: [PATCH 457/533] Add color parameter to button component --- .../components/regular_button.scss | 49 +++++++++++++++++-- .../buttons/regular_button_component.rb | 2 +- .../regular_button_component.html.haml | 10 ++-- .../regular_button_component_preview.rb | 12 +++++ 4 files changed, 65 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/components/regular_button.scss b/app/assets/stylesheets/components/regular_button.scss index 6e7bbe69b..bc934468f 100644 --- a/app/assets/stylesheets/components/regular_button.scss +++ b/app/assets/stylesheets/components/regular_button.scss @@ -14,32 +14,68 @@ border: none; transition: background-color ease 0.3s; } -.primary-button:focus{ +.primary-button:focus { outline: none; } + .primary-button:hover { background-color: var(--hover-color); cursor: pointer; } +.danger-button.primary-button { + background-color: #F24C3D !important; +} + +.danger-button.primary-button:hover { + background-color: #d74639 !important; +} + +.warning-button.primary-button { + background-color: #F2BE22 !important; +} + +.warning-button.primary-button:hover { + background-color: #dcac1d !important; +} .secondary-button { color: var(--primary-color); border: 1px solid var(--primary-color); transition: background-color ease 0.3s; - background-color: rgba(0, 0, 0, 0); + background-color: rgba(0, 0, 0, 0) !important; } .secondary-button:focus { outline: none; } .secondary-button:hover { - background-color: var(--primary-color); + background-color: var(--primary-color) !important; cursor: pointer; color: white !important; + .secondary-button-icon path { fill: white; } } + +.secondary-button.danger-button { + color: #F24C3D !important; + border: 1px solid #F24C3D; +} +.secondary-button.danger-button:hover { + background-color: #F24C3D !important; + color: white !important; +} +.secondary-button.warning-button { + color: #F2BE22 !important; + border: 1px solid #F2BE22; +} + +.secondary-button.warning-button:hover { + background-color: #dcac1d !important; + color: white !important; +} + .left-button-icon{ margin-right: 10px; } @@ -64,7 +100,12 @@ justify-content: center; align-items: center; display: none; - +} +.animation-container.danger-button{ + background-color: #d74639 !important; +} +.animation-container.warning-button{ + background-color: #dcac1d !important; } .lds-ellipsis { display: inline-block; diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index b5ea12f63..4ea3a071c 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -1,5 +1,5 @@ class Buttons::RegularButtonComponent < ViewComponent::Base - def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "primary", icon: "", icon_type:"left", href: "#", size: "normal") + def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "normal", icon: "", icon_type:"left", href: "#", size: "normal") @name = name @value = value @variant = variant diff --git a/app/components/buttons/regular_button_component/regular_button_component.html.haml b/app/components/buttons/regular_button_component/regular_button_component.html.haml index ba92234d4..db5c047e8 100644 --- a/app/components/buttons/regular_button_component/regular_button_component.html.haml +++ b/app/components/buttons/regular_button_component/regular_button_component.html.haml @@ -1,21 +1,25 @@ - style = @size == "slim" ? "height: 42px;" : "height: 60px;" +- danger_class = @color == "danger" ? "danger-button " : " " +- warning_class = @color == "warning" ? "warning-button " : " " +- #danger color: #F24C3D +- #warning color: #F2BE22 .button-container - if @type == "link" - %a.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button", href: @href, style: style} + %a.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class, href: @href, style: style} - if @icon != "" && @icon_type == "left" = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" = @value - if @icon != "" && @icon_type == "right" = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" - else - %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button", type: "#{"submit" if @type == "submit"}", style: style} + %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class, type: "#{"submit" if @type == "submit"}", style: style} - if @icon != "" && @icon_type == "left" = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" = @value - if @icon != "" && @icon_type == "right" = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" -.animation-container#loading-animation +.animation-container#loading-animation{style: style, class: danger_class+warning_class} .lds-ellipsis %div %div diff --git a/test/components/previews/buttons/regular_button_component_preview.rb b/test/components/previews/buttons/regular_button_component_preview.rb index e1e54f846..6d6d6e922 100644 --- a/test/components/previews/buttons/regular_button_component_preview.rb +++ b/test/components/previews/buttons/regular_button_component_preview.rb @@ -22,6 +22,18 @@ def slim() end end + def danger + def danger() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", color: "danger") + end + end + + def warning + def warning() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", color: "warning") + end + end + def icon_left def icon_left() render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", icon: "check.svg") From abedbf1e27bc281a9426ef543ac1e73fe69a8ca0 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 10 Aug 2023 12:12:56 +0000 Subject: [PATCH 458/533] Add state parameter to the button component --- .../components/regular_button.scss | 20 +++++++++++ .../buttons/regular_button_component.rb | 3 +- .../regular_button_component.html.haml | 36 +++++++++---------- .../regular_button_component_preview.rb | 12 +++++++ 4 files changed, 52 insertions(+), 19 deletions(-) diff --git a/app/assets/stylesheets/components/regular_button.scss b/app/assets/stylesheets/components/regular_button.scss index bc934468f..c16a08e70 100644 --- a/app/assets/stylesheets/components/regular_button.scss +++ b/app/assets/stylesheets/components/regular_button.scss @@ -22,6 +22,15 @@ background-color: var(--hover-color); cursor: pointer; } + +.primary-button.disabled-button{ + background-color: #a3a3a3; +} +.primary-button.disabled-button:hover { + background-color: #a3a3a3; + cursor:default; +} + .danger-button.primary-button { background-color: #F24C3D !important; } @@ -58,6 +67,17 @@ } } +.secondary-button.disabled-button { + border: 1px solid #a3a3a3; + color: #a3a3a3 !important; +} + +.secondary-button.disabled-button:hover { + background-color: rgba(0, 0, 0, 0) !important; + cursor: default; + color: #a3a3a3 !important; +} + .secondary-button.danger-button { color: #F24C3D !important; border: 1px solid #F24C3D; diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index 4ea3a071c..7eae0ff91 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -1,5 +1,5 @@ class Buttons::RegularButtonComponent < ViewComponent::Base - def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "normal", icon: "", icon_type:"left", href: "#", size: "normal") + def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "normal", icon: "", icon_type:"left", href: "#", size: "normal", state: "animate") @name = name @value = value @variant = variant @@ -10,5 +10,6 @@ def initialize(name: "", value: ,variant: "primary", type: "regular", style: "re @icon_type = icon_type @href = href @size = size + @state = state end end diff --git a/app/components/buttons/regular_button_component/regular_button_component.html.haml b/app/components/buttons/regular_button_component/regular_button_component.html.haml index db5c047e8..5221a969d 100644 --- a/app/components/buttons/regular_button_component/regular_button_component.html.haml +++ b/app/components/buttons/regular_button_component/regular_button_component.html.haml @@ -1,36 +1,36 @@ - style = @size == "slim" ? "height: 42px;" : "height: 60px;" - danger_class = @color == "danger" ? "danger-button " : " " - warning_class = @color == "warning" ? "warning-button " : " " -- #danger color: #F24C3D -- #warning color: #F2BE22 +- disabled_class = @state == "disabled" ? "disabled-button " : " " .button-container - if @type == "link" - %a.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class, href: @href, style: style} + %a.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class+disabled_class, href: @href, style: style} - if @icon != "" && @icon_type == "left" = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" = @value - if @icon != "" && @icon_type == "right" = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" - else - %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class, type: "#{"submit" if @type == "submit"}", style: style} + %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class+disabled_class, type: "#{"submit" if @type == "submit"}", style: style} - if @icon != "" && @icon_type == "left" = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" = @value - if @icon != "" && @icon_type == "right" = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" -.animation-container#loading-animation{style: style, class: danger_class+warning_class} - .lds-ellipsis - %div - %div - %div - %div +- if @state == "animate" + .animation-container#loading-animation{style: style, class: danger_class+warning_class} + .lds-ellipsis + %div + %div + %div + %div -:javascript - const button = document.getElementById("button-animation-id") - const loading = document.getElementById("loading-animation") - function displayAnimation(){ - console.log("working") - button.style.display = 'none'; - loading.style.display = 'flex'; - } \ No newline at end of file + :javascript + const button = document.getElementById("button-animation-id") + const loading = document.getElementById("loading-animation") + function displayAnimation(){ + console.log("working") + button.style.display = 'none'; + loading.style.display = 'flex'; + } \ No newline at end of file diff --git a/test/components/previews/buttons/regular_button_component_preview.rb b/test/components/previews/buttons/regular_button_component_preview.rb index 6d6d6e922..0ab6bff85 100644 --- a/test/components/previews/buttons/regular_button_component_preview.rb +++ b/test/components/previews/buttons/regular_button_component_preview.rb @@ -34,6 +34,18 @@ def warning() end end + def disabled + def disabled() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", state: "disabled") + end + end + + def no_animation + def no_animation() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", state: "regular") + end + end + def icon_left def icon_left() render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", icon: "check.svg") From 104aa907a2752a21813eceb6e5e2a04eaf4acf37 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 12 Aug 2023 21:07:05 +0200 Subject: [PATCH 459/533] add slim state to the regular button component --- app/assets/stylesheets/components/regular_button.scss | 8 ++++++++ .../regular_button_component.html.haml | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/components/regular_button.scss b/app/assets/stylesheets/components/regular_button.scss index c16a08e70..a1afb15f9 100644 --- a/app/assets/stylesheets/components/regular_button.scss +++ b/app/assets/stylesheets/components/regular_button.scss @@ -7,6 +7,10 @@ height: 60px; border-radius: 9px; } +.regular-button.slim{ + border-radius: 5px; + height: 42px; +} .primary-button { color: white !important; @@ -121,6 +125,10 @@ align-items: center; display: none; } +.animation-container.slim { + border-radius: 5px; + height: 42px; +} .animation-container.danger-button{ background-color: #d74639 !important; } diff --git a/app/components/buttons/regular_button_component/regular_button_component.html.haml b/app/components/buttons/regular_button_component/regular_button_component.html.haml index 5221a969d..2c01b2c90 100644 --- a/app/components/buttons/regular_button_component/regular_button_component.html.haml +++ b/app/components/buttons/regular_button_component/regular_button_component.html.haml @@ -1,17 +1,17 @@ -- style = @size == "slim" ? "height: 42px;" : "height: 60px;" +- slim_class = @size == "slim" ? "slim " : " " - danger_class = @color == "danger" ? "danger-button " : " " - warning_class = @color == "warning" ? "warning-button " : " " - disabled_class = @state == "disabled" ? "disabled-button " : " " .button-container - if @type == "link" - %a.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class+disabled_class, href: @href, style: style} + %a.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class+disabled_class+slim_class, href: @href} - if @icon != "" && @icon_type == "left" = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" = @value - if @icon != "" && @icon_type == "right" = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" - else - %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class+disabled_class, type: "#{"submit" if @type == "submit"}", style: style} + %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class+disabled_class+slim_class, type: "#{@type == "submit" ? "submit" : "button"}"} - if @icon != "" && @icon_type == "left" = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" = @value @@ -19,7 +19,7 @@ = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" - if @state == "animate" - .animation-container#loading-animation{style: style, class: danger_class+warning_class} + .animation-container#loading-animation{class: danger_class+warning_class+slim_class} .lds-ellipsis %div %div From 0ef11bcaaaf65a1c8f7f45c1165fff7aaa16ac51 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 16 Aug 2023 13:23:29 +0000 Subject: [PATCH 460/533] add slim, danger, warning, disabled, noAnimarion variations to button component --- .../components/regular_button.scss | 96 +++++++++++++++++-- .../buttons/regular_button_component.rb | 4 +- .../regular_button_component.html.haml | 37 +++---- .../regular_button_component_preview.rb | 30 ++++++ 4 files changed, 143 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/components/regular_button.scss b/app/assets/stylesheets/components/regular_button.scss index 6e7bbe69b..2d0c680a6 100644 --- a/app/assets/stylesheets/components/regular_button.scss +++ b/app/assets/stylesheets/components/regular_button.scss @@ -1,4 +1,4 @@ -.regular-button{ +.regular-button { width: 100%; display: flex; justify-content: center; @@ -8,53 +8,122 @@ border-radius: 9px; } +.regular-button.slim { + border-radius: 5px; + height: 42px; +} + .primary-button { color: white !important; background-color: var(--primary-color); border: none; transition: background-color ease 0.3s; } -.primary-button:focus{ + +.primary-button:focus { outline: none; } + .primary-button:hover { background-color: var(--hover-color); cursor: pointer; } +.primary-button.disabled-button { + background-color: #a3a3a3; +} + +.primary-button.disabled-button:hover { + background-color: #a3a3a3; + cursor: default; +} + +.danger-button.primary-button { + background-color: #F24C3D !important; +} + +.danger-button.primary-button:hover { + background-color: #d74639 !important; +} + +.warning-button.primary-button { + background-color: #F2BE22 !important; +} + +.warning-button.primary-button:hover { + background-color: #dcac1d !important; +} + .secondary-button { color: var(--primary-color); border: 1px solid var(--primary-color); transition: background-color ease 0.3s; - background-color: rgba(0, 0, 0, 0); + background-color: rgba(0, 0, 0, 0) !important; } + .secondary-button:focus { outline: none; } .secondary-button:hover { - background-color: var(--primary-color); + background-color: var(--primary-color) !important; cursor: pointer; color: white !important; + .secondary-button-icon path { fill: white; } } -.left-button-icon{ + +.secondary-button.disabled-button { + border: 1px solid #a3a3a3; + color: #a3a3a3 !important; +} + +.secondary-button.disabled-button:hover { + background-color: rgba(0, 0, 0, 0) !important; + cursor: default; + color: #a3a3a3 !important; +} + +.secondary-button.danger-button { + color: #F24C3D !important; + border: 1px solid #F24C3D; +} + +.secondary-button.danger-button:hover { + background-color: #F24C3D !important; + color: white !important; +} + +.secondary-button.warning-button { + color: #F2BE22 !important; + border: 1px solid #F2BE22; +} + +.secondary-button.warning-button:hover { + background-color: #dcac1d !important; + color: white !important; +} + +.left-button-icon { margin-right: 10px; } + .right-button-icon { margin-left: 10px; } + .secondary-button-icon path { fill: var(--primary-color); } -.primary-button-icon path{ + +.primary-button-icon path { fill: white; } -.animation-container{ +.animation-container { width: 100%; height: 60px; font-size: 16px; @@ -64,8 +133,21 @@ justify-content: center; align-items: center; display: none; +} +.animation-container.slim { + border-radius: 5px; + height: 42px; } + +.animation-container.danger-button { + background-color: #d74639 !important; +} + +.animation-container.warning-button { + background-color: #dcac1d !important; +} + .lds-ellipsis { display: inline-block; position: relative; diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index f1f17bd76..7eae0ff91 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -1,5 +1,5 @@ class Buttons::RegularButtonComponent < ViewComponent::Base - def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "primary", icon: "", icon_type:"left", href: "#") + def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "normal", icon: "", icon_type:"left", href: "#", size: "normal", state: "animate") @name = name @value = value @variant = variant @@ -9,5 +9,7 @@ def initialize(name: "", value: ,variant: "primary", type: "regular", style: "re @icon = icon @icon_type = icon_type @href = href + @size = size + @state = state end end diff --git a/app/components/buttons/regular_button_component/regular_button_component.html.haml b/app/components/buttons/regular_button_component/regular_button_component.html.haml index 887ddf381..2c01b2c90 100644 --- a/app/components/buttons/regular_button_component/regular_button_component.html.haml +++ b/app/components/buttons/regular_button_component/regular_button_component.html.haml @@ -1,31 +1,36 @@ +- slim_class = @size == "slim" ? "slim " : " " +- danger_class = @color == "danger" ? "danger-button " : " " +- warning_class = @color == "warning" ? "warning-button " : " " +- disabled_class = @state == "disabled" ? "disabled-button " : " " .button-container - if @type == "link" - %a.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button", href: @href} + %a.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class+disabled_class+slim_class, href: @href} - if @icon != "" && @icon_type == "left" = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" = @value - if @icon != "" && @icon_type == "right" = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" - else - %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button", type: "#{"submit" if @type == "submit"}"} + %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class+disabled_class+slim_class, type: "#{@type == "submit" ? "submit" : "button"}"} - if @icon != "" && @icon_type == "left" = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" = @value - if @icon != "" && @icon_type == "right" = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" -.animation-container#loading-animation - .lds-ellipsis - %div - %div - %div - %div +- if @state == "animate" + .animation-container#loading-animation{class: danger_class+warning_class+slim_class} + .lds-ellipsis + %div + %div + %div + %div -:javascript - const button = document.getElementById("button-animation-id") - const loading = document.getElementById("loading-animation") - function displayAnimation(){ - console.log("working") - button.style.display = 'none'; - loading.style.display = 'flex'; - } \ No newline at end of file + :javascript + const button = document.getElementById("button-animation-id") + const loading = document.getElementById("loading-animation") + function displayAnimation(){ + console.log("working") + button.style.display = 'none'; + loading.style.display = 'flex'; + } \ No newline at end of file diff --git a/test/components/previews/buttons/regular_button_component_preview.rb b/test/components/previews/buttons/regular_button_component_preview.rb index a209bd379..0ab6bff85 100644 --- a/test/components/previews/buttons/regular_button_component_preview.rb +++ b/test/components/previews/buttons/regular_button_component_preview.rb @@ -16,6 +16,36 @@ def secondary() end end + def slim + def slim() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", size: "slim") + end + end + + def danger + def danger() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", color: "danger") + end + end + + def warning + def warning() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", color: "warning") + end + end + + def disabled + def disabled() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", state: "disabled") + end + end + + def no_animation + def no_animation() + render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", state: "regular") + end + end + def icon_left def icon_left() render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", icon: "check.svg") From c4b6754684dcbae79f379b2e5cffaaeed2834824 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 17 Aug 2023 14:55:47 +0000 Subject: [PATCH 461/533] groupe all buttons in one folder in the lookbook --- Gemfile.lock | 2 +- .../{display => buttons}/chip_button_component_preview.rb | 2 +- .../{button => buttons}/pill_button_component_preview.rb | 2 +- .../{button => buttons}/rounded_button_component_preview.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename test/components/previews/{display => buttons}/chip_button_component_preview.rb (85%) rename test/components/previews/{button => buttons}/pill_button_component_preview.rb (67%) rename test/components/previews/{button => buttons}/rounded_button_component_preview.rb (78%) diff --git a/Gemfile.lock b/Gemfile.lock index 2ae2ec315..6e4f2b162 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -243,7 +243,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) mini_mime (1.1.2) - mini_portile2 (2.8.4) minitest (5.19.0) msgpack (1.7.2) multi_json (1.15.0) @@ -496,6 +495,7 @@ GEM zeitwerk (2.6.11) PLATFORMS + ruby x86_64-darwin-21 x86_64-linux diff --git a/test/components/previews/display/chip_button_component_preview.rb b/test/components/previews/buttons/chip_button_component_preview.rb similarity index 85% rename from test/components/previews/display/chip_button_component_preview.rb rename to test/components/previews/buttons/chip_button_component_preview.rb index 8ee442987..9ac36c8a3 100644 --- a/test/components/previews/display/chip_button_component_preview.rb +++ b/test/components/previews/buttons/chip_button_component_preview.rb @@ -1,4 +1,4 @@ -class Display::ChipButtonComponentPreview < ViewComponent::Preview +class Buttons::ChipButtonComponentPreview < ViewComponent::Preview # @param url text # @param text text diff --git a/test/components/previews/button/pill_button_component_preview.rb b/test/components/previews/buttons/pill_button_component_preview.rb similarity index 67% rename from test/components/previews/button/pill_button_component_preview.rb rename to test/components/previews/buttons/pill_button_component_preview.rb index 1c599ee30..f4cc6a9ac 100644 --- a/test/components/previews/button/pill_button_component_preview.rb +++ b/test/components/previews/buttons/pill_button_component_preview.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Button::PillButtonComponentPreview < ViewComponent::Preview +class Buttons::PillButtonComponentPreview < ViewComponent::Preview # @param text text def default(text: 'hello') render PillButtonComponent.new(text: text) diff --git a/test/components/previews/button/rounded_button_component_preview.rb b/test/components/previews/buttons/rounded_button_component_preview.rb similarity index 78% rename from test/components/previews/button/rounded_button_component_preview.rb rename to test/components/previews/buttons/rounded_button_component_preview.rb index 06837779f..685badf8a 100644 --- a/test/components/previews/button/rounded_button_component_preview.rb +++ b/test/components/previews/buttons/rounded_button_component_preview.rb @@ -1,4 +1,4 @@ -class Button::RoundedButtonComponentPreview < ViewComponent::Preview +class Buttons::RoundedButtonComponentPreview < ViewComponent::Preview # @param icon text # @param link text From 84cedea3ad0c918f0fde8f4f4e63f7a759dca0ac Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 21 Aug 2023 06:22:58 +0200 Subject: [PATCH 462/533] put ontology subscribe button component preview in buttons namespace --- .../ontology_subscribe_button_component_preview.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename test/components/previews/{ => buttons}/ontology_subscribe_button_component_preview.rb (65%) diff --git a/test/components/previews/ontology_subscribe_button_component_preview.rb b/test/components/previews/buttons/ontology_subscribe_button_component_preview.rb similarity index 65% rename from test/components/previews/ontology_subscribe_button_component_preview.rb rename to test/components/previews/buttons/ontology_subscribe_button_component_preview.rb index 68acbd8e9..4d9c2b56d 100644 --- a/test/components/previews/ontology_subscribe_button_component_preview.rb +++ b/test/components/previews/buttons/ontology_subscribe_button_component_preview.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class OntologySubscribeButtonComponentPreview < ViewComponent::Preview +class Buttons::OntologySubscribeButtonComponentPreview < ViewComponent::Preview def default render OntologySubscribeButtonComponent.new(ontology_id: '', subscribed: true, user_id: '') end From 3f3b1a1c0efbd5d0e3820fe31ec2c78f470db938 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 21 Aug 2023 07:16:50 +0200 Subject: [PATCH 463/533] fix function names duplication in the buttons previews and link preview --- .../regular_button_component_preview.rb | 50 ++++++++----------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/test/components/previews/buttons/regular_button_component_preview.rb b/test/components/previews/buttons/regular_button_component_preview.rb index 0ab6bff85..26606a90f 100644 --- a/test/components/previews/buttons/regular_button_component_preview.rb +++ b/test/components/previews/buttons/regular_button_component_preview.rb @@ -1,62 +1,56 @@ # frozen_string_literal: true class Buttons::RegularButtonComponentPreview < ViewComponent::Preview + include InlineSvg::ActionView::Helpers layout 'component_preview_not_centred' - def primary - def primary() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary") - end + render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", variant: "primary") + end - + def link + render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Link", variant: "primary", href: "#") + end + + def secondary - def secondary() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "secondary") - end + render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", variant: "secondary") end def slim - def slim() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", size: "slim") - end + render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", variant: "primary", size: "slim") end def danger - def danger() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", color: "danger") - end + render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", variant: "primary", color: "danger") end def warning - def warning() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", color: "warning") - end + render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", variant: "primary", color: "warning") end def disabled - def disabled() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", state: "disabled") - end + render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", variant: "primary", state: "disabled") end def no_animation - def no_animation() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", state: "regular") - end + render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", variant: "primary", state: "regular") end def icon_left - def icon_left() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", icon: "check.svg") + render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", variant: "primary") do |btn| + btn.icon_left do + inline_svg_tag "check.svg" + end end end def icon_right - def icon_right() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", icon: "check.svg", icon_type: "right") + render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", type: "regular", variant: "primary") do |btn| + btn.icon_right do + inline_svg_tag "check.svg" + end end end - end \ No newline at end of file From ff92b0df2febed283d4ea67e559cae65d395b0fe Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 21 Aug 2023 07:17:37 +0200 Subject: [PATCH 464/533] extract button loader component from regular button component --- .../display/button_loader_component.rb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 app/components/display/button_loader_component.rb diff --git a/app/components/display/button_loader_component.rb b/app/components/display/button_loader_component.rb new file mode 100644 index 000000000..6897a2243 --- /dev/null +++ b/app/components/display/button_loader_component.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +class Display::ButtonLoaderComponent < ViewComponent::Base + + def initialize(id: nil, slim: false, color: 'normal') + @slim = slim + @color = color + @id = id + end + + + def call + slim_class = @size == "slim" ? "slim " : "" + danger_class = @color == "danger" ? "danger-button " : "" + warning_class = @color == "warning" ? "warning-button " : "" + + content_tag(:div, class: "animation-container #{danger_class} #{warning_class} #{slim_class}", id: @id) do + content_tag(:div, class: "lds-ellipsis") do + 4.times.map { content_tag(:div) }.join.html_safe + end + end + end +end From 5cd1c44d4fa712b63d09476c0530dd06a884c0da Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 21 Aug 2023 07:18:06 +0200 Subject: [PATCH 465/533] refactor regular button components to have less arguments and code duplication --- .../buttons/regular_button_component.rb | 53 ++++++++++++++----- .../regular_button_component.html.haml | 34 ++---------- 2 files changed, 46 insertions(+), 41 deletions(-) diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index 7eae0ff91..dbdcf60ce 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -1,15 +1,44 @@ class Buttons::RegularButtonComponent < ViewComponent::Base - def initialize(name: "", value: ,variant: "primary", type: "regular", style: "regular", color: "normal", icon: "", icon_type:"left", href: "#", size: "normal", state: "animate") - @name = name - @value = value - @variant = variant - @type = type - @style = style - @color = color - @icon = icon - @icon_type = icon_type - @href = href - @size = size - @state = state + renders_one :icon_left + renders_one :icon_right + + def initialize(id: "", value:, variant: "primary", color: "normal", href: "", size: "normal", state: "animate") + @id = id + @value = value + @variant = variant + @color = color + @href = href + @size = size + @state = state + end + + def button_label + content_tag(:span, icon_left, class: "#{@variant}-button-icon left-button-icon") + @value + content_tag(:span, icon_right, class: "#{@variant}-button-icon right-button-icon") + end + + def button_elem + slim_class = @size == "slim" ? "slim " : " " + danger_class = @color == "danger" ? "danger-button " : " " + warning_class = @color == "warning" ? "warning-button " : " " + disabled_class = @state == "disabled" ? "disabled-button " : " " + class_style = "#{@variant}-button regular-button " + danger_class + warning_class + disabled_class + slim_class + if link? + link_to(@href, class: class_style, onclick: "displayAnimation()", id: @id) do + button_label + end + else + button_tag(type: 'button', class: class_style, onclick: "displayAnimation()", id: @id) do + button_label + end end + end + + def link? + @href && !@href.empty? + end + + def load_animation? + @state == "animate" + end + end diff --git a/app/components/buttons/regular_button_component/regular_button_component.html.haml b/app/components/buttons/regular_button_component/regular_button_component.html.haml index 2c01b2c90..7999b48b3 100644 --- a/app/components/buttons/regular_button_component/regular_button_component.html.haml +++ b/app/components/buttons/regular_button_component/regular_button_component.html.haml @@ -1,36 +1,12 @@ -- slim_class = @size == "slim" ? "slim " : " " -- danger_class = @color == "danger" ? "danger-button " : " " -- warning_class = @color == "warning" ? "warning-button " : " " -- disabled_class = @state == "disabled" ? "disabled-button " : " " .button-container - - if @type == "link" - %a.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class+disabled_class+slim_class, href: @href} - - if @icon != "" && @icon_type == "left" - = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" - = @value - - if @icon != "" && @icon_type == "right" - = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" - - else - %button.regular-button{:name => @name, onclick: "displayAnimation()", id: "button-animation-id", class: "#{@variant}-button "+danger_class+warning_class+disabled_class+slim_class, type: "#{@type == "submit" ? "submit" : "button"}"} - - if @icon != "" && @icon_type == "left" - = inline_svg_tag @icon, class: "#{@variant}-button-icon left-button-icon" - = @value - - if @icon != "" && @icon_type == "right" - = inline_svg_tag @icon, class: "#{@variant}-button-icon right-button-icon" - -- if @state == "animate" - .animation-container#loading-animation{class: danger_class+warning_class+slim_class} - .lds-ellipsis - %div - %div - %div - %div + = button_elem +- if load_animation? + = render Display::ButtonLoaderComponent.new(id: @id + '-loading-animation', slim: @size.eql?('slim'), color: @color) :javascript - const button = document.getElementById("button-animation-id") - const loading = document.getElementById("loading-animation") + const button = document.getElementById("#{@id}") + const loading = document.getElementById("#{@id}-loading-animation") function displayAnimation(){ - console.log("working") button.style.display = 'none'; loading.style.display = 'flex'; } \ No newline at end of file From 42c8d5ee05764e8a4caf49105eafc9daad0c7520 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 21 Aug 2023 08:38:31 +0200 Subject: [PATCH 466/533] set button component type by default equal 'submit' --- app/components/buttons/regular_button_component.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index dbdcf60ce..162807fcf 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -27,7 +27,7 @@ def button_elem button_label end else - button_tag(type: 'button', class: class_style, onclick: "displayAnimation()", id: @id) do + button_tag(type: 'submit', class: class_style, onclick: "displayAnimation()", id: @id) do button_label end end From 60395fff2647310f5c58122820ccab342cfaa9bb Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 21 Aug 2023 09:15:09 +0200 Subject: [PATCH 467/533] fix buttons component default padding --- app/assets/stylesheets/components/regular_button.scss | 2 ++ .../previews/buttons/regular_button_component_preview.rb | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/components/regular_button.scss b/app/assets/stylesheets/components/regular_button.scss index 720eba7c4..954165297 100644 --- a/app/assets/stylesheets/components/regular_button.scss +++ b/app/assets/stylesheets/components/regular_button.scss @@ -6,10 +6,12 @@ font-size: 16px; height: 60px; border-radius: 9px; + padding: 0 30px; } .regular-button.slim{ border-radius: 5px; height: 42px; + padding: 0 15px; } .primary-button { diff --git a/test/components/previews/buttons/regular_button_component_preview.rb b/test/components/previews/buttons/regular_button_component_preview.rb index 26606a90f..85894c64a 100644 --- a/test/components/previews/buttons/regular_button_component_preview.rb +++ b/test/components/previews/buttons/regular_button_component_preview.rb @@ -46,7 +46,8 @@ def icon_left end def icon_right - render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", type: "regular", variant: "primary") do |btn| + + render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", variant: "primary") do |btn| btn.icon_right do inline_svg_tag "check.svg" end From b85b2a5a52ae6e3929216cd676b01801bb914e06 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 21 Aug 2023 09:24:48 +0200 Subject: [PATCH 468/533] fix omniauth_provider_info helper not working for github --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 82cfae666..70934a1e0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -34,7 +34,7 @@ def omniauth_providers_info end def omniauth_provider_info(strategy) - omniauth_providers_info.select {|k,v| v[:strategy].eql?(strategy.to_sym)} + omniauth_providers_info.select {|k,v| v[:strategy].eql?(strategy.to_sym) || k.eql?(strategy)} end def omniauth_token_provider(strategy) From 60d8fa0faa01708f4fa65ffca859e99333f36d70 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 21 Aug 2023 10:06:12 +0200 Subject: [PATCH 469/533] put again the type argument for button component --- app/components/buttons/regular_button_component.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index 162807fcf..a8d9f0bba 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -2,7 +2,7 @@ class Buttons::RegularButtonComponent < ViewComponent::Base renders_one :icon_left renders_one :icon_right - def initialize(id: "", value:, variant: "primary", color: "normal", href: "", size: "normal", state: "animate") + def initialize(id: "", value:, variant: "primary", color: "normal", href: "", size: "normal", state: "animate", type: 'button') @id = id @value = value @variant = variant @@ -10,6 +10,7 @@ def initialize(id: "", value:, variant: "primary", color: "normal", href: "", si @href = href @size = size @state = state + @type = type end def button_label @@ -27,7 +28,7 @@ def button_elem button_label end else - button_tag(type: 'submit', class: class_style, onclick: "displayAnimation()", id: @id) do + button_tag(type: @type, class: class_style, onclick: "displayAnimation()", id: @id) do button_label end end From e40e74c332cb02338f369977e01a80cbcc4824cf Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 21 Aug 2023 10:52:46 +0200 Subject: [PATCH 470/533] fix slim state of the button loader component --- app/components/display/button_loader_component.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/display/button_loader_component.rb b/app/components/display/button_loader_component.rb index 6897a2243..202cd4cf9 100644 --- a/app/components/display/button_loader_component.rb +++ b/app/components/display/button_loader_component.rb @@ -10,7 +10,7 @@ def initialize(id: nil, slim: false, color: 'normal') def call - slim_class = @size == "slim" ? "slim " : "" + slim_class = @slim ? "slim " : "" danger_class = @color == "danger" ? "danger-button " : "" warning_class = @color == "warning" ? "warning-button " : "" From 6ef57ea50b856fef1e286588cef58b74d6f8c2c6 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Mon, 21 Aug 2023 10:55:03 +0200 Subject: [PATCH 471/533] make the call the to displayAnimation event triggered only if enabled --- app/components/buttons/regular_button_component.rb | 8 +++++--- .../regular_button_component.html.haml | 7 +++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index a8d9f0bba..32c451bae 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -2,7 +2,7 @@ class Buttons::RegularButtonComponent < ViewComponent::Base renders_one :icon_left renders_one :icon_right - def initialize(id: "", value:, variant: "primary", color: "normal", href: "", size: "normal", state: "animate", type: 'button') + def initialize(id: , value:, variant: "primary", color: "normal", href: "", size: "normal", state: "animate", type: 'button') @id = id @value = value @variant = variant @@ -23,12 +23,14 @@ def button_elem warning_class = @color == "warning" ? "warning-button " : " " disabled_class = @state == "disabled" ? "disabled-button " : " " class_style = "#{@variant}-button regular-button " + danger_class + warning_class + disabled_class + slim_class + on_click_event = load_animation? ? "displayAnimation(this)" : '' + if link? - link_to(@href, class: class_style, onclick: "displayAnimation()", id: @id) do + link_to(@href, class: class_style, onclick: on_click_event, id: @id) do button_label end else - button_tag(type: @type, class: class_style, onclick: "displayAnimation()", id: @id) do + button_tag(type: @type, class: class_style, onclick: on_click_event, id: @id) do button_label end end diff --git a/app/components/buttons/regular_button_component/regular_button_component.html.haml b/app/components/buttons/regular_button_component/regular_button_component.html.haml index 7999b48b3..17c8f3c42 100644 --- a/app/components/buttons/regular_button_component/regular_button_component.html.haml +++ b/app/components/buttons/regular_button_component/regular_button_component.html.haml @@ -4,9 +4,8 @@ - if load_animation? = render Display::ButtonLoaderComponent.new(id: @id + '-loading-animation', slim: @size.eql?('slim'), color: @color) :javascript - const button = document.getElementById("#{@id}") - const loading = document.getElementById("#{@id}-loading-animation") - function displayAnimation(){ - button.style.display = 'none'; + function displayAnimation(element){ + const loading = document.getElementById("#{@id}-loading-animation") + element.style.display = 'none'; loading.style.display = 'flex'; } \ No newline at end of file From d6a79cbd4a243e88952c88f22bb6574247f2540d Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Mon, 21 Aug 2023 09:46:50 +0000 Subject: [PATCH 472/533] hide button icon when it's not initialized to avoid undesired padding --- app/assets/stylesheets/bioportal.scss | 4 ++++ app/components/buttons/regular_button_component.rb | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/bioportal.scss b/app/assets/stylesheets/bioportal.scss index e20991b0c..607d23630 100644 --- a/app/assets/stylesheets/bioportal.scss +++ b/app/assets/stylesheets/bioportal.scss @@ -1159,3 +1159,7 @@ turbo-frame[busy] .hide-if-loading, .show-if-loading { turbo-frame[busy] ~ .show-if-loading { display: inline-block; } + +.hide{ + display:none; +} \ No newline at end of file diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index 32c451bae..c40a9f67b 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -14,7 +14,9 @@ def initialize(id: , value:, variant: "primary", color: "normal", href: "", size end def button_label - content_tag(:span, icon_left, class: "#{@variant}-button-icon left-button-icon") + @value + content_tag(:span, icon_right, class: "#{@variant}-button-icon right-button-icon") + hide_icon_left = icon_left == nil ? "hide" : " " + hide_icon_right = icon_right == nil ? "hide" : " " + content_tag(:span, icon_left, class: "#{@variant}-button-icon left-button-icon #{hide_icon_left}") + @value + content_tag(:span, icon_right, class: "#{@variant}-button-icon right-button-icon #{hide_icon_right}") end def button_elem From 1bc089a79708906260ffc11e61feaba61bdadb50 Mon Sep 17 00:00:00 2001 From: Syphax bouazzouni Date: Tue, 22 Aug 2023 08:54:15 +0200 Subject: [PATCH 473/533] Feature: Add progress pages component (#328) * add progress pages component * put again the type argument for button component * fix progress pages item not center if test is long * make progress pages container take full width by default * Fix progress item position (first & last one) to be aligned with the content * fix progress item checked state to show the icon and the good background * make the progress page component preview width bigger --------- Co-authored-by: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> --- app/assets/images/icons/arrow-left.svg | 4 + app/assets/images/icons/white-check.svg | 5 + app/assets/stylesheets/bioportal.scss | 3 + app/assets/stylesheets/components/index.scss | 3 +- .../components/progress_pages.scss | 118 ++++++++++++++++++ .../layout/progress_pages_component.rb | 10 ++ .../progress_pages_component.html.haml | 32 +++++ .../progress_pages_component_controller.js | 87 +++++++++++++ app/javascript/component_controllers/index.js | 4 +- .../progress_pages_component_preview.rb | 11 ++ 10 files changed, 275 insertions(+), 2 deletions(-) create mode 100644 app/assets/images/icons/arrow-left.svg create mode 100644 app/assets/images/icons/white-check.svg create mode 100644 app/assets/stylesheets/components/progress_pages.scss create mode 100644 app/components/layout/progress_pages_component.rb create mode 100644 app/components/layout/progress_pages_component/progress_pages_component.html.haml create mode 100644 app/components/layout/progress_pages_component/progress_pages_component_controller.js create mode 100644 test/components/previews/layout/progress_pages_component_preview.rb diff --git a/app/assets/images/icons/arrow-left.svg b/app/assets/images/icons/arrow-left.svg new file mode 100644 index 000000000..b3c63be0d --- /dev/null +++ b/app/assets/images/icons/arrow-left.svg @@ -0,0 +1,4 @@ + + + diff --git a/app/assets/images/icons/white-check.svg b/app/assets/images/icons/white-check.svg new file mode 100644 index 000000000..9ef8028d3 --- /dev/null +++ b/app/assets/images/icons/white-check.svg @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/assets/stylesheets/bioportal.scss b/app/assets/stylesheets/bioportal.scss index 607d23630..c3ccdf04f 100644 --- a/app/assets/stylesheets/bioportal.scss +++ b/app/assets/stylesheets/bioportal.scss @@ -1143,6 +1143,9 @@ a.truncated_less, a.truncated_more { .highlighted .search_ontology_acronym { color: white; } +.hide { + display: none !important; +} .empty-state { display: none; diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 630b7cbb0..23f4da20f 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -23,4 +23,5 @@ @import "concept_details"; @import "card"; @import "header"; -@import "image"; \ No newline at end of file +@import "image"; +@import "progress_pages"; \ No newline at end of file diff --git a/app/assets/stylesheets/components/progress_pages.scss b/app/assets/stylesheets/components/progress_pages.scss new file mode 100644 index 000000000..6e3f6cff5 --- /dev/null +++ b/app/assets/stylesheets/components/progress_pages.scss @@ -0,0 +1,118 @@ +.progress-pages-container { + display: flex; + align-items: center; + margin-top: 20px; + margin-bottom: 50px; + width: 100%; +} + +.progress-pages-container hr { + flex-grow: 1; + border: 1px solid #D9D9D9; + margin: 0; +} + +.progress-pages-container hr.active { + border: 1px solid var(--primary-color); +} + +.progress-pages-container .progress-item { + position: relative; + & > div { + position: absolute; + top: -13px; + left: -13px; + display: flex; + flex-direction: column; + align-items: center; + } +} + +.progress-pages-container .progress-item:first-of-type { + & > div { + align-items: start; + left: 0; + } +} + +.progress-pages-container .progress-item:last-of-type { + & > div { + align-items: end; + left: -23px; + } +} + +.progress-pages-container .progress-item div .active:nth-child(2) { + color: var(--primary-color); + font-weight: 600; +} + +.progress-pages-container .progress-item div span:nth-child(2) { + position: absolute; + font-size: 12px; + top: 33px; + white-space: nowrap; + color: #A9A9A9; +} + +.progress-pages-container .progress-content .active:nth-child(2) { + color: var(--primary-color); + font-weight: 600; +} + +.progress-pages-container .progress-content div:nth-child(2) { + position: absolute; + right: -38px; + top: 33px; + +} + + + +.outlined-checked-circle { + border: 2px solid var(--primary-color) !important; + background-color: var(--primary-color) !important; + display: flex; + align-items: center; + justify-content: center; +} + +.outlined-active-circle { + border: 2px solid var(--primary-color) !important; +} + +.outlined-circle { + border: 1px solid #D9D9D9; + border-radius: 13px; + height: 26px; + width: 26px; + background-color: white; + +} + +.outlined-checked-circle img { + display: block !important; +} + +.outlined-active-circle img { + display: none; +} + +.outlined-circle img { + display: none; +} + + + +.progress-pages-actions { + display: flex; + justify-content: flex-end; + margin-top: 20px; +} + +.progress-pages-next-button { + margin-left: 25px; +} + + + diff --git a/app/components/layout/progress_pages_component.rb b/app/components/layout/progress_pages_component.rb new file mode 100644 index 000000000..1680e4e49 --- /dev/null +++ b/app/components/layout/progress_pages_component.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class Layout::ProgressPagesComponent < ViewComponent::Base + + renders_many :pages + def initialize(pages_title: []) + super + @pages_title = pages_title + end +end diff --git a/app/components/layout/progress_pages_component/progress_pages_component.html.haml b/app/components/layout/progress_pages_component/progress_pages_component.html.haml new file mode 100644 index 000000000..f6b02cd67 --- /dev/null +++ b/app/components/layout/progress_pages_component/progress_pages_component.html.haml @@ -0,0 +1,32 @@ +%div.w-100{'data-controller': 'progress-pages'} + %div + .d-flex.justify-content-center.flex-column + .progress-pages-container + - @pages_title.each_with_index do |key, index| + .progress-item{'data-progress-pages-target': 'pageItem'} + %div + .outlined-circle{class: index.zero? ? 'outlined-active-circle' : ''} + = image_tag("icons/white-check.svg") + %span{class: index.zero? ? 'active' : ''} + = key.humanize + - if index < (@pages_title.size-1) + %hr.line + %div + - pages.each_with_index do |page, index| + %div.progress-content{{'data-progress-pages-target': 'pageContent'}, class: index.zero? ? '' : 'hide'} + = page + + + .progress-pages-actions + .progress-pages-back-button.hide{'data-action': "click->progress-pages#navigateBack", 'data-progress-pages-target': 'backBtn'} + = render Buttons::RegularButtonComponent.new(id: 'progress-pages-back-button', value: "Back", variant: "secondary", size: 'slim',state: 'regular') do |btn| + - btn.icon_left do + = inline_svg "icons/arrow-left.svg" + .progress-pages-next-button{'data-action': "click->progress-pages#navigateNext", 'data-progress-pages-target': 'nextBtn'} + = render Buttons::RegularButtonComponent.new(id: 'progress-pages-next-button', value: "Next", size: 'slim', state: 'regular') do |btn| + - btn.icon_right do + = inline_svg "arrow-right.svg" + .progress-pages-next-button.hide{ 'data-progress-pages-target': 'finishBtn'} + = render Buttons::RegularButtonComponent.new(id: 'progress-pages-finish-button', value: "Finish", size: 'slim', type: 'submit') do |btn| + - btn.icon_right do + = inline_svg "icons/white-check.svg" \ No newline at end of file diff --git a/app/components/layout/progress_pages_component/progress_pages_component_controller.js b/app/components/layout/progress_pages_component/progress_pages_component_controller.js new file mode 100644 index 000000000..146922311 --- /dev/null +++ b/app/components/layout/progress_pages_component/progress_pages_component_controller.js @@ -0,0 +1,87 @@ +import {Controller} from "@hotwired/stimulus"; + +export default class extends Controller { + static targets = ['pageItem','pageContent' ,'backBtn', 'nextBtn', 'finishBtn'] + connect() { + this.pagesItems = this.pageItemTargets + this.buttons = [this.backBtnTarget, this.nextBtnTarget, this.finishBtnTarget] + this.currentForm = 1 + } + + navigateBack(){ + this.navigateForm('back') + } + navigateNext(){ + this.navigateForm('next') + } + + navigateForm(direction) { + if (direction === "next" && this.currentForm < this.pagesItems.length) { + this.currentForm += 1 + this.showForm() + } else if (direction === "back" && this.currentForm > 1){ + this.currentForm -= 1 + this.showForm() + } + } + + showForm(){ + const targetForm = this.currentForm + for (let index = 1; index <= this.pagesItems.length; index++) { + + const targetFormDOM = this.pageContentTargets[index - 1]; + + const isCurrentForm = targetForm === index; + + targetFormDOM.classList.toggle("hide", !isCurrentForm); + + if (isCurrentForm) { + this.updateProgressBar(targetForm); + this.updateButtons(targetForm); + } + + } + + } + updateProgressBar(targetForm) { + const progressItemsDOM = document.querySelectorAll(".progress-item > div"); + const line = document.querySelectorAll(".line"); + + progressItemsDOM.forEach((item, index) => { + const isPassedSection = index + 1 < targetForm; + const isCurrentSection = index + 1 === targetForm; + + item.children[0].classList.toggle("outlined-checked-circle", isPassedSection); + item.children[0].classList.toggle("outlined-active-circle", isCurrentSection); + + + item.children[1].classList.toggle("active", isCurrentSection || isPassedSection); + + + line[index]?.classList.toggle("active", isPassedSection); + }); + } + + updateButtons(targetForm) { + + switch (targetForm) { + case 1: + this.showBtn([this.buttons[1]]); + break; + case this.pagesItems.length: + this.showBtn([this.buttons[0], this.buttons[2]]); + break; + default: + this.showBtn([this.buttons[0], this.buttons[1]]); + } + + } + + showBtn(btnIds = []) { + this.buttons.forEach((btn) => { + const targetBtnDOM = btn; + const shouldShowBtn = btnIds.includes(btn); + targetBtnDOM.classList.toggle("hide", !shouldShowBtn); + }); + } +} diff --git a/app/javascript/component_controllers/index.js b/app/javascript/component_controllers/index.js index 5cb73bbeb..482bc6786 100644 --- a/app/javascript/component_controllers/index.js +++ b/app/javascript/component_controllers/index.js @@ -15,7 +15,8 @@ import Search_input_component_controller import CircleProgressBarComponentController from "../../components/circle_progress_bar_component/circle_progress_bar_component_controller" import Tabs_container_component_controller from "../../components/tabs_container_component/tabs_container_component_controller"; - +import Progress_pages_component_controller + from "../../components/layout/progress_pages_component/progress_pages_component_controller"; application.register("turbo-modal", TurboModalController) application.register("file-input", FileInputLoaderController) @@ -25,3 +26,4 @@ application.register("subscribe-notes", Ontology_subscribe_button_component_cont application.register("search-input", Search_input_component_controller) application.register("tabs-container", Tabs_container_component_controller) application.register("circle-progress-bar", CircleProgressBarComponentController) +application.register("progress-pages", Progress_pages_component_controller) diff --git a/test/components/previews/layout/progress_pages_component_preview.rb b/test/components/previews/layout/progress_pages_component_preview.rb new file mode 100644 index 000000000..afb6596de --- /dev/null +++ b/test/components/previews/layout/progress_pages_component_preview.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class Layout::ProgressPagesComponentPreview < ViewComponent::Preview + + # @param pages_count number + def default(pages_count: 5) + render Layout::ProgressPagesComponent.new(pages_title: (pages_count || 0).times.map { |x| "page #{x}" }) do |c| + 5.times.each { |i| c.page { content_tag(:div, "page #{i}", class: "p-5 mx-5 text-center", style: 'width: 500px') } } + end + end +end From 1d7580499e75e1e62a1cc290f15ff83b68e38917 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 23 Aug 2023 09:20:16 +0200 Subject: [PATCH 474/533] Feature: add alert component (#330) * add alert component types icons * create alert component and add to it it's logic * add alert component structure and style * Add alert component close icon * add close logic to alert component * add lookbook preview for alert component * make alert component get closed auto after a delai * add auto close option for the alert component with a configurable delay * add the option to alert component to use also the content as message * replace old alert message component usage with the new one --------- Co-authored-by: Syphax bouazzouni --- app/assets/images/danger.svg | 3 + app/assets/images/info.svg | 3 + app/assets/images/success.svg | 3 + app/assets/images/warning.svg | 3 + app/assets/images/x.svg | 3 + app/assets/stylesheets/components/alert.scss | 84 +++++++++++++++++++ app/assets/stylesheets/components/index.scss | 3 +- app/components/alert_message_component.rb | 11 --- .../alert_message_component.html.haml | 8 -- app/components/display/alert_component.rb | 47 +++++++++++ .../alert_component/alert_component.html.haml | 14 ++++ .../alert_component_controller.js | 19 +++++ .../infinite_scroll_component.html.haml | 3 +- .../turbo_frame_component.html.haml | 2 +- app/helpers/collections_helper.rb | 2 +- app/helpers/schemes_helper.rb | 4 +- app/helpers/turbo_helper.rb | 2 +- app/javascript/component_controllers/index.js | 4 + app/views/concepts/_details.html.haml | 2 +- .../bulk_loader/_loaded_mappings.html.haml | 4 +- .../_attribute_inline.html.haml | 2 +- .../_form_edit.html.haml | 4 +- .../alert_message_component_spec.rb | 15 ---- .../alert_message_component_preview.rb | 10 --- .../display/alert_component_preview.rb | 34 ++++++++ 25 files changed, 231 insertions(+), 58 deletions(-) create mode 100644 app/assets/images/danger.svg create mode 100644 app/assets/images/info.svg create mode 100644 app/assets/images/success.svg create mode 100644 app/assets/images/warning.svg create mode 100644 app/assets/images/x.svg create mode 100644 app/assets/stylesheets/components/alert.scss delete mode 100644 app/components/alert_message_component.rb delete mode 100644 app/components/alert_message_component/alert_message_component.html.haml create mode 100644 app/components/display/alert_component.rb create mode 100644 app/components/display/alert_component/alert_component.html.haml create mode 100644 app/components/display/alert_component/alert_component_controller.js delete mode 100644 spec/components/alert_message_component_spec.rb delete mode 100644 test/components/previews/alert_message_component_preview.rb create mode 100644 test/components/previews/display/alert_component_preview.rb diff --git a/app/assets/images/danger.svg b/app/assets/images/danger.svg new file mode 100644 index 000000000..27f5cef63 --- /dev/null +++ b/app/assets/images/danger.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/images/info.svg b/app/assets/images/info.svg new file mode 100644 index 000000000..8b9e031f6 --- /dev/null +++ b/app/assets/images/info.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/images/success.svg b/app/assets/images/success.svg new file mode 100644 index 000000000..1a6d1a81e --- /dev/null +++ b/app/assets/images/success.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/images/warning.svg b/app/assets/images/warning.svg new file mode 100644 index 000000000..0ca8db260 --- /dev/null +++ b/app/assets/images/warning.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/images/x.svg b/app/assets/images/x.svg new file mode 100644 index 000000000..6be564a08 --- /dev/null +++ b/app/assets/images/x.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/stylesheets/components/alert.scss b/app/assets/stylesheets/components/alert.scss new file mode 100644 index 000000000..e68adc486 --- /dev/null +++ b/app/assets/stylesheets/components/alert.scss @@ -0,0 +1,84 @@ +.alert-container{ + display: flex; + align-items: center; + padding: 20px; + border-radius: 5px; +} +.alert-container.alert-info-type{ + background-color: rgba(59, 130, 246, 0.1); +} +.alert-container.alert-warning-type { + background-color: rgba(234, 179, 8, 0.1); +} +.alert-container.alert-danger-type { + background-color: rgba(239, 68, 68, 0.1); +} +.alert-container.alert-success-type { + background-color: rgba(34, 197, 94, 0.1); +} + + + + + +.alert-message{ + font-size: 16px; + margin: 0 10px; + text-align: center; +} + + + +.alert-message.alert-info-type{ + color: rgb(59, 130, 246); +} +.alert-message.alert-warning-type { + color: rgb(234, 179, 8); +} +.alert-message.alert-danger-type { + color: rgb(239, 68, 68); +} +.alert-message.alert-success-type { + color: rgb(34, 197, 94); +} + + + + +.alert-icon svg{ + width: 25px; + margin: 0 !important; +} +.alert-icon.alert-info-type svg path{ + fill: rgb(59, 130, 246); +} +.alert-icon.alert-warning-type svg path { + fill: rgb(234, 179, 8); +} +.alert-icon.alert-danger-type svg path { + fill: rgb(239, 68, 68); +} +.alert-icon.alert-success-type svg path { + fill: rgb(34, 197, 94); +} + + +.alert-close svg{ + width: 25px; + cursor: pointer; +} + +.alert-close.alert-info-type svg path{ + fill:rgb(59, 130, 246); +} +.alert-close.alert-warning-type svg path { + fill: rgb(234, 179, 8); +} +.alert-close.alert-danger-type svg path { + fill: rgb(239, 68, 68); +} +.alert-close.alert-success-type svg path { + fill: rgb(34, 197, 94); +} + + diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss index 23f4da20f..7ea4777c1 100644 --- a/app/assets/stylesheets/components/index.scss +++ b/app/assets/stylesheets/components/index.scss @@ -24,4 +24,5 @@ @import "card"; @import "header"; @import "image"; -@import "progress_pages"; \ No newline at end of file +@import "alert"; +@import "progress_pages"; diff --git a/app/components/alert_message_component.rb b/app/components/alert_message_component.rb deleted file mode 100644 index 09ece182b..000000000 --- a/app/components/alert_message_component.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -class AlertMessageComponent < ViewComponent::Base - include Turbo::FramesHelper - def initialize(id: '', message: nil, type: 'info', closeable: true) - @id = id - @message = message - @type = "alert-#{type}" - @closeable = closeable - end -end diff --git a/app/components/alert_message_component/alert_message_component.html.haml b/app/components/alert_message_component/alert_message_component.html.haml deleted file mode 100644 index c32ec7d3c..000000000 --- a/app/components/alert_message_component/alert_message_component.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -.alert.alert-dismissible.fade.show{:role => "alert", class: "#{@type}", style: "text-align: left;white-space: normal;"} - = @message || content - - - if @closeable - %button.close{"aria-label": "Close", "data-dismiss": "alert", type: "button", style: "background: transparent"} - %span{"aria-hidden" => "true"} × - - \ No newline at end of file diff --git a/app/components/display/alert_component.rb b/app/components/display/alert_component.rb new file mode 100644 index 000000000..c381f2a37 --- /dev/null +++ b/app/components/display/alert_component.rb @@ -0,0 +1,47 @@ +class Display::AlertComponent < ViewComponent::Base + def initialize(message: nil, closable: true, type: "info", auto_close_delay: nil) + @message = message + @closable = closable + @type = type + @auto_close_delay = auto_close_delay + end + + def closable? + @closable + end + + def message + @message + end + + def alert_type_class + case @type + when "info" + "alert-info-type" + when "warning" + "alert-warning-type" + when "danger" + "alert-danger-type" + when "success" + "alert-success-type" + end + end + + def alert_icon + case @type + when "info" + "info.svg" + when "warning" + "warning.svg" + when "danger" + "danger.svg" + when "success" + "success.svg" + end + end + + def auto_close? + !@auto_close_delay.nil? + end + +end \ No newline at end of file diff --git a/app/components/display/alert_component/alert_component.html.haml b/app/components/display/alert_component/alert_component.html.haml new file mode 100644 index 000000000..d0bc0d5ce --- /dev/null +++ b/app/components/display/alert_component/alert_component.html.haml @@ -0,0 +1,14 @@ +.alert-container{data: {controller: "alert-component", + 'alert-component-auto-close-value': auto_close?, + 'alert-component-auto-close-after-value': @auto_close_delay, + }, + class: alert_type_class} + .alert-icon{class: alert_type_class} + = inline_svg_tag alert_icon + .alert-message{class: alert_type_class} + = message || content + - if closable? + .alert-close{"data-action":"click->alert-component#close", class: alert_type_class} + = inline_svg_tag "x.svg" + + \ No newline at end of file diff --git a/app/components/display/alert_component/alert_component_controller.js b/app/components/display/alert_component/alert_component_controller.js new file mode 100644 index 000000000..0abf19dda --- /dev/null +++ b/app/components/display/alert_component/alert_component_controller.js @@ -0,0 +1,19 @@ +import { Controller } from "@hotwired/stimulus"; + +export default class extends Controller { + + static values = { + autoCloseAfter: { type: Number, default: 5000 }, + autoClose: { type: Boolean, default: false }, + } + connect(){ + if (this.autoCloseValue){ + setTimeout(() => { + this.close() + }, this.autoCloseAfterValue); + } + } + close(){ + this.element.style.display = "none" + } +} diff --git a/app/components/infinite_scroll_component/infinite_scroll_component.html.haml b/app/components/infinite_scroll_component/infinite_scroll_component.html.haml index c0fd9abac..5bdcb976c 100644 --- a/app/components/infinite_scroll_component/infinite_scroll_component.html.haml +++ b/app/components/infinite_scroll_component/infinite_scroll_component.html.haml @@ -12,5 +12,4 @@ Loading ... - elsif @current_page == 1 %div.text-wrap - = render AlertMessageComponent.new(id: "#{@id}_view_alert") do - = error + = render Display::AlertComponent.new { error } diff --git a/app/components/turbo_frame_component/turbo_frame_component.html.haml b/app/components/turbo_frame_component/turbo_frame_component.html.haml index 0991eb213..51ce9169c 100644 --- a/app/components/turbo_frame_component/turbo_frame_component.html.haml +++ b/app/components/turbo_frame_component/turbo_frame_component.html.haml @@ -6,4 +6,4 @@ %div.p-3 = render LoaderComponent.new %div{'data-turbo-frame-error-target': 'errorMessage', style:'display: none; width: 100%'} - = render AlertMessageComponent.new(id: "#{@id}_error-message", type:'danger') \ No newline at end of file + = render Display::AlertComponent.new(type:'danger') \ No newline at end of file diff --git a/app/helpers/collections_helper.rb b/app/helpers/collections_helper.rb index 9f6de4008..40783b666 100644 --- a/app/helpers/collections_helper.rb +++ b/app/helpers/collections_helper.rb @@ -42,7 +42,7 @@ def no_collections? end def no_collections_alert - render AlertMessageComponent.new(id: 'collection-empty-info') do + render Display::AlertComponent.new do "#{@ontology.acronym} does not contain collections (skos:Collection)" end end diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb index 01b3993da..55d59c4e1 100644 --- a/app/helpers/schemes_helper.rb +++ b/app/helpers/schemes_helper.rb @@ -63,12 +63,12 @@ def no_schemes? end def no_main_scheme_alert - render AlertMessageComponent.new(id: 'main-scheme-empty-info') do + render Display::AlertComponent.new do 'no main scheme defined in the URI attribute' end end def no_schemes_alert - render AlertMessageComponent.new(id: 'schemes-empty-info') do + render Display::AlertComponent.new do "#{@ontology.acronym} does not contain schemes (skos:ConceptScheme)" end end diff --git a/app/helpers/turbo_helper.rb b/app/helpers/turbo_helper.rb index 3e1f71155..c1b0303b4 100644 --- a/app/helpers/turbo_helper.rb +++ b/app/helpers/turbo_helper.rb @@ -9,7 +9,7 @@ def alerts_container_id(id = nil) def alert(id: nil, type: 'success', &block) turbo_stream.prepend(id ||alerts_container_id) do - AlertMessageComponent.new(type: type).render_in(view_context, &block) + Display::AlertComponent.new(type: type).render_in(view_context, &block) end end diff --git a/app/javascript/component_controllers/index.js b/app/javascript/component_controllers/index.js index 482bc6786..0a94e7a7e 100644 --- a/app/javascript/component_controllers/index.js +++ b/app/javascript/component_controllers/index.js @@ -15,9 +15,12 @@ import Search_input_component_controller import CircleProgressBarComponentController from "../../components/circle_progress_bar_component/circle_progress_bar_component_controller" import Tabs_container_component_controller from "../../components/tabs_container_component/tabs_container_component_controller"; + +import alert_component_controller from "../../components/display/alert_component/alert_component_controller"; import Progress_pages_component_controller from "../../components/layout/progress_pages_component/progress_pages_component_controller"; + application.register("turbo-modal", TurboModalController) application.register("file-input", FileInputLoaderController) application.register("select-input", Select_input_component_controller) @@ -26,4 +29,5 @@ application.register("subscribe-notes", Ontology_subscribe_button_component_cont application.register("search-input", Search_input_component_controller) application.register("tabs-container", Tabs_container_component_controller) application.register("circle-progress-bar", CircleProgressBarComponentController) +application.register("alert-component", alert_component_controller) application.register("progress-pages", Progress_pages_component_controller) diff --git a/app/views/concepts/_details.html.haml b/app/views/concepts/_details.html.haml index a83f051fa..a98a909b0 100644 --- a/app/views/concepts/_details.html.haml +++ b/app/views/concepts/_details.html.haml @@ -3,7 +3,7 @@ - label_xl_set = %w[skos-xl#prefLabel skos-xl#altLabel skos-xl#hiddenLabel] - if @concept.prefLabel.nil? %div.py-3.px-2 - = render(AlertMessageComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language'), type: "warning", closeable: true)) + = render Display::AlertComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language'), type: "warning", closable: true) = render ConceptDetailsComponent.new(id:'concept-details', acronym: @ontology.acronym, properties: @concept.properties, diff --git a/app/views/mappings/bulk_loader/_loaded_mappings.html.haml b/app/views/mappings/bulk_loader/_loaded_mappings.html.haml index 522cbd690..0798d7ee0 100644 --- a/app/views/mappings/bulk_loader/_loaded_mappings.html.haml +++ b/app/views/mappings/bulk_loader/_loaded_mappings.html.haml @@ -1,14 +1,14 @@ %div.w-100.h-100 - if errors - errors = errors.map {|k,v| "Mapping #{k.to_s.to_i + 1} errors: #{v}"} - = render AlertMessageComponent.new(type:'danger') do + = render Display::AlertComponent.new(type:'danger') do - errors.each do |error| %p = error %div.overflow-scroll - if created = render AlertsContainerComponent.new(id: alerts_container_id) do - = render AlertMessageComponent.new(type: 'success') do + = render Display::AlertComponent.new(type: 'success') do #{created.size} mappings created successfully %table.table.table-sm.zebra{data: {controller: 'data-table'}, style:"table-layout: fixed; font-size: 12px; word-break: break-word;"} %thead diff --git a/app/views/ontologies_metadata_curator/_attribute_inline.html.haml b/app/views/ontologies_metadata_curator/_attribute_inline.html.haml index 58d6c0244..b430b3121 100644 --- a/app/views/ontologies_metadata_curator/_attribute_inline.html.haml +++ b/app/views/ontologies_metadata_curator/_attribute_inline.html.haml @@ -1,7 +1,7 @@ %div - if @errors %div - = render AlertMessageComponent.new(id:acronym+'-'+attribute+'-error', type: 'danger') do + = render Display::AlertComponent.new(type: 'danger') do = @errors.map{|e| e[:error]}.join(',') %div - if attribute == "contact" diff --git a/app/views/ontologies_metadata_curator/_form_edit.html.haml b/app/views/ontologies_metadata_curator/_form_edit.html.haml index 533cbde3b..06df06d03 100644 --- a/app/views/ontologies_metadata_curator/_form_edit.html.haml +++ b/app/views/ontologies_metadata_curator/_form_edit.html.haml @@ -23,9 +23,9 @@ %a.nav-link{id: "pills-"+onto+sub_i+"-tab", "data-toggle": "pill", href: "#pills-"+onto+sub_i, class: index.zero? ? 'active' : ''} = ontology_submission_id_label(onto, sub_i) %div#change_all_warning_container - = render AlertMessageComponent.new(id:'change_all_warning', type: 'warning') do + = render Display::AlertComponent.new(type: 'warning') do %strong Apply the change for all - will update the current displayed content to all the following submssions: + will update the current displayed content to all the following submissions: - @selected_ontologies.map{|x| ontology_submission_id_label(*x)}.each do |onto| %span.badge.badge-primary = onto diff --git a/spec/components/alert_message_component_spec.rb b/spec/components/alert_message_component_spec.rb deleted file mode 100644 index fd5488bc0..000000000 --- a/spec/components/alert_message_component_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -require "rails_helper" - -RSpec.describe AlertMessageComponent, type: :component do - pending "add some examples to (or delete) #{__FILE__}" - - # it "renders something useful" do - # expect( - # render_inline(described_class.new(attr: "value")) { "Hello, components!" }.css("p").to_html - # ).to include( - # "Hello, components!" - # ) - # end -end diff --git a/test/components/previews/alert_message_component_preview.rb b/test/components/previews/alert_message_component_preview.rb deleted file mode 100644 index 4efb845e9..000000000 --- a/test/components/previews/alert_message_component_preview.rb +++ /dev/null @@ -1,10 +0,0 @@ -class AlertMessageComponentPreview < ViewComponent::Preview - - # @param message text - # @param type select [error, info, success, warning] - - def default(message: "Here we can type a success or failure message to the user", type: "info", closeable: true ) - render(AlertMessageComponent.new(message: message, type: type, closeable: closeable)) - end - -end \ No newline at end of file diff --git a/test/components/previews/display/alert_component_preview.rb b/test/components/previews/display/alert_component_preview.rb new file mode 100644 index 000000000..9b9d355a6 --- /dev/null +++ b/test/components/previews/display/alert_component_preview.rb @@ -0,0 +1,34 @@ +class Display::AlertComponentPreview < ViewComponent::Preview + + #@param message text + #@param closable select [true, false] + def default(message: "New ontology Bioinformatics Ontology v2.0 has been uploaded. Check it out in the latest uploads section", closable: true) + render Display::AlertComponent.new(message: message, closable: closable) + end + + #@param message text + #@param closable select [true, false] + def danger(message: "Unable to delete ontology Chemistry Concepts Ontology. This ontology is associated with existing mappings. Please remove mappings before deleting", closable: true) + render Display::AlertComponent.new(message: message, closable: closable, type: "danger") + end + + #@param message text + #@param closable select [true, false] + def warning(message: "This ontology version is outdated and may contain inaccuracies. Consider using the latest version for accurate information", closable: true) + render Display::AlertComponent.new(message: message, closable: closable, type: "warning") + end + + #@param message text + #@param closable select [true, false] + def success(message: "Your ontology submission has been successfully uploaded and is now under review. You will receive an email confirmation shortly", closable: true) + render Display::AlertComponent.new(message: message, closable: closable, type: "success") + end + + + #@param message text + #@param delay number + def auto_close(message: "Your ontology submission has been successfully uploaded and is now under review. You will receive an email confirmation shortly", delay: 3000) + render Display::AlertComponent.new(message: message, closable: true, auto_close_delay: delay, type: "default") + end + +end \ No newline at end of file From a8e175fde770678312ccfb443817df22df182afa Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 23 Aug 2023 17:21:24 +0000 Subject: [PATCH 475/533] do the appropriate changes to the usage of the button component according to the updates we did --- app/views/errors/not_found.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml index 62e23e16b..14907e9d1 100644 --- a/app/views/errors/not_found.html.haml +++ b/app/views/errors/not_found.html.haml @@ -4,9 +4,9 @@ Page not found .buttons.d-flex.justify-content-center.mt-3 %div{style: "width: 216px;"} - = render Buttons::RegularButtonComponent.new(value: "Go to home", name: "home", type: "link", variant: "secondary", href: "/") + = render Buttons::RegularButtonComponent.new(id:'Home-button', value: "Go home", variant: "secondary", href: "/") %div{style: "width: 216px; margin-left: 22px"} - = render Buttons::RegularButtonComponent.new(value: "Send a feedback", name: "feedback", type: "link", variant: "primary", href: "/") + = render Buttons::RegularButtonComponent.new(id:"feedback-button" ,value: "Send a feedback", variant: "primary", href: "/feedback") From c410a8e973c75a23b9829c7483bad0a05d78c04d Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 23 Aug 2023 17:24:00 +0000 Subject: [PATCH 476/533] fix animation id problem (animation starts in the wrong button) in button component --- .../regular_button_component.html.haml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/components/buttons/regular_button_component/regular_button_component.html.haml b/app/components/buttons/regular_button_component/regular_button_component.html.haml index 17c8f3c42..8f7ecf94b 100644 --- a/app/components/buttons/regular_button_component/regular_button_component.html.haml +++ b/app/components/buttons/regular_button_component/regular_button_component.html.haml @@ -1,11 +1,11 @@ -.button-container - = button_elem - -- if load_animation? - = render Display::ButtonLoaderComponent.new(id: @id + '-loading-animation', slim: @size.eql?('slim'), color: @color) - :javascript - function displayAnimation(element){ - const loading = document.getElementById("#{@id}-loading-animation") - element.style.display = 'none'; - loading.style.display = 'flex'; - } \ No newline at end of file +%div + .button-container + = button_elem + + - if load_animation? + = render Display::ButtonLoaderComponent.new(id: @id + '-loading-animation', slim: @size.eql?('slim'), color: @color) + :javascript + function displayAnimation(element){ + element.style.display = 'none'; + element.parentElement.parentElement.children[1].style.display = 'flex'; + } \ No newline at end of file From 34a1ede5526b1ce7fa500d8d6f95cec9219b3bc2 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Wed, 23 Aug 2023 17:28:13 +0000 Subject: [PATCH 477/533] add something went wrong page --- app/views/errors/internal_server_error.html.erb | 3 --- app/views/errors/internal_server_error.html.haml | 12 ++++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) delete mode 100644 app/views/errors/internal_server_error.html.erb create mode 100644 app/views/errors/internal_server_error.html.haml diff --git a/app/views/errors/internal_server_error.html.erb b/app/views/errors/internal_server_error.html.erb deleted file mode 100644 index f44358e78..000000000 --- a/app/views/errors/internal_server_error.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= content_tag :div, id: "bd", style: "clear: both; text-align: center; margin-top: 100px; margin-bottom: 100px;" do -%> -

    We're sorry but something has gone wrong. We have been notified of this error.

    -<% end -%> \ No newline at end of file diff --git a/app/views/errors/internal_server_error.html.haml b/app/views/errors/internal_server_error.html.haml new file mode 100644 index 000000000..4b95e9456 --- /dev/null +++ b/app/views/errors/internal_server_error.html.haml @@ -0,0 +1,12 @@ +.d-flex.align-items-center.flex-column.position-relative + = inline_svg("errors/agroportal.svg") + .position-absolute{style: "top: 442px; font-size: 30px; font-weight: 800; color: #263238;"} + Something went wrong. We have been notified about this error. + .buttons.d-flex.justify-content-center.mt-3 + %div{style: "width: 216px;"} + = render Buttons::RegularButtonComponent.new(id:'Home-button', value: "Go home", variant: "secondary", href: "/") + %div{style: "width: 216px; margin-left: 22px"} + = render Buttons::RegularButtonComponent.new(id:"feedback-button" ,value: "Send a feedback", variant: "primary", href: "/feedback") + + + From 1c0f89b7323c4d5b823d641c4a4bb930ef098733 Mon Sep 17 00:00:00 2001 From: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> Date: Thu, 24 Aug 2023 09:05:35 +0200 Subject: [PATCH 478/533] Feature: Implement the new upload ontology form (#292) * use inline svg in file input loader component * add hint to text input component * add error state to input field component * add helper text to input field component * add notes to input field component to explain how to use it * combine text area input component with input field component * groupe inputs in one folder in the lookbook * fix style issues in input field component * refactor input field component code to remove repetition * remove the duplicated alert component preview * make the input field component generic using a the content slot * implement form date component * implement form text area component * implement form text input component * duplicate the select component to be in the "form" namespace * fix select input component inversed open_to_add_values argument usage * move and rename file input loader component to be in the form module * update select component to use InputFieldComponent to have a label * remove unsed text in NestedFormInputComponentPreview * Fix bug of select list view of ontology (#289) * Add Chosen.js functionality to fix bug of select views of ontolgy * Add Chosen.js functionality for list views ontologies * fix bug of update ontology where there is no view * Refactor code * Delete ponse = @ontology.update * fix nested form component inputs focus color to use primary variable * add upload ontology from style file * extract from upload ontology from the location partial * update upload ontology form design * make the upload ontology form button style apply also submit button * add id argument to chips components to permit having multiple chips with same name * fix label not showing for the from select component * put the correct input names in the new ontology form * replace the finish div in the new ontology form with a submit tag * use for the administrated_by input with the form select component * implement the backend create action for the new upload ontology form * fix text area component not showing the value given as argument * add the default values for the inputs in the new ontology form * extract submission_from_params method from the save_submission concern * handle new ontology upload errors in the create action * add default empty submission in the new action * add type parametre to text_input_component so we can specify type as email, number .. * make nested form component start by default by one form initialized * add URI field to the upload ontology process * add search input component * add ontology search input component re-using search-input component * re-use ontology search input component in the topnav * re-use the ontology-search-input in the home * update search-input component to make it more generic * rename view components "form" namespace to "input" * create the display namespace for the data display components * create the layout namespace for view component that structure content * use the table component in the ontology mappings tab * add table component (style, preview and code) * make dropdown content. with no default padding * update concept details component to use the Table and dropdown component * add concept details component preview * update collection, concept, label_xl and scheme views with the new concept details component * migrate notes table to use Table component * install tom select * update select component with tom select * use not centred layout for the select input previews * remove the select id in the select input component template * remove is_selected_value variable in the select input component * fix select component id * add pill button component * add loader component small option and previews * update ontology subscribe component design and add preview * move rounded button preview to the button namespace * extract modal helpers into a helper file * use the new modal helpers instead of writing the view component or frame * add option to modal to show in connect alone * add modal component style * add modal component preview * move the modal component preview into the layout namespace * Update the design of the switch component * add switch input component preview * update search input component to handle custom link turbo targets * update search input component to have form-control style by default * remove no used home search controller replaced with search input * fix. ontology search input component ajax_url argument to add ?acronym= * fix home page search input style * migrate search input style from home.scss to search_input.scss * add margin top and bottom for the nested form component * update nested form component to have an empty state to send to the back * handle contact nested form empty state * migrate the fair score js code to stimulus to make it work with turbo * remove the old fair_score.js code * fix home page responsiveness issues * fix footer responsiveness * fix nav bar responsiveness and add admin to nav items * fix home annotator/recommender section title * fix home responsiveness for small screens * add link text component * use link text component to implement popup link component * use link text component to implement external link component * use link text component to implement internal link component * use internal and external links component in the label link component * add previews to link text components * change internal link icon in link text component tmp tmp tmp tmp tmp tmp tmp tmp tmp tmp * refactor select input component template to use the rails helper * use stimulus values in select input component controller * Add email, password, url components to lookbook * use url component in upload ontology process * fix location subform selection via text on upload ontology * change date of creation by modification date field, and add comment of changes field when upload new version of an ontology * fix select input component to use the name * use the correct name for the visibility and allowed to view inputs * make ontology edit and new form use multi part * fix URI input name and value to replace ontology by submission * add disable state to input field component * make acronym field disabled when uploading a new version of an ontology * migrate the ontology picker single partial to select component * Add the checked property to the chips component * update date component with flatpicker * add disabled state to input field component * update submission helpers with the new components * refactor update ontology code to remove undesired ifs * add text field and text area components to lookbook * add select component to lookbook * add date field to the lookbook * add "inline_svg" gem to use svg in files * make the components preview container include JS cod if needed * add language field component * add link field component * add date_time field component * add license field component * add text area field component * add summary section component preview * add dropdown component * add field container component to show a label with it's value vertically * add nested form input component preview * add a pop-up with list of ontologies in group and category admin table * Revert "add a pop-up with list of ontologies in group and category admin table" This reverts commit c4b391a9d3e5272703051922bcb9495ac35297c8. * add a select to update ontologies in the pop-up edit of group in admin table * add a select to update ontologies in the pop-up edit of category in admin table * Refactor code * refactor code and fix bug * remove old undesired text area input from lookbook * add Upload file input component to lookbook * combine all input components in one globale component * remove style params from input field component * recover text area field component (after deleting it by mistake in a previous commit * add hint to text input component * add error state to input field component * add helper text to input field component * add notes to input field component to explain how to use it * combine text area input component with input field component * groupe inputs in one folder in the lookbook * make the input field component generic using a the content slot * implement form date component * implement form text area component * implement form text input component * duplicate the select component to be in the "form" namespace * move and rename file input loader component to be in the form module * update select component to use InputFieldComponent to have a label * remove unsed text in NestedFormInputComponentPreview * fix nested form component inputs focus color to use primary variable * add upload ontology from style file * extract from upload ontology from the location partial * update upload ontology form design * make the upload ontology form button style apply also submit button * add id argument to chips components to permit having multiple chips with same name * fix label not showing for the from select component * put the correct input names in the new ontology form * replace the finish div in the new ontology form with a submit tag * use for the administrated_by input with the form select component * implement the backend create action for the new upload ontology form * fix text area component not showing the value given as argument * add the default values for the inputs in the new ontology form * extract submission_from_params method from the save_submission concern * handle new ontology upload errors in the create action * add default empty submission in the new action * add type parametre to text_input_component so we can specify type as email, number .. * make nested form component start by default by one form initialized * add URI field to the upload ontology process * rename view components "form" namespace to "input" * create the display namespace for the data display components * create the layout namespace for view component that structure content * add modal component preview * move the modal component preview into the layout namespace * change internal link icon in link text component tmp tmp tmp tmp tmp tmp tmp tmp tmp tmp * add text field and text area components to lookbook * add date field to the lookbook * fix label not showing for the from select component * fix text area component not showing the value given as argument * add type parametre to text_input_component so we can specify type as email, number .. * refactor select input component template to use the rails helper * use stimulus values in select input component controller * Add email, password, url components to lookbook * use url component in upload ontology process * fix location subform selection via text on upload ontology * fix select input component to use the name * use the correct name for the visibility and allowed to view inputs * make ontology edit and new form use multi part * fix URI input name and value to replace ontology by submission * migrate the ontology picker single partial to select component * Add the checked property to the chips component * Merge remote-tracking branch 'origin/feature/update-upload-ontology' into feature/update-upload-ontology * change date of creation by modification date field, and add comment of changes field when upload new version of an ontology * add disable state to input field component * update submission helpers with the new components * refactor update ontology code to remove undesired ifs * add id parameter to input field component * replace finish button in upload ontology by the button component * Add size parameter to button component * Add color parameter to button component * Add state parameter to the button component * make finish button animated in upload ontology process * add progress pages component * put again the type argument for button component * fix progress pages item not center if test is long * migrate upload ontology form to use progress pages component * make progress pages container take full width by default * update login page button component usage to have an ID * put again the removed JS code for visibility and is a view * fix chips style padding removed from merging with the browse branch * update date input in the ontology form to use the metadata helper * fix chips style in upload ontology form * remove old new submission form from the bottom of the new ontology page * Fix select multiple items, delete icon style in select component * fix upload ontology style to have less margin bottom * extract ontology updater and saver concern form ontologies controller code * update submission create action tu update also the ontology * use AlertComponent to display ontology form error messages * create input helpers to use inputs component more easily and use them in ontology form * remove no more used style code in upload ontology style file * fix ontology form date and contact inputs not showing error message * set update ontology to true in the create action of submission controller * fix alignement of chips and button components --------- Co-authored-by: Syphax Bouazzouni Co-authored-by: SirineMhedhbi <31127782+SirineMhedhbi@users.noreply.github.com> Co-authored-by: Sirine Mhedhbi --- app/assets/images/arrow-right.svg | 4 +- app/assets/images/json.svg | 2 +- app/assets/images/white-check.svg | 3 + .../stylesheets/application.css.scss.erb | 2 +- app/assets/stylesheets/components/chips.scss | 9 +- .../stylesheets/components/input_field.scss | 16 + .../components/primary_button.scss | 101 ++++++ .../components/regular_button.scss | 2 + app/assets/stylesheets/upload_ontology.scss | 105 ++++++ .../primary_button_component.html.haml | 23 ++ .../buttons/regular_button_component.rb | 2 +- .../chips_component/chips_component.html.haml | 2 +- app/components/input/date_component.rb | 7 +- app/components/input/input_field_component.rb | 5 +- .../input_field_component.html.haml | 2 +- app/components/input/text_input_component.rb | 8 +- .../nested_form_inputs_component.html.haml | 2 +- app/components/select_input_component.rb | 4 +- app/controllers/concerns/ontology_updater.rb | 92 +++++ .../concerns/submission_updater.rb | 14 +- app/controllers/ontologies_controller.rb | 49 +-- app/controllers/submissions_controller.rb | 27 +- app/helpers/application_helper.rb | 15 +- app/helpers/inputs_helper.rb | 45 +++ app/helpers/ontologies_helper.rb | 18 +- app/helpers/submissions_helper.rb | 33 +- .../controllers/tom_select_controller.js | 16 + app/views/layouts/_topnav.html.haml | 2 +- app/views/layouts/component_preview.html.erb | 1 + app/views/login/index.html.haml | 2 +- app/views/ontologies/_form.html.haml | 330 +++++++----------- .../_submission_location_form.html.haml | 49 +++ app/views/ontologies/edit.html.haml | 2 +- app/views/ontologies/new.html.haml | 4 +- .../shared/_ontology_picker_single.html.erb | 2 +- app/views/submissions/new.html.haml | 11 +- 36 files changed, 679 insertions(+), 332 deletions(-) create mode 100644 app/assets/images/white-check.svg create mode 100644 app/assets/stylesheets/components/primary_button.scss create mode 100644 app/assets/stylesheets/upload_ontology.scss create mode 100644 app/components/buttons/primary_button_component/primary_button_component.html.haml create mode 100644 app/controllers/concerns/ontology_updater.rb create mode 100644 app/helpers/inputs_helper.rb create mode 100644 app/javascript/controllers/tom_select_controller.js create mode 100644 app/views/ontologies/_submission_location_form.html.haml diff --git a/app/assets/images/arrow-right.svg b/app/assets/images/arrow-right.svg index 21ce5092c..07eb88ef1 100644 --- a/app/assets/images/arrow-right.svg +++ b/app/assets/images/arrow-right.svg @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/app/assets/images/json.svg b/app/assets/images/json.svg index 7af4b2fb2..e7f7e8898 100644 --- a/app/assets/images/json.svg +++ b/app/assets/images/json.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/app/assets/images/white-check.svg b/app/assets/images/white-check.svg new file mode 100644 index 000000000..6b657da4f --- /dev/null +++ b/app/assets/images/white-check.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index a3e69e6ab..e509a4f5d 100755 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -50,7 +50,7 @@ @import "components/index"; @import "account"; @import "agents"; - +@import "upload_ontology"; @import "nav_bar"; @import "ontology_details_header"; @import "ontology_viewer"; diff --git a/app/assets/stylesheets/components/chips.scss b/app/assets/stylesheets/components/chips.scss index d0539b6a0..9815dbdf1 100644 --- a/app/assets/stylesheets/components/chips.scss +++ b/app/assets/stylesheets/components/chips.scss @@ -1,3 +1,7 @@ +.chips-container > div{ + margin-right: 10px; +} + .chips-container svg path{ fill: var(--primary-color); } @@ -7,6 +11,7 @@ display: none; } + .chips-container div label{ cursor: pointer; } @@ -20,9 +25,9 @@ background:white; border: 0.5px solid #BDBDBD; color: #a7a7a7; - padding: 3px; + padding: 8px; border-radius: 5px; - font-size: 12px; + font-size: 13px; user-select: none; } diff --git a/app/assets/stylesheets/components/input_field.scss b/app/assets/stylesheets/components/input_field.scss index 9a5ad99c9..f11b84188 100644 --- a/app/assets/stylesheets/components/input_field.scss +++ b/app/assets/stylesheets/components/input_field.scss @@ -66,4 +66,20 @@ right: calc(0.75rem + 5px); top: 50%; width: 0; +} + +.ts-wrapper.multi .ts-control>div{ + border-radius: 5px; + font-size: 11px; + padding: 2px 0 4px 6px; + color: #888888; +} + +.ts-wrapper.plugin-remove_button:not(.rtl) .item .remove{ + border-left: none; + color: #888888 !important; + margin-left: 0; +} +.ts-wrapper.plugin-remove_button .item .remove:hover{ + background: unset; } \ No newline at end of file diff --git a/app/assets/stylesheets/components/primary_button.scss b/app/assets/stylesheets/components/primary_button.scss new file mode 100644 index 000000000..5e534fecd --- /dev/null +++ b/app/assets/stylesheets/components/primary_button.scss @@ -0,0 +1,101 @@ +.button-container{ + width: 100%; +} +.primary-button { + width: 100%; + display: flex; + justify-content: center; + align-items: center; + font-size: 16px; + color: white; + height: 60px; + background-color: var(--primary-color); + border: none; + border-radius: 9px; + transition: background-color ease 0.3s; +} +.primary-button:hover { + background-color: var(--hover-color); + cursor: pointer; +} + + +.animation-container{ + width: 100%; + height: 60px; + font-size: 16px; + background-color: var(--hover-color); + border: none; + border-radius: 9px; + justify-content: center; + align-items: center; + display: none; + +} +.lds-ellipsis { + display: inline-block; + position: relative; + margin-top: 50px; + width: 80px; + height: 80px; + transform: scale(0.7); +} + +.lds-ellipsis div { + position: absolute; + width: 13px; + height: 13px; + border-radius: 50%; + background: white; + animation-timing-function: cubic-bezier(0, 1, 1, 0); +} + +.lds-ellipsis div:nth-child(1) { + left: 8px; + animation: lds-ellipsis1 0.6s infinite; +} + +.lds-ellipsis div:nth-child(2) { + left: 8px; + animation: lds-ellipsis2 0.6s infinite; +} + +.lds-ellipsis div:nth-child(3) { + left: 32px; + animation: lds-ellipsis2 0.6s infinite; +} + +.lds-ellipsis div:nth-child(4) { + left: 56px; + animation: lds-ellipsis3 0.6s infinite; +} + +@keyframes lds-ellipsis1 { + 0% { + transform: scale(0); + } + + 100% { + transform: scale(1); + } +} + +@keyframes lds-ellipsis3 { + 0% { + transform: scale(1); + } + + 100% { + transform: scale(0); + } +} + +@keyframes lds-ellipsis2 { + 0% { + transform: translate(0, 0); + } + + 100% { + transform: translate(24px, 0); + } +} diff --git a/app/assets/stylesheets/components/regular_button.scss b/app/assets/stylesheets/components/regular_button.scss index 954165297..762b285b2 100644 --- a/app/assets/stylesheets/components/regular_button.scss +++ b/app/assets/stylesheets/components/regular_button.scss @@ -105,10 +105,12 @@ .left-button-icon{ margin-right: 10px; + margin-bottom: 3px; } .right-button-icon { margin-left: 10px; + margin-bottom: 3px; } .secondary-button-icon path { diff --git a/app/assets/stylesheets/upload_ontology.scss b/app/assets/stylesheets/upload_ontology.scss new file mode 100644 index 000000000..d5026556c --- /dev/null +++ b/app/assets/stylesheets/upload_ontology.scss @@ -0,0 +1,105 @@ +.upload-ontology-container { + display: flex; + justify-content: center; + padding: 40px 0; +} + +.upload-ontology-card { + width: 589px; + border-radius: 14px; + box-shadow: rgba(0, 0, 0, 0.05) 0px 20px 50px; + padding: 20px 40px; + +} + +.upload-ontology-center { + display: flex; + justify-content: center; + flex-direction: column; +} + +.Upload-ontology-title { + font-size: 18px; + display: flex; + font-weight: bold; + flex-direction: column; + align-items: center; +} + +.Upload-ontology-title hr { + border: 1px solid var(--primary-color); + width: 93px; + margin: 0; +} + +.upload-ontology-progress { + display: flex; + align-items: center; + margin-top: 20px; + margin-bottom: 50px; +} + + +.upload-ontology-chips-container{ + display: flex; + flex-wrap: wrap; +} + + +.hide { + display: none; +} + +.show { + display: block; +} + +.upload-ontology-desc { + font-size: 12px; + color: #777777; + margin-bottom: 23px; +} + +.upload-ontology-desc a { + text-decoration: none; + color: var(--primary-color); +} +.upload-ontology-desc a svg{ + transform: scale(1.2); +} + + +.upload-ontology-contact .add-another-contact div { + font-size: 11px; + color: #DADADA; + margin-left: 10px; + +} + +.upload-ontology-field-container .location-choice{ + display: flex; + align-items: center; + margin-bottom: 3px; +} + +.upload-ontology-field-container .location-choice .title{ + font-size: 13px; + color: black; + margin-left: 13px; + margin-bottom: 0; + cursor: pointer; +} + +.upload-ontology-field-container > div{ + font-size: 12px; + color: #666666; +} + + +.upload-ontology-input-field-container{ + margin-bottom: 10px; +} + +.upload-ontology-input-field-container .switch-filter p{ + font-size: 12px !important; +} diff --git a/app/components/buttons/primary_button_component/primary_button_component.html.haml b/app/components/buttons/primary_button_component/primary_button_component.html.haml new file mode 100644 index 000000000..154eb2abe --- /dev/null +++ b/app/components/buttons/primary_button_component/primary_button_component.html.haml @@ -0,0 +1,23 @@ +- if @type == "submit" + .button-container{onclick: "displayAnimation()", id: "primary-button"} + %input.primary-button{:name => @name, :type => "submit", :value => @value, oncklick: @onclick}/ +- else + .button-container + .primary-button{:name => @name, onclick: "displayAnimation()", id: "primary-button", oncklick: @onclick} + = @value + +.animation-container#loading-animation + .lds-ellipsis + %div + %div + %div + %div + +:javascript + const button = document.getElementById("primary-button") + const loading = document.getElementById("loading-animation") + function displayAnimation(){ + console.log("working") + button.style.display = 'none'; + loading.style.display = 'flex'; + } \ No newline at end of file diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index c40a9f67b..cb75ef32a 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -16,7 +16,7 @@ def initialize(id: , value:, variant: "primary", color: "normal", href: "", size def button_label hide_icon_left = icon_left == nil ? "hide" : " " hide_icon_right = icon_right == nil ? "hide" : " " - content_tag(:span, icon_left, class: "#{@variant}-button-icon left-button-icon #{hide_icon_left}") + @value + content_tag(:span, icon_right, class: "#{@variant}-button-icon right-button-icon #{hide_icon_right}") + content_tag(:span, icon_left, class: "#{@variant}-button-icon left-button-icon #{hide_icon_left}") + content_tag(:div, @value) + content_tag(:span, icon_right, class: "#{@variant}-button-icon right-button-icon #{hide_icon_right}") end def button_elem diff --git a/app/components/chips_component/chips_component.html.haml b/app/components/chips_component/chips_component.html.haml index 48a0b88a4..3191dc1d3 100644 --- a/app/components/chips_component/chips_component.html.haml +++ b/app/components/chips_component/chips_component.html.haml @@ -5,6 +5,6 @@ %span %svg.chips-check-icon{:fill => "none", :height => "8", :viewbox => "0 0 10 8", :width => "10", :xmlns => "http://www.w3.org/2000/svg"} %path{:d => "M9.76764 0.232287C9.45824 -0.0775267 8.95582 -0.0773313 8.646 0.232287L3.59787 5.28062L1.35419 3.03696C1.04438 2.72714 0.542174 2.72714 0.23236 3.03696C-0.0774534 3.34677 -0.0774534 3.84897 0.23236 4.15879L3.03684 6.96326C3.19165 7.11807 3.39464 7.19567 3.59765 7.19567C3.80067 7.19567 4.00386 7.11827 4.15867 6.96326L9.76764 1.3541C10.0775 1.0445 10.0775 0.542081 9.76764 0.232287Z"} - %div.ml-1 + %div = @label = count diff --git a/app/components/input/date_component.rb b/app/components/input/date_component.rb index fe85fa892..2549e3670 100644 --- a/app/components/input/date_component.rb +++ b/app/components/input/date_component.rb @@ -1,11 +1,12 @@ # frozen_string_literal: true class Input::DateComponent < Input::InputFieldComponent - def initialize(label: '', name:, value: Date.today, placeholder: '', error_message: '', helper_text: '') - super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) + def initialize(label: '', name:, value: Date.today, placeholder: '', error_message: '', helper_text: '', id: nil) + data_flat_picker = { controller: "flatpickr", flatpickr_date_format: "Y-m-d", flatpickr_alt_input: "true", flatpickr_alt_format: "F j, Y" } + super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text, data: data_flat_picker, id: id) end def call - render Input::InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: 'date') + render Input::InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, data: @data, type: 'date', id: @id) end end diff --git a/app/components/input/input_field_component.rb b/app/components/input/input_field_component.rb index 01ed85ef6..d026ca0e5 100644 --- a/app/components/input/input_field_component.rb +++ b/app/components/input/input_field_component.rb @@ -1,5 +1,5 @@ class Input::InputFieldComponent < ViewComponent::Base - def initialize(label: "" , name:, value: 'Syphax', type: 'text', placeholder: "", error_message: "", helper_text: "") + def initialize(label: "" , name:, value: 'Syphax', type: 'text', placeholder: "", error_message: "", helper_text: "", disabled: false, data: nil, id: '') @label = label @name = name @placeholder = placeholder @@ -7,6 +7,9 @@ def initialize(label: "" , name:, value: 'Syphax', type: 'text', placeholder: "" @helper_text = helper_text @value = value @type = type + @disabled = disabled + @id = id + @data = data end diff --git a/app/components/input/input_field_component/input_field_component.html.haml b/app/components/input/input_field_component/input_field_component.html.haml index 0bd9f9a10..9500ba74d 100644 --- a/app/components/input/input_field_component/input_field_component.html.haml +++ b/app/components/input/input_field_component/input_field_component.html.haml @@ -6,7 +6,7 @@ - if content = content - else - %input.input-field-component.text-input{name: @name, type: @type, placeholder: @placeholder, style: error_style, value: @value} + %input.input-field-component.text-input{class: @disabled ? '' : 'not-disabled', name: @name, type: @type, placeholder: @placeholder, style: error_style, id: @id, data: @data, value: @value, disabled: @disabled} diff --git a/app/components/input/text_input_component.rb b/app/components/input/text_input_component.rb index 7a38b3de0..d5cca42eb 100644 --- a/app/components/input/text_input_component.rb +++ b/app/components/input/text_input_component.rb @@ -1,11 +1,13 @@ # frozen_string_literal: true class Input::TextInputComponent < Input::InputFieldComponent - def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '') - super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) + def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '', disabled: false, id: '') + super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text, disabled: disabled, id: id) end def call - render Input::InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, error_message: @error_message, helper_text: @helper_text, type: @type) + render Input::InputFieldComponent.new(label: @label, name: @name, value: @value, placeholder: @placeholder, + error_message: @error_message, helper_text: @helper_text, + type: @type, disabled: @disabled) end end diff --git a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml index 78a23641d..730ec86f4 100644 --- a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml +++ b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml @@ -31,4 +31,4 @@ %div.add-another-object{data: {action:"click->nested-form#add"}} = inline_svg 'icons/plus.svg' %div - Add another #{@object_name} \ No newline at end of file + Add another #{@object_name} diff --git a/app/components/select_input_component.rb b/app/components/select_input_component.rb index 935087fe5..99a481bb5 100644 --- a/app/components/select_input_component.rb +++ b/app/components/select_input_component.rb @@ -13,7 +13,7 @@ def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_valu end def call - select_input_tag(@id, @values, @selected, multiple: @multiple, open_to_add_values: @open_to_add_values) + select_input_tag(@name, @values, @selected, multiple: @multiple, open_to_add_values: @open_to_add_values) end private @@ -32,7 +32,7 @@ def select_input_tag(id, values, selected, options = {}) 'select-input-open-add-value': open_to_add_values } } - #binding.pry + select_tag(id, options_for_select(values, selected), select_html_options) end end diff --git a/app/controllers/concerns/ontology_updater.rb b/app/controllers/concerns/ontology_updater.rb new file mode 100644 index 000000000..c45020ce9 --- /dev/null +++ b/app/controllers/concerns/ontology_updater.rb @@ -0,0 +1,92 @@ +module OntologyUpdater + extend ActiveSupport::Concern + include SubmissionUpdater + def ontology_from_params + ontology = LinkedData::Client::Models::Ontology.new(values: ontology_params) + ontology.viewOf = nil unless ontology.isView + ontology + end + + def save_ontology + + @ontology = save_new_ontology + + if response_error?(@ontology) + show_new_errors(@ontology) + return + end + + + @submission = save_new_submission(params[:submission], @ontology) + + if response_error?(@submission) + @ontology.delete + show_new_errors(@submission) + else + redirect_to "/ontologies/success/#{@ontology.acronym}" + end + end + + def add_ontology_submission(acronym) + @ontology = update_existent_ontology(acronym) + + if @ontology.nil? || response_error?(@ontology) + show_new_errors(@ontology) + return + end + + @submission = @ontology.explore.latest_submission({ display: 'all' }) + submission_params = submission_params(params[:submission]) + submission_params = submission_params(ActionController::Parameters.new(@submission.to_hash.delete_if { |k, v| v.nil? || v.respond_to?(:empty?) && v.empty? })).merge(submission_params) if @submission + submission_params.delete 'submissionId' + @submission = save_new_submission(ActionController::Parameters.new(submission_params), @ontology) + + if response_error?(@submission) + show_new_errors(@submission) + else + redirect_to "/ontologies/success/#{@ontology.acronym}" + end + end + + def save_new_ontology + ontology = ontology_from_params + ontology.save + end + + def update_existent_ontology(acronym) + @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(acronym).first + return nil if @ontology.nil? + + @ontology.update_from_params(ontology_params) + end + + def save_new_submission(submission_hash, ontology) + new_submission_params = submission_hash + new_submission_params[:ontology] = ontology.acronym + save_submission(new_submission_params) + end + + def ontology_params + p = params.require(:ontology).permit(:name, :acronym, { administeredBy: [] }, :viewingRestriction, { acl: [] }, + { hasDomain: [] }, :viewOf,:isView, :subscribe_notifications, { group: [] }) + + p[:administeredBy].reject!(&:blank?) if p[:administeredBy] + # p[:acl].reject!(&:blank?) + p[:hasDomain].reject!(&:blank?) if p[:hasDomain] + p[:group].reject!(&:blank?) if p[:group] + p.to_h + end + + def show_new_errors(object) + # TODO optimize + @ontologies = LinkedData::Client::Models::Ontology.all(include: 'acronym', include_views: true, display_links: false, display_context: false) + @categories = LinkedData::Client::Models::Category.all + @groups = LinkedData::Client::Models::Group.all(display_links: false, display_context: false) + @user_select_list = LinkedData::Client::Models::User.all.map { |u| [u.username, u.id] } + @user_select_list.sort! { |a, b| a[1].downcase <=> b[1].downcase } + @errors = response_errors(object) + @ontology = ontology_from_params + @submission = submission_from_params(params[:submission]) + render 'ontologies/new' + end +end diff --git a/app/controllers/concerns/submission_updater.rb b/app/controllers/concerns/submission_updater.rb index 43746c38e..d8c63ba72 100644 --- a/app/controllers/concerns/submission_updater.rb +++ b/app/controllers/concerns/submission_updater.rb @@ -1,11 +1,15 @@ module SubmissionUpdater extend ActiveSupport::Concern - def save_submission(new_submission_hash) + def submission_from_params(new_submission_hash) convert_values_to_types(new_submission_hash) + LinkedData::Client::Models::OntologySubmission.new(values: submission_params(new_submission_hash)) + end + def save_submission(new_submission_hash) + @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(new_submission_hash[:ontology]).first - @submission = LinkedData::Client::Models::OntologySubmission.new(values: submission_params(new_submission_hash)) + @submission = submission_from_params(new_submission_hash) update_ontology_summary_only @submission.save(cache_refresh_all: false) @@ -64,12 +68,12 @@ def update_ontology_summary_only(is_remote = @submission.isRemote) def convert_values_to_types(new_submission_hash) unless new_submission_hash[:contact].nil? - new_submission_hash[:contact] = new_submission_hash[:contact].values + new_submission_hash[:contact] = new_submission_hash[:contact].values unless new_submission_hash[:contact].is_a?(Array) new_submission_hash[:contact].delete_if { |c| c[:name].empty? || c[:email].empty? } end # Convert metadata that needs to be integer to int - @metadata.map do |hash| + submission_metadata.map do |hash| if hash["enforce"].include?("integer") if !new_submission_hash[hash["attribute"]].nil? && !new_submission_hash[hash["attribute"]].eql?("") new_submission_hash[hash["attribute"].to_s.to_sym] = Integer(new_submission_hash[hash["attribute"].to_s.to_sym]) @@ -111,7 +115,7 @@ def submission_params(params) :publication ] - @metadata.each do |m| + submission_metadata.each do |m| m_attr = m["attribute"].to_sym diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index f7b9ae2fb..a50f1797c 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -7,6 +7,7 @@ class OntologiesController < ApplicationController include SchemesHelper, ConceptsHelper include CollectionsHelper include MappingStatistics + include OntologyUpdater require 'multi_json' require 'cgi' @@ -195,26 +196,9 @@ def properties end def create - if params[:commit].eql? 'Cancel' - redirect_to ontologies_path and return - end - @ontology = LinkedData::Client::Models::Ontology.new(values: ontology_params) - @ontology_saved = @ontology.save - if response_error?(@ontology_saved) - @categories = LinkedData::Client::Models::Category.all - @groups = LinkedData::Client::Models::Group.all(display_links: false, display_context: false) - @user_select_list = LinkedData::Client::Models::User.all.map { |u| [u.username, u.id] } - @user_select_list.sort! { |a, b| a[1].downcase <=> b[1].downcase } - @errors = response_errors(@ontology_saved) - render 'new' - else - if @ontology_saved.summaryOnly - redirect_to "/ontologies/success/#{@ontology.acronym}" - else - redirect_to new_ontology_submission_path(@ontology.acronym) - end - end + # redirect_to ontologies_path and return if params[:commit].eql? 'Cancel' + save_ontology end def edit @@ -239,7 +223,8 @@ def mappings def new @ontology = LinkedData::Client::Models::Ontology.new - @ontologies = LinkedData::Client::Models::Ontology.all(include: 'acronym', include_views: true,display_links: false, display_context: false) + @submission = LinkedData::Client::Models::OntologySubmission.new + @ontologies = LinkedData::Client::Models::Ontology.all(include: 'acronym', include_views: true, display_links: false, display_context: false) @categories = LinkedData::Client::Models::Category.all @groups = LinkedData::Client::Models::Group.all @user_select_list = LinkedData::Client::Models::User.all.map {|u| [u.username, u.id]} @@ -454,9 +439,9 @@ def widgets render partial: 'ontologies/sections/widgets', layout: 'ontology_viewer' end end - + def show_licenses - + @metadata = submission_metadata @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:id]).first @licenses= ["hasLicense","morePermissions","copyrightHolder"] @@ -464,28 +449,14 @@ def show_licenses render partial: 'ontologies/sections/licenses' end def ajax_ontologies - - + + render json: LinkedData::Client::Models::Ontology.all(include_views: true, display: 'acronym,name', display_links: false, display_context: false) end - private - - - - def ontology_params - p = params.require(:ontology).permit(:name, :acronym, { administeredBy:[] }, :viewingRestriction, { acl:[] }, - { hasDomain:[] }, :isView, :viewOf, :subscribe_notifications, {group:[]}) - - p[:administeredBy].reject!(&:blank?) - p[:acl].reject!(&:blank?) - p[:hasDomain].reject!(&:blank?) - p[:group].reject!(&:blank?) - p.to_h - end - + private def get_views(ontology) views = ontology.explore.views || [] views.select!{ |view| view.access?(session[:user]) } diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb index 2bea30bd3..66572cd8e 100644 --- a/app/controllers/submissions_controller.rb +++ b/app/controllers/submissions_controller.rb @@ -1,5 +1,5 @@ class SubmissionsController < ApplicationController - include SubmissionsHelper, SubmissionUpdater + include SubmissionsHelper, SubmissionUpdater, OntologyUpdater layout :determine_layout before_action :authorize_and_redirect, :only => [:edit, :update, :create, :new] before_action :submission_metadata, only: [:create, :edit, :new, :update, :index] @@ -28,28 +28,17 @@ def new @submission = @ontology.explore.latest_submission @submission ||= LinkedData::Client::Models::OntologySubmission.new @submission.id = nil + @categories = LinkedData::Client::Models::Category.all + @groups = LinkedData::Client::Models::Group.all + @user_select_list = LinkedData::Client::Models::User.all.map {|u| [u.username, u.id]} + @user_select_list.sort! {|a,b| a[1].downcase <=> b[1].downcase} + @is_update_ontology = true end # Called when form to "Add submission" is submitted def create - # Make the contacts an array - _, submission_params = params[:submission].each.first - @required_only = !params['required-only'].nil? - @filters_disabled = true - @submission_saved = save_submission(submission_params) - if response_error?(@submission_saved) - @errors = response_errors(@submission_saved) # see application_controller::response_errors - if @errors && @errors[:uploadFilePath] - @errors = ["Please specify the location of your ontology"] - elsif @errors && @errors[:contact] - @errors = ["Please enter a contact"] - end - - reset_agent_attributes - render 'new', status: 422 - else - redirect_to "/ontologies/success/#{@ontology.acronym}" - end + @is_update_ontology = true + add_ontology_submission(params[:ontology][:acronym] || params[:id]) end # Called when form to "Edit submission" is submitted diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3bdc2334b..396f68883 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -367,14 +367,14 @@ def get_groups_data def metadata_for_select get_metadata return @metadata_for_select - end + end def get_metadata @metadata_for_select = [] submission_metadata.each do |data| @metadata_for_select << data["attribute"] end - end + end def ontologies_to_acronyms(ontologyIDs) @@ -426,7 +426,7 @@ def add_proposal_button(parent_id, parent_type) class: "add_proposal btn btn-primary", data: { show_modal_title_value: "Add a new proposal"} end end - + def subscribe_button(ontology_id) ontology_acronym = ontology_id.split('/').last @@ -611,10 +611,10 @@ def skos? submission = @submission || @submission_latest submission&.hasOntologyLanguage === 'SKOS' end - + def current_page?(path) request.path.eql?(path) - end + end def request_lang lang = params[:language] || params[:lang] @@ -646,12 +646,9 @@ def bp_config_json config[:ncbo_slice] = @subdomain_filter[:acronym] if (@subdomain_filter[:active] && !@subdomain_filter[:acronym].empty?) config.to_json end - - def portal_name $SITE - end - + end def navitems items = [["/ontologies", "Browse"],["/mappings", "Mappings"],["/recommender", "Recommender"],["/annotator", "Annotator"], ["/landscape", "Landscape"]] end diff --git a/app/helpers/inputs_helper.rb b/app/helpers/inputs_helper.rb new file mode 100644 index 000000000..ff0f14294 --- /dev/null +++ b/app/helpers/inputs_helper.rb @@ -0,0 +1,45 @@ +module InputsHelper + + def text_input(label: nil, name: , value:, disabled: false) + render Input::TextInputComponent.new(label: input_label(label, name) , name: name, value: value, error_message: input_error_message(name), disabled: disabled) + end + + def select_input(label: nil, name: , values:, selected: nil, multiple: false) + render Input::SelectComponent.new(label: input_label(label, name), name: name, value: values, selected: selected, multiple: multiple) + end + + def check_input(id:, name: , label: '', value:, checked: false) + render ChipsComponent.new(name: name, id: id, label: label, value: value, checked: checked) + end + + def switch_input(id: , name:, label: ,checked: false) + render SwitchInputComponent.new(id: id, name: name, label: label, checked: checked) + end + + def url_input(label: nil, name: , value:) + render Input::UrlComponent.new(label: input_label(label, name), name: name, value: value, error_message: input_error_message(name) ) + end + + def text_area_input(label: nil, name: , value:) + render Input::TextAreaComponent.new(label: input_label(label, name), name: name, value: value, error_message: input_error_message(name)) + end + + def date_input(label: nil, name:, value:) + render Input::DateComponent.new(label: input_label(label, name) ,name: name, value: value || Date.today, error_message: input_error_message(name)) + end + + private + + def method_name(name) + match = /.*\[(.*?)\]/.match(name) + match.nil? ? name : match[1] + end + + def input_label(label, name) + label || method_name(name).humanize + end + + def input_error_message(name) + attribute_error(method_name(name)) + end +end \ No newline at end of file diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index b421e5ae4..cf35e422d 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -534,10 +534,26 @@ def ontology_edit_button def submission_json_button render RoundedButtonComponent.new(link: "#{(@submission_latest || @ontology).id}?display=all", target: '_blank', size: 'medium') end + + def attribute_error(attr) + return '' unless @errors && @errors[attr.to_sym] + errors = @errors[attr.to_sym] + + errors.values.join(', ') + end + + def error_message + if !@errors[:error].nil? && @errors[:error].is_a?(String) + @errors[:error] + else + "Errors in fields #{@errors.keys.join(', ')}" + end + + end private def submission_languages(submission = @submission) - submission.naturalLanguage.map { |natural_language| natural_language["iso639"] && natural_language.split('/').last }.compact + submission&.naturalLanguage.map { |natural_language| natural_language["iso639"] && natural_language.split('/').last }.compact end end diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb index cc338b994..ca55ce95b 100644 --- a/app/helpers/submissions_helper.rb +++ b/app/helpers/submissions_helper.rb @@ -338,12 +338,7 @@ def generate_agent_input(attr, type: 'person') def generate_date_input(attr) field_id = [:submission, attr["attribute"].to_s, @ontology.acronym].join('_') date_value = @submission.send(attr["attribute"]).presence - data_flat_picker = { controller: "flatpickr", flatpickr_date_format: "Y-m-d", flatpickr_alt_input: "true", flatpickr_alt_format: "F j, Y" } - content_tag(:div, class: 'input-group') do - [ - date_field(object_name, attr["attribute"].to_s.to_sym, value: date_value, id: field_id, data: data_flat_picker, class: "not-disabled") - ].join.html_safe - end + render Input::DateComponent.new(label: (attr["label"] || attr["attribute"]).to_s ,name: object_name, value: date_value || Date.today, id: field_id) end def generate_textarea_input(attr) @@ -355,10 +350,13 @@ def generate_select_input(attr, name, select_values, metadata_values, multiple: render SelectInputComponent.new(id: id, name: name, values: select_values , selected: metadata_values , multiple: multiple) end - def generate_list_field_input(attr, name, values, field_func) + def generate_list_field_input(attr, name, label, values, &block) render NestedFormInputsComponent.new do |c| - c.template do - method(field_func).call("#{name}[NEW_RECORD]", '', :id => attr["attribute"].to_s + "_" + @ontology.acronym, class: "metadataInput form-control my-1") + c.header do + content_tag(:div, label) + end + c.template do + block.call('', "#{name}[NEW_RECORD]", attr["attribute"].to_s + "_" + @ontology.acronym) end c.empty_state do @@ -367,20 +365,25 @@ def generate_list_field_input(attr, name, values, field_func) values.each_with_index do |metadata_val, i| c.row do - method(field_func).call("#{name}[#{i}]", metadata_val, :id => "submission_#{attr["attribute"].to_s}" + "_" + @ontology.acronym, class: "metadataInput my-1 form-control") + block.call(metadata_val, "#{name}[#{i}]" ,"submission_#{attr["attribute"].to_s}" + "_" + @ontology.acronym) end end end end - def generate_url_input(attr, name, values) - generate_list_field_input(attr, name, values, :url_field_tag) + def generate_url_input(attr, name, values, label:"") + generate_list_field_input(attr, name, label, values) do |value, row_name, id| + render Input::UrlComponent.new(label: "", name: row_name, value: value, id: id) + end end - def generate_list_text_input(attr, name, values) - generate_list_field_input(attr, name, values, :text_field_tag) + def generate_list_text_input(attr, name, values, label:"") + generate_list_field_input(attr, name, label, values) do |value, row_name, id| + render Input::TextInputComponent.new(label: "", name: row_name, value: value, id: id) + end end + def generate_boolean_input(attr, name) value = attribute_values(attr) value = value.to_s unless value.nil? @@ -412,7 +415,7 @@ def generate_attribute_input(attr_label, options = {}) input_html = ''.html_safe # Get the attribute hash corresponding to the given attribute - attr = @metadata.select { |attr_hash| attr_hash["attribute"].to_s.eql?(attr_label) }.first + attr = submission_metadata.select { |attr_hash| attr_hash["attribute"].to_s.eql?(attr_label) }.first object_name, name = attribute_input_name(attr["attribute"]) diff --git a/app/javascript/controllers/tom_select_controller.js b/app/javascript/controllers/tom_select_controller.js new file mode 100644 index 000000000..4f157b2aa --- /dev/null +++ b/app/javascript/controllers/tom_select_controller.js @@ -0,0 +1,16 @@ +import { Controller } from "@hotwired/stimulus" +import TomSelect from "tom-select" +// Connects to data-controller="tom-select" +export default class extends Controller { + + + + connect() { + + new TomSelect(this.element, { + + + //plugins: ['remove_button'] + }); + } +} diff --git a/app/views/layouts/_topnav.html.haml b/app/views/layouts/_topnav.html.haml index 2fcbcf94f..94c144037 100644 --- a/app/views/layouts/_topnav.html.haml +++ b/app/views/layouts/_topnav.html.haml @@ -44,7 +44,7 @@ = link_to("Logout", logout_path) = select_tag('language', options_for_select([['EN','en'],['FR','fr']]), id: 'language-select', class: 'nav-language', - data: { controller: "platform-language", action: "change->platform-language#handleLangChanged" }) + data: { controller: "platform-language", action: "change->platform-language#handleLangChanged" }) = render DropdownButtonComponent.new do |d| - d.header do diff --git a/app/views/layouts/component_preview.html.erb b/app/views/layouts/component_preview.html.erb index 5369cd053..429f63010 100644 --- a/app/views/layouts/component_preview.html.erb +++ b/app/views/layouts/component_preview.html.erb @@ -55,5 +55,6 @@ <%= javascript_include_tag "application" %>
    + \ No newline at end of file diff --git a/app/views/login/index.html.haml b/app/views/login/index.html.haml index de0a663a4..41ce080fe 100644 --- a/app/views/login/index.html.haml +++ b/app/views/login/index.html.haml @@ -15,7 +15,7 @@ %a.login-forgot-password{:href => "/lost_pass"} %p Forgot password? .login-button-container - = render Buttons::RegularButtonComponent.new(value: "Login", name: "commit", type: "submit") + = render Buttons::RegularButtonComponent.new(id: 'login-button', value: "Login", type:'submit') %p.dont-have-account Don't have an account? %a.text-decoration-none{:href => new_user_path} Register diff --git a/app/views/ontologies/_form.html.haml b/app/views/ontologies/_form.html.haml index fe945e9f6..012a3056a 100644 --- a/app/views/ontologies/_form.html.haml +++ b/app/views/ontologies/_form.html.haml @@ -1,220 +1,130 @@ -- button_text ||= "Create ontology" -- title_text ||= "Submit New Ontology" +.upload-ontology-container + %div{style: 'width: 589px'} + - unless @errors.nil? + = render Display::AlertComponent.new(message: error_message, type: 'danger', closable: false) + .upload-ontology-card + .upload-ontology-center + .Upload-ontology-title + %div + = @is_update_ontology ? "Upload new update" : "Upload ontology" + %hr + .upload-ontology-progress + = render Layout::ProgressPagesComponent.new(pages_title: ['Details', 'General metadata', 'Dates contacts']) do |c| + - c.page do + .upload-ontology-input-field-container + = text_input(name: 'ontology[name]', value: @ontology.name) + .upload-ontology-input-field-container + = text_input(name: 'ontology[acronym]', value: @ontology.acronym, disabled: @is_update_ontology) + = hidden_field_tag 'ontology[acronym]', @ontology.acronym if @is_update_ontology + + .upload-ontology-input-field-container#visibilityContainer + = select_input(label: "Visibility", name: "ontology[viewingRestriction]", values: ["public","private"], selected: @ontology.viewingRestriction ) + .upload-ontology-input-field-container#visibility-group{style: 'display: none'} + = select_input(label: "Add or remove accounts that are allowed to view classes in this ontology using the account name", name: "ontology[acl]", values: @user_select_list, selected: @ontology.acl, multiple: true) + + .upload-ontology-input-field-container + = select_input(label: "Administrator", name: "ontology[administeredBy]", values: @user_select_list, selected: @ontology.administeredBy || session[:user].id, multiple: true) + .upload-ontology-input-field-container + = render Input::InputFieldComponent.new(name: '', label:'Categories') do + %div.upload-ontology-chips-container + - @categories.each do |category| + = check_input(name: "ontology[hasDomain][]", id: category[:acronym] , label: category[:acronym], value: category[:id], checked: @ontology.hasDomain&.any?{|x| x.eql?(category[:id])}) + .upload-ontology-field-container + = render Input::InputFieldComponent.new(name: '', label:'Groups') do + %div.upload-ontology-chips-container + - @groups.each do |group| + = check_input(name: "ontology[group][]", id: group[:acronym] , label: group[:acronym], value: group[:id], checked: @ontology.group&.any?{|x| x.eql?(group[:id])}) + + .upload-ontology-input-field-container.mt-2 + %span.d-flex + = switch_input(id: 'ontology_isView', name: 'ontology[isView]', label: 'Is a view of another ontology?', checked: @ontology.view?) + %div#ontology_viewOf{style: "display: #{ !@ontology.view? ? 'none' : 'block'}"} + = render partial: "shared/ontology_picker_single", locals: {placeholder: "", field_name: "viewOf", selected: @ontology.viewOf} + + - c.page do + .upload-ontology-desc + %div + To understand the ontologies metadata: + %a{:href => "#seethewiki"} + see the Wiki + %svg{:fill => "none", :height => "8", :viewbox => "0 0 8 8", :width => "8", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M5.77776 8H1.33333C0.977156 8 0.642334 7.8613 0.390512 7.60946C0.138689 7.35762 0 7.02278 0 6.66666V2.22222C0 1.86607 0.138704 1.53124 0.390527 1.27942C0.64235 1.0276 0.977172 0.888894 1.33334 0.888894H3.11111C3.35659 0.888894 3.55556 1.08787 3.55556 1.33334C3.55556 1.57881 3.35659 1.77779 3.11111 1.77779H1.33333C1.2146 1.77779 1.10301 1.82402 1.01907 1.90795C0.935144 1.99188 0.888894 2.1035 0.888894 2.22222V6.66666C0.888894 6.78538 0.935129 6.89698 1.01907 6.98094C1.10301 7.06486 1.2146 7.11111 1.33333 7.11111H5.77775C5.89647 7.11111 6.00807 7.06487 6.09202 6.98091C6.17595 6.89698 6.22218 6.78537 6.22218 6.66664V4.88889C6.22218 4.64341 6.42117 4.44445 6.66664 4.44445C6.91212 4.44445 7.11111 4.64343 7.11111 4.88889V6.66666C7.11111 7.02281 6.9724 7.35762 6.72056 7.60947C6.46872 7.8613 6.13389 8 5.77776 8ZM3.11111 5.33332C2.99736 5.33332 2.88362 5.28994 2.79685 5.20315C2.62329 5.02959 2.62329 4.74816 2.79685 4.5746L6.48254 0.888894H4.88889C4.64341 0.888894 4.44445 0.68992 4.44445 0.444447C4.44445 0.198974 4.64341 0 4.88889 0H7.55555C7.61702 0 7.67556 0.0124825 7.72882 0.0350409C7.77851 0.0560624 7.82518 0.0865233 7.86602 0.126439L7.86605 0.12647C7.86634 0.126765 7.86664 0.127045 7.86692 0.12734C7.86699 0.127417 7.8671 0.127511 7.86718 0.127588C7.8674 0.127805 7.86765 0.128038 7.86786 0.128271C7.86802 0.128427 7.86816 0.128566 7.86831 0.128721C7.86848 0.128892 7.86867 0.129079 7.86881 0.129218C7.86912 0.129529 7.86946 0.129855 7.86977 0.130181C7.87008 0.130491 7.87042 0.130833 7.87074 0.131143C7.87091 0.131299 7.87109 0.131501 7.87122 0.13164C7.87139 0.131796 7.87151 0.131935 7.87167 0.132091C7.87191 0.132323 7.87213 0.132541 7.87235 0.132789C7.87243 0.132851 7.87254 0.13296 7.8726 0.133038C7.87289 0.133333 7.87319 0.133628 7.87347 0.133923L7.8735 0.133954C7.9134 0.174817 7.94388 0.221486 7.96488 0.271167C7.98744 0.32442 7.99994 0.382951 7.99994 0.444431V3.1111C7.99994 3.35657 7.80095 3.55555 7.55548 3.55555C7.31 3.55555 7.11104 3.35657 7.11104 3.1111V1.51744L3.4253 5.20317C3.33859 5.28995 3.22485 5.33332 3.11111 5.33332Z", :fill => "#31B404"} + .upload-ontology-input-field-container + = url_input(label: 'URL', name: "submission[URI]", value: @submission.URI) + .upload-ontology-input-field-container + = text_area_input(name: "submission[description]", value: @submission.description) + + - if @is_update_ontology + .upload-ontology-input-field-container + = generate_list_text_input("notes", "submission[notes]", Array(@submission.notes), label: "Change notes") + .upload-ontology-field-container + = select_input(label: "Format", name: "submission[hasOntologyLanguage]", values: ["OBO", "OWL", "SKOS", "UMLS"], selected: @submission.hasOntologyLanguage) + .upload-ontology-desc.hide + %div + SKOS vocabularies submitted to BioPortal must contain a minimum of one concept scheme and top concept assertion. Please + refer to the NCBO wiki for a more + %a{:href => "#seethewiki"} + detailed explanation + %svg{:fill => "none", :height => "8", :viewbox => "0 0 8 8", :width => "8", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M5.77776 8H1.33333C0.977156 8 0.642334 7.8613 0.390512 7.60946C0.138689 7.35762 0 7.02278 0 6.66666V2.22222C0 1.86607 0.138704 1.53124 0.390527 1.27942C0.64235 1.0276 0.977172 0.888894 1.33334 0.888894H3.11111C3.35659 0.888894 3.55556 1.08787 3.55556 1.33334C3.55556 1.57881 3.35659 1.77779 3.11111 1.77779H1.33333C1.2146 1.77779 1.10301 1.82402 1.01907 1.90795C0.935144 1.99188 0.888894 2.1035 0.888894 2.22222V6.66666C0.888894 6.78538 0.935129 6.89698 1.01907 6.98094C1.10301 7.06486 1.2146 7.11111 1.33333 7.11111H5.77775C5.89647 7.11111 6.00807 7.06487 6.09202 6.98091C6.17595 6.89698 6.22218 6.78537 6.22218 6.66664V4.88889C6.22218 4.64341 6.42117 4.44445 6.66664 4.44445C6.91212 4.44445 7.11111 4.64343 7.11111 4.88889V6.66666C7.11111 7.02281 6.9724 7.35762 6.72056 7.60947C6.46872 7.8613 6.13389 8 5.77776 8ZM3.11111 5.33332C2.99736 5.33332 2.88362 5.28994 2.79685 5.20315C2.62329 5.02959 2.62329 4.74816 2.79685 4.5746L6.48254 0.888894H4.88889C4.64341 0.888894 4.44445 0.68992 4.44445 0.444447C4.44445 0.198974 4.64341 0 4.88889 0H7.55555C7.61702 0 7.67556 0.0124825 7.72882 0.0350409C7.77851 0.0560624 7.82518 0.0865233 7.86602 0.126439L7.86605 0.12647C7.86634 0.126765 7.86664 0.127045 7.86692 0.12734C7.86699 0.127417 7.8671 0.127511 7.86718 0.127588C7.8674 0.127805 7.86765 0.128038 7.86786 0.128271C7.86802 0.128427 7.86816 0.128566 7.86831 0.128721C7.86848 0.128892 7.86867 0.129079 7.86881 0.129218C7.86912 0.129529 7.86946 0.129855 7.86977 0.130181C7.87008 0.130491 7.87042 0.130833 7.87074 0.131143C7.87091 0.131299 7.87109 0.131501 7.87122 0.13164C7.87139 0.131796 7.87151 0.131935 7.87167 0.132091C7.87191 0.132323 7.87213 0.132541 7.87235 0.132789C7.87243 0.132851 7.87254 0.13296 7.8726 0.133038C7.87289 0.133333 7.87319 0.133628 7.87347 0.133923L7.8735 0.133954C7.9134 0.174817 7.94388 0.221486 7.96488 0.271167C7.98744 0.32442 7.99994 0.382951 7.99994 0.444431V3.1111C7.99994 3.35657 7.80095 3.55555 7.55548 3.55555C7.31 3.55555 7.11104 3.35657 7.11104 3.1111V1.51744L3.4253 5.20317C3.33859 5.28995 3.22485 5.33332 3.11111 5.33332Z", :fill => "#31B404"} + with examples. + .upload-ontology-field-container.mt-3 + = select_input(name: "submission[status]", values: ["alpha", "beta", "production", "retired"], selected: @submission.status) + .upload-ontology-field-container + .mt-3.mb-2 Location + = render partial: 'ontologies/submission_location_form' + + - c.page do + .upload-ontology-input-field-container + - if @is_update_ontology + = date_input(label: 'Modification date (dd/mm/yy)', name: 'submission[modificationDate]', value: @submission.modificationDate) + - else + = date_input(label: 'Date of original creation (dd/mm/yy)', name: 'submission[released]', value: @submission.released) + .upload-ontology-contact + = render Input::InputFieldComponent.new(name:'', error_message: attribute_error(:contact)) do + = render NestedFormInputsComponent.new(object_name: "Contact") do |c| + - c.header do + - content_tag(:div, 'Contact name', class: 'w-50') + content_tag(:div, 'Contact email', class: 'w-50') + - c.template do + = content_tag(:div, class: "d-flex my-1") do + .w-50.mr-2 + = render Input::TextInputComponent.new(label: "", name: "submission[contact][NEW_RECORD][name]") + .w-50 + = render Input::TextInputComponent.new(label: "", name: "submission[contact][NEW_RECORD][email]") + - Array(@submission.contact).each_with_index do |contact, i| + - c.row do + = content_tag(:div, class: "d-flex my-1") do + .w-50.mr-2 + = render Input::TextInputComponent.new(label: "", name: "submission[contact][#{i}][name]", value: contact["name"]) + .w-50 + = render Input::TextInputComponent.new(label: "", name: "submission[contact][#{i}][email]", value: contact["email"]) :javascript - function hideAllRestrictions() { - jQuery(".viewing_restriction_disabled").attr("disabled", true); - jQuery("div.viewing_restriction_types").addClass("hidden"); - } - - function showRestrictionPrivate() { - jQuery("#ontology_acl").removeAttr("disabled"); - jQuery("#viewingRestrictionsPrivate").removeClass("hidden"); - } - - function showRestrictionLicensed() { - jQuery("#ontology_licenseInformation").removeAttr("disabled"); - jQuery("#viewingRestrictionsLicensed").removeClass("hidden"); - } - jQuery(document).data().bp.acronyms = #{raw LinkedData::Client::Models::Ontology.all.map {|o| o.acronym}.to_json}; + function showPrivateAclSelect() { + const visibilityGroupDiv = document.getElementById('visibility-group'); + // Get the selected value from the select element + const selectElement = document.getElementById('select_ontology[viewingRestriction]'); + const selectedValue = selectElement.value; - jQuery(document).ready(function(){ - // Wire up options for restriction how an ontology is viewed - jQuery("#ontology_viewingRestriction").change(function(){ - var select = jQuery(this); - if (select.val() == "private") { - hideAllRestrictions() - showRestrictionPrivate(); - } else if (select.val() == "licensed") { - hideAllRestrictions(); - showRestrictionLicensed(); - } else if (select.val() == "public") { - hideAllRestrictions(); - } - }); - // Make sure you can see the account select if the select list has private selected - if (jQuery("#ontology_viewingRestriction").val() == "private") { - showRestrictionPrivate(); - } else if (jQuery("#ontology_viewingRestriction").val() == "licensed") { - showRestrictionLicensed(); + // Check if the selected value is "private" + if (selectedValue === 'private') { + // If it's "private", show the visibility-group div + visibilityGroupDiv.style.display = 'block'; + } else { + // If it's not "private", hide the visibility-group div + visibilityGroupDiv.style.display = 'none'; } + } + const parentDiv = document.getElementById('visibilityContainer'); + parentDiv.addEventListener('change', () => { showPrivateAclSelect() }); + - jQuery("#ontology_isView").live("click", function(){ - console.log(jQuery("#ontology_isView").is(":checked")) + jQuery("#ontology_isView").live("click", function(){ if (jQuery("#ontology_isView").is(":checked")) { - jQuery("#ontology_viewOf").removeAttr('disabled').trigger("liszt:updated"); + jQuery("#ontology_viewOf").removeAttr('disabled').show(); } else { - jQuery("#ontology_viewOf").attr('disabled', true).trigger("liszt:updated"); + jQuery("#ontology_viewOf").attr('disabled', true).hide(); } - }); - - // Wire up chosen selectors - jQuery("#ontology_administeredBy").chosen(); - jQuery("#ontology_acl").chosen(); - jQuery("#ontology_hasDomain").chosen(); - jQuery("#ontology_group").chosen(); - - // Make acronym upcase as you type - jQuery("#ontology_acronym").on('input', function(e) { - var input = $(this); - var start = input[0].selectionStart; - $(this).val(function (_, val) { - return val.toUpperCase(); - }); - input[0].selectionStart = input[0].selectionEnd = start; - }); - - // Check acronym as you type - jQuery("#ontology_acronym").on('input', function(e) { - var $this = $(this); - var errors = []; - var errorHTML = ""; - - if ($this.val().match("^[^a-z^A-Z]{1}")) { - errors.push("Acronym must start with a letter"); - } - - if ($this.val().match("[^-_0-9a-zA-Z]")) { - errors.push("Acronym must only contain the folowing characters: -, _, letters, and numbers"); - } - - if ($this.val().match(".{17,}")) { - errors.push("Acronym must be sixteen characters or less"); - } - - if (jQuery(document).data().bp.acronyms.indexOf($this.val()) !== -1) { - errors.push("Acronym already in use"); - } - - if (errors.length > 0) { - errorHTML = "
  • " + errors.join("
  • ") + "
  • "; - } - - jQuery("#acronym_errors").html(errorHTML); - }); - - jQuery("#ontologyForm").validate({ - errorClass: "ontologyFormError", - errorElement: "div", - rules: { - "ontology[name]": "required", - "ontology[acronym]": "required", - }, - messages: { - "ontology[name]": "Please enter a name", - "ontology[acronym]": "Please enter an acronym", - }, - }); - }); - -:css - div.ontologyFormError { - color: red; - padding-top: 3px; - } - -- unless @errors.nil? - .enable-lists{:style => "color:red;"} - %strong Errors On Form - %ul - - if @errors[:error].instance_of? OpenStruct - - errors = @errors[:error].to_h - - errors.delete :links - - errors.delete :context - - errors.to_h.each do |errors_field, error| - - next if error.nil? - - %li - - if error.instance_of? OpenStruct - - error_hash = error.to_h - - error_hash.delete :links - - error_hash.delete :context - - error_hash.each do |error_type, e| - = "#{error_type} : #{e}" - - else - = errors_field - - else - -# A generic fallback - = @errors.to_json - -%div.p-5 - %div - %h1 - #{title_text} - - %div.p-5.card - %small.asterik.mb-2.text-right - * fields are required - %div.form-row - %div.form-group.col-md-6 - = f.label :name, "Name" - %span.asterik * - = f.text_field :name, value: @ontology.name, class:"form-control" - %div.form-group.col-md-3 - = f.label :acronym, "Acronym" - %span.asterik * - - acronym_enabled = @ontology.acronym.nil? || ! @errors.nil? - = f.text_field(:acronym, value: @ontology.acronym, :disabled => ! acronym_enabled, data: { acronyms: acronyms(@ontologies) }, class:"form-control") - %ul#acronym_errors.enable-lists{style: "color: red; padding: 3px;"} - %div.form-group.col-md-3 - %div - - viewing_help = "Public ontologies; will be accessible to everyone via UI and API. Download can be desactivated on demand.
    Private ontologies; are only accessible via UI and API to logged users listed explicitly." - = f.label :viewingRestriction do - = render partial: "shared/ui-component/label_with_help", locals:{help_text: viewing_help, id:"viewing_tooltip" ,label: "Viewing Restriction"} - - view_restiction_options = [["Public", "public"], ["Private", "private"]] - - selected = @ontology.private? ? "private" : "" - - selected = @ontology.licensed? ? "licensed" : selected - - display_private = @ontology.private? ? "" : "hidden" - - display_licensed = @ontology.licensed? ? "" : "hidden" - = f.select :viewingRestriction, view_restiction_options, { :selected => selected }, class:"form-control" - - %div.form-row - #viewingRestrictionsPrivate.form-group.col.viewing_restriction_types{class: display_private} - = f.label :acl do - Add or remove accounts that are allowed to view classes in this ontology using the account name - = f.select(:acl, @user_select_list, {include_blank: true, selected: @ontology.acl}, {multiple: true, :"data-placeholder" => "Select users who have access", class:"form-control"}) - %div.form-row - %div#viewingRestrictionsLicensed.form-group.col.viewing_restriction_types{class: display_licensed} - = f.label :licenseInformation do - %b License Text: - The text below explains what licensing information you want to collect before allowing access. We will display this text and record the user's response when the user attempts to access your ontology. - - disabled = @ontology.licensed? ? {} : {:disabled => "true"} - = f.text_area :licenseInformation, { :rows => 5, :class => "viewing_restriction_disabled form-control", :style => "width: 90%;" }.merge(disabled) - - %div.form-row.form-group - %div.col-md-1 - = f.label :administeredBy, "Administrators", class:" col-form-label" - %span.asterik * - %div.col-md-11 - = f.select(:administeredBy, @user_select_list ,{selected: @ontology.administeredBy || session[:user].id}, {multiple: true, :"data-placeholder" => "Select administrators", class:"form-control"}) - %div.form-group.row - %div.col-md-1 - = f.label :hasDomain, "Categories", class:"col-form-label" - %div.col-md-11 - - cat_select = @categories.sort{|a,b| a.name <=> b.name}.map{|c| [c.name, c.id]} - = f.hidden_field(:hasDomain, {value: "", id: "ontology_hasDomain_empty_select_hack", name: "ontology[hasDomain][]"}) - = f.select(:hasDomain, cat_select, {selected: @ontology.hasDomain}, {multiple: true, :"data-placeholder" => "Select category (domain)", class:"form-control"}) - %div.form-group.row - %div.col-md-1 - = f.label :group, "Groups", class:"col-form-label" - %div.col-md-11 - - group_select = @groups.sort{|a,b| a.name <=> b.name}.map{|c| [c.name, c.id]} - = f.hidden_field(:group, {value: "", id: "ontology_group_empty_select_hack", name: "ontology[group][]"}) - = f.select(:group, group_select, {selected: @ontology.group}, {multiple: true, :"data-placeholder" => "Select group", class:"form-control"}) - %div.form-row - %div.from-group.col-md-6 - = f.label :isView, "This ontology is a view of:" - = f.check_box :isView, checked: @ontology.view? - %div#viewOf_picker.row.form-group - - single_picker_locals = {:picker_id => "ontology_viewOf", placeholder: "Select an ontology to create a view on", field_name: "viewOf", disabled: !@ontology.view?, selected: @ontology.viewOf} - = render :partial => "shared/ontology_picker_single", :locals => single_picker_locals - %div.form-row - %div.from-group.col-md-6 - = f.label :subscribe_notifications, "Subscribe to email notifications for new notes" - = f.check_box :subscribe_notifications - - %div.d-flex.justify-content-center - = submit_tag "Cancel", formnovalidate: "formnovalidate", class: "btn btn-secondary mx-1 col-2" - = submit_tag button_text, class: "btn btn-primary mx-1 col-2" + }); \ No newline at end of file diff --git a/app/views/ontologies/_submission_location_form.html.haml b/app/views/ontologies/_submission_location_form.html.haml new file mode 100644 index 000000000..4fbdc2b24 --- /dev/null +++ b/app/views/ontologies/_submission_location_form.html.haml @@ -0,0 +1,49 @@ +.location-choice + %input{type: "radio", name: "submission[isRemote]", value: "3", id: "metadata_only", onchange: "displayMetadataOnlyForm()"} + %label.title{for: "metadata_only"} + Metadata only (No file) +.upload-ontology-desc.mb-2 + Allow users to view and search your ontology metadata, but not its classes and properties. +#metadata-only-form.d-none +.location-choice + %input{type: "radio", name: "submission[isRemote]", value: "1", id: "load_from_url", onchange: "displayUrlForm()"} + %label.title{for: "load_from_url"} + Load from URL +.upload-ontology-desc.mb-1 + New versions loaded on a nightly basis. +#url-form.d-none + = render Input::UrlComponent.new(label: "", name: "submission[pullLocation]") +.location-choice.mb-3.mt-3 + %input{type: "radio", name: "submission[isRemote]", value: "0", id: "upload_local_file", checked: true, onchange: "displayLocalFileForm()"} + %label.title{for: "upload_local_file"} + Upload local file +#local-file-form + = render Input::FileInputComponent.new(name: "submission[filePath]") + + +:javascript + const MetadataOnlyForm = document.getElementById("metadata-only-form"); + const UrlForm = document.getElementById("url-form"); + const LocalFileForm = document.getElementById("local-file-form"); + + const displayForm = (formElement) => { + [MetadataOnlyForm, UrlForm, LocalFileForm].forEach((form) => { + if (form === formElement) { + form.classList.remove("d-none"); + } else { + form.classList.add("d-none"); + } + }); + }; + + const displayMetadataOnlyForm = () => { + displayForm(MetadataOnlyForm); + }; + + const displayUrlForm = () => { + displayForm(UrlForm); + }; + + const displayLocalFileForm = () => { + displayForm(LocalFileForm); + }; diff --git a/app/views/ontologies/edit.html.haml b/app/views/ontologies/edit.html.haml index edaa0d654..ef1fd0f78 100644 --- a/app/views/ontologies/edit.html.haml +++ b/app/views/ontologies/edit.html.haml @@ -1,5 +1,5 @@ - @title = "Edit Ontology Information" %div{:style => "margin:10px;"} - = form_for :ontology, url: ontology_path(@ontology.acronym), html: {method: :put, id: "ontologyForm"} do |f| + = form_for :ontology, url: ontology_path(@ontology.acronym), html: {method: :put, id: "ontologyForm", multipart: true} do |f| = render partial: "form", locals: {f: f, button_text: "Save ontology", title_text: "Edit Ontology Information"} diff --git a/app/views/ontologies/new.html.haml b/app/views/ontologies/new.html.haml index a8bdab8e0..29a66b45e 100644 --- a/app/views/ontologies/new.html.haml +++ b/app/views/ontologies/new.html.haml @@ -1,5 +1,5 @@ - @title = "Submit New Ontology" %div{:style => "margin:10px;"} - = form_for :ontology, url: {action: "create"}, html: {id: "ontologyForm"} do |f| - = render partial: "form", locals: {f: f} + = form_for :ontology, url: {action: "create"}, html: {id: "ontologyForm", multipart: true} do |f| + = render partial: "ontologies/form", locals: {f: f} diff --git a/app/views/shared/_ontology_picker_single.html.erb b/app/views/shared/_ontology_picker_single.html.erb index 53e2b4f9d..1883ce904 100644 --- a/app/views/shared/_ontology_picker_single.html.erb +++ b/app/views/shared/_ontology_picker_single.html.erb @@ -25,6 +25,6 @@
    - <%= select object_name, field_name, @onts_for_select, { :include_blank => true, :selected => selected }, :id => picker_id, :class => "ontology_picker_single form-control", "data-placeholder".to_sym => placeholder, disabled: disabled %> + <%= render Input::SelectComponent.new(label: placeholder, name: "#{object_name}[#{field_name}]", value: @onts_for_select, selected: selected) %>
    diff --git a/app/views/submissions/new.html.haml b/app/views/submissions/new.html.haml index d6413ca0a..82e77242e 100644 --- a/app/views/submissions/new.html.haml +++ b/app/views/submissions/new.html.haml @@ -1,9 +1,2 @@ -- @title = "Add new ontology submission" - -%div.py-4.py-md-5 - %h3.text-center.mb-4 - Add new submission - - if !(@submission.ontology.nil? || (@submission.ontology.is_a? String)) - %small.text-muted for #{@submission.ontology.acronym} - = form_for :submission, url: {action: "create"}, html: {id: "ontology_submission_form", multipart: true, 'data-turbo': true} do |f| - = render partial: "form", locals: {f: f, button_text: "Add submission"} += form_for :submission, url: {action: "create"}, html: {id: "ontology_submission_form", multipart: true} do |f| + = render partial: "ontologies/form", locals: {f: f, button_text: "Add submission"} \ No newline at end of file From 63bb857e600861b0489e390e71b1a329aac7dfea Mon Sep 17 00:00:00 2001 From: DJEBABRIA Hiba <59914426+hibadjebabria169@users.noreply.github.com> Date: Mon, 28 Aug 2023 13:45:57 +0200 Subject: [PATCH 479/533] Feature: Update summary page design (#244) * re-style persons and organizations section * add safety parameter to metrics variables * re-style identifiers bloc * relocate the projects sections with visits * modify the table of verisons' name to submissions * add the condition to the fair score bloc for logged in and non logged in users * remove contact title * remove creation text from the general information bloc * remove unecessary containers * remove the title " versions" * remove the unecessary code * remove the links bloc to replace it with the identifiers * relocate the methodology bloc * remove projects bloc and relocate it * remove duplicated code * remove static code from the competency question variable * add the date array * add the date array to show the dates section * update Gemfile.lock file * add keywords and keyclasses containers * remove unecessary margins * add the style to modal component * add the function " show dates " to ontologies controllers * remove the duplicated fair score title * remove released column from the submissions table * add prettier file * fix components index style typo issue * add pull url section in summary if user is an the ontology admin * implement projects section in the summary page * fix an issue in the alert message component not showing the content * add circle progress bar component * override bootstrap text-primary color * add submission metadata component * update summary additional metadata content to show all the attributes * add stimulus read more to package.json * show corresponding lang in the tree view * remove audience from aditionnal metadata * add download links array to the download_link function * update the summary page css * re-style the submissions table in the summary page * update the contact and release date information * chnage categories and domains to categories and subjects * remove the old contact information * change the identifier bloc to an open one * add dates bloc to summary page * add the json entry to the links bloc * add projects variables * add methodology bloc * remove visits bloc to relocate it * relocate the visits bloc * add views bloc to the summary page * Show data in platform language when lang is equal to 'all' * fix sort_by in collections and schemes * make the summary two columns bigger * hide the fair score section if not enabled or ontology is AGROVOC * make sub.publication iterable * use tooltip to show language in concept tree links * re-style the fair-score bloc with the new design * re-style fair-score bloc * Auto stash before merge of "feature/update-summary-page-design" and "origin/feature/update-summary-page-design" * re-locate the logo in the summary page * chnage additionnal metadata modal title to all metadata * align the general information and the logo * add function show-category-name to domains section * add summary page dropdown component * add summary section component * extract summary page section to partials * use display_in_multiple_languges methode to show properties in multiple langs * add tooltips to show language in tree view * change 'process_concept' method name to 'language_hash' * define 'display_in_multiple_languages' method * use 'langauge_hash' methode in collection instead of 'process_concept' * cls_id to string * use 'langauge_hash' methode in schemes instead of 'process_concept' * update tooltip controller to support position * use 'langauge_hash' methode in _list_view instead of 'process_concept' * use 'display_in_multiple_languges' to display properties * fix missing 'end' in application helper * display_in_multiple_languges in schemes * fix language_hash method name typo * check if prefLabel is nil * use tooltip to show preLabel lang in schemes * use tooltip to show preLabel lang in collections * use tooltip in collection * fix a typo display_in_multiple_languages function name * extract link_to_scheme helper for schemes tree view * extract helpers to display the collections list view * refactor language related helpers code in application_helper * add language argument to scheme and collection tree links * refactor scheme and collection helpers to make it work for mutli-langs * move submission_metadata into the application helper * extract summary page section to partials * make the summary page responsive * disable summary ontology relation network mouse zoom in/out * move fairness, submission & metrics sections of summary page to bottom * make the submissions table borderless * move see all metadata button to the summary description section bottom * update the usage of the DropdownContainer Component in summary page * fix summary ontology relation network height * use the correct submission description value instead of a placeholder * make the keyClasses of type link clickable * hide Categories and subjects of the summary page if nil or empty * migrate additional_metadata helper to SubmissionMetadataComponent * update Gemfile.lock * remove container fluid for the appliance layout * fix top_nav responsiveness width * fix design on summary page css * update fair score bloc * remove third row section in summary page * Update Fair Score score section * Add persons and organizations variables * fix summary page inline SVG icons * add natural language to the summary page description * hide ontology hasDomain if empty in the summary page * update summary page to make it work for the new keyclasses attribute * Add link component to identifiers section on the summary page * Add css to the identiders section' attributes * updates vis's * update chips button component to have optional html attributes * fix language field to show the lexvo URL if not matched * make label ajax link component use the ChipsButton component * show the go to API in the top let of the ontology viewer * remove the duplicate get_link_for_cls_ajax helper * update keywords section in the summary to use get_link_for_cls_ajax * add show_licences method * add licenses modal file * add licenses modal * put value as nil by default * add condition to license modal * add show license method to ontoloies controller * add or operation to value and content * make field container use content if given value is nil * fix summary fair score not showing because the controller was removed * fix submission edit page container layout * fix topnav raising an issue when session does not contain ontologies * unify the usage of submission_metadata everywhere * use concept_link helper in the concept show view * use ChipButton component for person & organization in summary page * fix field_container margin if using content not the given value * migrate projects and usage information summary section to use components * Remove maring in the class ontology-details-tabs * fix ontology header responsiveness issues * fix ontology-details-header-layout * fix ontology details tabs layout * fix summary page layout * fix summary page responsiveness issues * add metrics evolution popup in the summary page * fix summary page creators input margin bottom in summary page * fix submissions table dropdown button white space * Revert "Merge branch 'feature/update-browse-page-design' into stage" This reverts commit 5bffb8c6cc7f4ccdeb23babd5df7a0a7ae016252. * Revert "Merge remote-tracking branch 'refs/remotes/origin/feature/support-multilingual-part-2'" * Remove line 56/57 from .gitignore file * Delete .prettierrc * Delete depiction.svg * Delete github.svg * Delete test_visits.svg * Delete openUp.svg * add depiction section partial * add depiction section partial * Add identifier partial section * Add visits partial * Add all projects partial * add projects partial * Add views partial * Add height line on the chip button * Add condition to versionIRI prop * update chip button * Add properties tables to the ontology controller * Use partials and properties on the summary page * fix bug on the fair score section * add conditions to identifiers * add metrics evolution popup in the summary page * Merge branch 'development' into feature/update-summary-page-design * fix summary page creators input margin bottom in summary page * fix submissions table dropdown button white space * Revert "Merge branch 'feature/update-browse-page-design' into stage" This reverts commit 5bffb8c6cc7f4ccdeb23babd5df7a0a7ae016252. * Revert "Merge remote-tracking branch 'refs/remotes/origin/feature/support-multilingual-part-2'" * remove the summary logo placeholder image * fix the drodown button color * fix summary page css * add the tooltip to the dropwon container * add condition to the tooltip usage * fix the field container component * include ApplicationHelper to the summary section component * add the info_tooltip to the card tiltle * add the info_tooltip function to the application helper * add the tooltip to the submission helper * add the tooltip to components on the summary page * add tooltip info to project section * add condition to the icons on the general information section * add tooltip infot to identifiers section * create props array to the projects section * refactor the project section * fix the visits section download arrow * add tootlip to summary page * add ontology viewer style file , for tabs responsiveness * fix a min width for the concept browser * replace open-popup icon with popup-link icon * remove no more used partials in the summary page * migrate submission table to use Table component * clean summary style file and use new icons for ontology relation graph * remove no more used show_depiction and info_tooltip code * fix concept details raw section title padding * use action link slot for summary fairness and submissions sections * update fair score partial design * use component and helpers in summary page partials * migrate submission metadata component to use table component and display_attributes helper * simplify summary ontology_relations_data code * reverse metrics evolution data to have its chart in the right direction * migrate ontology relation network filter to use select input component * remove no more used icons in summary page * simplify ontologies controller summary action by using submission_metadata helper * put again methods used by the index action * handle ontologies with no submission summary page * put temporary help message in summary page section --------- Co-authored-by: Syphax Bouazzouni Co-authored-by: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> --- .gitignore | 3 +- Gemfile.lock | 49 +- app/assets/images/icons/circle-down.svg | 4 + app/assets/images/icons/circle-left.svg | 4 + app/assets/images/icons/circle-right.svg | 4 + app/assets/images/icons/circle-up.svg | 4 + app/assets/images/icons/zoom-center.svg | 4 + app/assets/images/icons/zoom-in.svg | 4 + app/assets/images/icons/zoom-out.svg | 4 + app/assets/images/summary/documentation.svg | 1 + app/assets/images/summary/download.svg | 1 + app/assets/images/summary/homepage.svg | 1 + app/assets/images/summary/sparql.svg | 11 + .../stylesheets/application.css.scss.erb | 1 + .../components/concept_details.scss | 2 - app/assets/stylesheets/ontologies.scss | 5 +- app/assets/stylesheets/summary.scss.erb | 213 + .../dropdown_container_component.rb | 1 + app/components/language_field_component.rb | 17 +- .../language_field_component.html.haml | 2 +- .../submission_metadata_component.rb | 52 + .../submission_metadata_component.html.haml | 18 + app/controllers/application_controller.rb | 10 +- app/controllers/ontologies_controller.rb | 105 +- .../ontologies_metadata_curator_controller.rb | 2 +- app/helpers/agent_helper.rb | 2 + app/helpers/application_helper.rb | 24 +- app/helpers/mappings_helper.rb | 20 - app/helpers/metadata_helper.rb | 77 + app/helpers/ontologies_helper.rb | 329 +- app/helpers/submissions_helper.rb | 10 +- app/javascript/controllers/application.js | 2 + app/javascript/controllers/index.js | 4 + .../metadata_downloader_controller.js | 2 +- .../ontology_relations_network_controller.js | 169 + .../controllers/tooltip_controller.js | 4 +- .../fair_score/_fair_service_header.html.haml | 5 +- app/views/home/index.html.haml | 20 +- app/views/layouts/appliance.html.haml | 2 +- .../layouts/ontology_viewer/_header.html.haml | 4 +- app/views/ontologies/_fairs_score.html.haml | 19 +- .../ontologies/_ontology_views.html.haml | 8 + app/views/ontologies/_visits.html.haml | 2 +- .../sections/_additional_metadata.html.haml | 18 + .../ontologies/sections/_licenses.html.haml | 13 +- .../ontologies/sections/_metadata.html.haml | 233 +- .../_metrics_evolution_graph.html.haml | 26 + .../_ontology_description_section.html.haml | 53 + .../_ontology_fairness_section.html.haml | 15 + .../_ontology_metrics_section.html.haml | 15 + .../_ontology_relations_network.html.haml | 13 + .../_ontology_submissions_section.html.haml | 10 + app/views/submissions/_form_content.html.haml | 22 +- app/views/submissions/_submissions.html.haml | 77 +- config/routes.rb | 2 + package.json | 7 +- public/browse/font/webhostinghub-glyphs.eot | Bin public/browse/font/webhostinghub-glyphs.ttf | Bin public/browse/font/whhg.css | 4170 ++++++++--------- yarn.lock | 52 +- 60 files changed, 3265 insertions(+), 2686 deletions(-) create mode 100644 app/assets/images/icons/circle-down.svg create mode 100644 app/assets/images/icons/circle-left.svg create mode 100644 app/assets/images/icons/circle-right.svg create mode 100644 app/assets/images/icons/circle-up.svg create mode 100644 app/assets/images/icons/zoom-center.svg create mode 100644 app/assets/images/icons/zoom-in.svg create mode 100644 app/assets/images/icons/zoom-out.svg create mode 100644 app/assets/images/summary/documentation.svg create mode 100644 app/assets/images/summary/download.svg create mode 100644 app/assets/images/summary/homepage.svg create mode 100644 app/assets/images/summary/sparql.svg create mode 100644 app/assets/stylesheets/summary.scss.erb create mode 100644 app/components/submission_metadata_component.rb create mode 100644 app/components/submission_metadata_component/submission_metadata_component.html.haml create mode 100644 app/helpers/metadata_helper.rb create mode 100644 app/javascript/controllers/ontology_relations_network_controller.js create mode 100644 app/views/ontologies/_ontology_views.html.haml create mode 100644 app/views/ontologies/sections/_additional_metadata.html.haml mode change 100644 => 100755 app/views/ontologies/sections/_metadata.html.haml create mode 100644 app/views/ontologies/sections/metadata/_metrics_evolution_graph.html.haml create mode 100644 app/views/ontologies/sections/metadata/_ontology_description_section.html.haml create mode 100644 app/views/ontologies/sections/metadata/_ontology_fairness_section.html.haml create mode 100644 app/views/ontologies/sections/metadata/_ontology_metrics_section.html.haml create mode 100644 app/views/ontologies/sections/metadata/_ontology_relations_network.html.haml create mode 100644 app/views/ontologies/sections/metadata/_ontology_submissions_section.html.haml mode change 100755 => 100644 public/browse/font/webhostinghub-glyphs.eot mode change 100755 => 100644 public/browse/font/webhostinghub-glyphs.ttf mode change 100755 => 100644 public/browse/font/whhg.css diff --git a/.gitignore b/.gitignore index 4ce7bb4e4..06f40b993 100644 --- a/.gitignore +++ b/.gitignore @@ -54,5 +54,4 @@ docker-sync.yml /config/credentials/development.key /config/credentials/test.key /config/credentials/staging.key -/config/credentials/appliance.key - +/config/credentials/appliance.key \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 6e4f2b162..7d7448cc4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM flamegraph (0.9.5) globalid (1.1.0) activesupport (>= 5.0) - graphql (2.0.24) + graphql (2.0.25) graphql-client (0.18.0) activesupport (>= 3.0) graphql @@ -239,7 +239,7 @@ GEM marcel (1.0.2) matrix (0.4.2) method_source (1.0.0) - mime-types (3.4.1) + mime-types (3.5.0) mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) mini_mime (1.1.2) @@ -269,6 +269,9 @@ GEM netrc (0.11.0) newrelic_rpm (9.3.1) nio4r (2.5.9) + nokogiri (1.15.3) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.15.3-x86_64-darwin) racc (~> 1.4) nokogiri (1.15.3-x86_64-linux) @@ -280,30 +283,32 @@ GEM multi_xml (~> 0.5) rack (>= 1.2, < 4) oj (3.15.1) - omniauth (1.9.2) + omniauth (2.1.1) hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) - omniauth-github (1.4.0) - omniauth (~> 1.5) - omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.8.2) + rack (>= 2.2.3) + rack-protection + omniauth-github (2.0.0) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.7.1) + omniauth-google-oauth2 (1.0.1) jwt (>= 2.0) oauth2 (~> 1.1) - omniauth (~> 1.1) - omniauth-oauth2 (>= 1.6) - omniauth-keycloak (1.2.1) - json-jwt (~> 1.12) - omniauth (~> 1.9.0) - omniauth-oauth2 (~> 1.6.0) - omniauth-oauth2 (1.6.0) - oauth2 (~> 1.1) - omniauth (~> 1.9) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.7.1) + omniauth-keycloak (1.5.1) + faraday + json-jwt (> 1.13.0) + omniauth (>= 2.0) + omniauth-oauth2 (~> 1.7.1) + omniauth-oauth2 (1.7.3) + oauth2 (>= 1.4, < 3) + omniauth (>= 1.9, < 3) omniauth-orcid (2.1.1) omniauth-oauth2 (~> 1.3) ruby_dig (~> 0.0.2) - omniauth-rails_csrf_protection (0.1.2) + omniauth-rails_csrf_protection (1.0.1) actionpack (>= 4.2) - omniauth (>= 1.3.1) + omniauth (~> 2.0) open_uri_redirections (0.2.1) parallel (1.23.0) parser (3.2.2.3) @@ -323,6 +328,8 @@ GEM rack (>= 0.4) rack-mini-profiler (3.1.1) rack (>= 1.2.0) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) rails (7.0.3) @@ -441,7 +448,7 @@ GEM net-scp (>= 1.1.2) net-ssh (>= 2.8.0) stackprof (0.2.25) - stimulus-rails (1.2.1) + stimulus-rails (1.2.2) railties (>= 6.0.0) temple (0.10.2) terser (1.1.17) @@ -572,4 +579,4 @@ DEPENDENCIES will_paginate (~> 3.0) BUNDLED WITH - 2.4.12 + 2.1.4 diff --git a/app/assets/images/icons/circle-down.svg b/app/assets/images/icons/circle-down.svg new file mode 100644 index 000000000..a230b0565 --- /dev/null +++ b/app/assets/images/icons/circle-down.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/app/assets/images/icons/circle-left.svg b/app/assets/images/icons/circle-left.svg new file mode 100644 index 000000000..45a2739be --- /dev/null +++ b/app/assets/images/icons/circle-left.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/app/assets/images/icons/circle-right.svg b/app/assets/images/icons/circle-right.svg new file mode 100644 index 000000000..f77ce5fb8 --- /dev/null +++ b/app/assets/images/icons/circle-right.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/app/assets/images/icons/circle-up.svg b/app/assets/images/icons/circle-up.svg new file mode 100644 index 000000000..30d084681 --- /dev/null +++ b/app/assets/images/icons/circle-up.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/app/assets/images/icons/zoom-center.svg b/app/assets/images/icons/zoom-center.svg new file mode 100644 index 000000000..8cdd83939 --- /dev/null +++ b/app/assets/images/icons/zoom-center.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/app/assets/images/icons/zoom-in.svg b/app/assets/images/icons/zoom-in.svg new file mode 100644 index 000000000..9d91d0541 --- /dev/null +++ b/app/assets/images/icons/zoom-in.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/app/assets/images/icons/zoom-out.svg b/app/assets/images/icons/zoom-out.svg new file mode 100644 index 000000000..58f33bebb --- /dev/null +++ b/app/assets/images/icons/zoom-out.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/app/assets/images/summary/documentation.svg b/app/assets/images/summary/documentation.svg new file mode 100644 index 000000000..826e62cc5 --- /dev/null +++ b/app/assets/images/summary/documentation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/summary/download.svg b/app/assets/images/summary/download.svg new file mode 100644 index 000000000..3af86ed8a --- /dev/null +++ b/app/assets/images/summary/download.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/summary/homepage.svg b/app/assets/images/summary/homepage.svg new file mode 100644 index 000000000..4df669b75 --- /dev/null +++ b/app/assets/images/summary/homepage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/summary/sparql.svg b/app/assets/images/summary/sparql.svg new file mode 100644 index 000000000..c2cda9582 --- /dev/null +++ b/app/assets/images/summary/sparql.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index e509a4f5d..7152e9a2a 100755 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -21,6 +21,7 @@ *= require select2 *= require trumbowyg *= require theme-variables + *= require summary */ /* BioPortal */ diff --git a/app/assets/stylesheets/components/concept_details.scss b/app/assets/stylesheets/components/concept_details.scss index 7ae6fef43..28b1b92cf 100644 --- a/app/assets/stylesheets/components/concept_details.scss +++ b/app/assets/stylesheets/components/concept_details.scss @@ -1,6 +1,4 @@ - .concept_details_component .raw-table .dropdown-title-bar p { - padding: 10px 0px; color: rgb(136, 136, 136); font-weight: 400; } diff --git a/app/assets/stylesheets/ontologies.scss b/app/assets/stylesheets/ontologies.scss index 41edd683d..19cfad023 100644 --- a/app/assets/stylesheets/ontologies.scss +++ b/app/assets/stylesheets/ontologies.scss @@ -158,10 +158,7 @@ $ont-show-bg-color: #e9ecef; } } -#ontology_versions td.show_more_subs { - text-align: right; - background-color: white; -} + /************************************ /* Classes pane diff --git a/app/assets/stylesheets/summary.scss.erb b/app/assets/stylesheets/summary.scss.erb new file mode 100644 index 000000000..e3f6adbdd --- /dev/null +++ b/app/assets/stylesheets/summary.scss.erb @@ -0,0 +1,213 @@ +.summary-page-center { + display: flex; + justify-content: center; + flex-wrap: wrap; +} + +.summary-page-first-row { + width: 670px; + margin-right: 20px; +} + +.summary-page-second-row { + width: 450px; +} + +@media (max-width: 1288px) { + .summary-page-first-row { + width: 100%; + margin: 0; + padding: 0 20px; + } + .summary-page-second-row { + width: 100%; + margin: 0; + padding: 0 20px; + } +} + +.show > .btn-outline-primary.dropdown-toggle { + background-color: var(--primary-color) !important; + color: white !important; +} + + +.description_text, +.description_text a { + color: #888888 !important; + font-size: 15px; + overflow: hidden; + margin-bottom: 0; + flex: 1; + min-width: 500px; +} + + +.creation_info { + display: flex; + flex-wrap: wrap; + align-items: center; +} + + + +.date_creation_text { + color: #888888; + font-size: 14px; + font-weight: 550; + margin-top: 15px; + margin-right: 5px; + margin-left: 5px; +} + +.creator_text { + color: #888888; + font-size: 14px; + margin-left: 5px; + font-weight: 550; + margin-top: 15px; + width: 300px; +} + +.creation_text { + color: #888888; + font-size: 14px; + margin-left: 1px; + margin-top: 15px; + margin-right: 2px; +} + + +.icons_container { + margin-top: 10px; + justify-content: space-evenly; + display: flex; + padding: 0 20px; + svg path { + fill: var(--primary-color); + } +} + + + +.disabled-icon svg path { + fill: rgba(0, 0, 0, 0.1); +} + +.normal_text { + font-size: 15px; + color: black; + word-wrap: break-word; +} + + + +.metrics { + display: flex; + justify-content: space-between; +} + +.metrics-container { + border-radius: 8px; + height: 90px; + box-shadow: 2px 0px 60px rgba(0, 0, 0, 0.1); + padding: 71px 40px; + margin-top: 10px; +} + +.metrics-container > div { + display: flex; + align-items: center; + margin-bottom: 20px; +} + +.metrics-container > div > p { + font-size: 20px; + font-weight: 600; + margin-left: 18px; +} + +.metrics-item { + display: flex; + align-items: center; +} + +.metrics-item hr { + height: 73px; + width: 0px; + border: 2px solid var(--primary-color); + border-radius: 5px; + margin-right: 15px; +} + +.metrics-item h4 { + font-size: 30px; + font-weight: 600; + line-height: 1.2; + color: #000000; +} + +.metrics-item p, +.metrics-item a { + font-size: 18px; + font-weight: 400; +} + + +#ontology_versions .show_more_subs td { + text-align: right; +} + + + +div.vis-network div.vis-navigation { + div.vis-button.vis-up{ + background-color: var(--primary-color); + -webkit-mask-image: url(asset-path('icons/circle-up.svg')); + mask-image: url(asset-path('icons/circle-up.svg')); + background-image: none !important; + } + div.vis-button.vis-down{ + background-color: var(--primary-color); + -webkit-mask-image: url(asset-path('icons/circle-down.svg')); + mask-image: url(asset-path('icons/circle-down.svg')); + background-image: none !important; + } + + div.vis-button.vis-left{ + background-color: var(--primary-color); + -webkit-mask-image: url(asset-path('icons/circle-left.svg')); + mask-image: url(asset-path('icons/circle-left.svg')); + background-image: none !important; + } + + div.vis-button.vis-right{ + background-color: var(--primary-color); + -webkit-mask-image: url(asset-path('icons/circle-right.svg')); + mask-image: url(asset-path('icons/circle-right.svg')); + background-image: none !important; + } + + div.vis-button.vis-zoomIn{ + background-color: var(--primary-color); + -webkit-mask-image: url(asset-path('icons/zoom-in.svg')); + mask-image: url(asset-path('icons/zoom-in.svg')); + background-image: none !important; + } + + div.vis-button.vis-zoomOut{ + background-color: var(--primary-color); + -webkit-mask-image: url(asset-path('icons/zoom-out.svg')); + mask-image: url(asset-path('icons/zoom-out.svg')); + background-image: none !important; + } + + div.vis-button.vis-zoomExtends{ + background-color: var(--primary-color); + -webkit-mask-image: url(asset-path('icons/zoom-center.svg')); + mask-image: url(asset-path('icons/zoom-center.svg')); + background-image: none !important; + } +} + + diff --git a/app/components/dropdown_container_component.rb b/app/components/dropdown_container_component.rb index 897d708b9..3d785f85e 100644 --- a/app/components/dropdown_container_component.rb +++ b/app/components/dropdown_container_component.rb @@ -6,5 +6,6 @@ def initialize(title:, id:, tooltip:nil) super @title = title @id = id + @tooltip = tooltip end end diff --git a/app/components/language_field_component.rb b/app/components/language_field_component.rb index 6922f855e..c2e00ed31 100644 --- a/app/components/language_field_component.rb +++ b/app/components/language_field_component.rb @@ -3,21 +3,22 @@ class LanguageFieldComponent < ViewComponent::Base LEXVO_TO_FLAG = { 'http://lexvo.org/id/iso639-3/aar' => 'aa', 'http://lexvo.org/id/iso639-3/abk' => 'ab', - 'http://lexvo.org/id/iso639-3/ave' => 'ae', 'http://lexvo.org/id/iso639-3/afr' => 'af', - 'http://lexvo.org/id/iso639-3/aka' => 'ak', 'http://lexvo.org/id/iso639-3/amh' => 'am', - 'http://lexvo.org/id/iso639-3/arg' => 'an', 'http://lexvo.org/id/iso639-3/ara' => 'ar', 'http://lexvo.org/id/iso639-3/asm' => 'as', 'http://lexvo.org/id/iso639-3/ava' => 'av', 'http://lexvo.org/id/iso639-3/aym' => 'ay', 'http://lexvo.org/id/iso639-3/aze' => 'az', 'http://lexvo.org/id/iso639-3/bak' => 'ba', 'http://lexvo.org/id/iso639-3/bel' => 'be', 'http://lexvo.org/id/iso639-3/bul' => 'bg', 'http://lexvo.org/id/iso639-3/bis' => 'bi', 'http://lexvo.org/id/iso639-3/bam' => 'bm', 'http://lexvo.org/id/iso639-3/ben' => 'bn', 'http://lexvo.org/id/iso639-3/bod' => 'bo', 'http://lexvo.org/id/iso639-3/bre' => 'br', 'http://lexvo.org/id/iso639-3/bos' => 'bs', 'http://lexvo.org/id/iso639-3/cat' => 'ca', 'http://lexvo.org/id/iso639-3/che' => 'ce', 'http://lexvo.org/id/iso639-3/cha' => 'ch', 'http://lexvo.org/id/iso639-3/cos' => 'co', 'http://lexvo.org/id/iso639-3/cre' => 'cr', 'http://lexvo.org/id/iso639-3/ces' => 'cs', 'http://lexvo.org/id/iso639-3/chu' => 'cu', 'http://lexvo.org/id/iso639-3/chv' => 'cv', 'http://lexvo.org/id/iso639-3/cym' => 'cy', 'http://lexvo.org/id/iso639-3/dan' => 'da', 'http://lexvo.org/id/iso639-3/deu' => 'de', 'http://lexvo.org/id/iso639-3/div' => 'dv', 'http://lexvo.org/id/iso639-3/dzo' => 'dz', 'http://lexvo.org/id/iso639-3/ewe' => 'ee', 'http://lexvo.org/id/iso639-3/ell' => 'el', 'http://lexvo.org/id/iso639-3/eng' => 'en', 'http://lexvo.org/id/iso639-3/epo' => 'eo', 'http://lexvo.org/id/iso639-3/spa' => 'es', 'http://lexvo.org/id/iso639-3/est' => 'et', 'http://lexvo.org/id/iso639-3/eus' => 'eu', 'http://lexvo.org/id/iso639-3/fas' => 'fa', 'http://lexvo.org/id/iso639-3/ful' => 'ff', 'http://lexvo.org/id/iso639-3/fin' => 'fi', 'http://lexvo.org/id/iso639-3/fij' => 'fj', 'http://lexvo.org/id/iso639-3/fao' => 'fo', 'http://lexvo.org/id/iso639-3/fra' => 'fr', 'http://lexvo.org/id/iso639-3/fry' => 'fy', 'http://lexvo.org/id/iso639-3/gle' => 'ga', 'http://lexvo.org/id/iso639-3/gla' => 'gd', 'http://lexvo.org/id/iso639-3/glg' => 'gl', 'http://lexvo.org/id/iso639-3/grn' => 'gn', 'http://lexvo.org/id/iso639-3/guj' => 'gu', 'http://lexvo.org/id/iso639-3/glv' => 'gv', 'http://lexvo.org/id/iso639-3/hau' => 'ha', 'http://lexvo.org/id/iso639-3/heb' => 'he', 'http://lexvo.org/id/iso639-3/hin' => 'hi', 'http://lexvo.org/id/iso639-3/hmo' => 'ho', 'http://lexvo.org/id/iso639-3/hrv' => 'hr', 'http://lexvo.org/id/iso639-3/hat' => 'ht', 'http://lexvo.org/id/iso639-3/hun' => 'hu', 'http://lexvo.org/id/iso639-3/hye' => 'hy', 'http://lexvo.org/id/iso639-3/her' => 'hz', 'http://lexvo.org/id/iso639-3/ina' => 'ia', 'http://lexvo.org/id/iso639-3/ind' => 'id', 'http://lexvo.org/id/iso639-3/ile' => 'ie', 'http://lexvo.org/id/iso639-3/ibo' => 'ig', 'http://lexvo.org/id/iso639-3/iii' => 'ii', 'http://lexvo.org/id/iso639-3/ipk' => 'ik', 'http://lexvo.org/id/iso639-3/ido' => 'io', 'http://lexvo.org/id/iso639-3/isl' => 'is', 'http://lexvo.org/id/iso639-3/ita' => 'it', 'http://lexvo.org/id/iso639-3/iku' => 'iu', 'http://lexvo.org/id/iso639-3/jpn' => 'ja', 'http://lexvo.org/id/iso639-3/jav' => 'jv', 'http://lexvo.org/id/iso639-3/kat' => 'ka', 'http://lexvo.org/id/iso639-3/kon' => 'kg', 'http://lexvo.org/id/iso639-3/kik' => 'ki', 'http://lexvo.org/id/iso639-3/kua' => 'kj', 'http://lexvo.org/id/iso639-3/kaz' => 'kk', 'http://lexvo.org/id/iso639-3/kal' => 'kl', 'http://lexvo.org/id/iso639-3/khm' => 'km', 'http://lexvo.org/id/iso639-3/kan' => 'kn', 'http://lexvo.org/id/iso639-3/kor' => 'ko', 'http://lexvo.org/id/iso639-3/kau' => 'kr', 'http://lexvo.org/id/iso639-3/kas' => 'ks', 'http://lexvo.org/id/iso639-3/kur' => 'ku', 'http://lexvo.org/id/iso639-3/kom' => 'kv', 'http://lexvo.org/id/iso639-3/cor' => 'kw', 'http://lexvo.org/id/iso639-3/kir' => 'ky', 'http://lexvo.org/id/iso639-3/lat' => 'la', 'http://lexvo.org/id/iso639-3/ltz' => 'lb', 'http://lexvo.org/id/iso639-3/lug' => 'lg', 'http://lexvo.org/id/iso639-3/lim' => 'li', 'http://lexvo.org/id/iso639-3/lin' => 'ln', 'http://lexvo.org/id/iso639-3/lao' => 'lo', 'http://lexvo.org/id/iso639-3/lit' => 'lt', 'http://lexvo.org/id/iso639-3/lub' => 'lu', 'http://lexvo.org/id/iso639-3/lav' => 'lv', 'http://lexvo.org/id/iso639-3/mlg' => 'mg', 'http://lexvo.org/id/iso639-3/mah' => 'mh', 'http://lexvo.org/id/iso639-3/mri' => 'mi', 'http://lexvo.org/id/iso639-3/mkd' => 'mk', 'http://lexvo.org/id/iso639-3/mal' => 'ml', 'http://lexvo.org/id/iso639-3/mon' => 'mn', 'http://lexvo.org/id/iso639-3/mar' => 'mr', 'http://lexvo.org/id/iso639-3/msa' => 'ms', 'http://lexvo.org/id/iso639-3/mlt' => 'mt', 'http://lexvo.org/id/iso639-3/mya' => 'my', 'http://lexvo.org/id/iso639-3/nau' => 'na', 'http://lexvo.org/id/iso639-3/nob' => 'nb', 'http://lexvo.org/id/iso639-3/nde' => 'nd', 'http://lexvo.org/id/iso639-3/nep' => 'ne', 'http://lexvo.org/id/iso639-3/ndo' => 'ng', 'http://lexvo.org/id/iso639-3/nld' => 'nl', 'http://lexvo.org/id/iso639-3/nno' => 'nn', 'http://lexvo.org/id/iso639-3/nor' => 'no', 'http://lexvo.org/id/iso639-3/nbl' => 'nr', 'http://lexvo.org/id/iso639-3/nav' => 'nv', 'http://lexvo.org/id/iso639-3/nya' => 'ny', 'http://lexvo.org/id/iso639-3/oci' => 'oc', 'http://lexvo.org/id/iso639-3/oji' => 'oj', 'http://lexvo.org/id/iso639-3/orm' => 'om', 'http://lexvo.org/id/iso639-3/ori' => 'or', 'http://lexvo.org/id/iso639-3/oss' => 'os', 'http://lexvo.org/id/iso639-3/pan' => 'pa', 'http://lexvo.org/id/iso639-3/pli' => 'pi', 'http://lexvo.org/id/iso639-3/pol' => 'pl', 'http://lexvo.org/id/iso639-3/pus' => 'ps', 'http://lexvo.org/id/iso639-3/por' => 'pt', 'http://lexvo.org/id/iso639-3/que' => 'qu', 'http://lexvo.org/id/iso639-3/roh' => 'rm', 'http://lexvo.org/id/iso639-3/run' => 'rn', 'http://lexvo.org/id/iso639-3/ron' => 'ro', 'http://lexvo.org/id/iso639-3/rus' => 'ru', 'http://lexvo.org/id/iso639-3/kin' => 'rw', 'http://lexvo.org/id/iso639-3/san' => 'sa', 'http://lexvo.org/id/iso639-3/srd' => 'sc', 'http://lexvo.org/id/iso639-3/snd' => 'sd', 'http://lexvo.org/id/iso639-3/sme' => 'se', 'http://lexvo.org/id/iso639-3/sag' => 'sg', 'http://lexvo.org/id/iso639-3/hbs' => 'sh', 'http://lexvo.org/id/iso639-3/sin' => 'si', 'http://lexvo.org/id/iso639-3/slk' => 'sk', 'http://lexvo.org/id/iso639-3/slv' => 'sl', 'http://lexvo.org/id/iso639-3/smo' => 'sm', 'http://lexvo.org/id/iso639-3/sna' => 'sn', 'http://lexvo.org/id/iso639-3/som' => 'so', 'http://lexvo.org/id/iso639-3/sqi' => 'sq', 'http://lexvo.org/id/iso639-3/srp' => 'sr', 'http://lexvo.org/id/iso639-3/ssw' => 'ss', 'http://lexvo.org/id/iso639-3/sot' => 'st', 'http://lexvo.org/id/iso639-3/sun' => 'su', 'http://lexvo.org/id/iso639-3/swe' => 'sv', 'http://lexvo.org/id/iso639-3/swa' => 'sw', 'http://lexvo.org/id/iso639-3/tam' => 'ta', 'http://lexvo.org/id/iso639-3/tel' => 'te', 'http://lexvo.org/id/iso639-3/tgk' => 'tg', 'http://lexvo.org/id/iso639-3/tha' => 'th', 'http://lexvo.org/id/iso639-3/tir' => 'ti', 'http://lexvo.org/id/iso639-3/tuk' => 'tk', 'http://lexvo.org/id/iso639-3/tgl' => 'tl', 'http://lexvo.org/id/iso639-3/tsn' => 'tn', 'http://lexvo.org/id/iso639-3/ton' => 'to', 'http://lexvo.org/id/iso639-3/tur' => 'tr', 'http://lexvo.org/id/iso639-3/tso' => 'ts', 'http://lexvo.org/id/iso639-3/tat' => 'tt', 'http://lexvo.org/id/iso639-3/twi' => 'tw', 'http://lexvo.org/id/iso639-3/tah' => 'ty', 'http://lexvo.org/id/iso639-3/uig' => 'ug', 'http://lexvo.org/id/iso639-3/ukr' => 'uk', 'http://lexvo.org/id/iso639-3/urd' => 'ur', 'http://lexvo.org/id/iso639-3/uzb' => 'uz', 'http://lexvo.org/id/iso639-3/ven' => 've', 'http://lexvo.org/id/iso639-3/vie' => 'vi', 'http://lexvo.org/id/iso639-3/vol' => 'vo', 'http://lexvo.org/id/iso639-3/wln' => 'wa', 'http://lexvo.org/id/iso639-3/wol' => 'wo', 'http://lexvo.org/id/iso639-3/xho' => 'xh', 'http://lexvo.org/id/iso639-3/yid' => 'yi', 'http://lexvo.org/id/iso639-3/yor' => 'yo', 'http://lexvo.org/id/iso639-3/zha' => 'za', 'http://lexvo.org/id/iso639-3/zho' => 'zh', 'http://lexvo.org/id/iso639-3/zul' => 'zu' } + 'http://lexvo.org/id/iso639-3/ave' => 'ae', 'http://lexvo.org/id/iso639-3/afr' => 'af', + 'http://lexvo.org/id/iso639-3/aka' => 'ak', 'http://lexvo.org/id/iso639-3/amh' => 'am', + 'http://lexvo.org/id/iso639-3/arg' => 'an', 'http://lexvo.org/id/iso639-3/ara' => 'ar', 'http://lexvo.org/id/iso639-3/asm' => 'as', 'http://lexvo.org/id/iso639-3/ava' => 'av', 'http://lexvo.org/id/iso639-3/aym' => 'ay', 'http://lexvo.org/id/iso639-3/aze' => 'az', 'http://lexvo.org/id/iso639-3/bak' => 'ba', 'http://lexvo.org/id/iso639-3/bel' => 'be', 'http://lexvo.org/id/iso639-3/bul' => 'bg', 'http://lexvo.org/id/iso639-3/bis' => 'bi', 'http://lexvo.org/id/iso639-3/bam' => 'bm', 'http://lexvo.org/id/iso639-3/ben' => 'bn', 'http://lexvo.org/id/iso639-3/bod' => 'bo', 'http://lexvo.org/id/iso639-3/bre' => 'br', 'http://lexvo.org/id/iso639-3/bos' => 'bs', 'http://lexvo.org/id/iso639-3/cat' => 'ca', 'http://lexvo.org/id/iso639-3/che' => 'ce', 'http://lexvo.org/id/iso639-3/cha' => 'ch', 'http://lexvo.org/id/iso639-3/cos' => 'co', 'http://lexvo.org/id/iso639-3/cre' => 'cr', 'http://lexvo.org/id/iso639-3/ces' => 'cs', 'http://lexvo.org/id/iso639-3/chu' => 'cu', 'http://lexvo.org/id/iso639-3/chv' => 'cv', 'http://lexvo.org/id/iso639-3/cym' => 'cy', 'http://lexvo.org/id/iso639-3/dan' => 'da', 'http://lexvo.org/id/iso639-3/deu' => 'de', 'http://lexvo.org/id/iso639-3/div' => 'dv', 'http://lexvo.org/id/iso639-3/dzo' => 'dz', 'http://lexvo.org/id/iso639-3/ewe' => 'ee', 'http://lexvo.org/id/iso639-3/ell' => 'el', 'http://lexvo.org/id/iso639-3/eng' => 'en', 'http://lexvo.org/id/iso639-3/epo' => 'eo', 'http://lexvo.org/id/iso639-3/spa' => 'es', 'http://lexvo.org/id/iso639-3/est' => 'et', 'http://lexvo.org/id/iso639-3/eus' => 'eu', 'http://lexvo.org/id/iso639-3/fas' => 'fa', 'http://lexvo.org/id/iso639-3/ful' => 'ff', 'http://lexvo.org/id/iso639-3/fin' => 'fi', 'http://lexvo.org/id/iso639-3/fij' => 'fj', 'http://lexvo.org/id/iso639-3/fao' => 'fo', 'http://lexvo.org/id/iso639-3/fra' => 'fr', 'http://lexvo.org/id/iso639-3/fry' => 'fy', 'http://lexvo.org/id/iso639-3/gle' => 'ga', 'http://lexvo.org/id/iso639-3/gla' => 'gd', 'http://lexvo.org/id/iso639-3/glg' => 'gl', 'http://lexvo.org/id/iso639-3/grn' => 'gn', 'http://lexvo.org/id/iso639-3/guj' => 'gu', 'http://lexvo.org/id/iso639-3/glv' => 'gv', 'http://lexvo.org/id/iso639-3/hau' => 'ha', 'http://lexvo.org/id/iso639-3/heb' => 'he', 'http://lexvo.org/id/iso639-3/hin' => 'hi', 'http://lexvo.org/id/iso639-3/hmo' => 'ho', 'http://lexvo.org/id/iso639-3/hrv' => 'hr', 'http://lexvo.org/id/iso639-3/hat' => 'ht', 'http://lexvo.org/id/iso639-3/hun' => 'hu', 'http://lexvo.org/id/iso639-3/hye' => 'hy', 'http://lexvo.org/id/iso639-3/her' => 'hz', 'http://lexvo.org/id/iso639-3/ina' => 'ia', 'http://lexvo.org/id/iso639-3/ind' => 'id', 'http://lexvo.org/id/iso639-3/ile' => 'ie', 'http://lexvo.org/id/iso639-3/ibo' => 'ig', 'http://lexvo.org/id/iso639-3/iii' => 'ii', 'http://lexvo.org/id/iso639-3/ipk' => 'ik', 'http://lexvo.org/id/iso639-3/ido' => 'io', 'http://lexvo.org/id/iso639-3/isl' => 'is', 'http://lexvo.org/id/iso639-3/ita' => 'it', 'http://lexvo.org/id/iso639-3/iku' => 'iu', 'http://lexvo.org/id/iso639-3/jpn' => 'ja', 'http://lexvo.org/id/iso639-3/jav' => 'jv', 'http://lexvo.org/id/iso639-3/kat' => 'ka', 'http://lexvo.org/id/iso639-3/kon' => 'kg', 'http://lexvo.org/id/iso639-3/kik' => 'ki', 'http://lexvo.org/id/iso639-3/kua' => 'kj', 'http://lexvo.org/id/iso639-3/kaz' => 'kk', 'http://lexvo.org/id/iso639-3/kal' => 'kl', 'http://lexvo.org/id/iso639-3/khm' => 'km', 'http://lexvo.org/id/iso639-3/kan' => 'kn', 'http://lexvo.org/id/iso639-3/kor' => 'ko', 'http://lexvo.org/id/iso639-3/kau' => 'kr', 'http://lexvo.org/id/iso639-3/kas' => 'ks', 'http://lexvo.org/id/iso639-3/kur' => 'ku', 'http://lexvo.org/id/iso639-3/kom' => 'kv', 'http://lexvo.org/id/iso639-3/cor' => 'kw', 'http://lexvo.org/id/iso639-3/kir' => 'ky', 'http://lexvo.org/id/iso639-3/lat' => 'la', 'http://lexvo.org/id/iso639-3/ltz' => 'lb', 'http://lexvo.org/id/iso639-3/lug' => 'lg', 'http://lexvo.org/id/iso639-3/lim' => 'li', 'http://lexvo.org/id/iso639-3/lin' => 'ln', 'http://lexvo.org/id/iso639-3/lao' => 'lo', 'http://lexvo.org/id/iso639-3/lit' => 'lt', 'http://lexvo.org/id/iso639-3/lub' => 'lu', 'http://lexvo.org/id/iso639-3/lav' => 'lv', 'http://lexvo.org/id/iso639-3/mlg' => 'mg', 'http://lexvo.org/id/iso639-3/mah' => 'mh', 'http://lexvo.org/id/iso639-3/mri' => 'mi', 'http://lexvo.org/id/iso639-3/mkd' => 'mk', 'http://lexvo.org/id/iso639-3/mal' => 'ml', 'http://lexvo.org/id/iso639-3/mon' => 'mn', 'http://lexvo.org/id/iso639-3/mar' => 'mr', 'http://lexvo.org/id/iso639-3/msa' => 'ms', 'http://lexvo.org/id/iso639-3/mlt' => 'mt', 'http://lexvo.org/id/iso639-3/mya' => 'my', 'http://lexvo.org/id/iso639-3/nau' => 'na', 'http://lexvo.org/id/iso639-3/nob' => 'nb', 'http://lexvo.org/id/iso639-3/nde' => 'nd', 'http://lexvo.org/id/iso639-3/nep' => 'ne', 'http://lexvo.org/id/iso639-3/ndo' => 'ng', 'http://lexvo.org/id/iso639-3/nld' => 'nl', 'http://lexvo.org/id/iso639-3/nno' => 'nn', 'http://lexvo.org/id/iso639-3/nor' => 'no', 'http://lexvo.org/id/iso639-3/nbl' => 'nr', 'http://lexvo.org/id/iso639-3/nav' => 'nv', 'http://lexvo.org/id/iso639-3/nya' => 'ny', 'http://lexvo.org/id/iso639-3/oci' => 'oc', 'http://lexvo.org/id/iso639-3/oji' => 'oj', 'http://lexvo.org/id/iso639-3/orm' => 'om', 'http://lexvo.org/id/iso639-3/ori' => 'or', 'http://lexvo.org/id/iso639-3/oss' => 'os', 'http://lexvo.org/id/iso639-3/pan' => 'pa', 'http://lexvo.org/id/iso639-3/pli' => 'pi', 'http://lexvo.org/id/iso639-3/pol' => 'pl', 'http://lexvo.org/id/iso639-3/pus' => 'ps', 'http://lexvo.org/id/iso639-3/por' => 'pt', 'http://lexvo.org/id/iso639-3/que' => 'qu', 'http://lexvo.org/id/iso639-3/roh' => 'rm', 'http://lexvo.org/id/iso639-3/run' => 'rn', 'http://lexvo.org/id/iso639-3/ron' => 'ro', 'http://lexvo.org/id/iso639-3/rus' => 'ru', 'http://lexvo.org/id/iso639-3/kin' => 'rw', 'http://lexvo.org/id/iso639-3/san' => 'sa', 'http://lexvo.org/id/iso639-3/srd' => 'sc', 'http://lexvo.org/id/iso639-3/snd' => 'sd', 'http://lexvo.org/id/iso639-3/sme' => 'se', 'http://lexvo.org/id/iso639-3/sag' => 'sg', 'http://lexvo.org/id/iso639-3/hbs' => 'sh', 'http://lexvo.org/id/iso639-3/sin' => 'si', 'http://lexvo.org/id/iso639-3/slk' => 'sk', 'http://lexvo.org/id/iso639-3/slv' => 'sl', 'http://lexvo.org/id/iso639-3/smo' => 'sm', 'http://lexvo.org/id/iso639-3/sna' => 'sn', 'http://lexvo.org/id/iso639-3/som' => 'so', 'http://lexvo.org/id/iso639-3/sqi' => 'sq', 'http://lexvo.org/id/iso639-3/srp' => 'sr', 'http://lexvo.org/id/iso639-3/ssw' => 'ss', 'http://lexvo.org/id/iso639-3/sot' => 'st', 'http://lexvo.org/id/iso639-3/sun' => 'su', 'http://lexvo.org/id/iso639-3/swe' => 'sv', 'http://lexvo.org/id/iso639-3/swa' => 'sw', 'http://lexvo.org/id/iso639-3/tam' => 'ta', 'http://lexvo.org/id/iso639-3/tel' => 'te', 'http://lexvo.org/id/iso639-3/tgk' => 'tg', 'http://lexvo.org/id/iso639-3/tha' => 'th', 'http://lexvo.org/id/iso639-3/tir' => 'ti', 'http://lexvo.org/id/iso639-3/tuk' => 'tk', 'http://lexvo.org/id/iso639-3/tgl' => 'tl', 'http://lexvo.org/id/iso639-3/tsn' => 'tn', 'http://lexvo.org/id/iso639-3/ton' => 'to', 'http://lexvo.org/id/iso639-3/tur' => 'tr', 'http://lexvo.org/id/iso639-3/tso' => 'ts', 'http://lexvo.org/id/iso639-3/tat' => 'tt', 'http://lexvo.org/id/iso639-3/twi' => 'tw', 'http://lexvo.org/id/iso639-3/tah' => 'ty', 'http://lexvo.org/id/iso639-3/uig' => 'ug', 'http://lexvo.org/id/iso639-3/ukr' => 'uk', 'http://lexvo.org/id/iso639-3/urd' => 'ur', 'http://lexvo.org/id/iso639-3/uzb' => 'uz', 'http://lexvo.org/id/iso639-3/ven' => 've', 'http://lexvo.org/id/iso639-3/vie' => 'vi', 'http://lexvo.org/id/iso639-3/vol' => 'vo', 'http://lexvo.org/id/iso639-3/wln' => 'wa', 'http://lexvo.org/id/iso639-3/wol' => 'wo', 'http://lexvo.org/id/iso639-3/xho' => 'xh', 'http://lexvo.org/id/iso639-3/yid' => 'yi', 'http://lexvo.org/id/iso639-3/yor' => 'yo', 'http://lexvo.org/id/iso639-3/zha' => 'za', 'http://lexvo.org/id/iso639-3/zho' => 'zh', 'http://lexvo.org/id/iso639-3/zul' => 'zu' } - - def initialize(value: ) + def initialize(value:) super - @lang_code = lang_codes_init(value) + + @lang_code = lang_codes_init(value) end def lang_codes_init(lang) - if lang.to_s.eql?("en") || lang.to_s.eql?("eng") || lang.to_s.eql?("http://lexvo.org/id/iso639-3/eng") + + if lang.to_s.eql?("en") || lang.to_s.eql?("eng") || lang.to_s.start_with?("http://lexvo.org/id/iso639-3/en") lang_codes = "gb" elsif lang.to_s.start_with?("http://lexvo.org") - lang_codes = LEXVO_TO_FLAG[lang] + lang_codes = LEXVO_TO_FLAG[lang] || lang else lang_codes = lang end diff --git a/app/components/language_field_component/language_field_component.html.haml b/app/components/language_field_component/language_field_component.html.haml index a6b431565..6c0c9998e 100644 --- a/app/components/language_field_component/language_field_component.html.haml +++ b/app/components/language_field_component/language_field_component.html.haml @@ -1,4 +1,4 @@ -- if @lang_code.length == 2 +- if @lang_code && @lang_code.length == 2 %div.f32 %span.flag{:class => " #{@lang_code}", :style => "margin-right: 0.5em;"} - else diff --git a/app/components/submission_metadata_component.rb b/app/components/submission_metadata_component.rb new file mode 100644 index 000000000..69c23f9bd --- /dev/null +++ b/app/components/submission_metadata_component.rb @@ -0,0 +1,52 @@ +# frozen_string_literal: true + +class SubmissionMetadataComponent < ViewComponent::Base + include ApplicationHelper, MetadataHelper,OntologiesHelper, AgentHelper + + def initialize(submission: , submission_metadata:) + super + @submission = submission + + @json_metadata = submission_metadata + metadata_list = {} + # Get extracted metadata and put them in a hash with their label, if one, as value + @json_metadata.each do |metadata| + metadata_list[metadata["attribute"]] = metadata["label"] + end + + @metadata_list = metadata_list.sort + end + + def display_attributes(metadata) + if Array(@submission.send(metadata)).empty? + out = 'N/A' + else + out = Array(@submission.send(metadata)).map do |value| + content_tag(:div, class: 'm-1 f32') do + display_attribute(metadata, value) + end + end.join + end + out.html_safe + end + def attribute_help_text(attr) + if !attr["namespace"].nil? + help_text = "#{attr["namespace"]}:#{attr["attribute"]}" + else + help_text = "bioportal:#{attr["attribute"]}" + end + + if (attr["metadataMappings"] != nil) + help_text += " (#{attr["metadataMappings"].join(", ")})" + end + + if (!attr["enforce"].nil? && attr["enforce"].include?("uri")) + help_text += "
    This metadata should be an URI" + end + + if (attr["helpText"] != nil) + help_text += "

    #{attr["helpText"]}" + end + help_text.html_safe + end +end diff --git a/app/components/submission_metadata_component/submission_metadata_component.html.haml b/app/components/submission_metadata_component/submission_metadata_component.html.haml new file mode 100644 index 000000000..c244e7685 --- /dev/null +++ b/app/components/submission_metadata_component/submission_metadata_component.html.haml @@ -0,0 +1,18 @@ += render TableComponent.new(id: 'submission_metadata_table', borderless: true, layout_fixed: true) do |t| + - t.header do |h| + - h.th(width:'15%') {"Label"} + - h.th(width:'50%') {"Value"} + - h.th(width:'35%') {"Metadata"} + + - @metadata_list.each do |metadata, label| + - t.row do |r| + - r.td do + = label || metadata.underscore.humanize + - r.td do + .d-flex.flex-wrap.align-items-center + = display_attributes(metadata) + - r.td {attribute_help_text(attr_metadata(metadata))} +:javascript + $("#submission_metadata_table").dataTable({ paging: false, autoWidth: false }) + + diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7ce8b03e2..5829d5484 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -529,13 +529,6 @@ def get_class(params) @concept end - def get_metrics_hash - metrics_hash = {} - # TODO: Metrics do not return for views on the backend, need to enable include_views param there - @metrics = LinkedData::Client::Models::Metrics.all(include_views: true) - @metrics.each {|m| metrics_hash[m.links['ontology']] = m } - return metrics_hash - end def get_ontology_submission_ready(ontology) # Get the latest 'ready' submission @@ -782,9 +775,8 @@ def init_trial_license # Get the submission metadata from the REST API. def submission_metadata - @metadata ||= JSON.parse(Net::HTTP.get(URI.parse("#{REST_URI}/submission_metadata?apikey=#{API_KEY}"))) + helpers.submission_metadata end - helper_method :submission_metadata def request_lang diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index a50f1797c..afb34ecfd 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -370,7 +370,6 @@ def summary @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:id]).first if @ontology.nil? ontology_not_found(params[:id]) if @ontology.nil? # Check to see if user is requesting json-ld, return the file from REST service if so - if request.accept.to_s.eql?('application/ld+json') || request.accept.to_s.eql?('application/json') headers['Content-Type'] = request.accept.to_s render plain: @ontology.to_jsonld @@ -382,13 +381,23 @@ def summary @projects = @ontology.explore.projects.sort {|a,b| a.name.downcase <=> b.name.downcase } || [] @analytics = LinkedData::Client::HTTP.get(@ontology.links['analytics']) - #Call to fairness assessment service + # Call to fairness assessment service tmp = fairness_service_enabled? ? get_fair_score(@ontology.acronym) : nil @fair_scores_data = create_fair_scores_data(tmp.values.first) unless tmp.nil? @views = get_views(@ontology) - @view_decorators = @views.map{ |view| ViewDecorator.new(view, view_context) } - + @view_decorators = @views.map { |view| ViewDecorator.new(view, view_context) } + @ontology_relations_data = ontology_relations_data + + category_attributes = submission_metadata.group_by{|x| x['category']}.transform_values{|x| x.map{|attr| attr['attribute']} } + + @methodology_properties = properties_hash_values(category_attributes["methodology"]) + @agents_properties = properties_hash_values(category_attributes["people"].without('wasGeneratedBy', 'wasInvalidatedBy') + [:hasCreator, :hasContributor, :translator, :publisher, :copyrightHolder]) + @dates_properties = properties_hash_values(category_attributes["dates"] + [:creationDate, :modificationDate, :released]) + @links_properties = properties_hash_values(category_attributes["links"].without('includedInDataCatalog') +[:wasGeneratedBy, :wasInvalidatedBy] ) + @identifiers = properties_hash_values( [:URI, :versionIRI, :identifier]) + @projects_properties = properties_hash_values(category_attributes["usage"].without('hasDomain') + [:audience, :includedInDataCatalog]) + @ontology_icon_links = [%w[summary/download dataDump], %w[summary/homepage homepage], %w[summary/documentation documentation], %w[icons/github repository], %w[summary/sparql endpoint]] if request.xhr? render partial: 'ontologies/sections/metadata', layout: false else @@ -439,6 +448,14 @@ def widgets render partial: 'ontologies/sections/widgets', layout: 'ontology_viewer' end end + + + def show_additional_metadata + @metadata = submission_metadata + @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:id]).first + @submission_latest = @ontology.explore.latest_submission(include: 'all', display_context: false, display_links: false) + render partial: 'ontologies/sections/additional_metadata' + end def show_licenses @@ -452,9 +469,28 @@ def ajax_ontologies render json: LinkedData::Client::Models::Ontology.all(include_views: true, - display: 'acronym,name', display_links: false, display_context: false) + display: 'acronym,name', display_links: false, display_context: false) end + + + def metrics_evolution + @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology_id]).first + key = params[:metrics_key] + ontology_not_found(params[:ontology_id]) if @ontology.nil? + + # Retrieve submissions in descending submissionId order (should be reverse chronological order) + @submissions = @ontology.explore.submissions({ include: "metrics" }) + .sort { |a, b| a.submissionId.to_i <=> b.submissionId.to_i }.reverse || [] + + metrics = @submissions.map { |s| s.metrics } + + data = { + key => metrics.map { |m| m[key] } + } + + render partial: 'ontologies/sections/metadata/metrics_evolution_graph', locals: { data: data } + end private def get_views(ontology) @@ -463,4 +499,63 @@ def get_views(ontology) views.sort{ |a,b| a.acronym.downcase <=> b.acronym.downcase } end + def ontology_relations_data(sub = @submission_latest) + ontology_relations_array = [] + @relations_array = ["omv:useImports", "door:isAlignedTo", "door:ontologyRelatedTo", "omv:isBackwardCompatibleWith", "omv:isIncompatibleWith", "door:comesFromTheSameDomain", "door:similarTo", + "door:explanationEvolution", "voaf:generalizes", "door:hasDisparateModelling", "dct:hasPart", "voaf:usedBy", "schema:workTranslation", "schema:translationOfWork"] + + return if sub.nil? + + ont = sub.ontology + # Get ontology relations between each other (ex: STY isAlignedTo GO) + @relations_array.each do |relation_attr| + relation_values = sub.send(relation_attr.to_s.split(':')[1]) + next if relation_values.nil? || relation_values.empty? + + relation_values = [relation_values] unless relation_values.kind_of?(Array) + + relation_values.each do |relation_value| + next if relation_value.eql?(ont.acronym) + + target_id = relation_value + target_in_portal = false + # if we find our portal URL in the ontology URL, then we just keep the ACRONYM to try to get the ontology. + relation_value = relation_value.split('/').last if relation_value.include?($UI_URL) + + # Use acronym to get ontology from the portal + target_ont = LinkedData::Client::Models::Ontology.find_by_acronym(relation_value).first + if target_ont + target_id = target_ont.acronym + target_in_portal = true + end + + ontology_relations_array.push({ source: ont.acronym, target: target_id, relation: relation_attr.to_s, targetInPortal: target_in_portal }) + end + end + + ontology_relations_array + end + def properties_hash_values(properties, sub = @submission_latest) + return {} if sub.nil? + + properties.map { |x| [x.to_s, sub.send(x.to_s)] }.to_h + end + + def get_metrics_hash + metrics_hash = {} + # TODO: Metrics do not return for views on the backend, need to enable include_views param there + @metrics = LinkedData::Client::Models::Metrics.all(include_views: true) + @metrics.each {|m| metrics_hash[m.links['ontology']] = m } + return metrics_hash + end + + def determine_layout + case action_name + when 'index' + 'angular' + else + super + end + end + end diff --git a/app/controllers/ontologies_metadata_curator_controller.rb b/app/controllers/ontologies_metadata_curator_controller.rb index 7b9c95cfb..b65658f86 100644 --- a/app/controllers/ontologies_metadata_curator_controller.rb +++ b/app/controllers/ontologies_metadata_curator_controller.rb @@ -144,7 +144,7 @@ def metadata_params :publication ] - @metadata.each do |m| + submission_metadata.each do |m| m_attr = m["attribute"].to_sym diff --git a/app/helpers/agent_helper.rb b/app/helpers/agent_helper.rb index ea8c46c6a..590e297ce 100644 --- a/app/helpers/agent_helper.rb +++ b/app/helpers/agent_helper.rb @@ -79,6 +79,8 @@ def display_identifiers(identifiers, link: true) end def display_agent(agent, link: true) + return agent if agent.is_a?(String) + out = agent.name.to_s.humanize identifiers = display_identifiers(agent.identifiers, link: link) out = "#{out} (#{identifiers})" unless identifiers.empty? diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 396f68883..9e65befaf 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -6,6 +6,8 @@ require 'pry' # used in a rescue module ApplicationHelper + REST_URI = $REST_URL + API_KEY = $API_KEY include ModalHelper @@ -41,6 +43,10 @@ def omniauth_token_provider(strategy) omniauth_provider_info(strategy).keys.first end + def submission_metadata + @metadata ||= JSON.parse(Net::HTTP.get(URI.parse("#{REST_URI}/submission_metadata?apikey=#{API_KEY}"))) + end + def isOwner?(id) unless session[:user].nil? if session[:user].admin? @@ -52,6 +58,7 @@ def isOwner?(id) end end end + def encode_param(string) CGI.escape(string) @@ -276,6 +283,8 @@ def help_tooltip(content, html_attribs = {}, icon = 'fas fa-question-circle', cs BLOCK end + + def anonymous_user # # TODO: Fix and failures from removing 'DataAccess' call here. @@ -529,24 +538,23 @@ def label_ajax_data_h(cls_id, ont_acronym, ajax_uri, cls_url) end def label_ajax_data(cls_id, ont_acronym, ajax_uri, cls_url) - tag.attributes label_ajax_data_h(cls_id, ont_acronym, ajax_uri, cls_url) + label_ajax_data_h(cls_id, ont_acronym, ajax_uri, cls_url) end - def label_ajax_link(link, cls_id, ont_acronym, ajax_uri, cls_url, target = '') - href_cls = " href='#{link}'" + def label_ajax_link(link, cls_id, ont_acronym, ajax_uri, cls_url, target = nil) data = label_ajax_data(cls_id, ont_acronym, ajax_uri, cls_url) - style = 'btn btn-sm btn-light' - "#{cls_id}" + options = { 'data-controller': 'label-ajax' }.merge(data) + options = options.merge({ target: target }) if target + + render ChipButtonComponent.new(url: link, text: cls_id, type: 'clickable', **options) end def get_link_for_cls_ajax(cls_id, ont_acronym, target = nil) - target = target.nil? ? '' : " target='#{target}' " - if cls_id.start_with?('http://') || cls_id.start_with?('https://') link = bp_class_link(cls_id, ont_acronym) ajax_url = "/ajax/classes/label?language=#{request_lang}" cls_url = "?p=classes&conceptid=#{CGI.escape(cls_id)}&language=#{request_lang}" - label_ajax_link(link, cls_id, ont_acronym, ajax_url , cls_url ,target) + label_ajax_link(link, cls_id, ont_acronym, ajax_url, cls_url, target) else auto_link(cls_id, :all, target: '_blank') end diff --git a/app/helpers/mappings_helper.rb b/app/helpers/mappings_helper.rb index a3f03f65f..b64ab13ae 100644 --- a/app/helpers/mappings_helper.rb +++ b/app/helpers/mappings_helper.rb @@ -48,26 +48,6 @@ def get_prefixed_uri(uri) return uri end - def get_link_for_cls_ajax(cls_id, ont_acronym, target = nil) - # Note: bp_ajax_controller.ajax_process_cls will try to resolve class labels. - # Uses 'http' as a more generic attempt to resolve class labels than .include? ont_acronym; the - # bp_ajax_controller.ajax_process_cls will try to resolve class labels and - # otherwise remove the UNIQUE_SPLIT_STR and the ont_acronym. - if target.nil? - target = "" - else - target = " target='#{target}' " - end - if cls_id.start_with? 'http://' - href_cls = " href='#{bp_class_link(cls_id, ont_acronym)}' " - data_cls = " data-cls='#{cls_id}' " - data_ont = " data-ont='#{ont_acronym}' " - return "#{cls_id}" - else - return auto_link(cls_id, :all, :target => '_blank') - end - end - # method to get (using http) prefLabel for interportal classes # Using bp_ajax_controller.ajax_process_interportal_cls will try to resolve class labels. def ajax_to_inter_portal_cls(cls) diff --git a/app/helpers/metadata_helper.rb b/app/helpers/metadata_helper.rb new file mode 100644 index 000000000..5cf73e2fa --- /dev/null +++ b/app/helpers/metadata_helper.rb @@ -0,0 +1,77 @@ +module MetadataHelper + + def input_type?(attr, type) + attr["enforce"].include?(type) + end + + def attr_metadata(attr_key) + submission_metadata.select { |attr_hash| attr_hash["attribute"].to_s.eql?(attr_key) }.first + end + + def attr_label(attr) + data = attr_metadata(attr.to_s) + return attr.humanize if data.nil? + data["label"] + end + + def integer?(attr_label) + input_type?(attr_metadata(attr_label), 'integer') + end + + def date_time?(attr_label) + input_type?(attr_metadata(attr_label), 'date_time') + end + + def textarea?(attr_label) + input_type?(attr_metadata(attr_label), 'textarea') + end + + def enforce_values?(attr) + !attr["enforcedValues"].nil? + end + + def list?(attr_label) + input_type?(attr_metadata(attr_label), "list") + end + + def isOntology?(attr_label) + input_type?(attr_metadata(attr_label), 'isOntology') + end + + def attr_uri?(attr_label) + input_type?(attr_metadata(attr_label), "uri") + end + + def boolean?(attr_label) + input_type?(attr_metadata(attr_label), "boolean") + end + + def agent?(attr) + input_type?(attr_metadata(attr), "Agent") + end + + def display_attribute(metadata, value) + return 'N/A' if value.nil? || Array(value).empty? + + if agent?(metadata) + display_agent(value) + elsif metadata.eql?("naturalLanguage") + render LanguageFieldComponent.new(value: value) + elsif metadata.to_s.eql?("hasLicense") + render LicenseFieldComponent.new(value: value) + elsif metadata.to_s.eql?("endpoint") && (value.start_with?("http://sparql.") || value.start_with?("https://sparql.")) + link_to(value, :title => value, :target => "_blank", :style => "border-width:0;") do + image_tag('logos/sparql_logo.png', :title => value, :class => 'logo') + end + elsif date_time?(metadata) + render DateTimeFieldComponent.new(value: value) + elsif attr_uri?(metadata) + render LinkFieldComponent.new(value: value) + elsif input_type?(attr_metadata(metadata), 'contact') + display_contact(value) + else + render TextAreaFieldComponent.new(value: value.to_s) + end + end + +end \ No newline at end of file diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index cf35e422d..036652052 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -20,28 +20,14 @@ def additional_details end # Display data catalog metadata under visits (in _metadata.html.haml) - def display_data_catalog(sub) - if !sub.send("includedInDataCatalog").nil? && sub.send("includedInDataCatalog").any? + def display_data_catalog(value) + if !value.nil? && value.any? # Buttons for data catalogs - return content_tag(:section, { :class => "ont-metadata-card ont-included-in-data-catalog-card" }) do - concat(content_tag(:div, { :class => "ont-section-toolbar" }) do - concat(content_tag(:header, "includedInDataCatalog", { :class => "pb-2 font-weight-bold" })) - end) - concat(content_tag(:div, { :class => "" }) do - sub.send("includedInDataCatalog").each do |catalog| - catalog_btn_label = catalog - $DATA_CATALOG_VALUES.each do |cat_uri, cat_label| - if catalog[cat_uri] - catalog_btn_label = cat_label - break - end - end - concat(content_tag(:a, catalog_btn_label, { :class => "btn btn-primary", :href => catalog, :target => "_blank" })) - end - end) + content_tag(:div, { :class => "" }) do + end else - "" + "" end end @@ -50,232 +36,10 @@ def agent?(sub_metadata, attr) metadata && Array(metadata['enforce']).include?('Agent') end - # Display data catalog metadata under visits (in _metadata.html.haml) - def display_logo(sub) - logo_attributes = ["logo", "depiction"] - logo_html = "" - logo_attributes.each do |metadata| - if !sub.send(metadata).nil? - puts sub.send(metadata) - logo_html.concat(content_tag(:section, { :class => "ont-metadata-card ont-logo-depiction-card" }) do - concat(content_tag(:div, { :class => "ont-section-toolbar" }) do - concat(content_tag(:header, metadata.capitalize, { :class => "pb-2 font-weight-bold" })) - end) - concat(content_tag(:div, { :class => "" }) do - concat(content_tag(:a, { :href => sub.send(metadata), :title => sub.send(metadata), - :target => "_blank", :style => "border-width:0;" }) do - - concat(content_tag(:img, "", { :title => sub.send(metadata), - :style => "border-width:0;max-width: 100%;", :src => sub.send(metadata).to_s })) - end) - end) - end) - end - end - return logo_html + def display_contact(contacts) + contacts.map {|c| "#{c.name.humanize} at #{c.email}" if c.member?(:name) && c.member?(:email)}&.join(", ") end - - # Add additional metadata as html for a submission - def additional_metadata(sub) - # Get the list of metadata attribute from the REST API - json_metadata = submission_metadata - metadata_list = {} - # Get extracted metadata and put them in a hash with their label, if one, as value - json_metadata.each do |metadata| - metadata_list[metadata["attribute"]] = metadata["label"] - end - metadata_list = metadata_list.sort - - html = [] - - metadata_not_displayed = ["status", "description", "documentation", "publication", "homepage", - "openSearchDescription", "dataDump", "includedInDataCatalog", "logo", - "depiction", "submissionId", "submissionStatus", 'ontology', 'contact'] - begin - - metadata_list.each do |metadata, label| - # Don't display documentation, publication, homepage, status and description, they are already in main details - if !metadata_not_displayed.include?(metadata) - # different html build if list or single value - - # METADATA ARRAY - if sub.send(metadata).kind_of?(Array) - if sub.send(metadata).any? - if metadata.eql?("naturalLanguage") - # Special treatment for naturalLanguage: we want the flags in a bootstrap box - # UK is gb: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 - lang_codes = [] - - sub.send(metadata).each do |lang| - if (lang.to_s.eql?("en") || lang.to_s.eql?("eng") || lang.to_s.eql?("http://lexvo.org/id/iso639-3/eng")) - # We consider en and eng as english - lang_codes << "gb" - elsif lang.to_s.start_with?("http://lexvo.org") - lang_codes << $LEXVO_TO_FLAG[lang] - else - lang_codes << lang - end - end - - html << content_tag(:tr) do - concat(content_tag(:td, "Natural Language", " ")) - # Display naturalLanguage as flag - concat(content_tag(:td) do - concat(content_tag(:ul, { :class => "f32" }) do - lang_codes.each do |lang_code| - if lang_code.length == 2 - concat(content_tag(:li, "", { :class => "flag #{lang_code}", :style => "margin-right: 0.5em;" })) - else - concat(content_tag(:li, lang_code)) - end - end - end) - end) - end - - elsif agent?(json_metadata, metadata) - html << content_tag(:tr) do - if label.nil? - concat(content_tag(:td, metadata.gsub(/(?=[A-Z])/, " "))) - else - concat(content_tag(:td, label)) - end - - metadata_array = [] - - sub.send(metadata).each do |metadata_value| - metadata_array << "
    #{display_agent(metadata_value)}
    " - end - - concat(content_tag(:td, raw(metadata_array.join("")))) - end - else - html << content_tag(:tr) do - if label.nil? - concat(content_tag(:td, metadata.gsub(/(?=[A-Z])/, " "))) - else - concat(content_tag(:td, label)) - end - - metadata_array = [] - sub.send(metadata).each do |metadata_value| - if metadata_value.to_s.start_with?("#{$REST_URL}/ontologies/") - # For URI that links to our ontologies we display a button with only the acronym. And redirect to the UI - # Warning! Redirection is done by removing "data." from the REST_URL. So might not work perfectly everywhere - if metadata_value.to_s.split("/").length < 6 - # for ontologies/ACRONYM we redirect to the UI url - metadata_array.push("#{metadata_value.to_s.split("/")[4..-1].join("/")}") - else - metadata_array.push("#{metadata_value.to_s.split("/")[4..-1].join("/")}") - end - - elsif metadata_value.to_s =~ /\A#{URI::regexp(['http', 'https'])}\z/ - # Don't create a link if it not an URI - metadata_array.push("#{metadata_value.to_s}") - else - metadata_array.push(metadata_value) - end - end - concat(content_tag(:td, raw(metadata_array.join(", ")))) - end - end - end - else - - # SINGLE METADATA - if agent?(json_metadata, metadata) - next if sub.send(metadata).nil? - - html << content_tag(:tr) do - if label.nil? - concat(content_tag(:td, metadata.gsub(/(?=[A-Z])/, " "))) - else - concat(content_tag(:td, label)) - end - concat(content_tag(:td, raw("
    #{display_agent(sub.send(metadata))}
    "))) - end - elsif !sub.send(metadata).nil? - html << content_tag(:tr) do - if label.nil? - concat(content_tag(:td, metadata.gsub(/(?=[A-Z])/, " "))) - else - concat(content_tag(:td, label)) - end - if (metadata.to_s.eql?("hasLicense")) - if (sub.send(metadata).to_s.start_with?("http://creativecommons.org/licenses") || sub.send(metadata).start_with?("https://creativecommons.org/licenses")) - concat(content_tag(:td) do - concat(content_tag(:a, { :rel => "license", :alt => "Creative Commons License", - :href => sub.send(metadata), :target => "_blank", :style => "border-width:0", :title => sub.send(metadata), - :src => "https://i.creativecommons.org/l/by/4.0/88x31.png" }) do - - concat(content_tag(:img, "", { :rel => "license", :alt => "Creative Commons License", :title => sub.send(metadata), - :style => "border-width:0", :src => "https://i.creativecommons.org/l/by/4.0/88x31.png" })) - end) - end) - - elsif (sub.send(metadata).to_s.start_with?("http://opensource.org/licenses") || sub.send(metadata).start_with?("https://opensource.org/licenses")) - concat(content_tag(:td) do - concat(content_tag(:a, { :rel => "license", :alt => "Open Source License", - :href => sub.send(metadata), :title => sub.send(metadata), :target => "_blank", :style => "border-width:0;", - :src => "https://opensource.org/files/osi_logo_bold_100X133_90ppi.png" }) do - - concat(content_tag(:img, "", { :rel => "license", :alt => "Open Source License", :title => sub.send(metadata), - :style => "height: 80px; border-width:0;", :src => "https://opensource.org/files/osi_logo_bold_100X133_90ppi.png" })) - end) - end) - - else - concat(content_tag(:td) do - concat(content_tag(:a, sub.send(metadata), { :rel => "license", :href => sub.send(metadata), :target => "_blank" })) - end) - end - - elsif (metadata.to_s.eql?("endpoint") && (sub.send(metadata).start_with?("http://sparql.") || sub.send(metadata).start_with?("https://sparql."))) - concat(content_tag(:td) do - concat(content_tag(:a, { :href => sub.send(metadata), :title => sub.send(metadata), - :target => "_blank", :style => "border-width:0;" }) do - - concat(image_tag('logos/sparql_logo.png', title: sub.send(metadata), class: 'logo')) - end) - end) - - elsif sub.send(metadata).to_s.start_with?("#{$REST_URL}/ontologies/") - # For URI that links to our ontologies we display a button with only the acronym. And redirect to the UI - # Warning! Redirection is done by removing "data." from the REST_URL. So might not work perfectly everywhere - if sub.send(metadata).to_s.split("/").length < 6 - # for ontologies/ACRONYM we redirect to the UI url - concat(content_tag(:td) do - concat(content_tag(:a, sub.send(metadata).to_s.split("/")[4..-1].join("/"), { :class => "btn btn-primary", - :href => sub.send(metadata).sub("data.", ""), :target => "_blank", :title => sub.send(metadata) })) - end) - else - concat(content_tag(:td) do - concat(content_tag(:a, sub.send(metadata).to_s.split("/")[4..-1].join("/"), { :class => "btn btn-primary", - :href => sub.send(metadata), :target => "_blank", :title => sub.send(metadata) })) - end) - end - - else - if sub.send(metadata).to_s =~ /\A#{URI::regexp(['http', 'https'])}\z/ - # Don't create a link if it not an URI - concat(content_tag(:td, raw("#{sub.send(metadata).to_s}"))) - else - concat(content_tag(:td, raw(sub.send(metadata).to_s))) - end - end - end - end - end - end - end - rescue => e - LOG.add :debug, "Unable to retrieve additional ontology metadata" - LOG.add :debug, "error: #{e}" - LOG.add :debug, "error message: #{e.message}" - end - html.join("") - end - + def count_links(ont_acronym, page_name = 'summary', count = 0) ont_url = "/ontologies/#{ont_acronym}" if count.nil? || count.zero? @@ -294,29 +58,34 @@ def classes_link(ontology, count) # Creates a link based on the status of an ontology submission def download_link(submission, ontology = nil) ontology ||= @ontology + links = [] if ontology.summaryOnly if submission.homepage.nil? - link = 'N/A - metadata only' + links << {href: '', label:'N/A - metadata only'} else uri = submission.homepage - link = "Home Page" + links << {href: uri, label:'Home Page'} end else uri = submission.id + "/download?apikey=#{get_apikey}" - link = "#{submission.pretty_format}" + links << {href: uri, label:submission.pretty_format} latest = ontology.explore.latest_submission({ include_status: 'ready' }) if latest && latest.submissionId == submission.submissionId - link += " | CSV" + links << {href: "#{ontology.id}/download?apikey=#{get_apikey}&download_format=csv", label:"CSV"} if !latest.hasOntologyLanguage.eql?('UMLS') - link += " | RDF/XML" + links << {href: "#{ontology.id}/download?apikey=#{get_apikey}&download_format=rdf", label:"RDF/XML"} end end unless submission.diffFilePath.nil? uri = submission.id + "/download_diff?apikey=#{get_apikey}" - link = link + " | DIFF" + links << {href: uri, label:"DIFF"} end end - link + links + end + + def link?(string) + string.start_with?('http://') || string.start_with?('https://') end def mappings_link(ontology, count) @@ -380,6 +149,12 @@ def visibility_link(ontology) "#{link_name}" end + def show_category_name(domain) + acronym = domain.split('/').last.upcase + category = LinkedData::Client::Models::Category.find_by_acronym(acronym).first + category ? category.name : acronym + end + def visits_data(ontology = nil) ontology ||= @ontology @@ -480,7 +255,7 @@ def sections_to_show def language_selector_tag(name) languages = languages_options - if languages.empty? + if languages.empty? && @submission_latest content_tag(:div ,data: {'ontology-viewer-tabs-target': 'languageSelector'}, style: "visibility: #{ontology_data_section? ? 'visible' : 'hidden'} ; margin-bottom: -1px;") do render EditSubmissionAttributeButtonComponent.new(acronym: @ontology.acronym, submission_id: @submission_latest.submissionId, attribute: :naturalLanguage) do concat "Enable multilingual display " @@ -519,7 +294,55 @@ def dispaly_complex_text(definitions) end return html.html_safe end + def new_view_path(ont_id) + ont_id_esc = CGI.escape(ont_id) + if session[:user].nil? + "/login?redirect=#{escape("/ontologies/new?ontology[viewOf]=#{ont_id_esc}")}" + else + "/ontologies/new?ontology[viewOf]=#{ont_id_esc}" + end + end + def new_element_link(title, link) + link_to(link, title: title, class: "mx-1") do + inline_svg_tag("icons/plus.svg", width: '15px', height: '15px') + end + end + def ontology_icon_links(links, submission_latest) + links.map do |icon, attr| + value = submission_latest.nil? ? nil : submission_latest.send(attr) + + link_options = { style: "text-decoration: none; width: 30px; height: 30px" } + link_options[:class] = 'disabled-icon' if value.nil? + + link_to(inline_svg("#{icon}.svg"), Array(value).first || '', link_options) + end.join.html_safe + end + def ontology_depiction_card + return if Array(@submission_latest&.depiction).empty? + render Layout::CardComponent.new do + list_container(@submission_latest.depiction) do |depiction_url| + render Display::ImageComponent.new(src: depiction_url) + end + end + end + def metadata_formats_buttons + render SummarySectionComponent.new(title: 'Get my metadata back', show_card: false) do + content_tag :div, data: { controller: 'metadata-downloader' } do + horizontal_list_container([ + ['NQuads', 'N-Triple'], + ['JsonLd', 'Json-LD'], + ['XML', 'RDF/XML'] + ]) do |format, label| + render ChipButtonComponent.new(type: 'clickable', 'data-action': "metadata-downloader#download#{format}") do + concat content_tag(:span, label) + concat content_tag(:span, inline_svg("summary/download.svg", width: '15px', height: '15px')) + end + end + end + end + + end def count_subscriptions(ontology_id) users = LinkedData::Client::Models::User.all(include: 'subscription', display_context: false, display_links: false ) @@ -553,7 +376,7 @@ def error_message private def submission_languages(submission = @submission) - submission&.naturalLanguage.map { |natural_language| natural_language["iso639"] && natural_language.split('/').last }.compact + Array(submission&.naturalLanguage).map { |natural_language| natural_language["iso639"] && natural_language.split('/').last }.compact end end diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb index ca55ce95b..2fe2408d6 100644 --- a/app/helpers/submissions_helper.rb +++ b/app/helpers/submissions_helper.rb @@ -266,7 +266,7 @@ def extractable_metadatum_tooltip(options = {}) def attribute_infos(attr_label) - @metadata.select{ |attr_hash| attr_hash["attribute"].to_s.eql?(attr_label) }.first + submission_metadata.select{ |attr_hash| attr_hash["attribute"].to_s.eql?(attr_label) }.first end def attribute_help_text(attr) @@ -481,12 +481,14 @@ def generate_attribute_input(attr_label, options = {}) end - def generate_attribute_text(attr_label , label) + def generate_attribute_text(attr_label , label, tooltip: true) attr = attribute_infos(attr_label) label_html = "
    #{label}" # Generate tooltip - help_text = attribute_help_text(attr) - label_html << help_tooltip(help_text, {:id => "tooltip#{attr["attribute"]}"} ).html_safe + if tooltip + help_text = attribute_help_text(attr) + label_html << help_tooltip(help_text, {:id => "tooltip#{attr["attribute"]}"} ).html_safe + end label_html << '
    ' label_html.html_safe end diff --git a/app/javascript/controllers/application.js b/app/javascript/controllers/application.js index 185546806..f0624491d 100644 --- a/app/javascript/controllers/application.js +++ b/app/javascript/controllers/application.js @@ -14,6 +14,8 @@ import NestedForm from 'stimulus-rails-nested-form' application.register('nested-form', NestedForm) import ReadMore from 'stimulus-read-more' application.register('read-more', ReadMore) +import Timeago from 'stimulus-timeago' +application.register('timeago', Timeago) export { application } diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index 33e05b02d..59ac72d22 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -43,12 +43,16 @@ application.register("load-chart", LoadChartController) import MetadataDownloaderController from "./metadata_downloader_controller" application.register("metadata-downloader", MetadataDownloaderController) +import OntologyRelationsNetworkController from "./ontology_relations_network_controller" +application.register("ontology-relations-network", OntologyRelationsNetworkController) + import OntologyViewerTabsController from "./ontology_viewer_tabs_controller" application.register("ontology-viewer-tabs", OntologyViewerTabsController) import OntoportalAutocompleteController from "./ontoportal_autocomplete_controller" application.register("ontoportal-autocomplete", OntoportalAutocompleteController) + import PlatformLanguageController from "./platform_language_controller" application.register("platform-language", PlatformLanguageController) diff --git a/app/javascript/controllers/metadata_downloader_controller.js b/app/javascript/controllers/metadata_downloader_controller.js index c1f2a5b69..415b22223 100644 --- a/app/javascript/controllers/metadata_downloader_controller.js +++ b/app/javascript/controllers/metadata_downloader_controller.js @@ -57,7 +57,7 @@ export default class extends Controller { if (subJson["hasDomain"] == null) { subJson["hasDomain"] = ontJson["hasDomain"]; } else { - subJson["hasDomain"] = subJson["hasDomain"].split(", ").concat(ontJson["hasDomain"]); + subJson["hasDomain"] = subJson["hasDomain"].join(', ').split(", ").concat(ontJson["hasDomain"]); /* make the array unique: var unique = arr.filter(function(elem, index, self) { return index == self.indexOf(elem); diff --git a/app/javascript/controllers/ontology_relations_network_controller.js b/app/javascript/controllers/ontology_relations_network_controller.js new file mode 100644 index 000000000..7043a8384 --- /dev/null +++ b/app/javascript/controllers/ontology_relations_network_controller.js @@ -0,0 +1,169 @@ +import {Controller} from "@hotwired/stimulus" +import { Network, DataSet } from 'vis-network/standalone/esm/vis-network.min.js'; + +// Connects to data-controller="ontology-relations-network" +export default class extends Controller { + static values = { + data: Array + } + + static targets = ["container"] + + connect() { + this.build() + } + + + build(){ + this.#buildNetwork(this.dataValue); + } + /** + * Build the VIS network for ontologies relations: http://visjs.org/docs/network/ + * @param ontologyRelationsArray + */ + #buildNetwork(ontologyRelationsArray) { + const nodes = new DataSet([]) + // create an array with edges + const edges = new DataSet(); + + let propertyCount = 1; // To define nodes IDs + + // Hash with nodes id for each ontology URI + let nodeIds = {}; + + /* Get the relations that have been selected + if (jQuery("#selected_relations").val() !== null) { + selected_relations = jQuery("#selected_relations").val() + }*/ + + let selected_relations = []; + this.relationCheckTargets = Array.from(this.element.querySelectorAll('option')) + this.relationCheckTargets.forEach((elem) => { + if (elem.selected) { + selected_relations.push(elem.value); + } + }) + + ontologyRelationsArray.forEach((relation) => { + let targetNodeNumber + let sourceNodeNumber + + // If relations have been selected for filtering then we don't show others relations + if (!selected_relations.includes(relation["relation"])) { + return + } + + // Don't create a new node if node exist already, just add a new edge + if ( nodeIds[relation["source"]] != null) { + sourceNodeNumber = nodeIds[relation["source"]]; + } else { + sourceNodeNumber = propertyCount; + // If the node is the source it means it is from the Portal, so we colorate it in green + nodes.add([ + {id: sourceNodeNumber, label: relation["source"], color: "#5cb85c"} + ]); + nodeIds[relation["source"]] = propertyCount; + propertyCount++; + } + + // Create the target node if don't exist + if (nodeIds[relation["target"]] != null) { + targetNodeNumber = nodeIds[relation["target"]]; + } else { + targetNodeNumber = propertyCount; + // If target node is an ontology from the portal then node in green + if (relation["targetInPortal"]) { + nodes.add([ + {id: targetNodeNumber, label: relation["target"], color: "#5cb85c"} + ]); + } else { + nodes.add([ + {id: targetNodeNumber, label: relation["target"]} + ]); + } + nodeIds[relation["target"]] = propertyCount; + propertyCount++; + } + + edges.add([ + { + from: sourceNodeNumber, + to: targetNodeNumber, + label: relation["relation"], + font: {align: 'horizontal'} + } + ]); + }) + + + + // create a network + const container = this.containerTarget; + // provide the data in the vis format + + const data = { + nodes: nodes, + edges: edges + }; + + // Get height of div + const networkHeight = container.clientHeight.toString(); + + const options = { + autoResize: true, + height: networkHeight, + groups: { + useDefaultGroups: true, + myGroupId: { + /*node options*/ + } + }, + edges: { + color: {inherit: 'both'}, + smooth: { + enabled: true, + type: "dynamic", + roundness: 0.5 + } + }, + nodes: { + shape: "box" + }, + physics: { + // http://visjs.org/docs/network/physics.html + enabled: true, + // To stabilize faster, increase the minVelocity value + minVelocity: 1, + stabilization: { + enabled: true, + onlyDynamicEdges: false, + fit: true + }, + barnesHut: { + gravitationalConstant: -1500, + centralGravity: 0, + springLength: 300, + springConstant: 0.01, + damping: 0.2, + avoidOverlap: 0.2 + }, + hierarchicalRepulsion: { // not used at the moment + centralGravity: 0.0, + springLength: 500, + springConstant: 0.2, + damping: 1, + nodeDistance: 170 + }, + solver: 'barnesHut' + }, + interaction: { + zoomView: false, + navigationButtons: true + } + }; + + // initialize your network! + const network = new Network(container, data, options); + network.fit(); + } +} diff --git a/app/javascript/controllers/tooltip_controller.js b/app/javascript/controllers/tooltip_controller.js index f9bc3ca02..49bf93eee 100644 --- a/app/javascript/controllers/tooltip_controller.js +++ b/app/javascript/controllers/tooltip_controller.js @@ -4,6 +4,8 @@ import useTooltip from "../mixins/useTooltip"; // Connects to data-controller="tooltip" export default class extends Controller { connect() { - useTooltip(this.element) + if(this.element.title && this.element.title !== ''){ + useTooltip(this.element) + } } } diff --git a/app/views/fair_score/_fair_service_header.html.haml b/app/views/fair_score/_fair_service_header.html.haml index 61321623d..f462f97dc 100644 --- a/app/views/fair_score/_fair_service_header.html.haml +++ b/app/views/fair_score/_fair_service_header.html.haml @@ -1,10 +1,9 @@ %span %span - FAIR Scores %span.badge.badge-pill.badge-secondary beta %span = link_to("https://github.com/agroportal/fairness", target: "_blank", "aria-label": t("view_fair_scores_definitions"), title: t("view_fair_scores_definitions")) do - %i.fas.fa-lg.fa-question-circle{"aria-hidden": "true", style: "margin-left: 0.5rem"} + %i.fas.fa-question-circle{"aria-hidden": "true", style: "margin-left: 0.5rem"} = link_to(get_fairness_service_url,id: "fairness-service-url", target: "_blank", "aria-label": t("get_json_version"), title: t("get_json_version")) do - %i.fas.fa-lg.fa-code{"aria-hidden": "true", style: "margin-left: 0.5rem" } \ No newline at end of file + %i.fas.fa-code{"aria-hidden": "true", style: "margin-left: 0.5rem" } \ No newline at end of file diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 248c0f115..6461297cb 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -22,24 +22,24 @@ .home-bubble.home-bubble-one %h5 = @anal_ont_names[0] - %p + %p = @anal_ont_numbers[0].to_s + " visits" .home-bubble.home-bubble-two %h5 = @anal_ont_names[1] - %p + %p = @anal_ont_numbers[1].to_s + " visits" .home-bubble.home-bubble-three %h5 = @anal_ont_names[2] - %p + %p = @anal_ont_numbers[2].to_s + " visits" %a.home-bubble.home-bubble-four{:href => "/visits"} %h5 ... .home-header-title-container .home-header-title - %h4 + %h4 = t('.welcome', site: $SITE) %p = t('.tagline') @@ -91,10 +91,10 @@ - if fairness_service_enabled? %div#fair-home{data:{controller:"fair-score-home"}} = render partial: "shared/fair_score_bars", locals: {data: nil} - %a{:href => "#fairDetails"} - %div.home-fair-details - %p See details - = inline_svg_tag "arrow-right.svg" + %a{:href => "#fairDetails"} + %div.home-fair-details + %p See details + = inline_svg_tag "arrow-right.svg" .home-sub-section-right %h4 News %hr.home-section-line @@ -106,13 +106,13 @@ .home-statistics-container .home-agroportal-figures = inline_svg_tag "ontoportal-icon.svg" - %p + %p = portal_name+" in figures:" .home-statistics .home-statistics-item %hr/ %div - %h4 + %h4 = number_with_delimiter(@ont_count, :delimiter => ",") %p Ontologies .home-statistics-item diff --git a/app/views/layouts/appliance.html.haml b/app/views/layouts/appliance.html.haml index 5794e4865..d99cfaac7 100644 --- a/app/views/layouts/appliance.html.haml +++ b/app/views/layouts/appliance.html.haml @@ -28,7 +28,7 @@ %body{:class => "#{controller_name} #{action_name}"} = render partial: "layouts/topnav" - %div.container-fluid.flex-grow-1 + %div.flex-grow-1 = render partial: "layouts/notices" = modal_frame_container diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 41173aaf9..30474e193 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -15,13 +15,13 @@ = @ontology.name %span = "("+ @ontology.acronym+")" - - unless sub.hasLicense.nil? + - unless sub.nil? || sub.hasLicense.nil? = render ChipButtonComponent.new(class: 'chip_button_small') do = link_to_modal(nil, "/ajax/submission/show_licenses/#{@ontology.acronym}",data: { show_modal_title_value: "More licenses", show_modal_size_value: 'modal-xl' }) do = attribute_enforced_values('hasLicense')[sub.hasLicense] || sub.hasLicense = inline_svg_tag "icons/popup-link.svg" - - unless sub.creationDate.nil? + - unless sub.nil? || sub.creationDate.nil? .ontology-details-last-update %img{src: asset_path("update.svg")}/ %div diff --git a/app/views/ontologies/_fairs_score.html.haml b/app/views/ontologies/_fairs_score.html.haml index 26a98885c..95602dc6a 100644 --- a/app/views/ontologies/_fairs_score.html.haml +++ b/app/views/ontologies/_fairs_score.html.haml @@ -6,17 +6,18 @@ }) - if @fair_scores_data - - text = "Total score : #{@fair_scores_data[:score]} ( #{@fair_scores_data[:normalizedScore]}% ) details" - = link_to_modal(text.html_safe, - "/ajax/fair_score/html/?ontologies=#{@ontology.acronym}", - class: "btn btn-primary w-100", - data: { show_modal_title_value: "FAIRness assessment questions", show_modal_size_value: 'modal-xl' }, - ) - %div.statistics_container{data:{controller:"fair-score-summary"}} - %div + %div.statistics_container.d-flex.flex-grow-1{data:{controller:"fair-score-summary"}} + %div.w-50 = render partial: "shared/fair_score_radar" , locals: {data: @fair_scores_data} - %div + %div.w-50 = render partial: "shared/fair_score_bars" , locals: {data: @fair_scores_data} + %div.text-center + - text = " See details" + = link_to_modal(text.html_safe, + "/ajax/fair_score/html/?ontologies=#{@ontology.acronym}", + class: "btn", + data: { show_modal_title_value: "FAIRness assessment questions", show_modal_size_value: 'modal-xl' }, + ) - else %p.font-italic= "We are still collecting data for #{@ontology.acronym}" diff --git a/app/views/ontologies/_ontology_views.html.haml b/app/views/ontologies/_ontology_views.html.haml new file mode 100644 index 000000000..b500e0346 --- /dev/null +++ b/app/views/ontologies/_ontology_views.html.haml @@ -0,0 +1,8 @@ +- if @views.empty? + = empty_state_message "No views of #{@ontology.acronym} available" +- else + %div.border-top + %dl + - @view_decorators.each do |view_decorator| + %dt= view_decorator.linked_name + %dd= view_decorator.description \ No newline at end of file diff --git a/app/views/ontologies/_visits.html.haml b/app/views/ontologies/_visits.html.haml index bb2420bb2..13266ac02 100644 --- a/app/views/ontologies/_visits.html.haml +++ b/app/views/ontologies/_visits.html.haml @@ -2,4 +2,4 @@ %canvas#visits_chart{data: {controller:'load-chart' , 'load-chart-labels-value': @visits_data[:labels].last(13), 'load-chart-datasets-value': visits_chart_dataset(@visits_data[:visits].last(13))}} - else - %p.font-italic= "We are still collecting data for #{@ontology.acronym}" + = empty_state_message "We are still collecting data for #{@ontology.acronym}" diff --git a/app/views/ontologies/sections/_additional_metadata.html.haml b/app/views/ontologies/sections/_additional_metadata.html.haml new file mode 100644 index 000000000..0054b4c76 --- /dev/null +++ b/app/views/ontologies/sections/_additional_metadata.html.haml @@ -0,0 +1,18 @@ += turbo_frame_tag 'application_modal_content' do + - sub_hash = @submission_latest.to_hash.except(:context, :links, :ontology) + %div.card.overflow-hidden{style: 'border-radius: 20px;'} + %div + = render Display::AlertComponent.new(closable: false) do + %div.d-flex.align-items-center + %div{style:'width: 50px; height: 50px'} + - sub_values = sub_hash.values + - count = sub_values.count{|x| !(x.nil? || x.to_s.empty?)} + = render CircleProgressBarComponent.new(count: count , max: sub_values.size ) + %div.mx-1 + of the metadata attributes were filled + %section.px-4{style:'height: 70vh; overflow-y: scroll'} + = render SubmissionMetadataComponent.new(submission: @submission_latest, submission_metadata: submission_metadata) unless @submission_latest.nil? + %div.scroll-message.text-center.py-3.bg-light.text-primary + %p.scroll-text.mb-0 + Scroll down to see more + %i.scroll-icon.fa.fa-chevron-down diff --git a/app/views/ontologies/sections/_licenses.html.haml b/app/views/ontologies/sections/_licenses.html.haml index b9899f6dd..e966e7608 100644 --- a/app/views/ontologies/sections/_licenses.html.haml +++ b/app/views/ontologies/sections/_licenses.html.haml @@ -1,10 +1,3 @@ -= turbo_frame_tag 'application_modal_content' do - - @licenses.each do |attribute| - - attr = attribute_infos(attribute) - - value = Array(@submission_latest.send(attribute)) - .creation_info - %p.description_text - = attr["label"] || attribute - %p.normal_text - = value.join(", ") - += render_in_modal do + = render Layout::ListComponent.new do |l| + = properties_list_component(l, @licenses.map { |x| [x.to_s, @submission_latest.send(x.to_s)] }.to_h) diff --git a/app/views/ontologies/sections/_metadata.html.haml b/app/views/ontologies/sections/_metadata.html.haml old mode 100644 new mode 100755 index 655e20bf1..3b575d5b5 --- a/app/views/ontologies/sections/_metadata.html.haml +++ b/app/views/ontologies/sections/_metadata.html.haml @@ -1,189 +1,66 @@ = turbo_frame_tag 'summary', target:"_top" do - %div.ont-metadata - -# Details pane - %section.ont-metadata-card.ont-details-card - %header.pb-2.font-weight-bold= t('ontology_details.metadata.details') - %table.table.table-sm - %tr - %td= t('ontology_details.metadata.acronym') - %td= @ontology.acronym - %tr - %td= t('ontology_details.metadata.visibility') - %td= strip_links(visibility_link(@ontology)) - - if @ontology.viewing_restricted? - %tr - %td= t('ontology_details.metadata.viewing_restriction') - %td= @ontology.viewingRestriction.capitalize - - unless @ontology.viewOf.nil? - %tr - %td= t('ontology_details.metadata.view_of_ontology') - %td - - ont_parent_acronym = @ontology.viewOf.split('/').last - - if $PURL_ENABLED - - ont_url = @ontology.purl.sub(@ontology.acronym, ont_parent_acronym) - - else - - ont_url = @ontology.links['ui'].sub(@ontology.acronym, ont_parent_acronym) - = link_to(ont_parent_acronym, ont_url) - - unless @submission_latest.nil? - %tr - %td= t('ontology_details.metadata.description') - %td= sanitize(@submission_latest.description) - %tr - %td= t('ontology_details.metadata.status') - %td= @submission_latest.status.capitalize unless @submission_latest.status.nil? - %tr - %td= t('ontology_details.metadata.format') - %td= @submission_latest.hasOntologyLanguage - %tr - %td= t('ontology_details.metadata.contact') - %td= raw @submission_latest.contact.map {|c| [c.name, c.email].join(", ") if c.member?(:name) && c.member?(:email)}.join("
    ") - - categories_hash = LinkedData::Client::Models::Category.all_to_hash - - categories = @ontology.hasDomain - - unless categories.empty? - %tr - %td= t('ontology_details.metadata.categories') - %td= categories.map {|c| categories_hash[c].name}.sort.join(", ") - - groups_hash = LinkedData::Client::Models::Group.all_to_hash - - groups = @ontology.group - - unless groups.empty? - %tr - %td= t('ontology_details.metadata.groups') - %td= groups.map {|g| groups_hash[g].name}.sort.join(", ") - - if @ontology.admin?(session[:user]) - %tr - %td= t('ontology_details.metadata.pull_url') - %td - = link_to @submission_latest.pullLocation, @submission_latest.pullLocation - = raw additional_details + .summary-page-center + .summary-page-first-row + = render partial: 'ontologies/sections/metadata/ontology_description_section' + = render partial: 'ontologies/sections/metadata/ontology_fairness_section' + = render partial: 'ontologies/sections/metadata/ontology_relations_network' + = render partial: 'ontologies/sections/metadata/ontology_submissions_section' + = render partial: 'ontologies/sections/metadata/ontology_metrics_section' + .summary-page-second-row + = ontology_depiction_card + = properties_card('Identifiers','Principal identifiers of the ontology', @identifiers) do |values| + = horizontal_list_container(values) do |v| + = render LinkFieldComponent.new(value: v) - = render partial: 'additional_metadata' + = properties_dropdown('dates','Dates','', @dates_properties) do |values| + = horizontal_list_container(values) do |v| + = render DateTimeFieldComponent.new(value: v) - -# Submissions pane - %section.ont-metadata-card.ont-subs-card - %div.ont-section-toolbar - %header.pb-2.font-weight-bold= t('ontology_details.metadata.submissions') - - if @ontology.admin?(session[:user]) - = link_to(new_ontology_submission_path(@ontology.acronym), "aria-label": t('ontology_details.metadata.add_submission'), title: t('ontology_details.metadata.add_submission')) do - %i.fas.fa-lg.fa-plus-circle{"aria-hidden": "true", style: "margin-left: 0.75rem;"} - - unless (@submission_latest.nil? || (@submission_latest.respond_to?(:status) && @submission_latest.status == 404)) - = link_to(edit_ontology_submission_path(@ontology.acronym, @submission_latest.submissionId), "aria-label": t('ontology_details.metadata.edit_latest_submission'), title: t('ontology_details.metadata.edit_latest_submission')) do - %i.fas.fa-user-edit{"aria-hidden": "true", style: "margin-left: 0.5rem;"} - = render TurboFrameComponent.new(id: 'ontology_submissions', src: ontology_submissions_path(@ontology.acronym), target: '_top') + = properties_dropdown('person_and_organization','Persons and organizations','', @agents_properties) do |values| + = horizontal_list_container(values) do |v| + = render ChipButtonComponent.new(type: "static",'data-controller':' tooltip', title: '', class: 'text-truncate', style: 'max-width: 280px; display:block; line-height: unset') do + = display_agent(v, link: false) + = properties_dropdown('link','Links','Metadata properties that highlight the links enabling access to datasets, downloading semantic resources, etc', @links_properties) - -# Views pane (don't show if the ontology is a view - we don't allow views of views). - - unless @ontology.view? - %section.ont-metadata-card.ont-views-card - %div.ont-section-toolbar - %header.pb-2.font-weight-bold= "#{t('ontology_details.metadata.views_of')} #{@ontology.acronym}" - - ont_id_esc = CGI.escape(@ontology.id) - -# TODO: I don't think we should have brackets in the URL parameters. - - if session[:user].nil? - %a{href: "/login?redirect=#{escape("/ontologies/new?ontology[viewOf]=#{ont_id_esc}")}", "aria-label": t('ontology_details.metadata.create_new_view'), title: t('ontology_details.metadata.create_new_view')} - %i.fas.fa-lg.fa-plus-circle{"aria-hidden": "true", style: "margin-left: 0.5rem;"} - - else - %a{href: "/ontologies/new?ontology[viewOf]=#{ont_id_esc}"} - %i.fas.fa-lg.fa-plus-circle{"aria-hidden": "true", style: "margin-left: 0.5rem;"} - - if @views.empty? - %p.font-italic= t('ontology_details.metadata.no_views_of', name: @ontology.acronym) - - else - %div.border-top - %dl - - @view_decorators.each do |view_decorator| - %dt= view_decorator.linked_name - %dd= view_decorator.description + = properties_dropdown('projects_section','Projects and usage information','Details pertaining to the utilization of the ontology.', nil) do |c| + - c.row do + = render FieldContainerComponent.new do |f| + - f.label do + Projects using #{@ontology.acronym} + = new_element_link('Create new project', new_project_path) - %div.right-hand-content + - if @projects.empty? + = empty_state_message("No projects using #{@ontology.acronym}") + - else + = horizontal_list_container(@projects) do |project| + = render ChipButtonComponent.new(url: project_path(project.acronym), text: project.name, type: "clickable") + - properties_list_component(c, @projects_properties) - -# Misc links pane - %section.ont-metadata-card.ont-links-card - %div.ont-section-toolbar - %header.pb-2.font-weight-bold= t('ontology_details.metadata.links') - %a{:href => "#{(@submission_latest || @ontology).id}?display=all", :target => '_blank', :class => "btn btn-primary"}= t('ontology_details.metadata.go_to_rest_api_json_entry') + = properties_dropdown('methodology','Methodology', 'Metadata properties primarily encompass the design, methods, and actions to create the ontology. This includes elements such as the tools and software employed by the creator of the ontology during its configuration', @methodology_properties) - -# Metadata links pane - %section.ont-metadata-card.ont-metadatalinks-card - %div.ont-section-toolbar - %header.pb-2.font-weight-bold= t('ontology_details.metadata.get_my_metadata_back') - %div - - unless @submission_latest.nil? - %div{data:{controller: 'metadata-downloader'}} - =javascript_include_tag "jsonld" - %button{:id => "getMetadataBackNquadsBtn", :class => "btn btn-primary", 'data-action': 'metadata-downloader#downloadNQuads'}= t('ontology_details.metadata.n_triple') - %button{:id => "getMetadataBackJsonldBtn", :class => "btn btn-primary", 'data-action': 'metadata-downloader#downloadJsonLd'}= t('ontology_details.metadata.json_ld') - %button{:id => "getMetadataBackXmlBtn", :class => "btn btn-primary", 'data-action': 'metadata-downloader#downloadXML'}= t('ontology_details.metadata.rdf_xml') - -# Listener in bp_ontology_viewer.js.erb - -# Fair score pane - -# TODO temporary hide fairness_service for AGROVOC after there demand - - if fairness_service_enabled? && @ontology.acronym != 'AGROVOC' - %section.ont-metadata-card.ont-fair-score-card#fair-summary - %div.ont-section-toolbar - %header.pb-2.font-weight-bold - = render partial: "fair_score/fair_service_header" - %div#fair-score-charts-container - = render partial: "fairs_score" + = render Layout::CardComponent.new do |c| + - c.header do |h| + - h.text do + Visits + - if visits_data(@ontology) + = link_to(@ontology.links["analytics"] + "?apikey=#{get_apikey}&format=csv", title: "Download as CSV") do + = inline_svg("summary/download.svg", width: '30px', height: '20px') - -# Metrics pane - %section.ont-metadata-card.ont-metrics-card - %div.ont-section-toolbar - %header.pb-2.font-weight-bold= t('ontology_details.metadata.metrics') - = link_to(Rails.configuration.settings.links[:metrics], target: "_blank", "aria-label": t('ontology_details.metadata.view_individual_metrics_definitions'), title: t('ontology_details.metadata.view_individual_metrics_definitions')) do - %i.fas.fa-lg.fa-question-circle{"aria-hidden": "true", style: "margin-left: 0.5rem"} - - if @metrics.nil? || (@metrics.is_a?(Array) && @metrics.empty?) || (@metrics.respond_to?(:status) && @metrics.status == 404) - %p.font-italic= "#{t('ontology_details.metadata.metrics_not_calculated_yet')} #{@ontology.acronym}" - - else - %table.table.table-sm - %tr - %td= t('ontology_details.metadata.classes') - %td{style: "text-align: right"}= number_with_delimiter(@metrics.classes) - %tr - %td= t('ontology_details.metadata.individuals') - %td= number_with_delimiter(@metrics.individuals) - %tr - %td= t('ontology_details.metadata.properties') - %td= number_with_delimiter(@metrics.properties) - %tr - %td= t('ontology_details.metadata.max_depth') - %td= number_with_delimiter(@metrics.maxDepth) - %tr - %td= t('ontology_details.metadata.max_children') - %td= number_with_delimiter(@metrics.maxChildCount) - %tr - %td= t('ontology_details.metadata.avg_children') - %td= number_with_delimiter(@metrics.averageChildCount) - %tr - %td= t('ontology_details.metadata.single_child_classes') - %td= number_with_delimiter(@metrics.classesWithOneChild) - %tr - %td= t('ontology_details.metadata.many_children_classes') - %td= number_with_delimiter(@metrics.classesWithMoreThan25Children) - %tr - %td= t('ontology_details.metadata.no_definition_classes') - %td= number_with_delimiter(@metrics.classesWithNoDefinition) - -# Visits pane - %section.ont-metadata-card.ont-analytics-card - %div.ont-section-toolbar - %header.pb-2.font-weight-bold= t('ontology_details.metadata.visits') - - if visits_data(@ontology) - = link_to(@ontology.links["analytics"] + "?apikey=#{get_apikey}&format=csv", "aria-label": t('ontology_details.metadata.download_as_csv'), title: t('ontology_details.metadata.download_as_csv')) do - %i.fas.fa-lg.fa-download{"aria-hidden": "true", style: "margin-left: 0.5rem"} - = render partial: "visits" + = render Layout::ListComponent.new do |l| + - l.row do + = render partial: "visits" - -# Included in data catalog pane - = raw display_data_catalog(@submission_latest) unless @submission_latest.nil? - -# Logo & depiction - = raw display_logo(@submission_latest) unless @submission_latest.nil? - - -# Projects pane - %section.ont-metadata-card.ont-projects-card - %div.ont-section-toolbar - %header.pb-2.font-weight-bold= "#{t('ontology_details.metadata.projects_using')} #{@ontology.acronym}" - = link_to(new_project_path(), "aria-label": t('ontology_details.metadata.create_new_project'), title: t('ontology_details.metadata.create_new_project')) do - %i.fas.fa-lg.fa-plus-circle{"aria-hidden": "true", style: "margin-left: 0.5rem"} - - if @projects.empty? - %p.font-italic= "#{t('ontology_details.metadata.no_projects_using')} #{@ontology.acronym}" - - else - %div.border-top - - for project in @projects - %p= link_to(project.name, project_path(project.acronym)) + - unless @ontology.view? + = render Layout::CardComponent.new do |d| + - d.header do |h| + - h.text do + Views of #{@ontology.acronym} + = new_element_link('Create new view', new_view_path(@ontology.id)) + = render Layout::ListComponent.new do |l| + - l.row do + = render partial: 'ontology_views' + - unless @submission_latest.nil? + = javascript_include_tag("jsonld") + = metadata_formats_buttons \ No newline at end of file diff --git a/app/views/ontologies/sections/metadata/_metrics_evolution_graph.html.haml b/app/views/ontologies/sections/metadata/_metrics_evolution_graph.html.haml new file mode 100644 index 000000000..a8791f2da --- /dev/null +++ b/app/views/ontologies/sections/metadata/_metrics_evolution_graph.html.haml @@ -0,0 +1,26 @@ += turbo_frame_tag 'application_modal_content' do + %canvas#metrics_evolution_chart + :javascript + + var metrics = #{raw data.to_json}; + var key = Object.entries(metrics)[0][0] + var numbers = Object.entries(metrics)[0][1] + + // Create a line chart + var ctx = document.getElementById('metrics_evolution_chart').getContext('2d'); + console.log(key, numbers) + var metricsChart = new Chart(ctx, { + type: 'line', + data: { + labels: numbers.map((_, index) => `Submission ${index + 1}`), + datasets: [ + { + label: key, + data: numbers, + borderColor: 'rgba(75, 192, 192, 1)', + backgroundColor: 'rgba(75, 192, 192, 0.2)', + } + ] + }, + options: {} + }) \ No newline at end of file diff --git a/app/views/ontologies/sections/metadata/_ontology_description_section.html.haml b/app/views/ontologies/sections/metadata/_ontology_description_section.html.haml new file mode 100644 index 000000000..4fc4c21c7 --- /dev/null +++ b/app/views/ontologies/sections/metadata/_ontology_description_section.html.haml @@ -0,0 +1,53 @@ += render Layout::CardComponent.new do |c| + - c.header(text: 'General information') + = render Layout::ListComponent.new do |l| + - l.row do + .d-flex.align-items-center + .description_text + = render TextAreaFieldComponent.new(value: @submission_latest&.description) + - unless @submission_latest&.logo.nil? + = image_tag(@submission_latest&.logo, class: 'description_img') + - l.row do + %span.creation_text + - if @submission_latest&.released + Initial release occurred on + %span.date_creation_text= l(Date.parse(@submission_latest.released), format: :monthfull_day_year) + '.' + - if @submission_latest&.contact + For additional information, reach out + %span.creator_text + = display_contact(@submission_latest.contact) + + - unless Array(@submission_latest&.naturalLanguage).empty? + - l.row do + = render FieldContainerComponent.new(label: 'Languages') do + = horizontal_list_container(Array(@submission_latest&.naturalLanguage)) do |v| + = render LanguageFieldComponent.new(value: v) + + - if @ontology.admin?(session[:user]) && @submission_latest&.pullLocation + - l.row do + = render FieldContainerComponent.new(label: 'Pull location') do + = horizontal_list_container([@submission_latest&.pullLocation]) do |v| + = render LinkFieldComponent.new(value: v) + - unless Array(@submission_latest&.keywords).empty? && Array(@submission_latest&.keyClasses).empty? + - l.row do + = render FieldContainerComponent.new(label: 'Keywords and classes') do + - values = (Array(@submission_latest&.keywords) + Array(@submission_latest&.keyClasses)) + - values = values.map{|x| x.split(',')}.flatten + = horizontal_list_container(values) do |v| + - if link?(v) + = raw get_link_for_cls_ajax(v, @ontology.acronym, '_blank') + - else + = render ChipButtonComponent.new(text: v, type: "static") + + - unless Array(@ontology.hasDomain).empty? + - l.row do + = render FieldContainerComponent.new(label: 'Categories and subjects') do + = horizontal_list_container(@ontology.hasDomain) do |v| + = render ChipButtonComponent.new(text: show_category_name(v), type: "static") + + %hr.w-100.my-3 + .icons_container + = ontology_icon_links(@ontology_icon_links, @submission_latest) + %hr.w-100.my-3 + %div.text-center.pb-3 + = link_to_modal('See all metadata...', "/ajax/submission/show_additional_metadata/#{@ontology.acronym}",data: { show_modal_title_value: "All metadata properties", show_modal_size_value: 'modal-xl' }) \ No newline at end of file diff --git a/app/views/ontologies/sections/metadata/_ontology_fairness_section.html.haml b/app/views/ontologies/sections/metadata/_ontology_fairness_section.html.haml new file mode 100644 index 000000000..550776961 --- /dev/null +++ b/app/views/ontologies/sections/metadata/_ontology_fairness_section.html.haml @@ -0,0 +1,15 @@ +- if fairness_service_enabled? && @ontology.acronym != 'AGROVOC' && @fair_scores_data + = render SummarySectionComponent.new(title: 'FAIR score') do |s| + - s.action_link do + = render partial: "fair_score/fair_service_header" + + %div.p-2 + %section.ont-metadata-card.ont-fair-score-card#fair-summary + %div.ont-section-toolbar.justify-content-between.flex-row-reverse + %div.align-items-start + .btn.btn-primary.rounded-pill.right-button + .span Total score : #{@fair_scores_data[:score]} ( #{@fair_scores_data[:normalizedScore]}% ) + + %div#fair-score-charts-container + = render partial: "fairs_score" + .account-page-card-sub-container \ No newline at end of file diff --git a/app/views/ontologies/sections/metadata/_ontology_metrics_section.html.haml b/app/views/ontologies/sections/metadata/_ontology_metrics_section.html.haml new file mode 100644 index 000000000..ffe69f38d --- /dev/null +++ b/app/views/ontologies/sections/metadata/_ontology_metrics_section.html.haml @@ -0,0 +1,15 @@ += render SummarySectionComponent.new(title: "Metrics" , link: Rails.configuration.settings.links[:metrics], link_title: "Metadata properties that provide information about measurements of the ontology, such as the number of classes, individuals, etc.", show_card: false) do + - if @metrics.nil? || (@metrics.is_a?(Array) && @metrics.empty?) || (@metrics.respond_to?(:status) && @metrics.status == 404) + = empty_state_message("We have not yet calculated metrics for #{@ontology.acronym}") + - else + .metrics-container.metrics + - %w[classes individuals properties].each do |metric| + = link_to_modal nil, ontology_path(@ontology.acronym) + "/metrics_evolution?metrics_key=#{metric}", + class: "metrics-item", data: { show_modal_title_value: "Metrics evolution of #{@ontology.acronym}"} do + %hr + %div + %h4 + = @metrics.send(metric) + %p + = render PopupLinkTextComponent.new(text: metric.humanize) + diff --git a/app/views/ontologies/sections/metadata/_ontology_relations_network.html.haml b/app/views/ontologies/sections/metadata/_ontology_relations_network.html.haml new file mode 100644 index 000000000..3064d1a8d --- /dev/null +++ b/app/views/ontologies/sections/metadata/_ontology_relations_network.html.haml @@ -0,0 +1,13 @@ +- unless @ontology_relations_data.nil? || @ontology_relations_data.empty? + = render SummarySectionComponent.new(title: 'Ontology relations network') do + %div.d-flex.flex-column.justify-content-center{data: {controller: "ontology-relations-network", "ontology-relations-network-data-value": @ontology_relations_data.to_json.html_safe }} + %button.btn.btn-link.m-2{'data-toggle': "collapse",'data-target': "#ontologyRelations"} + %span= t("landscape.filter_network") + %i.fas.fa-chevron-down + %div#ontologyRelations.collapse.flex-row.flex-wrap.px-2.my-1.fade{'data-action': "change->ontology-relations-network#build"} + - values = @relations_array.map{|relation| ["#{attr_label(relation.split(':').last)}(#{relation})", relation]} + = render SelectInputComponent.new(id:'relation-network', name: 'selectedRelations[]', values: values, selected:@relations_array , multiple: true) + + %div{:style => "width: 100%;"} + %div#networkContainer{:style => "height: 465px; width: 100%;", "data-ontology-relations-network-target": "container" } + %div#ontologyNetwork \ No newline at end of file diff --git a/app/views/ontologies/sections/metadata/_ontology_submissions_section.html.haml b/app/views/ontologies/sections/metadata/_ontology_submissions_section.html.haml new file mode 100644 index 000000000..1f90304f5 --- /dev/null +++ b/app/views/ontologies/sections/metadata/_ontology_submissions_section.html.haml @@ -0,0 +1,10 @@ += render SummarySectionComponent.new(title: 'Submissions') do |s| + - if @ontology.admin?(session[:user]) + - s.action_link do + = link_to(new_ontology_submission_path(@ontology.acronym), "aria-label": "Add submission", title: "Add submission") do + %i.fas.fa-plus-circle + - unless @submission_latest.nil? || (@submission_latest.respond_to?(:status) && @submission_latest.status == 404) + - s.action_link do + = link_to(edit_ontology_submission_path(@ontology.acronym, @submission_latest.submissionId), "aria-label": "Edit latest submission", title: "Edit latest submission") do + %i.fas.fa-user-edit + = render TurboFrameComponent.new(id: 'ontology_submissions', src: ontology_submissions_path(@ontology.acronym)) \ No newline at end of file diff --git a/app/views/submissions/_form_content.html.haml b/app/views/submissions/_form_content.html.haml index 695a941b0..7ff7806a9 100644 --- a/app/views/submissions/_form_content.html.haml +++ b/app/views/submissions/_form_content.html.haml @@ -83,7 +83,7 @@ - data.each do |d| = metadata_section(d[0], d[1], parent_id: "description-card") do - - for attr in @metadata.select { |m| m['display'] == d[2] } + - for attr in submission_metadata.select { |m| m['category'] == d[2] } = form_group_attribute(attr["attribute"]) %div#ontology-dates-card.mt-4 @@ -91,7 +91,7 @@ = form_group_attribute("released", default: Date.today, required: true) = form_group_attribute("modificationDate") = metadata_section('more-dates', 'More dates', parent_id: "ontology-dates-card") do - - for attr in @metadata.select { |m| m['display'] == 'dates' } + - for attr in submission_metadata.select { |m| m['category'] == 'dates' } = form_group_attribute(attr["attribute"]) %div#licenses-card.mt-4 @@ -106,7 +106,7 @@ to choose your license = metadata_section('more-licensing-info', 'More licensing information', parent_id: "licenses-card") do - - for attr in @metadata.select { |m| m['display'] == 'license' } + - for attr in submission_metadata.select { |m| m['category'] == 'license' } = form_group_attribute(attr["attribute"]) %div#community.mt-4 @@ -128,11 +128,11 @@ = form_group_attribute("hasCreator") = metadata_section('more-community-info', 'More community information', parent_id: "community") do - - for attr in @metadata.select { |m| m['display'] == 'community' } + - for attr in submission_metadata.select { |m| m['category'] == 'community' } = form_group_attribute(attr["attribute"]) = metadata_section('more-people-info', 'More people information', parent_id: "community") do - - for attr in @metadata.select { |m| m['display'] == 'people' } + - for attr in submission_metadata.select { |m| m['category'] == 'people' } = form_group_attribute(attr["attribute"]) %div#ontology-relations-more.mt-4 @@ -142,9 +142,10 @@ = form_group_attribute("isAlignedTo") = form_group_attribute("ontologyRelatedTo") + = metadata_section('more-relations', 'More relations', parent_id: "ontology-relations-more") do - - for attr in @metadata - - if attr["display"].eql?("relations") + - for attr in submission_metadata + - if attr["category"].eql?("relations") = form_group_attribute(attr["attribute"]) %div#ontology-content-metrics.mt-4 @@ -152,10 +153,11 @@ = form_group_attribute("preferredNamespacePrefix") = form_group_attribute("preferredNamespaceUri") - = metadata_section('more-informations', 'More content informations', parent_id: "ontology-content-metrics") do - - for attr in @metadata.select { |m| m['display'] == 'content' } + %div#ontology-more-informations.mt-4 + = metadata_section('more-informations', 'More content informations', parent_id: "ontology-more-informations") do + - for attr in submission_metadata.select { |m| m['category'] == 'content' } = form_group_attribute(attr["attribute"]) = metadata_section('more-metrics-informations', 'More metrics informations', parent_id: "ontology-content-metrics") do - - for attr in @metadata.select { |m| m['display'] == 'metrics' } + - for attr in submission_metadata.select { |m| m['category'] == 'metrics' } = form_group_attribute(attr["attribute"]) diff --git a/app/views/submissions/_submissions.html.haml b/app/views/submissions/_submissions.html.haml index 6a666118f..8c74959a3 100644 --- a/app/views/submissions/_submissions.html.haml +++ b/app/views/submissions/_submissions.html.haml @@ -4,24 +4,29 @@ - more_colspan = 7 - more_colspan = 6 if @ont_restricted - %div.click_versions_collapse + %div.click_versions_collapse.p-1 = render_alerts_container(AdminController) - %table#ontology_versions.table.table-sm.table-striped - %thead - %tr - - if @ontology.admin?(session[:user]) - %th.align-middle ID - %th.align-middle Version - %th - = generate_attribute_text("released", "Released") - %th - = generate_attribute_text("modificationDate", "Modified") - %th - = generate_attribute_text("creationDate", "Uploaded") - - unless @ont_restricted - %th.align-middle Downloads - - if @ontology.admin?(session[:user]) - %th.align-middle Actions + = render TableComponent.new(id: 'ontology_versions', stripped: false, borderless: true) do |t| + - t.header do |header| + - if @ontology.admin?(session[:user]) + - header.th do + %div.align-middle + ID + - header.th do + %div.align-middle + Version + - header.th do + = generate_attribute_text("modificationDate", "Modified", tooltip: false) + - header.th do + = generate_attribute_text("creationDate", "Uploaded", tooltip: false) + - unless @ont_restricted + - header.th do + %div.align-middle + Downloads + - if @ontology.admin?(session[:user]) + - header.th do + %div.align-middle + Actions - begin - submission_ready = @ontology.explore.latest_submission({:include_status => 'ready', display: 'submissionId'}) @@ -30,23 +35,29 @@ - submission_readyId = -1 - @submissions.each_with_index do |sub, index| - hidden_row_class = index >= 5 ? "hidden_ont hidden_select" : "" - %tr{class: "#{hidden_row_class}", id: "submission_#{sub.submissionId}"} + - t.row(id:"submission_#{sub.submissionId}" , class_css: hidden_row_class) do |r| + - if @ontology.admin?(session[:user]) - %td - = sub.submissionId - %td - = raw status_link(sub, sub.submissionId==submission_readyId) - %td - = xmldatetime_to_date(sub.released) unless sub.released.nil? - %td - = xmldatetime_to_date(sub.modificationDate) unless sub.modificationDate.nil? - %td - = xmldatetime_to_date(sub.creationDate) unless sub.creationDate.nil? + - r.td { raw sub.submissionId } + - r.td { raw status_link(sub, sub.submissionId==submission_readyId)} + - r.td { xmldatetime_to_date(sub.modificationDate) unless sub.modificationDate.nil? } + - r.td { xmldatetime_to_date(sub.creationDate) unless sub.creationDate.nil? } + - unless @ont_restricted - %td - = raw download_link(sub, @ontology) + - r.td do + %div.dropdown + %button.btn.btn-outline-primary.rounded-pill.dropdown-toggle{type:"button", 'data-toggle':"dropdown", 'aria-expanded': "false", style:'white-space: nowrap'} + Download + %span.sr-only Toggle Dropdown + .dropdown-menu + - links = download_link(sub,@ontology) + - links.each do |value| + - link,label = value.values + %a.dropdown-item{ href: link }= label + + -# = raw download_link(sub, @ontology) - if @ontology.admin?(session[:user]) - %td + - r.td do %div.d-flex %a.btn.btn-sm.btn-link{:href => "/ontologies/#{@ontology.acronym}/submissions/#{sub.submissionId}/edit"} %span Edit @@ -55,8 +66,8 @@ = button_to "Delete", "/admin/ontologies/#{@ontology.acronym}/submissions/#{sub.submissionId}?turbo_stream=true", method: :delete, class:'btn btn-sm btn-link', form: {data: { turbo: true, turbo_confirm: alert_text, turbo_frame: '_top'}} - if @submissions.length > 5 - %tr - %td{colspan: more_colspan, class: "show_more_subs"} + - t.row(class_css: "show_more_subs") do |r| + - r.td(colspan: more_colspan) do %a#version_toggle{:href => ""} more... :javascript diff --git a/config/routes.rb b/config/routes.rb index 589464523..3188d56f7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -46,6 +46,7 @@ get 'instances/:instance_id', to: 'instances#show', constraints: { instance_id: /[^\/?]+/ } get 'schemes/show_scheme', to: 'schemes#show' get 'collections/show' + get 'metrics_evolution' end resources :login @@ -151,6 +152,7 @@ get 'ajax/label_xl', to: "label_xl#show" get '/ajax/biomixer' => 'concepts#biomixer' get '/ajax/fair_score/html' => 'fair_score#details_html' + get '/ajax/submission/show_additional_metadata/:id' => 'ontologies#show_additional_metadata' get '/ajax/submission/show_licenses/:id' => 'ontologies#show_licenses' get '/ajax/fair_score/json' => 'fair_score#details_json' get '/ajax/:ontology/instances' => 'instances#index_by_ontology' diff --git a/package.json b/package.json index 94282d913..62dabf435 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,17 @@ "dependencies": { "@hotwired/stimulus": "^3.0.1", "@hotwired/turbo-rails": "^7.1.1", + "debounce": "^1.2.1", "esbuild": "^0.14.41", "flatpickr": "^4.6.13", "split.js": "^1.6.5", "stimulus-flatpickr": "^3.0.0-0", - "stimulus-rails-nested-form": "^4.0.0", "stimulus-read-more": "^4.1.0", + "stimulus-rails-nested-form": "^4.0.0", + "stimulus-timeago": "^4.1.0", + "vis-data": "^7.1.6", + "vis-network": "^9.1.6", + "vis-util": "^5.0.3", "tom-select": "^2.2.2" }, "scripts": { diff --git a/public/browse/font/webhostinghub-glyphs.eot b/public/browse/font/webhostinghub-glyphs.eot old mode 100755 new mode 100644 diff --git a/public/browse/font/webhostinghub-glyphs.ttf b/public/browse/font/webhostinghub-glyphs.ttf old mode 100755 new mode 100644 diff --git a/public/browse/font/whhg.css b/public/browse/font/whhg.css old mode 100755 new mode 100644 index 9423e9914..ee5bfe84a --- a/public/browse/font/whhg.css +++ b/public/browse/font/whhg.css @@ -1,2085 +1,2085 @@ -@font-face { - font-family: 'WebHostingHub-Glyphs'; - src: url('webhostinghub-glyphs.eot'); - src: url('webhostinghub-glyphs.eot?#iefix') format('embedded-opentype'), - url('webhostinghub-glyphs.ttf') format('truetype'); - font-weight: normal; - font-style: normal; - -moz-font-feature-settings: "calt=0,liga=0"; -} -[class^="icon-"], [class*=" icon-"] {font-family:'WebHostingHub-Glyphs';background:none;width:auto;height:auto;font-style:normal} -.icon-aaabattery:before{content:'\f413'} -.icon-abacus:before{content:'\f261'} -.icon-accountfilter:before{content:'\f05e'} -.icon-acsource:before{content:'\f3ea'} -.icon-addfriend:before{content:'\f3da'} -.icon-address:before{content:'\f08f'} -.icon-addshape:before{content:'\f1fd'} -.icon-addtocart:before{content:'\f394'} -.icon-addtolist:before{content:'\f2ac'} -.icon-adjust:before{content:'\f484'} -.icon-adobe:before{content:'\f1c9'} -.icon-ads-bilboard:before{content:'\f082'} -.icon-affiliate:before{content:'\f01e'} -.icon-ajax:before{content:'\f06f'} -.icon-alarm:before{content:'\f233'} -.icon-alarmalt:before{content:'\f23d'} -.icon-album-cover:before{content:'\f19f'} -.icon-alertalt:before{content:'\f2b4'} -.icon-alertpay:before{content:'\f269'} -.icon-algorhythm:before{content:'\f0b8'} -.icon-alienship:before{content:'\f41f'} -.icon-alienware:before{content:'\f3be'} -.icon-align-center:before{content:'\f1d9'} -.icon-align-justify:before{content:'\f1da'} -.icon-align-left:before{content:'\f1d7'} -.icon-align-right:before{content:'\f1d8'} -.icon-alignbottomedge:before{content:'\f1d3'} -.icon-alignhorizontalcenter:before{content:'\f1d2'} -.icon-alignleftedge:before{content:'\f1d6'} -.icon-alignrightedge:before{content:'\f1d5'} -.icon-aligntopedge:before{content:'\f1d4'} -.icon-alignverticalcenter:before{content:'\f1d1'} -.icon-amd:before{content:'\f020'} -.icon-analogdown:before{content:'\f2cb'} -.icon-analogleft:before{content:'\f2c8'} -.icon-analogright:before{content:'\f2c9'} -.icon-analogup:before{content:'\f2ca'} -.icon-analytics-piechart:before{content:'\f000'} -.icon-analyticsalt-piechartalt:before{content:'\f001'} -.icon-anchor-port:before{content:'\f21d'} -.icon-android:before{content:'\f12a'} -.icon-angrybirds:before{content:'\f3c1'} -.icon-antenna:before{content:'\f3ec'} -.icon-apache-feather:before{content:'\f056'} -.icon-aperture:before{content:'\f356'} -.icon-appointment-agenda:before{content:'\f26c'} -.icon-archive:before{content:'\f171'} -.icon-arrow-down:before{content:'\f2fe'} -.icon-arrow-left:before{content:'\f305'} -.icon-arrow-right:before{content:'\f304'} -.icon-arrow-up:before{content:'\f301'} -.icon-asterisk:before{content:'\f317'} -.icon-asteriskalt:before{content:'\002a'} -.icon-at:before{content:'\40'} -.icon-atari:before{content:'\f3b9'} -.icon-authentication-keyalt:before{content:'\f051'} -.icon-automobile-car:before{content:'\f239'} -.icon-autorespond:before{content:'\f08e'} -.icon-avatar:before{content:'\f15a'} -.icon-avataralt:before{content:'\f161'} -.icon-avengers:before{content:'\f342'} -.icon-awstats:before{content:'\f04c'} -.icon-axe:before{content:'\f2ef'} -.icon-backup-vault:before{content:'\f004'} -.icon-backupalt-vaultalt:before{content:'\f005'} -.icon-backupwizard:before{content:'\f05f'} -.icon-backward:before{content:'\f183'} -.icon-bag:before{content:'\f234'} -.icon-baloon:before{content:'\f405'} -.icon-ban-circle:before{content:'\f313'} -.icon-banana:before{content:'\f3f4'} -.icon-bandwidth:before{content:'\f006'} -.icon-bank:before{content:'\f262'} -.icon-barchart:before{content:'\f02f'} -.icon-barchartalt:before{content:'\f07d'} -.icon-barcode:before{content:'\f276'} -.icon-basecamp:before{content:'\f160'} -.icon-basketball:before{content:'\f2e9'} -.icon-bat:before{content:'\f3d3'} -.icon-batman:before{content:'\f348'} -.icon-batteryaltcharging:before{content:'\f104'} -.icon-batteryaltfull:before{content:'\f101'} -.icon-batteryaltsixty:before{content:'\f102'} -.icon-batteryaltthird:before{content:'\f103'} -.icon-batterycharged:before{content:'\f0f4'} -.icon-batterycharging:before{content:'\f0f3'} -.icon-batteryeighty:before{content:'\f0f9'} -.icon-batteryempty:before{content:'\f0f5'} -.icon-batteryforty:before{content:'\f0f7'} -.icon-batteryfull:before{content:'\f0fa'} -.icon-batterysixty:before{content:'\f0f8'} -.icon-batterytwenty:before{content:'\f0f6'} -.icon-bed:before{content:'\f2b9'} -.icon-beer:before{content:'\f244'} -.icon-bell:before{content:'\2407'} -.icon-bigger:before{content:'\f30a'} -.icon-bill:before{content:'\f278'} -.icon-binary:before{content:'\f087'} -.icon-binoculars-searchalt:before{content:'\f2a0'} -.icon-birdhouse:before{content:'\f390'} -.icon-birthday:before{content:'\f36b'} -.icon-bishop:before{content:'\f2f9'} -.icon-blackberry:before{content:'\f421'} -.icon-blankstare:before{content:'\f13e'} -.icon-blogger-blog:before{content:'\f167'} -.icon-bluetooth:before{content:'\f12b'} -.icon-bluetoothconnected:before{content:'\f386'} -.icon-boardgame:before{content:'\f2d9'} -.icon-boat:before{content:'\f21a'} -.icon-bold:before{content:'\f1f4'} -.icon-bomb:before{content:'\f2dc'} -.icon-bone:before{content:'\f35f'} -.icon-book:before{content:'\f1ba'} -.icon-bookmark:before{content:'\f143'} -.icon-boombox:before{content:'\f195'} -.icon-bottle:before{content:'\f361'} -.icon-bow:before{content:'\f2ee'} -.icon-bowling:before{content:'\f2f3'} -.icon-bowlingpins:before{content:'\f3d2'} -.icon-bowtie:before{content:'\f37f'} -.icon-boxtrapper-mousetrap:before{content:'\f046'} -.icon-braces:before{content:'\f0b4'} -.icon-braille0:before{content:'\f44b'} -.icon-braille1:before{content:'\f44c'} -.icon-braille2:before{content:'\f44d'} -.icon-braille3:before{content:'\f44e'} -.icon-braille4:before{content:'\f44f'} -.icon-braille5:before{content:'\f450'} -.icon-braille6:before{content:'\f451'} -.icon-braille7:before{content:'\f452'} -.icon-braille8:before{content:'\f453'} -.icon-braille9:before{content:'\f454'} -.icon-braillea:before{content:'\f431'} -.icon-brailleb:before{content:'\f432'} -.icon-braillec:before{content:'\f433'} -.icon-brailled:before{content:'\f434'} -.icon-braillee:before{content:'\f435'} -.icon-braillef:before{content:'\f436'} -.icon-brailleg:before{content:'\f437'} -.icon-brailleh:before{content:'\f438'} -.icon-braillei:before{content:'\f439'} -.icon-braillej:before{content:'\f43a'} -.icon-braillek:before{content:'\f43b'} -.icon-braillel:before{content:'\f43c'} -.icon-braillem:before{content:'\f43d'} -.icon-braillen:before{content:'\f43e'} -.icon-brailleo:before{content:'\f43f'} -.icon-braillep:before{content:'\f440'} -.icon-brailleq:before{content:'\f441'} -.icon-brailler:before{content:'\f442'} -.icon-brailles:before{content:'\f443'} -.icon-braillespace:before{content:'\f455'} -.icon-braillet:before{content:'\f444'} -.icon-brailleu:before{content:'\f445'} -.icon-braillev:before{content:'\f446'} -.icon-braillew:before{content:'\f447'} -.icon-braillex:before{content:'\f448'} -.icon-brailley:before{content:'\f449'} -.icon-braillez:before{content:'\f44a'} -.icon-brain:before{content:'\f3e3'} -.icon-bread:before{content:'\f42f'} -.icon-breakable:before{content:'\f41c'} -.icon-briefcase:before{content:'\f25e'} -.icon-briefcasethree:before{content:'\f25f'} -.icon-briefcasetwo:before{content:'\f0a2'} -.icon-brightness:before{content:'\f10a'} -.icon-brightnessfull:before{content:'\f10b'} -.icon-brightnesshalf:before{content:'\f10c'} -.icon-broom:before{content:'\f40a'} -.icon-browser:before{content:'\f159'} -.icon-brush:before{content:'\f1b8'} -.icon-bucket:before{content:'\f1b5'} -.icon-bug:before{content:'\f0a7'} -.icon-bullhorn:before{content:'\f287'} -.icon-bus:before{content:'\f241'} -.icon-businesscardalt:before{content:'\f137'} -.icon-buttona:before{content:'\f2bf'} -.icon-buttonb:before{content:'\f2c0'} -.icon-buttonx:before{content:'\f2c1'} -.icon-buttony:before{content:'\f2c2'} -.icon-cactus-desert:before{content:'\f22c'} -.icon-calculator:before{content:'\f258'} -.icon-calculatoralt:before{content:'\f265'} -.icon-calendar:before{content:'\f20f'} -.icon-calendaralt-cronjobs:before{content:'\f0a1'} -.icon-camera:before{content:'\f19b'} -.icon-candle:before{content:'\f29a'} -.icon-candy:before{content:'\f42d'} -.icon-candycane:before{content:'\f37d'} -.icon-cannon:before{content:'\f401'} -.icon-canvas:before{content:'\f1c8'} -.icon-canvasrulers:before{content:'\f205'} -.icon-capacitator:before{content:'\f3e8'} -.icon-capslock:before{content:'\21ea'} -.icon-captainamerica:before{content:'\f341'} -.icon-carrot:before{content:'\f3f2'} -.icon-cashregister:before{content:'\f26e'} -.icon-cassette:before{content:'\f377'} -.icon-cd-dvd:before{content:'\f0cd'} -.icon-certificate:before{content:'\f277'} -.icon-certificatealt:before{content:'\f058'} -.icon-certificatethree:before{content:'\f059'} -.icon-cgi:before{content:'\f086'} -.icon-cgicenter:before{content:'\f079'} -.icon-chair:before{content:'\2441'} -.icon-chat:before{content:'\f162'} -.icon-check:before{content:'\f310'} -.icon-checkboxalt:before{content:'\f311'} -.icon-checkin:before{content:'\f223'} -.icon-checkinalt:before{content:'\f227'} -.icon-chef:before{content:'\f3ce'} -.icon-cherry:before{content:'\f35d'} -.icon-chevron-down:before{content:'\f48b'} -.icon-chevron-left:before{content:'\f489'} -.icon-chevron-right:before{content:'\f488'} -.icon-chevron-up:before{content:'\f48a'} -.icon-chevrons:before{content:'\f0b5'} -.icon-chicken:before{content:'\f359'} -.icon-chocolate:before{content:'\f367'} -.icon-christiancross:before{content:'\f40f'} -.icon-christmastree:before{content:'\f37b'} -.icon-chrome:before{content:'\f14e'} -.icon-cigarette:before{content:'\f229'} -.icon-circle-arrow-down:before{content:'\f475'} -.icon-circle-arrow-left:before{content:'\f472'} -.icon-circle-arrow-right:before{content:'\f473'} -.icon-circle-arrow-up:before{content:'\f474'} -.icon-circleadd:before{content:'\f0d1'} -.icon-circledelete:before{content:'\f0d2'} -.icon-circledown:before{content:'\f3c7'} -.icon-circleleft:before{content:'\f3c6'} -.icon-circleright:before{content:'\f3c9'} -.icon-circleselect:before{content:'\f0d3'} -.icon-circleselection:before{content:'\f1b1'} -.icon-circleup:before{content:'\f3c8'} -.icon-clearformatting:before{content:'\f1e7'} -.icon-clipboard-paste:before{content:'\f0cb'} -.icon-clockalt-timealt:before{content:'\f22b'} -.icon-closetab:before{content:'\f170'} -.icon-closewindow:before{content:'\f16e'} -.icon-cloud:before{content:'\f0b9'} -.icon-clouddownload:before{content:'\f0bb'} -.icon-cloudhosting:before{content:'\f007'} -.icon-cloudsync:before{content:'\f0bc'} -.icon-cloudupload:before{content:'\f0ba'} -.icon-clubs:before{content:'\f2f6'} -.icon-cmd:before{content:'\f33a'} -.icon-cms:before{content:'\f036'} -.icon-cmsmadesimple:before{content:'\f0b0'} -.icon-codeigniter:before{content:'\f077'} -.icon-coffee:before{content:'\f235'} -.icon-coffeebean:before{content:'\f366'} -.icon-cog:before{content:'\f00f'} -.icon-colocation:before{content:'\f024'} -.icon-colocationalt:before{content:'\f023'} -.icon-colors:before{content:'\f1e6'} -.icon-comment:before{content:'\f12c'} -.icon-commentout:before{content:'\f080'} -.icon-commentround:before{content:'\f155'} -.icon-commentroundempty:before{content:'\f156'} -.icon-commentroundtyping:before{content:'\f157'} -.icon-commentroundtypingempty:before{content:'\f158'} -.icon-commenttyping:before{content:'\f12d'} -.icon-compass:before{content:'\263c'} -.icon-concretefive:before{content:'\f0af'} -.icon-contact-businesscard:before{content:'\f040'} -.icon-controllernes:before{content:'\f2d2'} -.icon-controllerps:before{content:'\f2d1'} -.icon-controllersnes:before{content:'\f2d3'} -.icon-controlpanel:before{content:'\f008'} -.icon-controlpanelalt:before{content:'\f009'} -.icon-cooling:before{content:'\f00a'} -.icon-coppermine:before{content:'\f0a4'} -.icon-copy:before{content:'\f0c9'} -.icon-copyright:before{content:'\00a9'} -.icon-coupon:before{content:'\f254'} -.icon-cpanel:before{content:'\f072'} -.icon-cplusplus:before{content:'\f0b1'} -.icon-cpu-processor:before{content:'\f002'} -.icon-cpualt-processoralt:before{content:'\f003'} -.icon-crayon:before{content:'\f383'} -.icon-createfile:before{content:'\f0c6'} -.icon-createfolder:before{content:'\f0da'} -.icon-creativecommons:before{content:'\f1fc'} -.icon-creditcard:before{content:'\f279'} -.icon-cricket:before{content:'\f418'} -.icon-croisant:before{content:'\f29f'} -.icon-crop:before{content:'\f1af'} -.icon-crown:before{content:'\f28f'} -.icon-csharp:before{content:'\f0b2'} -.icon-cssthree:before{content:'\f06a'} -.icon-cup-coffeealt:before{content:'\f24b'} -.icon-cupcake:before{content:'\f35b'} -.icon-curling:before{content:'\f3d7'} -.icon-cursor:before{content:'\f0dc'} -.icon-cut-scissors:before{content:'\f0ca'} -.icon-dagger:before{content:'\2020'} -.icon-danger:before{content:'\f415'} -.icon-dart:before{content:'\f3d4'} -.icon-darthvader:before{content:'\f34a'} -.icon-database:before{content:'\f00b'} -.icon-databaseadd:before{content:'\f00c'} -.icon-databasedelete:before{content:'\f00d'} -.icon-davidstar:before{content:'\f40e'} -.icon-dcsource:before{content:'\f3e9'} -.icon-dedicatedserver:before{content:'\f00e'} -.icon-deletefile:before{content:'\f0c7'} -.icon-deletefolder:before{content:'\f0db'} -.icon-delicious:before{content:'\f152'} -.icon-designcontest:before{content:'\f351'} -.icon-desklamp:before{content:'\f412'} -.icon-dialpad:before{content:'\f399'} -.icon-diamond:before{content:'\2666'} -.icon-diamonds:before{content:'\f2f7'} -.icon-die-dice:before{content:'\f2d8'} -.icon-diefive:before{content:'\f3fb'} -.icon-diefour:before{content:'\f3fa'} -.icon-dieone:before{content:'\f3f7'} -.icon-diesix:before{content:'\f3fc'} -.icon-diethree:before{content:'\f3f9'} -.icon-dietwo:before{content:'\f3f8'} -.icon-diode:before{content:'\f3e7'} -.icon-director:before{content:'\f2ae'} -.icon-diskspace:before{content:'\f096'} -.icon-distributehorizontalcenters:before{content:'\f1dc'} -.icon-distributeverticalcenters:before{content:'\f1db'} -.icon-divide:before{content:'\00f7'} -.icon-dna:before{content:'\f409'} -.icon-dnszone:before{content:'\f07f'} -.icon-document:before{content:'\f0c2'} -.icon-doghouse:before{content:'\f38f'} -.icon-dollar:before{content:'\24'} -.icon-dollaralt:before{content:'\f259'} -.icon-dolphinsoftware:before{content:'\f064'} -.icon-domain:before{content:'\f01d'} -.icon-domainaddon:before{content:'\f053'} -.icon-domino:before{content:'\f3d5'} -.icon-donut:before{content:'\f3ca'} -.icon-downleft:before{content:'\f2ff'} -.icon-download:before{content:'\f47b'} -.icon-download-alt:before{content:'\f11a'} -.icon-downright:before{content:'\f300'} -.icon-draft:before{content:'\f172'} -.icon-dreamweaver:before{content:'\f1d0'} -.icon-dribbble:before{content:'\f14c'} -.icon-dropmenu:before{content:'\f0a5'} -.icon-drupal:before{content:'\f075'} -.icon-drwho:before{content:'\f3c0'} -.icon-edit:before{content:'\f47c'} -.icon-editalt:before{content:'\f0f2'} -.icon-egg:before{content:'\f407'} -.icon-eightball:before{content:'\f36e'} -.icon-eject:before{content:'\f199'} -.icon-elipse:before{content:'\f1bc'} -.icon-emailalt:before{content:'\f136'} -.icon-emailexport:before{content:'\f176'} -.icon-emailforward:before{content:'\f175'} -.icon-emailforwarders:before{content:'\f049'} -.icon-emailimport:before{content:'\f177'} -.icon-emailrefresh:before{content:'\f174'} -.icon-emailtrace:before{content:'\f091'} -.icon-emergency:before{content:'\f246'} -.icon-emptycart:before{content:'\f395'} -.icon-enter:before{content:'\f323'} -.icon-envelope:before{content:'\f028'} -.icon-equalizer:before{content:'\f18e'} -.icon-equalizeralt:before{content:'\f18f'} -.icon-equals:before{content:'\f30c'} -.icon-eraser:before{content:'\f1f1'} -.icon-erroralt:before{content:'\f05a'} -.icon-euro:before{content:'\20ac'} -.icon-euroalt:before{content:'\f25a'} -.icon-evernote:before{content:'\f17c'} -.icon-exchange-currency:before{content:'\f26b'} -.icon-exclamation-sign:before{content:'\f04a'} -.icon-excludeshape:before{content:'\f200'} -.icon-exit:before{content:'\f324'} -.icon-explorerwindow:before{content:'\f0d9'} -.icon-exportfile:before{content:'\f32f'} -.icon-exposure:before{content:'\f1de'} -.icon-extinguisher:before{content:'\f2b7'} -.icon-eye-close:before{content:'\f481'} -.icon-eye-open:before{content:'\f2b5'} -.icon-eye-view:before{content:'\f280'} -.icon-eyedropper:before{content:'\f1ad'} -.icon-facebook:before{content:'\f140'} -.icon-facebookalt:before{content:'\f14b'} -.icon-facetime-video:before{content:'\f19c'} -.icon-factory:before{content:'\f27a'} -.icon-fantastico:before{content:'\f0ae'} -.icon-faq:before{content:'\f099'} -.icon-fast-backward:before{content:'\f47e'} -.icon-fast-forward:before{content:'\f47f'} -.icon-fastdown:before{content:'\f31d'} -.icon-fastleft:before{content:'\f31a'} -.icon-fastright:before{content:'\f31b'} -.icon-fastup:before{content:'\f31c'} -.icon-favoritefile:before{content:'\f381'} -.icon-favoritefolder:before{content:'\f382'} -.icon-featheralt-write:before{content:'\f1c5'} -.icon-fedora:before{content:'\f3f1'} -.icon-fence:before{content:'\f2af'} -.icon-file:before{content:'\f0d6'} -.icon-film:before{content:'\f19d'} -.icon-filmstrip:before{content:'\f3ed'} -.icon-filter:before{content:'\f05c'} -.icon-finder:before{content:'\f398'} -.icon-fire:before{content:'\f27f'} -.icon-firefox:before{content:'\f420'} -.icon-firewall:before{content:'\f021'} -.icon-firewire:before{content:'\f0fc'} -.icon-firstaid:before{content:'\f2ba'} -.icon-fish:before{content:'\f35a'} -.icon-fishbone:before{content:'\f42b'} -.icon-flag:before{content:'\f487'} -.icon-flagalt:before{content:'\f232'} -.icon-flagtriangle:before{content:'\f20b'} -.icon-flash:before{content:'\f1cf'} -.icon-flashlight:before{content:'\f299'} -.icon-flashplayer:before{content:'\f070'} -.icon-flaskfull:before{content:'\f27e'} -.icon-flickr:before{content:'\f146'} -.icon-flower:before{content:'\f2a5'} -.icon-flowernew:before{content:'\f3a8'} -.icon-folder-close:before{content:'\f094'} -.icon-folder-open:before{content:'\f483'} -.icon-foldertree:before{content:'\f0f0'} -.icon-font:before{content:'\f1ae'} -.icon-foodtray:before{content:'\f3d0'} -.icon-football-soccer:before{content:'\f2eb'} -.icon-forbiddenalt:before{content:'\f314'} -.icon-forest-tree:before{content:'\f217'} -.icon-forestalt-treealt:before{content:'\f21c'} -.icon-fork:before{content:'\22d4'} -.icon-forklift:before{content:'\f29b'} -.icon-form:before{content:'\f08c'} -.icon-forrst:before{content:'\f14d'} -.icon-fort:before{content:'\f400'} -.icon-forward:before{content:'\f182'} -.icon-fourohfour:before{content:'\f09d'} -.icon-foursquare:before{content:'\f42a'} -.icon-freeway:before{content:'\f24a'} -.icon-fridge:before{content:'\f40d'} -.icon-fries:before{content:'\f36a'} -.icon-ftp:before{content:'\f029'} -.icon-ftpaccounts:before{content:'\f07b'} -.icon-ftpsession:before{content:'\f07c'} -.icon-fullscreen:before{content:'\f485'} -.icon-gameboy:before{content:'\f403'} -.icon-gamecursor:before{content:'\f2d0'} -.icon-gasstation:before{content:'\f216'} -.icon-gearfour:before{content:'\f3a7'} -.icon-ghost:before{content:'\f2da'} -.icon-gift:before{content:'\f260'} -.icon-github:before{content:'\f081'} -.icon-glass:before{content:'\f236'} -.icon-glasses:before{content:'\f295'} -.icon-glassesalt:before{content:'\f39d'} -.icon-globe:before{content:'\f01b'} -.icon-globealt:before{content:'\f36c'} -.icon-glue:before{content:'\f36d'} -.icon-gmail:before{content:'\f150'} -.icon-golf:before{content:'\f2f1'} -.icon-googledrive:before{content:'\f163'} -.icon-googleplus:before{content:'\f165'} -.icon-googlewallet:before{content:'\f270'} -.icon-gpsoff-gps:before{content:'\f21e'} -.icon-gpson:before{content:'\f21f'} -.icon-gpu-graphicscard:before{content:'\f108'} -.icon-gradient:before{content:'\2207'} -.icon-grails:before{content:'\f085'} -.icon-greenlantern:before{content:'\f340'} -.icon-greenlightbulb:before{content:'\f406'} -.icon-grooveshark:before{content:'\f3a2'} -.icon-groups-friends:before{content:'\f134'} -.icon-guitar:before{content:'\f19a'} -.icon-halflife:before{content:'\f3ba'} -.icon-halo:before{content:'\f3bb'} -.icon-hamburger:before{content:'\f2b3'} -.icon-hammer:before{content:'\f291'} -.icon-hand-down:before{content:'\f387'} -.icon-hand-left:before{content:'\f389'} -.icon-hand-right:before{content:'\f388'} -.icon-hand-up:before{content:'\f0dd'} -.icon-handcuffs:before{content:'\f393'} -.icon-handdrag:before{content:'\f0de'} -.icon-handtwofingers:before{content:'\f0df'} -.icon-hanger:before{content:'\f2ab'} -.icon-happy:before{content:'\f13c'} -.icon-harrypotter:before{content:'\f38b'} -.icon-hdd:before{content:'\f02a'} -.icon-hdtv:before{content:'\f1a0'} -.icon-headphones:before{content:'\f180'} -.icon-headphonesalt:before{content:'\f1a3'} -.icon-heart:before{content:'\f131'} -.icon-heartempty-love:before{content:'\f132'} -.icon-hearts:before{content:'\f2f4'} -.icon-helicopter:before{content:'\f3e4'} -.icon-hexagon-polygon:before{content:'\f1be'} -.icon-hockey:before{content:'\f3d9'} -.icon-home:before{content:'\21b8'} -.icon-homealt:before{content:'\f02b'} -.icon-hospital:before{content:'\f247'} -.icon-hotdog:before{content:'\f3cc'} -.icon-hotlinkprotection:before{content:'\f050'} -.icon-hourglassalt:before{content:'\f122'} -.icon-html:before{content:'\f068'} -.icon-htmlfive:before{content:'\f069'} -.icon-hydrant:before{content:'\f3ff'} -.icon-icecream:before{content:'\f2a4'} -.icon-icecreamalt:before{content:'\f289'} -.icon-illustrator:before{content:'\f1ce'} -.icon-imac:before{content:'\f0fb'} -.icon-images-gallery:before{content:'\f09f'} -.icon-importcontacts:before{content:'\f092'} -.icon-importfile:before{content:'\f32e'} -.icon-inbox:before{content:'\f17a'} -.icon-inboxalt:before{content:'\f178'} -.icon-incomingcall:before{content:'\f15d'} -.icon-indent-left:before{content:'\f1f2'} -.icon-indent-right:before{content:'\f1f3'} -.icon-indexmanager:before{content:'\f09e'} -.icon-infinity:before{content:'\221e'} -.icon-info-sign:before{content:'\f315'} -.icon-infographic:before{content:'\f336'} -.icon-ink:before{content:'\f3f6'} -.icon-inkpen:before{content:'\f1ac'} -.icon-insertbarchart:before{content:'\f1e5'} -.icon-insertpicture:before{content:'\f1e0'} -.icon-insertpicturecenter:before{content:'\f1e3'} -.icon-insertpictureleft:before{content:'\f1e1'} -.icon-insertpictureright:before{content:'\f1e2'} -.icon-insertpiechart:before{content:'\f1e4'} -.icon-instagram:before{content:'\f14a'} -.icon-install:before{content:'\f128'} -.icon-intel:before{content:'\f01f'} -.icon-intersection:before{content:'\2229'} -.icon-intersectshape:before{content:'\f1ff'} -.icon-invert:before{content:'\f1df'} -.icon-invoice:before{content:'\f3e5'} -.icon-ipcontrol:before{content:'\f08b'} -.icon-iphone:before{content:'\f0e6'} -.icon-ipod:before{content:'\f190'} -.icon-ironman:before{content:'\f349'} -.icon-islam:before{content:'\f410'} -.icon-island:before{content:'\f392'} -.icon-italic:before{content:'\f1f5'} -.icon-jar:before{content:'\f2b6'} -.icon-jason:before{content:'\f38c'} -.icon-java:before{content:'\f083'} -.icon-joomla:before{content:'\f073'} -.icon-joystickarcade:before{content:'\f2d4'} -.icon-joystickatari:before{content:'\f2d5'} -.icon-jquery:before{content:'\f06b'} -.icon-jqueryui:before{content:'\f06c'} -.icon-kerning:before{content:'\f1e9'} -.icon-key:before{content:'\f093'} -.icon-keyboard:before{content:'\f119'} -.icon-keyboardalt:before{content:'\f105'} -.icon-keyboarddelete:before{content:'\f3a6'} -.icon-kidney:before{content:'\f3e0'} -.icon-king:before{content:'\f2fc'} -.icon-knife:before{content:'\f214'} -.icon-knight:before{content:'\f2fb'} -.icon-knob:before{content:'\f376'} -.icon-lab-flask:before{content:'\f27d'} -.icon-lamp:before{content:'\f2b1'} -.icon-lan:before{content:'\f0ee'} -.icon-language:before{content:'\f042'} -.icon-laptop:before{content:'\f0d8'} -.icon-lasso:before{content:'\f396'} -.icon-lastfm:before{content:'\f3a3'} -.icon-laugh:before{content:'\f13f'} -.icon-law:before{content:'\f263'} -.icon-layers:before{content:'\f1ca'} -.icon-layersalt:before{content:'\f1cb'} -.icon-leaf:before{content:'\f039'} -.icon-leechprotect:before{content:'\f07e'} -.icon-legacyfilemanager:before{content:'\f095'} -.icon-lego:before{content:'\f370'} -.icon-lifeempty:before{content:'\f2e1'} -.icon-lifefull:before{content:'\f2e3'} -.icon-lifehacker:before{content:'\f380'} -.icon-lifehalf:before{content:'\f2e2'} -.icon-lifepreserver:before{content:'\f015'} -.icon-lightbulb-idea:before{content:'\f338'} -.icon-lighthouse:before{content:'\f3e6'} -.icon-lightning:before{content:'\f231'} -.icon-lightningalt:before{content:'\f2a8'} -.icon-line:before{content:'\f1bf'} -.icon-lineheight:before{content:'\f1c0'} -.icon-link:before{content:'\f022'} -.icon-linkalt:before{content:'\f333'} -.icon-linkedin:before{content:'\f166'} -.icon-linux:before{content:'\f01a'} -.icon-list:before{content:'\f111'} -.icon-list-alt:before{content:'\f480'} -.icon-liver:before{content:'\f3e2'} -.icon-loading-hourglass:before{content:'\f123'} -.icon-loadingalt:before{content:'\f339'} -.icon-lock:before{content:'\f0be'} -.icon-lockalt-keyhole:before{content:'\f0eb'} -.icon-lollypop:before{content:'\f3ee'} -.icon-lungs:before{content:'\f3df'} -.icon-macpro:before{content:'\f3a5'} -.icon-macro-plant:before{content:'\f1c6'} -.icon-magazine:before{content:'\f1ec'} -.icon-magento:before{content:'\f06e'} -.icon-magnet:before{content:'\f281'} -.icon-mailbox:before{content:'\f044'} -.icon-mailinglists:before{content:'\f090'} -.icon-man-male:before{content:'\f2a1'} -.icon-managedhosting:before{content:'\f038'} -.icon-map:before{content:'\f209'} -.icon-map-marker:before{content:'\f220'} -.icon-marker:before{content:'\f204'} -.icon-marvin:before{content:'\f3dd'} -.icon-mastercard:before{content:'\f266'} -.icon-maximize:before{content:'\f30f'} -.icon-medal:before{content:'\f2e5'} -.icon-medalbronze:before{content:'\f2e8'} -.icon-medalgold:before{content:'\f2e6'} -.icon-medalsilver:before{content:'\f2e7'} -.icon-mediarepeat:before{content:'\f187'} -.icon-men:before{content:'\f24c'} -.icon-menu:before{content:'\f127'} -.icon-merge:before{content:'\f334'} -.icon-mergecells:before{content:'\f327'} -.icon-mergeshapes:before{content:'\f201'} -.icon-metro-subway:before{content:'\f24f'} -.icon-metronome:before{content:'\f374'} -.icon-mickeymouse:before{content:'\f37a'} -.icon-microphone:before{content:'\f191'} -.icon-microscope:before{content:'\f283'} -.icon-microsd:before{content:'\f107'} -.icon-microwave:before{content:'\f42e'} -.icon-mimetype:before{content:'\f057'} -.icon-minimize:before{content:'\f30e'} -.icon-minus:before{content:'\2212'} -.icon-minus-sign:before{content:'\f477'} -.icon-missedcall:before{content:'\f15c'} -.icon-mobile:before{content:'\f0e8'} -.icon-moleskine:before{content:'\f1f0'} -.icon-money-cash:before{content:'\f27b'} -.icon-moneybag:before{content:'\f271'} -.icon-monitor:before{content:'\f0d5'} -.icon-monstersinc:before{content:'\f3bd'} -.icon-moon-night:before{content:'\f207'} -.icon-mouse:before{content:'\f0d4'} -.icon-mousealt:before{content:'\f126'} -.icon-move:before{content:'\f322'} -.icon-movieclapper:before{content:'\f193'} -.icon-moviereel:before{content:'\f17f'} -.icon-muffin:before{content:'\f363'} -.icon-mug:before{content:'\f24e'} -.icon-mushroom:before{content:'\f35e'} -.icon-music:before{content:'\f181'} -.icon-musicalt:before{content:'\f18d'} -.icon-mutealt:before{content:'\f0e5'} -.icon-mxentry:before{content:'\f07a'} -.icon-mybb:before{content:'\f065'} -.icon-myspace:before{content:'\f153'} -.icon-mysql-dolphin:before{content:'\f076'} -.icon-nail:before{content:'\f428'} -.icon-navigation:before{content:'\f23a'} -.icon-network:before{content:'\f0a6'} -.icon-networksignal:before{content:'\f3a9'} -.icon-news:before{content:'\f256'} -.icon-newtab:before{content:'\f16f'} -.icon-newwindow:before{content:'\f16d'} -.icon-next:before{content:'\f18a'} -.icon-nexus:before{content:'\f0e7'} -.icon-nintendods:before{content:'\f404'} -.icon-nodejs:before{content:'\f084'} -.icon-notes:before{content:'\f0d7'} -.icon-notificationbottom:before{content:'\f144'} -.icon-notificationtop:before{content:'\f145'} -.icon-nut:before{content:'\f427'} -.icon-off:before{content:'\f11d'} -.icon-office-building:before{content:'\f245'} -.icon-officechair:before{content:'\f26d'} -.icon-ok:before{content:'\2713'} -.icon-ok-circle:before{content:'\f471'} -.icon-ok-sign:before{content:'\f479'} -.icon-oneup:before{content:'\f3b7'} -.icon-oneupalt:before{content:'\f3b6'} -.icon-opencart:before{content:'\f060'} -.icon-opennewwindow:before{content:'\f332'} -.icon-orange:before{content:'\f29e'} -.icon-outbox:before{content:'\f179'} -.icon-outgoingcall:before{content:'\f15e'} -.icon-oxwall:before{content:'\f06d'} -.icon-pacman:before{content:'\f2db'} -.icon-pageback:before{content:'\f31e'} -.icon-pagebreak:before{content:'\f1cc'} -.icon-pageforward:before{content:'\f31f'} -.icon-pagesetup:before{content:'\f331'} -.icon-paintbrush:before{content:'\f1e8'} -.icon-paintroll:before{content:'\f1fa'} -.icon-palette-painting:before{content:'\f1b9'} -.icon-paperclip:before{content:'\f284'} -.icon-paperclipalt:before{content:'\f285'} -.icon-paperclipvertical:before{content:'\f286'} -.icon-paperplane:before{content:'\f296'} -.icon-parentheses:before{content:'\f3c4'} -.icon-parkeddomain:before{content:'\f055'} -.icon-password:before{content:'\f03e'} -.icon-passwordalt:before{content:'\f03f'} -.icon-pasta:before{content:'\f408'} -.icon-patch:before{content:'\f2a3'} -.icon-path:before{content:'\f169'} -.icon-pause:before{content:'\f186'} -.icon-paw-pet:before{content:'\f29d'} -.icon-pawn:before{content:'\f2f8'} -.icon-paypal:before{content:'\f267'} -.icon-peace:before{content:'\f2a7'} -.icon-pen:before{content:'\f1ee'} -.icon-pencil:before{content:'\f1b7'} -.icon-pepperoni:before{content:'\f364'} -.icon-percent:before{content:'\25'} -.icon-perl-camel:before{content:'\f0b6'} -.icon-perlalt:before{content:'\f0b7'} -.icon-phone-call:before{content:'\f14f'} -.icon-phonealt:before{content:'\f15b'} -.icon-phonebook:before{content:'\f149'} -.icon-phonebookalt:before{content:'\f135'} -.icon-phonemic:before{content:'\f391'} -.icon-phoneold:before{content:'\f148'} -.icon-photoshop:before{content:'\f1cd'} -.icon-php:before{content:'\f09c'} -.icon-phpbb:before{content:'\f063'} -.icon-phppear:before{content:'\f09b'} -.icon-piano:before{content:'\f19e'} -.icon-picture:before{content:'\22b7'} -.icon-pictureframe:before{content:'\f41e'} -.icon-piggybank:before{content:'\f257'} -.icon-pigpena:before{content:'\f456'} -.icon-pigpenb:before{content:'\f457'} -.icon-pigpenc:before{content:'\f458'} -.icon-pigpend:before{content:'\f459'} -.icon-pigpene:before{content:'\f45a'} -.icon-pigpenf:before{content:'\f45b'} -.icon-pigpeng:before{content:'\f45c'} -.icon-pigpenh:before{content:'\f45d'} -.icon-pigpeni:before{content:'\f45e'} -.icon-pigpenj:before{content:'\f45f'} -.icon-pigpenk:before{content:'\f460'} -.icon-pigpenl:before{content:'\f461'} -.icon-pigpenm:before{content:'\f462'} -.icon-pigpenn:before{content:'\f463'} -.icon-pigpeno:before{content:'\f464'} -.icon-pigpenp:before{content:'\f465'} -.icon-pigpenq:before{content:'\f466'} -.icon-pigpenr:before{content:'\f467'} -.icon-pigpens:before{content:'\f468'} -.icon-pigpent:before{content:'\f469'} -.icon-pigpenu:before{content:'\f46a'} -.icon-pigpenv:before{content:'\f46b'} -.icon-pigpenw:before{content:'\f46c'} -.icon-pigpenx:before{content:'\f46d'} -.icon-pigpeny:before{content:'\f46e'} -.icon-pigpenz:before{content:'\f46f'} -.icon-pilcrow:before{content:'\00b6'} -.icon-pill-antivirusalt:before{content:'\f0aa'} -.icon-pin:before{content:'\f20a'} -.icon-pipe:before{content:'\01c0'} -.icon-piwigo:before{content:'\f0ad'} -.icon-pizza:before{content:'\f35c'} -.icon-placeadd:before{content:'\f221'} -.icon-placealt:before{content:'\f224'} -.icon-placealtadd:before{content:'\f225'} -.icon-placealtdelete:before{content:'\f226'} -.icon-placedelete:before{content:'\f222'} -.icon-placeios:before{content:'\f20c'} -.icon-plane:before{content:'\f23e'} -.icon-plaque:before{content:'\f2b8'} -.icon-play:before{content:'\f184'} -.icon-play-circle:before{content:'\f17e'} -.icon-playstore:before{content:'\f255'} -.icon-playvideo:before{content:'\f03d'} -.icon-plug:before{content:'\f0ea'} -.icon-pluginalt:before{content:'\f098'} -.icon-plus:before{content:'\002b'} -.icon-plus-sign:before{content:'\f476'} -.icon-pocket:before{content:'\f16b'} -.icon-podcast:before{content:'\f1a2'} -.icon-podium-winner:before{content:'\f2d6'} -.icon-pokemon:before{content:'\f354'} -.icon-police:before{content:'\f2aa'} -.icon-polygonlasso:before{content:'\f397'} -.icon-post:before{content:'\f12e'} -.icon-postalt:before{content:'\f130'} -.icon-pound:before{content:'\f25b'} -.icon-poundalt:before{content:'\f25c'} -.icon-powerjack:before{content:'\f0fd'} -.icon-powerplug:before{content:'\f0ed'} -.icon-powerplugeu:before{content:'\f28b'} -.icon-powerplugus:before{content:'\f28c'} -.icon-presentation:before{content:'\f0c4'} -.icon-prestashop:before{content:'\f061'} -.icon-pretzel:before{content:'\f3cf'} -.icon-preview:before{content:'\f330'} -.icon-previous:before{content:'\f18b'} -.icon-print:before{content:'\f125'} -.icon-protecteddirectory:before{content:'\f04d'} -.icon-pscircle:before{content:'\f2bb'} -.icon-pscursor:before{content:'\f2c3'} -.icon-psdown:before{content:'\f2c6'} -.icon-psleft:before{content:'\f2c7'} -.icon-pslone:before{content:'\f2cc'} -.icon-psltwo:before{content:'\f2cd'} -.icon-psright:before{content:'\f2c5'} -.icon-psrone:before{content:'\f2ce'} -.icon-psrtwo:before{content:'\f2cf'} -.icon-pssquare:before{content:'\f2bc'} -.icon-pstriangle:before{content:'\f2bd'} -.icon-psup:before{content:'\f2c4'} -.icon-psx:before{content:'\f2be'} -.icon-pull:before{content:'\f089'} -.icon-punisher:before{content:'\f343'} -.icon-push:before{content:'\f088'} -.icon-puzzle-plugin:before{content:'\f0a0'} -.icon-python:before{content:'\f071'} -.icon-qrcode:before{content:'\f275'} -.icon-quake:before{content:'\f355'} -.icon-queen:before{content:'\f2fd'} -.icon-query:before{content:'\f08a'} -.icon-question-sign:before{content:'\f0a3'} -.icon-quote:before{content:'\f12f'} -.icon-quotedown:before{content:'\f329'} -.icon-quoteup:before{content:'\f328'} -.icon-raceflag:before{content:'\f38e'} -.icon-racquet:before{content:'\f2f2'} -.icon-radio:before{content:'\f1a1'} -.icon-radioactive:before{content:'\f282'} -.icon-radiobutton:before{content:'\f312'} -.icon-railroad:before{content:'\f248'} -.icon-rain:before{content:'\f22f'} -.icon-ram:before{content:'\f02c'} -.icon-random:before{content:'\f188'} -.icon-rar:before{content:'\f117'} -.icon-raspberry:before{content:'\f368'} -.icon-raspberrypi:before{content:'\f369'} -.icon-rawaccesslogs:before{content:'\f0c1'} -.icon-razor:before{content:'\f416'} -.icon-reademail:before{content:'\f173'} -.icon-record:before{content:'\f189'} -.icon-rectangle:before{content:'\25ad'} -.icon-recycle:before{content:'\f297'} -.icon-reddit:before{content:'\f154'} -.icon-redirect:before{content:'\f054'} -.icon-refresh:before{content:'\f078'} -.icon-reliability:before{content:'\f016'} -.icon-remote:before{content:'\f298'} -.icon-remove:before{content:'\00d7'} -.icon-remove-circle:before{content:'\f470'} -.icon-remove-sign:before{content:'\f478'} -.icon-removefriend:before{content:'\f3db'} -.icon-repeat:before{content:'\f32b'} -.icon-repeatone:before{content:'\f196'} -.icon-resellerhosting:before{content:'\f03a'} -.icon-residentevil:before{content:'\f350'} -.icon-resistor:before{content:'\f3eb'} -.icon-resize:before{content:'\f1ed'} -.icon-resize-full:before{content:'\f325'} -.icon-resize-horizontal:before{content:'\f318'} -.icon-resize-small:before{content:'\f326'} -.icon-resize-vertical:before{content:'\f319'} -.icon-restart:before{content:'\f11f'} -.icon-restaurantmenu:before{content:'\f362'} -.icon-restore:before{content:'\f30d'} -.icon-restricted:before{content:'\f0ab'} -.icon-retweet:before{content:'\f486'} -.icon-rim:before{content:'\f36f'} -.icon-ring:before{content:'\02da'} -.icon-road:before{content:'\f249'} -.icon-roadsign-roadsignright:before{content:'\f21b'} -.icon-roadsignleft:before{content:'\f240'} -.icon-robocop:before{content:'\f357'} -.icon-rocket-launch:before{content:'\f29c'} -.icon-rook:before{content:'\f2fa'} -.icon-root:before{content:'\f33c'} -.icon-rorschach:before{content:'\f358'} -.icon-rotateclockwise:before{content:'\f202'} -.icon-rotatecounterclockwise:before{content:'\f203'} -.icon-roundrectangle:before{content:'\f1bd'} -.icon-route:before{content:'\f402'} -.icon-router:before{content:'\f0e9'} -.icon-rss:before{content:'\f17b'} -.icon-rubberstamp:before{content:'\f274'} -.icon-ruby:before{content:'\f067'} -.icon-ruler:before{content:'\f1ef'} -.icon-sad:before{content:'\f13d'} -.icon-safetypin:before{content:'\f417'} -.icon-satellite:before{content:'\f38a'} -.icon-satellitedish-remotemysql:before{content:'\f0c0'} -.icon-save-floppy:before{content:'\f0c8'} -.icon-scales:before{content:'\f3fd'} -.icon-science-atom:before{content:'\f2b0'} -.icon-scope-scan:before{content:'\f212'} -.icon-scopealt:before{content:'\f237'} -.icon-screenshot:before{content:'\f109'} -.icon-screw:before{content:'\f426'} -.icon-screwdriver:before{content:'\f292'} -.icon-screwdriveralt:before{content:'\f293'} -.icon-script:before{content:'\f08d'} -.icon-sd:before{content:'\f106'} -.icon-search:before{content:'\f0c5'} -.icon-searchdocument:before{content:'\f419'} -.icon-searchfolder:before{content:'\f41a'} -.icon-security-shield:before{content:'\f02d'} -.icon-securityalt-shieldalt:before{content:'\f02e'} -.icon-selection-rectangleselection:before{content:'\f1b0'} -.icon-selectionadd:before{content:'\f1b2'} -.icon-selectionintersect:before{content:'\f1b4'} -.icon-selectionremove:before{content:'\f1b3'} -.icon-seo:before{content:'\f030'} -.icon-server:before{content:'\f026'} -.icon-servers:before{content:'\f027'} -.icon-settingsandroid:before{content:'\f309'} -.icon-settingsfour-gearsalt:before{content:'\f306'} -.icon-settingsthree-gears:before{content:'\f307'} -.icon-settingstwo-gearalt:before{content:'\f308'} -.icon-shades-sunglasses:before{content:'\f294'} -.icon-shapes:before{content:'\f1dd'} -.icon-share:before{content:'\f47d'} -.icon-share-alt:before{content:'\f16c'} -.icon-sharealt:before{content:'\f147'} -.icon-sharedfile:before{content:'\f0ef'} -.icon-sharedhosting:before{content:'\f037'} -.icon-sharethree:before{content:'\f414'} -.icon-sheriff:before{content:'\f2a9'} -.icon-shipping:before{content:'\f23f'} -.icon-shopping:before{content:'\f010'} -.icon-shopping-cart:before{content:'\f035'} -.icon-shoppingbag:before{content:'\f273'} -.icon-shortcut:before{content:'\f043'} -.icon-shovel:before{content:'\f290'} -.icon-shredder:before{content:'\f27c'} -.icon-shutdown:before{content:'\f11e'} -.icon-sidebar:before{content:'\f124'} -.icon-signal:before{content:'\f100'} -.icon-sim:before{content:'\f0e1'} -.icon-simalt:before{content:'\f121'} -.icon-skrill:before{content:'\f268'} -.icon-skull:before{content:'\f38d'} -.icon-skype:before{content:'\f141'} -.icon-skypeaway:before{content:'\f39f'} -.icon-skypebusy:before{content:'\f3a0'} -.icon-skypeoffline:before{content:'\f3a1'} -.icon-skypeonline:before{content:'\f39e'} -.icon-smaller:before{content:'\f30b'} -.icon-smf:before{content:'\f062'} -.icon-smile:before{content:'\263a'} -.icon-snow:before{content:'\f22e'} -.icon-snowman:before{content:'\f37c'} -.icon-socialnetwork:before{content:'\f03b'} -.icon-software:before{content:'\f09a'} -.icon-sortbynameascending-atoz:before{content:'\f1c2'} -.icon-sortbynamedescending-ztoa:before{content:'\f1c1'} -.icon-sortbysizeascending:before{content:'\f1c3'} -.icon-sortbysizedescending:before{content:'\f1c4'} -.icon-soundwave:before{content:'\f194'} -.icon-soup:before{content:'\f3d1'} -.icon-spaceinvaders:before{content:'\f352'} -.icon-spades:before{content:'\f2f5'} -.icon-spam:before{content:'\f047'} -.icon-spamalt:before{content:'\f048'} -.icon-spawn:before{content:'\f344'} -.icon-speaker:before{content:'\f372'} -.icon-speed:before{content:'\f40b'} -.icon-spider:before{content:'\f346'} -.icon-spiderman:before{content:'\f347'} -.icon-split:before{content:'\f335'} -.icon-spoon:before{content:'\f213'} -.icon-spray:before{content:'\f1c7'} -.icon-spreadsheet:before{content:'\f0c3'} -.icon-squareapp:before{content:'\f26f'} -.icon-squarebrackets:before{content:'\f0b3'} -.icon-ssh:before{content:'\f04e'} -.icon-sslmanager:before{content:'\f04f'} -.icon-stadium:before{content:'\f3d6'} -.icon-stamp:before{content:'\f242'} -.icon-stampalt:before{content:'\f243'} -.icon-star:before{content:'\f13a'} -.icon-star-empty:before{content:'\f13b'} -.icon-starempty:before{content:'\f2de'} -.icon-starfull:before{content:'\f2e0'} -.icon-starhalf:before{content:'\f2df'} -.icon-steak:before{content:'\f360'} -.icon-steam:before{content:'\f2dd'} -.icon-step-backward:before{content:'\f198'} -.icon-step-forward:before{content:'\f197'} -.icon-sticker:before{content:'\f3f5'} -.icon-stiletto:before{content:'\f429'} -.icon-stockdown:before{content:'\f252'} -.icon-stocks:before{content:'\f250'} -.icon-stockup:before{content:'\f251'} -.icon-stomach:before{content:'\f3e1'} -.icon-stop:before{content:'\f185'} -.icon-stopwatch:before{content:'\f219'} -.icon-storage-box:before{content:'\f011'} -.icon-storagealt-drawer:before{content:'\f012'} -.icon-store:before{content:'\f272'} -.icon-storm:before{content:'\f230'} -.icon-stove:before{content:'\f371'} -.icon-strawberry:before{content:'\f3f3'} -.icon-strikethrough:before{content:'\f1f7'} -.icon-student-school:before{content:'\f288'} -.icon-stumbleupon:before{content:'\f40c'} -.icon-subdomain:before{content:'\f052'} -.icon-submarine:before{content:'\f373'} -.icon-subscript:before{content:'\f1ea'} -.icon-subtractshape:before{content:'\f1fe'} -.icon-sum:before{content:'\f33b'} -.icon-sun-day:before{content:'\f206'} -.icon-sunnysideup:before{content:'\f365'} -.icon-superman:before{content:'\f33f'} -.icon-superscript:before{content:'\f1eb'} -.icon-support:before{content:'\f013'} -.icon-supportalt:before{content:'\f014'} -.icon-switch:before{content:'\f28a'} -.icon-switchoff:before{content:'\f32d'} -.icon-switchoffalt:before{content:'\f28e'} -.icon-switchon:before{content:'\f32c'} -.icon-switchonalt:before{content:'\f28d'} -.icon-sword:before{content:'\f2ed'} -.icon-sync:before{content:'\f0bd'} -.icon-syncalt:before{content:'\f11c'} -.icon-synckeeplocal:before{content:'\f33e'} -.icon-synckeepserver:before{content:'\f33d'} -.icon-syringe-antivirus:before{content:'\f0a9'} -.icon-tablet:before{content:'\f118'} -.icon-tabletennis-pingpong:before{content:'\f2f0'} -.icon-taco:before{content:'\f3cd'} -.icon-tag:before{content:'\f032'} -.icon-tagalt-pricealt:before{content:'\f264'} -.icon-tags:before{content:'\f482'} -.icon-tagvertical:before{content:'\f15f'} -.icon-tank:before{content:'\f423'} -.icon-target:before{content:'\f2a6'} -.icon-taskmanager-logprograms:before{content:'\f04b'} -.icon-tasks:before{content:'\f0e0'} -.icon-taxi:before{content:'\f3a4'} -.icon-tea:before{content:'\f3cb'} -.icon-teapot:before{content:'\f42c'} -.icon-telescope:before{content:'\f3ef'} -.icon-temperature-thermometer:before{content:'\f20d'} -.icon-temperaturealt-thermometeralt:before{content:'\f20e'} -.icon-tennis:before{content:'\f2ea'} -.icon-tent-camping:before{content:'\f215'} -.icon-terminal:before{content:'\f114'} -.icon-tethering:before{content:'\f0f1'} -.icon-tetrisone:before{content:'\f34b'} -.icon-tetristhree:before{content:'\f34d'} -.icon-tetristwo:before{content:'\f34c'} -.icon-text-height:before{content:'\f1f8'} -.icon-text-width:before{content:'\f1f9'} -.icon-th:before{content:'\f110'} -.icon-th-large:before{content:'\f112'} -.icon-th-list:before{content:'\f113'} -.icon-theather:before{content:'\f39c'} -.icon-theme-style:before{content:'\f041'} -.icon-thissideup:before{content:'\f41d'} -.icon-threecolumns:before{content:'\f1ab'} -.icon-thumbs-down:before{content:'\f139'} -.icon-thumbs-up:before{content:'\f138'} -.icon-ticket:before{content:'\f3dc'} -.icon-tictactoe:before{content:'\f39a'} -.icon-tie-business:before{content:'\2040'} -.icon-time:before{content:'\f210'} -.icon-timeline:before{content:'\f253'} -.icon-tint:before{content:'\f208'} -.icon-toast:before{content:'\f2ad'} -.icon-toiletpaper:before{content:'\f384'} -.icon-tooth:before{content:'\f3de'} -.icon-toothbrush:before{content:'\f385'} -.icon-tophat:before{content:'\f3f0'} -.icon-torigate:before{content:'\f411'} -.icon-touchpad:before{content:'\f115'} -.icon-trafficlight:before{content:'\f22a'} -.icon-transform:before{content:'\f1a6'} -.icon-trash:before{content:'\f0ce'} -.icon-trashempty:before{content:'\f0cf'} -.icon-trashfull:before{content:'\f0d0'} -.icon-travel:before{content:'\f422'} -.icon-treediagram:before{content:'\f0ec'} -.icon-treeornament:before{content:'\f37e'} -.icon-triangle:before{content:'\25b3'} -.icon-tron:before{content:'\f34f'} -.icon-trophy:before{content:'\f2d7'} -.icon-truck:before{content:'\f211'} -.icon-trumpet:before{content:'\f375'} -.icon-tumblr:before{content:'\f164'} -.icon-tv:before{content:'\f1a4'} -.icon-twitter:before{content:'\f16a'} -.icon-twocolumnsleft:before{content:'\f1a9'} -.icon-twocolumnsleftalt:before{content:'\f1aa'} -.icon-twocolumnsright:before{content:'\f1a7'} -.icon-twocolumnsrightalt:before{content:'\f1a8'} -.icon-ubuntu:before{content:'\f120'} -.icon-umbrella:before{content:'\f218'} -.icon-underline:before{content:'\f1f6'} -.icon-undo:before{content:'\f32a'} -.icon-unlock:before{content:'\f0bf'} -.icon-upleft:before{content:'\f302'} -.icon-upload:before{content:'\f47a'} -.icon-uploadalt:before{content:'\f11b'} -.icon-upright:before{content:'\f303'} -.icon-uptime:before{content:'\f017'} -.icon-usb:before{content:'\f10d'} -.icon-usbalt:before{content:'\f10e'} -.icon-usbplug:before{content:'\f10f'} -.icon-user:before{content:'\f133'} -.icon-userfilter:before{content:'\f05d'} -.icon-usfootball:before{content:'\f2ec'} -.icon-value-coins:before{content:'\f018'} -.icon-vector:before{content:'\f1b6'} -.icon-vendetta:before{content:'\f3c5'} -.icon-video:before{content:'\f17d'} -.icon-viking:before{content:'\f379'} -.icon-vimeo:before{content:'\f168'} -.icon-vinyl:before{content:'\f0cc'} -.icon-violin:before{content:'\f1a5'} -.icon-virus:before{content:'\f0a8'} -.icon-visa:before{content:'\f3c2'} -.icon-visitor:before{content:'\f097'} -.icon-vlc-cone:before{content:'\f192'} -.icon-voice:before{content:'\f18c'} -.icon-volume-down:before{content:'\f0e3'} -.icon-volume-off:before{content:'\f0e4'} -.icon-volume-up:before{content:'\f0e2'} -.icon-vps:before{content:'\f025'} -.icon-wacom:before{content:'\f1bb'} -.icon-walle:before{content:'\f3bc'} -.icon-wallet:before{content:'\e000'} -.icon-warcraft:before{content:'\f3bf'} -.icon-warmedal:before{content:'\f2e4'} -.icon-warning-sign:before{content:'\f316'} -.icon-washer:before{content:'\f39b'} -.icon-watch:before{content:'\f378'} -.icon-watertap-plumbing:before{content:'\f22d'} -.icon-wave-sea:before{content:'\f23c'} -.icon-wavealt-seaalt:before{content:'\f23b'} -.icon-webcam:before{content:'\f0fe'} -.icon-webcamalt:before{content:'\f129'} -.icon-webhostinghub:before{content:'\f031'} -.icon-webmail:before{content:'\f045'} -.icon-webpage:before{content:'\f033'} -.icon-webplatform:before{content:'\f3c3'} -.icon-websitealt:before{content:'\f01c'} -.icon-websitebuilder:before{content:'\f034'} -.icon-weight:before{content:'\f430'} -.icon-westernunion:before{content:'\f26a'} -.icon-wheel:before{content:'\f228'} -.icon-wheelchair:before{content:'\f3fe'} -.icon-whistle:before{content:'\f3d8'} -.icon-whmcs:before{content:'\f066'} -.icon-wifi:before{content:'\f0ff'} -.icon-wind:before{content:'\f41b'} -.icon-windleft:before{content:'\f424'} -.icon-windows:before{content:'\f019'} -.icon-windright:before{content:'\f425'} -.icon-wine:before{content:'\f238'} -.icon-wizard:before{content:'\f03c'} -.icon-wizardalt:before{content:'\f1fb'} -.icon-wizardhat:before{content:'\f337'} -.icon-woman-female:before{content:'\f2a2'} -.icon-women:before{content:'\f24d'} -.icon-wordpress:before{content:'\f074'} -.icon-wrench:before{content:'\f05b'} -.icon-wrenchalt:before{content:'\f2b2'} -.icon-xbox:before{content:'\f353'} -.icon-xmen:before{content:'\f345'} -.icon-yahoo:before{content:'\f151'} -.icon-yen:before{content:'\00a5'} -.icon-yenalt:before{content:'\f25d'} -.icon-yinyang:before{content:'\262f'} -.icon-youtube:before{content:'\f142'} -.icon-zelda:before{content:'\f3b8'} -.icon-zikula:before{content:'\f0ac'} -.icon-zip:before{content:'\f116'} -.icon-zodiac-aquarius:before{content:'\f3b4'} -.icon-zodiac-aries:before{content:'\f3aa'} -.icon-zodiac-cancer:before{content:'\f3ad'} -.icon-zodiac-capricorn:before{content:'\f3b3'} -.icon-zodiac-gemini:before{content:'\f3ac'} -.icon-zodiac-leo:before{content:'\f3ae'} -.icon-zodiac-libra:before{content:'\f3b0'} -.icon-zodiac-pisces:before{content:'\f3b5'} -.icon-zodiac-sagitarius:before{content:'\f3b2'} -.icon-zodiac-scorpio:before{content:'\f3b1'} -.icon-zodiac-taurus:before{content:'\f3ab'} -.icon-zodiac-virgo:before{content:'\f3af'} -.icon-zoom-in:before{content:'\f320'} -.icon-zoom-out:before{content:'\f321'} -.icon-vk:before{content:'\f34e'} -.icon-bitcoin:before{content:'\f584'} -.icon-rouble:before{content:'\f4ca'} -.icon-phpnuke:before{content:'\f48c'} -.icon-modx:before{content:'\f48d'} -.icon-eoneohseven:before{content:'\f48e'} -.icon-subrion:before{content:'\f48f'} -.icon-typothree:before{content:'\f490'} -.icon-tikiwiki:before{content:'\f491'} -.icon-pligg:before{content:'\f492'} -.icon-pyrocms:before{content:'\f493'} -.icon-mambo:before{content:'\f494'} -.icon-contao:before{content:'\f495'} -.icon-crackedegg:before{content:'\f496'} -.icon-coffeecupalt:before{content:'\f497'} -.icon-reademailalt:before{content:'\f498'} -.icon-train:before{content:'\f499'} -.icon-shoebox:before{content:'\f49a'} -.icon-bathtub:before{content:'\f49b'} -.icon-ninegag:before{content:'\f49c'} -.icon-pebble:before{content:'\f49d'} -.icon-musicthree:before{content:'\f49e'} -.icon-stairsup:before{content:'\f49f'} -.icon-stairsdown:before{content:'\f4a0'} -.icon-bookalt:before{content:'\f4a1'} -.icon-programclose:before{content:'\f4a2'} -.icon-programok:before{content:'\f4a3'} -.icon-splitalt:before{content:'\f4a4'} -.icon-solarsystem:before{content:'\f4a5'} -.icon-honeycomb:before{content:'\f4a6'} -.icon-tools:before{content:'\f4a7'} -.icon-xoops:before{content:'\f4a8'} -.icon-pixie:before{content:'\f4a9'} -.icon-dotclear:before{content:'\f4aa'} -.icon-impresscms:before{content:'\f4ab'} -.icon-saurus:before{content:'\f4ac'} -.icon-impresspages:before{content:'\f4ad'} -.icon-monstra:before{content:'\f4ae'} -.icon-snews:before{content:'\f4af'} -.icon-jcore:before{content:'\f4b0'} -.icon-silverstripe:before{content:'\f4b1'} -.icon-btwoevolution:before{content:'\f4b2'} -.icon-nucleus:before{content:'\f4b3'} -.icon-symphony:before{content:'\f4b5'} -.icon-vanillacms:before{content:'\f4b6'} -.icon-bbpress:before{content:'\f4b7'} -.icon-phpbbalt:before{content:'\f4b8'} -.icon-chyrp:before{content:'\f4b9'} -.icon-pivotx:before{content:'\f4ba'} -.icon-pagecookery:before{content:'\f4bb'} -.icon-moviereelalt:before{content:'\f4bc'} -.icon-cassettealt:before{content:'\f4bd'} -.icon-photobucket:before{content:'\f4be'} -.icon-technorati:before{content:'\f4bf'} -.icon-theverge:before{content:'\f4c0'} -.icon-stacks:before{content:'\f4c1'} -.icon-dotlist:before{content:'\f4c2'} -.icon-numberlist:before{content:'\f4c3'} -.icon-indentleft:before{content:'\f4c4'} -.icon-indentright:before{content:'\f4c5'} -.icon-fblike:before{content:'\f4c6'} -.icon-fbdislike:before{content:'\f4c7'} -.icon-sale:before{content:'\f4c8'} -.icon-sharetronix:before{content:'\f4c9'} -.icon-markerdown:before{content:'\f4cb'} -.icon-markerup:before{content:'\f4cc'} -.icon-markerleft:before{content:'\f4cd'} -.icon-markerright:before{content:'\f4ce'} -.icon-bookmarkalt:before{content:'\f4cf'} -.icon-calendarthree:before{content:'\f4d0'} -.icon-wineglass:before{content:'\f4d1'} -.icon-slidersoff:before{content:'\f4d2'} -.icon-slidersmiddle:before{content:'\f4d3'} -.icon-slidersfull:before{content:'\f4d4'} -.icon-slidersdesc:before{content:'\f4d5'} -.icon-slidersasc:before{content:'\f4d6'} -.icon-slideronefull:before{content:'\f4d7'} -.icon-slidertwofull:before{content:'\f4d8'} -.icon-sliderthreefull:before{content:'\f4d9'} -.icon-noborders:before{content:'\f4da'} -.icon-bottomborder:before{content:'\f4db'} -.icon-topborder:before{content:'\f4dc'} -.icon-leftborder:before{content:'\f4dd'} -.icon-rightborder:before{content:'\f4de'} -.icon-horizontalborder:before{content:'\f4df'} -.icon-verticalborder:before{content:'\f4e0'} -.icon-outerborders:before{content:'\f4e1'} -.icon-innerborders:before{content:'\f4e2'} -.icon-fullborders:before{content:'\f4e3'} -.icon-networksignalalt:before{content:'\f4e4'} -.icon-resizeverticalalt:before{content:'\f4e5'} -.icon-resizehorizontalalt:before{content:'\f4e6'} -.icon-moneyalt:before{content:'\f4e7'} -.icon-fontcase:before{content:'\f4e8'} -.icon-playstation:before{content:'\f4e9'} -.icon-cube:before{content:'\f4ea'} -.icon-sphere:before{content:'\f4eb'} -.icon-ceilinglight:before{content:'\f4ec'} -.icon-chandelier:before{content:'\f4ed'} -.icon-details:before{content:'\f4ee'} -.icon-detailsalt:before{content:'\f4ef'} -.icon-bullet:before{content:'\f4f0'} -.icon-gun:before{content:'\f4f1'} -.icon-processorthree:before{content:'\f4f2'} -.icon-world:before{content:'\f4f3'} -.icon-statistics:before{content:'\f4f4'} -.icon-shoppingcartalt:before{content:'\f4f5'} -.icon-microphonealt:before{content:'\f4f6'} -.icon-routeralt:before{content:'\f4f7'} -.icon-shell:before{content:'\f4f8'} -.icon-squareplay:before{content:'\f4f9'} -.icon-squarestop:before{content:'\f4fa'} -.icon-squarepause:before{content:'\f4fb'} -.icon-squarerecord:before{content:'\f4fc'} -.icon-squareforward:before{content:'\f4fd'} -.icon-squareback:before{content:'\f4fe'} -.icon-squarenext:before{content:'\f4ff'} -.icon-squareprevious:before{content:'\f500'} -.icon-mega:before{content:'\f501'} -.icon-charliechaplin:before{content:'\f502'} -.icon-popcorn:before{content:'\f503'} -.icon-fatarrowright:before{content:'\f504'} -.icon-fatarrowleft:before{content:'\f505'} -.icon-fatarrowdown:before{content:'\f506'} -.icon-fatarrowup:before{content:'\f507'} -.icon-shirtbutton:before{content:'\f508'} -.icon-shirtbuttonalt:before{content:'\f509'} -.icon-cuckooclock:before{content:'\f50a'} -.icon-lens:before{content:'\f50b'} -.icon-voltage:before{content:'\f50c'} -.icon-planealt:before{content:'\f50d'} -.icon-busalt:before{content:'\f50e'} -.icon-lipstick:before{content:'\f50f'} -.icon-plantalt:before{content:'\f510'} -.icon-paperboat:before{content:'\f511'} -.icon-texture:before{content:'\f512'} -.icon-dominoone:before{content:'\f513'} -.icon-dominotwo:before{content:'\f514'} -.icon-dominothree:before{content:'\f515'} -.icon-dominofour:before{content:'\f516'} -.icon-dominofive:before{content:'\f517'} -.icon-dominosix:before{content:'\f518'} -.icon-dominoseven:before{content:'\f519'} -.icon-dominoeight:before{content:'\f51a'} -.icon-dominonine:before{content:'\f51b'} -.icon-connected:before{content:'\f51c'} -.icon-connectedpc:before{content:'\f51d'} -.icon-musicsheet:before{content:'\f51e'} -.icon-rdio:before{content:'\f51f'} -.icon-spotify:before{content:'\f520'} -.icon-deviantart:before{content:'\f521'} -.icon-yelp:before{content:'\f522'} -.icon-behance:before{content:'\f523'} -.icon-nfc:before{content:'\f524'} -.icon-earbudsalt:before{content:'\f525'} -.icon-earbuds:before{content:'\f526'} -.icon-amazon:before{content:'\f527'} -.icon-openid:before{content:'\f528'} -.icon-digg:before{content:'\f529'} -.icon-retweet:before{content:'\f52a'} -.icon-moonnew:before{content:'\f52b'} -.icon-moonwaxingcrescent:before{content:'\f52c'} -.icon-moonfirstquarter:before{content:'\f52d'} -.icon-moonwaxinggibbous:before{content:'\f52e'} -.icon-moonfull:before{content:'\f52f'} -.icon-moonwaninggibbous:before{content:'\f530'} -.icon-moonthirdquarter:before{content:'\f531'} -.icon-moonwaningcrescent:before{content:'\f532'} -.icon-planet:before{content:'\f533'} -.icon-sodacup:before{content:'\f534'} -.icon-cocktail:before{content:'\f535'} -.icon-church:before{content:'\f536'} -.icon-mosque:before{content:'\f537'} -.icon-comedy:before{content:'\f538'} -.icon-tragedy:before{content:'\f539'} -.icon-bacon:before{content:'\f53a'} -.icon-trailor:before{content:'\f53b'} -.icon-tshirt:before{content:'\f53c'} -.icon-design:before{content:'\f53d'} -.icon-spiderweb:before{content:'\f53e'} -.icon-fireplace:before{content:'\f53f'} -.icon-tallglass:before{content:'\f540'} -.icon-grapes:before{content:'\f541'} -.icon-biohazard:before{content:'\f542'} -.icon-directions:before{content:'\f543'} -.icon-equalizerthree:before{content:'\f544'} -.icon-mountains:before{content:'\f545'} -.icon-bing:before{content:'\f546'} -.icon-windowseight:before{content:'\f547'} -.icon-microsoftoffice:before{content:'\f548'} -.icon-salealt:before{content:'\f549'} -.icon-purse:before{content:'\f54a'} -.icon-chickenalt:before{content:'\f54b'} -.icon-podium:before{content:'\f54c'} -.icon-findfriends:before{content:'\f54d'} -.icon-microphonethree:before{content:'\f54e'} -.icon-workshirt:before{content:'\f54f'} -.icon-donotdisturb:before{content:'\f550'} -.icon-addtags:before{content:'\f551'} -.icon-removetags:before{content:'\f556'} -.icon-carbattery:before{content:'\f553'} -.icon-debug:before{content:'\f554'} -.icon-trojan:before{content:'\f555'} -.icon-molecule:before{content:'\f556'} -.icon-safetygoggles:before{content:'\f557'} -.icon-leather:before{content:'\f558'} -.icon-teddybear:before{content:'\f559'} -.icon-stroller:before{content:'\f55a'} -.icon-circleplay:before{content:'\f55b'} -.icon-circlestop:before{content:'\f55c'} -.icon-circlepause:before{content:'\f55d'} -.icon-circlerecord:before{content:'\f55e'} -.icon-circleforward:before{content:'\f55f'} -.icon-circlebackward:before{content:'\f560'} -.icon-circlenext:before{content:'\f561'} -.icon-circleprevious:before{content:'\f562'} -.icon-circleplayempty:before{content:'\f563'} -.icon-circlestopempty:before{content:'\f564'} -.icon-circlepauseempty:before{content:'\f565'} -.icon-circlerecordempty:before{content:'\f566'} -.icon-circleforwardempty:before{content:'\f567'} -.icon-circlebackwardempty:before{content:'\f568'} -.icon-circlenextempty:before{content:'\f569'} -.icon-circlepreviousempty:before{content:'\f56a'} -.icon-belt:before{content:'\f56b'} -.icon-bait:before{content:'\f56c'} -.icon-manalt:before{content:'\f56d'} -.icon-womanalt:before{content:'\f56e'} -.icon-clover:before{content:'\f56f'} -.icon-pacifier:before{content:'\f570'} -.icon-calcplus:before{content:'\f571'} -.icon-calcminus:before{content:'\f572'} -.icon-calcmultiply:before{content:'\f573'} -.icon-calcdivide:before{content:'\f574'} -.icon-calcequals:before{content:'\f575'} -.icon-city:before{content:'\f576'} -.icon-hdvideo:before{content:'\f577'} -.icon-horizontalexpand:before{content:'\f578'} -.icon-horizontalcontract:before{content:'\f579'} -.icon-radar:before{content:'\f57a'} -.icon-threed:before{content:'\f57b'} -.icon-flickralt:before{content:'\f57c'} -.icon-pattern:before{content:'\f57d'} -.icon-elevator:before{content:'\f57e'} -.icon-escalator:before{content:'\f57f'} -.icon-portrait:before{content:'\f580'} -.icon-cigar:before{content:'\f581'} -.icon-dropbox:before{content:'\f582'} -.icon-origami:before{content:'\f583'} -.icon-opensource:before{content:'\f585'} -.icon-redaxscript:before{content:'\f586'} -.icon-mahara:before{content:'\f587'} -.icon-forkcms:before{content:'\f588'} -.icon-pimcore:before{content:'\f589'} -.icon-bigace:before{content:'\f58a'} -.icon-aef:before{content:'\f58b'} -.icon-punbb:before{content:'\f58c'} -.icon-phorum:before{content:'\f58d'} -.icon-fluxbb:before{content:'\f58e'} -.icon-minibb:before{content:'\f58f'} -.icon-zenphoto:before{content:'\f590'} -.icon-fourimages:before{content:'\f591'} -.icon-plogger:before{content:'\f592'} -.icon-jcow:before{content:'\f593'} -.icon-elgg:before{content:'\f594'} -.icon-etano:before{content:'\f595'} -.icon-openclassifieds:before{content:'\f596'} -.icon-osclass:before{content:'\f597'} -.icon-openx:before{content:'\f598'} -.icon-phplist:before{content:'\f599'} -.icon-roundcube:before{content:'\f59a'} -.icon-pommo:before{content:'\f59b'} -.icon-webinsta:before{content:'\f59c'} -.icon-limesurvey:before{content:'\f59d'} -.icon-fengoffice:before{content:'\f59e'} -.icon-eyeos:before{content:'\f59f'} -.icon-dotproject:before{content:'\f5a0'} -.icon-collabtive:before{content:'\f5a1'} -.icon-projectpier:before{content:'\f5a2'} -.icon-taskfreak:before{content:'\f5a3'} -.icon-eventum:before{content:'\f5a4'} -.icon-traq:before{content:'\f5a5'} -.icon-mantisbugtracker:before{content:'\f5a6'} -.icon-oscommerce:before{content:'\f5a7'} -.icon-zencart:before{content:'\f5a8'} -.icon-tomatocart:before{content:'\f5a9'} -.icon-boxbilling:before{content:'\f5aa'} -.icon-zurmo:before{content:'\f5ab'} -.icon-orangehrm:before{content:'\f5ac'} -.icon-vtiger:before{content:'\f5ad'} -.icon-mibew:before{content:'\f5ae'} -.icon-phpmyfaq:before{content:'\f5af'} -.icon-yiiframework:before{content:'\f5b0'} -.icon-zendframework:before{content:'\f5b1'} -.icon-fuelphp:before{content:'\f5b2'} -.icon-kohana:before{content:'\f5b3'} -.icon-smarty:before{content:'\f5b4'} -.icon-sidu:before{content:'\f5b5'} -.icon-simplepie:before{content:'\f5b6'} -.icon-projectsend:before{content:'\f5b7'} -.icon-extjs:before{content:'\f5b8'} -.icon-raphael:before{content:'\f5b9'} -.icon-sizzle:before{content:'\f5ba'} -.icon-yui:before{content:'\f5bb'} -.icon-scissorsalt:before{content:'\f5bc'} -.icon-cuthere:before{content:'\f5bd'} -.icon-coinsalt:before{content:'\f5be'} -.icon-parkingmeter:before{content:'\f5bf'} -.icon-treethree:before{content:'\f5c0'} -.icon-packarchive:before{content:'\f5c1'} -.icon-unpackarchive:before{content:'\f5c2'} -.icon-terminalalt:before{content:'\f5c3'} -.icon-jersey:before{content:'\f5c4'} -.icon-vial:before{content:'\f5c5'} -.icon-noteslist:before{content:'\f5c6'} -.icon-notestasks:before{content:'\f5c7'} -.icon-notesdate:before{content:'\f5c8'} -.icon-noteslocation:before{content:'\f5c9'} -.icon-noteslistalt:before{content:'\f5ca'} -.icon-notestasksalt:before{content:'\f5cb'} -.icon-notesdatealt:before{content:'\f5cc'} -.icon-noteslocationalt:before{content:'\f5cd'} -.icon-useralt:before{content:'\f5ce'} -.icon-adduseralt:before{content:'\f5cf'} -.icon-removeuseralt:before{content:'\f5d0'} -.icon-banuseralt:before{content:'\f5d1'} -.icon-banuser:before{content:'\f5d2'} -.icon-paintrollalt:before{content:'\f5d3'} -.icon-textcursor:before{content:'\f5d4'} -.icon-textfield:before{content:'\f5d5'} -.icon-precisecursor:before{content:'\f5d6'} -.icon-brokenlink:before{content:'\f5d7'} -.icon-bookmarkthree:before{content:'\f5d8'} -.icon-bookmarkfour:before{content:'\f5d9'} -.icon-warmedalalt:before{content:'\f5da'} -.icon-thinking:before{content:'\f5db'} -.icon-commentlove:before{content:'\f5dc'} -.icon-commentsmiley:before{content:'\f5dd'} -.icon-sharetwo:before{content:'\f147'} -.icon-emptystar:before{content:'\f2de'} -.icon-halfstar:before{content:'\f2df'} -.icon-fullstar:before{content:'\f2e0'} -.icon-forbidden:before{content:'\f314'} -.icon-indentleftalt:before{content:'\f4c4'} -.icon-indentrightalt:before{content:'\f4c5'} -.icon-modxalt:before{content:'\f5de'} -.icon-apple:before{content:'\f5df'} -.icon-greekcolumn:before{content:'\f5e0'} -.icon-walletalt:before{content:'\f5e1'} -.icon-dollarsquare:before{content:'\f5e2'} -.icon-poundsquare:before{content:'\f5e3'} -.icon-yensquare:before{content:'\f5e4'} -.icon-eurosquare:before{content:'\f5e5'} -.icon-bitcoinsquare:before{content:'\f5e6'} -.icon-roublesquare:before{content:'\f5e7'} -.icon-roublealt:before{content:'\f5e8'} -.icon-bitcoinalt:before{content:'\f5e9'} -.icon-gavel:before{content:'\f5ea'} -.icon-barchartasc:before{content:'\f5eb'} -.icon-barchartdesc:before{content:'\f5ec'} -.icon-house:before{content:'\f5ed'} -.icon-garage:before{content:'\f5ee'} -.icon-milk:before{content:'\f5ef'} -.icon-hryvnia:before{content:'\f5f0'} -.icon-hryvniasquare:before{content:'\f5f1'} -.icon-hryvniaalt:before{content:'\f5f2'} -.icon-beeralt:before{content:'\f5f3'} -.icon-trolleyfull:before{content:'\f5f4'} -.icon-trolleyload:before{content:'\f5f5'} -.icon-trolleyunload:before{content:'\f5f6'} -.icon-trolleyempty:before{content:'\f5f7'} -.icon-mootools:before{content:'\f5f8'} -.icon-mootoolstwo:before{content:'\f5f9'} -.icon-mootoolsthree:before{content:'\f5fa'} -.icon-mysqlthree:before{content:'\f5fb'} -.icon-mysqlalt:before{content:'\f5fc'} -.icon-pgsql:before{content:'\f5fd'} -.icon-mongodb:before{content:'\f5fe'} -.icon-neofourj:before{content:'\f5ff'} -.icon-nosql:before{content:'\f600'} -.icon-catface:before{content:'\f601'} -.icon-polaroid:before{content:'\f602'} -.icon-clouderror:before{content:'\f603'} -.icon-camcorder:before{content:'\f604'} -.icon-projector:before{content:'\f605'} -.icon-sdvideo:before{content:'\f606'} -.icon-fx:before{content:'\f607'} -.icon-gramophone:before{content:'\f608'} -.icon-speakeralt:before{content:'\f609'} -.icon-hddalt:before{content:'\f60a'} -.icon-usbflash:before{content:'\f60b'} -.icon-manillaenvelope:before{content:'\f60c'} -.icon-stickynote:before{content:'\f60d'} -.icon-stickynotealt:before{content:'\f60e'} -.icon-torch:before{content:'\f60f'} -.icon-flashlightalt:before{content:'\f610'} -.icon-campfire:before{content:'\f611'} -.icon-cctv:before{content:'\f612'} -.icon-drill:before{content:'\f613'} -.icon-lampalt:before{content:'\f614'} -.icon-flowerpot:before{content:'\f615'} -.icon-defragment:before{content:'\f616'} -.icon-panoramio:before{content:'\f617'} -.icon-panorama:before{content:'\f618'} -.icon-photosphere:before{content:'\f619'} -.icon-panoramaalt:before{content:'\f61a'} -.icon-timer:before{content:'\f61b'} -.icon-burstmode:before{content:'\f61c'} -.icon-cameraflash:before{content:'\f61d'} -.icon-autoflash:before{content:'\f61e'} -.icon-noflash:before{content:'\f61f'} -.icon-threetofour:before{content:'\f620'} -.icon-sixteentonine:before{content:'\f621'} -.icon-cat:before{content:'\f622'} -.icon-dog:before{content:'\f623'} -.icon-rabbit:before{content:'\f624'} -.icon-koala:before{content:'\f625'} -.icon-butterflyalt:before{content:'\f626'} -.icon-butterfly:before{content:'\f627'} -.icon-wwf:before{content:'\f628'} -.icon-poop:before{content:'\f629'} -.icon-poopalt:before{content:'\f62a'} -.icon-kiwi:before{content:'\f62b'} -.icon-kiwifruit:before{content:'\f62c'} -.icon-lemon:before{content:'\f62d'} -.icon-pear:before{content:'\f62e'} -.icon-watermelon:before{content:'\f62f'} -.icon-onion:before{content:'\f630'} -.icon-turnip:before{content:'\f631'} -.icon-eggplant:before{content:'\f632'} -.icon-avocado:before{content:'\f633'} -.icon-perfume:before{content:'\f634'} -.icon-arch:before{content:'\f635'} -.icon-pluspages:before{content:'\f636'} -.icon-community:before{content:'\f637'} -.icon-pluscircles:before{content:'\f638'} -.icon-googleplusold:before{content:'\f639'} -.icon-plusgames:before{content:'\f63a'} -.icon-event:before{content:'\f63b'} -.icon-miui:before{content:'\f63c'} -.icon-hot:before{content:'\f63d'} -.icon-flowup:before{content:'\f63e'} -.icon-flowdown:before{content:'\f63f'} -.icon-moustache:before{content:'\f640'} -.icon-angle:before{content:'\f641'} -.icon-sleep:before{content:'\f642'} -.icon-acorn:before{content:'\f643'} -.icon-steamalt:before{content:'\f644'} -.icon-resizeupleft:before{content:'\f645'} -.icon-resizeupright:before{content:'\f646'} -.icon-resizedownright:before{content:'\f647'} -.icon-resizedownleft:before{content:'\f648'} -.icon-hammeralt:before{content:'\f649'} -.icon-bamboo:before{content:'\f64a'} -.icon-mypictures:before{content:'\f64b'} -.icon-mymusic:before{content:'\f64c'} -.icon-myvideos:before{content:'\f64d'} -.icon-systemfolder:before{content:'\f64e'} -.icon-bookthree:before{content:'\f64f'} -.icon-compile:before{content:'\f650'} -.icon-report:before{content:'\f651'} -.icon-fliphorizontal:before{content:'\f652'} -.icon-flipvertical:before{content:'\f653'} -.icon-construction:before{content:'\f654'} -.icon-counteralt:before{content:'\f655'} -.icon-counter:before{content:'\f656'} -.icon-papercutter:before{content:'\f657'} -.icon-snaptodot:before{content:'\f658'} -.icon-snaptogrid:before{content:'\f659'} -.icon-caligraphy:before{content:'\f65a'} -.icon-icecreamthree:before{content:'\f65b'} -.icon-skitch:before{content:'\f65c'} -.icon-archlinux:before{content:'\f65d'} -.icon-elementaryos:before{content:'\f65e'} -.icon-loadingone:before{content:'\f65f'} -.icon-loadingtwo:before{content:'\f660'} -.icon-loadingthree:before{content:'\f661'} -.icon-loadingfour:before{content:'\f662'} -.icon-loadingfive:before{content:'\f663'} -.icon-loadingsix:before{content:'\f664'} -.icon-loadingseven:before{content:'\f665'} -.icon-loadingeight:before{content:'\f666'} -.icon-brokenheart:before{content:'\f667'} -.icon-heartarrow:before{content:'\f668'} -.icon-heartsparkle:before{content:'\f669'} -.icon-cell:before{content:'\f66a'} -.icon-panda:before{content:'\f66b'} -.icon-refreshalt:before{content:'\f66c'} -.icon-mirror:before{content:'\f66d'} -.icon-headphonesthree:before{content:'\f66e'} -.icon-fan:before{content:'\f66f'} -.icon-tornado:before{content:'\f670'} -.icon-hangout:before{content:'\f671'} -.icon-beaker:before{content:'\f672'} -.icon-beakeralt:before{content:'\f673'} -.icon-phonescreensize:before{content:'\f674'} -.icon-tabletscreensize:before{content:'\f675'} -.icon-notification:before{content:'\f676'} -.icon-googleglass:before{content:'\f677'} -.icon-pinterest:before{content:'\f678'} -.icon-soundcloud:before{content:'\f679'} -.icon-alarmclock:before{content:'\f67a'} -.icon-addalarm:before{content:'\f67b'} -.icon-deletealarm:before{content:'\f67c'} -.icon-turnoffalarm:before{content:'\f67d'} -.icon-snooze:before{content:'\f67e'} -.icon-bringforward:before{content:'\f67f'} -.icon-sendbackward:before{content:'\f680'} -.icon-bringtofront:before{content:'\f681'} -.icon-sendtoback:before{content:'\f682'} -.icon-tectile:before{content:'\f683'} -.icon-grave:before{content:'\f684'} -.icon-gravetwo:before{content:'\f685'} -.icon-gravethree:before{content:'\f686'} -.icon-gravefour:before{content:'\f687'} -.icon-textlayer:before{content:'\f688'} -.icon-vectoralt:before{content:'\f689'} -.icon-drmanhattan:before{content:'\f68a'} -.icon-foursquarealt:before{content:'\f68b'} -.icon-hashtag:before{content:'\f68c'} -.icon-enteralt:before{content:'\f68d'} -.icon-exitalt:before{content:'\f68e'} -.icon-cartalt:before{content:'\f68f'} -.icon-vaultthree:before{content:'\f690'} -.icon-fatundo:before{content:'\f691'} -.icon-fatredo:before{content:'\f692'} -.icon-feedly:before{content:'\f693'} -.icon-feedlyalt:before{content:'\f694'} -.icon-squareheart:before{content:'\f695'} -.icon-squarestar:before{content:'\f696'} -.icon-squarecomment:before{content:'\f697'} -.icon-squarelike:before{content:'\f698'} -.icon-squarebookmark:before{content:'\f699'} -.icon-squaresearch:before{content:'\f69a'} -.icon-squaresettings:before{content:'\f69b'} -.icon-squarevoice:before{content:'\f69c'} -.icon-google:before{content:'\f69d'} -.icon-emojigrinalt:before{content:'\f69e'} -.icon-emojigrin:before{content:'\f69f'} -.icon-constellation:before{content:'\f6a0'} -.icon-emojisurprise:before{content:'\f6a1'} -.icon-emojidead:before{content:'\f6a2'} -.icon-emojiangry:before{content:'\f6a3'} -.icon-emojidevil:before{content:'\f6a4'} -.icon-emojiwink:before{content:'\f6a5'} -.icon-moonorbit:before{content:'\f6a6'} -.icon-emojismile:before{content:'\f6a7'} -.icon-emojisorry:before{content:'\f6a8'} -.icon-emojiconfused:before{content:'\f6a9'} -.icon-emojisleep:before{content:'\f6aa'} -.icon-emojicry:before{content:'\f6ab'} -.icon-circlefork:before{content:'\f6ac'} -.icon-circlespoon:before{content:'\f6ad'} -.icon-circleknife:before{content:'\f6ae'} -.icon-circlepencil:before{content:'\f6af'} -.icon-circlehammer:before{content:'\f6b0'} -.icon-circlescrewdriver:before{content:'\f6b1'} -.icon-middlefinger:before{content:'\f6b2'} -.icon-heavymetal:before{content:'\f6b3'} -.icon-turnright:before{content:'\f6b4'} -.icon-turnleft:before{content:'\f6b5'} -.icon-vineapp:before{content:'\f6b6'} -.icon-vineappalt:before{content:'\f6b7'} -.icon-finance:before{content:'\f6b8'} -.icon-survey:before{content:'\f6b9'} -.icon-hangouts:before{content:'\f6ba'} -.icon-square0:before{content:'\f6bb'} -.icon-square1:before{content:'\f6bc'} -.icon-square2:before{content:'\f6bd'} -.icon-square3:before{content:'\f6be'} -.icon-square4:before{content:'\f6bf'} -.icon-square5:before{content:'\f6c0'} -.icon-square6:before{content:'\f6c1'} -.icon-square7:before{content:'\f6c2'} -.icon-square8:before{content:'\f6c3'} -.icon-square9:before{content:'\f6c4'} -.icon-squarea:before{content:'\f6c5'} -.icon-squareb:before{content:'\f6c6'} -.icon-squarec:before{content:'\f6c7'} -.icon-squared:before{content:'\f6c8'} -.icon-squaree:before{content:'\f6c9'} -.icon-squaref:before{content:'\f6ca'} -.icon-squareg:before{content:'\f6cb'} -.icon-squareh:before{content:'\f6cc'} -.icon-squarei:before{content:'\f6cd'} -.icon-squarej:before{content:'\f6ce'} -.icon-squarek:before{content:'\f6cf'} -.icon-squarel:before{content:'\f6d0'} -.icon-squarem:before{content:'\f6d1'} -.icon-squaren:before{content:'\f6d2'} -.icon-squareo:before{content:'\f6d3'} -.icon-squarep:before{content:'\f6d4'} -.icon-squareq:before{content:'\f6d5'} -.icon-squarer:before{content:'\f6d6'} -.icon-squares:before{content:'\f6d7'} -.icon-squaret:before{content:'\f6d8'} -.icon-squareu:before{content:'\f6d9'} -.icon-squarev:before{content:'\f6da'} -.icon-squarew:before{content:'\f6db'} -.icon-squarex:before{content:'\f6dc'} -.icon-squarey:before{content:'\f6dd'} -.icon-squarez:before{content:'\f6de'} -.icon-shuttle:before{content:'\f6df'} -.icon-meteor:before{content:'\f6e0'} -.icon-galaxy:before{content:'\f6e1'} -.icon-observatory:before{content:'\f6e2'} -.icon-astronaut:before{content:'\f6e3'} -.icon-asteroid:before{content:'\f6e4'} -.icon-sunrise:before{content:'\f6e5'} -.icon-sunset:before{content:'\f6e6'} -.icon-tiderise:before{content:'\f6e7'} -.icon-tidefall:before{content:'\f6e8'} -.icon-mushroomcloud:before{content:'\f6e9'} -.icon-galaxyalt:before{content:'\f6ea'} -.icon-sputnik:before{content:'\f6eb'} -.icon-sextant:before{content:'\f6ec'} -.icon-spock:before{content:'\f6ed'} -.icon-meteorite:before{content:'\f6ee'} -.icon-deathstar:before{content:'\f6ef'} -.icon-deathstarbulding:before{content:'\f6f0'} -.icon-fallingstar:before{content:'\f6f1'} -.icon-windmill:before{content:'\f6f2'} -.icon-windmillalt:before{content:'\f6f3'} -.icon-pumpjack:before{content:'\f6f4'} -.icon-nuclearplant:before{content:'\f6f5'} -.icon-solarpanel:before{content:'\f6f6'} -.icon-barrel:before{content:'\f6f7'} -.icon-canister:before{content:'\f6f8'} -.icon-railtunnel:before{content:'\f6f9'} -.icon-roadtunnel:before{content:'\f6fa'} -.icon-pickaxe:before{content:'\f6fb'} -.icon-cow:before{content:'\f6fc'} -.icon-sheep:before{content:'\f6fd'} -.icon-fountain:before{content:'\f6fe'} -.icon-circlezero:before{content:'\f6ff'} -.icon-circleone:before{content:'\f700'} -.icon-circletwo:before{content:'\f701'} -.icon-circlethree:before{content:'\f702'} -.icon-circlefour:before{content:'\f703'} -.icon-circlefive:before{content:'\f704'} -.icon-circlesix:before{content:'\f705'} -.icon-circleseven:before{content:'\f706'} -.icon-circleeight:before{content:'\f707'} -.icon-circlenine:before{content:'\f708'} -.icon-circlea:before{content:'\f709'} -.icon-circleb:before{content:'\f70a'} -.icon-circlec:before{content:'\f70b'} -.icon-circled:before{content:'\f70c'} -.icon-circlee:before{content:'\f70d'} -.icon-circlef:before{content:'\f70e'} -.icon-circleg:before{content:'\f70f'} -.icon-circleh:before{content:'\f710'} -.icon-circlei:before{content:'\f711'} -.icon-circlej:before{content:'\f712'} -.icon-circlek:before{content:'\f713'} -.icon-circlel:before{content:'\f714'} -.icon-circlem:before{content:'\f715'} -.icon-circlen:before{content:'\f716'} -.icon-circleo:before{content:'\f717'} -.icon-circlep:before{content:'\f718'} -.icon-circleq:before{content:'\f719'} -.icon-circler:before{content:'\f71a'} -.icon-circles:before{content:'\f71b'} -.icon-circlet:before{content:'\f71c'} -.icon-circleu:before{content:'\f71d'} -.icon-circlev:before{content:'\f71e'} -.icon-circlew:before{content:'\f71f'} -.icon-circlex:before{content:'\f720'} -.icon-circley:before{content:'\f721'} -.icon-circlez:before{content:'\f722'} -.icon-creeper:before{content:'\f723'} -.icon-minecraft:before{content:'\f724'} -.icon-minecraftalt:before{content:'\f725'} -.icon-pixelsword:before{content:'\f726'} -.icon-pixelbroadsword:before{content:'\f727'} -.icon-pixelwand:before{content:'\f728'} -.icon-pixelpotion:before{content:'\f729'} -.icon-pixelpotionalt:before{content:'\f72a'} -.icon-pixelpickaxe:before{content:'\f72b'} -.icon-pixelbow:before{content:'\f72c'} -.icon-pixelarrow:before{content:'\f72d'} -.icon-pixelaxe:before{content:'\f72e'} -.icon-pixeldagger:before{content:'\f72f'} -.icon-pixelbastardsword:before{content:'\f730'} -.icon-pixellance:before{content:'\f731'} -.icon-pixelbattleaxe:before{content:'\f732'} -.icon-pixelshovel:before{content:'\f733'} -.icon-pixelsphere:before{content:'\f734'} -.icon-pixelelixir:before{content:'\f735'} -.icon-pixelchest:before{content:'\f736'} -.icon-pixelshield:before{content:'\f737'} -.icon-pixelheart:before{content:'\f738'} -.icon-rudder:before{content:'\f739'} -.icon-folderalt:before{content:'\f73a'} -.icon-removefolderalt:before{content:'\f73b'} -.icon-addfolderalt:before{content:'\f73c'} -.icon-deletefolderalt:before{content:'\f73d'} -.icon-openfolderalt:before{content:'\f73e'} -.icon-clipboardalt:before{content:'\f73f'} -.icon-pastealt:before{content:'\f740'} -.icon-loadingflowccw:before{content:'\f741'} -.icon-loadingflowcw:before{content:'\f742'} -.icon-code:before{content:'\f743'} -.icon-cloveralt:before{content:'\f744'} -.icon-lips:before{content:'\f745'} -.icon-kiss:before{content:'\f746'} -.icon-manualshift:before{content:'\f747'} -.icon-simcardthree:before{content:'\f748'} -.icon-parthenon:before{content:'\f749'} -.icon-addcomment:before{content:'\f74a'} -.icon-deletecomment:before{content:'\f74b'} -.icon-gender:before{content:'\f74c'} -.icon-callalt:before{content:'\f74d'} -.icon-outgoingcallalt:before{content:'\f74e'} -.icon-incomingcallalt:before{content:'\f74f'} -.icon-missedcallalt:before{content:'\f750'} -.icon-export:before{content:'\f751'} -.icon-import:before{content:'\f752'} -.icon-cherryalt:before{content:'\f753'} -.icon-panties:before{content:'\f754'} -.icon-kimai:before{content:'\f755'} -.icon-livejournal:before{content:'\f756'} -.icon-livejournalalt:before{content:'\f757'} -.icon-tagged:before{content:'\f758'} -.icon-temple:before{content:'\f759'} -.icon-mayanpyramid:before{content:'\f75a'} -.icon-egyptpyramid:before{content:'\f75b'} -.icon-tampermonkey:before{content:'\f75c'} -.icon-pushbullet:before{content:'\f75d'} -.icon-currents:before{content:'\f75e'} -.icon-communitysmall:before{content:'\f75f'} -.icon-squaregithub:before{content:'\f760'} -.icon-projectfork:before{content:'\f761'} -.icon-projectmerge:before{content:'\f762'} -.icon-projectcompare:before{content:'\f763'} -.icon-history:before{content:'\f764'} -.icon-notebook:before{content:'\f765'} -.icon-issue:before{content:'\f766'} -.icon-issueclosed:before{content:'\f767'} -.icon-issuereopened:before{content:'\f768'} -.icon-rubyalt:before{content:'\f769'} -.icon-lighton:before{content:'\f76a'} -.icon-lightoff:before{content:'\f76b'} -.icon-bellalt:before{content:'\f76c'} -.icon-versions:before{content:'\f777'} -.icon-twog:before{content:'\f76e'} -.icon-threeg:before{content:'\f76f'} -.icon-fourg:before{content:'\f770'} -.icon-gpsalt:before{content:'\f771'} -.icon-circleloaderfull:before{content:'\f772'} -.icon-circleloaderseven:before{content:'\f773'} -.icon-circleloadersix:before{content:'\f774'} -.icon-circleloaderfive:before{content:'\f775'} -.icon-circleloaderfour:before{content:'\f776'} -.icon-circleloaderthree:before{content:'\f777'} -.icon-circleloadertwo:before{content:'\f778'} -.icon-circleloaderone:before{content:'\f779'} -.icon-circleloaderempty:before{content:'\f77a'} -.icon-whatsapp:before{content:'\f77b'} -.icon-whatsappalt:before{content:'\f77c'} -.icon-viber:before{content:'\f77d'} -.icon-squareviber:before{content:'\f77e'} -.icon-teamviewer:before{content:'\f77f'} -.icon-tunein:before{content:'\f780'} -.icon-tuneinalt:before{content:'\f781'} -.icon-weightscale:before{content:'\f782'} -.icon-boxing:before{content:'\f783'} -.icon-speedalt:before{content:'\f784'} -.icon-scriptalt:before{content:'\f785'} -.icon-splitthree:before{content:'\f786'} -.icon-mergethree:before{content:'\f787'} -.icon-layersthree:before{content:'\f788'} -.icon-mutemic:before{content:'\f789'} -.icon-zerply:before{content:'\f78a'} -.icon-circlegoogleplus:before{content:'\f78b'} -.icon-circletwitter:before{content:'\f78c'} -.icon-circlefacebook:before{content:'\f78d'} -.icon-circleyahoo:before{content:'\f78e'} -.icon-circlegithub:before{content:'\f78f'} -.icon-forumsalt:before{content:'\f790'} -.icon-circlepath:before{content:'\f791'} -.icon-circlevimeo:before{content:'\f792'} -.icon-circlevine:before{content:'\f793'} -.icon-instagramtwo:before{content:'\f794'} -.icon-instagramthree:before{content:'\f795'} -.icon-flickrthree:before{content:'\f796'} -.icon-quora:before{content:'\f797'} -.icon-squarequora:before{content:'\f798'} -.icon-circlequora:before{content:'\f799'} -.icon-picasa:before{content:'\f79a'} -.icon-branch:before{content:'\f79b'} -.icon-ingress:before{content:'\f79c'} -.icon-squarezerply:before{content:'\f79d'} -.icon-circlezerply:before{content:'\f79e'} -.icon-squarevimeo:before{content:'\f79f'} -.icon-squaretwitter:before{content:'\f7a0'} -.icon-brightnessalt:before{content:'\f7a1'} -.icon-brightnessalthalf:before{content:'\f7a2'} -.icon-brightnessaltfull:before{content:'\f7a3'} -.icon-brightnessaltauto:before{content:'\f7a4'} -.icon-shirtbuttonthree:before{content:'\f7a5'} -.icon-openshare:before{content:'\f7a6'} -.icon-copyapp:before{content:'\f7a7'} -.icon-bowl:before{content:'\f7a8'} -.icon-cloudalt:before{content:'\f7a9'} -.icon-cloudaltdownload:before{content:'\f7aa'} -.icon-cloudaltupload:before{content:'\f7ab'} -.icon-cloudaltsync:before{content:'\f7ac'} -.icon-cloudaltprivate:before{content:'\f7ad'} -.icon-flipboard:before{content:'\f7ae'} -.icon-octoloaderempty:before{content:'\f7af'} -.icon-octoloaderone:before{content:'\f7b0'} -.icon-octoloadertwo:before{content:'\f7b1'} -.icon-octoloaderthree:before{content:'\f7b2'} -.icon-octoloaderfour:before{content:'\f7b3'} -.icon-octoloaderfive:before{content:'\f7b4'} -.icon-octoloadersix:before{content:'\f7b5'} -.icon-octoloaderseven:before{content:'\f7b6'} -.icon-octoloaderfull:before{content:'\f7b7'} -.icon-selectionsymbol:before{content:'\f7b8'} -.icon-infinityalt:before{content:'\f7b9'} -.icon-pullrequest:before{content:'\f7ba'} -.icon-projectforkdelete:before{content:'\f7bb'} -.icon-projectforkprivate:before{content:'\f7bc'} -.icon-commit:before{content:'\f7bd'} -.icon-htmlfile:before{content:'\f7be'} -.icon-pushalt:before{content:'\f7bf'} -.icon-pullalt:before{content:'\f7c0'} -.icon-photonineframes:before{content:'\f7c1'} -.icon-wetfloor:before{content:'\f7c2'} -.icon-instagramfour:before{content:'\f7c3'} -.icon-circleinstagram:before{content:'\f7c4'} -.icon-videocamerathree:before{content:'\f7c5'} -.icon-subtitles:before{content:'\f7c6'} -.icon-subtitlesoff:before{content:'\f7c7'} -.icon-compress:before{content:'\f7c8'} -.icon-baby:before{content:'\f7c9'} -.icon-ducky:before{content:'\f7ca'} -.icon-handswipe:before{content:'\f7cb'} -.icon-swipeup:before{content:'\f7cc'} -.icon-swipedown:before{content:'\f7cd'} -.icon-twofingerswipedown:before{content:'\f7ce'} -.icon-twofingerswipeup:before{content:'\f7cf'} -.icon-doubletap:before{content:'\f7d0'} -.icon-dribbblealt:before{content:'\f7d1'} -.icon-circlecallmissed:before{content:'\f7d2'} -.icon-circlecallincoming:before{content:'\f7d3'} -.icon-circlecalloutgoing:before{content:'\f7d4'} -.icon-circledownload:before{content:'\f7d5'} -.icon-circleupload:before{content:'\f7d6'} -.icon-minismile:before{content:'\f7d7'} -.icon-minisad:before{content:'\f7d8'} -.icon-minilaugh:before{content:'\f7d9'} -.icon-minigrin:before{content:'\f7da'} -.icon-miniangry:before{content:'\f7db'} -.icon-minitongue:before{content:'\f7dc'} -.icon-minitonguealt:before{content:'\f7dd'} -.icon-miniwink:before{content:'\f7de'} -.icon-minitonguewink:before{content:'\f7df'} -.icon-miniconfused:before{content:'\f7e0'} -.icon-soundright:before{content:'\f7e1'} -.icon-soundleft:before{content:'\f7e2'} -.icon-savetodrive:before{content:'\f7e3'} -.icon-layerorderup:before{content:'\f7e4'} -.icon-layerorderdown:before{content:'\f7e5'} -.icon-layerorder:before{content:'\f7e6'} -.icon-circledribbble:before{content:'\f7e7'} -.icon-squaredribbble:before{content:'\f7e8'} -.icon-handexpand:before{content:'\f7e9'} -.icon-handpinch:before{content:'\f7ea'} -.icon-fontserif:before{content:'\f7eb'} -.icon-fontsansserif:before{content:'\f7ec'} -.icon-fontrounded:before{content:'\f7ed'} -.icon-fonthandwriting:before{content:'\f7ee'} -.icon-fonttypewriter:before{content:'\f7ef'} -.icon-fontcomic:before{content:'\f7f0'} -.icon-fontcaligraphy:before{content:'\f7f1'} -.icon-fontgothic:before{content:'\f7f2'} -.icon-fontstencil:before{content:'\f7f3'} +@font-face { + font-family: 'WebHostingHub-Glyphs'; + src: url('webhostinghub-glyphs.eot'); + src: url('webhostinghub-glyphs.eot?#iefix') format('embedded-opentype'), + url('webhostinghub-glyphs.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + -moz-font-feature-settings: "calt=0,liga=0"; +} +[class^="icon-"], [class*=" icon-"] {font-family:'WebHostingHub-Glyphs';background:none;width:auto;height:auto;font-style:normal} +.icon-aaabattery:before{content:'\f413'} +.icon-abacus:before{content:'\f261'} +.icon-accountfilter:before{content:'\f05e'} +.icon-acsource:before{content:'\f3ea'} +.icon-addfriend:before{content:'\f3da'} +.icon-address:before{content:'\f08f'} +.icon-addshape:before{content:'\f1fd'} +.icon-addtocart:before{content:'\f394'} +.icon-addtolist:before{content:'\f2ac'} +.icon-adjust:before{content:'\f484'} +.icon-adobe:before{content:'\f1c9'} +.icon-ads-bilboard:before{content:'\f082'} +.icon-affiliate:before{content:'\f01e'} +.icon-ajax:before{content:'\f06f'} +.icon-alarm:before{content:'\f233'} +.icon-alarmalt:before{content:'\f23d'} +.icon-album-cover:before{content:'\f19f'} +.icon-alertalt:before{content:'\f2b4'} +.icon-alertpay:before{content:'\f269'} +.icon-algorhythm:before{content:'\f0b8'} +.icon-alienship:before{content:'\f41f'} +.icon-alienware:before{content:'\f3be'} +.icon-align-center:before{content:'\f1d9'} +.icon-align-justify:before{content:'\f1da'} +.icon-align-left:before{content:'\f1d7'} +.icon-align-right:before{content:'\f1d8'} +.icon-alignbottomedge:before{content:'\f1d3'} +.icon-alignhorizontalcenter:before{content:'\f1d2'} +.icon-alignleftedge:before{content:'\f1d6'} +.icon-alignrightedge:before{content:'\f1d5'} +.icon-aligntopedge:before{content:'\f1d4'} +.icon-alignverticalcenter:before{content:'\f1d1'} +.icon-amd:before{content:'\f020'} +.icon-analogdown:before{content:'\f2cb'} +.icon-analogleft:before{content:'\f2c8'} +.icon-analogright:before{content:'\f2c9'} +.icon-analogup:before{content:'\f2ca'} +.icon-analytics-piechart:before{content:'\f000'} +.icon-analyticsalt-piechartalt:before{content:'\f001'} +.icon-anchor-port:before{content:'\f21d'} +.icon-android:before{content:'\f12a'} +.icon-angrybirds:before{content:'\f3c1'} +.icon-antenna:before{content:'\f3ec'} +.icon-apache-feather:before{content:'\f056'} +.icon-aperture:before{content:'\f356'} +.icon-appointment-agenda:before{content:'\f26c'} +.icon-archive:before{content:'\f171'} +.icon-arrow-down:before{content:'\f2fe'} +.icon-arrow-left:before{content:'\f305'} +.icon-arrow-right:before{content:'\f304'} +.icon-arrow-up:before{content:'\f301'} +.icon-asterisk:before{content:'\f317'} +.icon-asteriskalt:before{content:'\002a'} +.icon-at:before{content:'\40'} +.icon-atari:before{content:'\f3b9'} +.icon-authentication-keyalt:before{content:'\f051'} +.icon-automobile-car:before{content:'\f239'} +.icon-autorespond:before{content:'\f08e'} +.icon-avatar:before{content:'\f15a'} +.icon-avataralt:before{content:'\f161'} +.icon-avengers:before{content:'\f342'} +.icon-awstats:before{content:'\f04c'} +.icon-axe:before{content:'\f2ef'} +.icon-backup-vault:before{content:'\f004'} +.icon-backupalt-vaultalt:before{content:'\f005'} +.icon-backupwizard:before{content:'\f05f'} +.icon-backward:before{content:'\f183'} +.icon-bag:before{content:'\f234'} +.icon-baloon:before{content:'\f405'} +.icon-ban-circle:before{content:'\f313'} +.icon-banana:before{content:'\f3f4'} +.icon-bandwidth:before{content:'\f006'} +.icon-bank:before{content:'\f262'} +.icon-barchart:before{content:'\f02f'} +.icon-barchartalt:before{content:'\f07d'} +.icon-barcode:before{content:'\f276'} +.icon-basecamp:before{content:'\f160'} +.icon-basketball:before{content:'\f2e9'} +.icon-bat:before{content:'\f3d3'} +.icon-batman:before{content:'\f348'} +.icon-batteryaltcharging:before{content:'\f104'} +.icon-batteryaltfull:before{content:'\f101'} +.icon-batteryaltsixty:before{content:'\f102'} +.icon-batteryaltthird:before{content:'\f103'} +.icon-batterycharged:before{content:'\f0f4'} +.icon-batterycharging:before{content:'\f0f3'} +.icon-batteryeighty:before{content:'\f0f9'} +.icon-batteryempty:before{content:'\f0f5'} +.icon-batteryforty:before{content:'\f0f7'} +.icon-batteryfull:before{content:'\f0fa'} +.icon-batterysixty:before{content:'\f0f8'} +.icon-batterytwenty:before{content:'\f0f6'} +.icon-bed:before{content:'\f2b9'} +.icon-beer:before{content:'\f244'} +.icon-bell:before{content:'\2407'} +.icon-bigger:before{content:'\f30a'} +.icon-bill:before{content:'\f278'} +.icon-binary:before{content:'\f087'} +.icon-binoculars-searchalt:before{content:'\f2a0'} +.icon-birdhouse:before{content:'\f390'} +.icon-birthday:before{content:'\f36b'} +.icon-bishop:before{content:'\f2f9'} +.icon-blackberry:before{content:'\f421'} +.icon-blankstare:before{content:'\f13e'} +.icon-blogger-blog:before{content:'\f167'} +.icon-bluetooth:before{content:'\f12b'} +.icon-bluetoothconnected:before{content:'\f386'} +.icon-boardgame:before{content:'\f2d9'} +.icon-boat:before{content:'\f21a'} +.icon-bold:before{content:'\f1f4'} +.icon-bomb:before{content:'\f2dc'} +.icon-bone:before{content:'\f35f'} +.icon-book:before{content:'\f1ba'} +.icon-bookmark:before{content:'\f143'} +.icon-boombox:before{content:'\f195'} +.icon-bottle:before{content:'\f361'} +.icon-bow:before{content:'\f2ee'} +.icon-bowling:before{content:'\f2f3'} +.icon-bowlingpins:before{content:'\f3d2'} +.icon-bowtie:before{content:'\f37f'} +.icon-boxtrapper-mousetrap:before{content:'\f046'} +.icon-braces:before{content:'\f0b4'} +.icon-braille0:before{content:'\f44b'} +.icon-braille1:before{content:'\f44c'} +.icon-braille2:before{content:'\f44d'} +.icon-braille3:before{content:'\f44e'} +.icon-braille4:before{content:'\f44f'} +.icon-braille5:before{content:'\f450'} +.icon-braille6:before{content:'\f451'} +.icon-braille7:before{content:'\f452'} +.icon-braille8:before{content:'\f453'} +.icon-braille9:before{content:'\f454'} +.icon-braillea:before{content:'\f431'} +.icon-brailleb:before{content:'\f432'} +.icon-braillec:before{content:'\f433'} +.icon-brailled:before{content:'\f434'} +.icon-braillee:before{content:'\f435'} +.icon-braillef:before{content:'\f436'} +.icon-brailleg:before{content:'\f437'} +.icon-brailleh:before{content:'\f438'} +.icon-braillei:before{content:'\f439'} +.icon-braillej:before{content:'\f43a'} +.icon-braillek:before{content:'\f43b'} +.icon-braillel:before{content:'\f43c'} +.icon-braillem:before{content:'\f43d'} +.icon-braillen:before{content:'\f43e'} +.icon-brailleo:before{content:'\f43f'} +.icon-braillep:before{content:'\f440'} +.icon-brailleq:before{content:'\f441'} +.icon-brailler:before{content:'\f442'} +.icon-brailles:before{content:'\f443'} +.icon-braillespace:before{content:'\f455'} +.icon-braillet:before{content:'\f444'} +.icon-brailleu:before{content:'\f445'} +.icon-braillev:before{content:'\f446'} +.icon-braillew:before{content:'\f447'} +.icon-braillex:before{content:'\f448'} +.icon-brailley:before{content:'\f449'} +.icon-braillez:before{content:'\f44a'} +.icon-brain:before{content:'\f3e3'} +.icon-bread:before{content:'\f42f'} +.icon-breakable:before{content:'\f41c'} +.icon-briefcase:before{content:'\f25e'} +.icon-briefcasethree:before{content:'\f25f'} +.icon-briefcasetwo:before{content:'\f0a2'} +.icon-brightness:before{content:'\f10a'} +.icon-brightnessfull:before{content:'\f10b'} +.icon-brightnesshalf:before{content:'\f10c'} +.icon-broom:before{content:'\f40a'} +.icon-browser:before{content:'\f159'} +.icon-brush:before{content:'\f1b8'} +.icon-bucket:before{content:'\f1b5'} +.icon-bug:before{content:'\f0a7'} +.icon-bullhorn:before{content:'\f287'} +.icon-bus:before{content:'\f241'} +.icon-businesscardalt:before{content:'\f137'} +.icon-buttona:before{content:'\f2bf'} +.icon-buttonb:before{content:'\f2c0'} +.icon-buttonx:before{content:'\f2c1'} +.icon-buttony:before{content:'\f2c2'} +.icon-cactus-desert:before{content:'\f22c'} +.icon-calculator:before{content:'\f258'} +.icon-calculatoralt:before{content:'\f265'} +.icon-calendar:before{content:'\f20f'} +.icon-calendaralt-cronjobs:before{content:'\f0a1'} +.icon-camera:before{content:'\f19b'} +.icon-candle:before{content:'\f29a'} +.icon-candy:before{content:'\f42d'} +.icon-candycane:before{content:'\f37d'} +.icon-cannon:before{content:'\f401'} +.icon-canvas:before{content:'\f1c8'} +.icon-canvasrulers:before{content:'\f205'} +.icon-capacitator:before{content:'\f3e8'} +.icon-capslock:before{content:'\21ea'} +.icon-captainamerica:before{content:'\f341'} +.icon-carrot:before{content:'\f3f2'} +.icon-cashregister:before{content:'\f26e'} +.icon-cassette:before{content:'\f377'} +.icon-cd-dvd:before{content:'\f0cd'} +.icon-certificate:before{content:'\f277'} +.icon-certificatealt:before{content:'\f058'} +.icon-certificatethree:before{content:'\f059'} +.icon-cgi:before{content:'\f086'} +.icon-cgicenter:before{content:'\f079'} +.icon-chair:before{content:'\2441'} +.icon-chat:before{content:'\f162'} +.icon-check:before{content:'\f310'} +.icon-checkboxalt:before{content:'\f311'} +.icon-checkin:before{content:'\f223'} +.icon-checkinalt:before{content:'\f227'} +.icon-chef:before{content:'\f3ce'} +.icon-cherry:before{content:'\f35d'} +.icon-chevron-down:before{content:'\f48b'} +.icon-chevron-left:before{content:'\f489'} +.icon-chevron-right:before{content:'\f488'} +.icon-chevron-up:before{content:'\f48a'} +.icon-chevrons:before{content:'\f0b5'} +.icon-chicken:before{content:'\f359'} +.icon-chocolate:before{content:'\f367'} +.icon-christiancross:before{content:'\f40f'} +.icon-christmastree:before{content:'\f37b'} +.icon-chrome:before{content:'\f14e'} +.icon-cigarette:before{content:'\f229'} +.icon-circle-arrow-down:before{content:'\f475'} +.icon-circle-arrow-left:before{content:'\f472'} +.icon-circle-arrow-right:before{content:'\f473'} +.icon-circle-arrow-up:before{content:'\f474'} +.icon-circleadd:before{content:'\f0d1'} +.icon-circledelete:before{content:'\f0d2'} +.icon-circledown:before{content:'\f3c7'} +.icon-circleleft:before{content:'\f3c6'} +.icon-circleright:before{content:'\f3c9'} +.icon-circleselect:before{content:'\f0d3'} +.icon-circleselection:before{content:'\f1b1'} +.icon-circleup:before{content:'\f3c8'} +.icon-clearformatting:before{content:'\f1e7'} +.icon-clipboard-paste:before{content:'\f0cb'} +.icon-clockalt-timealt:before{content:'\f22b'} +.icon-closetab:before{content:'\f170'} +.icon-closewindow:before{content:'\f16e'} +.icon-cloud:before{content:'\f0b9'} +.icon-clouddownload:before{content:'\f0bb'} +.icon-cloudhosting:before{content:'\f007'} +.icon-cloudsync:before{content:'\f0bc'} +.icon-cloudupload:before{content:'\f0ba'} +.icon-clubs:before{content:'\f2f6'} +.icon-cmd:before{content:'\f33a'} +.icon-cms:before{content:'\f036'} +.icon-cmsmadesimple:before{content:'\f0b0'} +.icon-codeigniter:before{content:'\f077'} +.icon-coffee:before{content:'\f235'} +.icon-coffeebean:before{content:'\f366'} +.icon-cog:before{content:'\f00f'} +.icon-colocation:before{content:'\f024'} +.icon-colocationalt:before{content:'\f023'} +.icon-colors:before{content:'\f1e6'} +.icon-comment:before{content:'\f12c'} +.icon-commentout:before{content:'\f080'} +.icon-commentround:before{content:'\f155'} +.icon-commentroundempty:before{content:'\f156'} +.icon-commentroundtyping:before{content:'\f157'} +.icon-commentroundtypingempty:before{content:'\f158'} +.icon-commenttyping:before{content:'\f12d'} +.icon-compass:before{content:'\263c'} +.icon-concretefive:before{content:'\f0af'} +.icon-contact-businesscard:before{content:'\f040'} +.icon-controllernes:before{content:'\f2d2'} +.icon-controllerps:before{content:'\f2d1'} +.icon-controllersnes:before{content:'\f2d3'} +.icon-controlpanel:before{content:'\f008'} +.icon-controlpanelalt:before{content:'\f009'} +.icon-cooling:before{content:'\f00a'} +.icon-coppermine:before{content:'\f0a4'} +.icon-copy:before{content:'\f0c9'} +.icon-copyright:before{content:'\00a9'} +.icon-coupon:before{content:'\f254'} +.icon-cpanel:before{content:'\f072'} +.icon-cplusplus:before{content:'\f0b1'} +.icon-cpu-processor:before{content:'\f002'} +.icon-cpualt-processoralt:before{content:'\f003'} +.icon-crayon:before{content:'\f383'} +.icon-createfile:before{content:'\f0c6'} +.icon-createfolder:before{content:'\f0da'} +.icon-creativecommons:before{content:'\f1fc'} +.icon-creditcard:before{content:'\f279'} +.icon-cricket:before{content:'\f418'} +.icon-croisant:before{content:'\f29f'} +.icon-crop:before{content:'\f1af'} +.icon-crown:before{content:'\f28f'} +.icon-csharp:before{content:'\f0b2'} +.icon-cssthree:before{content:'\f06a'} +.icon-cup-coffeealt:before{content:'\f24b'} +.icon-cupcake:before{content:'\f35b'} +.icon-curling:before{content:'\f3d7'} +.icon-cursor:before{content:'\f0dc'} +.icon-cut-scissors:before{content:'\f0ca'} +.icon-dagger:before{content:'\2020'} +.icon-danger:before{content:'\f415'} +.icon-dart:before{content:'\f3d4'} +.icon-darthvader:before{content:'\f34a'} +.icon-database:before{content:'\f00b'} +.icon-databaseadd:before{content:'\f00c'} +.icon-databasedelete:before{content:'\f00d'} +.icon-davidstar:before{content:'\f40e'} +.icon-dcsource:before{content:'\f3e9'} +.icon-dedicatedserver:before{content:'\f00e'} +.icon-deletefile:before{content:'\f0c7'} +.icon-deletefolder:before{content:'\f0db'} +.icon-delicious:before{content:'\f152'} +.icon-designcontest:before{content:'\f351'} +.icon-desklamp:before{content:'\f412'} +.icon-dialpad:before{content:'\f399'} +.icon-diamond:before{content:'\2666'} +.icon-diamonds:before{content:'\f2f7'} +.icon-die-dice:before{content:'\f2d8'} +.icon-diefive:before{content:'\f3fb'} +.icon-diefour:before{content:'\f3fa'} +.icon-dieone:before{content:'\f3f7'} +.icon-diesix:before{content:'\f3fc'} +.icon-diethree:before{content:'\f3f9'} +.icon-dietwo:before{content:'\f3f8'} +.icon-diode:before{content:'\f3e7'} +.icon-director:before{content:'\f2ae'} +.icon-diskspace:before{content:'\f096'} +.icon-distributehorizontalcenters:before{content:'\f1dc'} +.icon-distributeverticalcenters:before{content:'\f1db'} +.icon-divide:before{content:'\00f7'} +.icon-dna:before{content:'\f409'} +.icon-dnszone:before{content:'\f07f'} +.icon-document:before{content:'\f0c2'} +.icon-doghouse:before{content:'\f38f'} +.icon-dollar:before{content:'\24'} +.icon-dollaralt:before{content:'\f259'} +.icon-dolphinsoftware:before{content:'\f064'} +.icon-domain:before{content:'\f01d'} +.icon-domainaddon:before{content:'\f053'} +.icon-domino:before{content:'\f3d5'} +.icon-donut:before{content:'\f3ca'} +.icon-downleft:before{content:'\f2ff'} +.icon-download:before{content:'\f47b'} +.icon-download-alt:before{content:'\f11a'} +.icon-downright:before{content:'\f300'} +.icon-draft:before{content:'\f172'} +.icon-dreamweaver:before{content:'\f1d0'} +.icon-dribbble:before{content:'\f14c'} +.icon-dropmenu:before{content:'\f0a5'} +.icon-drupal:before{content:'\f075'} +.icon-drwho:before{content:'\f3c0'} +.icon-edit:before{content:'\f47c'} +.icon-editalt:before{content:'\f0f2'} +.icon-egg:before{content:'\f407'} +.icon-eightball:before{content:'\f36e'} +.icon-eject:before{content:'\f199'} +.icon-elipse:before{content:'\f1bc'} +.icon-emailalt:before{content:'\f136'} +.icon-emailexport:before{content:'\f176'} +.icon-emailforward:before{content:'\f175'} +.icon-emailforwarders:before{content:'\f049'} +.icon-emailimport:before{content:'\f177'} +.icon-emailrefresh:before{content:'\f174'} +.icon-emailtrace:before{content:'\f091'} +.icon-emergency:before{content:'\f246'} +.icon-emptycart:before{content:'\f395'} +.icon-enter:before{content:'\f323'} +.icon-envelope:before{content:'\f028'} +.icon-equalizer:before{content:'\f18e'} +.icon-equalizeralt:before{content:'\f18f'} +.icon-equals:before{content:'\f30c'} +.icon-eraser:before{content:'\f1f1'} +.icon-erroralt:before{content:'\f05a'} +.icon-euro:before{content:'\20ac'} +.icon-euroalt:before{content:'\f25a'} +.icon-evernote:before{content:'\f17c'} +.icon-exchange-currency:before{content:'\f26b'} +.icon-exclamation-sign:before{content:'\f04a'} +.icon-excludeshape:before{content:'\f200'} +.icon-exit:before{content:'\f324'} +.icon-explorerwindow:before{content:'\f0d9'} +.icon-exportfile:before{content:'\f32f'} +.icon-exposure:before{content:'\f1de'} +.icon-extinguisher:before{content:'\f2b7'} +.icon-eye-close:before{content:'\f481'} +.icon-eye-open:before{content:'\f2b5'} +.icon-eye-view:before{content:'\f280'} +.icon-eyedropper:before{content:'\f1ad'} +.icon-facebook:before{content:'\f140'} +.icon-facebookalt:before{content:'\f14b'} +.icon-facetime-video:before{content:'\f19c'} +.icon-factory:before{content:'\f27a'} +.icon-fantastico:before{content:'\f0ae'} +.icon-faq:before{content:'\f099'} +.icon-fast-backward:before{content:'\f47e'} +.icon-fast-forward:before{content:'\f47f'} +.icon-fastdown:before{content:'\f31d'} +.icon-fastleft:before{content:'\f31a'} +.icon-fastright:before{content:'\f31b'} +.icon-fastup:before{content:'\f31c'} +.icon-favoritefile:before{content:'\f381'} +.icon-favoritefolder:before{content:'\f382'} +.icon-featheralt-write:before{content:'\f1c5'} +.icon-fedora:before{content:'\f3f1'} +.icon-fence:before{content:'\f2af'} +.icon-file:before{content:'\f0d6'} +.icon-film:before{content:'\f19d'} +.icon-filmstrip:before{content:'\f3ed'} +.icon-filter:before{content:'\f05c'} +.icon-finder:before{content:'\f398'} +.icon-fire:before{content:'\f27f'} +.icon-firefox:before{content:'\f420'} +.icon-firewall:before{content:'\f021'} +.icon-firewire:before{content:'\f0fc'} +.icon-firstaid:before{content:'\f2ba'} +.icon-fish:before{content:'\f35a'} +.icon-fishbone:before{content:'\f42b'} +.icon-flag:before{content:'\f487'} +.icon-flagalt:before{content:'\f232'} +.icon-flagtriangle:before{content:'\f20b'} +.icon-flash:before{content:'\f1cf'} +.icon-flashlight:before{content:'\f299'} +.icon-flashplayer:before{content:'\f070'} +.icon-flaskfull:before{content:'\f27e'} +.icon-flickr:before{content:'\f146'} +.icon-flower:before{content:'\f2a5'} +.icon-flowernew:before{content:'\f3a8'} +.icon-folder-close:before{content:'\f094'} +.icon-folder-open:before{content:'\f483'} +.icon-foldertree:before{content:'\f0f0'} +.icon-font:before{content:'\f1ae'} +.icon-foodtray:before{content:'\f3d0'} +.icon-football-soccer:before{content:'\f2eb'} +.icon-forbiddenalt:before{content:'\f314'} +.icon-forest-tree:before{content:'\f217'} +.icon-forestalt-treealt:before{content:'\f21c'} +.icon-fork:before{content:'\22d4'} +.icon-forklift:before{content:'\f29b'} +.icon-form:before{content:'\f08c'} +.icon-forrst:before{content:'\f14d'} +.icon-fort:before{content:'\f400'} +.icon-forward:before{content:'\f182'} +.icon-fourohfour:before{content:'\f09d'} +.icon-foursquare:before{content:'\f42a'} +.icon-freeway:before{content:'\f24a'} +.icon-fridge:before{content:'\f40d'} +.icon-fries:before{content:'\f36a'} +.icon-ftp:before{content:'\f029'} +.icon-ftpaccounts:before{content:'\f07b'} +.icon-ftpsession:before{content:'\f07c'} +.icon-fullscreen:before{content:'\f485'} +.icon-gameboy:before{content:'\f403'} +.icon-gamecursor:before{content:'\f2d0'} +.icon-gasstation:before{content:'\f216'} +.icon-gearfour:before{content:'\f3a7'} +.icon-ghost:before{content:'\f2da'} +.icon-gift:before{content:'\f260'} +.icon-github:before{content:'\f081'} +.icon-glass:before{content:'\f236'} +.icon-glasses:before{content:'\f295'} +.icon-glassesalt:before{content:'\f39d'} +.icon-globe:before{content:'\f01b'} +.icon-globealt:before{content:'\f36c'} +.icon-glue:before{content:'\f36d'} +.icon-gmail:before{content:'\f150'} +.icon-golf:before{content:'\f2f1'} +.icon-googledrive:before{content:'\f163'} +.icon-googleplus:before{content:'\f165'} +.icon-googlewallet:before{content:'\f270'} +.icon-gpsoff-gps:before{content:'\f21e'} +.icon-gpson:before{content:'\f21f'} +.icon-gpu-graphicscard:before{content:'\f108'} +.icon-gradient:before{content:'\2207'} +.icon-grails:before{content:'\f085'} +.icon-greenlantern:before{content:'\f340'} +.icon-greenlightbulb:before{content:'\f406'} +.icon-grooveshark:before{content:'\f3a2'} +.icon-groups-friends:before{content:'\f134'} +.icon-guitar:before{content:'\f19a'} +.icon-halflife:before{content:'\f3ba'} +.icon-halo:before{content:'\f3bb'} +.icon-hamburger:before{content:'\f2b3'} +.icon-hammer:before{content:'\f291'} +.icon-hand-down:before{content:'\f387'} +.icon-hand-left:before{content:'\f389'} +.icon-hand-right:before{content:'\f388'} +.icon-hand-up:before{content:'\f0dd'} +.icon-handcuffs:before{content:'\f393'} +.icon-handdrag:before{content:'\f0de'} +.icon-handtwofingers:before{content:'\f0df'} +.icon-hanger:before{content:'\f2ab'} +.icon-happy:before{content:'\f13c'} +.icon-harrypotter:before{content:'\f38b'} +.icon-hdd:before{content:'\f02a'} +.icon-hdtv:before{content:'\f1a0'} +.icon-headphones:before{content:'\f180'} +.icon-headphonesalt:before{content:'\f1a3'} +.icon-heart:before{content:'\f131'} +.icon-heartempty-love:before{content:'\f132'} +.icon-hearts:before{content:'\f2f4'} +.icon-helicopter:before{content:'\f3e4'} +.icon-hexagon-polygon:before{content:'\f1be'} +.icon-hockey:before{content:'\f3d9'} +.icon-home:before{content:'\21b8'} +.icon-homealt:before{content:'\f02b'} +.icon-hospital:before{content:'\f247'} +.icon-hotdog:before{content:'\f3cc'} +.icon-hotlinkprotection:before{content:'\f050'} +.icon-hourglassalt:before{content:'\f122'} +.icon-html:before{content:'\f068'} +.icon-htmlfive:before{content:'\f069'} +.icon-hydrant:before{content:'\f3ff'} +.icon-icecream:before{content:'\f2a4'} +.icon-icecreamalt:before{content:'\f289'} +.icon-illustrator:before{content:'\f1ce'} +.icon-imac:before{content:'\f0fb'} +.icon-images-gallery:before{content:'\f09f'} +.icon-importcontacts:before{content:'\f092'} +.icon-importfile:before{content:'\f32e'} +.icon-inbox:before{content:'\f17a'} +.icon-inboxalt:before{content:'\f178'} +.icon-incomingcall:before{content:'\f15d'} +.icon-indent-left:before{content:'\f1f2'} +.icon-indent-right:before{content:'\f1f3'} +.icon-indexmanager:before{content:'\f09e'} +.icon-infinity:before{content:'\221e'} +.icon-info-sign:before{content:'\f315'} +.icon-infographic:before{content:'\f336'} +.icon-ink:before{content:'\f3f6'} +.icon-inkpen:before{content:'\f1ac'} +.icon-insertbarchart:before{content:'\f1e5'} +.icon-insertpicture:before{content:'\f1e0'} +.icon-insertpicturecenter:before{content:'\f1e3'} +.icon-insertpictureleft:before{content:'\f1e1'} +.icon-insertpictureright:before{content:'\f1e2'} +.icon-insertpiechart:before{content:'\f1e4'} +.icon-instagram:before{content:'\f14a'} +.icon-install:before{content:'\f128'} +.icon-intel:before{content:'\f01f'} +.icon-intersection:before{content:'\2229'} +.icon-intersectshape:before{content:'\f1ff'} +.icon-invert:before{content:'\f1df'} +.icon-invoice:before{content:'\f3e5'} +.icon-ipcontrol:before{content:'\f08b'} +.icon-iphone:before{content:'\f0e6'} +.icon-ipod:before{content:'\f190'} +.icon-ironman:before{content:'\f349'} +.icon-islam:before{content:'\f410'} +.icon-island:before{content:'\f392'} +.icon-italic:before{content:'\f1f5'} +.icon-jar:before{content:'\f2b6'} +.icon-jason:before{content:'\f38c'} +.icon-java:before{content:'\f083'} +.icon-joomla:before{content:'\f073'} +.icon-joystickarcade:before{content:'\f2d4'} +.icon-joystickatari:before{content:'\f2d5'} +.icon-jquery:before{content:'\f06b'} +.icon-jqueryui:before{content:'\f06c'} +.icon-kerning:before{content:'\f1e9'} +.icon-key:before{content:'\f093'} +.icon-keyboard:before{content:'\f119'} +.icon-keyboardalt:before{content:'\f105'} +.icon-keyboarddelete:before{content:'\f3a6'} +.icon-kidney:before{content:'\f3e0'} +.icon-king:before{content:'\f2fc'} +.icon-knife:before{content:'\f214'} +.icon-knight:before{content:'\f2fb'} +.icon-knob:before{content:'\f376'} +.icon-lab-flask:before{content:'\f27d'} +.icon-lamp:before{content:'\f2b1'} +.icon-lan:before{content:'\f0ee'} +.icon-language:before{content:'\f042'} +.icon-laptop:before{content:'\f0d8'} +.icon-lasso:before{content:'\f396'} +.icon-lastfm:before{content:'\f3a3'} +.icon-laugh:before{content:'\f13f'} +.icon-law:before{content:'\f263'} +.icon-layers:before{content:'\f1ca'} +.icon-layersalt:before{content:'\f1cb'} +.icon-leaf:before{content:'\f039'} +.icon-leechprotect:before{content:'\f07e'} +.icon-legacyfilemanager:before{content:'\f095'} +.icon-lego:before{content:'\f370'} +.icon-lifeempty:before{content:'\f2e1'} +.icon-lifefull:before{content:'\f2e3'} +.icon-lifehacker:before{content:'\f380'} +.icon-lifehalf:before{content:'\f2e2'} +.icon-lifepreserver:before{content:'\f015'} +.icon-lightbulb-idea:before{content:'\f338'} +.icon-lighthouse:before{content:'\f3e6'} +.icon-lightning:before{content:'\f231'} +.icon-lightningalt:before{content:'\f2a8'} +.icon-line:before{content:'\f1bf'} +.icon-lineheight:before{content:'\f1c0'} +.icon-link:before{content:'\f022'} +.icon-linkalt:before{content:'\f333'} +.icon-linkedin:before{content:'\f166'} +.icon-linux:before{content:'\f01a'} +.icon-list:before{content:'\f111'} +.icon-list-alt:before{content:'\f480'} +.icon-liver:before{content:'\f3e2'} +.icon-loading-hourglass:before{content:'\f123'} +.icon-loadingalt:before{content:'\f339'} +.icon-lock:before{content:'\f0be'} +.icon-lockalt-keyhole:before{content:'\f0eb'} +.icon-lollypop:before{content:'\f3ee'} +.icon-lungs:before{content:'\f3df'} +.icon-macpro:before{content:'\f3a5'} +.icon-macro-plant:before{content:'\f1c6'} +.icon-magazine:before{content:'\f1ec'} +.icon-magento:before{content:'\f06e'} +.icon-magnet:before{content:'\f281'} +.icon-mailbox:before{content:'\f044'} +.icon-mailinglists:before{content:'\f090'} +.icon-man-male:before{content:'\f2a1'} +.icon-managedhosting:before{content:'\f038'} +.icon-map:before{content:'\f209'} +.icon-map-marker:before{content:'\f220'} +.icon-marker:before{content:'\f204'} +.icon-marvin:before{content:'\f3dd'} +.icon-mastercard:before{content:'\f266'} +.icon-maximize:before{content:'\f30f'} +.icon-medal:before{content:'\f2e5'} +.icon-medalbronze:before{content:'\f2e8'} +.icon-medalgold:before{content:'\f2e6'} +.icon-medalsilver:before{content:'\f2e7'} +.icon-mediarepeat:before{content:'\f187'} +.icon-men:before{content:'\f24c'} +.icon-menu:before{content:'\f127'} +.icon-merge:before{content:'\f334'} +.icon-mergecells:before{content:'\f327'} +.icon-mergeshapes:before{content:'\f201'} +.icon-metro-subway:before{content:'\f24f'} +.icon-metronome:before{content:'\f374'} +.icon-mickeymouse:before{content:'\f37a'} +.icon-microphone:before{content:'\f191'} +.icon-microscope:before{content:'\f283'} +.icon-microsd:before{content:'\f107'} +.icon-microwave:before{content:'\f42e'} +.icon-mimetype:before{content:'\f057'} +.icon-minimize:before{content:'\f30e'} +.icon-minus:before{content:'\2212'} +.icon-minus-sign:before{content:'\f477'} +.icon-missedcall:before{content:'\f15c'} +.icon-mobile:before{content:'\f0e8'} +.icon-moleskine:before{content:'\f1f0'} +.icon-money-cash:before{content:'\f27b'} +.icon-moneybag:before{content:'\f271'} +.icon-monitor:before{content:'\f0d5'} +.icon-monstersinc:before{content:'\f3bd'} +.icon-moon-night:before{content:'\f207'} +.icon-mouse:before{content:'\f0d4'} +.icon-mousealt:before{content:'\f126'} +.icon-move:before{content:'\f322'} +.icon-movieclapper:before{content:'\f193'} +.icon-moviereel:before{content:'\f17f'} +.icon-muffin:before{content:'\f363'} +.icon-mug:before{content:'\f24e'} +.icon-mushroom:before{content:'\f35e'} +.icon-music:before{content:'\f181'} +.icon-musicalt:before{content:'\f18d'} +.icon-mutealt:before{content:'\f0e5'} +.icon-mxentry:before{content:'\f07a'} +.icon-mybb:before{content:'\f065'} +.icon-myspace:before{content:'\f153'} +.icon-mysql-dolphin:before{content:'\f076'} +.icon-nail:before{content:'\f428'} +.icon-navigation:before{content:'\f23a'} +.icon-network:before{content:'\f0a6'} +.icon-networksignal:before{content:'\f3a9'} +.icon-news:before{content:'\f256'} +.icon-newtab:before{content:'\f16f'} +.icon-newwindow:before{content:'\f16d'} +.icon-next:before{content:'\f18a'} +.icon-nexus:before{content:'\f0e7'} +.icon-nintendods:before{content:'\f404'} +.icon-nodejs:before{content:'\f084'} +.icon-notes:before{content:'\f0d7'} +.icon-notificationbottom:before{content:'\f144'} +.icon-notificationtop:before{content:'\f145'} +.icon-nut:before{content:'\f427'} +.icon-off:before{content:'\f11d'} +.icon-office-building:before{content:'\f245'} +.icon-officechair:before{content:'\f26d'} +.icon-ok:before{content:'\2713'} +.icon-ok-circle:before{content:'\f471'} +.icon-ok-sign:before{content:'\f479'} +.icon-oneup:before{content:'\f3b7'} +.icon-oneupalt:before{content:'\f3b6'} +.icon-opencart:before{content:'\f060'} +.icon-opennewwindow:before{content:'\f332'} +.icon-orange:before{content:'\f29e'} +.icon-outbox:before{content:'\f179'} +.icon-outgoingcall:before{content:'\f15e'} +.icon-oxwall:before{content:'\f06d'} +.icon-pacman:before{content:'\f2db'} +.icon-pageback:before{content:'\f31e'} +.icon-pagebreak:before{content:'\f1cc'} +.icon-pageforward:before{content:'\f31f'} +.icon-pagesetup:before{content:'\f331'} +.icon-paintbrush:before{content:'\f1e8'} +.icon-paintroll:before{content:'\f1fa'} +.icon-palette-painting:before{content:'\f1b9'} +.icon-paperclip:before{content:'\f284'} +.icon-paperclipalt:before{content:'\f285'} +.icon-paperclipvertical:before{content:'\f286'} +.icon-paperplane:before{content:'\f296'} +.icon-parentheses:before{content:'\f3c4'} +.icon-parkeddomain:before{content:'\f055'} +.icon-password:before{content:'\f03e'} +.icon-passwordalt:before{content:'\f03f'} +.icon-pasta:before{content:'\f408'} +.icon-patch:before{content:'\f2a3'} +.icon-path:before{content:'\f169'} +.icon-pause:before{content:'\f186'} +.icon-paw-pet:before{content:'\f29d'} +.icon-pawn:before{content:'\f2f8'} +.icon-paypal:before{content:'\f267'} +.icon-peace:before{content:'\f2a7'} +.icon-pen:before{content:'\f1ee'} +.icon-pencil:before{content:'\f1b7'} +.icon-pepperoni:before{content:'\f364'} +.icon-percent:before{content:'\25'} +.icon-perl-camel:before{content:'\f0b6'} +.icon-perlalt:before{content:'\f0b7'} +.icon-phone-call:before{content:'\f14f'} +.icon-phonealt:before{content:'\f15b'} +.icon-phonebook:before{content:'\f149'} +.icon-phonebookalt:before{content:'\f135'} +.icon-phonemic:before{content:'\f391'} +.icon-phoneold:before{content:'\f148'} +.icon-photoshop:before{content:'\f1cd'} +.icon-php:before{content:'\f09c'} +.icon-phpbb:before{content:'\f063'} +.icon-phppear:before{content:'\f09b'} +.icon-piano:before{content:'\f19e'} +.icon-picture:before{content:'\22b7'} +.icon-pictureframe:before{content:'\f41e'} +.icon-piggybank:before{content:'\f257'} +.icon-pigpena:before{content:'\f456'} +.icon-pigpenb:before{content:'\f457'} +.icon-pigpenc:before{content:'\f458'} +.icon-pigpend:before{content:'\f459'} +.icon-pigpene:before{content:'\f45a'} +.icon-pigpenf:before{content:'\f45b'} +.icon-pigpeng:before{content:'\f45c'} +.icon-pigpenh:before{content:'\f45d'} +.icon-pigpeni:before{content:'\f45e'} +.icon-pigpenj:before{content:'\f45f'} +.icon-pigpenk:before{content:'\f460'} +.icon-pigpenl:before{content:'\f461'} +.icon-pigpenm:before{content:'\f462'} +.icon-pigpenn:before{content:'\f463'} +.icon-pigpeno:before{content:'\f464'} +.icon-pigpenp:before{content:'\f465'} +.icon-pigpenq:before{content:'\f466'} +.icon-pigpenr:before{content:'\f467'} +.icon-pigpens:before{content:'\f468'} +.icon-pigpent:before{content:'\f469'} +.icon-pigpenu:before{content:'\f46a'} +.icon-pigpenv:before{content:'\f46b'} +.icon-pigpenw:before{content:'\f46c'} +.icon-pigpenx:before{content:'\f46d'} +.icon-pigpeny:before{content:'\f46e'} +.icon-pigpenz:before{content:'\f46f'} +.icon-pilcrow:before{content:'\00b6'} +.icon-pill-antivirusalt:before{content:'\f0aa'} +.icon-pin:before{content:'\f20a'} +.icon-pipe:before{content:'\01c0'} +.icon-piwigo:before{content:'\f0ad'} +.icon-pizza:before{content:'\f35c'} +.icon-placeadd:before{content:'\f221'} +.icon-placealt:before{content:'\f224'} +.icon-placealtadd:before{content:'\f225'} +.icon-placealtdelete:before{content:'\f226'} +.icon-placedelete:before{content:'\f222'} +.icon-placeios:before{content:'\f20c'} +.icon-plane:before{content:'\f23e'} +.icon-plaque:before{content:'\f2b8'} +.icon-play:before{content:'\f184'} +.icon-play-circle:before{content:'\f17e'} +.icon-playstore:before{content:'\f255'} +.icon-playvideo:before{content:'\f03d'} +.icon-plug:before{content:'\f0ea'} +.icon-pluginalt:before{content:'\f098'} +.icon-plus:before{content:'\002b'} +.icon-plus-sign:before{content:'\f476'} +.icon-pocket:before{content:'\f16b'} +.icon-podcast:before{content:'\f1a2'} +.icon-podium-winner:before{content:'\f2d6'} +.icon-pokemon:before{content:'\f354'} +.icon-police:before{content:'\f2aa'} +.icon-polygonlasso:before{content:'\f397'} +.icon-post:before{content:'\f12e'} +.icon-postalt:before{content:'\f130'} +.icon-pound:before{content:'\f25b'} +.icon-poundalt:before{content:'\f25c'} +.icon-powerjack:before{content:'\f0fd'} +.icon-powerplug:before{content:'\f0ed'} +.icon-powerplugeu:before{content:'\f28b'} +.icon-powerplugus:before{content:'\f28c'} +.icon-presentation:before{content:'\f0c4'} +.icon-prestashop:before{content:'\f061'} +.icon-pretzel:before{content:'\f3cf'} +.icon-preview:before{content:'\f330'} +.icon-previous:before{content:'\f18b'} +.icon-print:before{content:'\f125'} +.icon-protecteddirectory:before{content:'\f04d'} +.icon-pscircle:before{content:'\f2bb'} +.icon-pscursor:before{content:'\f2c3'} +.icon-psdown:before{content:'\f2c6'} +.icon-psleft:before{content:'\f2c7'} +.icon-pslone:before{content:'\f2cc'} +.icon-psltwo:before{content:'\f2cd'} +.icon-psright:before{content:'\f2c5'} +.icon-psrone:before{content:'\f2ce'} +.icon-psrtwo:before{content:'\f2cf'} +.icon-pssquare:before{content:'\f2bc'} +.icon-pstriangle:before{content:'\f2bd'} +.icon-psup:before{content:'\f2c4'} +.icon-psx:before{content:'\f2be'} +.icon-pull:before{content:'\f089'} +.icon-punisher:before{content:'\f343'} +.icon-push:before{content:'\f088'} +.icon-puzzle-plugin:before{content:'\f0a0'} +.icon-python:before{content:'\f071'} +.icon-qrcode:before{content:'\f275'} +.icon-quake:before{content:'\f355'} +.icon-queen:before{content:'\f2fd'} +.icon-query:before{content:'\f08a'} +.icon-question-sign:before{content:'\f0a3'} +.icon-quote:before{content:'\f12f'} +.icon-quotedown:before{content:'\f329'} +.icon-quoteup:before{content:'\f328'} +.icon-raceflag:before{content:'\f38e'} +.icon-racquet:before{content:'\f2f2'} +.icon-radio:before{content:'\f1a1'} +.icon-radioactive:before{content:'\f282'} +.icon-radiobutton:before{content:'\f312'} +.icon-railroad:before{content:'\f248'} +.icon-rain:before{content:'\f22f'} +.icon-ram:before{content:'\f02c'} +.icon-random:before{content:'\f188'} +.icon-rar:before{content:'\f117'} +.icon-raspberry:before{content:'\f368'} +.icon-raspberrypi:before{content:'\f369'} +.icon-rawaccesslogs:before{content:'\f0c1'} +.icon-razor:before{content:'\f416'} +.icon-reademail:before{content:'\f173'} +.icon-record:before{content:'\f189'} +.icon-rectangle:before{content:'\25ad'} +.icon-recycle:before{content:'\f297'} +.icon-reddit:before{content:'\f154'} +.icon-redirect:before{content:'\f054'} +.icon-refresh:before{content:'\f078'} +.icon-reliability:before{content:'\f016'} +.icon-remote:before{content:'\f298'} +.icon-remove:before{content:'\00d7'} +.icon-remove-circle:before{content:'\f470'} +.icon-remove-sign:before{content:'\f478'} +.icon-removefriend:before{content:'\f3db'} +.icon-repeat:before{content:'\f32b'} +.icon-repeatone:before{content:'\f196'} +.icon-resellerhosting:before{content:'\f03a'} +.icon-residentevil:before{content:'\f350'} +.icon-resistor:before{content:'\f3eb'} +.icon-resize:before{content:'\f1ed'} +.icon-resize-full:before{content:'\f325'} +.icon-resize-horizontal:before{content:'\f318'} +.icon-resize-small:before{content:'\f326'} +.icon-resize-vertical:before{content:'\f319'} +.icon-restart:before{content:'\f11f'} +.icon-restaurantmenu:before{content:'\f362'} +.icon-restore:before{content:'\f30d'} +.icon-restricted:before{content:'\f0ab'} +.icon-retweet:before{content:'\f486'} +.icon-rim:before{content:'\f36f'} +.icon-ring:before{content:'\02da'} +.icon-road:before{content:'\f249'} +.icon-roadsign-roadsignright:before{content:'\f21b'} +.icon-roadsignleft:before{content:'\f240'} +.icon-robocop:before{content:'\f357'} +.icon-rocket-launch:before{content:'\f29c'} +.icon-rook:before{content:'\f2fa'} +.icon-root:before{content:'\f33c'} +.icon-rorschach:before{content:'\f358'} +.icon-rotateclockwise:before{content:'\f202'} +.icon-rotatecounterclockwise:before{content:'\f203'} +.icon-roundrectangle:before{content:'\f1bd'} +.icon-route:before{content:'\f402'} +.icon-router:before{content:'\f0e9'} +.icon-rss:before{content:'\f17b'} +.icon-rubberstamp:before{content:'\f274'} +.icon-ruby:before{content:'\f067'} +.icon-ruler:before{content:'\f1ef'} +.icon-sad:before{content:'\f13d'} +.icon-safetypin:before{content:'\f417'} +.icon-satellite:before{content:'\f38a'} +.icon-satellitedish-remotemysql:before{content:'\f0c0'} +.icon-save-floppy:before{content:'\f0c8'} +.icon-scales:before{content:'\f3fd'} +.icon-science-atom:before{content:'\f2b0'} +.icon-scope-scan:before{content:'\f212'} +.icon-scopealt:before{content:'\f237'} +.icon-screenshot:before{content:'\f109'} +.icon-screw:before{content:'\f426'} +.icon-screwdriver:before{content:'\f292'} +.icon-screwdriveralt:before{content:'\f293'} +.icon-script:before{content:'\f08d'} +.icon-sd:before{content:'\f106'} +.icon-search:before{content:'\f0c5'} +.icon-searchdocument:before{content:'\f419'} +.icon-searchfolder:before{content:'\f41a'} +.icon-security-shield:before{content:'\f02d'} +.icon-securityalt-shieldalt:before{content:'\f02e'} +.icon-selection-rectangleselection:before{content:'\f1b0'} +.icon-selectionadd:before{content:'\f1b2'} +.icon-selectionintersect:before{content:'\f1b4'} +.icon-selectionremove:before{content:'\f1b3'} +.icon-seo:before{content:'\f030'} +.icon-server:before{content:'\f026'} +.icon-servers:before{content:'\f027'} +.icon-settingsandroid:before{content:'\f309'} +.icon-settingsfour-gearsalt:before{content:'\f306'} +.icon-settingsthree-gears:before{content:'\f307'} +.icon-settingstwo-gearalt:before{content:'\f308'} +.icon-shades-sunglasses:before{content:'\f294'} +.icon-shapes:before{content:'\f1dd'} +.icon-share:before{content:'\f47d'} +.icon-share-alt:before{content:'\f16c'} +.icon-sharealt:before{content:'\f147'} +.icon-sharedfile:before{content:'\f0ef'} +.icon-sharedhosting:before{content:'\f037'} +.icon-sharethree:before{content:'\f414'} +.icon-sheriff:before{content:'\f2a9'} +.icon-shipping:before{content:'\f23f'} +.icon-shopping:before{content:'\f010'} +.icon-shopping-cart:before{content:'\f035'} +.icon-shoppingbag:before{content:'\f273'} +.icon-shortcut:before{content:'\f043'} +.icon-shovel:before{content:'\f290'} +.icon-shredder:before{content:'\f27c'} +.icon-shutdown:before{content:'\f11e'} +.icon-sidebar:before{content:'\f124'} +.icon-signal:before{content:'\f100'} +.icon-sim:before{content:'\f0e1'} +.icon-simalt:before{content:'\f121'} +.icon-skrill:before{content:'\f268'} +.icon-skull:before{content:'\f38d'} +.icon-skype:before{content:'\f141'} +.icon-skypeaway:before{content:'\f39f'} +.icon-skypebusy:before{content:'\f3a0'} +.icon-skypeoffline:before{content:'\f3a1'} +.icon-skypeonline:before{content:'\f39e'} +.icon-smaller:before{content:'\f30b'} +.icon-smf:before{content:'\f062'} +.icon-smile:before{content:'\263a'} +.icon-snow:before{content:'\f22e'} +.icon-snowman:before{content:'\f37c'} +.icon-socialnetwork:before{content:'\f03b'} +.icon-software:before{content:'\f09a'} +.icon-sortbynameascending-atoz:before{content:'\f1c2'} +.icon-sortbynamedescending-ztoa:before{content:'\f1c1'} +.icon-sortbysizeascending:before{content:'\f1c3'} +.icon-sortbysizedescending:before{content:'\f1c4'} +.icon-soundwave:before{content:'\f194'} +.icon-soup:before{content:'\f3d1'} +.icon-spaceinvaders:before{content:'\f352'} +.icon-spades:before{content:'\f2f5'} +.icon-spam:before{content:'\f047'} +.icon-spamalt:before{content:'\f048'} +.icon-spawn:before{content:'\f344'} +.icon-speaker:before{content:'\f372'} +.icon-speed:before{content:'\f40b'} +.icon-spider:before{content:'\f346'} +.icon-spiderman:before{content:'\f347'} +.icon-split:before{content:'\f335'} +.icon-spoon:before{content:'\f213'} +.icon-spray:before{content:'\f1c7'} +.icon-spreadsheet:before{content:'\f0c3'} +.icon-squareapp:before{content:'\f26f'} +.icon-squarebrackets:before{content:'\f0b3'} +.icon-ssh:before{content:'\f04e'} +.icon-sslmanager:before{content:'\f04f'} +.icon-stadium:before{content:'\f3d6'} +.icon-stamp:before{content:'\f242'} +.icon-stampalt:before{content:'\f243'} +.icon-star:before{content:'\f13a'} +.icon-star-empty:before{content:'\f13b'} +.icon-starempty:before{content:'\f2de'} +.icon-starfull:before{content:'\f2e0'} +.icon-starhalf:before{content:'\f2df'} +.icon-steak:before{content:'\f360'} +.icon-steam:before{content:'\f2dd'} +.icon-step-backward:before{content:'\f198'} +.icon-step-forward:before{content:'\f197'} +.icon-sticker:before{content:'\f3f5'} +.icon-stiletto:before{content:'\f429'} +.icon-stockdown:before{content:'\f252'} +.icon-stocks:before{content:'\f250'} +.icon-stockup:before{content:'\f251'} +.icon-stomach:before{content:'\f3e1'} +.icon-stop:before{content:'\f185'} +.icon-stopwatch:before{content:'\f219'} +.icon-storage-box:before{content:'\f011'} +.icon-storagealt-drawer:before{content:'\f012'} +.icon-store:before{content:'\f272'} +.icon-storm:before{content:'\f230'} +.icon-stove:before{content:'\f371'} +.icon-strawberry:before{content:'\f3f3'} +.icon-strikethrough:before{content:'\f1f7'} +.icon-student-school:before{content:'\f288'} +.icon-stumbleupon:before{content:'\f40c'} +.icon-subdomain:before{content:'\f052'} +.icon-submarine:before{content:'\f373'} +.icon-subscript:before{content:'\f1ea'} +.icon-subtractshape:before{content:'\f1fe'} +.icon-sum:before{content:'\f33b'} +.icon-sun-day:before{content:'\f206'} +.icon-sunnysideup:before{content:'\f365'} +.icon-superman:before{content:'\f33f'} +.icon-superscript:before{content:'\f1eb'} +.icon-support:before{content:'\f013'} +.icon-supportalt:before{content:'\f014'} +.icon-switch:before{content:'\f28a'} +.icon-switchoff:before{content:'\f32d'} +.icon-switchoffalt:before{content:'\f28e'} +.icon-switchon:before{content:'\f32c'} +.icon-switchonalt:before{content:'\f28d'} +.icon-sword:before{content:'\f2ed'} +.icon-sync:before{content:'\f0bd'} +.icon-syncalt:before{content:'\f11c'} +.icon-synckeeplocal:before{content:'\f33e'} +.icon-synckeepserver:before{content:'\f33d'} +.icon-syringe-antivirus:before{content:'\f0a9'} +.icon-tablet:before{content:'\f118'} +.icon-tabletennis-pingpong:before{content:'\f2f0'} +.icon-taco:before{content:'\f3cd'} +.icon-tag:before{content:'\f032'} +.icon-tagalt-pricealt:before{content:'\f264'} +.icon-tags:before{content:'\f482'} +.icon-tagvertical:before{content:'\f15f'} +.icon-tank:before{content:'\f423'} +.icon-target:before{content:'\f2a6'} +.icon-taskmanager-logprograms:before{content:'\f04b'} +.icon-tasks:before{content:'\f0e0'} +.icon-taxi:before{content:'\f3a4'} +.icon-tea:before{content:'\f3cb'} +.icon-teapot:before{content:'\f42c'} +.icon-telescope:before{content:'\f3ef'} +.icon-temperature-thermometer:before{content:'\f20d'} +.icon-temperaturealt-thermometeralt:before{content:'\f20e'} +.icon-tennis:before{content:'\f2ea'} +.icon-tent-camping:before{content:'\f215'} +.icon-terminal:before{content:'\f114'} +.icon-tethering:before{content:'\f0f1'} +.icon-tetrisone:before{content:'\f34b'} +.icon-tetristhree:before{content:'\f34d'} +.icon-tetristwo:before{content:'\f34c'} +.icon-text-height:before{content:'\f1f8'} +.icon-text-width:before{content:'\f1f9'} +.icon-th:before{content:'\f110'} +.icon-th-large:before{content:'\f112'} +.icon-th-list:before{content:'\f113'} +.icon-theather:before{content:'\f39c'} +.icon-theme-style:before{content:'\f041'} +.icon-thissideup:before{content:'\f41d'} +.icon-threecolumns:before{content:'\f1ab'} +.icon-thumbs-down:before{content:'\f139'} +.icon-thumbs-up:before{content:'\f138'} +.icon-ticket:before{content:'\f3dc'} +.icon-tictactoe:before{content:'\f39a'} +.icon-tie-business:before{content:'\2040'} +.icon-time:before{content:'\f210'} +.icon-timeline:before{content:'\f253'} +.icon-tint:before{content:'\f208'} +.icon-toast:before{content:'\f2ad'} +.icon-toiletpaper:before{content:'\f384'} +.icon-tooth:before{content:'\f3de'} +.icon-toothbrush:before{content:'\f385'} +.icon-tophat:before{content:'\f3f0'} +.icon-torigate:before{content:'\f411'} +.icon-touchpad:before{content:'\f115'} +.icon-trafficlight:before{content:'\f22a'} +.icon-transform:before{content:'\f1a6'} +.icon-trash:before{content:'\f0ce'} +.icon-trashempty:before{content:'\f0cf'} +.icon-trashfull:before{content:'\f0d0'} +.icon-travel:before{content:'\f422'} +.icon-treediagram:before{content:'\f0ec'} +.icon-treeornament:before{content:'\f37e'} +.icon-triangle:before{content:'\25b3'} +.icon-tron:before{content:'\f34f'} +.icon-trophy:before{content:'\f2d7'} +.icon-truck:before{content:'\f211'} +.icon-trumpet:before{content:'\f375'} +.icon-tumblr:before{content:'\f164'} +.icon-tv:before{content:'\f1a4'} +.icon-twitter:before{content:'\f16a'} +.icon-twocolumnsleft:before{content:'\f1a9'} +.icon-twocolumnsleftalt:before{content:'\f1aa'} +.icon-twocolumnsright:before{content:'\f1a7'} +.icon-twocolumnsrightalt:before{content:'\f1a8'} +.icon-ubuntu:before{content:'\f120'} +.icon-umbrella:before{content:'\f218'} +.icon-underline:before{content:'\f1f6'} +.icon-undo:before{content:'\f32a'} +.icon-unlock:before{content:'\f0bf'} +.icon-upleft:before{content:'\f302'} +.icon-upload:before{content:'\f47a'} +.icon-uploadalt:before{content:'\f11b'} +.icon-upright:before{content:'\f303'} +.icon-uptime:before{content:'\f017'} +.icon-usb:before{content:'\f10d'} +.icon-usbalt:before{content:'\f10e'} +.icon-usbplug:before{content:'\f10f'} +.icon-user:before{content:'\f133'} +.icon-userfilter:before{content:'\f05d'} +.icon-usfootball:before{content:'\f2ec'} +.icon-value-coins:before{content:'\f018'} +.icon-vector:before{content:'\f1b6'} +.icon-vendetta:before{content:'\f3c5'} +.icon-video:before{content:'\f17d'} +.icon-viking:before{content:'\f379'} +.icon-vimeo:before{content:'\f168'} +.icon-vinyl:before{content:'\f0cc'} +.icon-violin:before{content:'\f1a5'} +.icon-virus:before{content:'\f0a8'} +.icon-visa:before{content:'\f3c2'} +.icon-visitor:before{content:'\f097'} +.icon-vlc-cone:before{content:'\f192'} +.icon-voice:before{content:'\f18c'} +.icon-volume-down:before{content:'\f0e3'} +.icon-volume-off:before{content:'\f0e4'} +.icon-volume-up:before{content:'\f0e2'} +.icon-vps:before{content:'\f025'} +.icon-wacom:before{content:'\f1bb'} +.icon-walle:before{content:'\f3bc'} +.icon-wallet:before{content:'\e000'} +.icon-warcraft:before{content:'\f3bf'} +.icon-warmedal:before{content:'\f2e4'} +.icon-warning-sign:before{content:'\f316'} +.icon-washer:before{content:'\f39b'} +.icon-watch:before{content:'\f378'} +.icon-watertap-plumbing:before{content:'\f22d'} +.icon-wave-sea:before{content:'\f23c'} +.icon-wavealt-seaalt:before{content:'\f23b'} +.icon-webcam:before{content:'\f0fe'} +.icon-webcamalt:before{content:'\f129'} +.icon-webhostinghub:before{content:'\f031'} +.icon-webmail:before{content:'\f045'} +.icon-webpage:before{content:'\f033'} +.icon-webplatform:before{content:'\f3c3'} +.icon-websitealt:before{content:'\f01c'} +.icon-websitebuilder:before{content:'\f034'} +.icon-weight:before{content:'\f430'} +.icon-westernunion:before{content:'\f26a'} +.icon-wheel:before{content:'\f228'} +.icon-wheelchair:before{content:'\f3fe'} +.icon-whistle:before{content:'\f3d8'} +.icon-whmcs:before{content:'\f066'} +.icon-wifi:before{content:'\f0ff'} +.icon-wind:before{content:'\f41b'} +.icon-windleft:before{content:'\f424'} +.icon-windows:before{content:'\f019'} +.icon-windright:before{content:'\f425'} +.icon-wine:before{content:'\f238'} +.icon-wizard:before{content:'\f03c'} +.icon-wizardalt:before{content:'\f1fb'} +.icon-wizardhat:before{content:'\f337'} +.icon-woman-female:before{content:'\f2a2'} +.icon-women:before{content:'\f24d'} +.icon-wordpress:before{content:'\f074'} +.icon-wrench:before{content:'\f05b'} +.icon-wrenchalt:before{content:'\f2b2'} +.icon-xbox:before{content:'\f353'} +.icon-xmen:before{content:'\f345'} +.icon-yahoo:before{content:'\f151'} +.icon-yen:before{content:'\00a5'} +.icon-yenalt:before{content:'\f25d'} +.icon-yinyang:before{content:'\262f'} +.icon-youtube:before{content:'\f142'} +.icon-zelda:before{content:'\f3b8'} +.icon-zikula:before{content:'\f0ac'} +.icon-zip:before{content:'\f116'} +.icon-zodiac-aquarius:before{content:'\f3b4'} +.icon-zodiac-aries:before{content:'\f3aa'} +.icon-zodiac-cancer:before{content:'\f3ad'} +.icon-zodiac-capricorn:before{content:'\f3b3'} +.icon-zodiac-gemini:before{content:'\f3ac'} +.icon-zodiac-leo:before{content:'\f3ae'} +.icon-zodiac-libra:before{content:'\f3b0'} +.icon-zodiac-pisces:before{content:'\f3b5'} +.icon-zodiac-sagitarius:before{content:'\f3b2'} +.icon-zodiac-scorpio:before{content:'\f3b1'} +.icon-zodiac-taurus:before{content:'\f3ab'} +.icon-zodiac-virgo:before{content:'\f3af'} +.icon-zoom-in:before{content:'\f320'} +.icon-zoom-out:before{content:'\f321'} +.icon-vk:before{content:'\f34e'} +.icon-bitcoin:before{content:'\f584'} +.icon-rouble:before{content:'\f4ca'} +.icon-phpnuke:before{content:'\f48c'} +.icon-modx:before{content:'\f48d'} +.icon-eoneohseven:before{content:'\f48e'} +.icon-subrion:before{content:'\f48f'} +.icon-typothree:before{content:'\f490'} +.icon-tikiwiki:before{content:'\f491'} +.icon-pligg:before{content:'\f492'} +.icon-pyrocms:before{content:'\f493'} +.icon-mambo:before{content:'\f494'} +.icon-contao:before{content:'\f495'} +.icon-crackedegg:before{content:'\f496'} +.icon-coffeecupalt:before{content:'\f497'} +.icon-reademailalt:before{content:'\f498'} +.icon-train:before{content:'\f499'} +.icon-shoebox:before{content:'\f49a'} +.icon-bathtub:before{content:'\f49b'} +.icon-ninegag:before{content:'\f49c'} +.icon-pebble:before{content:'\f49d'} +.icon-musicthree:before{content:'\f49e'} +.icon-stairsup:before{content:'\f49f'} +.icon-stairsdown:before{content:'\f4a0'} +.icon-bookalt:before{content:'\f4a1'} +.icon-programclose:before{content:'\f4a2'} +.icon-programok:before{content:'\f4a3'} +.icon-splitalt:before{content:'\f4a4'} +.icon-solarsystem:before{content:'\f4a5'} +.icon-honeycomb:before{content:'\f4a6'} +.icon-tools:before{content:'\f4a7'} +.icon-xoops:before{content:'\f4a8'} +.icon-pixie:before{content:'\f4a9'} +.icon-dotclear:before{content:'\f4aa'} +.icon-impresscms:before{content:'\f4ab'} +.icon-saurus:before{content:'\f4ac'} +.icon-impresspages:before{content:'\f4ad'} +.icon-monstra:before{content:'\f4ae'} +.icon-snews:before{content:'\f4af'} +.icon-jcore:before{content:'\f4b0'} +.icon-silverstripe:before{content:'\f4b1'} +.icon-btwoevolution:before{content:'\f4b2'} +.icon-nucleus:before{content:'\f4b3'} +.icon-symphony:before{content:'\f4b5'} +.icon-vanillacms:before{content:'\f4b6'} +.icon-bbpress:before{content:'\f4b7'} +.icon-phpbbalt:before{content:'\f4b8'} +.icon-chyrp:before{content:'\f4b9'} +.icon-pivotx:before{content:'\f4ba'} +.icon-pagecookery:before{content:'\f4bb'} +.icon-moviereelalt:before{content:'\f4bc'} +.icon-cassettealt:before{content:'\f4bd'} +.icon-photobucket:before{content:'\f4be'} +.icon-technorati:before{content:'\f4bf'} +.icon-theverge:before{content:'\f4c0'} +.icon-stacks:before{content:'\f4c1'} +.icon-dotlist:before{content:'\f4c2'} +.icon-numberlist:before{content:'\f4c3'} +.icon-indentleft:before{content:'\f4c4'} +.icon-indentright:before{content:'\f4c5'} +.icon-fblike:before{content:'\f4c6'} +.icon-fbdislike:before{content:'\f4c7'} +.icon-sale:before{content:'\f4c8'} +.icon-sharetronix:before{content:'\f4c9'} +.icon-markerdown:before{content:'\f4cb'} +.icon-markerup:before{content:'\f4cc'} +.icon-markerleft:before{content:'\f4cd'} +.icon-markerright:before{content:'\f4ce'} +.icon-bookmarkalt:before{content:'\f4cf'} +.icon-calendarthree:before{content:'\f4d0'} +.icon-wineglass:before{content:'\f4d1'} +.icon-slidersoff:before{content:'\f4d2'} +.icon-slidersmiddle:before{content:'\f4d3'} +.icon-slidersfull:before{content:'\f4d4'} +.icon-slidersdesc:before{content:'\f4d5'} +.icon-slidersasc:before{content:'\f4d6'} +.icon-slideronefull:before{content:'\f4d7'} +.icon-slidertwofull:before{content:'\f4d8'} +.icon-sliderthreefull:before{content:'\f4d9'} +.icon-noborders:before{content:'\f4da'} +.icon-bottomborder:before{content:'\f4db'} +.icon-topborder:before{content:'\f4dc'} +.icon-leftborder:before{content:'\f4dd'} +.icon-rightborder:before{content:'\f4de'} +.icon-horizontalborder:before{content:'\f4df'} +.icon-verticalborder:before{content:'\f4e0'} +.icon-outerborders:before{content:'\f4e1'} +.icon-innerborders:before{content:'\f4e2'} +.icon-fullborders:before{content:'\f4e3'} +.icon-networksignalalt:before{content:'\f4e4'} +.icon-resizeverticalalt:before{content:'\f4e5'} +.icon-resizehorizontalalt:before{content:'\f4e6'} +.icon-moneyalt:before{content:'\f4e7'} +.icon-fontcase:before{content:'\f4e8'} +.icon-playstation:before{content:'\f4e9'} +.icon-cube:before{content:'\f4ea'} +.icon-sphere:before{content:'\f4eb'} +.icon-ceilinglight:before{content:'\f4ec'} +.icon-chandelier:before{content:'\f4ed'} +.icon-details:before{content:'\f4ee'} +.icon-detailsalt:before{content:'\f4ef'} +.icon-bullet:before{content:'\f4f0'} +.icon-gun:before{content:'\f4f1'} +.icon-processorthree:before{content:'\f4f2'} +.icon-world:before{content:'\f4f3'} +.icon-statistics:before{content:'\f4f4'} +.icon-shoppingcartalt:before{content:'\f4f5'} +.icon-microphonealt:before{content:'\f4f6'} +.icon-routeralt:before{content:'\f4f7'} +.icon-shell:before{content:'\f4f8'} +.icon-squareplay:before{content:'\f4f9'} +.icon-squarestop:before{content:'\f4fa'} +.icon-squarepause:before{content:'\f4fb'} +.icon-squarerecord:before{content:'\f4fc'} +.icon-squareforward:before{content:'\f4fd'} +.icon-squareback:before{content:'\f4fe'} +.icon-squarenext:before{content:'\f4ff'} +.icon-squareprevious:before{content:'\f500'} +.icon-mega:before{content:'\f501'} +.icon-charliechaplin:before{content:'\f502'} +.icon-popcorn:before{content:'\f503'} +.icon-fatarrowright:before{content:'\f504'} +.icon-fatarrowleft:before{content:'\f505'} +.icon-fatarrowdown:before{content:'\f506'} +.icon-fatarrowup:before{content:'\f507'} +.icon-shirtbutton:before{content:'\f508'} +.icon-shirtbuttonalt:before{content:'\f509'} +.icon-cuckooclock:before{content:'\f50a'} +.icon-lens:before{content:'\f50b'} +.icon-voltage:before{content:'\f50c'} +.icon-planealt:before{content:'\f50d'} +.icon-busalt:before{content:'\f50e'} +.icon-lipstick:before{content:'\f50f'} +.icon-plantalt:before{content:'\f510'} +.icon-paperboat:before{content:'\f511'} +.icon-texture:before{content:'\f512'} +.icon-dominoone:before{content:'\f513'} +.icon-dominotwo:before{content:'\f514'} +.icon-dominothree:before{content:'\f515'} +.icon-dominofour:before{content:'\f516'} +.icon-dominofive:before{content:'\f517'} +.icon-dominosix:before{content:'\f518'} +.icon-dominoseven:before{content:'\f519'} +.icon-dominoeight:before{content:'\f51a'} +.icon-dominonine:before{content:'\f51b'} +.icon-connected:before{content:'\f51c'} +.icon-connectedpc:before{content:'\f51d'} +.icon-musicsheet:before{content:'\f51e'} +.icon-rdio:before{content:'\f51f'} +.icon-spotify:before{content:'\f520'} +.icon-deviantart:before{content:'\f521'} +.icon-yelp:before{content:'\f522'} +.icon-behance:before{content:'\f523'} +.icon-nfc:before{content:'\f524'} +.icon-earbudsalt:before{content:'\f525'} +.icon-earbuds:before{content:'\f526'} +.icon-amazon:before{content:'\f527'} +.icon-openid:before{content:'\f528'} +.icon-digg:before{content:'\f529'} +.icon-retweet:before{content:'\f52a'} +.icon-moonnew:before{content:'\f52b'} +.icon-moonwaxingcrescent:before{content:'\f52c'} +.icon-moonfirstquarter:before{content:'\f52d'} +.icon-moonwaxinggibbous:before{content:'\f52e'} +.icon-moonfull:before{content:'\f52f'} +.icon-moonwaninggibbous:before{content:'\f530'} +.icon-moonthirdquarter:before{content:'\f531'} +.icon-moonwaningcrescent:before{content:'\f532'} +.icon-planet:before{content:'\f533'} +.icon-sodacup:before{content:'\f534'} +.icon-cocktail:before{content:'\f535'} +.icon-church:before{content:'\f536'} +.icon-mosque:before{content:'\f537'} +.icon-comedy:before{content:'\f538'} +.icon-tragedy:before{content:'\f539'} +.icon-bacon:before{content:'\f53a'} +.icon-trailor:before{content:'\f53b'} +.icon-tshirt:before{content:'\f53c'} +.icon-design:before{content:'\f53d'} +.icon-spiderweb:before{content:'\f53e'} +.icon-fireplace:before{content:'\f53f'} +.icon-tallglass:before{content:'\f540'} +.icon-grapes:before{content:'\f541'} +.icon-biohazard:before{content:'\f542'} +.icon-directions:before{content:'\f543'} +.icon-equalizerthree:before{content:'\f544'} +.icon-mountains:before{content:'\f545'} +.icon-bing:before{content:'\f546'} +.icon-windowseight:before{content:'\f547'} +.icon-microsoftoffice:before{content:'\f548'} +.icon-salealt:before{content:'\f549'} +.icon-purse:before{content:'\f54a'} +.icon-chickenalt:before{content:'\f54b'} +.icon-podium:before{content:'\f54c'} +.icon-findfriends:before{content:'\f54d'} +.icon-microphonethree:before{content:'\f54e'} +.icon-workshirt:before{content:'\f54f'} +.icon-donotdisturb:before{content:'\f550'} +.icon-addtags:before{content:'\f551'} +.icon-removetags:before{content:'\f556'} +.icon-carbattery:before{content:'\f553'} +.icon-debug:before{content:'\f554'} +.icon-trojan:before{content:'\f555'} +.icon-molecule:before{content:'\f556'} +.icon-safetygoggles:before{content:'\f557'} +.icon-leather:before{content:'\f558'} +.icon-teddybear:before{content:'\f559'} +.icon-stroller:before{content:'\f55a'} +.icon-circleplay:before{content:'\f55b'} +.icon-circlestop:before{content:'\f55c'} +.icon-circlepause:before{content:'\f55d'} +.icon-circlerecord:before{content:'\f55e'} +.icon-circleforward:before{content:'\f55f'} +.icon-circlebackward:before{content:'\f560'} +.icon-circlenext:before{content:'\f561'} +.icon-circleprevious:before{content:'\f562'} +.icon-circleplayempty:before{content:'\f563'} +.icon-circlestopempty:before{content:'\f564'} +.icon-circlepauseempty:before{content:'\f565'} +.icon-circlerecordempty:before{content:'\f566'} +.icon-circleforwardempty:before{content:'\f567'} +.icon-circlebackwardempty:before{content:'\f568'} +.icon-circlenextempty:before{content:'\f569'} +.icon-circlepreviousempty:before{content:'\f56a'} +.icon-belt:before{content:'\f56b'} +.icon-bait:before{content:'\f56c'} +.icon-manalt:before{content:'\f56d'} +.icon-womanalt:before{content:'\f56e'} +.icon-clover:before{content:'\f56f'} +.icon-pacifier:before{content:'\f570'} +.icon-calcplus:before{content:'\f571'} +.icon-calcminus:before{content:'\f572'} +.icon-calcmultiply:before{content:'\f573'} +.icon-calcdivide:before{content:'\f574'} +.icon-calcequals:before{content:'\f575'} +.icon-city:before{content:'\f576'} +.icon-hdvideo:before{content:'\f577'} +.icon-horizontalexpand:before{content:'\f578'} +.icon-horizontalcontract:before{content:'\f579'} +.icon-radar:before{content:'\f57a'} +.icon-threed:before{content:'\f57b'} +.icon-flickralt:before{content:'\f57c'} +.icon-pattern:before{content:'\f57d'} +.icon-elevator:before{content:'\f57e'} +.icon-escalator:before{content:'\f57f'} +.icon-portrait:before{content:'\f580'} +.icon-cigar:before{content:'\f581'} +.icon-dropbox:before{content:'\f582'} +.icon-origami:before{content:'\f583'} +.icon-opensource:before{content:'\f585'} +.icon-redaxscript:before{content:'\f586'} +.icon-mahara:before{content:'\f587'} +.icon-forkcms:before{content:'\f588'} +.icon-pimcore:before{content:'\f589'} +.icon-bigace:before{content:'\f58a'} +.icon-aef:before{content:'\f58b'} +.icon-punbb:before{content:'\f58c'} +.icon-phorum:before{content:'\f58d'} +.icon-fluxbb:before{content:'\f58e'} +.icon-minibb:before{content:'\f58f'} +.icon-zenphoto:before{content:'\f590'} +.icon-fourimages:before{content:'\f591'} +.icon-plogger:before{content:'\f592'} +.icon-jcow:before{content:'\f593'} +.icon-elgg:before{content:'\f594'} +.icon-etano:before{content:'\f595'} +.icon-openclassifieds:before{content:'\f596'} +.icon-osclass:before{content:'\f597'} +.icon-openx:before{content:'\f598'} +.icon-phplist:before{content:'\f599'} +.icon-roundcube:before{content:'\f59a'} +.icon-pommo:before{content:'\f59b'} +.icon-webinsta:before{content:'\f59c'} +.icon-limesurvey:before{content:'\f59d'} +.icon-fengoffice:before{content:'\f59e'} +.icon-eyeos:before{content:'\f59f'} +.icon-dotproject:before{content:'\f5a0'} +.icon-collabtive:before{content:'\f5a1'} +.icon-projectpier:before{content:'\f5a2'} +.icon-taskfreak:before{content:'\f5a3'} +.icon-eventum:before{content:'\f5a4'} +.icon-traq:before{content:'\f5a5'} +.icon-mantisbugtracker:before{content:'\f5a6'} +.icon-oscommerce:before{content:'\f5a7'} +.icon-zencart:before{content:'\f5a8'} +.icon-tomatocart:before{content:'\f5a9'} +.icon-boxbilling:before{content:'\f5aa'} +.icon-zurmo:before{content:'\f5ab'} +.icon-orangehrm:before{content:'\f5ac'} +.icon-vtiger:before{content:'\f5ad'} +.icon-mibew:before{content:'\f5ae'} +.icon-phpmyfaq:before{content:'\f5af'} +.icon-yiiframework:before{content:'\f5b0'} +.icon-zendframework:before{content:'\f5b1'} +.icon-fuelphp:before{content:'\f5b2'} +.icon-kohana:before{content:'\f5b3'} +.icon-smarty:before{content:'\f5b4'} +.icon-sidu:before{content:'\f5b5'} +.icon-simplepie:before{content:'\f5b6'} +.icon-projectsend:before{content:'\f5b7'} +.icon-extjs:before{content:'\f5b8'} +.icon-raphael:before{content:'\f5b9'} +.icon-sizzle:before{content:'\f5ba'} +.icon-yui:before{content:'\f5bb'} +.icon-scissorsalt:before{content:'\f5bc'} +.icon-cuthere:before{content:'\f5bd'} +.icon-coinsalt:before{content:'\f5be'} +.icon-parkingmeter:before{content:'\f5bf'} +.icon-treethree:before{content:'\f5c0'} +.icon-packarchive:before{content:'\f5c1'} +.icon-unpackarchive:before{content:'\f5c2'} +.icon-terminalalt:before{content:'\f5c3'} +.icon-jersey:before{content:'\f5c4'} +.icon-vial:before{content:'\f5c5'} +.icon-noteslist:before{content:'\f5c6'} +.icon-notestasks:before{content:'\f5c7'} +.icon-notesdate:before{content:'\f5c8'} +.icon-noteslocation:before{content:'\f5c9'} +.icon-noteslistalt:before{content:'\f5ca'} +.icon-notestasksalt:before{content:'\f5cb'} +.icon-notesdatealt:before{content:'\f5cc'} +.icon-noteslocationalt:before{content:'\f5cd'} +.icon-useralt:before{content:'\f5ce'} +.icon-adduseralt:before{content:'\f5cf'} +.icon-removeuseralt:before{content:'\f5d0'} +.icon-banuseralt:before{content:'\f5d1'} +.icon-banuser:before{content:'\f5d2'} +.icon-paintrollalt:before{content:'\f5d3'} +.icon-textcursor:before{content:'\f5d4'} +.icon-textfield:before{content:'\f5d5'} +.icon-precisecursor:before{content:'\f5d6'} +.icon-brokenlink:before{content:'\f5d7'} +.icon-bookmarkthree:before{content:'\f5d8'} +.icon-bookmarkfour:before{content:'\f5d9'} +.icon-warmedalalt:before{content:'\f5da'} +.icon-thinking:before{content:'\f5db'} +.icon-commentlove:before{content:'\f5dc'} +.icon-commentsmiley:before{content:'\f5dd'} +.icon-sharetwo:before{content:'\f147'} +.icon-emptystar:before{content:'\f2de'} +.icon-halfstar:before{content:'\f2df'} +.icon-fullstar:before{content:'\f2e0'} +.icon-forbidden:before{content:'\f314'} +.icon-indentleftalt:before{content:'\f4c4'} +.icon-indentrightalt:before{content:'\f4c5'} +.icon-modxalt:before{content:'\f5de'} +.icon-apple:before{content:'\f5df'} +.icon-greekcolumn:before{content:'\f5e0'} +.icon-walletalt:before{content:'\f5e1'} +.icon-dollarsquare:before{content:'\f5e2'} +.icon-poundsquare:before{content:'\f5e3'} +.icon-yensquare:before{content:'\f5e4'} +.icon-eurosquare:before{content:'\f5e5'} +.icon-bitcoinsquare:before{content:'\f5e6'} +.icon-roublesquare:before{content:'\f5e7'} +.icon-roublealt:before{content:'\f5e8'} +.icon-bitcoinalt:before{content:'\f5e9'} +.icon-gavel:before{content:'\f5ea'} +.icon-barchartasc:before{content:'\f5eb'} +.icon-barchartdesc:before{content:'\f5ec'} +.icon-house:before{content:'\f5ed'} +.icon-garage:before{content:'\f5ee'} +.icon-milk:before{content:'\f5ef'} +.icon-hryvnia:before{content:'\f5f0'} +.icon-hryvniasquare:before{content:'\f5f1'} +.icon-hryvniaalt:before{content:'\f5f2'} +.icon-beeralt:before{content:'\f5f3'} +.icon-trolleyfull:before{content:'\f5f4'} +.icon-trolleyload:before{content:'\f5f5'} +.icon-trolleyunload:before{content:'\f5f6'} +.icon-trolleyempty:before{content:'\f5f7'} +.icon-mootools:before{content:'\f5f8'} +.icon-mootoolstwo:before{content:'\f5f9'} +.icon-mootoolsthree:before{content:'\f5fa'} +.icon-mysqlthree:before{content:'\f5fb'} +.icon-mysqlalt:before{content:'\f5fc'} +.icon-pgsql:before{content:'\f5fd'} +.icon-mongodb:before{content:'\f5fe'} +.icon-neofourj:before{content:'\f5ff'} +.icon-nosql:before{content:'\f600'} +.icon-catface:before{content:'\f601'} +.icon-polaroid:before{content:'\f602'} +.icon-clouderror:before{content:'\f603'} +.icon-camcorder:before{content:'\f604'} +.icon-projector:before{content:'\f605'} +.icon-sdvideo:before{content:'\f606'} +.icon-fx:before{content:'\f607'} +.icon-gramophone:before{content:'\f608'} +.icon-speakeralt:before{content:'\f609'} +.icon-hddalt:before{content:'\f60a'} +.icon-usbflash:before{content:'\f60b'} +.icon-manillaenvelope:before{content:'\f60c'} +.icon-stickynote:before{content:'\f60d'} +.icon-stickynotealt:before{content:'\f60e'} +.icon-torch:before{content:'\f60f'} +.icon-flashlightalt:before{content:'\f610'} +.icon-campfire:before{content:'\f611'} +.icon-cctv:before{content:'\f612'} +.icon-drill:before{content:'\f613'} +.icon-lampalt:before{content:'\f614'} +.icon-flowerpot:before{content:'\f615'} +.icon-defragment:before{content:'\f616'} +.icon-panoramio:before{content:'\f617'} +.icon-panorama:before{content:'\f618'} +.icon-photosphere:before{content:'\f619'} +.icon-panoramaalt:before{content:'\f61a'} +.icon-timer:before{content:'\f61b'} +.icon-burstmode:before{content:'\f61c'} +.icon-cameraflash:before{content:'\f61d'} +.icon-autoflash:before{content:'\f61e'} +.icon-noflash:before{content:'\f61f'} +.icon-threetofour:before{content:'\f620'} +.icon-sixteentonine:before{content:'\f621'} +.icon-cat:before{content:'\f622'} +.icon-dog:before{content:'\f623'} +.icon-rabbit:before{content:'\f624'} +.icon-koala:before{content:'\f625'} +.icon-butterflyalt:before{content:'\f626'} +.icon-butterfly:before{content:'\f627'} +.icon-wwf:before{content:'\f628'} +.icon-poop:before{content:'\f629'} +.icon-poopalt:before{content:'\f62a'} +.icon-kiwi:before{content:'\f62b'} +.icon-kiwifruit:before{content:'\f62c'} +.icon-lemon:before{content:'\f62d'} +.icon-pear:before{content:'\f62e'} +.icon-watermelon:before{content:'\f62f'} +.icon-onion:before{content:'\f630'} +.icon-turnip:before{content:'\f631'} +.icon-eggplant:before{content:'\f632'} +.icon-avocado:before{content:'\f633'} +.icon-perfume:before{content:'\f634'} +.icon-arch:before{content:'\f635'} +.icon-pluspages:before{content:'\f636'} +.icon-community:before{content:'\f637'} +.icon-pluscircles:before{content:'\f638'} +.icon-googleplusold:before{content:'\f639'} +.icon-plusgames:before{content:'\f63a'} +.icon-event:before{content:'\f63b'} +.icon-miui:before{content:'\f63c'} +.icon-hot:before{content:'\f63d'} +.icon-flowup:before{content:'\f63e'} +.icon-flowdown:before{content:'\f63f'} +.icon-moustache:before{content:'\f640'} +.icon-angle:before{content:'\f641'} +.icon-sleep:before{content:'\f642'} +.icon-acorn:before{content:'\f643'} +.icon-steamalt:before{content:'\f644'} +.icon-resizeupleft:before{content:'\f645'} +.icon-resizeupright:before{content:'\f646'} +.icon-resizedownright:before{content:'\f647'} +.icon-resizedownleft:before{content:'\f648'} +.icon-hammeralt:before{content:'\f649'} +.icon-bamboo:before{content:'\f64a'} +.icon-mypictures:before{content:'\f64b'} +.icon-mymusic:before{content:'\f64c'} +.icon-myvideos:before{content:'\f64d'} +.icon-systemfolder:before{content:'\f64e'} +.icon-bookthree:before{content:'\f64f'} +.icon-compile:before{content:'\f650'} +.icon-report:before{content:'\f651'} +.icon-fliphorizontal:before{content:'\f652'} +.icon-flipvertical:before{content:'\f653'} +.icon-construction:before{content:'\f654'} +.icon-counteralt:before{content:'\f655'} +.icon-counter:before{content:'\f656'} +.icon-papercutter:before{content:'\f657'} +.icon-snaptodot:before{content:'\f658'} +.icon-snaptogrid:before{content:'\f659'} +.icon-caligraphy:before{content:'\f65a'} +.icon-icecreamthree:before{content:'\f65b'} +.icon-skitch:before{content:'\f65c'} +.icon-archlinux:before{content:'\f65d'} +.icon-elementaryos:before{content:'\f65e'} +.icon-loadingone:before{content:'\f65f'} +.icon-loadingtwo:before{content:'\f660'} +.icon-loadingthree:before{content:'\f661'} +.icon-loadingfour:before{content:'\f662'} +.icon-loadingfive:before{content:'\f663'} +.icon-loadingsix:before{content:'\f664'} +.icon-loadingseven:before{content:'\f665'} +.icon-loadingeight:before{content:'\f666'} +.icon-brokenheart:before{content:'\f667'} +.icon-heartarrow:before{content:'\f668'} +.icon-heartsparkle:before{content:'\f669'} +.icon-cell:before{content:'\f66a'} +.icon-panda:before{content:'\f66b'} +.icon-refreshalt:before{content:'\f66c'} +.icon-mirror:before{content:'\f66d'} +.icon-headphonesthree:before{content:'\f66e'} +.icon-fan:before{content:'\f66f'} +.icon-tornado:before{content:'\f670'} +.icon-hangout:before{content:'\f671'} +.icon-beaker:before{content:'\f672'} +.icon-beakeralt:before{content:'\f673'} +.icon-phonescreensize:before{content:'\f674'} +.icon-tabletscreensize:before{content:'\f675'} +.icon-notification:before{content:'\f676'} +.icon-googleglass:before{content:'\f677'} +.icon-pinterest:before{content:'\f678'} +.icon-soundcloud:before{content:'\f679'} +.icon-alarmclock:before{content:'\f67a'} +.icon-addalarm:before{content:'\f67b'} +.icon-deletealarm:before{content:'\f67c'} +.icon-turnoffalarm:before{content:'\f67d'} +.icon-snooze:before{content:'\f67e'} +.icon-bringforward:before{content:'\f67f'} +.icon-sendbackward:before{content:'\f680'} +.icon-bringtofront:before{content:'\f681'} +.icon-sendtoback:before{content:'\f682'} +.icon-tectile:before{content:'\f683'} +.icon-grave:before{content:'\f684'} +.icon-gravetwo:before{content:'\f685'} +.icon-gravethree:before{content:'\f686'} +.icon-gravefour:before{content:'\f687'} +.icon-textlayer:before{content:'\f688'} +.icon-vectoralt:before{content:'\f689'} +.icon-drmanhattan:before{content:'\f68a'} +.icon-foursquarealt:before{content:'\f68b'} +.icon-hashtag:before{content:'\f68c'} +.icon-enteralt:before{content:'\f68d'} +.icon-exitalt:before{content:'\f68e'} +.icon-cartalt:before{content:'\f68f'} +.icon-vaultthree:before{content:'\f690'} +.icon-fatundo:before{content:'\f691'} +.icon-fatredo:before{content:'\f692'} +.icon-feedly:before{content:'\f693'} +.icon-feedlyalt:before{content:'\f694'} +.icon-squareheart:before{content:'\f695'} +.icon-squarestar:before{content:'\f696'} +.icon-squarecomment:before{content:'\f697'} +.icon-squarelike:before{content:'\f698'} +.icon-squarebookmark:before{content:'\f699'} +.icon-squaresearch:before{content:'\f69a'} +.icon-squaresettings:before{content:'\f69b'} +.icon-squarevoice:before{content:'\f69c'} +.icon-google:before{content:'\f69d'} +.icon-emojigrinalt:before{content:'\f69e'} +.icon-emojigrin:before{content:'\f69f'} +.icon-constellation:before{content:'\f6a0'} +.icon-emojisurprise:before{content:'\f6a1'} +.icon-emojidead:before{content:'\f6a2'} +.icon-emojiangry:before{content:'\f6a3'} +.icon-emojidevil:before{content:'\f6a4'} +.icon-emojiwink:before{content:'\f6a5'} +.icon-moonorbit:before{content:'\f6a6'} +.icon-emojismile:before{content:'\f6a7'} +.icon-emojisorry:before{content:'\f6a8'} +.icon-emojiconfused:before{content:'\f6a9'} +.icon-emojisleep:before{content:'\f6aa'} +.icon-emojicry:before{content:'\f6ab'} +.icon-circlefork:before{content:'\f6ac'} +.icon-circlespoon:before{content:'\f6ad'} +.icon-circleknife:before{content:'\f6ae'} +.icon-circlepencil:before{content:'\f6af'} +.icon-circlehammer:before{content:'\f6b0'} +.icon-circlescrewdriver:before{content:'\f6b1'} +.icon-middlefinger:before{content:'\f6b2'} +.icon-heavymetal:before{content:'\f6b3'} +.icon-turnright:before{content:'\f6b4'} +.icon-turnleft:before{content:'\f6b5'} +.icon-vineapp:before{content:'\f6b6'} +.icon-vineappalt:before{content:'\f6b7'} +.icon-finance:before{content:'\f6b8'} +.icon-survey:before{content:'\f6b9'} +.icon-hangouts:before{content:'\f6ba'} +.icon-square0:before{content:'\f6bb'} +.icon-square1:before{content:'\f6bc'} +.icon-square2:before{content:'\f6bd'} +.icon-square3:before{content:'\f6be'} +.icon-square4:before{content:'\f6bf'} +.icon-square5:before{content:'\f6c0'} +.icon-square6:before{content:'\f6c1'} +.icon-square7:before{content:'\f6c2'} +.icon-square8:before{content:'\f6c3'} +.icon-square9:before{content:'\f6c4'} +.icon-squarea:before{content:'\f6c5'} +.icon-squareb:before{content:'\f6c6'} +.icon-squarec:before{content:'\f6c7'} +.icon-squared:before{content:'\f6c8'} +.icon-squaree:before{content:'\f6c9'} +.icon-squaref:before{content:'\f6ca'} +.icon-squareg:before{content:'\f6cb'} +.icon-squareh:before{content:'\f6cc'} +.icon-squarei:before{content:'\f6cd'} +.icon-squarej:before{content:'\f6ce'} +.icon-squarek:before{content:'\f6cf'} +.icon-squarel:before{content:'\f6d0'} +.icon-squarem:before{content:'\f6d1'} +.icon-squaren:before{content:'\f6d2'} +.icon-squareo:before{content:'\f6d3'} +.icon-squarep:before{content:'\f6d4'} +.icon-squareq:before{content:'\f6d5'} +.icon-squarer:before{content:'\f6d6'} +.icon-squares:before{content:'\f6d7'} +.icon-squaret:before{content:'\f6d8'} +.icon-squareu:before{content:'\f6d9'} +.icon-squarev:before{content:'\f6da'} +.icon-squarew:before{content:'\f6db'} +.icon-squarex:before{content:'\f6dc'} +.icon-squarey:before{content:'\f6dd'} +.icon-squarez:before{content:'\f6de'} +.icon-shuttle:before{content:'\f6df'} +.icon-meteor:before{content:'\f6e0'} +.icon-galaxy:before{content:'\f6e1'} +.icon-observatory:before{content:'\f6e2'} +.icon-astronaut:before{content:'\f6e3'} +.icon-asteroid:before{content:'\f6e4'} +.icon-sunrise:before{content:'\f6e5'} +.icon-sunset:before{content:'\f6e6'} +.icon-tiderise:before{content:'\f6e7'} +.icon-tidefall:before{content:'\f6e8'} +.icon-mushroomcloud:before{content:'\f6e9'} +.icon-galaxyalt:before{content:'\f6ea'} +.icon-sputnik:before{content:'\f6eb'} +.icon-sextant:before{content:'\f6ec'} +.icon-spock:before{content:'\f6ed'} +.icon-meteorite:before{content:'\f6ee'} +.icon-deathstar:before{content:'\f6ef'} +.icon-deathstarbulding:before{content:'\f6f0'} +.icon-fallingstar:before{content:'\f6f1'} +.icon-windmill:before{content:'\f6f2'} +.icon-windmillalt:before{content:'\f6f3'} +.icon-pumpjack:before{content:'\f6f4'} +.icon-nuclearplant:before{content:'\f6f5'} +.icon-solarpanel:before{content:'\f6f6'} +.icon-barrel:before{content:'\f6f7'} +.icon-canister:before{content:'\f6f8'} +.icon-railtunnel:before{content:'\f6f9'} +.icon-roadtunnel:before{content:'\f6fa'} +.icon-pickaxe:before{content:'\f6fb'} +.icon-cow:before{content:'\f6fc'} +.icon-sheep:before{content:'\f6fd'} +.icon-fountain:before{content:'\f6fe'} +.icon-circlezero:before{content:'\f6ff'} +.icon-circleone:before{content:'\f700'} +.icon-circletwo:before{content:'\f701'} +.icon-circlethree:before{content:'\f702'} +.icon-circlefour:before{content:'\f703'} +.icon-circlefive:before{content:'\f704'} +.icon-circlesix:before{content:'\f705'} +.icon-circleseven:before{content:'\f706'} +.icon-circleeight:before{content:'\f707'} +.icon-circlenine:before{content:'\f708'} +.icon-circlea:before{content:'\f709'} +.icon-circleb:before{content:'\f70a'} +.icon-circlec:before{content:'\f70b'} +.icon-circled:before{content:'\f70c'} +.icon-circlee:before{content:'\f70d'} +.icon-circlef:before{content:'\f70e'} +.icon-circleg:before{content:'\f70f'} +.icon-circleh:before{content:'\f710'} +.icon-circlei:before{content:'\f711'} +.icon-circlej:before{content:'\f712'} +.icon-circlek:before{content:'\f713'} +.icon-circlel:before{content:'\f714'} +.icon-circlem:before{content:'\f715'} +.icon-circlen:before{content:'\f716'} +.icon-circleo:before{content:'\f717'} +.icon-circlep:before{content:'\f718'} +.icon-circleq:before{content:'\f719'} +.icon-circler:before{content:'\f71a'} +.icon-circles:before{content:'\f71b'} +.icon-circlet:before{content:'\f71c'} +.icon-circleu:before{content:'\f71d'} +.icon-circlev:before{content:'\f71e'} +.icon-circlew:before{content:'\f71f'} +.icon-circlex:before{content:'\f720'} +.icon-circley:before{content:'\f721'} +.icon-circlez:before{content:'\f722'} +.icon-creeper:before{content:'\f723'} +.icon-minecraft:before{content:'\f724'} +.icon-minecraftalt:before{content:'\f725'} +.icon-pixelsword:before{content:'\f726'} +.icon-pixelbroadsword:before{content:'\f727'} +.icon-pixelwand:before{content:'\f728'} +.icon-pixelpotion:before{content:'\f729'} +.icon-pixelpotionalt:before{content:'\f72a'} +.icon-pixelpickaxe:before{content:'\f72b'} +.icon-pixelbow:before{content:'\f72c'} +.icon-pixelarrow:before{content:'\f72d'} +.icon-pixelaxe:before{content:'\f72e'} +.icon-pixeldagger:before{content:'\f72f'} +.icon-pixelbastardsword:before{content:'\f730'} +.icon-pixellance:before{content:'\f731'} +.icon-pixelbattleaxe:before{content:'\f732'} +.icon-pixelshovel:before{content:'\f733'} +.icon-pixelsphere:before{content:'\f734'} +.icon-pixelelixir:before{content:'\f735'} +.icon-pixelchest:before{content:'\f736'} +.icon-pixelshield:before{content:'\f737'} +.icon-pixelheart:before{content:'\f738'} +.icon-rudder:before{content:'\f739'} +.icon-folderalt:before{content:'\f73a'} +.icon-removefolderalt:before{content:'\f73b'} +.icon-addfolderalt:before{content:'\f73c'} +.icon-deletefolderalt:before{content:'\f73d'} +.icon-openfolderalt:before{content:'\f73e'} +.icon-clipboardalt:before{content:'\f73f'} +.icon-pastealt:before{content:'\f740'} +.icon-loadingflowccw:before{content:'\f741'} +.icon-loadingflowcw:before{content:'\f742'} +.icon-code:before{content:'\f743'} +.icon-cloveralt:before{content:'\f744'} +.icon-lips:before{content:'\f745'} +.icon-kiss:before{content:'\f746'} +.icon-manualshift:before{content:'\f747'} +.icon-simcardthree:before{content:'\f748'} +.icon-parthenon:before{content:'\f749'} +.icon-addcomment:before{content:'\f74a'} +.icon-deletecomment:before{content:'\f74b'} +.icon-gender:before{content:'\f74c'} +.icon-callalt:before{content:'\f74d'} +.icon-outgoingcallalt:before{content:'\f74e'} +.icon-incomingcallalt:before{content:'\f74f'} +.icon-missedcallalt:before{content:'\f750'} +.icon-export:before{content:'\f751'} +.icon-import:before{content:'\f752'} +.icon-cherryalt:before{content:'\f753'} +.icon-panties:before{content:'\f754'} +.icon-kimai:before{content:'\f755'} +.icon-livejournal:before{content:'\f756'} +.icon-livejournalalt:before{content:'\f757'} +.icon-tagged:before{content:'\f758'} +.icon-temple:before{content:'\f759'} +.icon-mayanpyramid:before{content:'\f75a'} +.icon-egyptpyramid:before{content:'\f75b'} +.icon-tampermonkey:before{content:'\f75c'} +.icon-pushbullet:before{content:'\f75d'} +.icon-currents:before{content:'\f75e'} +.icon-communitysmall:before{content:'\f75f'} +.icon-squaregithub:before{content:'\f760'} +.icon-projectfork:before{content:'\f761'} +.icon-projectmerge:before{content:'\f762'} +.icon-projectcompare:before{content:'\f763'} +.icon-history:before{content:'\f764'} +.icon-notebook:before{content:'\f765'} +.icon-issue:before{content:'\f766'} +.icon-issueclosed:before{content:'\f767'} +.icon-issuereopened:before{content:'\f768'} +.icon-rubyalt:before{content:'\f769'} +.icon-lighton:before{content:'\f76a'} +.icon-lightoff:before{content:'\f76b'} +.icon-bellalt:before{content:'\f76c'} +.icon-versions:before{content:'\f777'} +.icon-twog:before{content:'\f76e'} +.icon-threeg:before{content:'\f76f'} +.icon-fourg:before{content:'\f770'} +.icon-gpsalt:before{content:'\f771'} +.icon-circleloaderfull:before{content:'\f772'} +.icon-circleloaderseven:before{content:'\f773'} +.icon-circleloadersix:before{content:'\f774'} +.icon-circleloaderfive:before{content:'\f775'} +.icon-circleloaderfour:before{content:'\f776'} +.icon-circleloaderthree:before{content:'\f777'} +.icon-circleloadertwo:before{content:'\f778'} +.icon-circleloaderone:before{content:'\f779'} +.icon-circleloaderempty:before{content:'\f77a'} +.icon-whatsapp:before{content:'\f77b'} +.icon-whatsappalt:before{content:'\f77c'} +.icon-viber:before{content:'\f77d'} +.icon-squareviber:before{content:'\f77e'} +.icon-teamviewer:before{content:'\f77f'} +.icon-tunein:before{content:'\f780'} +.icon-tuneinalt:before{content:'\f781'} +.icon-weightscale:before{content:'\f782'} +.icon-boxing:before{content:'\f783'} +.icon-speedalt:before{content:'\f784'} +.icon-scriptalt:before{content:'\f785'} +.icon-splitthree:before{content:'\f786'} +.icon-mergethree:before{content:'\f787'} +.icon-layersthree:before{content:'\f788'} +.icon-mutemic:before{content:'\f789'} +.icon-zerply:before{content:'\f78a'} +.icon-circlegoogleplus:before{content:'\f78b'} +.icon-circletwitter:before{content:'\f78c'} +.icon-circlefacebook:before{content:'\f78d'} +.icon-circleyahoo:before{content:'\f78e'} +.icon-circlegithub:before{content:'\f78f'} +.icon-forumsalt:before{content:'\f790'} +.icon-circlepath:before{content:'\f791'} +.icon-circlevimeo:before{content:'\f792'} +.icon-circlevine:before{content:'\f793'} +.icon-instagramtwo:before{content:'\f794'} +.icon-instagramthree:before{content:'\f795'} +.icon-flickrthree:before{content:'\f796'} +.icon-quora:before{content:'\f797'} +.icon-squarequora:before{content:'\f798'} +.icon-circlequora:before{content:'\f799'} +.icon-picasa:before{content:'\f79a'} +.icon-branch:before{content:'\f79b'} +.icon-ingress:before{content:'\f79c'} +.icon-squarezerply:before{content:'\f79d'} +.icon-circlezerply:before{content:'\f79e'} +.icon-squarevimeo:before{content:'\f79f'} +.icon-squaretwitter:before{content:'\f7a0'} +.icon-brightnessalt:before{content:'\f7a1'} +.icon-brightnessalthalf:before{content:'\f7a2'} +.icon-brightnessaltfull:before{content:'\f7a3'} +.icon-brightnessaltauto:before{content:'\f7a4'} +.icon-shirtbuttonthree:before{content:'\f7a5'} +.icon-openshare:before{content:'\f7a6'} +.icon-copyapp:before{content:'\f7a7'} +.icon-bowl:before{content:'\f7a8'} +.icon-cloudalt:before{content:'\f7a9'} +.icon-cloudaltdownload:before{content:'\f7aa'} +.icon-cloudaltupload:before{content:'\f7ab'} +.icon-cloudaltsync:before{content:'\f7ac'} +.icon-cloudaltprivate:before{content:'\f7ad'} +.icon-flipboard:before{content:'\f7ae'} +.icon-octoloaderempty:before{content:'\f7af'} +.icon-octoloaderone:before{content:'\f7b0'} +.icon-octoloadertwo:before{content:'\f7b1'} +.icon-octoloaderthree:before{content:'\f7b2'} +.icon-octoloaderfour:before{content:'\f7b3'} +.icon-octoloaderfive:before{content:'\f7b4'} +.icon-octoloadersix:before{content:'\f7b5'} +.icon-octoloaderseven:before{content:'\f7b6'} +.icon-octoloaderfull:before{content:'\f7b7'} +.icon-selectionsymbol:before{content:'\f7b8'} +.icon-infinityalt:before{content:'\f7b9'} +.icon-pullrequest:before{content:'\f7ba'} +.icon-projectforkdelete:before{content:'\f7bb'} +.icon-projectforkprivate:before{content:'\f7bc'} +.icon-commit:before{content:'\f7bd'} +.icon-htmlfile:before{content:'\f7be'} +.icon-pushalt:before{content:'\f7bf'} +.icon-pullalt:before{content:'\f7c0'} +.icon-photonineframes:before{content:'\f7c1'} +.icon-wetfloor:before{content:'\f7c2'} +.icon-instagramfour:before{content:'\f7c3'} +.icon-circleinstagram:before{content:'\f7c4'} +.icon-videocamerathree:before{content:'\f7c5'} +.icon-subtitles:before{content:'\f7c6'} +.icon-subtitlesoff:before{content:'\f7c7'} +.icon-compress:before{content:'\f7c8'} +.icon-baby:before{content:'\f7c9'} +.icon-ducky:before{content:'\f7ca'} +.icon-handswipe:before{content:'\f7cb'} +.icon-swipeup:before{content:'\f7cc'} +.icon-swipedown:before{content:'\f7cd'} +.icon-twofingerswipedown:before{content:'\f7ce'} +.icon-twofingerswipeup:before{content:'\f7cf'} +.icon-doubletap:before{content:'\f7d0'} +.icon-dribbblealt:before{content:'\f7d1'} +.icon-circlecallmissed:before{content:'\f7d2'} +.icon-circlecallincoming:before{content:'\f7d3'} +.icon-circlecalloutgoing:before{content:'\f7d4'} +.icon-circledownload:before{content:'\f7d5'} +.icon-circleupload:before{content:'\f7d6'} +.icon-minismile:before{content:'\f7d7'} +.icon-minisad:before{content:'\f7d8'} +.icon-minilaugh:before{content:'\f7d9'} +.icon-minigrin:before{content:'\f7da'} +.icon-miniangry:before{content:'\f7db'} +.icon-minitongue:before{content:'\f7dc'} +.icon-minitonguealt:before{content:'\f7dd'} +.icon-miniwink:before{content:'\f7de'} +.icon-minitonguewink:before{content:'\f7df'} +.icon-miniconfused:before{content:'\f7e0'} +.icon-soundright:before{content:'\f7e1'} +.icon-soundleft:before{content:'\f7e2'} +.icon-savetodrive:before{content:'\f7e3'} +.icon-layerorderup:before{content:'\f7e4'} +.icon-layerorderdown:before{content:'\f7e5'} +.icon-layerorder:before{content:'\f7e6'} +.icon-circledribbble:before{content:'\f7e7'} +.icon-squaredribbble:before{content:'\f7e8'} +.icon-handexpand:before{content:'\f7e9'} +.icon-handpinch:before{content:'\f7ea'} +.icon-fontserif:before{content:'\f7eb'} +.icon-fontsansserif:before{content:'\f7ec'} +.icon-fontrounded:before{content:'\f7ed'} +.icon-fonthandwriting:before{content:'\f7ee'} +.icon-fonttypewriter:before{content:'\f7ef'} +.icon-fontcomic:before{content:'\f7f0'} +.icon-fontcaligraphy:before{content:'\f7f1'} +.icon-fontgothic:before{content:'\f7f2'} +.icon-fontstencil:before{content:'\f7f3'} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 8d77bcaa5..3a6292d51 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,13 @@ # yarn lockfile v1 +"@babel/runtime@^7.21.0": + version "7.22.10" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.10.tgz#ae3e9631fd947cb7e3610d3e9d8fef5f76696682" + integrity sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ== + dependencies: + regenerator-runtime "^0.14.0" + "@esbuild/linux-loong64@0.14.54": version "0.14.54" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028" @@ -38,9 +45,21 @@ integrity sha512-NvVBRnZNE+dugiXERFsET1JlKZfM5lJDEpSMilKW4bToYJ7pxf0Zne78xyXB2ny2c2aHfJ6WLnz1AaTNHAmQeQ== "@rails/actioncable@^7.0": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.4.tgz#70a3ca56809f7aaabb80af2f9c01ae51e1a8ed41" - integrity sha512-tz4oM+Zn9CYsvtyicsa/AwzKZKL+ITHWkhiu7x+xF77clh2b4Rm+s6xnOgY/sGDWoFWZmtKsE95hxBPkgQQNnQ== + version "7.0.5" + resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.5.tgz#bbc11203e0d3d5084002abfcf01d621fdf5f3a9d" + integrity sha512-SOBA2heB9lTw0VYIx8M/ed7inSf4I9sR8OIlJprhgkfQ3WJtrxPJ6DDATR1Z3RYaIR7HlT2Olj08v1lfGIGuHA== + +date-fns@^2.29.3: + version "2.30.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0" + integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw== + dependencies: + "@babel/runtime" "^7.21.0" + +debounce@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5" + integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== esbuild-android-64@0.14.54: version "0.14.54" @@ -174,6 +193,11 @@ flatpickr@^4.6.13: resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94" integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw== +regenerator-runtime@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" + integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== + split.js@^1.6.5: version "1.6.5" resolved "https://registry.yarnpkg.com/split.js/-/split.js-1.6.5.tgz#f7f61da1044c9984cb42947df4de4fadb5a3f300" @@ -196,6 +220,13 @@ stimulus-read-more@^4.1.0: resolved "https://registry.yarnpkg.com/stimulus-read-more/-/stimulus-read-more-4.1.0.tgz#f34efb2dcb33fd091936d84c569937bc100506c8" integrity sha512-SJyCJqZrhDSKpfrepnhStBaxtyv6Jnvr+b84GDg3l+/BzL5HaFLYmc6QkSNCeR6y0x+Zw7lwKuzv+XzyAm1KzQ== +stimulus-timeago@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/stimulus-timeago/-/stimulus-timeago-4.1.0.tgz#5e4b712d9eadd7f0e2b3b142f35f334dba4b3857" + integrity sha512-CHcB2rko2ItmDMIhBTaxEMe7sKqI0DOMU8dmWuQ+gzDfoxcrA8DAW/BElHAAw26HVqLTA43RSUsfug8Q+2Ua+g== + dependencies: + date-fns "^2.29.3" + tom-select@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/tom-select/-/tom-select-2.2.2.tgz#8e5f9296e6d80254feccb57f0986bd6c44d126e2" @@ -203,3 +234,18 @@ tom-select@^2.2.2: dependencies: "@orchidjs/sifter" "^1.0.3" "@orchidjs/unicode-variants" "^1.0.4" + +vis-data@^7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/vis-data/-/vis-data-7.1.6.tgz#81dcf4d024d23183cacb680ad605e644cdd6ee6c" + integrity sha512-lG7LJdkawlKSXsdcEkxe/zRDyW29a4r7N7PMwxCPxK12/QIdqxJwcMxwjVj9ozdisRhP5TyWDHZwsgjmj0g6Dg== + +vis-network@^9.1.6: + version "9.1.6" + resolved "https://registry.yarnpkg.com/vis-network/-/vis-network-9.1.6.tgz#943df07e829248943656a2f19a7ec87cc1b707de" + integrity sha512-Eiwx1JleAsUqfy4pzcsFngCVlCEdjAtRPB/OwCV7PHBm+o2jtE4IZPcPITAEGUlxvL4Fdw7/lZsfD32dL+IL6g== + +vis-util@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/vis-util/-/vis-util-5.0.3.tgz#6a9d67c6ed92f2bfa67e50c20166bb5f59ac07bf" + integrity sha512-Wf9STUcFrDzK4/Zr7B6epW2Kvm3ORNWF+WiwEz2dpf5RdWkLUXFSbLcuB88n1W6tCdFwVN+v3V4/Xmn9PeL39g== From 557191655208ae78bdefc5522f34e853d2fe43bf Mon Sep 17 00:00:00 2001 From: Syphax bouazzouni Date: Sat, 2 Sep 2023 19:29:18 +0200 Subject: [PATCH 480/533] Feature: Update edit ontology design (#320) * remove the unnecessaire variable is_selected_value from the select component haml file * update submission form content to use attributes category not display * make submission edit frame have a custom id from params * extract submission form attributes category array * fix submission from tabs style by removing the old edit-ontology-tab cls * fix edit ontology tabs style * fix edit submission error * install tippy js for the hover notes * Add see the wiki sentence in edit ontology page * replace edit ontology buttons with component button * make reset all fields button works in edit ontology page * Make input field label font size bigger (12px --> 14px) * add data attribute for select and text components * handle for the input field component the case attributes are nil * remove no more used form group component and text field component * add a label argument for nest agent input component * make summary licenses popup use attr_label instead of attribute_infos * fix tom select hidden input style to not take full width * extract useTomSelect component tom select controller * update search input component to use InputFieldComponent * update input field help text slot to support raw html display * update submission location form JS to use 'var' instead of 'const' to make it work even if the partial is re-render again in the same context (turbo frame reload) * remove old submission contact and location form partials * update ontology picker single to use select input helper * use attr_label instead of generate_attribute_label helper in the metadata curator table header * redirect ontology edit action to submission controller new or edit * replace metadata selector component with a helper method * update ontology form partial to have only ontology attributes in it * update ontology new template to add submission attributes in it directly * fix regular button display animation by adding as argument a loader id * update inputs helpers to add the arguments data, id and help * extract from ontology and submission form the metadata_help_link helper * update submission new action to redirect to the ontology new template * add submission edit_properties action for a list of submission attributes * add ontology details tab to the submission form * add metadata and submission inputs helpers files * simplify the submission form content and remove no more used helpers * show in the submission edit action the new submission form template * simplify the submission format form and use the new input helpers * make the select component inline rendered * update tooltip to use Tippy.js * add tooltip popovers for submission attribute inputs * move submission form partial to the edit template * transform EditSubmissionAttributeButtonComponent to a helper function * add the button "add new submission" to the ontology viewer header * remove no more used ontology controller update action * fix nested turbo frame to be hidden when a parent frame is busy/loading * create error_message_alert helper to display an alert with erroneous fields * add required asteriks to submission attribute that enforce existence * make the submission location form partial work for existing submission * fix submission format form partial syle * transform submission form_content the view that display update errors * fix ontology form hasDomain and group inputs that can't be reset empty * make selected_attribute? helper work for equivalent or direct attribute * move back some code logic from ontology updated concern to controllers * create render_submission_inputs helper to display inputs components * use the default template of submissions controller edit action * disable submission form categories tabs when the properties filter used * handle submission pullLocation parameter update depending of isRemote * update submission update controller to add ontology update step * fix ontology metadata curator to use the new submission form * remove submission new template, replaced with ontologies new * make attr_header_label use a custom label as argument * add title to new and edit submission buttons in the ontology viewer * put again the removed margin top of summary section only in summary page * move submission_metadata to metadata_helper and application_controller files * have custom labels for summary submission table header * hide tooltip from attribute labels in the summary section * remove the add et edit submission button in front the submissions table * remove useless ontology value in submission updater * redirect edit page to home if user not connected * remove default today value from date input --------- Co-authored-by: Bilel Kihal <61744974+Bilelkihal@users.noreply.github.com> --- app/assets/images/icons/plus.svg | 2 +- app/assets/images/reload.svg | 10 + .../stylesheets/application.css.scss.erb | 3 + app/assets/stylesheets/bioportal.scss | 2 +- app/assets/stylesheets/components/header.scss | 1 + .../stylesheets/components/input_field.scss | 96 ++-- .../stylesheets/components/nested_form.scss | 7 +- .../stylesheets/components/search_input.scss | 4 - .../components/summary_section.scss | 1 - app/assets/stylesheets/edit-ontology.scss | 146 ++++++ app/assets/stylesheets/nav_bar.scss | 2 +- .../stylesheets/ontology_details_header.scss | 1 + app/assets/stylesheets/submissions.scss | 3 + app/assets/stylesheets/summary.scss.erb | 4 + .../buttons/regular_button_component.rb | 2 +- .../regular_button_component.html.haml | 4 +- ...t_submission_attribute_button_component.rb | 24 - app/components/form_group_component.rb | 47 -- .../form_group_component.html.haml | 23 - app/components/input/input_field_component.rb | 8 +- .../input_field_component.html.haml | 2 +- app/components/input/select_component.rb | 11 +- .../select_component.html.haml | 2 - app/components/input/text_input_component.rb | 2 +- .../progress_pages_component.html.haml | 2 +- app/components/metadata_selector_component.rb | 19 - .../metadata_selector_component.html.haml | 2 - .../metadata_selector_component_controller.js | 15 - .../nested_agent_search_input_component.rb | 3 +- ...ted_agent_search_input_component.html.haml | 4 +- .../nested_form_inputs_component.html.haml | 2 +- app/components/rounded_button_component.rb | 3 +- .../rounded_button_component.html.haml | 2 +- .../search_input_component.html.haml | 7 +- app/components/select_input_component.rb | 18 +- .../select_input_component_controller.js | 8 +- app/components/text_field_component.rb | 9 - .../text_field_component.html.haml | 7 - app/controllers/application_controller.rb | 4 +- app/controllers/concerns/ontology_updater.rb | 102 ++-- .../concerns/submission_updater.rb | 27 +- app/controllers/ontologies_controller.rb | 55 +- .../ontologies_metadata_curator_controller.rb | 56 +- app/controllers/submissions_controller.rb | 87 +++- app/helpers/application_helper.rb | 19 +- app/helpers/components_helper.rb | 4 +- app/helpers/inputs_helper.rb | 46 +- app/helpers/metadata_helper.rb | 12 +- app/helpers/ontologies_helper.rb | 41 +- app/helpers/submission_inputs_helper.rb | 309 +++++++++++ app/helpers/submissions_helper.rb | 490 +++--------------- app/javascript/component_controllers/index.js | 3 - .../controllers/chosen_controller.js | 1 + .../controllers/tom_select_controller.js | 16 - app/javascript/mixins/useTomSelect.js | 9 + app/javascript/mixins/useTooltip.js | 16 +- .../layouts/ontology_viewer/_header.html.haml | 6 +- app/views/ontologies/_form.html.haml | 132 ++--- .../_submission_location_form.html.haml | 89 ++-- app/views/ontologies/edit.html.haml | 5 - app/views/ontologies/new.html.haml | 50 +- .../ontologies/sections/_licenses.html.haml | 2 +- .../_ontology_relations_network.html.haml | 2 +- .../_ontology_submissions_section.html.haml | 8 - .../_attribute_inline.html.haml | 77 +-- .../_attribute_inline_editable.html.haml | 18 +- .../_metadata_tab.html.haml | 6 +- .../_metadata_table.html.haml | 2 +- .../shared/_ontology_picker_single.html.erb | 2 +- app/views/submissions/_form.html.haml | 47 -- app/views/submissions/_form_content.html.haml | 175 +------ .../_submission_contact_form.html.haml | 7 - .../_submission_format_form.html.haml | 82 +-- .../_submission_location_form.html.haml | 61 --- app/views/submissions/_submissions.html.haml | 4 +- app/views/submissions/edit.html.haml | 75 ++- app/views/submissions/new.html.haml | 2 - config/routes.rb | 5 +- package.json | 1 + yarn.lock | 12 + 80 files changed, 1248 insertions(+), 1427 deletions(-) create mode 100644 app/assets/images/reload.svg create mode 100644 app/assets/stylesheets/edit-ontology.scss delete mode 100644 app/components/edit_submission_attribute_button_component.rb delete mode 100644 app/components/form_group_component.rb delete mode 100644 app/components/form_group_component/form_group_component.html.haml delete mode 100644 app/components/input/select_component/select_component.html.haml delete mode 100644 app/components/metadata_selector_component.rb delete mode 100644 app/components/metadata_selector_component/metadata_selector_component.html.haml delete mode 100644 app/components/metadata_selector_component/metadata_selector_component_controller.js delete mode 100644 app/components/text_field_component.rb delete mode 100644 app/components/text_field_component/text_field_component.html.haml create mode 100644 app/helpers/submission_inputs_helper.rb delete mode 100644 app/javascript/controllers/tom_select_controller.js create mode 100644 app/javascript/mixins/useTomSelect.js delete mode 100644 app/views/ontologies/edit.html.haml delete mode 100644 app/views/submissions/_form.html.haml delete mode 100644 app/views/submissions/_submission_contact_form.html.haml delete mode 100644 app/views/submissions/_submission_location_form.html.haml delete mode 100644 app/views/submissions/new.html.haml diff --git a/app/assets/images/icons/plus.svg b/app/assets/images/icons/plus.svg index 17afc626b..809f6ed5a 100644 --- a/app/assets/images/icons/plus.svg +++ b/app/assets/images/icons/plus.svg @@ -1,3 +1,3 @@ - + diff --git a/app/assets/images/reload.svg b/app/assets/images/reload.svg new file mode 100644 index 000000000..2aa6dcd66 --- /dev/null +++ b/app/assets/images/reload.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index 7152e9a2a..17a5933e1 100755 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -46,12 +46,15 @@ @import "lostpassword"; @import "flatpickr/dist/themes/light"; @import "tom-select/dist/scss/tom-select"; +@import "tippy.js/dist/tippy"; +@import 'tippy.js/themes/light-border'; @import "feedback"; @import "login"; @import "components/index"; @import "account"; @import "agents"; @import "upload_ontology"; +@import "edit-ontology"; @import "nav_bar"; @import "ontology_details_header"; @import "ontology_viewer"; diff --git a/app/assets/stylesheets/bioportal.scss b/app/assets/stylesheets/bioportal.scss index c3ccdf04f..05c8b26da 100644 --- a/app/assets/stylesheets/bioportal.scss +++ b/app/assets/stylesheets/bioportal.scss @@ -1156,7 +1156,7 @@ a.truncated_less, a.truncated_more { } -turbo-frame[busy] .hide-if-loading, .show-if-loading { +turbo-frame[busy] > .hide-if-loading, .show-if-loading { display: none; } turbo-frame[busy] ~ .show-if-loading { diff --git a/app/assets/stylesheets/components/header.scss b/app/assets/stylesheets/components/header.scss index 30e464aba..ed8152788 100644 --- a/app/assets/stylesheets/components/header.scss +++ b/app/assets/stylesheets/components/header.scss @@ -9,6 +9,7 @@ cursor: pointer; width: 100%; padding: 14px 20px; + position: relative; p { margin-bottom: 0; } diff --git a/app/assets/stylesheets/components/input_field.scss b/app/assets/stylesheets/components/input_field.scss index f11b84188..9b80f4e54 100644 --- a/app/assets/stylesheets/components/input_field.scss +++ b/app/assets/stylesheets/components/input_field.scss @@ -1,85 +1,95 @@ .input-field-component { - width: 100%; - font-size: 13px; - padding: 10px; - border: 1px solid #BDBDBD; - border-radius: 5px; - outline: none; - resize: none; + width: 100%; + font-size: 13px; + padding: 10px; + border: 1px solid #BDBDBD; + border-radius: 5px; + outline: none; + resize: none; } .input-field-component:focus { - border: 1px solid var(--primary-color); + border: 1px solid var(--primary-color); } .text-input-label { - font-size: 12px; + font-size: 14px; color: #666666; margin-bottom: 5px; + img { + width: 15px; + height: 15px; + vertical-align: text-bottom; + } } .text-input-error-text { - font-size: 12px; - color: var(--error-color) + font-size: 12px; + color: var(--error-color) } .text-input-helper-text { - font-size: 12px; - color: #666666; - margin-top: 5px; + font-size: 12px; + color: #666666; + margin-top: 5px; } .ts-control { - padding: 12px; - border-radius: 5px; - border-color: #BDBDBD; + padding: 12px; + border-radius: 5px; + border-color: #BDBDBD; } .ts-dropdown-content .option { - padding: 12px; + padding: 12px; } .ts-dropdown .active { - background-color: #f8f8f8; + background-color: #f8f8f8; } .ts-dropdown { - margin: 0; - color: #666666; + margin: 0; + color: #666666; } .chosen-container { - padding: 0; - border-radius: 5px; + padding: 0; + border-radius: 5px; } .ts-wrapper.single .ts-control:after { - border-color: #343a40 transparent transparent; - border-style: solid; - border-width: 5px 5px 0; - content: " "; - display: block; - height: 0; - margin-top: -3px; - position: absolute; - right: calc(0.75rem + 5px); - top: 50%; - width: 0; + border-color: #343a40 transparent transparent; + border-style: solid; + border-width: 5px 5px 0; + content: " "; + display: block; + height: 0; + margin-top: -3px; + position: absolute; + right: calc(0.75rem + 5px); + top: 50%; + width: 0; } .ts-wrapper.multi .ts-control>div{ - border-radius: 5px; - font-size: 11px; - padding: 2px 0 4px 6px; - color: #888888; + border-radius: 5px; + font-size: 11px; + padding: 2px 0 4px 6px; + color: #888888; } .ts-wrapper.plugin-remove_button:not(.rtl) .item .remove{ - border-left: none; - color: #888888 !important; - margin-left: 0; + border-left: none; + color: #888888 !important; + margin-left: 0; } -.ts-wrapper.plugin-remove_button .item .remove:hover{ - background: unset; + +.ts-wrapper.plugin-remove_button .item .remove:hover { + background: unset; +} + +.has-items .ts-control > input { + width: unset !important; } \ No newline at end of file diff --git a/app/assets/stylesheets/components/nested_form.scss b/app/assets/stylesheets/components/nested_form.scss index 137efc358..7cd1bf426 100644 --- a/app/assets/stylesheets/components/nested_form.scss +++ b/app/assets/stylesheets/components/nested_form.scss @@ -1,9 +1,14 @@ .nested-form-input-container .titles{ display: flex; - font-size: 11px; + font-size: 14px; color: #666666; margin-bottom: 5px; width: 90%; + img { + width: 15px; + height: 15px; + vertical-align: text-bottom; + } } diff --git a/app/assets/stylesheets/components/search_input.scss b/app/assets/stylesheets/components/search_input.scss index e54d877ea..7d1ab568c 100644 --- a/app/assets/stylesheets/components/search_input.scss +++ b/app/assets/stylesheets/components/search_input.scss @@ -42,7 +42,3 @@ .searched-elements{ margin-bottom: 0; } - -.search-inputs input { - @extend .form-control !optional; -} \ No newline at end of file diff --git a/app/assets/stylesheets/components/summary_section.scss b/app/assets/stylesheets/components/summary_section.scss index 9592f305b..057208665 100644 --- a/app/assets/stylesheets/components/summary_section.scss +++ b/app/assets/stylesheets/components/summary_section.scss @@ -1,7 +1,6 @@ .card_title { display: flex; font-size: 18px; - margin-top: 40px; margin-bottom: 20px; span:nth-child(1){ diff --git a/app/assets/stylesheets/edit-ontology.scss b/app/assets/stylesheets/edit-ontology.scss new file mode 100644 index 000000000..26a6da3ac --- /dev/null +++ b/app/assets/stylesheets/edit-ontology.scss @@ -0,0 +1,146 @@ +.center { + display: flex; + justify-content: center; + margin-top: 50px; +} + +.edit-ontology-container { + padding: 0 50px; + width: 1248px +} + +.edit-ontology-title { + font-size: 18px; + font-weight: bold; +} + +.edit-ontology-title hr { + width: 93px; + border: 1px solid var(--primary-color); + margin: 0; + opacity: 100%; +} + +.edit-ontology-sub-container { + + display: flex; +} + +.edit-ontology-left-column { + border-radius: 5px; + width: 400px; + margin-right: 58px; + +} + +.edit-ontology-left-column { + .nav-pills.disabled a { + color: #888888 !important; + cursor: not-allowed; + } + + .nav-pills:not(.disabled){ + .edit-ontology-tab-item.active { + color: var(--primary-color); + background-color: var(--light-color) !important; + border-left: 3px solid var(--primary-color); + font-weight: 700; + } + + + + .edit-ontology-tab-item:hover { + background-color: #F6F6F6; + } + + } +} + +.edit-ontology-tab-item { + font-size: 14px; + width: 100%; + padding: 10px 15px; + font-weight: 500; + margin: 3px 0; + cursor: pointer; + border-radius: 5px; + transition: background-color ease 0.3s; +} + +.edit-ontology-right-column { + border-radius: 5px; + width: 100%; +} + +.edit-ontology-desc { + font-size: 12px; + color: #777777; + margin: 10px 0; +} + +.edit-ontology-desc a { + text-decoration: none; + color: var(--primary-color); +} + +.edit-ontology-desc a svg { + transform: scale(1.2); +} + +.edit-ontology-left-column input { + border: 1px solid #BDBDBD; + outline: none; + font-size: 14px; + border-radius: 5px; + padding: 10px 15px; + width: 100%; + margin-top: 20px; +} + + + + +.edit-ontology-field div { + font-size: 11px; + color: #666; + +} + +.edit-ontology-field input { + border: 1px solid #BDBDBD; + border-radius: 5px; + font-size: 14px; + padding: 10px 15px; + outline: none; + width: 100%; + margin-top: 5px; + margin-bottom: 20px; +} + +.edit-ontology-field input:focus { + border-color: var(--primary-color); +} + +#edit-ontology-actions-devider { + width: 100%; + border: 1px solid #E9E9E9; + border-radius: 210px; + margin: 20px 0; + opacity: 100%; + +} + +.edit-ontology-actions { + display: flex; + justify-content: flex-end; +} + +.reset-all-button { + margin-right: 25px; + width: 186px; +} + +.save-button { + width: 90px; +} + diff --git a/app/assets/stylesheets/nav_bar.scss b/app/assets/stylesheets/nav_bar.scss index 35ff36fb1..8d29b7dd4 100644 --- a/app/assets/stylesheets/nav_bar.scss +++ b/app/assets/stylesheets/nav_bar.scss @@ -68,7 +68,7 @@ outline: none; opacity: 60%; border: 1px solid white; - background-color: var(--primary-color); + background-color: var(--primary-color) !important; color: white; border-radius: 5px; font-size: 14px; diff --git a/app/assets/stylesheets/ontology_details_header.scss b/app/assets/stylesheets/ontology_details_header.scss index 1d4ec22f3..3f87f5017 100644 --- a/app/assets/stylesheets/ontology_details_header.scss +++ b/app/assets/stylesheets/ontology_details_header.scss @@ -20,6 +20,7 @@ display: flex; justify-content: space-between; align-items: center; + position: relative; } .ontology-details-name-bar{ diff --git a/app/assets/stylesheets/submissions.scss b/app/assets/stylesheets/submissions.scss index 41e12ec32..3b7316f01 100644 --- a/app/assets/stylesheets/submissions.scss +++ b/app/assets/stylesheets/submissions.scss @@ -8,4 +8,7 @@ div#contacts div.contact.col-sm-10.offset-sm-2 { #submissionLocation small.form-text { margin-bottom: 0.5em; +} +.tab-content{ + position: relative; } \ No newline at end of file diff --git a/app/assets/stylesheets/summary.scss.erb b/app/assets/stylesheets/summary.scss.erb index e3f6adbdd..262c9e742 100644 --- a/app/assets/stylesheets/summary.scss.erb +++ b/app/assets/stylesheets/summary.scss.erb @@ -4,6 +4,10 @@ flex-wrap: wrap; } +.summary-page-center .card_title{ + margin-top: 40px; +} + .summary-page-first-row { width: 670px; margin-right: 20px; diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index cb75ef32a..1e994e803 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -25,7 +25,7 @@ def button_elem warning_class = @color == "warning" ? "warning-button " : " " disabled_class = @state == "disabled" ? "disabled-button " : " " class_style = "#{@variant}-button regular-button " + danger_class + warning_class + disabled_class + slim_class - on_click_event = load_animation? ? "displayAnimation(this)" : '' + on_click_event = load_animation? ? "displayAnimation(this, '#{@id}-loading-animation')" : '' if link? link_to(@href, class: class_style, onclick: on_click_event, id: @id) do diff --git a/app/components/buttons/regular_button_component/regular_button_component.html.haml b/app/components/buttons/regular_button_component/regular_button_component.html.haml index 17c8f3c42..8b6567203 100644 --- a/app/components/buttons/regular_button_component/regular_button_component.html.haml +++ b/app/components/buttons/regular_button_component/regular_button_component.html.haml @@ -4,8 +4,8 @@ - if load_animation? = render Display::ButtonLoaderComponent.new(id: @id + '-loading-animation', slim: @size.eql?('slim'), color: @color) :javascript - function displayAnimation(element){ - const loading = document.getElementById("#{@id}-loading-animation") + function displayAnimation(element, loadingId){ + const loading = document.getElementById(loadingId) element.style.display = 'none'; loading.style.display = 'flex'; } \ No newline at end of file diff --git a/app/components/edit_submission_attribute_button_component.rb b/app/components/edit_submission_attribute_button_component.rb deleted file mode 100644 index a4ef5bbc7..000000000 --- a/app/components/edit_submission_attribute_button_component.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -class EditSubmissionAttributeButtonComponent < ViewComponent::Base - include ActionView::Helpers::TagHelper - - def initialize(acronym: , submission_id:, attribute:, inline: false) - @acronym = acronym - @submission_id = submission_id - @attribute = attribute - - if inline - @link = "ontologies_metadata_curator/#{@acronym}/submissions/#{@submission_id}?properties=#{@attribute}&inline_save=true" - else - @link = "/ontologies/#{@acronym}/submissions/#{@submission_id}/edit?properties=#{@attribute}" - end - end - - def call - link_to @link, data: {turbo: true}, class: "btn btn-sm btn-light" do - content - end - end - -end diff --git a/app/components/form_group_component.rb b/app/components/form_group_component.rb deleted file mode 100644 index ea9c21811..000000000 --- a/app/components/form_group_component.rb +++ /dev/null @@ -1,47 +0,0 @@ -# frozen_string_literal: true - -class FormGroupComponent < ViewComponent::Base - include Turbo::FramesHelper - attr_reader :method_name, :value, :name - renders_one :help - renders_one :label - renders_one :input - renders_one :submit - - - def initialize(object:nil, name: '', method: nil, label: '', required: false, inline: true) - @object_name = object.class.name - @method_name = method || '' - begin - @value = object.send(method) if object && method - rescue - @value = '' - end - @label_text = label && !label.empty? ? label : method.to_s.capitalize - @required = required - @name = name && !name.empty? ? name : @object_name - @inline = inline - end - - - def required? - @required - end - - def inline_label? - @inline - end - - def label_class - inline_label? ? 'col-sm-4' : '' - end - def content_class - inline_label? ? 'col-sm-8' : '' - end - def container_class - inline_label? ? 'row' : '' - end - def container_id - "#{@name}#{@method_name.capitalize}" - end -end diff --git a/app/components/form_group_component/form_group_component.html.haml b/app/components/form_group_component/form_group_component.html.haml deleted file mode 100644 index 8b3d1c735..000000000 --- a/app/components/form_group_component/form_group_component.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -%div.form-group{id: container_id, class: container_class, style: 'align-items: baseline'} - %div{class: label_class} - - if label? - = label - - elsif @label_text - %label{for: "#{@name}_#{@method_name}", } - = @label_text - - if required? - %span.asterik * - %div{class: content_class} - = render TurboFrameComponent.new(id: "#{container_id}_from_group_input") do - %div.d-flex.w-100 - %div.flex-grow-1.mr-1 - - if input? - = input - - else - = content - - if help? - %small.form-text.text-muted{id: "#{@name}_#{@method_name}_helpBlock"} - = help - - if submit? - %div.d-flex - = submit \ No newline at end of file diff --git a/app/components/input/input_field_component.rb b/app/components/input/input_field_component.rb index d026ca0e5..bed61a95f 100644 --- a/app/components/input/input_field_component.rb +++ b/app/components/input/input_field_component.rb @@ -1,5 +1,5 @@ class Input::InputFieldComponent < ViewComponent::Base - def initialize(label: "" , name:, value: 'Syphax', type: 'text', placeholder: "", error_message: "", helper_text: "", disabled: false, data: nil, id: '') + def initialize(label: "" , name:, value: '', type: 'text', placeholder: "", error_message: "", helper_text: "", disabled: false, data: nil, id: '') @label = label @name = name @placeholder = placeholder @@ -18,15 +18,15 @@ def error_style end def error? - !@error_message.empty? + !@error_message&.empty? end def help? - !@helper_text.empty? + !@helper_text&.empty? end def label? - !@label.empty? + !@label&.empty? end end diff --git a/app/components/input/input_field_component/input_field_component.html.haml b/app/components/input/input_field_component/input_field_component.html.haml index 9500ba74d..3c9dd39ad 100644 --- a/app/components/input/input_field_component/input_field_component.html.haml +++ b/app/components/input/input_field_component/input_field_component.html.haml @@ -15,7 +15,7 @@ = @error_message - if help? .text-input-helper-text - = @helper_text + = raw @helper_text diff --git a/app/components/input/select_component.rb b/app/components/input/select_component.rb index e9f8e9b33..50d8dc889 100644 --- a/app/components/input/select_component.rb +++ b/app/components/input/select_component.rb @@ -2,12 +2,19 @@ class Input::SelectComponent < Input::InputFieldComponent - def initialize(id: nil, label: '', name:, value: [], selected: '', placeholder: '', error_message: '', helper_text: '', multiple: false, open_to_add_values: false) - super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text) + def initialize(id: nil, label: '', name:, value: [], selected: '', placeholder: '', error_message: '', helper_text: '', multiple: false, open_to_add_values: false, data: {}, tooltip: nil) + super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, + helper_text: helper_text, data: data) @values = value @selected = selected @open_to_add_values = open_to_add_values @multiple = multiple @id = id end + + def call + render Input::InputFieldComponent.new(name: @name, error_message: @error_message, helper_text: @helper_text, label: @label) do + render SelectInputComponent.new(id: @id, name: @name, values: @values, selected: @selected, multiple: @multiple, open_to_add_values: @open_to_add_values, data: @data) + end + end end diff --git a/app/components/input/select_component/select_component.html.haml b/app/components/input/select_component/select_component.html.haml deleted file mode 100644 index 242f79405..000000000 --- a/app/components/input/select_component/select_component.html.haml +++ /dev/null @@ -1,2 +0,0 @@ -= render Input::InputFieldComponent.new(name: @name, error_message: @error_message, helper_text: @helper_text, label: @label) do - = render SelectInputComponent.new(id: @id, name: @name, values: @values , selected: @selected , multiple: @multiple, open_to_add_values: @open_to_add_values ) \ No newline at end of file diff --git a/app/components/input/text_input_component.rb b/app/components/input/text_input_component.rb index d5cca42eb..aad3006da 100644 --- a/app/components/input/text_input_component.rb +++ b/app/components/input/text_input_component.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Input::TextInputComponent < Input::InputFieldComponent - def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '', disabled: false, id: '') + def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '', disabled: false, id: '', data: {}) super(label: label, name: name, value: value, placeholder: placeholder, error_message: error_message, helper_text: helper_text, disabled: disabled, id: id) end diff --git a/app/components/layout/progress_pages_component/progress_pages_component.html.haml b/app/components/layout/progress_pages_component/progress_pages_component.html.haml index f6b02cd67..6786a5ce6 100644 --- a/app/components/layout/progress_pages_component/progress_pages_component.html.haml +++ b/app/components/layout/progress_pages_component/progress_pages_component.html.haml @@ -13,7 +13,7 @@ %hr.line %div - pages.each_with_index do |page, index| - %div.progress-content{{'data-progress-pages-target': 'pageContent'}, class: index.zero? ? '' : 'hide'} + %div.progress-content.position-relative{{'data-progress-pages-target': 'pageContent'}, class: index.zero? ? '' : 'hide'} = page diff --git a/app/components/metadata_selector_component.rb b/app/components/metadata_selector_component.rb deleted file mode 100644 index 70c411209..000000000 --- a/app/components/metadata_selector_component.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -class MetadataSelectorComponent < ViewComponent::Base - - include ActionView::Helpers::FormOptionsHelper - - def initialize(label: 'Select properties', selected:, values:, inline: false, multiple: true) - super - @label = label - @selected_values = selected - @metadata_data = values - @inline = inline - @multiple = multiple - end - - def options_data - options_for_select(@metadata_data, selected: @selected_values) - end -end diff --git a/app/components/metadata_selector_component/metadata_selector_component.html.haml b/app/components/metadata_selector_component/metadata_selector_component.html.haml deleted file mode 100644 index 15c1c5a84..000000000 --- a/app/components/metadata_selector_component/metadata_selector_component.html.haml +++ /dev/null @@ -1,2 +0,0 @@ -= render FormGroupComponent.new(object:nil, name: :search, method: :metadata, label: @label, inline: @inline) do - = select(:search, :metadata, options_data, {}, style:'width:100%', multiple: @multiple, data: {controller:'metadata-select'}) \ No newline at end of file diff --git a/app/components/metadata_selector_component/metadata_selector_component_controller.js b/app/components/metadata_selector_component/metadata_selector_component_controller.js deleted file mode 100644 index 59750c57a..000000000 --- a/app/components/metadata_selector_component/metadata_selector_component_controller.js +++ /dev/null @@ -1,15 +0,0 @@ -import {Controller} from "@hotwired/stimulus"; -import {useChosen} from "../../javascript/mixins/useChosen"; - -export default class extends Controller { - connect() { - useChosen(this.element, { - search_contains: true, - width: "100%" - }, this.#triggerChange.bind(this)) - } - - #triggerChange() { - document.dispatchEvent(new Event('change', {target: this.element})) - } -} diff --git a/app/components/nested_agent_search_input_component.rb b/app/components/nested_agent_search_input_component.rb index 092e6ed36..98cbbd489 100644 --- a/app/components/nested_agent_search_input_component.rb +++ b/app/components/nested_agent_search_input_component.rb @@ -4,12 +4,13 @@ class NestedAgentSearchInputComponent < ViewComponent::Base include Turbo::FramesHelper, AgentHelper - def initialize(agents:, agent_type:, name_prefix:, edit_on_modal: false, parent_id: nil) + def initialize(label: nil, agents:, agent_type:, name_prefix:, edit_on_modal: false, parent_id: nil) super @agents = agents @agent_type = agent_type @name_prefix = name_prefix @edit_on_modal = edit_on_modal @parent_id = parent_id + @label = label end end diff --git a/app/components/nested_agent_search_input_component/nested_agent_search_input_component.html.haml b/app/components/nested_agent_search_input_component/nested_agent_search_input_component.html.haml index fb057218d..fbb548970 100644 --- a/app/components/nested_agent_search_input_component/nested_agent_search_input_component.html.haml +++ b/app/components/nested_agent_search_input_component/nested_agent_search_input_component.html.haml @@ -1,8 +1,10 @@ = render NestedFormInputsComponent.new do |c| + - c.header do + = @label - c.template do = render TurboFrameComponent.new(id: agent_id_frame_id('NEW_RECORD', @parent_id)) do = render AgentSearchInputComponent.new(id: 'NEW_RECORD', agent_type: @agent_type, name_prefix: @name_prefix, - parent_id: @parent_id, edit_on_modal: @edit_on_modal) + parent_id: @parent_id, edit_on_modal: @edit_on_modal) - c.empty_state do = hidden_field_tag agent_field_name('', @name_prefix+"[#{Array(@agents).size}]") diff --git a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml index 730ec86f4..bb013d867 100644 --- a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml +++ b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml @@ -29,6 +29,6 @@ %div{'data-nested-form-target': "target"} %div.add-another-object{data: {action:"click->nested-form#add"}} - = inline_svg 'icons/plus.svg' + = inline_svg 'icons/plus.svg', width: "14px", height: "14px" %div Add another #{@object_name} diff --git a/app/components/rounded_button_component.rb b/app/components/rounded_button_component.rb index d964d0b5a..b2a0ce49c 100644 --- a/app/components/rounded_button_component.rb +++ b/app/components/rounded_button_component.rb @@ -1,9 +1,10 @@ class RoundedButtonComponent < ViewComponent::Base - def initialize(icon: "json.svg", link: "#", size: "small", target: '') + def initialize(icon: "json.svg", link: "#", size: "small", target: '', title: '') @icon = icon @link = link @size = size @target = target + @title = title end def size diff --git a/app/components/rounded_button_component/rounded_button_component.html.haml b/app/components/rounded_button_component/rounded_button_component.html.haml index 4baa20df9..f5f23aad5 100644 --- a/app/components/rounded_button_component/rounded_button_component.html.haml +++ b/app/components/rounded_button_component/rounded_button_component.html.haml @@ -1,2 +1,2 @@ -%a.rounded-button{:href => @link, style: "height:"+size[0]+"; width:"+size[0]+"; border-radius:"+size[2]+";", target:@target} +%a.rounded-button{:href => @link, style: "height:"+size[0]+"; width:"+size[0]+"; border-radius:"+size[2]+";", target:@target, title: @title, 'data-controller':'tooltip'} = inline_svg_tag @icon, style: "transform: scale("+size[1]+");" diff --git a/app/components/search_input_component/search_input_component.html.haml b/app/components/search_input_component/search_input_component.html.haml index 6a0a5657a..162156e9d 100644 --- a/app/components/search_input_component/search_input_component.html.haml +++ b/app/components/search_input_component/search_input_component.html.haml @@ -4,9 +4,10 @@ 'data-search-input-id-key-value': @id_key, 'data-search-input-cache-value': @use_cache.to_s, 'data-search-input-scroll-down-value': @scroll_down.to_s} - %input#home-search{:name => @name, :placeholder => @placeholder, - :type => "text", 'data-action': 'input->search-input#search blur->search-input#blur', - 'data-search-input-target': 'input'} + + = render Input::InputFieldComponent.new(name: @name, placeholder: @placeholder, + data: {'action': 'input->search-input#search blur->search-input#blur', + 'search-input-target': 'input'}) .search-container{'data-search-input-target': 'dropDown', 'data-action': 'mousedown->search-input#prevent'} - @actions_links.each do |key, value| - link, target = action_link_info(value) diff --git a/app/components/select_input_component.rb b/app/components/select_input_component.rb index 99a481bb5..94d4d4fd9 100644 --- a/app/components/select_input_component.rb +++ b/app/components/select_input_component.rb @@ -2,7 +2,7 @@ class SelectInputComponent < ViewComponent::Base - def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_values: false) + def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_values: false, data: {}) super @id = id || "" @name = name @@ -10,6 +10,7 @@ def initialize(id:, name:, values:, selected:, multiple: false, open_to_add_valu @selected = selected @multiple = multiple @open_to_add_values = open_to_add_values + @data = data end def call @@ -21,18 +22,21 @@ def call def select_input_tag(id, values, selected, options = {}) multiple = options[:multiple] || false open_to_add_values = options[:open_to_add_values] || false - + data = @data.merge({ + 'select-input-multiple-value': multiple, + 'select-input-open-add-value': open_to_add_values + }) + data[:controller] = "#{data[:controller]} select-input" select_html_options = { id: "select_#{id}", autocomplete: "off", multiple: multiple, - data: { - controller: "select-input", - 'select-input-multiple-value': multiple, - 'select-input-open-add-value': open_to_add_values - } + data: data } + + + select_tag(id, options_for_select(values, selected), select_html_options) end end diff --git a/app/components/select_input_component/select_input_component_controller.js b/app/components/select_input_component/select_input_component_controller.js index 5002e90ea..369671199 100644 --- a/app/components/select_input_component/select_input_component_controller.js +++ b/app/components/select_input_component/select_input_component_controller.js @@ -1,5 +1,5 @@ import { Controller } from "@hotwired/stimulus" -import TomSelect from "tom-select" +import {useTomSelect} from "../../javascript/mixins/useTomSelect"; export default class extends Controller { static values = { @@ -14,7 +14,11 @@ export default class extends Controller { if (this.openAddValue) { myOptions['create'] = true; } - new TomSelect(this.element, myOptions); + + useTomSelect(this.element, myOptions, this.#triggerChange.bind(this)) } + #triggerChange() { + document.dispatchEvent(new Event('change', { target: this.element })) + } } \ No newline at end of file diff --git a/app/components/text_field_component.rb b/app/components/text_field_component.rb deleted file mode 100644 index 63fe0c242..000000000 --- a/app/components/text_field_component.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -class TextFieldComponent < FormGroupComponent - - def initialize(object:, name: nil, method:, label: nil, required: false, inline: true) - super - @object = object - end -end diff --git a/app/components/text_field_component/text_field_component.html.haml b/app/components/text_field_component/text_field_component.html.haml deleted file mode 100644 index 48353e691..000000000 --- a/app/components/text_field_component/text_field_component.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -= render FormGroupComponent.new(object: @object, name: @name, method: @method_name, label: @label_text, inline: @inline, required: @required) do |c| - = text_field c.name, c.method_name , value: c.value, class: "form-control" - - c.help do - = help - - if submit? - - c.submit do - = submit \ No newline at end of file diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5829d5484..974491dda 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -775,9 +775,9 @@ def init_trial_license # Get the submission metadata from the REST API. def submission_metadata - helpers.submission_metadata + @metadata ||= JSON.parse(Net::HTTP.get(URI.parse("#{REST_URI}/submission_metadata?apikey=#{API_KEY}"))) end - + helper_method :submission_metadata def request_lang helpers.request_lang diff --git a/app/controllers/concerns/ontology_updater.rb b/app/controllers/concerns/ontology_updater.rb index c45020ce9..847b29ea2 100644 --- a/app/controllers/concerns/ontology_updater.rb +++ b/app/controllers/concerns/ontology_updater.rb @@ -1,83 +1,34 @@ module OntologyUpdater extend ActiveSupport::Concern include SubmissionUpdater - def ontology_from_params - ontology = LinkedData::Client::Models::Ontology.new(values: ontology_params) - ontology.viewOf = nil unless ontology.isView - ontology - end - - def save_ontology - - @ontology = save_new_ontology - - if response_error?(@ontology) - show_new_errors(@ontology) - return - end - - - @submission = save_new_submission(params[:submission], @ontology) - - if response_error?(@submission) - @ontology.delete - show_new_errors(@submission) - else - redirect_to "/ontologies/success/#{@ontology.acronym}" - end - end - - def add_ontology_submission(acronym) - @ontology = update_existent_ontology(acronym) - - if @ontology.nil? || response_error?(@ontology) - show_new_errors(@ontology) - return - end - - @submission = @ontology.explore.latest_submission({ display: 'all' }) - submission_params = submission_params(params[:submission]) - submission_params = submission_params(ActionController::Parameters.new(@submission.to_hash.delete_if { |k, v| v.nil? || v.respond_to?(:empty?) && v.empty? })).merge(submission_params) if @submission - submission_params.delete 'submissionId' - @submission = save_new_submission(ActionController::Parameters.new(submission_params), @ontology) - - if response_error?(@submission) - show_new_errors(@submission) - else - redirect_to "/ontologies/success/#{@ontology.acronym}" - end - end - - def save_new_ontology - ontology = ontology_from_params - ontology.save - end def update_existent_ontology(acronym) @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(acronym).first return nil if @ontology.nil? - @ontology.update_from_params(ontology_params) + @ontology.update(values: ontology_params) end - def save_new_submission(submission_hash, ontology) - new_submission_params = submission_hash - new_submission_params[:ontology] = ontology.acronym - save_submission(new_submission_params) + def ontology_from_params + ontology = LinkedData::Client::Models::Ontology.new(values: ontology_params) + ontology.viewOf = nil unless ontology.isView + ontology end def ontology_params + return {} unless params[:ontology] + p = params.require(:ontology).permit(:name, :acronym, { administeredBy: [] }, :viewingRestriction, { acl: [] }, - { hasDomain: [] }, :viewOf,:isView, :subscribe_notifications, { group: [] }) + { hasDomain: [] }, :viewOf, :isView, :subscribe_notifications, { group: [] }) p[:administeredBy].reject!(&:blank?) if p[:administeredBy] # p[:acl].reject!(&:blank?) p[:hasDomain].reject!(&:blank?) if p[:hasDomain] - p[:group].reject!(&:blank?) if p[:group] + p[:group].reject!(&:blank?) if p[:group] p.to_h end - def show_new_errors(object) + def show_new_errors(object, redirection = 'ontologies/new') # TODO optimize @ontologies = LinkedData::Client::Models::Ontology.all(include: 'acronym', include_views: true, display_links: false, display_context: false) @categories = LinkedData::Client::Models::Category.all @@ -85,8 +36,37 @@ def show_new_errors(object) @user_select_list = LinkedData::Client::Models::User.all.map { |u| [u.username, u.id] } @user_select_list.sort! { |a, b| a[1].downcase <=> b[1].downcase } @errors = response_errors(object) + @is_update_ontology = true + @selected_attributes = (Array(errors_attributes) + Array(params[:submission]&.keys)).uniq @ontology = ontology_from_params - @submission = submission_from_params(params[:submission]) - render 'ontologies/new' + + @submission = submission_from_params(params[:submission]) if params[:submission] + render redirection + end + def errors_attributes + @errors = @errors[:error] if @errors && @errors[:error] + @errors.keys.map(&:to_s) if @errors.is_a?(Hash) + end + + def new_submission_hash + @submission = @ontology.explore.latest_submission({ display: 'all' }) + + submission_params = submission_params(params[:submission]) + + if @submission + submission_params = submission_params(ActionController::Parameters.new(@submission.to_hash.delete_if do |k, v| + v.nil? || v.respond_to?(:empty?) && v.empty? + end.merge(submission_params))) + end + + submission_params.delete 'submissionId' + submission_params[:ontology] = @ontology.acronym + ActionController::Parameters.new(submission_params) + end + + def update_submission_hash(acronym) + submission_params = submission_params(params[:submission]) + submission_params[:ontology] = acronym + submission_params end end diff --git a/app/controllers/concerns/submission_updater.rb b/app/controllers/concerns/submission_updater.rb index d8c63ba72..d283b82c0 100644 --- a/app/controllers/concerns/submission_updater.rb +++ b/app/controllers/concerns/submission_updater.rb @@ -15,14 +15,15 @@ def save_submission(new_submission_hash) @submission.save(cache_refresh_all: false) end - def update_submission(new_submission_hash) + def update_submission(new_submission_hash, submission_id) convert_values_to_types(new_submission_hash) @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(new_submission_hash[:ontology]).first - @submission = @ontology.explore.submissions({ display: 'all' }, new_submission_hash[:id]) + new_submission_hash.delete(:ontology) + @submission = @ontology.explore.submissions({ display: 'all' }, submission_id) - new_values = submission_params(new_submission_hash) + new_values = new_submission_hash new_values.each do |key, values| @submission.send("#{key}=", values) rescue StandardError @@ -36,23 +37,23 @@ def update_submission(new_submission_hash) def add_ontologies_to_object(ontologies,object) ontologies.each do |ont| next if object.ontologies.include?(ont) - ontology = LinkedData::Client::Models::Ontology.find(ont) - if object.type.match(/\/([^\/]+)$/)[1] == 'Group' - ontology.group.push(object.id) - else - ontology.hasDomain.push(object.id) - end - ontology.update + ontology = LinkedData::Client::Models::Ontology.find(ont) + if object.type.match(/\/([^\/]+)$/)[1] == 'Group' + ontology.group.push(object.id) + else + ontology.hasDomain.push(object.id) + end + ontology.update end end def delete_ontologies_from_object(new_ontologies,old_ontologies,object) - ontologies = old_ontologies - new_ontologies + ontologies = old_ontologies - new_ontologies ontologies.each do |ont| ontology = LinkedData::Client::Models::Ontology.find(ont) if object.type.match(/\/([^\/]+)$/)[1] == 'Group' ontology.group.delete(object.id) - else + else ontology.hasDomain.delete(object.id) end ontology.update @@ -126,6 +127,8 @@ def submission_params(params) end end p = params.permit(attributes.uniq) + p['pullLocation'] = '' if p['isRemote']&.eql?('3') + p = p.to_h.transform_values do |v| if v.is_a? Hash v.values.reject(&:empty?) diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index afb34ecfd..280af07bc 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -196,19 +196,33 @@ def properties end def create + @ontology = ontology_from_params.save - # redirect_to ontologies_path and return if params[:commit].eql? 'Cancel' - save_ontology + if response_error?(@ontology) + show_new_errors(@ontology) + return + end + + @submission = save_submission(new_submission_hash) + + if response_error?(@submission) + @ontology.delete + show_new_errors(@submission) + else + redirect_to "/ontologies/success/#{@ontology.acronym}" + end end def edit - # Note: find_by_acronym includes ontology views @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:id]).first redirect_to_home unless session[:user] && @ontology.administeredBy.include?(session[:user].id) || session[:user].admin? - @categories = LinkedData::Client::Models::Category.all - @groups = LinkedData::Client::Models::Group.all - @user_select_list = LinkedData::Client::Models::User.all.map {|u| [u.username, u.id]} - @user_select_list.sort! {|a,b| a[1].downcase <=> b[1].downcase} + + submission = @ontology.explore.latest_submission(include: 'submissionId') + if submission + redirect_to edit_ontology_submission_path(@ontology.acronym, submission.submissionId) + else + redirect_to new_ontology_submission_path(@ontology.acronym) + end end def mappings @@ -405,33 +419,6 @@ def summary end end - def update - if params['commit'] == 'Cancel' - acronym = params['id'] - redirect_to "/ontologies/#{acronym}" - return - end - # Note: find_by_acronym includes ontology views - @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology][:acronym] || params[:id]).first - @ontology.update_from_params(ontology_params) - @ontology.viewOf = nil if @ontology.isView.eql? "0" - error_response = @ontology.update - if response_error?(error_response) - @categories = LinkedData::Client::Models::Category.all - @user_select_list = LinkedData::Client::Models::User.all.map {|u| [u.username, u.id]} - @user_select_list.sort! {|a,b| a[1].downcase <=> b[1].downcase} - @errors = response_errors(error_response) - @errors = { acronym: 'Acronym already exists, please use another' } if error_response.status == 409 - flash[:error] = @errors - redirect_to "/ontologies/#{@ontology.acronym}/edit" - else - # TODO_REV: Enable subscriptions - # if params["ontology"]["subscribe_notifications"].eql?("1") - # DataAccess.createUserSubscriptions(@ontology.administeredBy, @ontology.ontologyId, NOTIFICATION_TYPES[:all]) - # end - redirect_to "/ontologies/#{@ontology.acronym}" - end - end def virtual redirect_new_api diff --git a/app/controllers/ontologies_metadata_curator_controller.rb b/app/controllers/ontologies_metadata_curator_controller.rb index b65658f86..69179b5be 100644 --- a/app/controllers/ontologies_metadata_curator_controller.rb +++ b/app/controllers/ontologies_metadata_curator_controller.rb @@ -5,11 +5,12 @@ class OntologiesMetadataCuratorController < ApplicationController before_action :submission_metadata, only: [:result, :edit, :update, :show_metadata_by_ontology] def result - @ontologies_ids = params[:ontology][:ontologyId].drop(1) - @metadata_sel = params[:search][:metadata].drop(1) + @ontologies_ids = params[:ontology] ? params[:ontology][:ontologyId] : [] + @metadata_sel = params[:search] ? params[:search][:metadata] : [] @show_submissions = !params[:show_submissions].nil? @ontologies = [] @submissions = [] + if @ontologies_ids.nil? || @ontologies_ids.empty? @ontologies = LinkedData::Client::Models::Ontology.all else @@ -46,8 +47,7 @@ def show_metadata_by_ontology @acronym = params[:ontology] inline_save = params[:inline_save] && params[:inline_save].eql?('true') display_submission_attributes(@acronym, params[:properties]&.split(','), - submissionId: params[:submission_id], - show_sections: false, inline_save: inline_save) + submissionId: params[:submission_id], inline_save: inline_save) render partial: 'submissions/form_content', locals: { id: params[:form_id] || '', acronym: @acronym, submissionId: params[:submission_id] } end @@ -57,8 +57,9 @@ def show_metadata_value submission_id = params[:submission_id] @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(acronym).first @submission = @ontology.explore.submissions({ display: "#{attribute},submissionId" }, submission_id) - - render_submission_attribute(attribute) + id = attribute_input_frame_id(acronym, submission_id, attribute) + render_turbo_stream replace(id, partial: 'ontologies_metadata_curator/attribute_inline', locals: { id: id, attribute: attribute, + submission: @submission, ontology: @ontology }) end def edit @@ -86,7 +87,7 @@ def update new_data = active_submission_data new_data[:ontology] = onto new_data[:id] = sub_i - error_responses << update_submission(new_data) if new_data + error_responses << update_submission(new_data, sub_i) if new_data @submissions << @submission end @@ -121,45 +122,4 @@ def append_submission(ontology, submission) @submissions << sub end - def metadata_params - attributes = [ - :ontology, - :description, - :hasOntologyLanguage, - :prefLabelProperty, - :synonymProperty, - :definitionProperty, - :authorProperty, - :obsoleteProperty, - :obsoleteParent, - :version, - :status, - :released, - :isRemote, - :pullLocation, - :filePath, - { contact: [:name, :email] }, - :homepage, - :documentation, - :publication - ] - - submission_metadata.each do |m| - - m_attr = m["attribute"].to_sym - - attributes << if m["enforce"].include?("list") - { m_attr => [] } - else - m_attr - end - end - out = [] - params.require(:submission).permit!.tap do |x| - x.keys.each do |y| - out << x.require(y).permit(attributes.uniq) - end - end - out - end end diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb index 66572cd8e..84a66a805 100644 --- a/app/controllers/submissions_controller.rb +++ b/app/controllers/submissions_controller.rb @@ -22,54 +22,91 @@ def index # When getting "Add submission" form to display def new - @required_only = params[:required].nil? || !params[:required]&.eql?('false') - @ontology = LinkedData::Client::Models::Ontology.get(CGI.unescape(params[:ontology_id])) rescue nil - @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology_id]).first unless @ontology - @submission = @ontology.explore.latest_submission - @submission ||= LinkedData::Client::Models::OntologySubmission.new + @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology_id]).first + @submission = @ontology.explore.latest_submission || LinkedData::Client::Models::OntologySubmission.new @submission.id = nil @categories = LinkedData::Client::Models::Category.all @groups = LinkedData::Client::Models::Group.all @user_select_list = LinkedData::Client::Models::User.all.map {|u| [u.username, u.id]} @user_select_list.sort! {|a,b| a[1].downcase <=> b[1].downcase} @is_update_ontology = true + render "ontologies/new" end # Called when form to "Add submission" is submitted def create @is_update_ontology = true - add_ontology_submission(params[:ontology][:acronym] || params[:id]) + + if params[:ontology] + @ontology = update_existent_ontology(params[:ontology_id]) + + if @ontology.nil? || response_error?(@ontology) + show_new_errors(@ontology) + return + end + end + + @submission = save_submission(new_submission_hash) + + if response_error?(@submission) + show_new_errors(@submission) + else + redirect_to "/ontologies/success/#{@ontology.acronym}" + end end # Called when form to "Edit submission" is submitted - def edit - display_submission_attributes params[:ontology_id], params[:properties]&.split(','), submissionId: params[:id], - required: params[:required]&.eql?('true'), - show_sections: params[:show_sections].nil? || params[:show_sections].eql?('true'), + def edit_properties + display_submission_attributes params[:ontology_id], params[:properties]&.split(','), submissionId: params[:submission_id], inline_save: params[:inline_save]&.eql?('true') + + attribute_template_output = render_to_string(inline: helpers.render_submission_inputs(params[:container_id] || 'metadata_by_ontology')) + + render inline: attribute_template_output + + end + + def edit + @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology_id]).first + ontology_not_found(params[:ontology_id]) unless @ontology + @categories = LinkedData::Client::Models::Category.all + @groups = LinkedData::Client::Models::Group.all + @user_select_list = LinkedData::Client::Models::User.all.map {|u| [u.username, u.id]} + @user_select_list.sort! {|a,b| a[1].downcase <=> b[1].downcase} + @is_update_ontology = true end # When editing a submission (called when submit "Edit submission information" form) def update - error_responses = [] - _, submission_params = params[:submission].each.first - - error_responses << update_submission(submission_params) + acronym = params[:ontology_id] + submission_id = params[:id] + if params[:ontology] + @ontology = update_existent_ontology(acronym) + if @ontology.nil? || response_error?(@ontology) + show_new_errors(@ontology, partial: 'submissions/form_content', locals: { id: 'test' }) + return + end + end - if error_responses.compact.any? { |x| x.status != 204 } - @errors = error_responses.map { |error_response| response_errors(error_response) } + if params[:submission].nil? + return redirect_to "/ontologies/#{acronym}", + notice: 'Submission updated successfully' end - if @errors && !params[:attribute] - @required_only = !params['required-only'].nil? - @filters_disabled = true - reset_agent_attributes - render 'edit', status: 422 - elsif params[:attribute] - reset_agent_attributes - render_submission_attribute(params[:attribute]) + @submission = update_submission(update_submission_hash(acronym), submission_id) + #reset_agent_attributes + if params[:attribute].nil? + if response_error?(@submission) + show_new_errors(@submission, partial: 'submissions/form_content', locals: { id: 'test' }) + else + redirect_to "/ontologies/#{acronym}", + notice: 'Submission updated successfully' + end else - redirect_to "/ontologies/#{@ontology.acronym}" + @errors = response_errors(@submission) if response_error?(@submission) + @submission = submission_from_params(params[:submission]) + @submission.submissionId = submission_id + render_submission_attribute(params[:attribute]) end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9e65befaf..c4c5bbd14 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -43,10 +43,6 @@ def omniauth_token_provider(strategy) omniauth_provider_info(strategy).keys.first end - def submission_metadata - @metadata ||= JSON.parse(Net::HTTP.get(URI.parse("#{REST_URI}/submission_metadata?apikey=#{API_KEY}"))) - end - def isOwner?(id) unless session[:user].nil? if session[:user].admin? @@ -283,7 +279,22 @@ def help_tooltip(content, html_attribs = {}, icon = 'fas fa-question-circle', cs BLOCK end + def error_message_text + @errors = @errors[:error] if @errors && @errors[:error] + if @errors.is_a?(String) + @errors + else + "Errors in fields #{@errors.keys.join(', ')}" + end + end + + def error_message_alert + return if @errors.nil? + content_tag(:div, class: 'my-1') do + render Display::AlertComponent.new(message: error_message_text, type: 'danger', closable: false) + end + end def anonymous_user # diff --git a/app/helpers/components_helper.rb b/app/helpers/components_helper.rb index 3b931cb31..1452610cd 100644 --- a/app/helpers/components_helper.rb +++ b/app/helpers/components_helper.rb @@ -15,7 +15,7 @@ def properties_list_component(c, properties, &block) else v end - render FieldContainerComponent.new(label: attr_label(k)) do + render FieldContainerComponent.new(label: attr_label(k, show_tooltip: false)) do content end end @@ -64,7 +64,7 @@ def properties_card(title, tooltip, properties, &block) def properties_dropdown(id, title, tooltip, properties, &block) render DropdownContainerComponent.new(title: title, id: id, tooltip: tooltip) do |d| d.empty_state do - properties_string = properties.keys[0..4].map{|key| "#{attr_label(key)}" }.join(', ')+'... ' if properties + properties_string = properties.keys[0..4].map{|key| "#{attr_label(key, show_tooltip: false)}" }.join(', ')+'... ' if properties empty_state_message "The fields #{properties_string} are empty" end diff --git a/app/helpers/inputs_helper.rb b/app/helpers/inputs_helper.rb index ff0f14294..086af83bf 100644 --- a/app/helpers/inputs_helper.rb +++ b/app/helpers/inputs_helper.rb @@ -1,31 +1,43 @@ module InputsHelper - def text_input(label: nil, name: , value:, disabled: false) - render Input::TextInputComponent.new(label: input_label(label, name) , name: name, value: value, error_message: input_error_message(name), disabled: disabled) + def text_input(name:, value:, label: nil, disabled: false, help: nil) + render Input::TextInputComponent.new(label: input_label(label, name), name: name, value: value, + error_message: input_error_message(name), + disabled: disabled, + helper_text: help) end - def select_input(label: nil, name: , values:, selected: nil, multiple: false) - render Input::SelectComponent.new(label: input_label(label, name), name: name, value: values, selected: selected, multiple: multiple) + def select_input(name:, values:, id: nil, label: nil, selected: nil, multiple: false, help: nil, data: {}) + render Input::SelectComponent.new(label: input_label(label, name), id: id, name: name, value: values, + selected: selected, + multiple: multiple, + helper_text: help, data: data) end - def check_input(id:, name: , label: '', value:, checked: false) + def check_input(id:, name:, value:, label: '', checked: false) render ChipsComponent.new(name: name, id: id, label: label, value: value, checked: checked) end - def switch_input(id: , name:, label: ,checked: false) - render SwitchInputComponent.new(id: id, name: name, label: label, checked: checked) + def switch_input(id:, name:, label:, checked: false, value: '', boolean_switch: false) + render SwitchInputComponent.new(id: id, name: name, label: label, checked: checked, value: value, boolean_switch: boolean_switch) end - def url_input(label: nil, name: , value:) - render Input::UrlComponent.new(label: input_label(label, name), name: name, value: value, error_message: input_error_message(name) ) + def url_input(name:, value:, label: nil, help: nil) + render Input::UrlComponent.new(label: input_label(label, name), name: name, value: value, + error_message: input_error_message(name), + helper_text: help) end - def text_area_input(label: nil, name: , value:) - render Input::TextAreaComponent.new(label: input_label(label, name), name: name, value: value, error_message: input_error_message(name)) + def text_area_input(name:, value:, label: nil, help: nil) + render Input::TextAreaComponent.new(label: input_label(label, name), name: name, value: value, + error_message: input_error_message(name), + helper_text: help) end - def date_input(label: nil, name:, value:) - render Input::DateComponent.new(label: input_label(label, name) ,name: name, value: value || Date.today, error_message: input_error_message(name)) + def date_input(name:, value:, label: nil, help: nil) + render Input::DateComponent.new(label: input_label(label, name), name: name, value: value, + error_message: input_error_message(name), + helper_text: help) end private @@ -39,6 +51,14 @@ def input_label(label, name) label || method_name(name).humanize end + def attribute_error(attr) + return '' unless @errors && @errors[attr.to_sym] + + errors = @errors[attr.to_sym] + + errors.values.join(', ') + end + def input_error_message(name) attribute_error(method_name(name)) end diff --git a/app/helpers/metadata_helper.rb b/app/helpers/metadata_helper.rb index 5cf73e2fa..fbb4a3c0f 100644 --- a/app/helpers/metadata_helper.rb +++ b/app/helpers/metadata_helper.rb @@ -4,16 +4,14 @@ def input_type?(attr, type) attr["enforce"].include?(type) end - def attr_metadata(attr_key) - submission_metadata.select { |attr_hash| attr_hash["attribute"].to_s.eql?(attr_key) }.first + def submission_metadata + @metadata ||= JSON.parse(Net::HTTP.get(URI.parse("#{$REST_URL}/submission_metadata?apikey=#{$API_KEY}"))) end - def attr_label(attr) - data = attr_metadata(attr.to_s) - return attr.humanize if data.nil? - data["label"] + def attr_metadata(attr_key) + submission_metadata.select { |attr_hash| attr_hash["attribute"].to_s.eql?(attr_key) }.first end - + def integer?(attr_label) input_type?(attr_metadata(attr_label), 'integer') end diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 036652052..6c50c0515 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -256,10 +256,9 @@ def language_selector_tag(name) languages = languages_options if languages.empty? && @submission_latest - content_tag(:div ,data: {'ontology-viewer-tabs-target': 'languageSelector'}, style: "visibility: #{ontology_data_section? ? 'visible' : 'hidden'} ; margin-bottom: -1px;") do - render EditSubmissionAttributeButtonComponent.new(acronym: @ontology.acronym, submission_id: @submission_latest.submissionId, attribute: :naturalLanguage) do - concat "Enable multilingual display " - concat content_tag(:i , "", class: "fas fa-lg fa-question-circle") + content_tag(:div, data: { 'ontology-viewer-tabs-target': 'languageSelector' }, style: "visibility: #{ontology_data_section? ? 'visible' : 'hidden'} ; margin-bottom: -1px;") do + edit_submission_property_link(@ontology.acronym, @submission_latest.submissionId, :naturalLanguage) do + "Enable multilingual display " + content_tag(:i, "", class: "fas fa-lg fa-question-circle") end end else @@ -345,34 +344,36 @@ def metadata_formats_buttons end def count_subscriptions(ontology_id) - users = LinkedData::Client::Models::User.all(include: 'subscription', display_context: false, display_links: false ) - users.select{ |u| u.subscription.find{ |s| s.ontology.eql?(ontology_id)} }.count + users = LinkedData::Client::Models::User.all(include: 'subscription', display_context: false, display_links: false) + users.select { |u| u.subscription.find { |s| s.ontology.eql?(ontology_id) } }.count + end + + def new_submission_button + return unless @ontology.admin?(session[:user]) + render RoundedButtonComponent.new(link: new_ontology_submission_path(@ontology.acronym), icon: 'icons/plus.svg', + size: 'medium', title: 'Add new submission') end def ontology_edit_button - return unless @ontology.admin?(session[:user]) - render RoundedButtonComponent.new(link: edit_ontology_path(@ontology.acronym), icon: 'edit.svg', size: 'medium') + return unless @ontology.admin?(session[:user]) + render RoundedButtonComponent.new(link: edit_ontology_path(@ontology.acronym), icon: 'edit.svg', + size: 'medium', + title: 'Edit metadata') end def submission_json_button - render RoundedButtonComponent.new(link: "#{(@submission_latest || @ontology).id}?display=all", target: '_blank', size: 'medium') + render RoundedButtonComponent.new(link: "#{(@submission_latest || @ontology).id}?display=all", target: '_blank', size: 'medium') end - def attribute_error(attr) - return '' unless @errors && @errors[attr.to_sym] - errors = @errors[attr.to_sym] - errors.values.join(', ') + def summary_only? + @ontology&.summaryOnly || @submission&.isRemote&.eql?('3') end - def error_message - if !@errors[:error].nil? && @errors[:error].is_a?(String) - @errors[:error] - else - "Errors in fields #{@errors.keys.join(', ')}" - end - + def ontology_pull_location? + !(@submission.pullLocation.nil? || @submission.pullLocation.empty?) end + private def submission_languages(submission = @submission) diff --git a/app/helpers/submission_inputs_helper.rb b/app/helpers/submission_inputs_helper.rb new file mode 100644 index 000000000..4a527913a --- /dev/null +++ b/app/helpers/submission_inputs_helper.rb @@ -0,0 +1,309 @@ +module SubmissionInputsHelper + + class SubmissionMetadataInput + include MetadataHelper + + def initialize(attribute_key:, submission: nil, attr_metadata: nil, label: nil) + @attribute_key = attribute_key + @attr_metadata = attr_metadata || attr_metadata(attribute_key) + @submission = submission + @label = label + end + + def name + "submission[#{@attribute_key}]" + end + + def values + @submission.send(@attr_metadata['attribute']) + rescue StandardError + nil + end + + def help_text + CGI.unescape_html(@attr_metadata['helpText']) if @attr_metadata['helpText'] + end + + def label + @label || @attr_metadata['label'] || @attr_metadata['attribute'].humanize + end + + def type?(type) + @attr_metadata['enforce'].include?(type) + end + + def metadata + @attr_metadata + end + + def required? + Array(@attr_metadata['enforce']).include?('existence') + end + end + + # @param attr_key String + def attribute_input(attr_key, attr_metadata: nil, long_text: false, label: nil, show_tooltip: true) + attr = SubmissionMetadataInput.new(attribute_key: attr_key, submission: @submission, label: label, attr_metadata: attr_metadata) + + if attr.type?('Agent') + generate_agent_input(attr) + elsif attr.type?('integer') + generate_integer_input(attr) + elsif attr.type?('date_time') + generate_date_input(attr) + elsif attr.type?('textarea') + generate_textarea_input(attr) + elsif enforce_values?(attr) + if attr.type?('list') + generate_select_input(attr, multiple: true) + else + generate_select_input(attr) + end + elsif attr.type?('isOntology') + generate_select_input(attr, multiple: attr['enforce'].include?('list')) + elsif attr.type?('uri') + generate_url_input(attr) + elsif attr.type?('boolean') + generate_boolean_input(attr) + else + # If input a simple text + name = attr.name + label = attr_header_label(attr, show_tooltip: show_tooltip) + if attr.type?('list') + generate_list_text_input(attr) + elsif attr.metadata['attribute'].to_s.eql?('URI') + url_input(name: name, label: label, value: @submission.URI) + elsif long_text + text_area_input(name: name, label: label, + value: attr.values) + else + text_input(name: name, label: label, + value: attr.values) + end + end + + end + + def contact_input(label: '', name: 'Contact', show_help: true) + attr = SubmissionMetadataInput.new(attribute_key: 'contact') + render Input::InputFieldComponent.new(name: '', label: attr_header_label(attr, label, show_tooltip: show_help), + error_message: attribute_error(:contact)) do + render NestedFormInputsComponent.new(object_name: 'Contact') do |c| + c.header do + content_tag(:div, "#{name} name", class: 'w-50') + content_tag(:div, "#{name} email", class: 'w-50') + end + + c.template do + content_tag(:div, class: 'd-flex my-1') do + out = content_tag(:div, class: ' w-50 mr-2') do + text_input(label: '', name: 'submission[contact][NEW_RECORD][name]', value: '') + end + out + content_tag(:div, class: ' w-50') do + text_input(label: '', name: 'submission[contact][NEW_RECORD][email]', value: '') + end + end + end + + Array(@submission.contact).each_with_index do |contact, i| + c.row do + content_tag(:div, class: 'd-flex my-1') do + out = content_tag(:div, class: 'w-50 mr-2') do + text_input(label: '', name: "submission[contact][#{i}][name]", value: contact['name']) + end + out + content_tag(:div, class: 'w-50') do + text_input(label: '', name: "submission[contact][#{i}][email]", value: contact['email']) + end + end + end + end + end + end + end + + # @param attr_key string + def attr_label(attr_key, label = nil, attr_metadata: nil, show_tooltip: true) + + data = attr_metadata || SubmissionMetadataInput.new(attribute_key: attr_key.to_s) + return attr_key.humanize if data.nil? + + if show_tooltip + attr_header_label(data, label, show_tooltip: show_tooltip) + else + label || data.label + end + end + + private + + def agent_type(attr) + if input_type?(attr, 'is_person') + 'person' + elsif input_type?(attr, 'is_organization') + 'organization' + else + '' + end + end + + def generate_integer_input(attr) + # TODO to update to use a component + number_field object_name, attr.metadata['attribute'].to_s.to_sym, value: @submission.send(attr.metadata['attribute']), class: 'metadataInput form-control' + end + + def generate_agent_input(attr) + render Input::InputFieldComponent.new(name: '', error_message: attribute_error(attr.metadata['attribute'])) do + render NestedAgentSearchInputComponent.new(label: attr_header_label(attr), + agents: attr.values, + agent_type: agent_type(attr.metadata), + name_prefix: attr.name, + parent_id: '') + end + + end + + def generate_date_input(attr) + date_input(label: attr_header_label(attr), name: attr.name, + value: attr.values) + end + + def generate_textarea_input(attr) + text_input(name: attr.name, + value: attr.values) + end + + def generate_select_input(attr, multiple: false) + name = attr.name + label = attr_header_label(attr) + metadata_values, select_values = selected_values(attr, enforced_values(attr)) + + unless multiple + select_values << ['', ''] + metadata_values = '' if metadata_values.nil? + end + + select_input(name: name, label: label, values: select_values, + selected: metadata_values, multiple: multiple) + end + + def generate_list_field_input(attr, name, label, values, &block) + render Input::InputFieldComponent.new(name: '', error_message: attribute_error(attr.metadata['attribute'])) do + render NestedFormInputsComponent.new do |c| + c.header do + label + end + c.template do + block.call('', "#{name}[NEW_RECORD]", attr.metadata['attribute'].to_s + '_' + @ontology.acronym) + end + + c.empty_state do + hidden_field_tag "#{name}[#{values.size}]" + end + + values.each_with_index do |metadata_val, i| + c.row do + block.call(metadata_val, "#{name}[#{i}]", "submission_#{attr.metadata['attribute'].to_s}" + '_' + @ontology.acronym) + end + end + end + end + + end + + def generate_url_input(attr) + label = attr_header_label(attr) + values = attr.values + name = attr.name + if attr.type?('list') + generate_list_field_input(attr, name, label, values || ['']) do |value, row_name, id| + url_input(label: '', name: row_name, value: value) + end + else + url_input(label: label, name: name, value: values) + end + end + + def generate_list_text_input(attr) + label = attr_header_label(attr) + values = attr.values || [''] + name = attr.name + generate_list_field_input(attr, name, label, values) do |value, row_name, id| + text_input(label: '', name: row_name, value: value) + end + end + + def generate_boolean_input(attr) + value = attr.values + value = value.to_s unless value.nil? + name = attr.name + content_tag(:div, class: 'd-flex') do + switch_input(id: name, name: name, label: attr_header_label(attr), checked: value.eql?('true'), value: value, boolean_switch: true) + end + end + + def enforce_values?(attr) + !attr.metadata['enforcedValues'].nil? + end + + def enforced_values(attr) + attr.metadata['enforcedValues'].collect { |k, v| [v || k, k] } + end + + def selected_values(attr, enforced_values) + metadata_values = attr.values + select_values = enforced_values + + if metadata_values.kind_of?(Array) + metadata_values.map do |metadata| + select_values << metadata unless select_values.flatten.include?(metadata) + end + elsif !select_values.flatten.include?(metadata_values) && !metadata_values.to_s.empty? + select_values << metadata_values + end + [metadata_values, select_values] + end + + private + + def attr_header_label(attr, label = nil, show_tooltip: true) + label ||= attr.label + return '' if label.nil? || label.empty? + + content_tag(:div) do + tooltip_span = render(Display::InfoTooltipComponent.new(text: attribute_help_text(attr))) + html = content_tag(:span, label) + html += content_tag(:span, '*', class: "text-danger") if attr.required? + html += content_tag(:span, tooltip_span, class: 'ml-1') if show_tooltip + html + end + end + + def attribute_help_text(attr) + label = attr.label + help = attr.help_text + required = attr.required? + attr = attr.metadata + attribute = !attr['namespace'].nil? ? "#{attr['namespace']}:#{attr['attribute']}" : "bioportal:#{attr['attribute']}" + + title = content_tag(:span, "#{label} (#{attribute})") + title += content_tag(:span, 'required', class: 'badge badge-danger mx-1') if required + + render SummarySectionComponent.new(title: title, show_card: false) do + help_text = '' + unless attr['metadataMappings'].nil? + help_text += render(FieldContainerComponent.new(label: 'Equivalents', value: attr['metadataMappings'].join(', '))) + end + + unless attr['enforce'].nil? || attr['enforce'].empty? + help_text += render(FieldContainerComponent.new(label: 'Validators', value: attr['enforce'].map do |x| + content_tag(:span, x.humanize, class: 'badge badge-primary mx-1') + end.join.html_safe)) + end + + unless attr['helpText'].nil? + help_text += render(FieldContainerComponent.new(label: 'Help text ', value: help.html_safe)) + end + + help_text + end + end +end \ No newline at end of file diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb index 2fe2408d6..29ac4c6b5 100644 --- a/app/helpers/submissions_helper.rb +++ b/app/helpers/submissions_helper.rb @@ -1,8 +1,24 @@ module SubmissionsHelper + def metadata_help_link + content_tag(:div, class: 'edit-ontology-desc') do + html = content_tag(:span, 'To understand the ontologies metadata:') + html += content_tag(:span, style: 'width: 10px; height: 10px') do + link_to(render(ExternalLinkTextComponent.new(text: 'see the Wiki')), "https://github.com/agroportal/documentation/wiki/Ontology-metadata") + end + html.html_safe + end + end + def ontology_submission_id_label(acronym, submission_id) [acronym, submission_id].join('#') end + + def submission_metadata_selector(id: 'search_metadata', name: 'search[metadata]', label: 'Filter properties to show') + select_input(id: id, name: name, label: label, values: submission_editable_properties.sort, multiple: true, + data: { placeholder: 'Start typing to select properties' }) + end + def ontology_and_submission_id(value) value.split('#') end @@ -11,62 +27,49 @@ def render_submission_attribute(attribute, submission = @submission, ontology = render partial: 'ontologies_metadata_curator/attribute_inline_editable', locals: { attribute: attribute, submission: submission, ontology: ontology } end - def render_submission_attribute_inline(attribute, submission = @submission, acronym) - render partial:"ontologies_metadata_curator/attribute_inline", locals:{attribute: attribute, submission: submission, acronym: acronym} - end - def attribute_input_frame_id(acronym, submission_id, attribute) "submission[#{acronym}_#{submission_id}]#{attribute.capitalize}_from_group_input" end - def display_submission_attributes(acronym, attributes, submissionId: nil, required: false, show_sections: false, inline_save: false) + def edit_submission_property_link(acronym, submission_id, attribute, container_id = nil, &block) + link = "/ontologies/#{acronym}/submissions/#{submission_id}/edit_properties?properties=#{attribute}&inline_save=true" + if container_id + link += "&container_id=#{container_id}" + else + link += "&container_id=#{attribute_input_frame_id(acronym, submission_id, attribute)}" + end + link_to link, data: { turbo: true }, class: 'btn btn-sm btn-light' do + capture(&block) + end + end + + def display_submission_attributes(acronym, attributes, submissionId: nil, inline_save: false) @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(acronym).first @selected_attributes = attributes - @required_only = required - @hide_sections = !show_sections @inline_save = inline_save - display_properties = @selected_attributes && !@selected_attributes.empty? ? (equivalent_properties(@selected_attributes) + [:ontology, :submissionId]).join(',') : 'all' - if submissionId - @submission = @ontology.explore.submissions({ display: display_properties }, submissionId) + if @selected_attributes && !@selected_attributes.empty? + display_properties = (equivalent_properties(@selected_attributes) + [:ontology, :submissionId]).join(',') else - @submission = @ontology.explore.latest_submission({ display: display_properties }) + display_properties = 'all' end - end - def metadata_section(id, label, collapsed: true, parent_id: nil, &block) - if @hide_sections - content_tag(:div) do - capture(&block) - end + if submissionId + @submission = @ontology.explore.submissions({ display: display_properties }, submissionId) else - collapsed = false if !@selected_attributes.nil? || !@errors.nil? - render CollapsableBlockComponent.new(id: id, parent_id: (parent_id || "#{id}-card"), title: label, collapsed: collapsed) do - capture(&block) - end - end - end - - def attribute_container(attr, required: false, &block) - if show_attribute?(attr, required) - content_tag(:div) do - capture(&block) + @submission = @ontology.explore.latest_submission({ display: display_properties }) end end - end def inline_save? !@inline_save.nil? && @inline_save end def selected_attribute?(attr) - @selected_attributes.nil? || @selected_attributes.empty? || @selected_attributes.include?(attr.to_s) || equivalent_properties(@selected_attributes).include?(attr.to_s) - end + return true if @selected_attributes.nil? || @selected_attributes.empty? || @selected_attributes.include?(attr.to_s) + return true if equivalent_properties(@selected_attributes).include?(attr.to_s) - def show_attribute?(attr, required) - selected = selected_attribute?(attr) - required_only = @required_only && required || !@required_only - selected && required_only + equivalent_properties(attr.to_s).any? { |x| @selected_attributes.include?(x) } end def save_button @@ -90,36 +93,22 @@ def cancel_button(href) end end - def attribute_form_group_container(attr, label: '', required: false, &block) - attribute_container(attr, required: required) do - render FormGroupComponent.new(object: @submission, name: object_name, method: attr, label: label, required: required) do |c| - if inline_save? - c.submit do - html = '' - html += save_button - html += cancel_button(cancel_link(attribute: attr)) - html.html_safe - end + def attribute_form_group_container(attr, &block) + render(TurboFrameComponent.new(id: "#{object_name}#{attr}_from_group_input")) do + tag.div(class: 'd-flex w-100 mb-3') do + html = tag.div(class: 'flex-grow-1 mr-1') do + capture(&block) end - capture(c, &block) - end - end - end - - def attribute_text_field_container(attr, label: '', required: false, inline: true, &block) - attribute_container(attr, required: required) do - render TextFieldComponent.new(object: @submission, name: object_name, label: label, method: attr, required: required, inline: inline) do |c| if inline_save? - c.submit do + html += tag.div(class: 'd-flex') do html = '' html += save_button html += cancel_button(cancel_link(attribute: attr)) html.html_safe end end - - capture(c, &block) if block_given? + html end end end @@ -134,122 +123,34 @@ def format_equivalent end def location_equivalent - %w[summaryOnly pullLocation] + %w[summaryOnly pullLocation uploadFilePath] end def equivalent_property(attr) equivalents = submission_properties found = equivalents.select { |x| x.is_a?(Array) && x[0].eql?(attr.to_sym) } - found.empty? ? attr.to_sym: found.first[1] + found.empty? ? attr.to_sym : found.first[1] end def equivalent_properties(attr_labels) labels = Array(attr_labels) - labels.map { |x| equivalent_property(x) }.flatten end def submission_properties - out = [ - [:format, format_equivalent], - :version, - :status, - [:location, location_equivalent], - :URI, - :deprecated, - :hasOntologySyntax, - :hasFormalityLevel, - :isOfType, - :naturalLanguage, - :description, - :homepage, - :documentation, - :publication, - :usedOntologyEngineeringTool, - :abstract, :notes, :keywords, :alternative, :identifier, - :knownUsage, - :designedForOntologyTask, - :hasDomain, - :coverage, - :example, - :conformsToKnowledgeRepresentationParadigm, - :usedOntologyEngineeringMethodology, - :accrualMethod, - :accrualPeriodicity, - :accrualPolicy, - :competencyQuestion, - :versionIRI, - :source, - :isFormatOf, - :hasFormat, - :includedInDataCatalog, - :depiction, - :logo, - :associatedMedia, - :released, - :modificationDate, - :valid, - :curatedOn, - :publisher, - :hasLicense, - :morePermissions, - :copyrightHolder, - :contact, - :hasContributor, - :hasCreator, - :audience, - :toDoList, - :useGuidelines, - :repository, - :bugDatabase, - :mailingList, - :award, - :wasGeneratedBy, - :wasInvalidatedBy, - :curatedBy, - :endorsedBy, - :fundedBy, - :translator, - :useImports, - :hasPriorVersion, - :isAlignedTo, - :ontologyRelatedTo, - :isBackwardCompatibleWith, - :isIncompatibleWith, - :comesFromTheSameDomain, - :similarTo, - :explanationEvolution, - :generalizes, - :hasDisparateModelling, - :hasPart, - :usedBy, - :workTranslation, - :translationOfWork, - :preferredNamespacePrefix, - :preferredNamespaceUri, - :keyClasses, - :endpoint, - :dataDump, - :csvDump, - :openSearchDescription, - :uriLookupEndpoint, - :uriRegexPattern, - :metadataVoc, - :exampleIdentifier, - :numberOfClasses, - :numberOfIndividuals, - :numberOfProperties, - :entities, - :numberOfAxioms - ] - out.uniq + format_equivalents = format_equivalent + location_equivalents = location_equivalent + equivalents = location_equivalents + format_equivalents + out = submission_metadata.map { |x| x['attribute'] }.reject { |x| equivalents.include?(x) } + out << [:format, format_equivalent] + out << [:location, location_equivalent] + + out end def submission_editable_properties - properties = submission_properties - properties.map do |x| if x.is_a? Array [x[0].to_s.underscore.humanize, x[0]] @@ -257,285 +158,62 @@ def submission_editable_properties [x.to_s.underscore.humanize, x] end end - end - def extractable_metadatum_tooltip(options = {}) - help_tooltip(options[:content], {}, 'fas fa-file-export', 'extractable-metadatum', options[:text]).html_safe - end def attribute_infos(attr_label) submission_metadata.select{ |attr_hash| attr_hash["attribute"].to_s.eql?(attr_label) }.first end - def attribute_help_text(attr) - - if !attr["namespace"].nil? - help_text = "<strong>#{attr["namespace"]}:#{attr["attribute"]}</strong>" - else - help_text = "<strong>bioportal:#{attr["attribute"]}</strong>" - end - - if (attr["metadataMappings"] != nil) - help_text << " (#{attr["metadataMappings"].join(", ")})" - end - - if (!attr["enforce"].nil? && attr["enforce"].include?("uri")) - help_text << "<br>This metadata should be an <strong>URI</strong>" - end - - if (attr["helpText"] != nil) - help_text << "<br><br>#{attr["helpText"]}" - end - help_text - end - - # Generate the HTML label for every attributes - def generate_attribute_label(attr_label, label_tag_sym: :label) - # Get the attribute hash corresponding to the given attribute - attr = attribute_infos(attr_label) - - return attr_label if attr.nil? - label_html = ''.html_safe - # label_html = if !attr["extracted"].nil? && attr["extracted"] == true - # extractable_metadatum_tooltip({ content: 'Extractable metadatum' }) - # end.to_s.html_safe - - - label = attr["label"].nil? ? attr_label.underscore.humanize : attr["label"] - - if label_tag_sym.eql? :label - label_html << label_tag("submission_#{attr_label}", label , { class: 'form-label' }) - else - label_html << content_tag(label_tag_sym, label, {class: 'form-label'}) - end - - # Generate tooltip - help_text = attribute_help_text(attr) - label_html << help_tooltip(help_text, {:id => "tooltip#{attr["attribute"]}"}).html_safe - label_html - end - - def object_name(acronym= @ontology.acronym, submissionId= @submission.submissionId) - "submission[#{acronym}_#{submissionId}]" + def object_name(acronym = @ontology.acronym, submissionId = @submission.submissionId) + # TO REMOVE or Update + 'submission' end - def attribute_input_name(attr_label) - object_name_val = object_name - name = "#{object_name_val}[#{attr_label}]" - [object_name_val, name] - end - - def generate_integer_input(attr) - number_field object_name, attr["attribute"].to_s.to_sym, value: @submission.send(attr["attribute"]), class: 'metadataInput form-control' - end - - def generate_agent_input(attr, type: 'person') - render NestedAgentSearchInputComponent.new(agents: @submission.send(attr["attribute"]), agent_type: type, name_prefix: object_name + "[#{attr['attribute']}]", parent_id: '') - end - - def generate_date_input(attr) - field_id = [:submission, attr["attribute"].to_s, @ontology.acronym].join('_') - date_value = @submission.send(attr["attribute"]).presence - render Input::DateComponent.new(label: (attr["label"] || attr["attribute"]).to_s ,name: object_name, value: date_value || Date.today, id: field_id) - end - - def generate_textarea_input(attr) - text_area(object_name, attr["attribute"].to_s.to_sym, rows: 3, value: @submission.send(attr["attribute"]), class: 'metadataInput form-control') - end - - def generate_select_input(attr, name, select_values, metadata_values, multiple: false) - id = attr["attribute"].to_s + "_" + @ontology.acronym - render SelectInputComponent.new(id: id, name: name, values: select_values , selected: metadata_values , multiple: multiple) + def agent_attributes + submission_metadata.select { |x| x["enforce"].include?('Agent') }.map { |x| x["attribute"] } end - def generate_list_field_input(attr, name, label, values, &block) - render NestedFormInputsComponent.new do |c| - c.header do - content_tag(:div, label) - end - c.template do - block.call('', "#{name}[NEW_RECORD]", attr["attribute"].to_s + "_" + @ontology.acronym) - end + def render_submission_inputs(frame_id) + output = "" - c.empty_state do - hidden_field_tag "#{name}[#{values.size}]" + if selected_attribute?('format') + output += attribute_form_group_container('format') do + render partial: 'submissions/submission_format_form' end - - values.each_with_index do |metadata_val, i| - c.row do - block.call(metadata_val, "#{name}[#{i}]" ,"submission_#{attr["attribute"].to_s}" + "_" + @ontology.acronym) - end - end - end - end - - def generate_url_input(attr, name, values, label:"") - generate_list_field_input(attr, name, label, values) do |value, row_name, id| - render Input::UrlComponent.new(label: "", name: row_name, value: value, id: id) - end - end - - def generate_list_text_input(attr, name, values, label:"") - generate_list_field_input(attr, name, label, values) do |value, row_name, id| - render Input::TextInputComponent.new(label: "", name: row_name, value: value, id: id) - end - end - - - def generate_boolean_input(attr, name) - value = attribute_values(attr) - value = value.to_s unless value.nil? - - render SwitchInputComponent.new(id: name, name: name, label: "", checked: value.eql?('true') , value: value, boolean_switch: true) - end - - def input_type?(attr, type) - attr["enforce"].include?(type) - end - - def enforce_values?(attr) - !attr["enforcedValues"].nil? - end - - def attribute_values(attr) - begin - @submission.send(attr["attribute"]) - rescue - nil end - end - def agent_attributes - submission_metadata.select{|x| x["enforce"].include?('Agent')}.map{|x| x["attribute"]} - end - # Generate the HTML input for every attributes. - def generate_attribute_input(attr_label, options = {}) - input_html = ''.html_safe - - # Get the attribute hash corresponding to the given attribute - attr = submission_metadata.select { |attr_hash| attr_hash["attribute"].to_s.eql?(attr_label) }.first - - object_name, name = attribute_input_name(attr["attribute"]) - - if input_type?(attr, 'Agent') - type = if input_type?(attr, 'is_person') - 'person' - elsif input_type?(attr, 'is_organization') - 'organization' - else - '' - end - generate_agent_input(attr, type: type) - elsif input_type?(attr, 'integer') - generate_integer_input(attr) - elsif input_type?(attr, 'date_time') - generate_date_input(attr) - elsif input_type?(attr, 'textaclrea') - generate_textarea_input(attr) - elsif enforce_values?(attr) - metadata_values, select_values = selected_values(attr, enforced_values(attr)) - if input_type?(attr, "list") - input_html << generate_select_input(attr, name, select_values, metadata_values, multiple: true) - else - select_values << ["", ""] - select_values << %w[Other other] - - metadata_values = "" if metadata_values.nil? - - input_html << generate_select_input(attr, name, select_values, metadata_values) + if selected_attribute?('location') + output += attribute_form_group_container('location') do + render partial: 'ontologies/submission_location_form' end + end - return input_html - elsif input_type?(attr, 'isOntology') - metadata_values, select_values = selected_values(attr, ontologies_for_select.dup) - input_html << generate_select_input(attr, name, select_values, metadata_values, multiple: attr["enforce"].include?("list")) - return input_html - elsif input_type?(attr, "uri") - uri_values = attribute_values(attr) || [''] - if input_type?(attr, "list") - input_html << generate_url_input(attr, name, uri_values) - else - input_html << text_field(object_name, attr["attribute"].to_s.to_sym, value: Array(uri_values).first, class: "metadataInput form-control") - end - return input_html - elsif input_type?(attr, "boolean") - input_html << generate_boolean_input(attr, name) - else - # If input a simple text - values = attribute_values(attr) || [''] - if input_type?(attr, "list") - input_html << generate_list_text_input(attr, name, values) - else - # if single value text - # TODO: For some reason @submission.send("URI") FAILS... I don't know why... so I need to call it manually - if attr["attribute"].to_s.eql?("URI") - input_html << text_field(object_name, attr["attribute"].to_s.to_sym, value: @submission.URI, class: "metadataInput form-control") - else - input_html << text_field(object_name, attr["attribute"].to_s.to_sym, value: @submission.send(attr["attribute"]), class: "metadataInput form-control") - end + if selected_attribute?('contact') + output += attribute_form_group_container('contact') do + @submission.contact = [] unless @submission.contact && @submission.contact.size > 0 + contact_input(label: 'Contacts', name: '') end - input_html end - end - - def generate_attribute_text(attr_label , label, tooltip: true) - attr = attribute_infos(attr_label) - label_html = "
    #{label}" - # Generate tooltip - if tooltip - help_text = attribute_help_text(attr) - label_html << help_tooltip(help_text, {:id => "tooltip#{attr["attribute"]}"} ).html_safe - end - label_html << '
    ' - label_html.html_safe - end - def ontologies_for_select - @ontologies_for_select ||= LinkedData::Client::Models::Ontology.all.collect do |onto| - ["#{onto.name} (#{onto.acronym})", onto.id] + reject_metadata = %w[abstract uploadFilePath contact pullLocation prefLabelProperty definitionProperty synonymProperty authorProperty obsoleteParent obsoleteProperty hasOntologyLanguage] + label = inline_save? ? '' : nil + submission_metadata.reject { |attr| reject_metadata.include?(attr['attribute']) || !selected_attribute?(attr['attribute']) }.each do |attr| + output += attribute_form_group_container(attr['attribute']) do + raw attribute_input(attr['attribute'], attr_metadata: attr, label: label) + end end - end - def form_group_attribute(attr, options = {}, &block) - attribute_form_group_container(attr, required: !options[:required].nil?) do |c| - c.label do - generate_attribute_label(attr) - end - c.input do - raw generate_attribute_input(attr, options) - end - if block_given? - c.help do - capture(&block) - end + if selected_attribute?('abstract') + output += attribute_form_group_container('abstract') do + raw attribute_input('abstract',long_text: true, label: label) end end - end - private - def enforced_values(attr) - attr["enforcedValues"].collect { |k, v| [v, k] } - end - - def selected_values(attr, enforced_values) - metadata_values = attribute_values(attr) - select_values = enforced_values - - if metadata_values.kind_of?(Array) - metadata_values.map do |metadata| - unless select_values.flatten.include?(metadata) - select_values << metadata - end - end - else - if !select_values.flatten.include?(metadata_values) && !metadata_values.to_s.empty? - select_values << metadata_values - end + render TurboFrameComponent.new(id: frame_id) do + output.html_safe end - [metadata_values, select_values] end - end \ No newline at end of file diff --git a/app/javascript/component_controllers/index.js b/app/javascript/component_controllers/index.js index 0a94e7a7e..5f6443e92 100644 --- a/app/javascript/component_controllers/index.js +++ b/app/javascript/component_controllers/index.js @@ -6,8 +6,6 @@ import FileInputLoaderController import Select_input_component_controller from "../../components/select_input_component/select_input_component_controller"; -import Metadata_selector_component_controller - from "../../components/metadata_selector_component/metadata_selector_component_controller"; import Ontology_subscribe_button_component_controller from "../../components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller"; import Search_input_component_controller @@ -24,7 +22,6 @@ import Progress_pages_component_controller application.register("turbo-modal", TurboModalController) application.register("file-input", FileInputLoaderController) application.register("select-input", Select_input_component_controller) -application.register("metadata-select", Metadata_selector_component_controller) application.register("subscribe-notes", Ontology_subscribe_button_component_controller) application.register("search-input", Search_input_component_controller) application.register("tabs-container", Tabs_container_component_controller) diff --git a/app/javascript/controllers/chosen_controller.js b/app/javascript/controllers/chosen_controller.js index 3293c985f..2115f93e4 100644 --- a/app/javascript/controllers/chosen_controller.js +++ b/app/javascript/controllers/chosen_controller.js @@ -3,6 +3,7 @@ import {useChosen} from "../mixins/useChosen"; // Connects to data-controller="chosen" export default class extends Controller { + // TODO to update to use TomSelect static values = { name: String, enableColors: {type: Boolean, default: false} diff --git a/app/javascript/controllers/tom_select_controller.js b/app/javascript/controllers/tom_select_controller.js deleted file mode 100644 index 4f157b2aa..000000000 --- a/app/javascript/controllers/tom_select_controller.js +++ /dev/null @@ -1,16 +0,0 @@ -import { Controller } from "@hotwired/stimulus" -import TomSelect from "tom-select" -// Connects to data-controller="tom-select" -export default class extends Controller { - - - - connect() { - - new TomSelect(this.element, { - - - //plugins: ['remove_button'] - }); - } -} diff --git a/app/javascript/mixins/useTomSelect.js b/app/javascript/mixins/useTomSelect.js new file mode 100644 index 000000000..7b4923d02 --- /dev/null +++ b/app/javascript/mixins/useTomSelect.js @@ -0,0 +1,9 @@ +import TomSelect from "tom-select" + +export function useTomSelect(element, params, onChange = null) { + const tom = new TomSelect(element,params) + if(onChange){ + tom.on('change',onChange) + } + return tom; +} \ No newline at end of file diff --git a/app/javascript/mixins/useTooltip.js b/app/javascript/mixins/useTooltip.js index 46b44dc3e..d444f3fd1 100644 --- a/app/javascript/mixins/useTooltip.js +++ b/app/javascript/mixins/useTooltip.js @@ -1,3 +1,15 @@ -export default function useTooltip(elem){ - $(elem).tooltipster({theme: 'tooltipster-shadow', contentAsHTML: true}) +import tippy from 'tippy.js'; + +export default function useTooltip(elem) { + const content = elem.title + elem.removeAttribute('title') + tippy(elem, { + theme: 'light-border', + animation: 'fade', + content: content, + allowHTML: true, + placement: 'top', + interactive: true, + maxWidth: '400' + }) } \ No newline at end of file diff --git a/app/views/layouts/ontology_viewer/_header.html.haml b/app/views/layouts/ontology_viewer/_header.html.haml index 30474e193..de16221f9 100644 --- a/app/views/layouts/ontology_viewer/_header.html.haml +++ b/app/views/layouts/ontology_viewer/_header.html.haml @@ -29,7 +29,9 @@ = render DateTimeFieldComponent.new(value: sub.creationDate) .ontology-details-header-right-container.justify-content-end{style: 'min-width: 20%;'} %span.mx-1 - = submission_json_button - %span + = new_submission_button + %span.mx-1 = ontology_edit_button + %span + = submission_json_button = subscribe_button(@ontology.id) diff --git a/app/views/ontologies/_form.html.haml b/app/views/ontologies/_form.html.haml index 012a3056a..f165bdad3 100644 --- a/app/views/ontologies/_form.html.haml +++ b/app/views/ontologies/_form.html.haml @@ -1,104 +1,34 @@ -.upload-ontology-container - %div{style: 'width: 589px'} - - unless @errors.nil? - = render Display::AlertComponent.new(message: error_message, type: 'danger', closable: false) - .upload-ontology-card - .upload-ontology-center - .Upload-ontology-title - %div - = @is_update_ontology ? "Upload new update" : "Upload ontology" - %hr - .upload-ontology-progress - = render Layout::ProgressPagesComponent.new(pages_title: ['Details', 'General metadata', 'Dates contacts']) do |c| - - c.page do - .upload-ontology-input-field-container - = text_input(name: 'ontology[name]', value: @ontology.name) - .upload-ontology-input-field-container - = text_input(name: 'ontology[acronym]', value: @ontology.acronym, disabled: @is_update_ontology) - = hidden_field_tag 'ontology[acronym]', @ontology.acronym if @is_update_ontology - - .upload-ontology-input-field-container#visibilityContainer - = select_input(label: "Visibility", name: "ontology[viewingRestriction]", values: ["public","private"], selected: @ontology.viewingRestriction ) - .upload-ontology-input-field-container#visibility-group{style: 'display: none'} - = select_input(label: "Add or remove accounts that are allowed to view classes in this ontology using the account name", name: "ontology[acl]", values: @user_select_list, selected: @ontology.acl, multiple: true) - - .upload-ontology-input-field-container - = select_input(label: "Administrator", name: "ontology[administeredBy]", values: @user_select_list, selected: @ontology.administeredBy || session[:user].id, multiple: true) - .upload-ontology-input-field-container - = render Input::InputFieldComponent.new(name: '', label:'Categories') do - %div.upload-ontology-chips-container - - @categories.each do |category| - = check_input(name: "ontology[hasDomain][]", id: category[:acronym] , label: category[:acronym], value: category[:id], checked: @ontology.hasDomain&.any?{|x| x.eql?(category[:id])}) - .upload-ontology-field-container - = render Input::InputFieldComponent.new(name: '', label:'Groups') do - %div.upload-ontology-chips-container - - @groups.each do |group| - = check_input(name: "ontology[group][]", id: group[:acronym] , label: group[:acronym], value: group[:id], checked: @ontology.group&.any?{|x| x.eql?(group[:id])}) - - .upload-ontology-input-field-container.mt-2 - %span.d-flex - = switch_input(id: 'ontology_isView', name: 'ontology[isView]', label: 'Is a view of another ontology?', checked: @ontology.view?) - %div#ontology_viewOf{style: "display: #{ !@ontology.view? ? 'none' : 'block'}"} - = render partial: "shared/ontology_picker_single", locals: {placeholder: "", field_name: "viewOf", selected: @ontology.viewOf} - - - c.page do - .upload-ontology-desc - %div - To understand the ontologies metadata: - %a{:href => "#seethewiki"} - see the Wiki - %svg{:fill => "none", :height => "8", :viewbox => "0 0 8 8", :width => "8", :xmlns => "http://www.w3.org/2000/svg"} - %path{:d => "M5.77776 8H1.33333C0.977156 8 0.642334 7.8613 0.390512 7.60946C0.138689 7.35762 0 7.02278 0 6.66666V2.22222C0 1.86607 0.138704 1.53124 0.390527 1.27942C0.64235 1.0276 0.977172 0.888894 1.33334 0.888894H3.11111C3.35659 0.888894 3.55556 1.08787 3.55556 1.33334C3.55556 1.57881 3.35659 1.77779 3.11111 1.77779H1.33333C1.2146 1.77779 1.10301 1.82402 1.01907 1.90795C0.935144 1.99188 0.888894 2.1035 0.888894 2.22222V6.66666C0.888894 6.78538 0.935129 6.89698 1.01907 6.98094C1.10301 7.06486 1.2146 7.11111 1.33333 7.11111H5.77775C5.89647 7.11111 6.00807 7.06487 6.09202 6.98091C6.17595 6.89698 6.22218 6.78537 6.22218 6.66664V4.88889C6.22218 4.64341 6.42117 4.44445 6.66664 4.44445C6.91212 4.44445 7.11111 4.64343 7.11111 4.88889V6.66666C7.11111 7.02281 6.9724 7.35762 6.72056 7.60947C6.46872 7.8613 6.13389 8 5.77776 8ZM3.11111 5.33332C2.99736 5.33332 2.88362 5.28994 2.79685 5.20315C2.62329 5.02959 2.62329 4.74816 2.79685 4.5746L6.48254 0.888894H4.88889C4.64341 0.888894 4.44445 0.68992 4.44445 0.444447C4.44445 0.198974 4.64341 0 4.88889 0H7.55555C7.61702 0 7.67556 0.0124825 7.72882 0.0350409C7.77851 0.0560624 7.82518 0.0865233 7.86602 0.126439L7.86605 0.12647C7.86634 0.126765 7.86664 0.127045 7.86692 0.12734C7.86699 0.127417 7.8671 0.127511 7.86718 0.127588C7.8674 0.127805 7.86765 0.128038 7.86786 0.128271C7.86802 0.128427 7.86816 0.128566 7.86831 0.128721C7.86848 0.128892 7.86867 0.129079 7.86881 0.129218C7.86912 0.129529 7.86946 0.129855 7.86977 0.130181C7.87008 0.130491 7.87042 0.130833 7.87074 0.131143C7.87091 0.131299 7.87109 0.131501 7.87122 0.13164C7.87139 0.131796 7.87151 0.131935 7.87167 0.132091C7.87191 0.132323 7.87213 0.132541 7.87235 0.132789C7.87243 0.132851 7.87254 0.13296 7.8726 0.133038C7.87289 0.133333 7.87319 0.133628 7.87347 0.133923L7.8735 0.133954C7.9134 0.174817 7.94388 0.221486 7.96488 0.271167C7.98744 0.32442 7.99994 0.382951 7.99994 0.444431V3.1111C7.99994 3.35657 7.80095 3.55555 7.55548 3.55555C7.31 3.55555 7.11104 3.35657 7.11104 3.1111V1.51744L3.4253 5.20317C3.33859 5.28995 3.22485 5.33332 3.11111 5.33332Z", :fill => "#31B404"} - .upload-ontology-input-field-container - = url_input(label: 'URL', name: "submission[URI]", value: @submission.URI) - .upload-ontology-input-field-container - = text_area_input(name: "submission[description]", value: @submission.description) - - - if @is_update_ontology - .upload-ontology-input-field-container - = generate_list_text_input("notes", "submission[notes]", Array(@submission.notes), label: "Change notes") - .upload-ontology-field-container - = select_input(label: "Format", name: "submission[hasOntologyLanguage]", values: ["OBO", "OWL", "SKOS", "UMLS"], selected: @submission.hasOntologyLanguage) - .upload-ontology-desc.hide - %div - SKOS vocabularies submitted to BioPortal must contain a minimum of one concept scheme and top concept assertion. Please - refer to the NCBO wiki for a more - %a{:href => "#seethewiki"} - detailed explanation - %svg{:fill => "none", :height => "8", :viewbox => "0 0 8 8", :width => "8", :xmlns => "http://www.w3.org/2000/svg"} - %path{:d => "M5.77776 8H1.33333C0.977156 8 0.642334 7.8613 0.390512 7.60946C0.138689 7.35762 0 7.02278 0 6.66666V2.22222C0 1.86607 0.138704 1.53124 0.390527 1.27942C0.64235 1.0276 0.977172 0.888894 1.33334 0.888894H3.11111C3.35659 0.888894 3.55556 1.08787 3.55556 1.33334C3.55556 1.57881 3.35659 1.77779 3.11111 1.77779H1.33333C1.2146 1.77779 1.10301 1.82402 1.01907 1.90795C0.935144 1.99188 0.888894 2.1035 0.888894 2.22222V6.66666C0.888894 6.78538 0.935129 6.89698 1.01907 6.98094C1.10301 7.06486 1.2146 7.11111 1.33333 7.11111H5.77775C5.89647 7.11111 6.00807 7.06487 6.09202 6.98091C6.17595 6.89698 6.22218 6.78537 6.22218 6.66664V4.88889C6.22218 4.64341 6.42117 4.44445 6.66664 4.44445C6.91212 4.44445 7.11111 4.64343 7.11111 4.88889V6.66666C7.11111 7.02281 6.9724 7.35762 6.72056 7.60947C6.46872 7.8613 6.13389 8 5.77776 8ZM3.11111 5.33332C2.99736 5.33332 2.88362 5.28994 2.79685 5.20315C2.62329 5.02959 2.62329 4.74816 2.79685 4.5746L6.48254 0.888894H4.88889C4.64341 0.888894 4.44445 0.68992 4.44445 0.444447C4.44445 0.198974 4.64341 0 4.88889 0H7.55555C7.61702 0 7.67556 0.0124825 7.72882 0.0350409C7.77851 0.0560624 7.82518 0.0865233 7.86602 0.126439L7.86605 0.12647C7.86634 0.126765 7.86664 0.127045 7.86692 0.12734C7.86699 0.127417 7.8671 0.127511 7.86718 0.127588C7.8674 0.127805 7.86765 0.128038 7.86786 0.128271C7.86802 0.128427 7.86816 0.128566 7.86831 0.128721C7.86848 0.128892 7.86867 0.129079 7.86881 0.129218C7.86912 0.129529 7.86946 0.129855 7.86977 0.130181C7.87008 0.130491 7.87042 0.130833 7.87074 0.131143C7.87091 0.131299 7.87109 0.131501 7.87122 0.13164C7.87139 0.131796 7.87151 0.131935 7.87167 0.132091C7.87191 0.132323 7.87213 0.132541 7.87235 0.132789C7.87243 0.132851 7.87254 0.13296 7.8726 0.133038C7.87289 0.133333 7.87319 0.133628 7.87347 0.133923L7.8735 0.133954C7.9134 0.174817 7.94388 0.221486 7.96488 0.271167C7.98744 0.32442 7.99994 0.382951 7.99994 0.444431V3.1111C7.99994 3.35657 7.80095 3.55555 7.55548 3.55555C7.31 3.55555 7.11104 3.35657 7.11104 3.1111V1.51744L3.4253 5.20317C3.33859 5.28995 3.22485 5.33332 3.11111 5.33332Z", :fill => "#31B404"} - with examples. - .upload-ontology-field-container.mt-3 - = select_input(name: "submission[status]", values: ["alpha", "beta", "production", "retired"], selected: @submission.status) - .upload-ontology-field-container - .mt-3.mb-2 Location - = render partial: 'ontologies/submission_location_form' - - - c.page do - .upload-ontology-input-field-container - - if @is_update_ontology - = date_input(label: 'Modification date (dd/mm/yy)', name: 'submission[modificationDate]', value: @submission.modificationDate) - - else - = date_input(label: 'Date of original creation (dd/mm/yy)', name: 'submission[released]', value: @submission.released) - .upload-ontology-contact - = render Input::InputFieldComponent.new(name:'', error_message: attribute_error(:contact)) do - = render NestedFormInputsComponent.new(object_name: "Contact") do |c| - - c.header do - - content_tag(:div, 'Contact name', class: 'w-50') + content_tag(:div, 'Contact email', class: 'w-50') - - c.template do - = content_tag(:div, class: "d-flex my-1") do - .w-50.mr-2 - = render Input::TextInputComponent.new(label: "", name: "submission[contact][NEW_RECORD][name]") - .w-50 - = render Input::TextInputComponent.new(label: "", name: "submission[contact][NEW_RECORD][email]") - - Array(@submission.contact).each_with_index do |contact, i| - - c.row do - = content_tag(:div, class: "d-flex my-1") do - .w-50.mr-2 - = render Input::TextInputComponent.new(label: "", name: "submission[contact][#{i}][name]", value: contact["name"]) - .w-50 - = render Input::TextInputComponent.new(label: "", name: "submission[contact][#{i}][email]", value: contact["email"]) - +.upload-ontology-input-field-container + = text_input(name: 'ontology[name]', value: @ontology.name) +.upload-ontology-input-field-container + = text_input(name: 'ontology[acronym]', value: @ontology.acronym, disabled: @is_update_ontology) + = hidden_field_tag 'ontology[acronym]', @ontology.acronym if @is_update_ontology + +.upload-ontology-input-field-container#visibilityContainer + = select_input(label: "Visibility", name: "ontology[viewingRestriction]", values: %w[public private], selected: @ontology.viewingRestriction ) +.upload-ontology-input-field-container#visibility-group{style: 'display: none'} + = select_input(label: "Add or remove accounts that are allowed to view classes in this ontology using the account name", name: "ontology[acl]", values: @user_select_list, selected: @ontology.acl, multiple: true) + +.upload-ontology-input-field-container + = select_input(label: "Administrator", name: "ontology[administeredBy]", values: @user_select_list, selected: @ontology.administeredBy || session[:user].id, multiple: true) +.upload-ontology-input-field-container + = render Input::InputFieldComponent.new(name: '', label:'Categories') do + %div.upload-ontology-chips-container + = hidden_field_tag 'ontology[hasDomain][]' + - @categories.each do |category| + = check_input(name: "ontology[hasDomain][]", id: category[:acronym] , label: category[:acronym], value: category[:id], checked: @ontology.hasDomain&.any?{|x| x.eql?(category[:id])}) +.upload-ontology-field-container + = render Input::InputFieldComponent.new(name: '', label:'Groups') do + %div.upload-ontology-chips-container + = hidden_field_tag "ontology[group][]" + - @groups.each do |group| + = check_input(name: "ontology[group][]", id: group[:acronym] , label: group[:acronym], value: group[:id], checked: @ontology.group&.any?{|x| x.eql?(group[:id])}) + +.upload-ontology-input-field-container.mt-2 + %span.d-flex + = switch_input(id: 'ontology_isView', name: 'ontology[isView]', label: 'Is a view of another ontology?', checked: @ontology.view?) + %div#ontology_viewOf{style: "display: #{ !@ontology.view? ? 'none' : 'block'}"} + = render partial: "shared/ontology_picker_single", locals: {placeholder: "", field_name: "viewOf", selected: @ontology.viewOf} :javascript function showPrivateAclSelect() { diff --git a/app/views/ontologies/_submission_location_form.html.haml b/app/views/ontologies/_submission_location_form.html.haml index 4fbdc2b24..40dec5c5c 100644 --- a/app/views/ontologies/_submission_location_form.html.haml +++ b/app/views/ontologies/_submission_location_form.html.haml @@ -1,49 +1,52 @@ -.location-choice - %input{type: "radio", name: "submission[isRemote]", value: "3", id: "metadata_only", onchange: "displayMetadataOnlyForm()"} - %label.title{for: "metadata_only"} - Metadata only (No file) -.upload-ontology-desc.mb-2 - Allow users to view and search your ontology metadata, but not its classes and properties. -#metadata-only-form.d-none -.location-choice - %input{type: "radio", name: "submission[isRemote]", value: "1", id: "load_from_url", onchange: "displayUrlForm()"} - %label.title{for: "load_from_url"} - Load from URL -.upload-ontology-desc.mb-1 - New versions loaded on a nightly basis. -#url-form.d-none - = render Input::UrlComponent.new(label: "", name: "submission[pullLocation]") -.location-choice.mb-3.mt-3 - %input{type: "radio", name: "submission[isRemote]", value: "0", id: "upload_local_file", checked: true, onchange: "displayLocalFileForm()"} - %label.title{for: "upload_local_file"} - Upload local file -#local-file-form - = render Input::FileInputComponent.new(name: "submission[filePath]") += render Input::InputFieldComponent.new(label: 'Location', name: '') do + .location-choice + %input{type: "radio", name: "submission[isRemote]", value: "3", checked: summary_only?, id: "metadata_only", onchange: "displayMetadataOnlyForm()"} + %label.title{for: "metadata_only"} + Metadata only (No file) + .upload-ontology-desc.mb-2 + Allow users to view and search your ontology metadata, but not its classes and properties. + #metadata-only-form + .location-choice + %input{type: "radio", name: "submission[isRemote]", value: "1", id: "load_from_url", checked: ontology_pull_location?, onchange: "displayUrlForm()"} + %label.title{for: "load_from_url"} + Load from URL + .upload-ontology-desc.mb-1 + New versions loaded on a nightly basis. + #url-form{style: ontology_pull_location? ? "" : "display:none;"} + = render Input::UrlComponent.new(label: "", name: "submission[pullLocation]", value: @submission.pullLocation) + .location-choice.mb-3.mt-3 + - checked = !summary_only? && !ontology_pull_location? + %input{type: "radio", name: "submission[isRemote]", value: "0", id: "upload_local_file", checked: checked, onchange: "displayLocalFileForm()"} + %label.title{for: "upload_local_file"} + Upload local file + #local-file-form{style: checked ? "" : "display:none;" } + = render Input::FileInputComponent.new(name: "submission[filePath]") -:javascript - const MetadataOnlyForm = document.getElementById("metadata-only-form"); - const UrlForm = document.getElementById("url-form"); - const LocalFileForm = document.getElementById("local-file-form"); - const displayForm = (formElement) => { - [MetadataOnlyForm, UrlForm, LocalFileForm].forEach((form) => { - if (form === formElement) { - form.classList.remove("d-none"); - } else { - form.classList.add("d-none"); - } - }); - }; + :javascript + var MetadataOnlyForm = document.getElementById("metadata-only-form"); + var UrlForm = document.getElementById("url-form"); + var LocalFileForm = document.getElementById("local-file-form"); - const displayMetadataOnlyForm = () => { - displayForm(MetadataOnlyForm); - }; + var displayForm = (formElement) => { + [MetadataOnlyForm, UrlForm, LocalFileForm].forEach((form) => { + if (form === formElement) { + form.style.display = "block"; + } else { + form.style.display = "none"; + } + }); + }; - const displayUrlForm = () => { - displayForm(UrlForm); - }; + var displayMetadataOnlyForm = () => { + displayForm(MetadataOnlyForm); + }; - const displayLocalFileForm = () => { - displayForm(LocalFileForm); - }; + var displayUrlForm = () => { + displayForm(UrlForm); + }; + + var displayLocalFileForm = () => { + displayForm(LocalFileForm); + }; diff --git a/app/views/ontologies/edit.html.haml b/app/views/ontologies/edit.html.haml deleted file mode 100644 index ef1fd0f78..000000000 --- a/app/views/ontologies/edit.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -- @title = "Edit Ontology Information" - -%div{:style => "margin:10px;"} - = form_for :ontology, url: ontology_path(@ontology.acronym), html: {method: :put, id: "ontologyForm", multipart: true} do |f| - = render partial: "form", locals: {f: f, button_text: "Save ontology", title_text: "Edit Ontology Information"} diff --git a/app/views/ontologies/new.html.haml b/app/views/ontologies/new.html.haml index 29a66b45e..f89fa5b6f 100644 --- a/app/views/ontologies/new.html.haml +++ b/app/views/ontologies/new.html.haml @@ -1,5 +1,51 @@ - @title = "Submit New Ontology" %div{:style => "margin:10px;"} - = form_for :ontology, url: {action: "create"}, html: {id: "ontologyForm", multipart: true} do |f| - = render partial: "ontologies/form", locals: {f: f} + = form_for :ontology, url: {action: "create"}, html: {id: "ontologyForm", multipart: true} do + .upload-ontology-container + %div{style: 'width: 589px'} + = error_message_alert + .upload-ontology-card + .upload-ontology-center + .Upload-ontology-title + %div + = @is_update_ontology ? "Upload new update" : "Upload ontology" + %hr + .upload-ontology-progress + = render Layout::ProgressPagesComponent.new(pages_title: ['Details', 'General metadata', 'Dates contacts']) do |c| + - c.page do + = render partial: 'ontologies/form' + - c.page do + .upload-ontology-desc + = metadata_help_link + .upload-ontology-input-field-container + = attribute_input('URI', label: 'URI') + .upload-ontology-input-field-container + = attribute_input('description', long_text: true) + - if @is_update_ontology + .upload-ontology-input-field-container + = attribute_input("notes", label: 'Change notes') + .upload-ontology-field-container + = select_input(label: "Format", name: "submission[hasOntologyLanguage]", values: ["OBO", "OWL", "SKOS", "UMLS"], selected: @submission.hasOntologyLanguage) + .upload-ontology-desc.hide + %div + SKOS vocabularies submitted to BioPortal must contain a minimum of one concept scheme and top concept assertion. Please + refer to the NCBO wiki for a more + %a{:href => "#seethewiki"} + detailed explanation + %svg{:fill => "none", :height => "8", :viewbox => "0 0 8 8", :width => "8", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M5.77776 8H1.33333C0.977156 8 0.642334 7.8613 0.390512 7.60946C0.138689 7.35762 0 7.02278 0 6.66666V2.22222C0 1.86607 0.138704 1.53124 0.390527 1.27942C0.64235 1.0276 0.977172 0.888894 1.33334 0.888894H3.11111C3.35659 0.888894 3.55556 1.08787 3.55556 1.33334C3.55556 1.57881 3.35659 1.77779 3.11111 1.77779H1.33333C1.2146 1.77779 1.10301 1.82402 1.01907 1.90795C0.935144 1.99188 0.888894 2.1035 0.888894 2.22222V6.66666C0.888894 6.78538 0.935129 6.89698 1.01907 6.98094C1.10301 7.06486 1.2146 7.11111 1.33333 7.11111H5.77775C5.89647 7.11111 6.00807 7.06487 6.09202 6.98091C6.17595 6.89698 6.22218 6.78537 6.22218 6.66664V4.88889C6.22218 4.64341 6.42117 4.44445 6.66664 4.44445C6.91212 4.44445 7.11111 4.64343 7.11111 4.88889V6.66666C7.11111 7.02281 6.9724 7.35762 6.72056 7.60947C6.46872 7.8613 6.13389 8 5.77776 8ZM3.11111 5.33332C2.99736 5.33332 2.88362 5.28994 2.79685 5.20315C2.62329 5.02959 2.62329 4.74816 2.79685 4.5746L6.48254 0.888894H4.88889C4.64341 0.888894 4.44445 0.68992 4.44445 0.444447C4.44445 0.198974 4.64341 0 4.88889 0H7.55555C7.61702 0 7.67556 0.0124825 7.72882 0.0350409C7.77851 0.0560624 7.82518 0.0865233 7.86602 0.126439L7.86605 0.12647C7.86634 0.126765 7.86664 0.127045 7.86692 0.12734C7.86699 0.127417 7.8671 0.127511 7.86718 0.127588C7.8674 0.127805 7.86765 0.128038 7.86786 0.128271C7.86802 0.128427 7.86816 0.128566 7.86831 0.128721C7.86848 0.128892 7.86867 0.129079 7.86881 0.129218C7.86912 0.129529 7.86946 0.129855 7.86977 0.130181C7.87008 0.130491 7.87042 0.130833 7.87074 0.131143C7.87091 0.131299 7.87109 0.131501 7.87122 0.13164C7.87139 0.131796 7.87151 0.131935 7.87167 0.132091C7.87191 0.132323 7.87213 0.132541 7.87235 0.132789C7.87243 0.132851 7.87254 0.13296 7.8726 0.133038C7.87289 0.133333 7.87319 0.133628 7.87347 0.133923L7.8735 0.133954C7.9134 0.174817 7.94388 0.221486 7.96488 0.271167C7.98744 0.32442 7.99994 0.382951 7.99994 0.444431V3.1111C7.99994 3.35657 7.80095 3.55555 7.55548 3.55555C7.31 3.55555 7.11104 3.35657 7.11104 3.1111V1.51744L3.4253 5.20317C3.33859 5.28995 3.22485 5.33332 3.11111 5.33332Z", :fill => "#31B404"} + with examples. + .upload-ontology-field-container.mt-3 + = attribute_input("status") + .upload-ontology-field-container + = render partial: 'ontologies/submission_location_form' + + - c.page do + .upload-ontology-input-field-container + - if @is_update_ontology + = attribute_input('modificationDate', label: 'Modification date (dd/mm/yy)') + - else + = attribute_input('released', label: 'Date of original creation (dd/mm/yy)') + .upload-ontology-contact + = contact_input(show_help: false) diff --git a/app/views/ontologies/sections/_licenses.html.haml b/app/views/ontologies/sections/_licenses.html.haml index e966e7608..62a11383c 100644 --- a/app/views/ontologies/sections/_licenses.html.haml +++ b/app/views/ontologies/sections/_licenses.html.haml @@ -1,3 +1,3 @@ = render_in_modal do = render Layout::ListComponent.new do |l| - = properties_list_component(l, @licenses.map { |x| [x.to_s, @submission_latest.send(x.to_s)] }.to_h) + = properties_list_component(l, @licenses.map { |x| [x, @submission_latest.send(x.to_s)] }.to_h) diff --git a/app/views/ontologies/sections/metadata/_ontology_relations_network.html.haml b/app/views/ontologies/sections/metadata/_ontology_relations_network.html.haml index 3064d1a8d..3c2bf4fec 100644 --- a/app/views/ontologies/sections/metadata/_ontology_relations_network.html.haml +++ b/app/views/ontologies/sections/metadata/_ontology_relations_network.html.haml @@ -5,7 +5,7 @@ %span= t("landscape.filter_network") %i.fas.fa-chevron-down %div#ontologyRelations.collapse.flex-row.flex-wrap.px-2.my-1.fade{'data-action': "change->ontology-relations-network#build"} - - values = @relations_array.map{|relation| ["#{attr_label(relation.split(':').last)}(#{relation})", relation]} + - values = @relations_array.map{|relation| ["#{attr_label(relation.split(':').last, show_tooltip: false)}(#{relation})", relation]} = render SelectInputComponent.new(id:'relation-network', name: 'selectedRelations[]', values: values, selected:@relations_array , multiple: true) %div{:style => "width: 100%;"} diff --git a/app/views/ontologies/sections/metadata/_ontology_submissions_section.html.haml b/app/views/ontologies/sections/metadata/_ontology_submissions_section.html.haml index 1f90304f5..eede1de47 100644 --- a/app/views/ontologies/sections/metadata/_ontology_submissions_section.html.haml +++ b/app/views/ontologies/sections/metadata/_ontology_submissions_section.html.haml @@ -1,10 +1,2 @@ = render SummarySectionComponent.new(title: 'Submissions') do |s| - - if @ontology.admin?(session[:user]) - - s.action_link do - = link_to(new_ontology_submission_path(@ontology.acronym), "aria-label": "Add submission", title: "Add submission") do - %i.fas.fa-plus-circle - - unless @submission_latest.nil? || (@submission_latest.respond_to?(:status) && @submission_latest.status == 404) - - s.action_link do - = link_to(edit_ontology_submission_path(@ontology.acronym, @submission_latest.submissionId), "aria-label": "Edit latest submission", title: "Edit latest submission") do - %i.fas.fa-user-edit = render TurboFrameComponent.new(id: 'ontology_submissions', src: ontology_submissions_path(@ontology.acronym)) \ No newline at end of file diff --git a/app/views/ontologies_metadata_curator/_attribute_inline.html.haml b/app/views/ontologies_metadata_curator/_attribute_inline.html.haml index b430b3121..1872035cc 100644 --- a/app/views/ontologies_metadata_curator/_attribute_inline.html.haml +++ b/app/views/ontologies_metadata_curator/_attribute_inline.html.haml @@ -1,33 +1,44 @@ -%div - - if @errors - %div - = render Display::AlertComponent.new(type: 'danger') do - = @errors.map{|e| e[:error]}.join(',') -%div - - if attribute == "contact" - = raw submission.contact.map {|c| [c["name"], c["email"]].join(", ") if c.member?(:name) && c.member?(:email)}.join("
    ") - - elsif attribute == "naturalLanguage" - - lang_codes = [] - - submission.send(attribute).each do |lang| - - if (lang.to_s.eql?("en") || lang.to_s.eql?("eng") || lang.to_s.eql?("http://lexvo.org/id/iso639-3/eng")) - - lang_codes << "gb" - - elsif lang.to_s.start_with?("http://lexvo.org") - - lang_codes << $LEXVO_TO_FLAG[lang] - - else - - lang_codes << lang - %ul{:class => "f32"} - - lang_codes.each do |lang_code| - %li{:class => "flag " + lang_code, :style => "margin-right: 0.5em;"} - - elsif attribute == "ontology" - = acronym - - else - - if submission.instance_values[attribute.to_s].is_a?(String) && %w[http https].include?(submission.instance_values[attribute.to_s][0..3]) - %a{:href=> ""+ submission.instance_values[attribute.to_s] +""}= submission.instance_values[attribute.to_s] - - else - - Array(submission.instance_values[attribute.to_s]).each do |value| - - if value.is_a?(LinkedData::Client::Models::Agent) - %div - = display_agent(value, link: false) - - else - %p - = value \ No newline at end of file += render TurboFrameComponent.new(id: id) do + %div.d-flex.justify-content-between.align-items-center + %div.d-flex.justify-content-between + %div + - acronym = ontology.acronym + - equivalents = equivalent_properties(attribute) + - equivalents.each do |attr| + %div.d-flex + - if equivalents.size > 1 + %span= "#{attr}: " + %div + %div + = error_message_alert + %div + - if attribute == "contact" + = raw submission.contact.map {|c| [c["name"], c["email"]].join(", ") if c.member?(:name) && c.member?(:email)}.join("
    ") + - elsif attribute == "naturalLanguage" + - lang_codes = [] + - submission.send(attribute).each do |lang| + - if (lang.to_s.eql?("en") || lang.to_s.eql?("eng") || lang.to_s.eql?("http://lexvo.org/id/iso639-3/eng")) + - lang_codes << "gb" + - elsif lang.to_s.start_with?("http://lexvo.org") + - lang_codes << $LEXVO_TO_FLAG[lang] + - else + - lang_codes << lang + %ul{:class => "f32"} + - lang_codes.each do |lang_code| + %li{:class => "flag " + lang_code, :style => "margin-right: 0.5em;"} + - elsif attribute == "ontology" + = acronym + - else + - if submission.instance_values[attribute.to_s].is_a?(String) && %w[http https].include?(submission.instance_values[attribute.to_s][0..3]) + %a{:href=> ""+ submission.instance_values[attribute.to_s] +""}= submission.instance_values[attribute.to_s] + - else + - Array(submission.instance_values[attribute.to_s]).each do |value| + - if value.is_a?(LinkedData::Client::Models::Agent) + %div + = display_agent(value, link: false) + - else + %p + = value + %div + = edit_submission_property_link(ontology.acronym, submission.submissionId, attribute) do + %i.far.fa-edit \ No newline at end of file diff --git a/app/views/ontologies_metadata_curator/_attribute_inline_editable.html.haml b/app/views/ontologies_metadata_curator/_attribute_inline_editable.html.haml index 7358a35e0..55d4b5ec4 100644 --- a/app/views/ontologies_metadata_curator/_attribute_inline_editable.html.haml +++ b/app/views/ontologies_metadata_curator/_attribute_inline_editable.html.haml @@ -6,19 +6,5 @@ = hidden_field object_name(acronym, submission_id), :ontology, value: acronym = hidden_field object_name(acronym, submission_id), :id, value: submission_id = hidden_field_tag :attribute, attribute - = render TurboFrameComponent.new(id: id) do - %div.d-flex.justify-content-between.align-items-center - %div.d-flex.justify-content-between - %div - - equivalents = equivalent_properties(attribute) - - equivalents.each do |attr| - %div.d-flex - - if equivalents.size > 1 - %span= "#{attr}: " - %div - = render_submission_attribute_inline(attr.to_s, submission, acronym) - - - %div - = render EditSubmissionAttributeButtonComponent.new(acronym: ontology.acronym, submission_id: submission_id, attribute: attribute, inline: true) do - %i.far.fa-edit \ No newline at end of file + = render partial: "ontologies_metadata_curator/attribute_inline", locals: { id: id, attribute: attribute, + submission: submission, ontology: ontology } diff --git a/app/views/ontologies_metadata_curator/_metadata_tab.html.haml b/app/views/ontologies_metadata_curator/_metadata_tab.html.haml index d0c2abf76..30c4a514c 100644 --- a/app/views/ontologies_metadata_curator/_metadata_tab.html.haml +++ b/app/views/ontologies_metadata_curator/_metadata_tab.html.haml @@ -3,11 +3,11 @@ = form_tag("/ontologies_metadata_curator/result", method: "post", data: { turbo: true, turbo_frame: 'selection_metadata_form'}) do %div %div.mx-1.pt-3 - = render FormGroupComponent.new(label:' Ontologies', inline: false) do - = render :partial => "shared/ontology_picker", locals: {sel_text: '', selected_ontologies: @ontologies_ids} + - init_ontology_picker(nil, @ontologies_ids) + = select_input(label: 'Ontologies', name: "ontology[ontologyId]", values: @onts_for_select, selected: @ontologies_ids, multiple: true, data: {placeholder: t("select_ontologies")}) %div.d-flex.align-items-center.mb-5 %div.mx-1{style: 'width: 65%'} - = render MetadataSelectorComponent.new(label: 'Metadata Properties', values: submission_editable_properties , selected: @metadata_sel) + = submission_metadata_selector %div.mx-1.mt-3{style: 'width: 15%'} = render SwitchInputComponent.new(id:"show_submissions", name: "show_submissions", label: "Include all submissions") %div.mt-3.flex-shrink-0 diff --git a/app/views/ontologies_metadata_curator/_metadata_table.html.haml b/app/views/ontologies_metadata_curator/_metadata_table.html.haml index 73850816d..41b453ffc 100644 --- a/app/views/ontologies_metadata_curator/_metadata_table.html.haml +++ b/app/views/ontologies_metadata_curator/_metadata_table.html.haml @@ -18,7 +18,7 @@ %th %div = render SwitchInputComponent.new(id: meta, name: 'selected_metadata[]', value: meta) do - %h6{style:'margin-top: 0.2rem'}=generate_attribute_label(meta, label_tag_sym: :span) + %h6{style:'margin-top: 0.2rem'}=attr_label(meta) %tbody - @submissions.each do |submission| diff --git a/app/views/shared/_ontology_picker_single.html.erb b/app/views/shared/_ontology_picker_single.html.erb index 1883ce904..5bcba1323 100644 --- a/app/views/shared/_ontology_picker_single.html.erb +++ b/app/views/shared/_ontology_picker_single.html.erb @@ -25,6 +25,6 @@
    - <%= render Input::SelectComponent.new(label: placeholder, name: "#{object_name}[#{field_name}]", value: @onts_for_select, selected: selected) %> + <%= select_input(label: placeholder, name: "#{object_name}[#{field_name}]", values: @onts_for_select, selected: selected) %>
    diff --git a/app/views/submissions/_form.html.haml b/app/views/submissions/_form.html.haml deleted file mode 100644 index 152656cd2..000000000 --- a/app/views/submissions/_form.html.haml +++ /dev/null @@ -1,47 +0,0 @@ -:javascript - $(document).ready(function() { - jQuery("#ontology_submission_form").validate(); - }); - - - function onMetadataChange(){ - let frame = document.getElementById('metadata_by_ontology') - let properties = document.getElementById('search_metadata') - let required = document.getElementById('filter-required-only') - let selectedProperties = "all" - if(properties){ - selectedProperties = Array.from(properties.selectedOptions).map(({ value }) => value).join(',') - } - frame.src = "?properties=" + selectedProperties + "&required=" + required.checked + "&show_sections=true" - } - -%div#editMetadataDiv - %div{:style => "width: 50%;margin: 3em auto;"} - %p{:style => "text-align: center;"} - To understand the ontologies metadata: - %a{:href => "https://github.com/agroportal/documentation/wiki/Ontology-metadata", :target => "_blank"} see the Wiki - %div{:style => "text-align: center;"} - %span.asterik * fields are required - %br - = extractable_metadatum_tooltip({ text: 'Metadata that can be extracted from the ontology' , content: "Extractable metadatum"}) - - %div.d-flex.align-items-center.justify-content-between{onchange: "onMetadataChange()"} - - unless @filters_disabled - %div.w-75.mt-3 - - if @submission.id - = render MetadataSelectorComponent.new(label: 'Filter properties to show', values: submission_editable_properties , selected: @selected_attributes, inline: true) - %div - = render SwitchInputComponent.new(id:"filter-required-only", name: "required-only", label: "Required only", checked: @required_only) - - -= render partial: 'form_content', locals: {id: 'metadata_by_ontology', acronym: @ontology.acronym, submissionId: @submission.submissionId} - -%div.form-group.row - %div.col-12.text-center - %label.col-form-label.font-italic.asterik * Fields marked with an asterisk are required. - -%div.form-group.row - %div.col-6 - = submit_tag button_text, class: "btn btn-primary" - %div.col-6.text-right - = link_to "Cancel", :back, class: "btn btn-warning" diff --git a/app/views/submissions/_form_content.html.haml b/app/views/submissions/_form_content.html.haml index 7ff7806a9..486a6adf0 100644 --- a/app/views/submissions/_form_content.html.haml +++ b/app/views/submissions/_form_content.html.haml @@ -1,163 +1,20 @@ = render TurboFrameComponent.new(id:id) do - unless @errors.nil? - %div - %div.enable-lists{style: "color:red;"} - %strong Errors On Form - %ul - - Array(@errors).each do |error| - - error = error[:error] if error.is_a?(Hash) && error[:error] - - if error.is_a?(String) - = error - - else - - error.each do |key, value| - %li - - value = value.values if value.is_a?(Hash) - #{key}: #{Array(value).join(', ')} + = error_message_alert + = form_for :submission, url: ontology_submission_path(params["ontology_id"], params["id"]), html: { id: "ontology_submission_form", method: :put, multipart: true, 'data-turbo': true} do + - if selected_attribute?('name') + = render 'ontologies/form' + + = render_submission_inputs('') + %hr#edit-ontology-actions-devider + .edit-ontology-actions + .reset-all-button#reset-all-button + = render Buttons::RegularButtonComponent.new(id:'reset-all-fields', value: "Reset all fields", variant: "secondary", size: "slim") do |btn| + - btn.icon_left do + - inline_svg_tag "reload.svg" + .save-button + = render Buttons::RegularButtonComponent.new(id:'save-button', value: "Save", variant: "primary", size: "slim", type: "submit") do |btn| + - btn.icon_left do + - inline_svg_tag "check.svg" - = hidden_field object_name, :ontology, value: acronym - = hidden_field object_name, :id, value: submissionId - %div#general-card.mt-4 - = metadata_section('general', 'General', collapsed: false) do |c| - = attribute_container('format', required: true) do - = turbo_frame_tag "#{object_name(acronym, submissionId)}Format_from_group_input" do - = render partial: 'submissions/submission_format_form' - = attribute_text_field_container('version') - = attribute_form_group_container('status', required: true) do |c| - - selected_status = c.value ? c.value : "alpha" - - status_options = %w[alpha beta production retired] - = select c.name, c.method_name, status_options, {selected: selected_status, required: true}, class: "form-control" - - = attribute_form_group_container('location', required: true) do - = render partial: 'submissions/submission_location_form' - - %div#key-properties-card.mt-4 - = metadata_section('key-properties', 'Key properties', collapsed: false) do - = form_group_attribute("URI", required: true) - = form_group_attribute("deprecated") - = form_group_attribute("hasOntologySyntax") do - %p - Properties taken from - = link_to "W3C URIs for file format", "https://www.w3.org/ns/formats/", target: "_blank" - - = form_group_attribute("hasFormalityLevel") do - %p - Properties taken from - = link_to "DCMI KOS type vocabularies", "http://wiki.dublincore.org/index.php/NKOS_Vocabularies#KOS_Types_Vocabulary", target: "_blank" - - = form_group_attribute("isOfType") - = form_group_attribute("naturalLanguage") do - %p - Consider using a - = link_to "Lexvo URI", "http://www.lexvo.org", target: "_blank" - with ISO639-3 code - %br - e.g.: http://lexvo.org/id/iso639-3/eng - - %div#description-card.mt-4 - = metadata_section('description', 'Description', collapsed: !@required_only || !@submission.id.nil?) do - -# Description - = attribute_form_group_container('description', required: true) do |c| - = text_area c.name, c.method_name, rows: 5, value: @submission.description, required: true, class: "form-control" - - -# Home page - = form_group_attribute('homepage') do - Enter a URL for the main page of your ontology. - - -# Documentation page - = form_group_attribute('documentation') do - Enter a URL for a page that provides ontology documentation. - - -# Publications page - = form_group_attribute('publication') do - Enter a URL for a page that lists publications about your ontology. - - -# Used ontology engineering tool - = form_group_attribute("usedOntologyEngineeringTool") - - = metadata_section('more-description-details', 'More description details', parent_id: "description-card") do - - for attr_name in %w[abstract notes keywords alternative identifier] - = form_group_attribute(attr_name) - - - data = sections - - - data.each do |d| - = metadata_section(d[0], d[1], parent_id: "description-card") do - - for attr in submission_metadata.select { |m| m['category'] == d[2] } - = form_group_attribute(attr["attribute"]) - - %div#ontology-dates-card.mt-4 - = metadata_section('ontology-dates', 'Dates', collapsed: !@required_only || !@submission.id.nil?) do - = form_group_attribute("released", default: Date.today, required: true) - = form_group_attribute("modificationDate") - = metadata_section('more-dates', 'More dates', parent_id: "ontology-dates-card") do - - for attr in submission_metadata.select { |m| m['category'] == 'dates' } - = form_group_attribute(attr["attribute"]) - - %div#licenses-card.mt-4 - = metadata_section('licenses', 'Licenses') do - = form_group_attribute("hasLicense") do - %p - Consider using a - = link_to "URI to describe your License", "http://rdflicense.appspot.com", target: "_blank" - %p - Consider using - = link_to "INRIA licentia", "http://licentia.inria.fr/", target: "_blank" - to choose your license - - = metadata_section('more-licensing-info', 'More licensing information', parent_id: "licenses-card") do - - for attr in submission_metadata.select { |m| m['category'] == 'license' } - = form_group_attribute(attr["attribute"]) - - %div#community.mt-4 - = metadata_section('contacts-panel', 'Contacts', parent_id: "community", collapsed: !@required_only || !@submission.id.nil?) do - -# Contact(s) - = attribute_form_group_container('contact' ,required: true) do |c| - - @submission.contact = [] unless @submission.contact && @submission.contact.size > 0 - = render NestedFormInputsComponent.new do |c| - - c.template do - = render partial: "submissions/submission_contact_form", locals: {contact: nil, index: 'NEW_RECORD'} - - c.empty_state do - = hidden_field_tag object_name+"[contact][#{@submission.contact.size}][email]" - = hidden_field_tag object_name+"[contact][#{@submission.contact.size}][name]" - - @submission.contact.each_with_index do |contact, i| - - c.row do - = render partial: "submissions/submission_contact_form", locals: {contact: contact, index: i} - - = form_group_attribute("hasContributor") - = form_group_attribute("hasCreator") - - = metadata_section('more-community-info', 'More community information', parent_id: "community") do - - for attr in submission_metadata.select { |m| m['category'] == 'community' } - = form_group_attribute(attr["attribute"]) - - = metadata_section('more-people-info', 'More people information', parent_id: "community") do - - for attr in submission_metadata.select { |m| m['category'] == 'people' } - = form_group_attribute(attr["attribute"]) - - %div#ontology-relations-more.mt-4 - = metadata_section('ontology-relations', 'Ontology relations', parent_id: "ontology-relations-more") do - = form_group_attribute("useImports") - = form_group_attribute("hasPriorVersion") - = form_group_attribute("isAlignedTo") - = form_group_attribute("ontologyRelatedTo") - - - = metadata_section('more-relations', 'More relations', parent_id: "ontology-relations-more") do - - for attr in submission_metadata - - if attr["category"].eql?("relations") - = form_group_attribute(attr["attribute"]) - - %div#ontology-content-metrics.mt-4 - = metadata_section('ontology-content', 'Ontology content', parent_id: "ontology-content-metrics") do - = form_group_attribute("preferredNamespacePrefix") - = form_group_attribute("preferredNamespaceUri") - - %div#ontology-more-informations.mt-4 - = metadata_section('more-informations', 'More content informations', parent_id: "ontology-more-informations") do - - for attr in submission_metadata.select { |m| m['category'] == 'content' } - = form_group_attribute(attr["attribute"]) - - = metadata_section('more-metrics-informations', 'More metrics informations', parent_id: "ontology-content-metrics") do - - for attr in submission_metadata.select { |m| m['category'] == 'metrics' } - = form_group_attribute(attr["attribute"]) diff --git a/app/views/submissions/_submission_contact_form.html.haml b/app/views/submissions/_submission_contact_form.html.haml deleted file mode 100644 index 590a9dd6c..000000000 --- a/app/views/submissions/_submission_contact_form.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -%div.d-flex - %div.w-50.mx-1.mt-3 - = render FormGroupComponent.new(name: object_name, method: "contact[#{index.to_s.upcase}][name]", label: 'Name' ) do |c1| - = text_field c1.name, "contact[#{index.to_s.upcase}][name]", value: contact ? contact["name"] : '' , class: "form-control flex-grow-1 mx-2" - %div.w-50.mx-1.mt-3 - = render FormGroupComponent.new(name: object_name, method: "contact[#{index.to_s.upcase}][email]", label: 'Email' ) do |c2| - = text_field c2.name, "contact[#{index.to_s.upcase}][email]", value: contact ? contact["email"] : '', class: "form-control flex-grow-1 mx-2" diff --git a/app/views/submissions/_submission_format_form.html.haml b/app/views/submissions/_submission_format_form.html.haml index fc2a1ba51..45e289b90 100644 --- a/app/views/submissions/_submission_format_form.html.haml +++ b/app/views/submissions/_submission_format_form.html.haml @@ -11,60 +11,60 @@ case 'SKOS': jQuery("#skos_options").show() break + default: + jQuery("#skos_options").hide() + jQuery("#owl_options").hide() } } -= attribute_form_group_container('hasOntologyLanguage', label: 'Format', required: true) do |c| - - ont_formats = %w[OBO OWL UMLS SKOS].sort - - selected = @submission.hasOntologyLanguage ? @submission.hasOntologyLanguage : "OWL" - = select c.name, c.method_name, options_for_select(ont_formats, selected), {required: true}, {class: "form-control", onchange: 'ontologyFormatChange(event)'} - - c.help do - %div#skos_options.format_options{style: "display:#{skos? ? 'block': 'none'}"} += attribute_form_group_container('hasOntologyLanguage') do + %div{onchange: 'ontologyFormatChange(event)'} + = select_input(label: "Format", name: "submission[hasOntologyLanguage]", values: ["OBO", "OWL", "SKOS", "UMLS"], selected: @submission.hasOntologyLanguage) + %div#skos_options.upload-ontology-desc{style: "display:#{skos? ? 'block': 'none'}"} SKOS vocabularies submitted to BioPortal must contain a minimum of one concept scheme and top concept assertion. Please refer to the NCBO wiki for a more #{link_to 'detailed explanation', 'https://www.bioontology.org/wiki/index.php/SKOSSupport', target: "_blank" } with examples. - -%div#owl_options.form-group.row.format_options - %div.col-sm-8.offset-sm-4 + %div + %div#owl_options %a#collapseOWLOptions{href: "#owl-options-properties", role: "button", data: {toggle: "collapse"}, aria: {expanded: "false", controls: "owl-options"}, - class: "btn btn-outline-secondary btn-sm"} Show advanced OWL options + class: "btn btn-outline-primary btn-sm"} Show advanced options - %div#owl-options-properties.collapse - %div.form-group.row - %div.col-sm-8.offset-sm-2 - %label.lead Customize default property settings - = attribute_text_field_container('prefLabelProperty', label: 'Preferred name', inline: false) do |c| - - c.help do - Enter a property ID, or leave blank to use the default setting: - = link_to 'http://www.w3.org/2004/02/skos/core#prefLabel', 'http://www.w3.org/2004/02/skos/core#prefLabel', target: "_blank" + %div#owl-options-properties.collapse.px-2.py-5.fade + %div + %div + %label Customize default property settings + = attribute_input('prefLabelProperty', label: 'Preferred name') do + - c.help do + Enter a property ID, or leave blank to use the default setting: + = link_to 'http://www.w3.org/2004/02/skos/core#prefLabel', 'http://www.w3.org/2004/02/skos/core#prefLabel', target: "_blank" - = attribute_text_field_container('synonymProperty', label: 'Synonym', inline: false) do |c| - - c.help do - Enter a property ID, or leave blank to use the default setting: - = link_to 'http://www.w3.org/2004/02/skos/core#altLabel', 'http://www.w3.org/2004/02/skos/core#altLabel', target: "_blank" + = attribute_input('synonymProperty', label: 'Synonym') do + - c.help do + Enter a property ID, or leave blank to use the default setting: + = link_to 'http://www.w3.org/2004/02/skos/core#altLabel', 'http://www.w3.org/2004/02/skos/core#altLabel', target: "_blank" - = attribute_text_field_container('definitionProperty', label: 'Definition', inline: false) do |c| - - c.help do - Enter a property ID, or leave blank to use the default setting: - = link_to 'http://www.w3.org/2004/02/skos/core#definition', 'http://www.w3.org/2004/02/skos/core#definition', target: "_blank" + = attribute_input('definitionProperty', label: 'Definition') do + - c.help do + Enter a property ID, or leave blank to use the default setting: + = link_to 'http://www.w3.org/2004/02/skos/core#definition', 'http://www.w3.org/2004/02/skos/core#definition', target: "_blank" - = attribute_text_field_container('authorProperty', label: 'Author', inline: false) do |c| - - c.help do - Enter a property ID, or leave blank to use the default setting: - = link_to 'http://purl.org/dc/elements/1.1/creator', 'http://purl.org/dc/elements/1.1/creator', target: "_blank" + = attribute_input('authorProperty', label: 'Author') do + - c.help do + Enter a property ID, or leave blank to use the default setting: + = link_to 'http://purl.org/dc/elements/1.1/creator', 'http://purl.org/dc/elements/1.1/creator', target: "_blank" - %div.form-group.row - %div.col-sm-8.offset-sm-2 - %label.lead Identify obsolete classes - = attribute_text_field_container('obsoleteProperty', label: 'Obsolete property', inline: false) do |c| - - c.help do - Optionally enter a property ID that indicates obsolete status for ontology classes - (the property value must be set to "true"). Note that by default, BioPortal checks for existence of the owl:deprecated property. + %div + %div + %label Identify obsolete classes + = attribute_input('obsoleteProperty', label: 'Obsolete property') do + - c.help do + Optionally enter a property ID that indicates obsolete status for ontology classes + (the property value must be set to "true"). Note that by default, BioPortal checks for existence of the owl:deprecated property. - = attribute_text_field_container('obsoleteParent', label: 'Obsolete branch root', inline: false) do |c| - - c.help do - Optionally enter a class ID for the root of an obsolete branch. All classes in the branch will be marked as - obsolete, with the exception of the root class. + = attribute_input('obsoleteParent', label: 'Obsolete branch root') do + - c.help do + Optionally enter a class ID for the root of an obsolete branch. All classes in the branch will be marked as + obsolete, with the exception of the root class. diff --git a/app/views/submissions/_submission_location_form.html.haml b/app/views/submissions/_submission_location_form.html.haml deleted file mode 100644 index 07faedf61..000000000 --- a/app/views/submissions/_submission_location_form.html.haml +++ /dev/null @@ -1,61 +0,0 @@ -:javascript - $(document).ready(function() { - - // Properly display the information for 'File Location' based on radio button - if (jQuery("#submission_isRemote_0").is(":checked")) { - location_toggle("upload"); - } - if (jQuery("#submission_isRemote_1").is(":checked")) { - location_toggle("remote"); - } - - // Select default 'File Location' radio button - if (!jQuery("#submission_isRemote_0").is(":checked") && !jQuery("#submission_isRemote_1").is(":checked") && !jQuery("#submission_isRemote_2").is(":checked")) { - jQuery("#submission_isRemote_0").attr("checked", "checked") - } - }); - - // Show/hide location inputs - function location_toggle(input_div) { - jQuery('.hidden_field').hide(); - jQuery('.hidden_field input').attr("disabled", true); - jQuery('#' + input_div + " input").removeAttr("disabled"); - jQuery('#' + input_div).show(); - } - - -- if !@masterFileOptions - %div.form-check - - checked = @ontology.summaryOnly - = radio_button(object_name, :isRemote, 3, :onclick=>"$('.hidden_field').hide();", checked: checked, aria: {describedBy: "metadataHelpBlock"}, class: "form-check-input") - %label.form-check-label{for: "submission_isRemote_3"} - Metadata only - %small.form-text.text-muted#metadataHelpBlock Allow users to view and search your ontology metadata, but not its classes and properties. - %div.form-check - - checked = !(@submission.pullLocation.nil? || @submission.pullLocation.empty?) - = radio_button(object_name, :isRemote, 1, :onclick=>"location_toggle('remote');", checked: checked, aria: {describedBy: "loadFromURLHelpBlock"}, class: "form-check-input") - %label.form-check-label{for: "submission_isRemote_1"} - Load from URL - %small.form-text.text-muted#loadFromURLHelpBlock New versions loaded on a nightly basis. - - display = (checked and "" or "display:none;") - %div.hidden_field#remote{style: display} - = text_field(object_name, :pullLocation, value: @submission.pullLocation, aria: {describedBy: "enterURLHelpBlock"}, class: "form-control") - %small.form-text.text-muted#enterURLHelpBlock Enter a URL, including the name of your ontology source file, e.g., http://www.example.com/my_ontology.owl. - %div.form-check - - checked = (!@ontology.summaryOnly) && @submission.pullLocation.nil? - = radio_button(object_name, :isRemote, 0, :onclick=>"location_toggle('upload');", checked: checked, class: "form-check-input") - %label.form-check-label{for: "submission_isRemote_0"} - Upload local file - - display = (checked and "" or "display:none;") - %div.hidden_field#upload{style: display} - = file_field(object_name, :filePath, class: "mt-2") -- else - -# TODO: Has this section of code actually been tested? - = radio_button object_name, :isRemote, 0, :onclick=>"location_toggle('upload');", checked: true - Upload Local File - %br/ - %span{:style => "font-size:11px;"} (choose a file on your local file system to upload) - - display = (checked and "" or "display:none;") - %div#upload{style: display} - = file_field object_name, :filePath, required: true - = select(object_name, "masterFileName", @masterFileOptions, { include_blank: "Select primary file from zip contents", required: true}, {style: "border-color: red;"}) diff --git a/app/views/submissions/_submissions.html.haml b/app/views/submissions/_submissions.html.haml index 8c74959a3..d77fdb234 100644 --- a/app/views/submissions/_submissions.html.haml +++ b/app/views/submissions/_submissions.html.haml @@ -16,9 +16,9 @@ %div.align-middle Version - header.th do - = generate_attribute_text("modificationDate", "Modified", tooltip: false) + = attr_label("modificationDate", "Modified", show_tooltip: false) - header.th do - = generate_attribute_text("creationDate", "Uploaded", tooltip: false) + = attr_label("creationDate", "Uploaded", show_tooltip: false) - unless @ont_restricted - header.th do %div.align-middle diff --git a/app/views/submissions/edit.html.haml b/app/views/submissions/edit.html.haml index 5c46f3099..dc16d4b14 100644 --- a/app/views/submissions/edit.html.haml +++ b/app/views/submissions/edit.html.haml @@ -1,6 +1,69 @@ -%div.py-4.py-md-5.flex-column.w-100 - %h3.text-center.mb-4 - Edit submission information - %small.text-muted for #{@ontology.acronym} - = form_for :submission, url: ontology_submission_path(@ontology.acronym, @submission.submissionId), html: { id: "ontology_submission_form", method: :put, multipart: true, 'data-turbo': true } do |f| - = render partial: "form", locals: {f: f, button_text: "Save submission"} +.center + .edit-ontology-container + = turbo_frame_tag("test") do + = form_for :submission, url: ontology_submission_path(@ontology.acronym, params["id"]), html: { id: "ontology_submission_form", method: :put, multipart: true, 'data-turbo': true} do + .edit-ontology-title + %div Edit ontology + %hr + .edit-ontology-sub-container + - category_attributes = submission_metadata.group_by{|x| x['category']}.transform_values{|x| x.map{|attr| attr['attribute']} } + - category_attributes = category_attributes.reject{|key| ['no', 'Object description properties', 'Content', 'Links'].include?(key.to_s)} + - category_attributes['license'] << 'hasLicense' + - category_attributes['dates'] << ['creationDate', 'modificationDate', 'released'] + - category_attributes['general'].append(['format', 'contact', 'location']) + .edit-ontology-left-column{:role => "tablist",onchange:"onMetadataChange()"} + .edit-ontology-desc + = submission_metadata_selector + %div.nav.nav-pills.flex-column#categories-tabs + %a.edit-ontology-tab-item.d-block{href: "#ontology-details-tab", "data-toggle" => "pill", class: 'active show'} + Ontology details + - category_attributes.keys.each do |key| + %a.edit-ontology-tab-item.d-block{href: "##{key.parameterize}-tab", "data-toggle" => "pill", class: ''} + = key.humanize + + #myTabContent.edit-ontology-right-column.w-100 + = render TurboFrameComponent.new(id:"metadata_by_ontology") do + = metadata_help_link + %div.tab-content + .edit-ontology-tab.tab-pane.fade{id:'ontology-details-tab', class: 'active show'} + = render partial: 'ontologies/form' + + - category_attributes.each_with_index do |key_properties, index| + - key, properties = key_properties + .edit-ontology-tab.tab-pane.fade{id: key.parameterize+'-tab', class: ''} + = render TurboFrameComponent.new(id: "ontology-content-#{index}", loading:"lazy", src: "edit_properties?properties=#{properties.join(',')}&container_id=ontology-content-#{index}") + + %hr#edit-ontology-actions-devider + .edit-ontology-actions + .reset-all-button#reset-all-button + = render Buttons::RegularButtonComponent.new(id:'reset-all-fields', value: "Reset all fields", variant: "secondary", size: "slim") do |btn| + - btn.icon_left do + - inline_svg_tag "reload.svg" + .save-button + = render Buttons::RegularButtonComponent.new(id:'save-button', value: "Save", variant: "primary", size: "slim", type: "submit") do |btn| + - btn.icon_left do + - inline_svg_tag "check.svg" + + + :javascript + function onMetadataChange(){ + document.querySelector('.edit-ontology-tab-item.d-block.active.show')?.classList.remove('active', 'show') + document.querySelector('.edit-ontology-tab.tab-pane.fade.active.show')?.classList.remove('active', 'show') + document.getElementById('categories-tabs')?.classList.add('disabled') + + let frame = document.getElementById('metadata_by_ontology') + let properties = document.getElementById('select_search[metadata]') + + let selectedProperties = "all" + if(properties && properties.selectedOptions.length > 0){ + selectedProperties = Array.from(properties.selectedOptions).map(({ value }) => value).join(',') + frame.src = "./edit_properties?properties=" + selectedProperties + } else { + location.reload() + } + + } + + document.getElementById("reset-all-button").addEventListener('click', function() { + location.reload(); + }); \ No newline at end of file diff --git a/app/views/submissions/new.html.haml b/app/views/submissions/new.html.haml deleted file mode 100644 index 82e77242e..000000000 --- a/app/views/submissions/new.html.haml +++ /dev/null @@ -1,2 +0,0 @@ -= form_for :submission, url: {action: "create"}, html: {id: "ontology_submission_form", multipart: true} do |f| - = render partial: "ontologies/form", locals: {f: f, button_text: "Add submission"} \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 3188d56f7..4ba040d8e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -42,7 +42,10 @@ get 'ontologies/:ontology_id/concepts', to: 'concepts#show_concept' resources :ontologies do - resources :submissions + resources :submissions do + get 'edit_properties' + end + get 'instances/:instance_id', to: 'instances#show', constraints: { instance_id: /[^\/?]+/ } get 'schemes/show_scheme', to: 'schemes#show' get 'collections/show' diff --git a/package.json b/package.json index 62dabf435..c4241b80f 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "vis-data": "^7.1.6", "vis-network": "^9.1.6", "vis-util": "^5.0.3", + "tippy.js": "^6.3.7", "tom-select": "^2.2.2" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index 3a6292d51..44b81c162 100644 --- a/yarn.lock +++ b/yarn.lock @@ -44,6 +44,11 @@ resolved "https://registry.yarnpkg.com/@orchidjs/unicode-variants/-/unicode-variants-1.0.4.tgz#6d2f812e3b19545bba2d81caffff1204de9a6a58" integrity sha512-NvVBRnZNE+dugiXERFsET1JlKZfM5lJDEpSMilKW4bToYJ7pxf0Zne78xyXB2ny2c2aHfJ6WLnz1AaTNHAmQeQ== +"@popperjs/core@^2.9.0": + version "2.11.8" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" + integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== + "@rails/actioncable@^7.0": version "7.0.5" resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.5.tgz#bbc11203e0d3d5084002abfcf01d621fdf5f3a9d" @@ -227,6 +232,13 @@ stimulus-timeago@^4.1.0: dependencies: date-fns "^2.29.3" +tippy.js@^6.3.7: + version "6.3.7" + resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c" + integrity sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ== + dependencies: + "@popperjs/core" "^2.9.0" + tom-select@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/tom-select/-/tom-select-2.2.2.tgz#8e5f9296e6d80254feccb57f0986bd6c44d126e2" From 617b95247bffb1c8d41606d146a08084ada0a5e1 Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 2 Sep 2023 22:08:38 +0200 Subject: [PATCH 481/533] make the not found page message customizable depending of the error type --- app/views/errors/not_found.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml index 14907e9d1..5aaf6ea2c 100644 --- a/app/views/errors/not_found.html.haml +++ b/app/views/errors/not_found.html.haml @@ -1,7 +1,7 @@ .d-flex.align-items-center.flex-column.position-relative = inline_svg("errors/agroportal.svg") - .position-absolute{style: "top: 442px; font-size: 30px; font-weight: 800; color: #263238;"} - Page not found + .position-absolute{style: "top: 442px; font-size: 30px; font-weight: 800; color: #263238;"} + = @error_message || "Page not found" .buttons.d-flex.justify-content-center.mt-3 %div{style: "width: 216px;"} = render Buttons::RegularButtonComponent.new(id:'Home-button', value: "Go home", variant: "secondary", href: "/") From 15a311dfd5599f88a7181481cafd5580395ad7cb Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Sat, 2 Sep 2023 22:09:05 +0200 Subject: [PATCH 482/533] put again the old internal server error message with style fixing --- app/assets/stylesheets/ontologies.scss | 9 --------- .../errors/internal_server_error.html.haml | 19 +++++++++++-------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/ontologies.scss b/app/assets/stylesheets/ontologies.scss index 19cfad023..a6e024f4c 100644 --- a/app/assets/stylesheets/ontologies.scss +++ b/app/assets/stylesheets/ontologies.scss @@ -1,14 +1,5 @@ $ont-metadata-bg-color: #e2ebf0; $widget-table-border-color: #EFEFEF; -$ont-show-bg-color: #e9ecef; - -.ontologies.show { - background-color: $ont-show-bg-color; - - #bd { - background-color: $ont-show-bg-color; - } -} .ontologies.show .gutter { background-repeat: no-repeat; diff --git a/app/views/errors/internal_server_error.html.haml b/app/views/errors/internal_server_error.html.haml index 4b95e9456..3a9b4c7df 100644 --- a/app/views/errors/internal_server_error.html.haml +++ b/app/views/errors/internal_server_error.html.haml @@ -1,12 +1,15 @@ .d-flex.align-items-center.flex-column.position-relative - = inline_svg("errors/agroportal.svg") - .position-absolute{style: "top: 442px; font-size: 30px; font-weight: 800; color: #263238;"} - Something went wrong. We have been notified about this error. - .buttons.d-flex.justify-content-center.mt-3 - %div{style: "width: 216px;"} - = render Buttons::RegularButtonComponent.new(id:'Home-button', value: "Go home", variant: "secondary", href: "/") - %div{style: "width: 216px; margin-left: 22px"} - = render Buttons::RegularButtonComponent.new(id:"feedback-button" ,value: "Send a feedback", variant: "primary", href: "/feedback") + = inline_svg("errors/agroportal.svg") + .position-absolute.text-center{style: "top: 425px; font-size: 30px; font-weight: 800; color: #263238;"} + %div + We're sorry but something has gone wrong. + %div + We have been notified of this error. + .buttons.d-flex.justify-content-center.mt-3 + %div{style: "width: 216px;"} + = render Buttons::RegularButtonComponent.new(id:'Home-button', value: "Go home", variant: "secondary", href: "/") + %div{style: "width: 216px; margin-left: 22px"} + = render Buttons::RegularButtonComponent.new(id:"feedback-button" ,value: "Send a feedback", variant: "primary", href: "/feedback") From 350ea19d8cd0669cd172810c79906b801d6fc440 Mon Sep 17 00:00:00 2001 From: Syphax bouazzouni Date: Mon, 4 Sep 2023 00:12:09 +0200 Subject: [PATCH 483/533] Feature: Update browse page design (#217) * Update browse page design with the new design on figma * Fix the problems in the design of the browse page and make it responsive * Add the light color variable for differnet themes * Extract the ontologies section in the browse page to be the src of the turbo frame * Change the color of the turbo progress bar * Update the design of the switch component * Add the checked property to the chips component * Add the filtering logic of the browse page * Add the checked filters count in the browse page * Remove the angular from the browse page * In browse page, limit the ontology description to 3 lines and add a button show more to see the entire description * remove duplicate action changed->turbo-frame#updateFrame in the browser * add text truncate stimulus controller * replace in the browser descriptions js with a controller to show more * add timeago stimulus controller to show dates in a human readable way * add ontology contacts and format to the ontology card * remove old angular files * yarn update to install the new JS dependencies * add ontology browser page and empty state image * refactor useHistory mixin This reverts commit 719e45604eb6a303c5ca0fae9b34753a34f19ade. * add count slot to the chips components * add small version of the loader component * add filters count by ontology * add the count slots to the chips in the browse page * use turbo streams to update ontologies result and the filters counts * add ontology browse private icon * add admin-color theme variable * add private only switch to the ontologies browser * implement the private only ontologies filter * add title tooltip for the browser filters chips * update turbo_frame component to use a custom loader * handle the case where submission publication attribute is not an array * update infinite scroll component to add custom loader and be generic * create and use tree infinite scroll component * create ontology browser card component * decrease the debounce time of the browser search input * remove no more used get_metrics_hash function * move submission filters methods to a concern module * add back to top button and counter loader to the browse page * implement and use submissions filter concern * create browser ontologies partial * update chips component to add label attribute * update tooltip controller to not show if title is empty * update browse page filters section titles * use the new chips component 'label' attribute for the browser filters * fix the wrong browser count when show private only * migrate the fair score js code to stimulus to make it work with turbo * put again the accidentally removed ontology_params method * prevent zombie submission with no ontology) bug in the browse page * fix browse page layout issues * fix unable to see full content of the filter collapsible block in the browse page * move deprecated and view cards of ontology down instead next to name * remove default margin left of the pill button component * add tooltip message to the ontology that is the view of another ontology * change the layout of the browse page to have the upload button and search in same level * add admin style classes * add interactive option for use tooltip controller * add disabled state to chips component * show the filter count loader each time changed * add released year card to the ontology cards * add the debug card to the ontologies card if user is admin --------- Co-authored-by: Bilelkihal <61744974+Bilelkihal@users.noreply.github.com> --- Gemfile.lock | 39 +- app/assets/images/search.svg | 3 + .../stylesheets/application.css.scss.erb | 1 + app/assets/stylesheets/bioportal.scss | 22 +- app/assets/stylesheets/browse.scss | 649 + app/assets/stylesheets/components/chips.scss | 6 +- .../stylesheets/components/pill_button.scss | 1 - app/assets/stylesheets/ontologies.scss | 4 + app/components/chip_button_component.rb | 3 +- .../chips_component/chips_component.html.haml | 4 +- .../display/info_tooltip_component.rb | 2 +- app/components/infinite_scroll_component.rb | 8 +- .../infinite_scroll_component.html.haml | 16 +- app/components/loader_component.rb | 7 + .../ontology_browse_card_component.rb | 13 + .../ontology_browse_card_component.html.haml | 90 + ...ology_subscribe_button_component.html.haml | 2 +- .../tree_infinite_scroll_component.rb | 21 + .../tree_infinite_scroll_component.html.haml | 15 + app/components/turbo_frame_component.rb | 2 + .../turbo_frame_component.html.haml | 7 +- app/controllers/concerns/submission_filter.rb | 247 + app/controllers/ontologies_controller.rb | 166 +- app/helpers/ontologies_helper.rb | 124 +- .../controllers/browse_filters_controller.js | 69 + app/javascript/controllers/index.js | 6 + .../show_filter_count_controller.js | 17 + .../controllers/tooltip_controller.js | 5 +- app/javascript/mixins/useTooltip.js | 5 +- .../concepts/_date_sorted_list.html.haml | 2 +- app/views/concepts/_list.html.haml | 2 +- app/views/layouts/angular.html.erb | 72 - app/views/ontologies/browse.html.erb | 324 - .../ontologies/browser/_ontologies.html.haml | 13 + app/views/ontologies/browser/browse.html.haml | 96 + config/routes.rb | 1 + public/browse/.bowerrc | 3 - public/browse/.gitignore | 7 - public/browse/.jshintrc | 13 - public/browse/app.css | 184 - public/browse/app.js | 417 - public/browse/bower.json | 18 - public/browse/checklist-model.js | 99 - public/browse/e2e-tests/protractor.conf.js | 19 - public/browse/e2e-tests/scenarios.js | 42 - public/browse/font/webhostinghub-glyphs.eot | Bin 503876 -> 0 bytes public/browse/font/webhostinghub-glyphs.svg | 7835 ----- public/browse/font/webhostinghub-glyphs.ttf | Bin 503664 -> 0 bytes public/browse/font/whhg.css | 2085 -- public/browse/karma.conf.js | 33 - public/browse/lib/angular-animate/.bower.json | 19 - public/browse/lib/angular-animate/README.md | 77 - .../lib/angular-animate/angular-animate.js | 2136 -- .../angular-animate/angular-animate.min.js | 33 - .../angular-animate.min.js.map | 8 - public/browse/lib/angular-animate/bower.json | 9 - .../browse/lib/angular-animate/package.json | 26 - .../browse/lib/angular-bindonce/.bower.json | 37 - .../browse/lib/angular-bindonce/CHANGELOG.md | 43 - public/browse/lib/angular-bindonce/README.md | 154 - .../browse/lib/angular-bindonce/bindonce.js | 325 - .../lib/angular-bindonce/bindonce.min.js | 1 - public/browse/lib/angular-bindonce/bower.json | 28 - .../browse/lib/angular-bindonce/package.json | 28 - public/browse/lib/angular-loader/.bower.json | 19 - public/browse/lib/angular-loader/README.md | 65 - .../lib/angular-loader/angular-loader.js | 405 - .../lib/angular-loader/angular-loader.min.js | 9 - .../angular-loader/angular-loader.min.js.map | 8 - public/browse/lib/angular-loader/bower.json | 9 - public/browse/lib/angular-loader/package.json | 26 - public/browse/lib/angular-mocks/.bower.json | 19 - public/browse/lib/angular-mocks/README.md | 57 - .../browse/lib/angular-mocks/angular-mocks.js | 2380 -- public/browse/lib/angular-mocks/bower.json | 9 - public/browse/lib/angular-mocks/package.json | 27 - public/browse/lib/angular-route/.bower.json | 19 - public/browse/lib/angular-route/README.md | 77 - .../browse/lib/angular-route/angular-route.js | 996 - .../lib/angular-route/angular-route.min.js | 15 - .../angular-route/angular-route.min.js.map | 8 - public/browse/lib/angular-route/bower.json | 9 - public/browse/lib/angular-route/package.json | 26 - public/browse/lib/angular/.bower.json | 17 - public/browse/lib/angular/README.md | 67 - public/browse/lib/angular/angular-csp.css | 13 - public/browse/lib/angular/angular.js | 25917 ---------------- public/browse/lib/angular/angular.min.js | 250 - public/browse/lib/angular/angular.min.js.gzip | Bin 45728 -> 0 bytes public/browse/lib/angular/angular.min.js.map | 8 - public/browse/lib/angular/bower.json | 8 - public/browse/lib/angular/package.json | 25 - .../browse/lib/html5-boilerplate/.bower.json | 14 - .../lib/html5-boilerplate/.gitattributes | 1 - .../browse/lib/html5-boilerplate/.gitignore | 2 - public/browse/lib/html5-boilerplate/.htaccess | 551 - public/browse/lib/html5-boilerplate/404.html | 157 - .../browse/lib/html5-boilerplate/CHANGELOG.md | 133 - .../lib/html5-boilerplate/CONTRIBUTING.md | 154 - .../browse/lib/html5-boilerplate/LICENSE.md | 19 - public/browse/lib/html5-boilerplate/README.md | 61 - .../apple-touch-icon-precomposed.png | Bin 1226 -> 0 bytes .../lib/html5-boilerplate/crossdomain.xml | 15 - .../browse/lib/html5-boilerplate/css/main.css | 304 - .../lib/html5-boilerplate/css/normalize.css | 527 - .../browse/lib/html5-boilerplate/doc/TOC.md | 37 - .../lib/html5-boilerplate/doc/crossdomain.md | 17 - .../browse/lib/html5-boilerplate/doc/css.md | 136 - .../lib/html5-boilerplate/doc/extend.md | 586 - .../browse/lib/html5-boilerplate/doc/faq.md | 76 - .../browse/lib/html5-boilerplate/doc/html.md | 161 - public/browse/lib/html5-boilerplate/doc/js.md | 31 - .../browse/lib/html5-boilerplate/doc/misc.md | 26 - .../browse/lib/html5-boilerplate/doc/usage.md | 113 - .../browse/lib/html5-boilerplate/favicon.ico | Bin 766 -> 0 bytes .../browse/lib/html5-boilerplate/humans.txt | 15 - .../lib/html5-boilerplate/img/.gitignore | 0 .../browse/lib/html5-boilerplate/index.html | 42 - .../browse/lib/html5-boilerplate/js/main.js | 1 - .../lib/html5-boilerplate/js/plugins.js | 24 - .../js/vendor/jquery-1.10.2.min.js | 6 - .../js/vendor/modernizr-2.6.2.min.js | 4 - .../browse/lib/html5-boilerplate/robots.txt | 3 - public/browse/lib/lunr.js/.bower.json | 21 - public/browse/lib/lunr.js/.gitignore | 1 - public/browse/lib/lunr.js/.travis.yml | 6 - public/browse/lib/lunr.js/CHANGELOG.mdown | 94 - public/browse/lib/lunr.js/CNAME | 1 - public/browse/lib/lunr.js/CONTRIBUTING.mdown | 20 - public/browse/lib/lunr.js/LICENSE | 19 - public/browse/lib/lunr.js/Makefile | 68 - public/browse/lib/lunr.js/README.mdown | 63 - public/browse/lib/lunr.js/VERSION | 1 - public/browse/lib/lunr.js/bower.json | 11 - public/browse/lib/lunr.js/component.json | 9 - public/browse/lib/lunr.js/example/app.js | 89 - .../lib/lunr.js/example/example_data.json | 3016 -- .../lib/lunr.js/example/example_index.json | 1 - public/browse/lib/lunr.js/example/index.html | 81 - .../lib/lunr.js/example/index_builder.js | 34 - public/browse/lib/lunr.js/example/jquery.js | 4 - public/browse/lib/lunr.js/example/mustache.js | 570 - public/browse/lib/lunr.js/example/require.js | 36 - .../example/templates/question_list.mustache | 10 - .../example/templates/question_view.mustache | 5 - public/browse/lib/lunr.js/example/text.js | 386 - public/browse/lib/lunr.js/index.html | 305 - .../browse/lib/lunr.js/lib/document_store.js | 96 - .../browse/lib/lunr.js/lib/event_emitter.js | 82 - public/browse/lib/lunr.js/lib/index.js | 421 - public/browse/lib/lunr.js/lib/lunr.js | 50 - public/browse/lib/lunr.js/lib/pipeline.js | 217 - public/browse/lib/lunr.js/lib/sorted_set.js | 238 - public/browse/lib/lunr.js/lib/stemmer.js | 190 - .../lib/lunr.js/lib/stop_word_filter.js | 147 - public/browse/lib/lunr.js/lib/token_store.js | 193 - public/browse/lib/lunr.js/lib/tokenizer.js | 35 - public/browse/lib/lunr.js/lib/trimmer.js | 26 - public/browse/lib/lunr.js/lib/utils.js | 24 - public/browse/lib/lunr.js/lib/vector.js | 125 - public/browse/lib/lunr.js/lunr.js | 1882 -- public/browse/lib/lunr.js/lunr.min.js | 7 - public/browse/lib/lunr.js/notes | 47 - public/browse/lib/lunr.js/package.json | 24 - public/browse/lib/lunr.js/server.js | 45 - public/browse/lib/lunr.js/styles.css | 133 - .../lib/lunr.js/test/env/augment.min.js | 8 - public/browse/lib/lunr.js/test/env/jquery.js | 16 - public/browse/lib/lunr.js/test/env/qunit.css | 235 - public/browse/lib/lunr.js/test/env/qunit.js | 1977 -- public/browse/lib/lunr.js/test/env/runner.js | 125 - .../lib/lunr.js/test/event_emitter_test.js | 75 - .../lunr.js/test/fixtures/stemming_vocab.json | 1 - public/browse/lib/lunr.js/test/index.html | 52 - public/browse/lib/lunr.js/test/index_test.js | 322 - public/browse/lib/lunr.js/test/lunr_test.js | 37 - .../browse/lib/lunr.js/test/pipeline_test.js | 185 - public/browse/lib/lunr.js/test/runner.sh | 9 - public/browse/lib/lunr.js/test/search_test.js | 77 - .../lib/lunr.js/test/serialisation_test.js | 46 - .../lib/lunr.js/test/sorted_set_test.js | 118 - .../browse/lib/lunr.js/test/stemmer_test.js | 14 - .../lib/lunr.js/test/stop_word_filter_test.js | 22 - .../lib/lunr.js/test/store_node_test.js | 17 - public/browse/lib/lunr.js/test/store_test.js | 60 - public/browse/lib/lunr.js/test/test_helper.js | 23 - .../lib/lunr.js/test/token_store_test.js | 177 - .../browse/lib/lunr.js/test/tokenizer_test.js | 65 - .../browse/lib/lunr.js/test/trimmer_test.js | 27 - public/browse/lib/lunr.js/test/vector_test.js | 39 - public/browse/package.json | 35 - yarn.lock | 16 +- 192 files changed, 1480 insertions(+), 60578 deletions(-) create mode 100644 app/assets/images/search.svg create mode 100644 app/assets/stylesheets/browse.scss create mode 100644 app/components/ontology_browse_card_component.rb create mode 100644 app/components/ontology_browse_card_component/ontology_browse_card_component.html.haml create mode 100644 app/components/tree_infinite_scroll_component.rb create mode 100644 app/components/tree_infinite_scroll_component/tree_infinite_scroll_component.html.haml create mode 100644 app/controllers/concerns/submission_filter.rb create mode 100644 app/javascript/controllers/browse_filters_controller.js create mode 100644 app/javascript/controllers/show_filter_count_controller.js delete mode 100644 app/views/layouts/angular.html.erb delete mode 100644 app/views/ontologies/browse.html.erb create mode 100644 app/views/ontologies/browser/_ontologies.html.haml create mode 100644 app/views/ontologies/browser/browse.html.haml delete mode 100755 public/browse/.bowerrc delete mode 100755 public/browse/.gitignore delete mode 100755 public/browse/.jshintrc delete mode 100755 public/browse/app.css delete mode 100755 public/browse/app.js delete mode 100755 public/browse/bower.json delete mode 100644 public/browse/checklist-model.js delete mode 100755 public/browse/e2e-tests/protractor.conf.js delete mode 100755 public/browse/e2e-tests/scenarios.js delete mode 100644 public/browse/font/webhostinghub-glyphs.eot delete mode 100755 public/browse/font/webhostinghub-glyphs.svg delete mode 100644 public/browse/font/webhostinghub-glyphs.ttf delete mode 100644 public/browse/font/whhg.css delete mode 100755 public/browse/karma.conf.js delete mode 100644 public/browse/lib/angular-animate/.bower.json delete mode 100644 public/browse/lib/angular-animate/README.md delete mode 100644 public/browse/lib/angular-animate/angular-animate.js delete mode 100644 public/browse/lib/angular-animate/angular-animate.min.js delete mode 100644 public/browse/lib/angular-animate/angular-animate.min.js.map delete mode 100644 public/browse/lib/angular-animate/bower.json delete mode 100644 public/browse/lib/angular-animate/package.json delete mode 100644 public/browse/lib/angular-bindonce/.bower.json delete mode 100644 public/browse/lib/angular-bindonce/CHANGELOG.md delete mode 100644 public/browse/lib/angular-bindonce/README.md delete mode 100644 public/browse/lib/angular-bindonce/bindonce.js delete mode 100644 public/browse/lib/angular-bindonce/bindonce.min.js delete mode 100644 public/browse/lib/angular-bindonce/bower.json delete mode 100644 public/browse/lib/angular-bindonce/package.json delete mode 100644 public/browse/lib/angular-loader/.bower.json delete mode 100644 public/browse/lib/angular-loader/README.md delete mode 100644 public/browse/lib/angular-loader/angular-loader.js delete mode 100644 public/browse/lib/angular-loader/angular-loader.min.js delete mode 100644 public/browse/lib/angular-loader/angular-loader.min.js.map delete mode 100644 public/browse/lib/angular-loader/bower.json delete mode 100644 public/browse/lib/angular-loader/package.json delete mode 100644 public/browse/lib/angular-mocks/.bower.json delete mode 100644 public/browse/lib/angular-mocks/README.md delete mode 100644 public/browse/lib/angular-mocks/angular-mocks.js delete mode 100644 public/browse/lib/angular-mocks/bower.json delete mode 100644 public/browse/lib/angular-mocks/package.json delete mode 100644 public/browse/lib/angular-route/.bower.json delete mode 100644 public/browse/lib/angular-route/README.md delete mode 100644 public/browse/lib/angular-route/angular-route.js delete mode 100644 public/browse/lib/angular-route/angular-route.min.js delete mode 100644 public/browse/lib/angular-route/angular-route.min.js.map delete mode 100644 public/browse/lib/angular-route/bower.json delete mode 100644 public/browse/lib/angular-route/package.json delete mode 100644 public/browse/lib/angular/.bower.json delete mode 100644 public/browse/lib/angular/README.md delete mode 100644 public/browse/lib/angular/angular-csp.css delete mode 100644 public/browse/lib/angular/angular.js delete mode 100644 public/browse/lib/angular/angular.min.js delete mode 100644 public/browse/lib/angular/angular.min.js.gzip delete mode 100644 public/browse/lib/angular/angular.min.js.map delete mode 100644 public/browse/lib/angular/bower.json delete mode 100644 public/browse/lib/angular/package.json delete mode 100644 public/browse/lib/html5-boilerplate/.bower.json delete mode 100644 public/browse/lib/html5-boilerplate/.gitattributes delete mode 100644 public/browse/lib/html5-boilerplate/.gitignore delete mode 100644 public/browse/lib/html5-boilerplate/.htaccess delete mode 100644 public/browse/lib/html5-boilerplate/404.html delete mode 100644 public/browse/lib/html5-boilerplate/CHANGELOG.md delete mode 100644 public/browse/lib/html5-boilerplate/CONTRIBUTING.md delete mode 100644 public/browse/lib/html5-boilerplate/LICENSE.md delete mode 100644 public/browse/lib/html5-boilerplate/README.md delete mode 100644 public/browse/lib/html5-boilerplate/apple-touch-icon-precomposed.png delete mode 100644 public/browse/lib/html5-boilerplate/crossdomain.xml delete mode 100644 public/browse/lib/html5-boilerplate/css/main.css delete mode 100644 public/browse/lib/html5-boilerplate/css/normalize.css delete mode 100644 public/browse/lib/html5-boilerplate/doc/TOC.md delete mode 100644 public/browse/lib/html5-boilerplate/doc/crossdomain.md delete mode 100644 public/browse/lib/html5-boilerplate/doc/css.md delete mode 100644 public/browse/lib/html5-boilerplate/doc/extend.md delete mode 100644 public/browse/lib/html5-boilerplate/doc/faq.md delete mode 100644 public/browse/lib/html5-boilerplate/doc/html.md delete mode 100644 public/browse/lib/html5-boilerplate/doc/js.md delete mode 100644 public/browse/lib/html5-boilerplate/doc/misc.md delete mode 100644 public/browse/lib/html5-boilerplate/doc/usage.md delete mode 100644 public/browse/lib/html5-boilerplate/favicon.ico delete mode 100644 public/browse/lib/html5-boilerplate/humans.txt delete mode 100644 public/browse/lib/html5-boilerplate/img/.gitignore delete mode 100644 public/browse/lib/html5-boilerplate/index.html delete mode 100644 public/browse/lib/html5-boilerplate/js/main.js delete mode 100644 public/browse/lib/html5-boilerplate/js/plugins.js delete mode 100644 public/browse/lib/html5-boilerplate/js/vendor/jquery-1.10.2.min.js delete mode 100644 public/browse/lib/html5-boilerplate/js/vendor/modernizr-2.6.2.min.js delete mode 100644 public/browse/lib/html5-boilerplate/robots.txt delete mode 100644 public/browse/lib/lunr.js/.bower.json delete mode 100644 public/browse/lib/lunr.js/.gitignore delete mode 100644 public/browse/lib/lunr.js/.travis.yml delete mode 100644 public/browse/lib/lunr.js/CHANGELOG.mdown delete mode 100644 public/browse/lib/lunr.js/CNAME delete mode 100644 public/browse/lib/lunr.js/CONTRIBUTING.mdown delete mode 100644 public/browse/lib/lunr.js/LICENSE delete mode 100644 public/browse/lib/lunr.js/Makefile delete mode 100644 public/browse/lib/lunr.js/README.mdown delete mode 100644 public/browse/lib/lunr.js/VERSION delete mode 100644 public/browse/lib/lunr.js/bower.json delete mode 100644 public/browse/lib/lunr.js/component.json delete mode 100644 public/browse/lib/lunr.js/example/app.js delete mode 100644 public/browse/lib/lunr.js/example/example_data.json delete mode 100644 public/browse/lib/lunr.js/example/example_index.json delete mode 100644 public/browse/lib/lunr.js/example/index.html delete mode 100644 public/browse/lib/lunr.js/example/index_builder.js delete mode 100644 public/browse/lib/lunr.js/example/jquery.js delete mode 100644 public/browse/lib/lunr.js/example/mustache.js delete mode 100644 public/browse/lib/lunr.js/example/require.js delete mode 100644 public/browse/lib/lunr.js/example/templates/question_list.mustache delete mode 100644 public/browse/lib/lunr.js/example/templates/question_view.mustache delete mode 100644 public/browse/lib/lunr.js/example/text.js delete mode 100644 public/browse/lib/lunr.js/index.html delete mode 100644 public/browse/lib/lunr.js/lib/document_store.js delete mode 100644 public/browse/lib/lunr.js/lib/event_emitter.js delete mode 100644 public/browse/lib/lunr.js/lib/index.js delete mode 100644 public/browse/lib/lunr.js/lib/lunr.js delete mode 100644 public/browse/lib/lunr.js/lib/pipeline.js delete mode 100644 public/browse/lib/lunr.js/lib/sorted_set.js delete mode 100644 public/browse/lib/lunr.js/lib/stemmer.js delete mode 100644 public/browse/lib/lunr.js/lib/stop_word_filter.js delete mode 100644 public/browse/lib/lunr.js/lib/token_store.js delete mode 100644 public/browse/lib/lunr.js/lib/tokenizer.js delete mode 100644 public/browse/lib/lunr.js/lib/trimmer.js delete mode 100644 public/browse/lib/lunr.js/lib/utils.js delete mode 100644 public/browse/lib/lunr.js/lib/vector.js delete mode 100644 public/browse/lib/lunr.js/lunr.js delete mode 100644 public/browse/lib/lunr.js/lunr.min.js delete mode 100644 public/browse/lib/lunr.js/notes delete mode 100644 public/browse/lib/lunr.js/package.json delete mode 100644 public/browse/lib/lunr.js/server.js delete mode 100644 public/browse/lib/lunr.js/styles.css delete mode 100644 public/browse/lib/lunr.js/test/env/augment.min.js delete mode 100644 public/browse/lib/lunr.js/test/env/jquery.js delete mode 100644 public/browse/lib/lunr.js/test/env/qunit.css delete mode 100644 public/browse/lib/lunr.js/test/env/qunit.js delete mode 100644 public/browse/lib/lunr.js/test/env/runner.js delete mode 100644 public/browse/lib/lunr.js/test/event_emitter_test.js delete mode 100644 public/browse/lib/lunr.js/test/fixtures/stemming_vocab.json delete mode 100644 public/browse/lib/lunr.js/test/index.html delete mode 100644 public/browse/lib/lunr.js/test/index_test.js delete mode 100644 public/browse/lib/lunr.js/test/lunr_test.js delete mode 100644 public/browse/lib/lunr.js/test/pipeline_test.js delete mode 100755 public/browse/lib/lunr.js/test/runner.sh delete mode 100644 public/browse/lib/lunr.js/test/search_test.js delete mode 100644 public/browse/lib/lunr.js/test/serialisation_test.js delete mode 100644 public/browse/lib/lunr.js/test/sorted_set_test.js delete mode 100644 public/browse/lib/lunr.js/test/stemmer_test.js delete mode 100644 public/browse/lib/lunr.js/test/stop_word_filter_test.js delete mode 100644 public/browse/lib/lunr.js/test/store_node_test.js delete mode 100644 public/browse/lib/lunr.js/test/store_test.js delete mode 100644 public/browse/lib/lunr.js/test/test_helper.js delete mode 100644 public/browse/lib/lunr.js/test/token_store_test.js delete mode 100644 public/browse/lib/lunr.js/test/tokenizer_test.js delete mode 100644 public/browse/lib/lunr.js/test/trimmer_test.js delete mode 100644 public/browse/lib/lunr.js/test/vector_test.js delete mode 100755 public/browse/package.json diff --git a/Gemfile.lock b/Gemfile.lock index 7d7448cc4..03ad8cf1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,11 +85,12 @@ GEM addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) - airbrussh (1.4.1) + airbrussh (1.4.2) sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) autoprefixer-rails (10.4.13.0) execjs (~> 2) + base64 (0.1.1) bcrypt_pbkdf (1.1.0) bindata (2.4.15) bindex (0.8.1) @@ -131,7 +132,7 @@ GEM coderay (1.1.3) concurrent-ruby (1.2.2) crass (1.0.6) - css_parser (1.14.0) + css_parser (1.16.0) addressable cube-ruby (0.0.3) daemons (1.4.1) @@ -147,7 +148,7 @@ GEM erubi (1.12.0) erubis (2.7.0) eventmachine (1.2.7) - excon (0.100.0) + excon (0.102.0) execjs (2.8.1) faraday (2.0.1) faraday-net_http (~> 2.0) @@ -162,9 +163,9 @@ GEM faraday-net_http (2.1.0) ffi (1.15.5) flamegraph (0.9.5) - globalid (1.1.0) - activesupport (>= 5.0) - graphql (2.0.25) + globalid (1.2.0) + activesupport (>= 6.1) + graphql (2.1.0) graphql-client (0.18.0) activesupport (>= 3.0) graphql @@ -239,10 +240,11 @@ GEM marcel (1.0.2) matrix (0.4.2) method_source (1.0.0) - mime-types (3.5.0) + mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) - mini_mime (1.1.2) + mime-types-data (3.2023.0808) + mini_mime (1.1.5) + mini_portile2 (2.8.4) minitest (5.19.0) msgpack (1.7.2) multi_json (1.15.0) @@ -267,14 +269,14 @@ GEM net-protocol net-ssh (7.2.0) netrc (0.11.0) - newrelic_rpm (9.3.1) + newrelic_rpm (9.4.2) nio4r (2.5.9) - nokogiri (1.15.3) + nokogiri (1.15.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.3-x86_64-darwin) + nokogiri (1.15.4-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.3-x86_64-linux) + nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) oauth2 (1.4.11) faraday (>= 0.17.3, < 3.0) @@ -282,7 +284,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 4) - oj (3.15.1) + oj (3.16.1) omniauth (2.1.1) hashie (>= 3.4.6) rack (>= 2.2.3) @@ -320,7 +322,7 @@ GEM method_source (~> 1.0) psych (3.3.4) public_suffix (5.0.3) - puma (5.6.6) + puma (5.6.7) nio4r (~> 2.0) racc (1.7.1) rack (2.2.8) @@ -353,7 +355,7 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (7.0.7) + rails-i18n (7.0.8) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) rails_autolink (1.1.8) @@ -377,7 +379,7 @@ GEM json redcarpet (3.6.0) regexp_parser (2.8.1) - reline (0.3.7) + reline (0.3.8) io-console (~> 0.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -403,7 +405,8 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.55.1) + rubocop (1.56.2) + base64 (~> 0.1.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) diff --git a/app/assets/images/search.svg b/app/assets/images/search.svg new file mode 100644 index 000000000..5b6ace2ed --- /dev/null +++ b/app/assets/images/search.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index 17a5933e1..f3a611fbe 100755 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -58,6 +58,7 @@ @import "nav_bar"; @import "ontology_details_header"; @import "ontology_viewer"; +@import "browse"; /* Bootstrap and Font Awesome */ @import "bootstrap"; @import "bootstrap_overrides"; diff --git a/app/assets/stylesheets/bioportal.scss b/app/assets/stylesheets/bioportal.scss index 05c8b26da..118a8f12a 100644 --- a/app/assets/stylesheets/bioportal.scss +++ b/app/assets/stylesheets/bioportal.scss @@ -1,10 +1,19 @@ -a { +.turbo-progress-bar { + height: 5px; + background-color: var(--light-color); +} + +a{ text-decoration: none !important; } p { margin-bottom: 0; } +body{ + position: relative; +} + .alignright { float:right; } @@ -12,6 +21,17 @@ p { float:left; } +.admin-border{ + border: 1px solid; + border-color: var(--admin-color) !important; +} + +.admin-background{ + background-color: var(--light-color) !important; + border-color: var(--admin-color) !important; + color: var(--admin-color) !important; +} + #hd { background: image-url('layout/header_bg.png') repeat-x; width: 100%; diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss new file mode 100644 index 000000000..036060f96 --- /dev/null +++ b/app/assets/stylesheets/browse.scss @@ -0,0 +1,649 @@ + +.browse-container p { + margin: unset; +} + +.browse-container h2 { + margin: unset; + line-height: unset; +} + +.browse-container hr { + margin: unset; +} + +.browse-center { + display: flex; + justify-content: center; + margin: 20px 50px 50px; +} + +.browse-title { + font-size: 22px; + font-weight: 700; +} + +.browse-submit-new-ontology-and-you-are-admin-container { + display: flex; + justify-content: center; + margin-bottom: 20px; + padding: 20px; + & > div { + display: flex; + flex-direction: column; + align-items: center; + border-radius: 5px; + border: 1px solid #DFDFDF; + } + +} + +.browse-desc-text { + font-size: 16px; + color: #666666; + font-weight: 400; + margin: 5px 0 !important; + overflow: hidden; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: var(--read-more-line-clamp, 2); +} + + +.browse-you-are-admin { + display: flex; + flex-direction: column; + align-items: center; + padding: 20px; + div { + display: flex; + align-items: center; + } +} + +.browse-you-are-admin h3 { + font-size: 20px; + font-weight: 600; + +} + +.browse-you-are-admin div p { + margin-left: 20px; +} + +.browse-upload-ontology-button { + margin: 20px 0; + display: flex; + justify-content: space-between; + align-items: center; + font-size: 15px; + font-weight: 500; + color: var(--primary-color); + width: 226px; + padding: 15px 25px; + border: 1px solid var(--primary-color); + border-radius: 40px; +} + +.browse-show-more-button { + cursor: pointer; + font-size: 14px; + color: gray; + margin-bottom: 10px; +} + +.browse-ontology-container { + border: 1px solid #DFDFDF; + border-radius: 5px; + padding: 15px 20px; + margin-bottom: 20px; + display: flex; + justify-content: space-between; + position: relative; +} + +.browse-ontology-description { + width: 540px; +} + +.browse-ontology-title { + color: var(--primary-color); + font-weight: 600; + font-size: 18px; +} + +.browse-fair { + display: flex; + align-items: center; + justify-content: space-between; + width: 400px; +} + +.browse-sub-container { + display: flex; +} + +.browse-first-row { + width: 300px; + margin-right: 35px; + + .pill-button { + width: 100%; + justify-content: center; + } +} + +.browse-second-row { + width: 828px; + + .browse-ontologies { + margin-top: 90px; + } + +} + +#browse-title-line { + width: 55px; + margin-top: 3px; + border: 0.5px solid var(--primary-color); + border-radius: 5px; +} + +.browse-fair-title { + font-size: 16px; + color: #666666; + font-weight: 400; +} + +.browse-progress-bar { + width: 154px; + height: 10px; + border-radius: 20px; + background-color: #E7E7E7; + +} + +.browse-faire-progress { + width: 100%; + height: 10px; + background-color: var(--primary-color); + border-radius: 20px 0px 0px 20px; +} + +.browse-fair-score { + font-size: 14px; + font-weight: 500; + color: #666666; +} + +.browse-fair-details { + font-size: 14px; + font-weight: 400; + color: var(--primary-color); +} + +.browse-uploaded { + font-size: 13px; + height: 37px; + max-width: 400px; + background-color: var(--light-color); + border-radius: 5px; + display: flex; + padding: 2px 15px; + justify-content: space-between; + align-items: center; + color: var(--primary-color); + margin-top: 15px; +} + +.browse-uploaded-date { + font-weight: 600; + white-space: nowrap; +} + +.browse-ontology-cards { + display: grid; + grid-template-columns: 113px 113px; + grid-template-rows: min-content; + grid-column-gap: 15px; + grid-row-gap: 15px; + direction: rtl; +} + +.browse-onology-card { + border: 0.5px solid var(--primary-color); + border-radius: 5px; + height: 70px; + width: 100px; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + color: var(--primary-color); +} + +.browse-card-number { + font: 17px; + font-weight: 700; +} + +.browse-card-text { + font-size: 15px; + font-weight: 500; +} + +#browse-sub-title-line { + width: 20px; + margin-top: 3px; + border: 0.5px solid var(--primary-color); + border-radius: 5px; + margin-bottom: 15px; +} + +.browse-filters-title { + font-weight: 600; + font-size: 16px; + text-decoration: underline; + text-underline-offset: 12px; + text-decoration-color: var(--primary-color); + text-decoration-thickness: 2px; + margin-bottom: 13px !important; +} + +.browse-search-bar { + display: flex; + +} + +.browse-search-bar input { + border-radius: 14px; + box-shadow: rgba(100, 100, 111, 0.08) 0 7px 29px 0; + border: none; + // border: 1px solid #dee2e6; + padding: 20px 20px; + margin-bottom: 20px; + font-size: 16px; + position: absolute; + width: 828px; + z-index: 1; + +} + +.browse-search-bar input:focus { + box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px; + outline: none; +} + +.browse-search-bar select { + border: none; + background-color: white; + padding: 20px 20px; + margin: 1px; + font-size: 16px; + background-image: url("data:image/svg+xml;utf8,"); + -webkit-appearance: none; + -moz-appearance: none; + background-repeat: no-repeat; + background-position-x: 90%; + background-position-y: 50%; + +} + +.browse-search-bar select:focus { + outline: none; + box-shadow: rgba(100, 100, 111, 0.1) 0px 7px 29px 0px; +} + +.browse-search-bar .browse-format-filter { + position: absolute; + margin-left: 557px; + z-index: 2; + width: 150px; +} + +.browse-search-bar .browse-sort-by-filter { + position: absolute; + margin-left: 692px; + z-index: 2; + width: 135px; + border-radius: 0 14px 14px 0; +} + +.browse-search-button { + margin-left: 85%; + display: flex; + align-items: center; + justify-content: center; + + border-radius: 14px; + padding: 20px; + background-color: var(--primary-color); + width: 160px; + height: 62px; + cursor: pointer; +} + +.browse-search-button p { + font-size: 16px; + color: white; + margin-left: 15px; +} + +.browse-filter { + border: 1px solid #DFDFDF; + border-radius: 5px; + padding: 14px 20px; + margin-bottom: 12px; + + +} + +.browse-filter-checks-container { + display: flex; + flex-wrap: wrap; + margin-top: 10px; + + div { + display: grid; + flex-grow: 1; + } + + .spinner-border-sm{ + width: 0.75rem; + height: 0.75rem; + } +} + +.browse-filter-title-bar { + display: flex; + align-items: center; + justify-content: space-between; + font-size: 14px; + font-weight: 400; + color: #666666; + cursor: pointer; +} + +.browse-ontology-title-bar { + display: flex; + align-items: center; +} + +.browse-ontology-deprecated { + background-color: #EB433521; + color: #EB4335; + padding: 10px; + font-size: 14px; + border-radius: 8px; + margin-left: 15px; + margin-right: 15px; + font-weight: 500; +} + +.browse-ontology-view { + background-color: var(--light-color); + color: var(--primary-color); + padding: 10px; + font-size: 14px; + border-radius: 8px; + margin-left: 15px; + font-weight: 500; +} + +.browse-switch-filter { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 20px; +} + +.browse-switch-filter p { + font-size: 16px; + color: #666666; +} + + +.browse-ontology-title-bar { + display: flex; + align-items: center; +} + +.browse-ontology-deprecated { + background-color: #EB433521; + color: #EB4335; + padding: 10px; + font-size: 14px; + border-radius: 8px; + margin-left: 15px; + font-weight: 500; +} + +.browse-ontology-view { + background-color: var(--light-color); + color: var(--primary-color); + padding: 10px; + font-size: 14px; + border-radius: 8px; + margin-left: 15px; + font-weight: 500; +} + + +.browse-empty-illustration { + margin-top: 100px; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; +} + +.browse-empty-illustration p { + font-size: 16px; + color: #B8B8B8; + font-weight: 500; + margin-top: 10px; +} + + +@media only screen and (max-width: 1250px) { + .browse-first-row { + width: 24vw; + margin-right: 20px; + } + + .browse-second-row { + width: 68vw; + } + .browse-search-bar input { + width: 94vw; + } + .browse-search-bar .browse-format-filter { + margin-left: 50% + } + .browse-search-bar .browse-sort-by-filter { + margin-left: 65% + } + +} + +@media only screen and (max-width: 1005px) { + .browse-sub-container { + display: block; + } + .browse-second-row { + width: 94vw; + } + .browse-first-row { + width: 94vw; + } + .browse-search-bar input { + position: static; + margin-bottom: 1vw; + } + .browse-search-bar .browse-format-filter { + margin-left: 0; + position: static; + border-radius: 14px; + width: 46.5vw; + box-shadow: rgba(100, 100, 111, 0.1) 0px 7px 29px 0px; + margin-right: 1vw; + } + .browse-search-bar .browse-sort-by-filter { + margin-left: 0; + position: static; + border-radius: 14px; + width: 46vw; + box-shadow: rgba(100, 100, 111, 0.1) 0px 7px 29px 0px; + } + + .browse-sub-container { + margin-top: 20px; + } + .browse-center { + margin-left: 20px; + } +} + +@media only screen and (max-width: 893px) { + .browse-ontology-container { + display: block; + } + .browse-ontology-description { + width: 100%; + } + .browse-ontology-cards { + direction: ltr; + margin-top: 20px; + } + .browse-ontology-deprecated { + margin-right: 0; + } + .browse-ontology-view { + margin-right: 0; + } + +} + + +// Browser loader skeleton + +.browse-sket { + display: flex; +} + +.browse-sket-column-one { + margin-right: 37px; +} + +.browse-sket-column-one .one { + width: 525px; + height: 50px; + background: linear-gradient(-90deg, #EEE, #F5F5F5, #EEE); + border-radius: 5px; + margin-bottom: 15px; + background-size: 400% 400%; + animation: skeleton 3s ease-in-out infinite; +} + +.browse-sket-column-one .two { + width: 525px; + height: 44px; + background: linear-gradient(-90deg, #EEE, #F5F5F5, #EEE); + border-radius: 5px; + margin-bottom: 15px; + background-size: 400% 400%; + animation: skeleton 3s ease-in-out infinite; +} + +.browse-sket-column-one .three { + width: 525px; + height: 18px; + background: linear-gradient(-90deg, #EEE, #F5F5F5, #EEE); + border-radius: 5px; + margin-bottom: 15px; + background-size: 400% 400%; + animation: skeleton 3s ease-in-out infinite; +} + +.browse-sket-column-one .four { + width: 160px; + height: 36px; + background: linear-gradient(-90deg, #EEE, #F5F5F5, #EEE); + border-radius: 5px; + background-size: 400% 400%; + animation: skeleton 3s ease-in-out infinite; +} + +.browse-sket-column-two { + margin-right: 15px; +} + +.browse-sket-column-two .one { + width: 113px; + height: 78px; + background: linear-gradient(-90deg, #EEE, #F5F5F5, #EEE); + border-radius: 5px; + margin-bottom: 15px; + background-size: 400% 400%; + animation: skeleton 3s ease-in-out infinite; +} + +.browse-sket-column-two .two { + width: 113px; + height: 78px; + background: linear-gradient(-90deg, #EEE, #F5F5F5, #EEE); + border-radius: 5px; + margin-bottom: 15px; + background-size: 400% 400%; + animation: skeleton 3s ease-in-out infinite; +} + +.browse-sket-column-three .one { + width: 113px; + height: 78px; + background: linear-gradient(-90deg, #EEE, #F5F5F5, #EEE); + border-radius: 5px; + margin-bottom: 15px; + background-size: 400% 400%; + animation: skeleton 3s ease-in-out infinite; +} + +.browse-sket-column-three .two { + width: 113px; + height: 78px; + background: linear-gradient(-90deg, #EEE, #F5F5F5, #EEE); + border-radius: 5px; + margin-bottom: 15px; + background-size: 400% 400%; + animation: skeleton 3s ease-in-out infinite; +} + +@keyframes skeleton { + 0% { + background-position: 0 0; + } + 100% { + background-position: 400% 0; + + } + + +} + + +#back_top_btn { + position: fixed; + bottom: 30px; + right: 30px; + transition: background-color .3s, + opacity .5s, visibility .5s; + opacity: 0; + visibility: hidden; + z-index: 1000; +} + + +#back_top_btn.show { + opacity: 1; + visibility: visible; +} \ No newline at end of file diff --git a/app/assets/stylesheets/components/chips.scss b/app/assets/stylesheets/components/chips.scss index 9815dbdf1..ac1a2a939 100644 --- a/app/assets/stylesheets/components/chips.scss +++ b/app/assets/stylesheets/components/chips.scss @@ -18,7 +18,7 @@ .chips-container div label input[type="checkbox"]{ display: none; } -.chips-container div label span{ +.chips-container div label > span{ position: relative; display: flex; align-items: center; @@ -31,6 +31,10 @@ user-select: none; } +.chips-container.disabled div label > span, .chips-container div label span:has(span.disabled){ + background-color: #f8f9fa !important; +} + .chips-container div label input[type="checkbox"]:checked ~ span{ border: 1px solid var(--primary-color); color: var(--primary-color); diff --git a/app/assets/stylesheets/components/pill_button.scss b/app/assets/stylesheets/components/pill_button.scss index a7060d77f..10641b357 100644 --- a/app/assets/stylesheets/components/pill_button.scss +++ b/app/assets/stylesheets/components/pill_button.scss @@ -7,7 +7,6 @@ border-radius: 32px; padding: 10px 20px; cursor: pointer; - margin-left: 10px; transition: background-color ease 0.3s; white-space: nowrap; background-color: transparent; diff --git a/app/assets/stylesheets/ontologies.scss b/app/assets/stylesheets/ontologies.scss index a6e024f4c..a211db1b9 100644 --- a/app/assets/stylesheets/ontologies.scss +++ b/app/assets/stylesheets/ontologies.scss @@ -1,6 +1,10 @@ $ont-metadata-bg-color: #e2ebf0; $widget-table-border-color: #EFEFEF; +svg path { + fill: var(--primary-color); +} + .ontologies.show .gutter { background-repeat: no-repeat; background-position: center; diff --git a/app/components/chip_button_component.rb b/app/components/chip_button_component.rb index 64e9e5672..f503dca5a 100644 --- a/app/components/chip_button_component.rb +++ b/app/components/chip_button_component.rb @@ -1,8 +1,9 @@ class ChipButtonComponent < ViewComponent::Base - def initialize(url: nil, text: nil, type: "static", **html_options) + def initialize(url: nil, text: nil, type: "static", disabled: false, **html_options) @url = url @text = text @type = type + @disabled = disabled @html_options = html_options.merge({href: @url}) end end \ No newline at end of file diff --git a/app/components/chips_component/chips_component.html.haml b/app/components/chips_component/chips_component.html.haml index 3191dc1d3..e5ef551b6 100644 --- a/app/components/chips_component/chips_component.html.haml +++ b/app/components/chips_component/chips_component.html.haml @@ -1,7 +1,7 @@ -.chips-container +.chips-container{class: @disabled ? 'disabled' : ''} %div %label{:for => "chips-#{@id}-check"} - %input{:id => "chips-#{@id}-check", :name => @name, :type => "checkbox", :value => @value, checked: checked?} + %input{:id => "chips-#{@id}-check", :name => @name, :type => "checkbox", :value => @value, checked: checked?, disabled: @disabled} %span %svg.chips-check-icon{:fill => "none", :height => "8", :viewbox => "0 0 10 8", :width => "10", :xmlns => "http://www.w3.org/2000/svg"} %path{:d => "M9.76764 0.232287C9.45824 -0.0775267 8.95582 -0.0773313 8.646 0.232287L3.59787 5.28062L1.35419 3.03696C1.04438 2.72714 0.542174 2.72714 0.23236 3.03696C-0.0774534 3.34677 -0.0774534 3.84897 0.23236 4.15879L3.03684 6.96326C3.19165 7.11807 3.39464 7.19567 3.59765 7.19567C3.80067 7.19567 4.00386 7.11827 4.15867 6.96326L9.76764 1.3541C10.0775 1.0445 10.0775 0.542081 9.76764 0.232287Z"} diff --git a/app/components/display/info_tooltip_component.rb b/app/components/display/info_tooltip_component.rb index 12c3bf93d..478d18690 100644 --- a/app/components/display/info_tooltip_component.rb +++ b/app/components/display/info_tooltip_component.rb @@ -7,7 +7,7 @@ def initialize(text: ) @text = text end def call - image_tag("icons/info.svg", data:{controller:'tooltip'}, title: @text) + image_tag("icons/info.svg", data:{controller:'tooltip', 'tooltip-interactive-value': 'true'}, title: @text) end end diff --git a/app/components/infinite_scroll_component.rb b/app/components/infinite_scroll_component.rb index a52358feb..ecbfa3a88 100644 --- a/app/components/infinite_scroll_component.rb +++ b/app/components/infinite_scroll_component.rb @@ -3,20 +3,18 @@ class InfiniteScrollComponent < ViewComponent::Base include Turbo::FramesHelper attr_reader :collection + renders_one :error + renders_one :loader - def initialize(id:, collection:, next_url:, current_page:, next_page:, auto_click: false) + def initialize(id:, collection:, next_url:, current_page:, next_page:) super @id = id @collection = collection @next_url = next_url @current_page = current_page @next_page = next_page - @auto_click = auto_click - end - def auto_click? - @auto_click end end diff --git a/app/components/infinite_scroll_component/infinite_scroll_component.html.haml b/app/components/infinite_scroll_component/infinite_scroll_component.html.haml index 5bdcb976c..85620fcb8 100644 --- a/app/components/infinite_scroll_component/infinite_scroll_component.html.haml +++ b/app/components/infinite_scroll_component/infinite_scroll_component.html.haml @@ -1,15 +1,13 @@ = turbo_frame_tag "#{@id}_view-page-#{@current_page}" do - if @collection && !@collection.empty? .hide-if-loading - %div - %ul.simpleTree{data:{controller: 'simple-tree','simple-tree': { 'auto-click-value': auto_click? }, action: 'clicked->history#updateURL'}} - %li.root - %ul - = content + = content - if @next_page = turbo_frame_tag "#{@id}_view-page-#{@next_page}", loading: :lazy, src: @next_url do - Loading ... - - elsif @current_page == 1 - %div.text-wrap - = render Display::AlertComponent.new { error } + - if loader? + = loader + - else + Loading ... + - elsif @current_page.eql?(1) && error? + = error diff --git a/app/components/loader_component.rb b/app/components/loader_component.rb index 6d3a217f6..a17b9f8b6 100644 --- a/app/components/loader_component.rb +++ b/app/components/loader_component.rb @@ -25,4 +25,11 @@ def call end end + def small? + @small + end + def small_class + "spinner-border-sm" + end + end diff --git a/app/components/ontology_browse_card_component.rb b/app/components/ontology_browse_card_component.rb new file mode 100644 index 000000000..6e55bd627 --- /dev/null +++ b/app/components/ontology_browse_card_component.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class OntologyBrowseCardComponent < ViewComponent::Base + + def initialize(ontology: nil) + super + @ontology = ontology + end + + def ontology + @ontology + end +end diff --git a/app/components/ontology_browse_card_component/ontology_browse_card_component.html.haml b/app/components/ontology_browse_card_component/ontology_browse_card_component.html.haml new file mode 100644 index 000000000..93feaaa15 --- /dev/null +++ b/app/components/ontology_browse_card_component/ontology_browse_card_component.html.haml @@ -0,0 +1,90 @@ +- if ontology + .browse-ontology-container + .browse-ontology-description + .browse-ontology-title-bar + %a.browse-ontology-title{:href => "/ontologies/#{ontology[:acronym]}", data: {'turbo-frame': '_top'}} + = ontology[:name]+" ("+ontology[:acronym]+")" + - if ontology[:private] + %i.fas.fa-key{title:"Private Ontology"} + .browse-desc-container{data:{controller:"text-truncate", 'text-truncate-more-text-value': '+ Show more ...' , 'text-truncate-less-text-value': '- Show less ...'}} + %p.browse-desc-text{'data-text-truncate-target': 'content'} + = ontology[:description] + .browse-show-more-button{data:{'text-truncate-target': 'button', 'action':"click->text-truncate#toggle"}} + + Show more ... + + + - unless ontology[:fairScore].nil? || ontology[:acronym] == 'AGROVOC' + .browse-fair + %p.browse-fair-title + FAIR score + .browse-progress-bar + .browse-faire-progress{:style => "width: #{ontology[:normalizedFairScore].to_s+"%"}"} + %p.browse-fair-score + = ontology[:fairScore] + %a.browse-fair-details{:href => "/ontologies/#{ontology[:acronym]}#fair-details"} FAIR details ... + .d-flex.align-items-baseline + - if ontology[:creationDate] + .browse-uploaded + %p.mr-1 Uploaded + %p.browse-uploaded-date{data:{controller: 'timeago', 'timeago-datetime-value': ontology[:creationDate], 'timeago-add-suffix-value': 'true'}} + - if ontology[:contact] + %p.mx-1 by + %p.browse-uploaded-date.text-truncate + = ontology[:contact].humanize + + - if ontology[:released] + .browse-ontology-view{data:{controller:'tooltip'}, title: "Release date #{ontology[:released].split('/').last}"} + = DateTime.parse(ontology[:released]).year + + - if ontology[:format] + .browse-ontology-view + = ontology[:format] + - if ontology[:deprecated] + .browse-ontology-deprecated + deprecated + - if ontology[:viewOfOnt] + .browse-ontology-view{data:{controller:'tooltip'}, title: "View of the ontology #{ontology[:viewOfOnt].split('/').last}"} + view + - if session[:user].admin? + %div.admin-broder{title: content_tag(:div, debug(ontology), style: 'height: 300px; overflow: scroll'), data:{controller: 'tooltip', 'tooltip-interactive-value': 'true'}} + .browse-ontology-view.admin-background + Debug + .browse-ontology-cards + - if ontology[:format] != 'SKOS' && ontology[:class_count] > 0 + %a.browse-onology-card{:href => "/ontologies/#{ontology[:acronym]}?p=classes"} + %p.browse-card-number + = ontology[:class_count_formatted] + %p.browse-card-text + classes + - if ontology[:individual_count] > 0 + %a.browse-onology-card{:href => "/ontologies/#{ontology[:acronym]}?p=classes"} + %p.browse-card-number + = ontology[:individual_count_formatted] + %p.browse-card-text + = ontology[:format] == 'SKOS' ? "concepts" : "instances" + - if ontology[:project_count] > 0 + %a.browse-onology-card{:href => "/ontologies/#{ontology[:acronym]}#projects_content"} + %p.browse-card-number + = ontology[:project_count] + %p.browse-card-text + projects + - if ontology[:note_count] > 0 + %a.browse-onology-card{:href => "#"} + %p.browse-card-number + = ontology[:note_count] + %p.browse-card-text + notes +- else + .browse-ontology-container + .browse-sket + .browse-sket-column-one + .one + .two + .three + .four + .browse-sket-column-two + .one + .two + .browse-sket-column-three + .one + .two \ No newline at end of file diff --git a/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml index 45236a517..76d6e6247 100644 --- a/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml +++ b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml @@ -1,4 +1,4 @@ -%div{@controller_params} +%div{@controller_params, style: 'margin-left: 10px;'} = render PillButtonComponent.new do %a.d-flex.align-items-center{href: @link} = inline_svg_tag "eye.svg" diff --git a/app/components/tree_infinite_scroll_component.rb b/app/components/tree_infinite_scroll_component.rb new file mode 100644 index 000000000..4d751bf17 --- /dev/null +++ b/app/components/tree_infinite_scroll_component.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class TreeInfiniteScrollComponent < ViewComponent::Base + + attr_reader :collection + renders_one :error + + def initialize(id:, collection:, next_url:, current_page:, next_page:, auto_click: false) + super + @id = id + @collection = collection + @next_url = next_url + @current_page = current_page + @next_page = next_page + @auto_click = auto_click + end + + def auto_click? + @auto_click + end +end diff --git a/app/components/tree_infinite_scroll_component/tree_infinite_scroll_component.html.haml b/app/components/tree_infinite_scroll_component/tree_infinite_scroll_component.html.haml new file mode 100644 index 000000000..a6d699059 --- /dev/null +++ b/app/components/tree_infinite_scroll_component/tree_infinite_scroll_component.html.haml @@ -0,0 +1,15 @@ += render InfiniteScrollComponent.new(id: @id, + collection: @collection, + next_url: @next_url, + current_page: @current_page, next_page: @next_page) do |c| + + %div + %ul.simpleTree{data:{controller: 'simple-tree','simple-tree': { 'auto-click-value': auto_click? }, action: 'clicked->history#updateURL'}} + %li.root + %ul + = content + + - c.error do + %div.text-wrap + = render AlertMessageComponent.new(id: "#{@id}_view_alert") do + = error \ No newline at end of file diff --git a/app/components/turbo_frame_component.rb b/app/components/turbo_frame_component.rb index f14f587cd..d25322e15 100644 --- a/app/components/turbo_frame_component.rb +++ b/app/components/turbo_frame_component.rb @@ -3,6 +3,8 @@ class TurboFrameComponent < ViewComponent::Base include Turbo::FramesHelper + renders_one :loader + def initialize(id:, src: '', **html_options) @id = id @src = src diff --git a/app/components/turbo_frame_component/turbo_frame_component.html.haml b/app/components/turbo_frame_component/turbo_frame_component.html.haml index 51ce9169c..4ffcb9641 100644 --- a/app/components/turbo_frame_component/turbo_frame_component.html.haml +++ b/app/components/turbo_frame_component/turbo_frame_component.html.haml @@ -3,7 +3,10 @@ %div.hide-if-loading = content %div.show-if-loading.my-auto.mx-auto - %div.p-3 - = render LoaderComponent.new + - if loader? + = loader + - else + %div.p-3 + = render LoaderComponent.new %div{'data-turbo-frame-error-target': 'errorMessage', style:'display: none; width: 100%'} = render Display::AlertComponent.new(type:'danger') \ No newline at end of file diff --git a/app/controllers/concerns/submission_filter.rb b/app/controllers/concerns/submission_filter.rb new file mode 100644 index 000000000..c97434847 --- /dev/null +++ b/app/controllers/concerns/submission_filter.rb @@ -0,0 +1,247 @@ +module SubmissionFilter + extend ActiveSupport::Concern + + BROWSE_ATTRIBUTES = ['ontology', 'submissionStatus', 'description', 'pullLocation', 'creationDate', + 'contact', 'released', 'naturalLanguage', 'hasOntologyLanguage', + 'hasFormalityLevel', 'isOfType', 'deprecated', 'status', 'metrics'] + + def init_filters(params) + @show_views = params[:show_views]&.eql?('true') + @show_private_only = params[:private_only]&.eql?('true') + @show_retired = params[:show_retired]&.eql?('true') + @selected_format = params[:format] + @selected_sort_by = params[:sort_by] + @search = params[:search] + end + + def submissions_paginate_filter(params) + request_params = filters_params(params, page: params[:page] || 1) + init_filters(params) + @page = LinkedData::Client::Models::OntologySubmission.all(request_params) + + submissions = @page.collection + + # analytics = LinkedData::Client::Analytics.last_month + # @analytics = Hash[analytics.onts.map { |o| [o[:ont].to_s, o[:views]] }] + + # get fair scores of all ontologies + @fair_scores = fairness_service_enabled? ? get_fair_score('all') : nil + submissions.reject{|sub| sub.ontology.nil?}.map { |sub| ontology_hash(sub) } + end + + def ontologies_filter_url(filters, page: 1, count: false) + helpers.ontologies_filter_url(filters, page: page, count: count) + end + + private + + def filters_params(params, includes: BROWSE_ATTRIBUTES.join(','), page: 1, pagesize: 5) + request_params = { display_links: false, display_context: false, + include: includes, include_status: 'RDF' } + request_params.merge!(page: page, pagesize: pagesize) if page + params[:sort_by] ||= 'ontology_name' + filters_values_map = { + categories: :hasDomain, + groups: :group, + naturalLanguage: :naturalLanguage, + isOfType: :isOfType, + format: :hasOntologyLanguage, + hasFormalityLevel: :hasFormalityLevel, + search: %i[name acronym], + sort_by: :order_by + } + + filters_boolean_map = { + show_views: { api_key: :also_include_views, default: 'true' }, + private_only: { api_key: :viewingRestriction, default: 'private' }, + show_retired: { api_key: :status, default: 'retired' } + } + @filters = {} + + filters_boolean_map.each do |k, v| + next unless params[k].eql?('true') || params[k].eql?(v[:default]) + + @filters.merge!(k => v[:default]) + request_params.merge!(v[:api_key] => v[:default]) + end + + filters_values_map.each do |filter, api_key| + next if params[filter].nil? || params[filter].empty? + + @filters.merge!(filter => params[filter]) + Array(api_key).each do |key| + request_params.merge!(key => params[filter]) + end + end + @show_views = params[:show_views]&.eql?('true') + @show_private_only = params[:private_only]&.eql?('true') + @show_retired = params[:show_retired]&.eql?('true') + @selected_format = params[:format] + @search = params[:search] + + request_params + end + + def ontology_hash(sub) + o = {} + ont = sub.ontology + + add_ontology_attributes(o, ont) + add_submission_attributes(o, sub) + add_fair_score_metrics(o, ont) + + if sub.metrics + o[:class_count] = sub.metrics.classes + o[:individual_count] = sub.metrics.individuals + else + o[:class_count] = 0 + o[:individual_count] = 0 + end + o[:class_count_formatted] = number_with_delimiter(o[:class_count], delimiter: ',') + o[:individual_count_formatted] = number_with_delimiter(o[:individual_count], delimiter: ',') + + o[:note_count] = ont.notes.length + o[:project_count] = ont.projects.length + # o[:popularity] = @analytics[ont.acronym] || 0 + + # if o[:type].eql?('ontology_view') + # unless ontologies_hash[ont.viewOf].blank? + # o[:viewOfOnt] = { + # name: ontologies_hash[ont.viewOf].name, + # acronym: ontologies_hash[ont.viewOf].acronym + # } + # end + # end + + o + end + + def add_submission_attributes(ont_hash, sub) + ont_hash[:submissionStatus] = sub.submissionStatus + ont_hash[:deprecated] = sub.deprecated + ont_hash[:status] = sub.status + ont_hash[:submission] = true + ont_hash[:pullLocation] = sub.pullLocation + ont_hash[:description] = sub.description + ont_hash[:creationDate] = sub.creationDate + ont_hash[:released] = sub.released + ont_hash[:naturalLanguage] = sub.naturalLanguage + ont_hash[:hasFormalityLevel] = sub.hasFormalityLevel + ont_hash[:isOfType] = sub.isOfType + ont_hash[:submissionStatusFormatted] = submission_status2string(sub).gsub(/\(|\)/, '') + ont_hash[:format] = sub.hasOntologyLanguage + ont_hash[:contact] = sub.contact.map(&:name).first unless sub.contact.nil? + end + + def add_ontology_attributes(ont_hash, ont) + return if ont.nil? + + ont_hash[:id] = ont.id + ont_hash[:type] = ont.viewOf.nil? ? 'ontology' : 'ontology_view' + ont_hash[:show] = ont.viewOf.nil? ? true : false # show ontologies only by default + ont_hash[:groups] = ont.group || [] + ont_hash[:categories] = ont.hasDomain || [] + ont_hash[:private] = ont.private? + ont_hash[:submissionStatus] = [] + ont_hash[:administeredBy] = ont.administeredBy + ont_hash[:name] = ont.name + ont_hash[:acronym] = ont.acronym + ont_hash[:projects] = ont.projects + ont_hash[:notes] = ont.notes + ont_hash[:viewOfOnt] = ont.viewOf + end + + def add_fair_score_metrics(ont_hash, ont) + if !@fair_scores.nil? && !@fair_scores[ont.acronym].nil? + ont_hash[:fairScore] = @fair_scores[ont.acronym]['score'] + ont_hash[:normalizedFairScore] = @fair_scores[ont.acronym]['normalizedScore'] + else + ont_hash[:fairScore] = nil + ont_hash[:normalizedFairScore] = 0 + end + end + + def ontology_filters_init(categories, groups) + @languages = submission_metadata.select { |x| x['@id']['naturalLanguage'] }.first['enforcedValues'].map do |id, name| + { 'id' => id, 'name' => name, 'value' => id.split('/').last, 'acronym' => name } + end + + @formalityLevel = submission_metadata.select { |x| x['@id']['hasFormalityLevel'] }.first['enforcedValues'].map do |id, name| + { 'id' => id, 'name' => name, 'acronym' => name.camelize(:lower), 'value' => name.delete(' ')} + end + + @isOfType = submission_metadata.select { |x| x['@id']['isOfType'] }.first['enforcedValues'].map do |id, name| + { 'id' => id, 'name' => name, 'acronym' => name.camelize(:lower), 'value' => name.delete(' ') } + end + + @formats = [['All formats', ''], 'OBO', 'OWL', 'SKOS', 'UMLS'] + @sorts_options = [['Sort by', ''], ['Name', 'ontology_name'], + ['Class count', 'metrics_classes'], ['Instances/Concepts count', 'metrics_individuals'], + ['Upload date', 'creationDate'], ['Release date', 'released']] + + init_filters(params) + # @missingStatus = [ + # {'id' => 'RDF', 'name' => 'RDF', 'acronym' => 'RDF'}, + # {'id' => 'ABSOLETE', 'name' => 'ABSOLETE', 'acronym' => 'ABSOLETE'}, + # {'id' => 'METRICS', 'name' => 'METRICS', 'acronym' => 'METRICS'}, + # {'id' => 'RDF_LABELS', 'name' => 'RDF LABELS', 'acronym' => 'RDFLABELS'}, + # {'id' => 'UPLOADED', 'name' => 'UPLOADED', 'acronym' => 'UPLOADED'}, + # {'id' => 'INDEXED_PROPERTIES', 'name' => 'INDEXED PROPERTIES', 'acronym' => 'INDEXED_PROPERTIES'}, + # {'id' => 'ANNOTATOR', 'name' => 'ANNOTATOR', 'acronym' => 'ANNOTATOR'}, + # {'id' => 'DIFF', 'name' => 'DIFF', 'acronym' => 'DIFF'} + # ] + + { + categories: object_filter(categories, :categories), + groups: object_filter(groups, :groups), + naturalLanguage: object_filter(@languages, :naturalLanguage), + hasFormalityLevel: object_filter(@formalityLevel, :hasFormalityLevel), + isOfType: object_filter(@isOfType, :isOfType), + #missingStatus: object_filter(@missingStatus, :missingStatus) + } + end + + def check_id(name_value, objects, name_key) + selected_category = objects.select { |x| x[name_key].parameterize.underscore.eql?(name_value.parameterize.underscore) } + selected_category.first && selected_category.first['id'] + end + + def object_checks(key) + params[key]&.split(',') + end + + def object_filter(objects, object_name, name_key = 'acronym') + checks = object_checks(object_name) || [] + checks = checks.map { |x| check_id(x, objects, name_key) }.compact + + ids = objects.map { |x| x['id'] } + count = ids.count { |x| checks.include?(x) } + [objects, checks, count] + end + + def count_objects(ontologies) + objects_count = {} + @categories = LinkedData::Client::Models::Category.all(display_links: false, display_context: false) + @groups = LinkedData::Client::Models::Group.all(display_links: false, display_context: false) + @filters = ontology_filters_init(@categories, @groups) + object_names = @filters.keys + + + @filters.each do |filter, values| + objects = values.first + objects_count[filter] = objects.map { |v| [v['id'], 0] }.to_h + end + + ontologies.each do |ontology| + object_names.each do |name| + values = Array(ontology[name]) + values.each do |v| + objects_count[name] = {} unless objects_count[name] + objects_count[name][v] = (objects_count[name][v] || 0) + 1 + end + end + end + objects_count + end + +end diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb index 280af07bc..79e7e40af 100644 --- a/app/controllers/ontologies_controller.rb +++ b/app/controllers/ontologies_controller.rb @@ -8,6 +8,8 @@ class OntologiesController < ApplicationController include CollectionsHelper include MappingStatistics include OntologyUpdater + include TurboHelper + include SubmissionFilter require 'multi_json' require 'cgi' @@ -15,11 +17,11 @@ class OntologiesController < ApplicationController helper :concepts helper :fair_score - layout :determine_layout + layout 'ontology' - before_action :authorize_and_redirect, :only=>[:edit,:update,:create,:new] + before_action :authorize_and_redirect, :only => [:edit, :update, :create, :new] before_action :submission_metadata, only: [:show] - KNOWN_PAGES = Set.new(["terms", "classes", "mappings", "notes", "widgets", "summary", "properties" ,"instances", "schemes", "collections"]) + KNOWN_PAGES = Set.new(["terms", "classes", "mappings", "notes", "widgets", "summary", "properties", "instances", "schemes", "collections"]) EXTERNAL_MAPPINGS_GRAPH = "http://data.bioontology.org/metadata/ExternalMappings" INTERPORTAL_MAPPINGS_GRAPH = "http://data.bioontology.org/metadata/InterportalMappings" @@ -31,125 +33,56 @@ class OntologiesController < ApplicationController # GET /ontologies def index - @app_name = 'FacetedBrowsing' - @app_dir = '/browse' - @base_path = @app_dir - ontologies = LinkedData::Client::Models::Ontology.all(include: LinkedData::Client::Models::Ontology.include_params + ',viewOf', include_views: true, display_context: false) - ontologies_hash = Hash[ontologies.map {|o| [o.id, o] }] - @admin = session[:user] ? session[:user].admin? : false - @development = Rails.env.development? - - # We could get naturalLanguages, isOfType and formalityLevels from the API, but for performance we are storing it in config/bioportal_config_production.rb - #@metadata = submission_metadata - - # The attributes used when retrieving the submission. We are not retrieving all attributes to be faster - browse_attributes = 'ontology,acronym,submissionStatus,description,pullLocation,creationDate,released,name,naturalLanguage,hasOntologyLanguage,hasFormalityLevel,isOfType,contact' - submissions = LinkedData::Client::Models::OntologySubmission.all(include_views: true, display_links: false,display_context: false, include: browse_attributes) - submissions_map = Hash[submissions.map {|sub| [sub.ontology.acronym, sub] }] - @categories = LinkedData::Client::Models::Category.all(display_links: false, display_context: false) - @categories_hash = Hash[@categories.map {|c| [c.id, c] }] - @groups = LinkedData::Client::Models::Group.all(display_links: false, display_context: false) - @groups_hash = Hash[@groups.map {|g| [g.id, g] }] - - analytics = LinkedData::Client::Analytics.last_month - @analytics = Hash[analytics.onts.map {|o| [o[:ont].to_s, o[:views]]}] + @filters = ontology_filters_init(@categories, @groups) + init_filters(params) + render 'ontologies/browser/browse' + end - reviews = {} - LinkedData::Client::Models::Review.all(display_links: false, display_context: false).each do |r| - reviews[r.reviewedOntology] ||= [] - reviews[r.reviewedOntology] << r - end + def ontologies_filter - metrics_hash = get_metrics_hash + params[:sort_by] = 'creationDate' if params[:search] - @formats = Set.new - #get fairscores of all ontologies - @fair_scores = fairness_service_enabled? ? get_fair_score('all') : nil; - @ontologies = [] - ontologies.each do |ont| - o = {} + if params[:count] + request_params = filters_params(params, includes: 'ontology,naturalLanguage,hasFormalityLevel,isOfType', page: nil) + submissions = LinkedData::Client::Models::OntologySubmission.all(request_params) + @object_count = count_objects(submissions.map { |sub| ontology_hash(sub) }) - if metrics_hash[ont.id] - o[:class_count] = metrics_hash[ont.id].classes - o[:individual_count] = metrics_hash[ont.id].individuals - else - o[:class_count] = 0 - o[:individual_count] = 0 - end - o[:class_count_formatted] = number_with_delimiter(o[:class_count], delimiter: ',') - o[:individual_count_formatted] = number_with_delimiter(o[:individual_count], delimiter: ',') - - o[:id] = ont.id - o[:type] = ont.viewOf.nil? ? 'ontology' : 'ontology_view' - o[:show] = ont.viewOf.nil? ? true : false # show ontologies only by default - o[:reviews] = reviews[ont.id] || [] - o[:groups] = ont.group || [] - o[:categories] = ont.hasDomain || [] - o[:note_count] = ont.notes.length - o[:review_count] = ont.reviews.length - o[:project_count] = ont.projects.length - o[:private] = ont.private? - o[:popularity] = @analytics[ont.acronym] || 0 - o[:submissionStatus] = [] - o[:administeredBy] = ont.administeredBy - o[:name] = ont.name - o[:acronym] = ont.acronym - o[:projects] = ont.projects - o[:notes] = ont.notes - - if !@fair_scores.nil? && !@fair_scores[ont.acronym].nil? - o[:fairScore] = @fair_scores[ont.acronym]['score'] - o[:normalizedFairScore] = @fair_scores[ont.acronym]['normalizedScore'] - else - o[:fairScore] = nil - o[:normalizedFairScore] = 0 - end - - if o[:type].eql?('ontology_view') - unless ontologies_hash[ont.viewOf].blank? - o[:viewOfOnt] = { - name: ontologies_hash[ont.viewOf].name, - acronym: ontologies_hash[ont.viewOf].acronym - } + update_filters_counts = @object_count.map do |section, values_count| + values_count.map do |value, count| + replace("count_#{section}_#{value}") do + helpers.turbo_frame_tag("count_#{section}_#{value}") do + helpers.content_tag(:span, count.to_s, class: "hide-if-loading #{count.zero? ? 'disabled' : ''}") + end + end + end + end.flatten + streams = [ + replace('ontologies_filter_count_request') do + helpers.content_tag(:p, class: "browse-desc-text", style: "margin-bottom: 12px !important;") { "Showing #{submissions.size}" } end - end - - o[:artifacts] = [] - o[:artifacts] << 'notes' if ont.notes.length > 0 - o[:artifacts] << 'reviews' if ont.reviews.length > 0 - o[:artifacts] << 'projects' if ont.projects.length > 0 - o[:artifacts] << 'summary_only' if ont.summaryOnly - - sub = submissions_map[ont.acronym] - if sub - o[:submissionStatus] = sub.submissionStatus - o[:submission] = true - o[:pullLocation] = sub.pullLocation - o[:description] = sub.description - o[:creationDate] = sub.creationDate - o[:released] = sub.released - o[:naturalLanguage] = sub.naturalLanguage - o[:hasFormalityLevel] = sub.hasFormalityLevel - o[:isOfType] = sub.isOfType - o[:submissionStatusFormatted] = submission_status2string(sub).gsub(/\(|\)/, '') - - o[:format] = sub.hasOntologyLanguage - @formats << sub.hasOntologyLanguage - else - # Used to sort ontologies without submissions to the end when sorting on upload date - o[:creationDate] = DateTime.parse('19900601') - end - - @ontologies << o + ] + update_filters_counts + else + @ontologies = submissions_paginate_filter(params) + streams = if params[:page].nil? + [ + prepend('ontologies_list_container', partial: 'ontologies/browser/ontologies'), + prepend('ontologies_list_container') { + helpers.turbo_frame_tag("ontologies_filter_count_request", src: ontologies_filter_url(@filters, page: nil, count: true)) do + helpers.browser_counter_loader + end + } + ] + else + [replace("ontologies_list_view-page-#{@page.page}", partial: 'ontologies/browser/ontologies')] + end end - @ontologies.sort! {|a,b| b[:popularity] <=> a[:popularity]} - render 'browse' + render turbo_stream: streams end def classes @@ -157,7 +90,7 @@ def classes get_class(params) if @submission.hasOntologyLanguage == 'SKOS' - @schemes = get_schemes(@ontology) + @schemes = get_schemes(@ontology) @collections = get_collections(@ontology, add_colors: true) else @instance_details, type = get_instance_and_type(params[:instanceid]) @@ -167,7 +100,6 @@ def classes @instances_concept_id = get_concept_id(params, @concept, @root) end - if ['application/ld+json', 'application/json'].include?(request.accept) render plain: @concept.to_jsonld, content_type: request.accept and return end @@ -241,8 +173,8 @@ def new @ontologies = LinkedData::Client::Models::Ontology.all(include: 'acronym', include_views: true, display_links: false, display_context: false) @categories = LinkedData::Client::Models::Category.all @groups = LinkedData::Client::Models::Group.all - @user_select_list = LinkedData::Client::Models::User.all.map {|u| [u.username, u.id]} - @user_select_list.sort! {|a,b| a[1].downcase <=> b[1].downcase} + @user_select_list = LinkedData::Client::Models::User.all.map { |u| [u.username, u.id] } + @user_select_list.sort! { |a, b| a[1].downcase <=> b[1].downcase } end def notes @@ -260,9 +192,9 @@ def notes def instances if request.xhr? - render partial: 'instances/instances', locals: { id: 'instances-data-table'}, layout: false + render partial: 'instances/instances', locals: { id: 'instances-data-table' }, layout: false else - render partial: 'instances/instances', locals: { id: 'instances-data-table'}, layout: 'ontology_viewer' + render partial: 'instances/instances', locals: { id: 'instances-data-table' }, layout: 'ontology_viewer' end end @@ -392,7 +324,7 @@ def summary @metrics = @ontology.explore.metrics rescue [] #@reviews = @ontology.explore.reviews.sort {|a,b| b.created <=> a.created} || [] - @projects = @ontology.explore.projects.sort {|a,b| a.name.downcase <=> b.name.downcase } || [] + @projects = @ontology.explore.projects.sort { |a, b| a.name.downcase <=> b.name.downcase } || [] @analytics = LinkedData::Client::HTTP.get(@ontology.links['analytics']) # Call to fairness assessment service diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb index 6c50c0515..bd5f77ded 100644 --- a/app/helpers/ontologies_helper.rb +++ b/app/helpers/ontologies_helper.rb @@ -2,9 +2,47 @@ module OntologiesHelper REST_URI = $REST_URL API_KEY = $API_KEY - LANGUAGE_FILTERABLE_SECTIONS = %w[classes schemes collections instances] + LANGUAGE_FILTERABLE_SECTIONS = %w[classes schemes collections instances] + def browse_filter_section_label(key) + labels = { + hasFormalityLevel: 'Formality levels', + isOfType: 'Generic Types', + naturalLanguage: 'Natural languages' + } + labels[key] || key.to_s.underscore.humanize.capitalize + end + + def browser_counter_loader + content_tag(:div, class: "browse-desc-text", style: "margin-bottom: 15px;") do + content_tag(:div, class: "d-flex align-items-center") do + str = content_tag(:span, "Showing") + str += content_tag(:span, "", class: "p-1 p-2", style: "color: #a7a7a7;") do + render LoaderComponent.new(small: true) + end + str + end + end + end + + def ontologies_browse_skeleton(pagesize = 5) + pagesize.times do + concat render OntologyBrowseCardComponent.new + end + end + + def ontologies_filter_url(filters, page: 1, count: false) + url = 'ontologies_filter?' + url += "page=#{page}" if page + url += "count=#{page}" if count + if filters + filters_str = filters.reject { |k, v| v.nil? || (k.eql?(:sort_by) && count) } + .map { |k, v| "#{k}=#{v}" }.join('&') + url += "&#{filters_str}" + end + url + end def additional_details return "" if $ADDITIONAL_ONTOLOGY_DETAILS.nil? || $ADDITIONAL_ONTOLOGY_DETAILS[@ontology.acronym].nil? @@ -32,14 +70,14 @@ def display_data_catalog(value) end def agent?(sub_metadata, attr) - metadata = sub_metadata.select{ |x| x['@id'][attr] }.first + metadata = sub_metadata.select { |x| x['@id'][attr] }.first metadata && Array(metadata['enforce']).include?('Agent') end def display_contact(contacts) - contacts.map {|c| "#{c.name.humanize} at #{c.email}" if c.member?(:name) && c.member?(:email)}&.join(", ") + contacts.map { |c| "#{c.name.humanize} at #{c.email}" if c.member?(:name) && c.member?(:email) }&.join(", ") end - + def count_links(ont_acronym, page_name = 'summary', count = 0) ont_url = "/ontologies/#{ont_acronym}" if count.nil? || count.zero? @@ -61,24 +99,24 @@ def download_link(submission, ontology = nil) links = [] if ontology.summaryOnly if submission.homepage.nil? - links << {href: '', label:'N/A - metadata only'} + links << { href: '', label: 'N/A - metadata only' } else uri = submission.homepage - links << {href: uri, label:'Home Page'} + links << { href: uri, label: 'Home Page' } end else uri = submission.id + "/download?apikey=#{get_apikey}" - links << {href: uri, label:submission.pretty_format} + links << { href: uri, label: submission.pretty_format } latest = ontology.explore.latest_submission({ include_status: 'ready' }) if latest && latest.submissionId == submission.submissionId - links << {href: "#{ontology.id}/download?apikey=#{get_apikey}&download_format=csv", label:"CSV"} + links << { href: "#{ontology.id}/download?apikey=#{get_apikey}&download_format=csv", label: "CSV" } if !latest.hasOntologyLanguage.eql?('UMLS') - links << {href: "#{ontology.id}/download?apikey=#{get_apikey}&download_format=rdf", label:"RDF/XML"} + links << { href: "#{ontology.id}/download?apikey=#{get_apikey}&download_format=rdf", label: "RDF/XML" } end end unless submission.diffFilePath.nil? uri = submission.id + "/download_diff?apikey=#{get_apikey}" - links << {href: uri, label:"DIFF"} + links << { href: uri, label: "DIFF" } end end links @@ -111,6 +149,7 @@ def status_link(submission, latest = false, target = '') end def submission_status2string(sub) + return '' if sub.submissionStatus.nil? # Massage the submission status into a UI string # submission status values, from: # https://github.com/ncbo/ontologies_linked_data/blob/master/lib/ontologies_linked_data/models/submission_status.rb @@ -137,8 +176,8 @@ def submission_status2string(sub) # Link for private/public/licensed ontologies def visibility_link(ontology) ont_url = "/ontologies/#{ontology.acronym}" # 'ontology' is NOT a submission here - page_name = 'summary' # default ontology page view for visibility link - link_name = 'Public' # default ontology visibility + page_name = 'summary' # default ontology page view for visibility link + link_name = 'Public' # default ontology visibility if ontology.summaryOnly link_name = 'Summary Only' elsif ontology.private? @@ -187,15 +226,16 @@ def change_requests_enabled?(ontology_acronym) Rails.configuration.change_request[:ontologies].include? ontology_acronym.to_sym end + def current_section (params[:p]) ? params[:p] : 'summary' end def link_to_section(section_title) - link_to(section_name(section_title) , ontology_path(@ontology.acronym, p: section_title), + link_to(section_name(section_title), ontology_path(@ontology.acronym, p: section_title), id: "ont-#{section_title}-tab", class: "nav-link #{selected_section?(section_title) ? 'active show' : ''}", data: { action: 'click->ontology-viewer-tabs#selectTab', - toggle: "tab", target: "#ont_#{section_title}_content", 'bp-ont-page': section_title , + toggle: "tab", target: "#ont_#{section_title}_content", 'bp-ont-page': section_title, 'bp-ont-page-name': ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section_title) }) end @@ -214,7 +254,7 @@ def ontology_data_section?(section_title = current_section) def section_data(section_title) if ontology_data_section?(section_title) url_value = selected_section?(section_title) ? request.fullpath : "/ontologies/#{@ontology.acronym}?p=#{section_title}" - { controller: "history turbo-frame" , 'turbo-frame-url-value': url_value ,action: "lang_changed->history#updateURL lang_changed->turbo-frame#updateFrame" } + { controller: "history turbo-frame", 'turbo-frame-url-value': url_value, action: "lang_changed->history#updateURL lang_changed->turbo-frame#updateFrame" } else {} end @@ -224,7 +264,7 @@ def lazy_load_section(section_title, &block) if current_section.eql?(section_title) block.call else - render TurboFrameComponent.new(id: section_title, src: "/ontologies/#{@ontology.acronym}?p=#{section_title}", target: '_top', data: {"turbo-frame-target": "frame"} ) + render TurboFrameComponent.new(id: section_title, src: "/ontologies/#{@ontology.acronym}?p=#{section_title}", target: '_top', data: { "turbo-frame-target": "frame" }) end end @@ -251,27 +291,27 @@ def sections_to_show sections end - def language_selector_tag(name) languages = languages_options if languages.empty? && @submission_latest + return unless @ontology.admin?(session[:user]) content_tag(:div, data: { 'ontology-viewer-tabs-target': 'languageSelector' }, style: "visibility: #{ontology_data_section? ? 'visible' : 'hidden'} ; margin-bottom: -1px;") do - edit_submission_property_link(@ontology.acronym, @submission_latest.submissionId, :naturalLanguage) do - "Enable multilingual display " + content_tag(:i, "", class: "fas fa-lg fa-question-circle") + edit_submission_property_link(@ontology.acronym, @submission_latest.submissionId, :naturalLanguage, container_id: '') do + ("Enable multilingual display " + content_tag(:i, "", class: "fas fa-lg fa-question-circle")).html_safe end end else - select_tag name, languages_options, class: '', disabled: !ontology_data_section?, style: "visibility: #{ontology_data_section? ? 'visible' : 'hidden'}; border: none; outline: none;", data: {'ontology-viewer-tabs-target': 'languageSelector'} + select_tag name, languages_options, class: '', disabled: !ontology_data_section?, style: "visibility: #{ontology_data_section? ? 'visible' : 'hidden'}; border: none; outline: none;", data: { 'ontology-viewer-tabs-target': 'languageSelector' } end end def language_selector_hidden_tag(section) hidden_field_tag "language_selector_hidden_#{section}", '', - data: { controller: "language-change", 'language-change-section-value': section, action: "change->language-change#dispatchLangChangeEvent"} + data: { controller: "language-change", 'language-change-section-value': section, action: "change->language-change#dispatchLangChangeEvent" } end - def languages_options(submission = @submission || @submission_latest) + def languages_options(submission = @submission || @submission_latest) current_lang = request_lang submission_lang = submission_languages(submission) # Transform each language into a select option @@ -293,6 +333,7 @@ def dispaly_complex_text(definitions) end return html.html_safe end + def new_view_path(ont_id) ont_id_esc = CGI.escape(ont_id) if session[:user].nil? @@ -301,11 +342,13 @@ def new_view_path(ont_id) "/ontologies/new?ontology[viewOf]=#{ont_id_esc}" end end + def new_element_link(title, link) link_to(link, title: title, class: "mx-1") do inline_svg_tag("icons/plus.svg", width: '15px', height: '15px') end end + def ontology_icon_links(links, submission_latest) links.map do |icon, attr| value = submission_latest.nil? ? nil : submission_latest.send(attr) @@ -316,8 +359,9 @@ def ontology_icon_links(links, submission_latest) link_to(inline_svg("#{icon}.svg"), Array(value).first || '', link_options) end.join.html_safe end + def ontology_depiction_card - return if Array(@submission_latest&.depiction).empty? + return if Array(@submission_latest&.depiction).empty? render Layout::CardComponent.new do list_container(@submission_latest.depiction) do |depiction_url| @@ -325,18 +369,19 @@ def ontology_depiction_card end end end + def metadata_formats_buttons - render SummarySectionComponent.new(title: 'Get my metadata back', show_card: false) do + render SummarySectionComponent.new(title: 'Get my metadata back', show_card: false) do content_tag :div, data: { controller: 'metadata-downloader' } do horizontal_list_container([ - ['NQuads', 'N-Triple'], - ['JsonLd', 'Json-LD'], - ['XML', 'RDF/XML'] - ]) do |format, label| + ['NQuads', 'N-Triple'], + ['JsonLd', 'Json-LD'], + ['XML', 'RDF/XML'] + ]) do |format, label| render ChipButtonComponent.new(type: 'clickable', 'data-action': "metadata-downloader#download#{format}") do - concat content_tag(:span, label) - concat content_tag(:span, inline_svg("summary/download.svg", width: '15px', height: '15px')) - end + concat content_tag(:span, label) + concat content_tag(:span, inline_svg("summary/download.svg", width: '15px', height: '15px')) + end end end end @@ -361,6 +406,23 @@ def ontology_edit_button title: 'Edit metadata') end + def upload_ontology_button + if session[:user].nil? + render PillButtonComponent.new do + link_to "/login?redirect=/ontologies/new" do + inline_svg('upload.svg') + "Submit new ontology" + end + end + + else + render PillButtonComponent.new do + link_to new_ontology_path do + inline_svg('upload.svg') + "Submit new ontology" + end + end + end + end + def submission_json_button render RoundedButtonComponent.new(link: "#{(@submission_latest || @ontology).id}?display=all", target: '_blank', size: 'medium') end diff --git a/app/javascript/controllers/browse_filters_controller.js b/app/javascript/controllers/browse_filters_controller.js new file mode 100644 index 000000000..082bde42f --- /dev/null +++ b/app/javascript/controllers/browse_filters_controller.js @@ -0,0 +1,69 @@ +import {Controller} from "@hotwired/stimulus" +import debounce from "debounce" +// Connects to data-controller="browse-filters" +export default class extends Controller { + + initialize() { + this.dispatchInputEvent = debounce(this.dispatchInputEvent.bind(this), 700); + } + + dispatchInputEvent(event) { + if (event.target.name !== "search") { + return + } + this.#dispatchEvent("search", [event.target.value]) + } + + dispatchFilterEvent(event) { + let checks; + let filter; + + switch (event.target.name) { + case "format": + checks = event.target.value === '' ? [] : [event.target.value] + filter = "format" + break; + case "Sort_by": + checks = [event.target.value] + filter = "sort_by" + break; + case "search": + return + case "views": + checks = event.target.checked ? ['true'] : [] + filter = "show_views" + break; + case "retired": + checks = event.target.checked ? ['true'] : [] + filter = "show_retired" + break; + case "private_only": + checks = event.target.checked ? ['true'] : [] + filter = "private_only" + break; + default: + checks = this.#getSelectedChecks().map(x => x.value) + filter = this.element.id.split("_")[0] + } + + this.#dispatchEvent(filter, checks) + } + + + #dispatchEvent(filter, checks){ + let data = { + [filter]: checks, + } + const customEvent = new CustomEvent('changed', { + detail: { + data: data + }, bubbles: true + }); + + this.element.dispatchEvent(customEvent); + } + #getSelectedChecks() { + return Array.from(this.element.querySelectorAll('input:checked')) + } + +} diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index 59ac72d22..8e366ff45 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -4,6 +4,9 @@ import { application } from "./application" +import BrowseFiltersController from "./browse_filters_controller" +application.register("browse-filters", BrowseFiltersController) + import ChosenController from "./chosen_controller" application.register("chosen", ChosenController) @@ -52,6 +55,9 @@ application.register("ontology-viewer-tabs", OntologyViewerTabsController) import OntoportalAutocompleteController from "./ontoportal_autocomplete_controller" application.register("ontoportal-autocomplete", OntoportalAutocompleteController) +import ShowFilterCountController from "./show_filter_count_controller" +application.register("show-filter-count", ShowFilterCountController) + import PlatformLanguageController from "./platform_language_controller" application.register("platform-language", PlatformLanguageController) diff --git a/app/javascript/controllers/show_filter_count_controller.js b/app/javascript/controllers/show_filter_count_controller.js new file mode 100644 index 000000000..21b3d7250 --- /dev/null +++ b/app/javascript/controllers/show_filter_count_controller.js @@ -0,0 +1,17 @@ +import {Controller} from "@hotwired/stimulus" + +// Connects to data-controller="show-filter-count" + +export default class extends Controller { + static targets = ["countSpan"] + + updateCount() { + const checkInputs = this.element.querySelectorAll('input:checked') + this.element.querySelectorAll('turbo-frame').forEach(x => { + x.setAttribute('busy', 'true') + }) + const count = checkInputs.length + this.countSpanTarget.style.display = count === 0 ? "none" : "inline-block" + this.countSpanTarget.innerHTML = count === 0 ? "" : count + } +} diff --git a/app/javascript/controllers/tooltip_controller.js b/app/javascript/controllers/tooltip_controller.js index 49bf93eee..13f0bb9f5 100644 --- a/app/javascript/controllers/tooltip_controller.js +++ b/app/javascript/controllers/tooltip_controller.js @@ -3,9 +3,12 @@ import useTooltip from "../mixins/useTooltip"; // Connects to data-controller="tooltip" export default class extends Controller { + static values = { + interactive: {type: Boolean, default: false} + } connect() { if(this.element.title && this.element.title !== ''){ - useTooltip(this.element) + useTooltip(this.element, {interactive: this.interactiveValue}) } } } diff --git a/app/javascript/mixins/useTooltip.js b/app/javascript/mixins/useTooltip.js index d444f3fd1..2d2b8bd6c 100644 --- a/app/javascript/mixins/useTooltip.js +++ b/app/javascript/mixins/useTooltip.js @@ -1,6 +1,6 @@ import tippy from 'tippy.js'; -export default function useTooltip(elem) { +export default function useTooltip(elem, params) { const content = elem.title elem.removeAttribute('title') tippy(elem, { @@ -9,7 +9,6 @@ export default function useTooltip(elem) { content: content, allowHTML: true, placement: 'top', - interactive: true, - maxWidth: '400' + maxWidth: '400', ...params }) } \ No newline at end of file diff --git a/app/views/concepts/_date_sorted_list.html.haml b/app/views/concepts/_date_sorted_list.html.haml index ea6ab08bd..517b37590 100644 --- a/app/views/concepts/_date_sorted_list.html.haml +++ b/app/views/concepts/_date_sorted_list.html.haml @@ -1,4 +1,4 @@ -= render InfiniteScrollComponent.new(id: 'concepts_date_sorted_list', += render TreeInfiniteScrollComponent.new(id: 'concepts_date_sorted_list', collection: @concepts, next_url: sorted_by_date_url(@page.nextPage, @concepts.last), current_page: @page.page, next_page: @page.nextPage) do |c| = render_concepts_by_dates diff --git a/app/views/concepts/_list.html.haml b/app/views/concepts/_list.html.haml index 6b67d002f..d3cebdcd5 100644 --- a/app/views/concepts/_list.html.haml +++ b/app/views/concepts/_list.html.haml @@ -1,4 +1,4 @@ -= render InfiniteScrollComponent.new(id: 'concepts_list', += render TreeInfiniteScrollComponent.new(id: 'concepts_list', collection: @concepts, next_url: concept_list_url(@page.nextPage, request_collection_id, @ontology.acronym), current_page: @page.page, next_page: @page.nextPage, diff --git a/app/views/layouts/angular.html.erb b/app/views/layouts/angular.html.erb deleted file mode 100644 index 61b977ad4..000000000 --- a/app/views/layouts/angular.html.erb +++ /dev/null @@ -1,72 +0,0 @@ -<% raise ArgumentError, "@app_name variable must be set to use the Angular layout" unless @app_name%> -<% raise ArgumentError, "@base_path variable must be set to use the Angular layout" unless @base_path%> -<% @base_path = "/#{@base_path}/".gsub(/\/{2,}/, "/") %> -<% appliance_mode = Rails.env.appliance? %> - - - - - - - - - - - - - - - - - - - <% unless appliance_mode %> - - <% end %> - <%= csrf_meta_tag %> - <%if @title.nil?%><%=$ORG_SITE%><%else%><%="#{@title} | #{$ORG_SITE}"%><%end%> - - - <%= stylesheet_link_tag "https://use.fontawesome.com/releases/v5.2.0/css/all.css", integrity: "sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ", crossorigin: "anonymous" %> - <%= stylesheet_link_tag "application" %> - - - <%=javascript_include_tag "vendor"%> - <%=javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/handlebars.js/2.0.0/handlebars.min.js"%> - <%=javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.1/Chart.min.js"%> - <%=javascript_include_tag "//ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js"%> - - <%=render partial: 'layouts/topnav'%> -
    - <%=render partial: 'layouts/notices'%> -
    - - - - <%=yield%> - - - - - - - - - - - - - - - <%= render partial: 'layouts/footer' %> - - - \ No newline at end of file diff --git a/app/views/ontologies/browse.html.erb b/app/views/ontologies/browse.html.erb deleted file mode 100644 index 69d99663a..000000000 --- a/app/views/ontologies/browse.html.erb +++ /dev/null @@ -1,324 +0,0 @@ - - - - -
    -
    <%= t('ontologies.loading') %>
    -

    <%= t('ontologies.please_wait') %>

    -
    - -
    -

    <%= t('browse') %>

    -

    - <%= t('ontologies.intro').html_safe %> - <%= link_to(Rails.configuration.settings.links[:help_ontology_browse], id: 'ontology-browse-help', - 'aria-label': 'View ontology browse help') do %> - - <% end %> -

    - -
    -
    - <%= t('ontologies.welcome_admin') %>
    <%= t('ontologies.admin_help') %> -
    - -
    -

    <%= t('ontologies.debug_info') %>

    - <%= t('types') %>: {{facets.types.active}}
    - <%= t('artifacts') %>: {{facets.artifacts.active}}
    - <%= t('formats') %>: {{facets.formats.active}}
    - <%= t('groups') %>: {{facets.groups.active}}
    - <%= t('categories') %>: {{facets.categories.active}}
    - <%= t('selected_ontologies') %>: {{visible_ont_count}} -
    - -
    - <%if session[:user].nil?%> - - <%= t('ontologies.submit_new_ontology') %> - - <%else%> - - <%= t('ontologies.submit_new_ontology') %> - - <%end%> - - -
    -

    <%= t('ontologies.entry_type') %>

    -
    - - - -
    -
    -
    -
    - -
    -

    <%= t('ontologies.uploaded_in_the_last') %>

    -
    - -
    -
    - -
    -

    <%= t('category') %>

    -
    - - - - ({{facet_counts["categories"][category.id] || 0}}) -
    -
    -
    -
    - -
    -

    <%= t('group') %>

    -
    - - - - ({{facet_counts["groups"][group.id] || 0}}) -
    -
    -
    -
    - -
    -

    <%= t('format') %>

    -
    - - - - ({{facet_counts["formats"][format] || 0}}) -
    -
    -
    -
    - -
    -

    <%= t('ontology_content') %>

    -
    - - - - ({{facet_counts["artifacts"][artifact] || 0}}) -
    -
    -
    -
    - -
    -

    <%= t('natural_language') %>

    -
    - - - - ({{facet_counts["natural_languages"][language_uri] || 0}}) -
    -
    -
    -
    - -
    -

    <%= t('formality_levels') %>

    -
    - - - - ({{facet_counts["formality_levels"][formality_uri] || 0}}) -
    -
    -
    -
    - -
    -

    <%= t('is_of_type') %>

    -
    - - - - ({{facet_counts["is_of_type"][is_of_type_uri] || 0}}) -
    -
    -
    -
    - -
    -

    <%= t('missing_status') %>

    -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - <%= t('showing') %> {{visible_ont_count}} <%= t('of') %> {{ontologies.length}} - - -
    -
    - -
    -
    -

    <%= t('no_matches') %>

    -
    -
    - -
    -
    -
    <%= t('view') %>
    -

    - - {{$index}} - {{ontology.name}} ({{ontology.acronym}}) - - -

    -
    -

    {{ontology.description | descriptionToText}}

    - - <%= t('uploaded') %>: {{ontology.creationDate | date:'shortDate'}} - - - <%= t('format') %>: {{ontology.format}} - - - <%= t('view_of') %>: {{ontology.viewOfOnt.acronym}} - - - <%= t('summary_only') %> - - - <%= t('groups') %>: {{groupAcronyms(ontology.groups).join(', ')}} - - - <%= t('categories') %>: {{categoryNames(ontology.categories).join(', ')}} - - - - <%= t('admins') %>: {{adminUsernames(ontology.administeredBy).join(', ')}} - - - Pull URL - - - <%= t('status') %>: {{ontology.submissionStatusFormatted}} - - -
    - - <%= t('no_submissions_available') %> -
    - - - - -
    -
    -
    -
    - - - - - - diff --git a/app/views/ontologies/browser/_ontologies.html.haml b/app/views/ontologies/browser/_ontologies.html.haml new file mode 100644 index 000000000..3e4d3c130 --- /dev/null +++ b/app/views/ontologies/browser/_ontologies.html.haml @@ -0,0 +1,13 @@ += render InfiniteScrollComponent.new(id: 'ontologies_list', + collection: @ontologies, + next_url: ontologies_filter_url(@filters, page: @page.nextPage), + current_page: @page.page, next_page: @page.nextPage) do |c| + - ontologies = c.collection + - ontologies.each do |ontology| + = render OntologyBrowseCardComponent.new(ontology: ontology) + - c.loader do + - ontologies_browse_skeleton + - c.error do + .browse-empty-illustration + %img{:src => "#{asset_path("empty-box.svg")}"} + %p No result was found \ No newline at end of file diff --git a/app/views/ontologies/browser/browse.html.haml b/app/views/ontologies/browser/browse.html.haml new file mode 100644 index 000000000..2ef7337f4 --- /dev/null +++ b/app/views/ontologies/browser/browse.html.haml @@ -0,0 +1,96 @@ +.browse-center + .browse-container + + .browse-submit-new-ontology-and-you-are-admin-container + - if session[:user]&.admin? + %div + %div.browse-you-are-admin + %h3 Welcome admin + %div + %svg{:fill => "none", :height => "11", :viewbox => "0 0 11 11", :width => "11", :xmlns => "http://www.w3.org/2000/svg"} + %circle{:cx => "5.5", :cy => "5.5", :fill => 'var(--admin-color)', :r => "5.5"} + %p This coloring indicates admin-only features + + %a#back_top_btn.btn.btn-primary.btn-floating.btn-lg + %i.fas.fa-arrow-up.text-white + + :javascript + const btn = document.getElementById("back_top_btn"); + window.addEventListener("scroll", function() { + if (window.scrollY > 300) { + btn.classList.add("show"); + } else { + btn.classList.remove("show"); + } + }); + + btn.addEventListener("click", function(e) { + e.preventDefault(); + window.scrollTo({ + top: 0, + behavior: "smooth" + }); + }); + + %div{data: { controller: "turbo-frame history browse-filters" , "turbo-frame-url-value": "/ontologies_filter", action: "change->browse-filters#dispatchFilterEvent changed->history#updateURL changed->turbo-frame#updateFrame"}} + + .browse-sub-container + .browse-first-row{data:{controller: "browse-filters", action: "change->browse-filters#dispatchFilterEvent changed->history#updateURL"}} + %div.d-flex.p-2{style: "height: 67px"} + = upload_ontology_button + %div{style:'margin-top: 27px'} + %p.browse-filters-title Filters + - if session[:user]&.admin? + %div.browse-filter.admin-border + = render SwitchInputComponent.new(id:'filter-private', name:'private_only', checked: @show_private_only) do + Show private ontology only + %div.browse-filter{style:'border: none'} + = render SwitchInputComponent.new(id:'filter-views', name:'views', checked: @show_views) do + Show ontology views + = render SwitchInputComponent.new(id:'filter-retired', name:'retired',checked: @show_retired) do + Show retired ontologies + + - @filters.each do |key, values| + - if session[:user]&.admin? || key != :missingStatus + .browse-filter{data:{controller: "show-filter-count browse-filters", action: "change->show-filter-count#updateCount change->browse-filters#dispatchFilterEvent"}, id: "#{key}_filter_container", style: "#{"border-color: var(--admin-color);" if key == :missingStatus}"} + .browse-filter-title-bar{"data-target" => "#browse-#{key}-filter", "data-toggle" => "collapse"} + %p + = browse_filter_section_label(key) + %span.badge.badge-primary{"data-show-filter-count-target":"countSpan", style: "#{values[2] && values[2].positive? ? '' : 'display: none;'}"} + = values[2] + %img{:src => "#{asset_path("arrow-down.svg")}"}/ + .collapse{id: "browse-#{key}-filter", class: "#{values[2].positive? ? 'show': ''}"} + .browse-filter-checks-container + - values.first.each do |object| + - title = (key.eql?(:categories) || key.eql?(:groups) ? object["name"] : '') + - value = (object["value"] || object["acronym"] || object["id"]) + %div{data: {controller: 'tooltip'}, title: title} + = render ChipsComponent.new(id: value, name: key, value: value, + label: object["acronym"].humanize, + checked: values[1]&.include?(object["id"])) do |c| + - c.count do + %span.badge.badge-light.ml-1 + = turbo_frame_tag "count_#{key}_#{object["id"]}", busy: true + %span.show-if-loading + = render LoaderComponent.new(small:true) + + .browse-second-row + .browse-search-bar + .browse-search-container + %input{:name => "search", :placeholder => "Start typing to filter ontologies, e.g AGROVOC...", :type => "text", :value => @search, data: {action: "input->browse-filters#dispatchInputEvent"}} + .browse-search-filters + %select#format.browse-format-filter{:name => "format"} + = options_for_select(@formats, @selected_format) + %select#Sort_by.browse-sort-by-filter{:name => "Sort_by"} + = options_for_select(@sorts_options, '') + .browse-ontologies + = render TurboFrameComponent.new(id:"ontologies_list_container", data:{"turbo-frame-target":"frame", "turbo-frame-url-value": "/ontologies_filter"}) do |container| + = turbo_frame_tag "ontologies_filter_count_request", src: "/ontologies_filter?count=true&#{request.original_url.split('?').last}" do + = browser_counter_loader + = render TurboFrameComponent.new(id: "ontologies_list_view-page-1" , src: "/ontologies_filter?page=1&#{request.original_url.split('?').last}") do |list| + - list.loader do + - ontologies_browse_skeleton + - container.loader do + = browser_counter_loader + - ontologies_browse_skeleton + diff --git a/config/routes.rb b/config/routes.rb index 4ba040d8e..007c220f2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -124,6 +124,7 @@ get '/ontologies/:acronym/classes/:purl_conceptid', to: 'ontologies#show', constraints: { purl_conceptid: /[^\/]+/ } get '/ontologies/:acronym/: f', to: 'ontologies#show', constraints: { purl_conceptid: /[^\/]+/ } match '/ontologies/:acronym/submissions/:id/edit_metadata' => 'submissions#edit_metadata', via: [:get, :post] + get '/ontologies_filter', to: 'ontologies#ontologies_filter' # Analytics get '/analytics/:action' => 'analytics#(?-mix:search_result_clicked|user_intention_surveys)' diff --git a/public/browse/.bowerrc b/public/browse/.bowerrc deleted file mode 100755 index 7dcff4cd0..000000000 --- a/public/browse/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory" : "lib" -} \ No newline at end of file diff --git a/public/browse/.gitignore b/public/browse/.gitignore deleted file mode 100755 index b702acc68..000000000 --- a/public/browse/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -logs/* -!.gitkeep -node_modules/ -bower_components/ -tmp -.DS_Store -.idea \ No newline at end of file diff --git a/public/browse/.jshintrc b/public/browse/.jshintrc deleted file mode 100755 index 6f00218e3..000000000 --- a/public/browse/.jshintrc +++ /dev/null @@ -1,13 +0,0 @@ -{ - "globalstrict": true, - "globals": { - "angular": false, - "describe": false, - "it": false, - "expect": false, - "beforeEach": false, - "afterEach": false, - "module": false, - "inject": false - } -} \ No newline at end of file diff --git a/public/browse/app.css b/public/browse/app.css deleted file mode 100755 index 4cc86735e..000000000 --- a/public/browse/app.css +++ /dev/null @@ -1,184 +0,0 @@ -.grid-container { - max-width: 1400px; -} -[ng-cloak].splash { - display: block !important; -} -.splash { - display: none; - width: 25%; - height: 4em; - padding: 2em; - text-align: center; - margin: 2em auto; - background-color: #ECECEC; - border-radius: 3px; -} -[ng-cloak] { - display: none; -} -.admin { - background-color: #EFFFEF !important; -} -.welcome_admin { - width: 33%; - padding: 7px 10px 5px; - border-radius: 3px; - text-align: center; - top: -5em; - position: relative; - float: right; - left: -33%; -} -.search { - float: left; - width: 150px; - padding: 2px 4px 1px; - margin-top: -5px; - width: 200px; -} -.smaller { - color: gray; - font-size: .8em; - padding-bottom: 2px; -} -#facets { - margin-top: 1em; -} -.new_ontology_button { - display: inline-block; - width: 100%; - padding-left: 0px !important; - padding-right: 0px !important; - margin-top: 1em; -} -.facet { - margin: 1em 0; - border: thin lightGray solid; - padding: 5px; - border-radius: 3px; -} -.facet_disabled { - color: gray; -} -.checkbox_list { - max-height: 200px; - overflow: auto; - padding-left: 1px; -} -.checkbox_list > span { - overflow-x: hidden; - white-space: nowrap; - text-overflow: ellipsis; - width: 200px; - display: block; -} -#sorting { -} -#sorting_float { - float: right; - margin-bottom: .5em; -} -@keyframes highlight { - 0% { - background: yellow; - } - 100% { - background: none; - } -} -@-webkit-keyframes highlight { - 0% { - background: yellow; - } - 100% { - background: none; - } -} -.trigger_highlight-add, .trigger_highlight-remove { - -webkit-animation: highlight 1s; - animation: highlight 1s; -} -#ontologies { -} -.clear { - clear: both; -} -.ontology { - border: thin gray solid; - border-radius: 5px; - padding: .5em 1em .5em; - margin: 1em 0; -} -.ontology_view_badge { - float: left; - padding: 5px; - text-align: center; - margin-right: 5px; - border-radius: 3px; - color: white; - background-color: #234979; - font-size: 1em; - font-weight: bold; -} -.ontology_view_badge a { - color: white; - text-decoration: none; -} -.locked_ont { - font-size: .65em; - padding-left: .2em; - color: gray; - cursor: help; - /* Make the lock appear in the upper left corner */ - /* - background-color: #234979; - padding: 2.5px 4px; - font-size: 1em; - color: white; - position: relative; - left: -10px; - top: -8px; - border-radius: 5px 0px; - float: left; - */ -} -.ont-info { - margin: 5px 5px 0 0; - display: inline-block; - padding: 5px 10px 3px; - border-radius: 3px; - background-color: #ECECEC; - font-size: 11px; -} -.badge_grid { - padding-bottom: 10px; - float: right !important; -} -.ontology_badge { - border-radius: 5px; - text-align: center; - max-width: 120px; - height: 45px; - max-height: 45px; - border: solid #234979 thin; -} -.ontology_badge:hover { - cursor: pointer; -} -.badge_title { - border-radius: 4px 4px 0 0; - font-size: 12px; - color: white; - background-color: #234979; -} -.badge_count { - border-radius: 0 0 4px 4px; - height: 22px; - font-size: 1.1em; - font-weight: bold; - color: #234979; -} -.ontology_badge:hover .badge_count { - background-color: rgba(220, 235, 255, 0.79); -} \ No newline at end of file diff --git a/public/browse/app.js b/public/browse/app.js deleted file mode 100755 index fe18ca0d9..000000000 --- a/public/browse/app.js +++ /dev/null @@ -1,417 +0,0 @@ -'use strict'; - -// Declare app level module which depends on views, and components -angular.module('FacetedBrowsing', [ - 'ngRoute', - 'FacetedBrowsing.OntologyList' -]). -config( ['$locationProvider', function ($locationProvider) { - $locationProvider.html5Mode(true); -}]) -; - -var app = angular.module('FacetedBrowsing.OntologyList', ['checklist-model', 'ngAnimate', 'pasvaz.bindonce']) - -.controller('OntologyList', ['$scope', '$animate', '$timeout', function($scope, $animate, $timeout) { - // Default values - $scope.visible_ont_count = 0; - $scope.ontology_sort_order = "-popularity"; - $scope.previous_sort_order = "-popularity"; - $scope.show_highlight = false; - - // Data transfer from Rails - $scope.debug = jQuery(document).data().bp.development; - $scope.admin = jQuery(document).data().bp.admin; - $scope.ontologies = jQuery(document).data().bp.ontologies; - $scope.formats = jQuery(document).data().bp.formats.sort(); - $scope.categories = jQuery(document).data().bp.categories.sort(function(a, b){ - if (a.name < b.name) return -1; - if (a.name > b.name) return 1; - return 0; - }); - $scope.categories_hash = jQuery(document).data().bp.categories_hash; - $scope.groups = jQuery(document).data().bp.groups.sort(function(a, b){ - if (a.acronym < b.acronym) return -1; - if (a.acronym > b.acronym) return 1; - return 0; - }); - $scope.groups_hash = jQuery(document).data().bp.groups_hash; - - $scope.formality_levels = jQuery(document).data().bp.formality_levels; - $scope.natural_languages = jQuery(document).data().bp.natural_languages; - $scope.is_of_type = jQuery(document).data().bp.is_of_type; - - // Search setup - $scope.searchText = null; - $scope.ontIndex = lunr(function() { - this.field('acronym', 100); - this.field('name', 50); - this.field('description'); - this.ref('id'); - }); - $scope.ontIndex.pipeline.reset(); - - // Default setup for facets - $scope.facets = { - types: { - active: ["ontology"], - ont_property: "type", - filter: function(ontology) { - if ($scope.facets.types.active.length == 0) - return true; - if ($scope.facets.types.active.indexOf(ontology.type) === -1) - return false; - return true; - }, - }, - formats: { - active: [], - ont_property: "format", - filter: function(ontology) { - if ($scope.facets.formats.active.length == 0) - return true; - if ($scope.facets.formats.active.indexOf(ontology.format) === -1) - return false; - return true; - }, - }, - groups: { - active: [], - ont_property: "groups", - filter: function(ontology) { - if ($scope.facets.groups.active.length == 0) - return true; - if (intersection($scope.facets.groups.active, ontology.groups).length === 0) - return false; - return true; - }, - }, - categories: { - active: [], - ont_property: "categories", - filter: function(ontology) { - if ($scope.facets.categories.active.length == 0) - return true; - if (intersection($scope.facets.categories.active, ontology.categories).length === 0) - return false; - return true; - }, - }, - artifacts: { - active: [], - ont_property: "artifacts", - filter: function(ontology) { - if ($scope.facets.artifacts.active.length == 0) - return true; - if (intersection($scope.facets.artifacts.active, ontology.artifacts).length === 0) - return false; - return true; - }, - }, - missing_status: { - active: "", - ont_property: "submissionStatus", - values: ["None", "RDF", "OBSOLETE", "METRICS", "RDF_LABELS", "UPLOADED", "INDEXED", "ANNOTATOR", "DIFF"], - filter: function(ontology) { - if ($scope.facets.missing_status.active == "") - return true; - if (ontology.submissionStatus.indexOf($scope.facets.missing_status.active) !== -1) - return false; - return true; - } - }, - upload_date: { - active: "", - ont_property: "creationDate", - values: {day: 1, week: 7, month: 30, three_months: 90, six_months: 180, year: 365, all: "all"}, - day_text: ["day", "week", "month", "three_months", "six_months", "year", "all"], - filter: function(ontology) { - var active = $scope.facets.upload_date.active; - if (active == "") - return true; - if (!ontology.submission) - return false; - var ontDate = new Date(ontology.creationDate); - var compareDate = new Date(); - compareDate.setDate(compareDate.getDate() - active); - if (ontDate >= compareDate) - return true; - return false; - } - }, - formality_levels: { - active: [], - ont_property: "hasFormalityLevel", - filter: function(ontology) { - if ($scope.facets.formality_levels.active.length == 0) - return true; - if ($scope.facets.formality_levels.active.indexOf(ontology.hasFormalityLevel) === -1) - return false; - return true; - } - }, - natural_languages: { - active: [], - ont_property: "naturalLanguage", - filter: function(ontology) { - if ($scope.facets.natural_languages.active.length == 0) - return true; - if ( !ontology.naturalLanguage ) - return false; - for (var i = 0; i < ontology.naturalLanguage.length; i++) { - if ($scope.facets.natural_languages.active.indexOf(ontology.naturalLanguage[i]) !== -1) - return true; - } - return false; - } - }, - is_of_type: { - active: [], - ont_property: "isOfType", - filter: function(ontology) { - if ($scope.facets.is_of_type.active.length == 0) - return true; - if ($scope.facets.is_of_type.active.indexOf(ontology.isOfType) === -1) - return false; - return true; - } - } - } - - // Instantiate object counts - // This doesn't happen on the facet itself because - // there is a $watch directive and updating counts - // on the facets causes an infinite loop. - $scope.facet_counts = {}; - Object.keys($scope.facets).forEach(function(facet) {$scope.facet_counts[facet] = {}}); - - // Default values for facets that aren't definied on the ontologies - $scope.types = { - ontology: {sort: 1, id: "ontology"}, - ontology_view: {sort: 2, id: "ontology_view"} - }; - $scope.artifacts = ["notes", "reviews", "projects", "summary_only"]; - - $scope.groupAcronyms = function(groups) { - var groupNames = []; - angular.forEach(groups, function(group) { - groupNames.push($scope.groups_hash[group].acronym); - }); - return groupNames; - }; - - $scope.categoryNames = function(categories) { - var catNames = []; - angular.forEach(categories, function(category) { - catNames.push($scope.categories_hash[category].name) - }) - return catNames; - } - - $scope.adminUsernames = function(admins) { - return admins.map(function(a){return a.split('/').slice(-1)[0]}); - } - - $scope.ontologySortOrder = function(newOrder) { - $scope.ontology_sort_order = newOrder; - } - - // This watches the facets and updates the list depending on which facets are selected - // All facets are basically ANDed together and return true if no options under the facet are selected. - $scope.$watch('facets', function() { - filterOntologies(); - }, true); - - $scope.$watch('searchText', function() { - filterOntologies(); - }); - - var filterOntologies = function() { - var key, i, ontology, facet, facet_count, show, other_facets, count = 0; - $scope.show_highlight = false; - $scope.show_highlight = true; - - // Reset facet counts - Object.keys($scope.facet_counts).forEach(function(key) { - $scope.facet_counts[key] = {}; - }); - - // First, filter by search. Do this first because the facets - // will apply on top of the search results (EX: for hiding views) - filterSearch(); - - // Filter ontologies based on facet + count for facets - for (i = 0; i < $scope.ontologies.length; i++) { - ontology = $scope.ontologies[i]; - - if (searchActive() && ontology.show === false) continue; - - // Filter out ontologies based on their facet filter functions - ontology.show = Object.keys($scope.facets).map(function(key) { - return $scope.facets[key].filter(ontology); - }).every(Boolean); - - // Check each facet entry to calculate counts - // Counts are calculated by looking at whether or not ontologies match OTHER facets - // IE, counts show what will be available for a given facet entry if that entry - // were to be selected relative to what is already selected in other facets. - Object.keys($scope.facets).forEach(function(key) { - facet = $scope.facets[key]; - other_facets = Object.keys($scope.facets).filter(function(f){return key != f}); - show = other_facets.map(function(other_facet){return $scope.facets[other_facet].filter(ontology)}).every(Boolean); - if (show) { - facet_count = $scope.facet_counts[key]; - if (angular.isArray(ontology[facet.ont_property])) { - ontology[facet.ont_property].forEach(function(val) { - facet_count[val] = (facet_count[val] || 0) + 1; - }); - } else { - facet_count[ontology[facet.ont_property]] = (facet_count[ontology[facet.ont_property]] || 0) + 1; - } - } - }); - } - - $scope.visible_ont_count = $scope.ontologies.filter(function(ont) {return ont.show}).length; - - // Highlight the count - count = $("#visible_ont_count"); - if (count.hasClass("trigger_highlight")) { - $animate.removeClass(count, "trigger_highlight"); - } else { - $animate.addClass(count, "trigger_highlight"); - } - } - - var filterSearch = function() { - var i, results, ontology, found = {}; - if (!searchActive()) { - $scope.ontologySortOrder($scope.previous_sort_order); - return; - } - if ($scope.ontology_sort_order !== "-search_rank") { - $scope.previous_sort_order = $scope.ontology_sort_order; - } - $scope.ontologySortOrder("-search_rank"); - results = $scope.ontIndex.search($scope.searchText); - - angular.forEach(results, function(r){found[r.ref] = r}); - for (i = 0; i < $scope.ontologies.length; i++) { - ontology = $scope.ontologies[i]; - ontology.show = false; - ontology.search_rank = 0; - if (found[ontology.id]) { - ontology.show = true; - ontology.search_rank = found[ontology.id].score; - } - } - } - - var searchActive = function() { - return !($scope.searchText === null || $scope.searchText === ""); - } - - var countAllInFacet = function(facet) { - var active_facets = Object.keys($scope.facets).filter(function(facet) {return $scope.facets[facet].active.length > 0}); - if (active_facets.length == 0 || (active_facets.length == 1 && active_facets[0] == facet)) { - return true; - } - return false; - } - - var intersection = function(x, y) { - if (typeof x === 'undefined' || typeof y === 'undefined') {return [];} - var ret = []; - for (var i = 0; i < x.length; i++) { - for (var z = 0; z < y.length; z++) { - if (x[i] == y[z]) { - ret.push(i); - break; - } - } - } - return ret; - } - - - $scope.init = function() { - $scope.ontologies = jQuery(document).data().bp.fullOntologies; - if (BP_queryString().filter) { - angular.forEach($scope.groups, function(group) { - if (group.acronym == BP_queryString().filter) - $scope.facets.groups.active.push(group.id); - }); - } - filterOntologies(); - angular.forEach($scope.ontologies, function(ont) { - $scope.ontIndex.add({ - id: ont.id, - acronym: ont.acronym, - name: ont.name, - description: ont.description - }) - }); - } - $timeout($scope.init); - -}]) - -.filter('idToTitle', function() { - return function(input) { - if (input) { - var splitInput = input.replace(/_/g, " ").split(" "); - var newInput = []; - var word; - for (word in splitInput) { - word = splitInput[word]; - if (word[0].toUpperCase() == word[0]) { - newInput.push(word); - } else { - newInput.push(word[0].toUpperCase() + word.slice(1)); - } - - } - return newInput.join(" "); - } - }; -}) - -.filter('humanShortNum', function() { - return function(input) { - if (input) { - var num = parseInt(input); - if (num < 10000) {return num;} - if (num > 10000 && num < 1000000) { - return String(+(Math.round(num / 1000 + "e+1") + "e-1")) + "k" - } - if (num > 1000000) { - return String(+(Math.round(num / 100000 + "e+1") + "e-1")) + "M" - } - return newInput.join(" "); - } - }; -}) - -.filter("toArray", function() { - return function(obj) { - var result = []; - angular.forEach(obj, function(val, key) { - result.push(val); - }); - return result; - }; -}) - -.filter('htmlToText', function() { - return function(text) { - return String(text).replace(/<[^>]+>/gm, ''); - } -}) - -.filter('descriptionToText', function() { - return function(text) { - text = String(text).replace(/<[^>]+>/gm, ''); - return text.split(/\.\W/)[0]; - } -}) -; \ No newline at end of file diff --git a/public/browse/bower.json b/public/browse/bower.json deleted file mode 100755 index ed30585ec..000000000 --- a/public/browse/bower.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "angular-seed", - "description": "A starter project for AngularJS", - "version": "0.0.0", - "homepage": "https://github.com/angular/angular-seed", - "license": "MIT", - "private": true, - "dependencies": { - "angular": "1.3.x", - "angular-route": "1.3.x", - "angular-loader": "1.3.x", - "angular-mocks": "~1.3.x", - "angular-animate": "1.3.x", - "html5-boilerplate": "~4.3.0", - "lunr.js": "~0.5.6", - "angular-bindonce": "~0.3.3" - } -} diff --git a/public/browse/checklist-model.js b/public/browse/checklist-model.js deleted file mode 100644 index 228f0c5a0..000000000 --- a/public/browse/checklist-model.js +++ /dev/null @@ -1,99 +0,0 @@ -/** - * Checklist-model - * AngularJS directive for list of checkboxes - */ - -angular.module('checklist-model', []) -.directive('checklistModel', ['$parse', '$compile', function($parse, $compile) { - // contains - function contains(arr, item) { - if (angular.isArray(arr)) { - for (var i = 0; i < arr.length; i++) { - if (angular.equals(arr[i], item)) { - return true; - } - } - } - return false; - } - - // add - function add(arr, item) { - arr = angular.isArray(arr) ? arr : []; - for (var i = 0; i < arr.length; i++) { - if (angular.equals(arr[i], item)) { - return arr; - } - } - arr.push(item); - return arr; - } - - // remove - function remove(arr, item) { - if (angular.isArray(arr)) { - for (var i = 0; i < arr.length; i++) { - if (angular.equals(arr[i], item)) { - arr.splice(i, 1); - break; - } - } - } - return arr; - } - - // http://stackoverflow.com/a/19228302/1458162 - function postLinkFn(scope, elem, attrs) { - // compile with `ng-model` pointing to `checked` - $compile(elem)(scope); - - // getter / setter for original model - var getter = $parse(attrs.checklistModel); - var setter = getter.assign; - - // value added to list - var value = $parse(attrs.checklistValue)(scope.$parent); - - // watch UI checked change - scope.$watch('checked', function(newValue, oldValue) { - if (newValue === oldValue) { - return; - } - var current = getter(scope.$parent); - if (newValue === true) { - setter(scope.$parent, add(current, value)); - } else { - setter(scope.$parent, remove(current, value)); - } - }); - - // watch original model change - scope.$parent.$watch(attrs.checklistModel, function(newArr, oldArr) { - scope.checked = contains(newArr, value); - }, true); - } - - return { - restrict: 'A', - priority: 1000, - terminal: true, - scope: true, - compile: function(tElement, tAttrs) { - if (tElement[0].tagName !== 'INPUT' || tElement[0].getAttribute('type') !== 'checkbox') { - throw 'checklist-model should be applied to `input[type="checkbox"]`.'; - } - - if (!tAttrs.checklistValue) { - throw 'You should provide `checklist-value`.'; - } - - // exclude recursion - tElement.removeAttr('checklist-model'); - - // local scope var storing individual checkbox model - tElement.attr('ng-model', 'checked'); - - return postLinkFn; - } - }; -}]); diff --git a/public/browse/e2e-tests/protractor.conf.js b/public/browse/e2e-tests/protractor.conf.js deleted file mode 100755 index b45a117aa..000000000 --- a/public/browse/e2e-tests/protractor.conf.js +++ /dev/null @@ -1,19 +0,0 @@ -exports.config = { - allScriptsTimeout: 11000, - - specs: [ - '*.js' - ], - - capabilities: { - 'browserName': 'chrome' - }, - - baseUrl: 'http://localhost:8000/app/', - - framework: 'jasmine', - - jasmineNodeOpts: { - defaultTimeoutInterval: 30000 - } -}; diff --git a/public/browse/e2e-tests/scenarios.js b/public/browse/e2e-tests/scenarios.js deleted file mode 100755 index 59d816fc1..000000000 --- a/public/browse/e2e-tests/scenarios.js +++ /dev/null @@ -1,42 +0,0 @@ -'use strict'; - -/* https://github.com/angular/protractor/blob/master/docs/toc.md */ - -describe('faceted browsing', function() { - - browser.get('index.html'); - - it('should automatically redirect to /view1 when location hash/fragment is empty', function() { - expect(browser.getLocationAbsUrl()).toMatch("/view1"); - }); - - - describe('view1', function() { - - beforeEach(function() { - browser.get('index.html#/view1'); - }); - - - it('should render view1 when user navigates to /view1', function() { - expect(element.all(by.css('[ng-view] p')).first().getText()). - toMatch(/partial for view 1/); - }); - - }); - - - describe('view2', function() { - - beforeEach(function() { - browser.get('index.html#/view2'); - }); - - - it('should render view2 when user navigates to /view2', function() { - expect(element.all(by.css('[ng-view] p')).first().getText()). - toMatch(/partial for view 2/); - }); - - }); -}); diff --git a/public/browse/font/webhostinghub-glyphs.eot b/public/browse/font/webhostinghub-glyphs.eot deleted file mode 100644 index 7e9248ceef3b9f72dd6a29ea4901c3ce603d2b74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503876 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�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%0DoUF!70Ih&z#r8^;eSMAE_U6QHXCNQT_j1>GV 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 - - - -Created by FontForge 20110222 at Sun Jul 21 00:46:45 2013 - By www-data -WebHostingHub Glyphs - author WebHostingHub.com - http://webhostinghub.com/glyphs/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/browse/font/webhostinghub-glyphs.ttf b/public/browse/font/webhostinghub-glyphs.ttf deleted file mode 100644 index 6ad706c63289e7876847f1ecd351269bfcdc81d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503664 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�g_g$Uu(!M~CcRrP$&`zJhPx)Qq@hY2~dxM$o$6Y|*dyX_XD+Mg?7<+(6mKJLhYwCD{>Fr=q9p6ax`%bYm zk>~x};>oe3R{c&f)NYykopwfhm819jROAP!_5NO%x!xA9cZ?PFPr?W~f;X?Q`cBC! z43%}c_Bi_hRo-H3F220n2QUAB)KiTBhmXt;&=Gib$Ds? zt>^a!v^KpTL=CPUv}MzEkiKz7ZzQ7G8-ViH7+_N4t^)J&n?x6W<4lD+gDIc`=m4UF z^L!H278b*|2s#>X-UhPY&D})LzKKSYw}qT4l_tVEQP2__zSgUp1H@Hl1)+(sT1 zK24+zAhRfJ<|M*!lR4r=$f`)H0Fn*iQG+Q3338(&(w97eI27`>>oF@xu4z=;k`tal zjF&(%NUn{lsg{S|9V%o)*ksreucLot3zC>bVuO@j3vr?N&2(bpxX0CNT%ZY1b9)bd zn(thH!@EP-0)Ct=fB+^Q>&-Bt^V~RPl{dF|>l$tX3(9X>CQE`Q5zDETas;a=1u;Qk9#zX8+;SZ9 z2e~+l5YLmilF9R>j40^Vh+oBV=^y+PGDYn2s8!lgx2fn*Qif(oJOR3Sp~c)u)&8Cl$NB$KGV0p2nuvZePCKj-7tqW4E9F_BcljGr>(i zz3bz@UM-?nXBBb#v~m0Lh8Uh>pVl8&TAM|jgC0&yEknEaU4Pi5X0?U?;dlWbG-%Fu zX_O4Zss$t Nw930*np4YhiHYGCq@2& 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 to your `index.html`: - -```html - -``` - -Then add `ngAnimate` as a dependency for your app: - -```javascript -angular.module('myApp', ['ngAnimate']); -``` - -Note that this package is not in CommonJS format, so doing `require('angular-animate')` will -return `undefined`. - -### bower - -```shell -bower install angular-animate -``` - -Then add a ` -``` - -Then add `ngAnimate` as a dependency for your app: - -```javascript -angular.module('myApp', ['ngAnimate']); -``` - -## Documentation - -Documentation is available on the -[AngularJS docs site](http://docs.angularjs.org/api/ngAnimate). - -## License - -The MIT License - -Copyright (c) 2010-2012 Google, Inc. http://angularjs.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/public/browse/lib/angular-animate/angular-animate.js b/public/browse/lib/angular-animate/angular-animate.js deleted file mode 100644 index 761d622ea..000000000 --- a/public/browse/lib/angular-animate/angular-animate.js +++ /dev/null @@ -1,2136 +0,0 @@ -/** - * @license AngularJS v1.3.5 - * (c) 2010-2014 Google, Inc. http://angularjs.org - * License: MIT - */ -(function(window, angular, undefined) {'use strict'; - -/* jshint maxlen: false */ - -/** - * @ngdoc module - * @name ngAnimate - * @description - * - * The `ngAnimate` module provides support for JavaScript, CSS3 transition and CSS3 keyframe animation hooks within existing core and custom directives. - * - *

    - * - * # Usage - * - * To see animations in action, all that is required is to define the appropriate CSS classes - * or to register a JavaScript animation via the myModule.animation() function. The directives that support animation automatically are: - * `ngRepeat`, `ngInclude`, `ngIf`, `ngSwitch`, `ngShow`, `ngHide`, `ngView` and `ngClass`. Custom directives can take advantage of animation - * by using the `$animate` service. - * - * Below is a more detailed breakdown of the supported animation events provided by pre-existing ng directives: - * - * | Directive | Supported Animations | - * |----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------| - * | {@link ng.directive:ngRepeat#animations ngRepeat} | enter, leave and move | - * | {@link ngRoute.directive:ngView#animations ngView} | enter and leave | - * | {@link ng.directive:ngInclude#animations ngInclude} | enter and leave | - * | {@link ng.directive:ngSwitch#animations ngSwitch} | enter and leave | - * | {@link ng.directive:ngIf#animations ngIf} | enter and leave | - * | {@link ng.directive:ngClass#animations ngClass} | add and remove (the CSS class(es) present) | - * | {@link ng.directive:ngShow#animations ngShow} & {@link ng.directive:ngHide#animations ngHide} | add and remove (the ng-hide class value) | - * | {@link ng.directive:form#animation-hooks form} & {@link ng.directive:ngModel#animation-hooks ngModel} | add and remove (dirty, pristine, valid, invalid & all other validations) | - * | {@link module:ngMessages#animations ngMessages} | add and remove (ng-active & ng-inactive) | - * | {@link module:ngMessages#animations ngMessage} | enter and leave | - * - * You can find out more information about animations upon visiting each directive page. - * - * Below is an example of how to apply animations to a directive that supports animation hooks: - * - * ```html - * - * - * - * - * ``` - * - * Keep in mind that, by default, if an animation is running, any child elements cannot be animated - * until the parent element's animation has completed. This blocking feature can be overridden by - * placing the `ng-animate-children` attribute on a parent container tag. - * - * ```html - *
    - *
    - *
    - * ... - *
    - *
    - *
    - * ``` - * - * When the `on` expression value changes and an animation is triggered then each of the elements within - * will all animate without the block being applied to child elements. - * - * ## Are animations run when the application starts? - * No they are not. When an application is bootstrapped Angular will disable animations from running to avoid - * a frenzy of animations from being triggered as soon as the browser has rendered the screen. For this to work, - * Angular will wait for two digest cycles until enabling animations. From there on, any animation-triggering - * layout changes in the application will trigger animations as normal. - * - * In addition, upon bootstrap, if the routing system or any directives or load remote data (via $http) then Angular - * will automatically extend the wait time to enable animations once **all** of the outbound HTTP requests - * are complete. - * - * ## CSS-defined Animations - * The animate service will automatically apply two CSS classes to the animated element and these two CSS classes - * are designed to contain the start and end CSS styling. Both CSS transitions and keyframe animations are supported - * and can be used to play along with this naming structure. - * - * The following code below demonstrates how to perform animations using **CSS transitions** with Angular: - * - * ```html - * - * - *
    - *
    - *
    - * ``` - * - * The following code below demonstrates how to perform animations using **CSS animations** with Angular: - * - * ```html - * - * - *
    - *
    - *
    - * ``` - * - * Both CSS3 animations and transitions can be used together and the animate service will figure out the correct duration and delay timing. - * - * Upon DOM mutation, the event class is added first (something like `ng-enter`), then the browser prepares itself to add - * the active class (in this case `ng-enter-active`) which then triggers the animation. The animation module will automatically - * detect the CSS code to determine when the animation ends. Once the animation is over then both CSS classes will be - * removed from the DOM. If a browser does not support CSS transitions or CSS animations then the animation will start and end - * immediately resulting in a DOM element that is at its final state. This final state is when the DOM element - * has no CSS transition/animation classes applied to it. - * - * ### Structural transition animations - * - * Structural transitions (such as enter, leave and move) will always apply a `0s none` transition - * value to force the browser into rendering the styles defined in the setup (.ng-enter, .ng-leave - * or .ng-move) class. This means that any active transition animations operating on the element - * will be cut off to make way for the enter, leave or move animation. - * - * ### Class-based transition animations - * - * Class-based transitions refer to transition animations that are triggered when a CSS class is - * added to or removed from the element (via `$animate.addClass`, `$animate.removeClass`, - * `$animate.setClass`, or by directives such as `ngClass`, `ngModel` and `form`). - * They are different when compared to structural animations since they **do not cancel existing - * animations** nor do they **block successive transitions** from rendering on the same element. - * This distinction allows for **multiple class-based transitions** to be performed on the same element. - * - * In addition to ngAnimate supporting the default (natural) functionality of class-based transition - * animations, ngAnimate also decorates the element with starting and ending CSS classes to aid the - * developer in further styling the element throughout the transition animation. Earlier versions - * of ngAnimate may have caused natural CSS transitions to break and not render properly due to - * $animate temporarily blocking transitions using `0s none` in order to allow the setup CSS class - * (the `-add` or `-remove` class) to be applied without triggering an animation. However, as of - * **version 1.3**, this workaround has been removed with ngAnimate and all non-ngAnimate CSS - * class transitions are compatible with ngAnimate. - * - * There is, however, one special case when dealing with class-based transitions in ngAnimate. - * When rendering class-based transitions that make use of the setup and active CSS classes - * (e.g. `.fade-add` and `.fade-add-active` for when `.fade` is added) be sure to define - * the transition value **on the active CSS class** and not the setup class. - * - * ```css - * .fade-add { - * /* remember to place a 0s transition here - * to ensure that the styles are applied instantly - * even if the element already has a transition style */ - * transition:0s linear all; - * - * /* starting CSS styles */ - * opacity:1; - * } - * .fade-add.fade-add-active { - * /* this will be the length of the animation */ - * transition:1s linear all; - * opacity:0; - * } - * ``` - * - * The setup CSS class (in this case `.fade-add`) also has a transition style property, however, it - * has a duration of zero. This may not be required, however, incase the browser is unable to render - * the styling present in this CSS class instantly then it could be that the browser is attempting - * to perform an unnecessary transition. - * - * This workaround, however, does not apply to standard class-based transitions that are rendered - * when a CSS class containing a transition is applied to an element: - * - * ```css - * /* this works as expected */ - * .fade { - * transition:1s linear all; - * opacity:0; - * } - * ``` - * - * Please keep this in mind when coding the CSS markup that will be used within class-based transitions. - * Also, try not to mix the two class-based animation flavors together since the CSS code may become - * overly complex. - * - * - * ### Preventing Collisions With Third Party Libraries - * - * Some third-party frameworks place animation duration defaults across many element or className - * selectors in order to make their code small and reuseable. This can lead to issues with ngAnimate, which - * is expecting actual animations on these elements and has to wait for their completion. - * - * You can prevent this unwanted behavior by using a prefix on all your animation classes: - * - * ```css - * /* prefixed with animate- */ - * .animate-fade-add.animate-fade-add-active { - * transition:1s linear all; - * opacity:0; - * } - * ``` - * - * You then configure `$animate` to enforce this prefix: - * - * ```js - * $animateProvider.classNameFilter(/animate-/); - * ``` - *
    - * - * ### CSS Staggering Animations - * A Staggering animation is a collection of animations that are issued with a slight delay in between each successive operation resulting in a - * curtain-like effect. The ngAnimate module (versions >=1.2) supports staggering animations and the stagger effect can be - * performed by creating a **ng-EVENT-stagger** CSS class and attaching that class to the base CSS class used for - * the animation. The style property expected within the stagger class can either be a **transition-delay** or an - * **animation-delay** property (or both if your animation contains both transitions and keyframe animations). - * - * ```css - * .my-animation.ng-enter { - * /* standard transition code */ - * -webkit-transition: 1s linear all; - * transition: 1s linear all; - * opacity:0; - * } - * .my-animation.ng-enter-stagger { - * /* this will have a 100ms delay between each successive leave animation */ - * -webkit-transition-delay: 0.1s; - * transition-delay: 0.1s; - * - * /* in case the stagger doesn't work then these two values - * must be set to 0 to avoid an accidental CSS inheritance */ - * -webkit-transition-duration: 0s; - * transition-duration: 0s; - * } - * .my-animation.ng-enter.ng-enter-active { - * /* standard transition styles */ - * opacity:1; - * } - * ``` - * - * Staggering animations work by default in ngRepeat (so long as the CSS class is defined). Outside of ngRepeat, to use staggering animations - * on your own, they can be triggered by firing multiple calls to the same event on $animate. However, the restrictions surrounding this - * are that each of the elements must have the same CSS className value as well as the same parent element. A stagger operation - * will also be reset if more than 10ms has passed after the last animation has been fired. - * - * The following code will issue the **ng-leave-stagger** event on the element provided: - * - * ```js - * var kids = parent.children(); - * - * $animate.leave(kids[0]); //stagger index=0 - * $animate.leave(kids[1]); //stagger index=1 - * $animate.leave(kids[2]); //stagger index=2 - * $animate.leave(kids[3]); //stagger index=3 - * $animate.leave(kids[4]); //stagger index=4 - * - * $timeout(function() { - * //stagger has reset itself - * $animate.leave(kids[5]); //stagger index=0 - * $animate.leave(kids[6]); //stagger index=1 - * }, 100, false); - * ``` - * - * Stagger animations are currently only supported within CSS-defined animations. - * - * ## JavaScript-defined Animations - * In the event that you do not want to use CSS3 transitions or CSS3 animations or if you wish to offer animations on browsers that do not - * yet support CSS transitions/animations, then you can make use of JavaScript animations defined inside of your AngularJS module. - * - * ```js - * //!annotate="YourApp" Your AngularJS Module|Replace this or ngModule with the module that you used to define your application. - * var ngModule = angular.module('YourApp', ['ngAnimate']); - * ngModule.animation('.my-crazy-animation', function() { - * return { - * enter: function(element, done) { - * //run the animation here and call done when the animation is complete - * return function(cancelled) { - * //this (optional) function will be called when the animation - * //completes or when the animation is cancelled (the cancelled - * //flag will be set to true if cancelled). - * }; - * }, - * leave: function(element, done) { }, - * move: function(element, done) { }, - * - * //animation that can be triggered before the class is added - * beforeAddClass: function(element, className, done) { }, - * - * //animation that can be triggered after the class is added - * addClass: function(element, className, done) { }, - * - * //animation that can be triggered before the class is removed - * beforeRemoveClass: function(element, className, done) { }, - * - * //animation that can be triggered after the class is removed - * removeClass: function(element, className, done) { } - * }; - * }); - * ``` - * - * JavaScript-defined animations are created with a CSS-like class selector and a collection of events which are set to run - * a javascript callback function. When an animation is triggered, $animate will look for a matching animation which fits - * the element's CSS class attribute value and then run the matching animation event function (if found). - * In other words, if the CSS classes present on the animated element match any of the JavaScript animations then the callback function will - * be executed. It should be also noted that only simple, single class selectors are allowed (compound class selectors are not supported). - * - * Within a JavaScript animation, an object containing various event callback animation functions is expected to be returned. - * As explained above, these callbacks are triggered based on the animation event. Therefore if an enter animation is run, - * and the JavaScript animation is found, then the enter callback will handle that animation (in addition to the CSS keyframe animation - * or transition code that is defined via a stylesheet). - * - * - * ### Applying Directive-specific Styles to an Animation - * In some cases a directive or service may want to provide `$animate` with extra details that the animation will - * include into its animation. Let's say for example we wanted to render an animation that animates an element - * towards the mouse coordinates as to where the user clicked last. By collecting the X/Y coordinates of the click - * (via the event parameter) we can set the `top` and `left` styles into an object and pass that into our function - * call to `$animate.addClass`. - * - * ```js - * canvas.on('click', function(e) { - * $animate.addClass(element, 'on', { - * to: { - * left : e.client.x + 'px', - * top : e.client.y + 'px' - * } - * }): - * }); - * ``` - * - * Now when the animation runs, and a transition or keyframe animation is picked up, then the animation itself will - * also include and transition the styling of the `left` and `top` properties into its running animation. If we want - * to provide some starting animation values then we can do so by placing the starting animations styles into an object - * called `from` in the same object as the `to` animations. - * - * ```js - * canvas.on('click', function(e) { - * $animate.addClass(element, 'on', { - * from: { - * position: 'absolute', - * left: '0px', - * top: '0px' - * }, - * to: { - * left : e.client.x + 'px', - * top : e.client.y + 'px' - * } - * }): - * }); - * ``` - * - * Once the animation is complete or cancelled then the union of both the before and after styles are applied to the - * element. If `ngAnimate` is not present then the styles will be applied immediately. - * - */ - -angular.module('ngAnimate', ['ng']) - - /** - * @ngdoc provider - * @name $animateProvider - * @description - * - * The `$animateProvider` allows developers to register JavaScript animation event handlers directly inside of a module. - * When an animation is triggered, the $animate service will query the $animate service to find any animations that match - * the provided name value. - * - * Requires the {@link ngAnimate `ngAnimate`} module to be installed. - * - * Please visit the {@link ngAnimate `ngAnimate`} module overview page learn more about how to use animations in your application. - * - */ - .directive('ngAnimateChildren', function() { - var NG_ANIMATE_CHILDREN = '$$ngAnimateChildren'; - return function(scope, element, attrs) { - var val = attrs.ngAnimateChildren; - if (angular.isString(val) && val.length === 0) { //empty attribute - element.data(NG_ANIMATE_CHILDREN, true); - } else { - scope.$watch(val, function(value) { - element.data(NG_ANIMATE_CHILDREN, !!value); - }); - } - }; - }) - - //this private service is only used within CSS-enabled animations - //IE8 + IE9 do not support rAF natively, but that is fine since they - //also don't support transitions and keyframes which means that the code - //below will never be used by the two browsers. - .factory('$$animateReflow', ['$$rAF', '$document', function($$rAF, $document) { - var bod = $document[0].body; - return function(fn) { - //the returned function acts as the cancellation function - return $$rAF(function() { - //the line below will force the browser to perform a repaint - //so that all the animated elements within the animation frame - //will be properly updated and drawn on screen. This is - //required to perform multi-class CSS based animations with - //Firefox. DO NOT REMOVE THIS LINE. - var a = bod.offsetWidth + 1; - fn(); - }); - }; - }]) - - .config(['$provide', '$animateProvider', function($provide, $animateProvider) { - var noop = angular.noop; - var forEach = angular.forEach; - var selectors = $animateProvider.$$selectors; - var isArray = angular.isArray; - var isString = angular.isString; - var isObject = angular.isObject; - - var ELEMENT_NODE = 1; - var NG_ANIMATE_STATE = '$$ngAnimateState'; - var NG_ANIMATE_CHILDREN = '$$ngAnimateChildren'; - var NG_ANIMATE_CLASS_NAME = 'ng-animate'; - var rootAnimateState = {running: true}; - - function extractElementNode(element) { - for (var i = 0; i < element.length; i++) { - var elm = element[i]; - if (elm.nodeType == ELEMENT_NODE) { - return elm; - } - } - } - - function prepareElement(element) { - return element && angular.element(element); - } - - function stripCommentsFromElement(element) { - return angular.element(extractElementNode(element)); - } - - function isMatchingElement(elm1, elm2) { - return extractElementNode(elm1) == extractElementNode(elm2); - } - - $provide.decorator('$animate', - ['$delegate', '$$q', '$injector', '$sniffer', '$rootElement', '$$asyncCallback', '$rootScope', '$document', '$templateRequest', - function($delegate, $$q, $injector, $sniffer, $rootElement, $$asyncCallback, $rootScope, $document, $templateRequest) { - - $rootElement.data(NG_ANIMATE_STATE, rootAnimateState); - - // Wait until all directive and route-related templates are downloaded and - // compiled. The $templateRequest.totalPendingRequests variable keeps track of - // all of the remote templates being currently downloaded. If there are no - // templates currently downloading then the watcher will still fire anyway. - var deregisterWatch = $rootScope.$watch( - function() { return $templateRequest.totalPendingRequests; }, - function(val, oldVal) { - if (val !== 0) return; - deregisterWatch(); - - // Now that all templates have been downloaded, $animate will wait until - // the post digest queue is empty before enabling animations. By having two - // calls to $postDigest calls we can ensure that the flag is enabled at the - // very end of the post digest queue. Since all of the animations in $animate - // use $postDigest, it's important that the code below executes at the end. - // This basically means that the page is fully downloaded and compiled before - // any animations are triggered. - $rootScope.$$postDigest(function() { - $rootScope.$$postDigest(function() { - rootAnimateState.running = false; - }); - }); - } - ); - - var globalAnimationCounter = 0; - var classNameFilter = $animateProvider.classNameFilter(); - var isAnimatableClassName = !classNameFilter - ? function() { return true; } - : function(className) { - return classNameFilter.test(className); - }; - - function classBasedAnimationsBlocked(element, setter) { - var data = element.data(NG_ANIMATE_STATE) || {}; - if (setter) { - data.running = true; - data.structural = true; - element.data(NG_ANIMATE_STATE, data); - } - return data.disabled || (data.running && data.structural); - } - - function runAnimationPostDigest(fn) { - var cancelFn, defer = $$q.defer(); - defer.promise.$$cancelFn = function() { - cancelFn && cancelFn(); - }; - $rootScope.$$postDigest(function() { - cancelFn = fn(function() { - defer.resolve(); - }); - }); - return defer.promise; - } - - function parseAnimateOptions(options) { - // some plugin code may still be passing in the callback - // function as the last param for the $animate methods so - // it's best to only allow string or array values for now - if (isObject(options)) { - if (options.tempClasses && isString(options.tempClasses)) { - options.tempClasses = options.tempClasses.split(/\s+/); - } - return options; - } - } - - function resolveElementClasses(element, cache, runningAnimations) { - runningAnimations = runningAnimations || {}; - - var lookup = {}; - forEach(runningAnimations, function(data, selector) { - forEach(selector.split(' '), function(s) { - lookup[s]=data; - }); - }); - - var hasClasses = Object.create(null); - forEach((element.attr('class') || '').split(/\s+/), function(className) { - hasClasses[className] = true; - }); - - var toAdd = [], toRemove = []; - forEach((cache && cache.classes) || [], function(status, className) { - var hasClass = hasClasses[className]; - var matchingAnimation = lookup[className] || {}; - - // When addClass and removeClass is called then $animate will check to - // see if addClass and removeClass cancel each other out. When there are - // more calls to removeClass than addClass then the count falls below 0 - // and then the removeClass animation will be allowed. Otherwise if the - // count is above 0 then that means an addClass animation will commence. - // Once an animation is allowed then the code will also check to see if - // there exists any on-going animation that is already adding or remvoing - // the matching CSS class. - if (status === false) { - //does it have the class or will it have the class - if (hasClass || matchingAnimation.event == 'addClass') { - toRemove.push(className); - } - } else if (status === true) { - //is the class missing or will it be removed? - if (!hasClass || matchingAnimation.event == 'removeClass') { - toAdd.push(className); - } - } - }); - - return (toAdd.length + toRemove.length) > 0 && [toAdd.join(' '), toRemove.join(' ')]; - } - - function lookup(name) { - if (name) { - var matches = [], - flagMap = {}, - classes = name.substr(1).split('.'); - - //the empty string value is the default animation - //operation which performs CSS transition and keyframe - //animations sniffing. This is always included for each - //element animation procedure if the browser supports - //transitions and/or keyframe animations. The default - //animation is added to the top of the list to prevent - //any previous animations from affecting the element styling - //prior to the element being animated. - if ($sniffer.transitions || $sniffer.animations) { - matches.push($injector.get(selectors[''])); - } - - for (var i=0; i < classes.length; i++) { - var klass = classes[i], - selectorFactoryName = selectors[klass]; - if (selectorFactoryName && !flagMap[klass]) { - matches.push($injector.get(selectorFactoryName)); - flagMap[klass] = true; - } - } - return matches; - } - } - - function animationRunner(element, animationEvent, className, options) { - //transcluded directives may sometimes fire an animation using only comment nodes - //best to catch this early on to prevent any animation operations from occurring - var node = element[0]; - if (!node) { - return; - } - - if (options) { - options.to = options.to || {}; - options.from = options.from || {}; - } - - var classNameAdd; - var classNameRemove; - if (isArray(className)) { - classNameAdd = className[0]; - classNameRemove = className[1]; - if (!classNameAdd) { - className = classNameRemove; - animationEvent = 'removeClass'; - } else if (!classNameRemove) { - className = classNameAdd; - animationEvent = 'addClass'; - } else { - className = classNameAdd + ' ' + classNameRemove; - } - } - - var isSetClassOperation = animationEvent == 'setClass'; - var isClassBased = isSetClassOperation - || animationEvent == 'addClass' - || animationEvent == 'removeClass' - || animationEvent == 'animate'; - - var currentClassName = element.attr('class'); - var classes = currentClassName + ' ' + className; - if (!isAnimatableClassName(classes)) { - return; - } - - var beforeComplete = noop, - beforeCancel = [], - before = [], - afterComplete = noop, - afterCancel = [], - after = []; - - var animationLookup = (' ' + classes).replace(/\s+/g,'.'); - forEach(lookup(animationLookup), function(animationFactory) { - var created = registerAnimation(animationFactory, animationEvent); - if (!created && isSetClassOperation) { - registerAnimation(animationFactory, 'addClass'); - registerAnimation(animationFactory, 'removeClass'); - } - }); - - function registerAnimation(animationFactory, event) { - var afterFn = animationFactory[event]; - var beforeFn = animationFactory['before' + event.charAt(0).toUpperCase() + event.substr(1)]; - if (afterFn || beforeFn) { - if (event == 'leave') { - beforeFn = afterFn; - //when set as null then animation knows to skip this phase - afterFn = null; - } - after.push({ - event: event, fn: afterFn - }); - before.push({ - event: event, fn: beforeFn - }); - return true; - } - } - - function run(fns, cancellations, allCompleteFn) { - var animations = []; - forEach(fns, function(animation) { - animation.fn && animations.push(animation); - }); - - var count = 0; - function afterAnimationComplete(index) { - if (cancellations) { - (cancellations[index] || noop)(); - if (++count < animations.length) return; - cancellations = null; - } - allCompleteFn(); - } - - //The code below adds directly to the array in order to work with - //both sync and async animations. Sync animations are when the done() - //operation is called right away. DO NOT REFACTOR! - forEach(animations, function(animation, index) { - var progress = function() { - afterAnimationComplete(index); - }; - switch (animation.event) { - case 'setClass': - cancellations.push(animation.fn(element, classNameAdd, classNameRemove, progress, options)); - break; - case 'animate': - cancellations.push(animation.fn(element, className, options.from, options.to, progress)); - break; - case 'addClass': - cancellations.push(animation.fn(element, classNameAdd || className, progress, options)); - break; - case 'removeClass': - cancellations.push(animation.fn(element, classNameRemove || className, progress, options)); - break; - default: - cancellations.push(animation.fn(element, progress, options)); - break; - } - }); - - if (cancellations && cancellations.length === 0) { - allCompleteFn(); - } - } - - return { - node: node, - event: animationEvent, - className: className, - isClassBased: isClassBased, - isSetClassOperation: isSetClassOperation, - applyStyles: function() { - if (options) { - element.css(angular.extend(options.from || {}, options.to || {})); - } - }, - before: function(allCompleteFn) { - beforeComplete = allCompleteFn; - run(before, beforeCancel, function() { - beforeComplete = noop; - allCompleteFn(); - }); - }, - after: function(allCompleteFn) { - afterComplete = allCompleteFn; - run(after, afterCancel, function() { - afterComplete = noop; - allCompleteFn(); - }); - }, - cancel: function() { - if (beforeCancel) { - forEach(beforeCancel, function(cancelFn) { - (cancelFn || noop)(true); - }); - beforeComplete(true); - } - if (afterCancel) { - forEach(afterCancel, function(cancelFn) { - (cancelFn || noop)(true); - }); - afterComplete(true); - } - } - }; - } - - /** - * @ngdoc service - * @name $animate - * @kind object - * - * @description - * The `$animate` service provides animation detection support while performing DOM operations (enter, leave and move) as well as during addClass and removeClass operations. - * When any of these operations are run, the $animate service - * will examine any JavaScript-defined animations (which are defined by using the $animateProvider provider object) - * as well as any CSS-defined animations against the CSS classes present on the element once the DOM operation is run. - * - * The `$animate` service is used behind the scenes with pre-existing directives and animation with these directives - * will work out of the box without any extra configuration. - * - * Requires the {@link ngAnimate `ngAnimate`} module to be installed. - * - * Please visit the {@link ngAnimate `ngAnimate`} module overview page learn more about how to use animations in your application. - * ## Callback Promises - * With AngularJS 1.3, each of the animation methods, on the `$animate` service, return a promise when called. The - * promise itself is then resolved once the animation has completed itself, has been cancelled or has been - * skipped due to animations being disabled. (Note that even if the animation is cancelled it will still - * call the resolve function of the animation.) - * - * ```js - * $animate.enter(element, container).then(function() { - * //...this is called once the animation is complete... - * }); - * ``` - * - * Also note that, due to the nature of the callback promise, if any Angular-specific code (like changing the scope, - * location of the page, etc...) is executed within the callback promise then be sure to wrap the code using - * `$scope.$apply(...)`; - * - * ```js - * $animate.leave(element).then(function() { - * $scope.$apply(function() { - * $location.path('/new-page'); - * }); - * }); - * ``` - * - * An animation can also be cancelled by calling the `$animate.cancel(promise)` method with the provided - * promise that was returned when the animation was started. - * - * ```js - * var promise = $animate.addClass(element, 'super-long-animation').then(function() { - * //this will still be called even if cancelled - * }); - * - * element.on('click', function() { - * //tooo lazy to wait for the animation to end - * $animate.cancel(promise); - * }); - * ``` - * - * (Keep in mind that the promise cancellation is unique to `$animate` since promises in - * general cannot be cancelled.) - * - */ - return { - /** - * @ngdoc method - * @name $animate#animate - * @kind function - * - * @description - * Performs an inline animation on the element which applies the provided `to` and `from` CSS styles to the element. - * If any detected CSS transition, keyframe or JavaScript matches the provided `className` value then the animation - * will take on the provided styles. For example, if a transition animation is set for the given className then the - * provided `from` and `to` styles will be applied alongside the given transition. If a JavaScript animation is - * detected then the provided styles will be given in as function paramters. - * - * ```js - * ngModule.animation('.my-inline-animation', function() { - * return { - * animate : function(element, className, from, to, done) { - * //styles - * } - * } - * }); - * ``` - * - * Below is a breakdown of each step that occurs during the `animate` animation: - * - * | Animation Step | What the element class attribute looks like | - * |-------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------| - * | 1. $animate.animate(...) is called | class="my-animation" | - * | 2. $animate waits for the next digest to start the animation | class="my-animation ng-animate" | - * | 3. $animate runs the JavaScript-defined animations detected on the element | class="my-animation ng-animate" | - * | 4. the className class value is added to the element | class="my-animation ng-animate className" | - * | 5. $animate scans the element styles to get the CSS transition/animation duration and delay | class="my-animation ng-animate className" | - * | 6. $animate blocks all CSS transitions on the element to ensure the .className class styling is applied right away| class="my-animation ng-animate className" | - * | 7. $animate applies the provided collection of `from` CSS styles to the element | class="my-animation ng-animate className" | - * | 8. $animate waits for a single animation frame (this performs a reflow) | class="my-animation ng-animate className" | - * | 9. $animate removes the CSS transition block placed on the element | class="my-animation ng-animate className" | - * | 10. the className-active class is added (this triggers the CSS transition/animation) | class="my-animation ng-animate className className-active" | - * | 11. $animate applies the collection of `to` CSS styles to the element which are then handled by the transition | class="my-animation ng-animate className className-active" | - * | 12. $animate waits for the animation to complete (via events and timeout) | class="my-animation ng-animate className className-active" | - * | 13. The animation ends and all generated CSS classes are removed from the element | class="my-animation" | - * | 14. The returned promise is resolved. | class="my-animation" | - * - * @param {DOMElement} element the element that will be the focus of the enter animation - * @param {object} from a collection of CSS styles that will be applied to the element at the start of the animation - * @param {object} to a collection of CSS styles that the element will animate towards - * @param {string=} className an optional CSS class that will be added to the element for the duration of the animation (the default class is `ng-inline-animate`) - * @param {object=} options an optional collection of options that will be picked up by the CSS transition/animation - * @return {Promise} the animation callback promise - */ - animate: function(element, from, to, className, options) { - className = className || 'ng-inline-animate'; - options = parseAnimateOptions(options) || {}; - options.from = to ? from : null; - options.to = to ? to : from; - - return runAnimationPostDigest(function(done) { - return performAnimation('animate', className, stripCommentsFromElement(element), null, null, noop, options, done); - }); - }, - - /** - * @ngdoc method - * @name $animate#enter - * @kind function - * - * @description - * Appends the element to the parentElement element that resides in the document and then runs the enter animation. Once - * the animation is started, the following CSS classes will be present on the element for the duration of the animation: - * - * Below is a breakdown of each step that occurs during enter animation: - * - * | Animation Step | What the element class attribute looks like | - * |-------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------| - * | 1. $animate.enter(...) is called | class="my-animation" | - * | 2. element is inserted into the parentElement element or beside the afterElement element | class="my-animation" | - * | 3. $animate waits for the next digest to start the animation | class="my-animation ng-animate" | - * | 4. $animate runs the JavaScript-defined animations detected on the element | class="my-animation ng-animate" | - * | 5. the .ng-enter class is added to the element | class="my-animation ng-animate ng-enter" | - * | 6. $animate scans the element styles to get the CSS transition/animation duration and delay | class="my-animation ng-animate ng-enter" | - * | 7. $animate blocks all CSS transitions on the element to ensure the .ng-enter class styling is applied right away | class="my-animation ng-animate ng-enter" | - * | 8. $animate waits for a single animation frame (this performs a reflow) | class="my-animation ng-animate ng-enter" | - * | 9. $animate removes the CSS transition block placed on the element | class="my-animation ng-animate ng-enter" | - * | 10. the .ng-enter-active class is added (this triggers the CSS transition/animation) | class="my-animation ng-animate ng-enter ng-enter-active" | - * | 11. $animate waits for the animation to complete (via events and timeout) | class="my-animation ng-animate ng-enter ng-enter-active" | - * | 12. The animation ends and all generated CSS classes are removed from the element | class="my-animation" | - * | 13. The returned promise is resolved. | class="my-animation" | - * - * @param {DOMElement} element the element that will be the focus of the enter animation - * @param {DOMElement} parentElement the parent element of the element that will be the focus of the enter animation - * @param {DOMElement} afterElement the sibling element (which is the previous element) of the element that will be the focus of the enter animation - * @param {object=} options an optional collection of options that will be picked up by the CSS transition/animation - * @return {Promise} the animation callback promise - */ - enter: function(element, parentElement, afterElement, options) { - options = parseAnimateOptions(options); - element = angular.element(element); - parentElement = prepareElement(parentElement); - afterElement = prepareElement(afterElement); - - classBasedAnimationsBlocked(element, true); - $delegate.enter(element, parentElement, afterElement); - return runAnimationPostDigest(function(done) { - return performAnimation('enter', 'ng-enter', stripCommentsFromElement(element), parentElement, afterElement, noop, options, done); - }); - }, - - /** - * @ngdoc method - * @name $animate#leave - * @kind function - * - * @description - * Runs the leave animation operation and, upon completion, removes the element from the DOM. Once - * the animation is started, the following CSS classes will be added for the duration of the animation: - * - * Below is a breakdown of each step that occurs during leave animation: - * - * | Animation Step | What the element class attribute looks like | - * |-------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------| - * | 1. $animate.leave(...) is called | class="my-animation" | - * | 2. $animate runs the JavaScript-defined animations detected on the element | class="my-animation ng-animate" | - * | 3. $animate waits for the next digest to start the animation | class="my-animation ng-animate" | - * | 4. the .ng-leave class is added to the element | class="my-animation ng-animate ng-leave" | - * | 5. $animate scans the element styles to get the CSS transition/animation duration and delay | class="my-animation ng-animate ng-leave" | - * | 6. $animate blocks all CSS transitions on the element to ensure the .ng-leave class styling is applied right away | class="my-animation ng-animate ng-leave" | - * | 7. $animate waits for a single animation frame (this performs a reflow) | class="my-animation ng-animate ng-leave" | - * | 8. $animate removes the CSS transition block placed on the element | class="my-animation ng-animate ng-leave" | - * | 9. the .ng-leave-active class is added (this triggers the CSS transition/animation) | class="my-animation ng-animate ng-leave ng-leave-active" | - * | 10. $animate waits for the animation to complete (via events and timeout) | class="my-animation ng-animate ng-leave ng-leave-active" | - * | 11. The animation ends and all generated CSS classes are removed from the element | class="my-animation" | - * | 12. The element is removed from the DOM | ... | - * | 13. The returned promise is resolved. | ... | - * - * @param {DOMElement} element the element that will be the focus of the leave animation - * @param {object=} options an optional collection of styles that will be picked up by the CSS transition/animation - * @return {Promise} the animation callback promise - */ - leave: function(element, options) { - options = parseAnimateOptions(options); - element = angular.element(element); - - cancelChildAnimations(element); - classBasedAnimationsBlocked(element, true); - return runAnimationPostDigest(function(done) { - return performAnimation('leave', 'ng-leave', stripCommentsFromElement(element), null, null, function() { - $delegate.leave(element); - }, options, done); - }); - }, - - /** - * @ngdoc method - * @name $animate#move - * @kind function - * - * @description - * Fires the move DOM operation. Just before the animation starts, the animate service will either append it into the parentElement container or - * add the element directly after the afterElement element if present. Then the move animation will be run. Once - * the animation is started, the following CSS classes will be added for the duration of the animation: - * - * Below is a breakdown of each step that occurs during move animation: - * - * | Animation Step | What the element class attribute looks like | - * |------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------| - * | 1. $animate.move(...) is called | class="my-animation" | - * | 2. element is moved into the parentElement element or beside the afterElement element | class="my-animation" | - * | 3. $animate waits for the next digest to start the animation | class="my-animation ng-animate" | - * | 4. $animate runs the JavaScript-defined animations detected on the element | class="my-animation ng-animate" | - * | 5. the .ng-move class is added to the element | class="my-animation ng-animate ng-move" | - * | 6. $animate scans the element styles to get the CSS transition/animation duration and delay | class="my-animation ng-animate ng-move" | - * | 7. $animate blocks all CSS transitions on the element to ensure the .ng-move class styling is applied right away | class="my-animation ng-animate ng-move" | - * | 8. $animate waits for a single animation frame (this performs a reflow) | class="my-animation ng-animate ng-move" | - * | 9. $animate removes the CSS transition block placed on the element | class="my-animation ng-animate ng-move" | - * | 10. the .ng-move-active class is added (this triggers the CSS transition/animation) | class="my-animation ng-animate ng-move ng-move-active" | - * | 11. $animate waits for the animation to complete (via events and timeout) | class="my-animation ng-animate ng-move ng-move-active" | - * | 12. The animation ends and all generated CSS classes are removed from the element | class="my-animation" | - * | 13. The returned promise is resolved. | class="my-animation" | - * - * @param {DOMElement} element the element that will be the focus of the move animation - * @param {DOMElement} parentElement the parentElement element of the element that will be the focus of the move animation - * @param {DOMElement} afterElement the sibling element (which is the previous element) of the element that will be the focus of the move animation - * @param {object=} options an optional collection of styles that will be picked up by the CSS transition/animation - * @return {Promise} the animation callback promise - */ - move: function(element, parentElement, afterElement, options) { - options = parseAnimateOptions(options); - element = angular.element(element); - parentElement = prepareElement(parentElement); - afterElement = prepareElement(afterElement); - - cancelChildAnimations(element); - classBasedAnimationsBlocked(element, true); - $delegate.move(element, parentElement, afterElement); - return runAnimationPostDigest(function(done) { - return performAnimation('move', 'ng-move', stripCommentsFromElement(element), parentElement, afterElement, noop, options, done); - }); - }, - - /** - * @ngdoc method - * @name $animate#addClass - * - * @description - * Triggers a custom animation event based off the className variable and then attaches the className value to the element as a CSS class. - * Unlike the other animation methods, the animate service will suffix the className value with {@type -add} in order to provide - * the animate service the setup and active CSS classes in order to trigger the animation (this will be skipped if no CSS transitions - * or keyframes are defined on the -add-active or base CSS class). - * - * Below is a breakdown of each step that occurs during addClass animation: - * - * | Animation Step | What the element class attribute looks like | - * |----------------------------------------------------------------------------------------------------|------------------------------------------------------------------| - * | 1. $animate.addClass(element, 'super') is called | class="my-animation" | - * | 2. $animate runs the JavaScript-defined animations detected on the element | class="my-animation ng-animate" | - * | 3. the .super-add class is added to the element | class="my-animation ng-animate super-add" | - * | 4. $animate waits for a single animation frame (this performs a reflow) | class="my-animation ng-animate super-add" | - * | 5. the .super and .super-add-active classes are added (this triggers the CSS transition/animation) | class="my-animation ng-animate super super-add super-add-active" | - * | 6. $animate scans the element styles to get the CSS transition/animation duration and delay | class="my-animation ng-animate super super-add super-add-active" | - * | 7. $animate waits for the animation to complete (via events and timeout) | class="my-animation ng-animate super super-add super-add-active" | - * | 8. The animation ends and all generated CSS classes are removed from the element | class="my-animation super" | - * | 9. The super class is kept on the element | class="my-animation super" | - * | 10. The returned promise is resolved. | class="my-animation super" | - * - * @param {DOMElement} element the element that will be animated - * @param {string} className the CSS class that will be added to the element and then animated - * @param {object=} options an optional collection of styles that will be picked up by the CSS transition/animation - * @return {Promise} the animation callback promise - */ - addClass: function(element, className, options) { - return this.setClass(element, className, [], options); - }, - - /** - * @ngdoc method - * @name $animate#removeClass - * - * @description - * Triggers a custom animation event based off the className variable and then removes the CSS class provided by the className value - * from the element. Unlike the other animation methods, the animate service will suffix the className value with {@type -remove} in - * order to provide the animate service the setup and active CSS classes in order to trigger the animation (this will be skipped if - * no CSS transitions or keyframes are defined on the -remove or base CSS classes). - * - * Below is a breakdown of each step that occurs during removeClass animation: - * - * | Animation Step | What the element class attribute looks like | - * |------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------| - * | 1. $animate.removeClass(element, 'super') is called | class="my-animation super" | - * | 2. $animate runs the JavaScript-defined animations detected on the element | class="my-animation super ng-animate" | - * | 3. the .super-remove class is added to the element | class="my-animation super ng-animate super-remove" | - * | 4. $animate waits for a single animation frame (this performs a reflow) | class="my-animation super ng-animate super-remove" | - * | 5. the .super-remove-active classes are added and .super is removed (this triggers the CSS transition/animation) | class="my-animation ng-animate super-remove super-remove-active" | - * | 6. $animate scans the element styles to get the CSS transition/animation duration and delay | class="my-animation ng-animate super-remove super-remove-active" | - * | 7. $animate waits for the animation to complete (via events and timeout) | class="my-animation ng-animate super-remove super-remove-active" | - * | 8. The animation ends and all generated CSS classes are removed from the element | class="my-animation" | - * | 9. The returned promise is resolved. | class="my-animation" | - * - * - * @param {DOMElement} element the element that will be animated - * @param {string} className the CSS class that will be animated and then removed from the element - * @param {object=} options an optional collection of styles that will be picked up by the CSS transition/animation - * @return {Promise} the animation callback promise - */ - removeClass: function(element, className, options) { - return this.setClass(element, [], className, options); - }, - - /** - * - * @ngdoc method - * @name $animate#setClass - * - * @description Adds and/or removes the given CSS classes to and from the element. - * Once complete, the done() callback will be fired (if provided). - * - * | Animation Step | What the element class attribute looks like | - * |--------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------| - * | 1. $animate.setClass(element, 'on', 'off') is called | class="my-animation off" | - * | 2. $animate runs the JavaScript-defined animations detected on the element | class="my-animation ng-animate off" | - * | 3. the .on-add and .off-remove classes are added to the element | class="my-animation ng-animate on-add off-remove off" | - * | 4. $animate waits for a single animation frame (this performs a reflow) | class="my-animation ng-animate on-add off-remove off" | - * | 5. the .on, .on-add-active and .off-remove-active classes are added and .off is removed (this triggers the CSS transition/animation) | class="my-animation ng-animate on on-add on-add-active off-remove off-remove-active" | - * | 6. $animate scans the element styles to get the CSS transition/animation duration and delay | class="my-animation ng-animate on on-add on-add-active off-remove off-remove-active" | - * | 7. $animate waits for the animation to complete (via events and timeout) | class="my-animation ng-animate on on-add on-add-active off-remove off-remove-active" | - * | 8. The animation ends and all generated CSS classes are removed from the element | class="my-animation on" | - * | 9. The returned promise is resolved. | class="my-animation on" | - * - * @param {DOMElement} element the element which will have its CSS classes changed - * removed from it - * @param {string} add the CSS classes which will be added to the element - * @param {string} remove the CSS class which will be removed from the element - * CSS classes have been set on the element - * @param {object=} options an optional collection of styles that will be picked up by the CSS transition/animation - * @return {Promise} the animation callback promise - */ - setClass: function(element, add, remove, options) { - options = parseAnimateOptions(options); - - var STORAGE_KEY = '$$animateClasses'; - element = angular.element(element); - element = stripCommentsFromElement(element); - - if (classBasedAnimationsBlocked(element)) { - return $delegate.$$setClassImmediately(element, add, remove, options); - } - - // we're using a combined array for both the add and remove - // operations since the ORDER OF addClass and removeClass matters - var classes, cache = element.data(STORAGE_KEY); - var hasCache = !!cache; - if (!cache) { - cache = {}; - cache.classes = {}; - } - classes = cache.classes; - - add = isArray(add) ? add : add.split(' '); - forEach(add, function(c) { - if (c && c.length) { - classes[c] = true; - } - }); - - remove = isArray(remove) ? remove : remove.split(' '); - forEach(remove, function(c) { - if (c && c.length) { - classes[c] = false; - } - }); - - if (hasCache) { - if (options && cache.options) { - cache.options = angular.extend(cache.options || {}, options); - } - - //the digest cycle will combine all the animations into one function - return cache.promise; - } else { - element.data(STORAGE_KEY, cache = { - classes: classes, - options: options - }); - } - - return cache.promise = runAnimationPostDigest(function(done) { - var parentElement = element.parent(); - var elementNode = extractElementNode(element); - var parentNode = elementNode.parentNode; - // TODO(matsko): move this code into the animationsDisabled() function once #8092 is fixed - if (!parentNode || parentNode['$$NG_REMOVED'] || elementNode['$$NG_REMOVED']) { - done(); - return; - } - - var cache = element.data(STORAGE_KEY); - element.removeData(STORAGE_KEY); - - var state = element.data(NG_ANIMATE_STATE) || {}; - var classes = resolveElementClasses(element, cache, state.active); - return !classes - ? done() - : performAnimation('setClass', classes, element, parentElement, null, function() { - if (classes[0]) $delegate.$$addClassImmediately(element, classes[0]); - if (classes[1]) $delegate.$$removeClassImmediately(element, classes[1]); - }, cache.options, done); - }); - }, - - /** - * @ngdoc method - * @name $animate#cancel - * @kind function - * - * @param {Promise} animationPromise The animation promise that is returned when an animation is started. - * - * @description - * Cancels the provided animation. - */ - cancel: function(promise) { - promise.$$cancelFn(); - }, - - /** - * @ngdoc method - * @name $animate#enabled - * @kind function - * - * @param {boolean=} value If provided then set the animation on or off. - * @param {DOMElement=} element If provided then the element will be used to represent the enable/disable operation - * @return {boolean} Current animation state. - * - * @description - * Globally enables/disables animations. - * - */ - enabled: function(value, element) { - switch (arguments.length) { - case 2: - if (value) { - cleanup(element); - } else { - var data = element.data(NG_ANIMATE_STATE) || {}; - data.disabled = true; - element.data(NG_ANIMATE_STATE, data); - } - break; - - case 1: - rootAnimateState.disabled = !value; - break; - - default: - value = !rootAnimateState.disabled; - break; - } - return !!value; - } - }; - - /* - all animations call this shared animation triggering function internally. - The animationEvent variable refers to the JavaScript animation event that will be triggered - and the className value is the name of the animation that will be applied within the - CSS code. Element, parentElement and afterElement are provided DOM elements for the animation - and the onComplete callback will be fired once the animation is fully complete. - */ - function performAnimation(animationEvent, className, element, parentElement, afterElement, domOperation, options, doneCallback) { - var noopCancel = noop; - var runner = animationRunner(element, animationEvent, className, options); - if (!runner) { - fireDOMOperation(); - fireBeforeCallbackAsync(); - fireAfterCallbackAsync(); - closeAnimation(); - return noopCancel; - } - - animationEvent = runner.event; - className = runner.className; - var elementEvents = angular.element._data(runner.node); - elementEvents = elementEvents && elementEvents.events; - - if (!parentElement) { - parentElement = afterElement ? afterElement.parent() : element.parent(); - } - - //skip the animation if animations are disabled, a parent is already being animated, - //the element is not currently attached to the document body or then completely close - //the animation if any matching animations are not found at all. - //NOTE: IE8 + IE9 should close properly (run closeAnimation()) in case an animation was found. - if (animationsDisabled(element, parentElement)) { - fireDOMOperation(); - fireBeforeCallbackAsync(); - fireAfterCallbackAsync(); - closeAnimation(); - return noopCancel; - } - - var ngAnimateState = element.data(NG_ANIMATE_STATE) || {}; - var runningAnimations = ngAnimateState.active || {}; - var totalActiveAnimations = ngAnimateState.totalActive || 0; - var lastAnimation = ngAnimateState.last; - var skipAnimation = false; - - if (totalActiveAnimations > 0) { - var animationsToCancel = []; - if (!runner.isClassBased) { - if (animationEvent == 'leave' && runningAnimations['ng-leave']) { - skipAnimation = true; - } else { - //cancel all animations when a structural animation takes place - for (var klass in runningAnimations) { - animationsToCancel.push(runningAnimations[klass]); - } - ngAnimateState = {}; - cleanup(element, true); - } - } else if (lastAnimation.event == 'setClass') { - animationsToCancel.push(lastAnimation); - cleanup(element, className); - } - else if (runningAnimations[className]) { - var current = runningAnimations[className]; - if (current.event == animationEvent) { - skipAnimation = true; - } else { - animationsToCancel.push(current); - cleanup(element, className); - } - } - - if (animationsToCancel.length > 0) { - forEach(animationsToCancel, function(operation) { - operation.cancel(); - }); - } - } - - if (runner.isClassBased - && !runner.isSetClassOperation - && animationEvent != 'animate' - && !skipAnimation) { - skipAnimation = (animationEvent == 'addClass') == element.hasClass(className); //opposite of XOR - } - - if (skipAnimation) { - fireDOMOperation(); - fireBeforeCallbackAsync(); - fireAfterCallbackAsync(); - fireDoneCallbackAsync(); - return noopCancel; - } - - runningAnimations = ngAnimateState.active || {}; - totalActiveAnimations = ngAnimateState.totalActive || 0; - - if (animationEvent == 'leave') { - //there's no need to ever remove the listener since the element - //will be removed (destroyed) after the leave animation ends or - //is cancelled midway - element.one('$destroy', function(e) { - var element = angular.element(this); - var state = element.data(NG_ANIMATE_STATE); - if (state) { - var activeLeaveAnimation = state.active['ng-leave']; - if (activeLeaveAnimation) { - activeLeaveAnimation.cancel(); - cleanup(element, 'ng-leave'); - } - } - }); - } - - //the ng-animate class does nothing, but it's here to allow for - //parent animations to find and cancel child animations when needed - element.addClass(NG_ANIMATE_CLASS_NAME); - if (options && options.tempClasses) { - forEach(options.tempClasses, function(className) { - element.addClass(className); - }); - } - - var localAnimationCount = globalAnimationCounter++; - totalActiveAnimations++; - runningAnimations[className] = runner; - - element.data(NG_ANIMATE_STATE, { - last: runner, - active: runningAnimations, - index: localAnimationCount, - totalActive: totalActiveAnimations - }); - - //first we run the before animations and when all of those are complete - //then we perform the DOM operation and run the next set of animations - fireBeforeCallbackAsync(); - runner.before(function(cancelled) { - var data = element.data(NG_ANIMATE_STATE); - cancelled = cancelled || - !data || !data.active[className] || - (runner.isClassBased && data.active[className].event != animationEvent); - - fireDOMOperation(); - if (cancelled === true) { - closeAnimation(); - } else { - fireAfterCallbackAsync(); - runner.after(closeAnimation); - } - }); - - return runner.cancel; - - function fireDOMCallback(animationPhase) { - var eventName = '$animate:' + animationPhase; - if (elementEvents && elementEvents[eventName] && elementEvents[eventName].length > 0) { - $$asyncCallback(function() { - element.triggerHandler(eventName, { - event: animationEvent, - className: className - }); - }); - } - } - - function fireBeforeCallbackAsync() { - fireDOMCallback('before'); - } - - function fireAfterCallbackAsync() { - fireDOMCallback('after'); - } - - function fireDoneCallbackAsync() { - fireDOMCallback('close'); - doneCallback(); - } - - //it is less complicated to use a flag than managing and canceling - //timeouts containing multiple callbacks. - function fireDOMOperation() { - if (!fireDOMOperation.hasBeenRun) { - fireDOMOperation.hasBeenRun = true; - domOperation(); - } - } - - function closeAnimation() { - if (!closeAnimation.hasBeenRun) { - if (runner) { //the runner doesn't exist if it fails to instantiate - runner.applyStyles(); - } - - closeAnimation.hasBeenRun = true; - if (options && options.tempClasses) { - forEach(options.tempClasses, function(className) { - element.removeClass(className); - }); - } - - var data = element.data(NG_ANIMATE_STATE); - if (data) { - - /* only structural animations wait for reflow before removing an - animation, but class-based animations don't. An example of this - failing would be when a parent HTML tag has a ng-class attribute - causing ALL directives below to skip animations during the digest */ - if (runner && runner.isClassBased) { - cleanup(element, className); - } else { - $$asyncCallback(function() { - var data = element.data(NG_ANIMATE_STATE) || {}; - if (localAnimationCount == data.index) { - cleanup(element, className, animationEvent); - } - }); - element.data(NG_ANIMATE_STATE, data); - } - } - fireDoneCallbackAsync(); - } - } - } - - function cancelChildAnimations(element) { - var node = extractElementNode(element); - if (node) { - var nodes = angular.isFunction(node.getElementsByClassName) ? - node.getElementsByClassName(NG_ANIMATE_CLASS_NAME) : - node.querySelectorAll('.' + NG_ANIMATE_CLASS_NAME); - forEach(nodes, function(element) { - element = angular.element(element); - var data = element.data(NG_ANIMATE_STATE); - if (data && data.active) { - forEach(data.active, function(runner) { - runner.cancel(); - }); - } - }); - } - } - - function cleanup(element, className) { - if (isMatchingElement(element, $rootElement)) { - if (!rootAnimateState.disabled) { - rootAnimateState.running = false; - rootAnimateState.structural = false; - } - } else if (className) { - var data = element.data(NG_ANIMATE_STATE) || {}; - - var removeAnimations = className === true; - if (!removeAnimations && data.active && data.active[className]) { - data.totalActive--; - delete data.active[className]; - } - - if (removeAnimations || !data.totalActive) { - element.removeClass(NG_ANIMATE_CLASS_NAME); - element.removeData(NG_ANIMATE_STATE); - } - } - } - - function animationsDisabled(element, parentElement) { - if (rootAnimateState.disabled) { - return true; - } - - if (isMatchingElement(element, $rootElement)) { - return rootAnimateState.running; - } - - var allowChildAnimations, parentRunningAnimation, hasParent; - do { - //the element did not reach the root element which means that it - //is not apart of the DOM. Therefore there is no reason to do - //any animations on it - if (parentElement.length === 0) break; - - var isRoot = isMatchingElement(parentElement, $rootElement); - var state = isRoot ? rootAnimateState : (parentElement.data(NG_ANIMATE_STATE) || {}); - if (state.disabled) { - return true; - } - - //no matter what, for an animation to work it must reach the root element - //this implies that the element is attached to the DOM when the animation is run - if (isRoot) { - hasParent = true; - } - - //once a flag is found that is strictly false then everything before - //it will be discarded and all child animations will be restricted - if (allowChildAnimations !== false) { - var animateChildrenFlag = parentElement.data(NG_ANIMATE_CHILDREN); - if (angular.isDefined(animateChildrenFlag)) { - allowChildAnimations = animateChildrenFlag; - } - } - - parentRunningAnimation = parentRunningAnimation || - state.running || - (state.last && !state.last.isClassBased); - } - while (parentElement = parentElement.parent()); - - return !hasParent || (!allowChildAnimations && parentRunningAnimation); - } - }]); - - $animateProvider.register('', ['$window', '$sniffer', '$timeout', '$$animateReflow', - function($window, $sniffer, $timeout, $$animateReflow) { - // Detect proper transitionend/animationend event names. - var CSS_PREFIX = '', TRANSITION_PROP, TRANSITIONEND_EVENT, ANIMATION_PROP, ANIMATIONEND_EVENT; - - // If unprefixed events are not supported but webkit-prefixed are, use the latter. - // Otherwise, just use W3C names, browsers not supporting them at all will just ignore them. - // Note: Chrome implements `window.onwebkitanimationend` and doesn't implement `window.onanimationend` - // but at the same time dispatches the `animationend` event and not `webkitAnimationEnd`. - // Register both events in case `window.onanimationend` is not supported because of that, - // do the same for `transitionend` as Safari is likely to exhibit similar behavior. - // Also, the only modern browser that uses vendor prefixes for transitions/keyframes is webkit - // therefore there is no reason to test anymore for other vendor prefixes: http://caniuse.com/#search=transition - if (window.ontransitionend === undefined && window.onwebkittransitionend !== undefined) { - CSS_PREFIX = '-webkit-'; - TRANSITION_PROP = 'WebkitTransition'; - TRANSITIONEND_EVENT = 'webkitTransitionEnd transitionend'; - } else { - TRANSITION_PROP = 'transition'; - TRANSITIONEND_EVENT = 'transitionend'; - } - - if (window.onanimationend === undefined && window.onwebkitanimationend !== undefined) { - CSS_PREFIX = '-webkit-'; - ANIMATION_PROP = 'WebkitAnimation'; - ANIMATIONEND_EVENT = 'webkitAnimationEnd animationend'; - } else { - ANIMATION_PROP = 'animation'; - ANIMATIONEND_EVENT = 'animationend'; - } - - var DURATION_KEY = 'Duration'; - var PROPERTY_KEY = 'Property'; - var DELAY_KEY = 'Delay'; - var ANIMATION_ITERATION_COUNT_KEY = 'IterationCount'; - var ANIMATION_PLAYSTATE_KEY = 'PlayState'; - var NG_ANIMATE_PARENT_KEY = '$$ngAnimateKey'; - var NG_ANIMATE_CSS_DATA_KEY = '$$ngAnimateCSS3Data'; - var ELAPSED_TIME_MAX_DECIMAL_PLACES = 3; - var CLOSING_TIME_BUFFER = 1.5; - var ONE_SECOND = 1000; - - var lookupCache = {}; - var parentCounter = 0; - var animationReflowQueue = []; - var cancelAnimationReflow; - function clearCacheAfterReflow() { - if (!cancelAnimationReflow) { - cancelAnimationReflow = $$animateReflow(function() { - animationReflowQueue = []; - cancelAnimationReflow = null; - lookupCache = {}; - }); - } - } - - function afterReflow(element, callback) { - if (cancelAnimationReflow) { - cancelAnimationReflow(); - } - animationReflowQueue.push(callback); - cancelAnimationReflow = $$animateReflow(function() { - forEach(animationReflowQueue, function(fn) { - fn(); - }); - - animationReflowQueue = []; - cancelAnimationReflow = null; - lookupCache = {}; - }); - } - - var closingTimer = null; - var closingTimestamp = 0; - var animationElementQueue = []; - function animationCloseHandler(element, totalTime) { - var node = extractElementNode(element); - element = angular.element(node); - - //this item will be garbage collected by the closing - //animation timeout - animationElementQueue.push(element); - - //but it may not need to cancel out the existing timeout - //if the timestamp is less than the previous one - var futureTimestamp = Date.now() + totalTime; - if (futureTimestamp <= closingTimestamp) { - return; - } - - $timeout.cancel(closingTimer); - - closingTimestamp = futureTimestamp; - closingTimer = $timeout(function() { - closeAllAnimations(animationElementQueue); - animationElementQueue = []; - }, totalTime, false); - } - - function closeAllAnimations(elements) { - forEach(elements, function(element) { - var elementData = element.data(NG_ANIMATE_CSS_DATA_KEY); - if (elementData) { - forEach(elementData.closeAnimationFns, function(fn) { - fn(); - }); - } - }); - } - - function getElementAnimationDetails(element, cacheKey) { - var data = cacheKey ? lookupCache[cacheKey] : null; - if (!data) { - var transitionDuration = 0; - var transitionDelay = 0; - var animationDuration = 0; - var animationDelay = 0; - - //we want all the styles defined before and after - forEach(element, function(element) { - if (element.nodeType == ELEMENT_NODE) { - var elementStyles = $window.getComputedStyle(element) || {}; - - var transitionDurationStyle = elementStyles[TRANSITION_PROP + DURATION_KEY]; - transitionDuration = Math.max(parseMaxTime(transitionDurationStyle), transitionDuration); - - var transitionDelayStyle = elementStyles[TRANSITION_PROP + DELAY_KEY]; - transitionDelay = Math.max(parseMaxTime(transitionDelayStyle), transitionDelay); - - var animationDelayStyle = elementStyles[ANIMATION_PROP + DELAY_KEY]; - animationDelay = Math.max(parseMaxTime(elementStyles[ANIMATION_PROP + DELAY_KEY]), animationDelay); - - var aDuration = parseMaxTime(elementStyles[ANIMATION_PROP + DURATION_KEY]); - - if (aDuration > 0) { - aDuration *= parseInt(elementStyles[ANIMATION_PROP + ANIMATION_ITERATION_COUNT_KEY], 10) || 1; - } - animationDuration = Math.max(aDuration, animationDuration); - } - }); - data = { - total: 0, - transitionDelay: transitionDelay, - transitionDuration: transitionDuration, - animationDelay: animationDelay, - animationDuration: animationDuration - }; - if (cacheKey) { - lookupCache[cacheKey] = data; - } - } - return data; - } - - function parseMaxTime(str) { - var maxValue = 0; - var values = isString(str) ? - str.split(/\s*,\s*/) : - []; - forEach(values, function(value) { - maxValue = Math.max(parseFloat(value) || 0, maxValue); - }); - return maxValue; - } - - function getCacheKey(element) { - var parentElement = element.parent(); - var parentID = parentElement.data(NG_ANIMATE_PARENT_KEY); - if (!parentID) { - parentElement.data(NG_ANIMATE_PARENT_KEY, ++parentCounter); - parentID = parentCounter; - } - return parentID + '-' + extractElementNode(element).getAttribute('class'); - } - - function animateSetup(animationEvent, element, className, styles) { - var structural = ['ng-enter','ng-leave','ng-move'].indexOf(className) >= 0; - - var cacheKey = getCacheKey(element); - var eventCacheKey = cacheKey + ' ' + className; - var itemIndex = lookupCache[eventCacheKey] ? ++lookupCache[eventCacheKey].total : 0; - - var stagger = {}; - if (itemIndex > 0) { - var staggerClassName = className + '-stagger'; - var staggerCacheKey = cacheKey + ' ' + staggerClassName; - var applyClasses = !lookupCache[staggerCacheKey]; - - applyClasses && element.addClass(staggerClassName); - - stagger = getElementAnimationDetails(element, staggerCacheKey); - - applyClasses && element.removeClass(staggerClassName); - } - - element.addClass(className); - - var formerData = element.data(NG_ANIMATE_CSS_DATA_KEY) || {}; - var timings = getElementAnimationDetails(element, eventCacheKey); - var transitionDuration = timings.transitionDuration; - var animationDuration = timings.animationDuration; - - if (structural && transitionDuration === 0 && animationDuration === 0) { - element.removeClass(className); - return false; - } - - var blockTransition = styles || (structural && transitionDuration > 0); - var blockAnimation = animationDuration > 0 && - stagger.animationDelay > 0 && - stagger.animationDuration === 0; - - var closeAnimationFns = formerData.closeAnimationFns || []; - element.data(NG_ANIMATE_CSS_DATA_KEY, { - stagger: stagger, - cacheKey: eventCacheKey, - running: formerData.running || 0, - itemIndex: itemIndex, - blockTransition: blockTransition, - closeAnimationFns: closeAnimationFns - }); - - var node = extractElementNode(element); - - if (blockTransition) { - blockTransitions(node, true); - if (styles) { - element.css(styles); - } - } - - if (blockAnimation) { - blockAnimations(node, true); - } - - return true; - } - - function animateRun(animationEvent, element, className, activeAnimationComplete, styles) { - var node = extractElementNode(element); - var elementData = element.data(NG_ANIMATE_CSS_DATA_KEY); - if (node.getAttribute('class').indexOf(className) == -1 || !elementData) { - activeAnimationComplete(); - return; - } - - var activeClassName = ''; - var pendingClassName = ''; - forEach(className.split(' '), function(klass, i) { - var prefix = (i > 0 ? ' ' : '') + klass; - activeClassName += prefix + '-active'; - pendingClassName += prefix + '-pending'; - }); - - var style = ''; - var appliedStyles = []; - var itemIndex = elementData.itemIndex; - var stagger = elementData.stagger; - var staggerTime = 0; - if (itemIndex > 0) { - var transitionStaggerDelay = 0; - if (stagger.transitionDelay > 0 && stagger.transitionDuration === 0) { - transitionStaggerDelay = stagger.transitionDelay * itemIndex; - } - - var animationStaggerDelay = 0; - if (stagger.animationDelay > 0 && stagger.animationDuration === 0) { - animationStaggerDelay = stagger.animationDelay * itemIndex; - appliedStyles.push(CSS_PREFIX + 'animation-play-state'); - } - - staggerTime = Math.round(Math.max(transitionStaggerDelay, animationStaggerDelay) * 100) / 100; - } - - if (!staggerTime) { - element.addClass(activeClassName); - if (elementData.blockTransition) { - blockTransitions(node, false); - } - } - - var eventCacheKey = elementData.cacheKey + ' ' + activeClassName; - var timings = getElementAnimationDetails(element, eventCacheKey); - var maxDuration = Math.max(timings.transitionDuration, timings.animationDuration); - if (maxDuration === 0) { - element.removeClass(activeClassName); - animateClose(element, className); - activeAnimationComplete(); - return; - } - - if (!staggerTime && styles) { - if (!timings.transitionDuration) { - element.css('transition', timings.animationDuration + 's linear all'); - appliedStyles.push('transition'); - } - element.css(styles); - } - - var maxDelay = Math.max(timings.transitionDelay, timings.animationDelay); - var maxDelayTime = maxDelay * ONE_SECOND; - - if (appliedStyles.length > 0) { - //the element being animated may sometimes contain comment nodes in - //the jqLite object, so we're safe to use a single variable to house - //the styles since there is always only one element being animated - var oldStyle = node.getAttribute('style') || ''; - if (oldStyle.charAt(oldStyle.length - 1) !== ';') { - oldStyle += ';'; - } - node.setAttribute('style', oldStyle + ' ' + style); - } - - var startTime = Date.now(); - var css3AnimationEvents = ANIMATIONEND_EVENT + ' ' + TRANSITIONEND_EVENT; - var animationTime = (maxDelay + maxDuration) * CLOSING_TIME_BUFFER; - var totalTime = (staggerTime + animationTime) * ONE_SECOND; - - var staggerTimeout; - if (staggerTime > 0) { - element.addClass(pendingClassName); - staggerTimeout = $timeout(function() { - staggerTimeout = null; - - if (timings.transitionDuration > 0) { - blockTransitions(node, false); - } - if (timings.animationDuration > 0) { - blockAnimations(node, false); - } - - element.addClass(activeClassName); - element.removeClass(pendingClassName); - - if (styles) { - if (timings.transitionDuration === 0) { - element.css('transition', timings.animationDuration + 's linear all'); - } - element.css(styles); - appliedStyles.push('transition'); - } - }, staggerTime * ONE_SECOND, false); - } - - element.on(css3AnimationEvents, onAnimationProgress); - elementData.closeAnimationFns.push(function() { - onEnd(); - activeAnimationComplete(); - }); - - elementData.running++; - animationCloseHandler(element, totalTime); - return onEnd; - - // This will automatically be called by $animate so - // there is no need to attach this internally to the - // timeout done method. - function onEnd() { - element.off(css3AnimationEvents, onAnimationProgress); - element.removeClass(activeClassName); - element.removeClass(pendingClassName); - if (staggerTimeout) { - $timeout.cancel(staggerTimeout); - } - animateClose(element, className); - var node = extractElementNode(element); - for (var i in appliedStyles) { - node.style.removeProperty(appliedStyles[i]); - } - } - - function onAnimationProgress(event) { - event.stopPropagation(); - var ev = event.originalEvent || event; - var timeStamp = ev.$manualTimeStamp || ev.timeStamp || Date.now(); - - /* Firefox (or possibly just Gecko) likes to not round values up - * when a ms measurement is used for the animation */ - var elapsedTime = parseFloat(ev.elapsedTime.toFixed(ELAPSED_TIME_MAX_DECIMAL_PLACES)); - - /* $manualTimeStamp is a mocked timeStamp value which is set - * within browserTrigger(). This is only here so that tests can - * mock animations properly. Real events fallback to event.timeStamp, - * or, if they don't, then a timeStamp is automatically created for them. - * We're checking to see if the timeStamp surpasses the expected delay, - * but we're using elapsedTime instead of the timeStamp on the 2nd - * pre-condition since animations sometimes close off early */ - if (Math.max(timeStamp - startTime, 0) >= maxDelayTime && elapsedTime >= maxDuration) { - activeAnimationComplete(); - } - } - } - - function blockTransitions(node, bool) { - node.style[TRANSITION_PROP + PROPERTY_KEY] = bool ? 'none' : ''; - } - - function blockAnimations(node, bool) { - node.style[ANIMATION_PROP + ANIMATION_PLAYSTATE_KEY] = bool ? 'paused' : ''; - } - - function animateBefore(animationEvent, element, className, styles) { - if (animateSetup(animationEvent, element, className, styles)) { - return function(cancelled) { - cancelled && animateClose(element, className); - }; - } - } - - function animateAfter(animationEvent, element, className, afterAnimationComplete, styles) { - if (element.data(NG_ANIMATE_CSS_DATA_KEY)) { - return animateRun(animationEvent, element, className, afterAnimationComplete, styles); - } else { - animateClose(element, className); - afterAnimationComplete(); - } - } - - function animate(animationEvent, element, className, animationComplete, options) { - //If the animateSetup function doesn't bother returning a - //cancellation function then it means that there is no animation - //to perform at all - var preReflowCancellation = animateBefore(animationEvent, element, className, options.from); - if (!preReflowCancellation) { - clearCacheAfterReflow(); - animationComplete(); - return; - } - - //There are two cancellation functions: one is before the first - //reflow animation and the second is during the active state - //animation. The first function will take care of removing the - //data from the element which will not make the 2nd animation - //happen in the first place - var cancel = preReflowCancellation; - afterReflow(element, function() { - //once the reflow is complete then we point cancel to - //the new cancellation function which will remove all of the - //animation properties from the active animation - cancel = animateAfter(animationEvent, element, className, animationComplete, options.to); - }); - - return function(cancelled) { - (cancel || noop)(cancelled); - }; - } - - function animateClose(element, className) { - element.removeClass(className); - var data = element.data(NG_ANIMATE_CSS_DATA_KEY); - if (data) { - if (data.running) { - data.running--; - } - if (!data.running || data.running === 0) { - element.removeData(NG_ANIMATE_CSS_DATA_KEY); - } - } - } - - return { - animate: function(element, className, from, to, animationCompleted, options) { - options = options || {}; - options.from = from; - options.to = to; - return animate('animate', element, className, animationCompleted, options); - }, - - enter: function(element, animationCompleted, options) { - options = options || {}; - return animate('enter', element, 'ng-enter', animationCompleted, options); - }, - - leave: function(element, animationCompleted, options) { - options = options || {}; - return animate('leave', element, 'ng-leave', animationCompleted, options); - }, - - move: function(element, animationCompleted, options) { - options = options || {}; - return animate('move', element, 'ng-move', animationCompleted, options); - }, - - beforeSetClass: function(element, add, remove, animationCompleted, options) { - options = options || {}; - var className = suffixClasses(remove, '-remove') + ' ' + - suffixClasses(add, '-add'); - var cancellationMethod = animateBefore('setClass', element, className, options.from); - if (cancellationMethod) { - afterReflow(element, animationCompleted); - return cancellationMethod; - } - clearCacheAfterReflow(); - animationCompleted(); - }, - - beforeAddClass: function(element, className, animationCompleted, options) { - options = options || {}; - var cancellationMethod = animateBefore('addClass', element, suffixClasses(className, '-add'), options.from); - if (cancellationMethod) { - afterReflow(element, animationCompleted); - return cancellationMethod; - } - clearCacheAfterReflow(); - animationCompleted(); - }, - - beforeRemoveClass: function(element, className, animationCompleted, options) { - options = options || {}; - var cancellationMethod = animateBefore('removeClass', element, suffixClasses(className, '-remove'), options.from); - if (cancellationMethod) { - afterReflow(element, animationCompleted); - return cancellationMethod; - } - clearCacheAfterReflow(); - animationCompleted(); - }, - - setClass: function(element, add, remove, animationCompleted, options) { - options = options || {}; - remove = suffixClasses(remove, '-remove'); - add = suffixClasses(add, '-add'); - var className = remove + ' ' + add; - return animateAfter('setClass', element, className, animationCompleted, options.to); - }, - - addClass: function(element, className, animationCompleted, options) { - options = options || {}; - return animateAfter('addClass', element, suffixClasses(className, '-add'), animationCompleted, options.to); - }, - - removeClass: function(element, className, animationCompleted, options) { - options = options || {}; - return animateAfter('removeClass', element, suffixClasses(className, '-remove'), animationCompleted, options.to); - } - }; - - function suffixClasses(classes, suffix) { - var className = ''; - classes = isArray(classes) ? classes : classes.split(/\s+/); - forEach(classes, function(klass, i) { - if (klass && klass.length > 0) { - className += (i > 0 ? ' ' : '') + klass + suffix; - } - }); - return className; - } - }]); - }]); - - -})(window, window.angular); diff --git a/public/browse/lib/angular-animate/angular-animate.min.js b/public/browse/lib/angular-animate/angular-animate.min.js deleted file mode 100644 index 63cbbbb02..000000000 --- a/public/browse/lib/angular-animate/angular-animate.min.js +++ /dev/null @@ -1,33 +0,0 @@ -/* - AngularJS v1.3.5 - (c) 2010-2014 Google, Inc. http://angularjs.org - License: MIT -*/ -(function(M,f,S){'use strict';f.module("ngAnimate",["ng"]).directive("ngAnimateChildren",function(){return function(T,B,k){k=k.ngAnimateChildren;f.isString(k)&&0===k.length?B.data("$$ngAnimateChildren",!0):T.$watch(k,function(f){B.data("$$ngAnimateChildren",!!f)})}}).factory("$$animateReflow",["$$rAF","$document",function(f,B){return function(k){return f(function(){k()})}}]).config(["$provide","$animateProvider",function(T,B){function k(f){for(var g=0;g=A&&d>=x&&c()}var m=k(d);a=d.data("$$ngAnimateCSS3Data");if(-1!=m.getAttribute("class").indexOf(b)&&a){var q="",r="";g(b.split(" "),function(a,d){var b=(0", - "license": "MIT", - "bugs": { - "url": "https://github.com/angular/angular.js/issues" - }, - "homepage": "http://angularjs.org" -} diff --git a/public/browse/lib/angular-bindonce/.bower.json b/public/browse/lib/angular-bindonce/.bower.json deleted file mode 100644 index 313c654cc..000000000 --- a/public/browse/lib/angular-bindonce/.bower.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "angular-bindonce", - "version": "0.3.3", - "main": "bindonce.js", - "description": "Zero watchers binding directives for AngularJS", - "homepage": "https://github.com/Pasvaz/bindonce", - "author": "Pasquale Vazzana ", - "repository": { - "type": "git", - "url": "https://github.com/Pasvaz/bindonce.git" - }, - "license": "MIT", - "ignore": [ - "**/.*", - "node_modules", - "components" - ], - "dependencies": {}, - "keywords": [ - "angularjs", - "angular", - "directive", - "binding", - "watcher", - "bindonce" - ], - "_release": "0.3.3", - "_resolution": { - "type": "version", - "tag": "0.3.3", - "commit": "0fcf71e6effc88179893c9c06baf6c6bf9037632" - }, - "_source": "git://github.com/Pasvaz/bindonce.git", - "_target": "~0.3.3", - "_originalSource": "angular-bindonce", - "_direct": true -} \ No newline at end of file diff --git a/public/browse/lib/angular-bindonce/CHANGELOG.md b/public/browse/lib/angular-bindonce/CHANGELOG.md deleted file mode 100644 index 8246d986e..000000000 --- a/public/browse/lib/angular-bindonce/CHANGELOG.md +++ /dev/null @@ -1,43 +0,0 @@ -# 0.3.3 (2014-02-12) -### Features -- **bo-disabled:** - - Add support for ng-disabled/bo-disabled #110 - -
    -# 0.3.2 (2014-11-23) -### Bug Fixes -- **Angular 1.3 compatibility** - -
    -# 0.3.1 (2014-02-12) -### Features -- **bo-bind:** - - alias for bo-text - -### Bug Fixes -- **Angular Promises** - - Ensures that promises are resolved before to run binders ([b3ef1b4](https://github.com/Pasvaz/bindonce/commit/b3ef1b46edfe83f10ed455d5520027f731563f32)) - -### Minor improvements -- Updated Readme - -
    -# 0.3.0 (2014-01-21) -### Features -- **bo-switch:** - - Create new directive: bo-switch ([652d0db](https://github.com/Pasvaz/bindonce/commit/652d0db04325166a180377c738a376543b5f2357)) - -
    -# 0.2.3 (2014-01-20) -### Bug Fixes - -- **bo-if:** - - Ensures that we both process newly added binders from bo-if, and that -we only process each binder once ([d11f863](https://github.com/Pasvaz/bindonce/commit/e091c273bbd17603d410fecc363874f0d1e6f38e)) - -### Features - -- **Minification:** - - add min file ([47277ee](https://github.com/Pasvaz/bindonce/commit/47277eedd092b3210de362c725a7dadcddac8e87)) -- **Changelog:** - - Created a changelog file diff --git a/public/browse/lib/angular-bindonce/README.md b/public/browse/lib/angular-bindonce/README.md deleted file mode 100644 index c8d753fbe..000000000 --- a/public/browse/lib/angular-bindonce/README.md +++ /dev/null @@ -1,154 +0,0 @@ -Bindonce -======== - -High performance binding for AngularJs - -## Usage -* download, clone or fork it or install it using [bower](http://twitter.github.com/bower/) `bower install angular-bindonce` -* Include the `bindonce.js` script provided by this component into your app. -* Add `'pasvaz.bindonce'` as a module dependency to your app: `angular.module('app', ['pasvaz.bindonce'])` - -## Demo -Here is an example of how AngularJs can [freeze your UI](http://plnkr.co/edit/jwrHVb?p=preview), try to press and hold a key inside the input field, when the table is filled with only 1 person everything is ok, you can see how the DOM is updated by the input in real time, however if you try to load 1000 person *(or even 500 if the testing device is not powerfull)* and repeat the experiment you can see how the UI is frozen. In [this other demo](http://plnkr.co/edit/0DGOrk?p=preview) BindOnce will take care of your watchers and the UI will be reactive as it should be. The code is the same for both demos, the only difference is that I replaced any `ng-*` tag inside the table with the equivalent `bo-*` tag. -* [AngularJs regular Demo](http://plnkr.co/edit/jwrHVb?p=preview) -* [Demo with Bindonce](http://plnkr.co/edit/0DGOrk?p=preview) - -## Overview -AngularJs provides a great data binding system but if you abuse of it the page can run into some performance issues, it's known that more of 2000 watchers can lag the UI and that amount can be reached easily if you don't pay attention to the data-binding. Sometime you really need to bind your data using watchers, especially for SPA because the data are updated in real time, but often you can avoid it with some efforts, most of the data presented in your page, once rendered, are immutable so you shouldn't keep watching them for changes. - -For instance, take a look to this snippet: -```html -
    -``` -Angular internally creates a `$watch` for each `ng-*` directive in order to keep the data up to date, so in this example just for displaying few info it creates 6 + 1 *(ngRepeatWatch)* watchers per `person`, even if the `person` is supposed to remain the same once shown. Iterate this amount for each person and you can have an idea about how easy is to reach 2000 watchers. Now if you need it because those data could change while you show the page or are bound to some models, it's ok. But most of the time they are static data that don't change once rendered. This is where **bindonce** can really help you. - -The above example done with **bindonce**: -```html -
      -
    • - - -

      -
    • -
    -``` -Now this example uses **0 watches** per `person` and renders exactly the same result as the above that uses ng-*. *(Angular still uses 1 watcher for ngRepeatWatch)* - -### The smart approach -OK until here nothing completely new, with a bit of efforts you could create your own directive and render the `person` inside the `link` function, or you could use [watch fighters](https://github.com/abourget/abourget-angular) that has a similar approach, but there is still one problem that you have to face and **bindonce** already handles it: *the existence of the data when the directive renders the content*. Usually the directives, unless you use watchers or bind their attributes to the scope (still a watcher), render the content when they are loaded into the markup, but if at that given time your data is not available, the directive can't render it. Bindonce can wait until the data is ready before to rendering the content. -Let's take a look at the follow snippet to better understand the concept: -```html - - -... - -``` -This basic directive works as expected, it renders the `Person` data without using any watchers. However, if `Person` is not yet available inside the $scope when the page is loaded (say we get `Person` via $http or via $resource), the directive is useless, `scope.$eval(attr.myCustomSetText)` simply renders nothing and exits. - -Here is how we can solve this issue with **bindonce**: -```html -
    - - - -

    -
    -``` -`bindonce="Person"` does the trick, any `bo-*` attribute belonging to `bindonce` waits until the parent `bindonce="{somedata}"` is validated and then renders its content. Once the scope contains the value `Person` then each bo-* child gets filled with the proper values. In order to accomplish this task, **bindonce** uses just **one** temporary watcher, no matters how many children need to be rendered. As soon as it gets `Person` the watcher is promptly removed. If the $scope already contains the data `bindonce` is looking for, then it doesn't create the temporary watcher and simply starts rendering its children. - -You may have noticed that the first example didn't assign any value to the `bindonce` attribute: -```html -
      -
    • - ... -``` -when used with `ng-repeat` `bindonce` doesn't need to check if `person` is defined because `ng-repeat` creates the directives only when `person` exists. You could be more explicit: `
    • `, however assigning a value to `bindonce` in an `ng-repeat` won't make any difference. - -### Interpolation -Some directives (ng-href, ng-src) use interpolation, ie: `ng-href="/profile/{{User.profileId}}"`. -Both `ng-href` and `ng-src` have the bo-* equivalent directives: `bo-href-i` and `bo-src-i` (pay attention to the **-i**, it stands for **interpolate**). As expected they don't use watchers however Angular creates one watcher per interpolation, for instance `bo-href-i="/profile/{{User.profileId}}"` sets the element's href **once**, as expected, but Angular keeps a watcher active on `{{User.profileId}}` even if `bo-href-i` doesn't use it. -That's why by default the `bo-href` doesn't use interpolation or watchers. The above equivalent with 0 watchers would be `bo-href="'/profile/' + User.profileId"`. Nevertheless, `bo-href-i` and `bo-src-i` are still maintained for compatibility reasons. - -### Filters -Almost every `bo-*` directive replace the equivalent `ng-*` and works in the same ways, except it is evaluated once. -Consequentially you can use any valid angular expression, including filters. This is an example how to use a filter: -```html -
      - -
      -``` - -## Attribute Usage -| Directive | Description | Example | -|------------|----------------|-----| -| `bindonce="{somedata}"`| **bindonce** is the main directive. `{somedata}` is optional, and if present, forces bindonce to wait until `somedata` is defined before rendering its children | `
      ...
      ` | -| `bo-if = "condition"` | equivalent to `ng-if` but doesn't use watchers |``| -| `bo-switch = "expression"` | equivalent to `ng-switch` but doesn't use watchers |`
      ` `public` `private` `
      `| -| `bo-show = "condition"` | equivalent to `ng-show` but doesn't use watchers |``| -| `bo-hide = "condition"` | equivalent to `ng-hide` but doesn't use watchers |``| -| `bo-disabled = "condition"` | equivalent to `ng-disabled` but doesn't use watchers |``| -| `bo-text = "text"` | evaluates "text" and print it as text inside the element | `` | -| `bo-bind = "text"` | alias for `bo-text`, equivalent to `ng-bind` but doesn't use watchers | `` | -| `bo-html = "markup"` | evaluates "markup" and render it as html inside the element |`bo-html="Person.description"`| -| `bo-href-i = "url"`
      *use `bo-href` instead* | **equivalent** to `ng-href`.
      **Heads up!** Using interpolation `{{}}` it creates one watcher:
      `bo-href-i="/p/{{Person.id}}"`.
      Use `bo-href` to avoid the watcher:
      `bo-href="'/p/' + Person.id"` |``| -| `bo-href = "url"` | **similar** to `ng-href` but doesn't allow interpolation using `{{}}` like `ng-href`.
      **Heads up!** You can't use interpolation `{{}}` inside the url, use bo-href-i for that purpose |``
      or
      ``| -| `bo-src-i = "url"`
      *use `bo-src` instead* | **equivalent** to `ng-src`.
      **Heads up!** It creates one watcher |``| -| `bo-src = "url"` | **similar** to `ng-src` but doesn't allow interpolation using `{{}}` like `ng-src`.
      **Heads up!** You can't use interpolation `{{}}`, use bo-src-i for that purpose |``| -| `bo-class = "object/string"` | equivalent to `ng-class` but doesn't use watchers |``| -| `bo-alt = "text"` | evaluates "text" and render it as `alt` for the element |``| -| `bo-title = "text"` | evaluates "text" and render it as `title` for the element |``| -| `bo-id = "#id"` | evaluates "#id" and render it as `id` for the element |``| -| `bo-style = "object"` | equivalent to `ng-style` but doesn't use watchers |``| -| `bo-value = "expression"` | evaluates "expression" and render it as `value` for the element |``| -| `bo-attr bo-attr-foo = "text"` | evaluates "text" and render it as a custom attribute for the element |`
      `| - -## Build -``` -$ npm install uglify-js -g -$ uglifyjs bindonce.js -c -m -o bindonce.min.js -``` - -## Todo -Tests - -## Copyright -BindOnce was written by **Pasquale Vazzana**, you can follow him on [google+](https://plus.google.com/101872882413388363602) or on [@twitter](https://twitter.com/PasqualeVazzana) - -Thanks to all the [contributors](https://github.com/Pasvaz/bindonce/graphs/contributors) - -## LICENSE - "MIT License" - -Copyright (c) 2013-2014 Pasquale Vazzana - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/public/browse/lib/angular-bindonce/bindonce.js b/public/browse/lib/angular-bindonce/bindonce.js deleted file mode 100644 index 8742d8917..000000000 --- a/public/browse/lib/angular-bindonce/bindonce.js +++ /dev/null @@ -1,325 +0,0 @@ -(function () { - "use strict"; - /** - * Bindonce - Zero watches binding for AngularJs - * @version v0.3.3 - * @link https://github.com/Pasvaz/bindonce - * @author Pasquale Vazzana - * @license MIT License, http://www.opensource.org/licenses/MIT - */ - - var bindonceModule = angular.module('pasvaz.bindonce', []); - - bindonceModule.directive('bindonce', function () - { - var toBoolean = function (value) - { - if (value && value.length !== 0) - { - var v = angular.lowercase("" + value); - value = !(v === 'f' || v === '0' || v === 'false' || v === 'no' || v === 'n' || v === '[]'); - } - else - { - value = false; - } - return value; - }; - - var msie = parseInt((/msie (\d+)/.exec(angular.lowercase(navigator.userAgent)) || [])[1], 10); - if (isNaN(msie)) - { - msie = parseInt((/trident\/.*; rv:(\d+)/.exec(angular.lowercase(navigator.userAgent)) || [])[1], 10); - } - - var bindonceDirective = - { - restrict: "AM", - controller: ['$scope', '$element', '$attrs', '$interpolate', function ($scope, $element, $attrs, $interpolate) - { - var showHideBinder = function (elm, attr, value) - { - var show = (attr === 'show') ? '' : 'none'; - var hide = (attr === 'hide') ? '' : 'none'; - elm.css('display', toBoolean(value) ? show : hide); - }; - var classBinder = function (elm, value) - { - if (angular.isObject(value) && !angular.isArray(value)) - { - var results = []; - angular.forEach(value, function (value, index) - { - if (value) results.push(index); - }); - value = results; - } - if (value) - { - elm.addClass(angular.isArray(value) ? value.join(' ') : value); - } - }; - var transclude = function (transcluder, scope) - { - transcluder.transclude(scope, function (clone) - { - var parent = transcluder.element.parent(); - var afterNode = transcluder.element && transcluder.element[transcluder.element.length - 1]; - var parentNode = parent && parent[0] || afterNode && afterNode.parentNode; - var afterNextSibling = (afterNode && afterNode.nextSibling) || null; - angular.forEach(clone, function (node) - { - parentNode.insertBefore(node, afterNextSibling); - }); - }); - }; - - var ctrl = - { - watcherRemover: undefined, - binders: [], - group: $attrs.boName, - element: $element, - ran: false, - - addBinder: function (binder) - { - this.binders.push(binder); - - // In case of late binding (when using the directive bo-name/bo-parent) - // it happens only when you use nested bindonce, if the bo-children - // are not dom children the linking can follow another order - if (this.ran) - { - this.runBinders(); - } - }, - - setupWatcher: function (bindonceValue) - { - var that = this; - this.watcherRemover = $scope.$watch(bindonceValue, function (newValue) - { - if (newValue === undefined) return; - that.removeWatcher(); - that.checkBindonce(newValue); - }, true); - }, - - checkBindonce: function (value) - { - var that = this, promise = (value.$promise) ? value.$promise.then : value.then; - // since Angular 1.2 promises are no longer - // undefined until they don't get resolved - if (typeof promise === 'function') - { - promise(function () - { - that.runBinders(); - }); - } - else - { - that.runBinders(); - } - }, - - removeWatcher: function () - { - if (this.watcherRemover !== undefined) - { - this.watcherRemover(); - this.watcherRemover = undefined; - } - }, - - runBinders: function () - { - while (this.binders.length > 0) - { - var binder = this.binders.shift(); - if (this.group && this.group != binder.group) continue; - var value = binder.scope.$eval((binder.interpolate) ? $interpolate(binder.value) : binder.value); - switch (binder.attr) - { - case 'boIf': - if (toBoolean(value)) - { - transclude(binder, binder.scope.$new()); - } - break; - case 'boSwitch': - var selectedTranscludes, switchCtrl = binder.controller[0]; - if ((selectedTranscludes = switchCtrl.cases['!' + value] || switchCtrl.cases['?'])) - { - binder.scope.$eval(binder.attrs.change); - angular.forEach(selectedTranscludes, function (selectedTransclude) - { - transclude(selectedTransclude, binder.scope.$new()); - }); - } - break; - case 'boSwitchWhen': - var ctrl = binder.controller[0]; - ctrl.cases['!' + binder.attrs.boSwitchWhen] = (ctrl.cases['!' + binder.attrs.boSwitchWhen] || []); - ctrl.cases['!' + binder.attrs.boSwitchWhen].push({ transclude: binder.transclude, element: binder.element }); - break; - case 'boSwitchDefault': - var ctrl = binder.controller[0]; - ctrl.cases['?'] = (ctrl.cases['?'] || []); - ctrl.cases['?'].push({ transclude: binder.transclude, element: binder.element }); - break; - case 'hide': - case 'show': - showHideBinder(binder.element, binder.attr, value); - break; - case 'class': - classBinder(binder.element, value); - break; - case 'text': - binder.element.text(value); - break; - case 'html': - binder.element.html(value); - break; - case 'style': - binder.element.css(value); - break; - case 'disabled': - binder.element.prop('disabled', value); - break; - case 'src': - binder.element.attr(binder.attr, value); - if (msie) binder.element.prop('src', value); - break; - case 'attr': - angular.forEach(binder.attrs, function (attrValue, attrKey) - { - var newAttr, newValue; - if (attrKey.match(/^boAttr./) && binder.attrs[attrKey]) - { - newAttr = attrKey.replace(/^boAttr/, '').replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase(); - newValue = binder.scope.$eval(binder.attrs[attrKey]); - binder.element.attr(newAttr, newValue); - } - }); - break; - case 'href': - case 'alt': - case 'title': - case 'id': - case 'value': - binder.element.attr(binder.attr, value); - break; - } - } - this.ran = true; - } - }; - - angular.extend(this, ctrl); - }], - - link: function (scope, elm, attrs, bindonceController) - { - var value = attrs.bindonce && scope.$eval(attrs.bindonce); - if (value !== undefined) - { - bindonceController.checkBindonce(value); - } - else - { - bindonceController.setupWatcher(attrs.bindonce); - elm.bind("$destroy", bindonceController.removeWatcher); - } - } - }; - - return bindonceDirective; - }); - - angular.forEach( - [ - { directiveName: 'boShow', attribute: 'show' }, - { directiveName: 'boHide', attribute: 'hide' }, - { directiveName: 'boClass', attribute: 'class' }, - { directiveName: 'boText', attribute: 'text' }, - { directiveName: 'boBind', attribute: 'text' }, - { directiveName: 'boHtml', attribute: 'html' }, - { directiveName: 'boSrcI', attribute: 'src', interpolate: true }, - { directiveName: 'boSrc', attribute: 'src' }, - { directiveName: 'boHrefI', attribute: 'href', interpolate: true }, - { directiveName: 'boHref', attribute: 'href' }, - { directiveName: 'boAlt', attribute: 'alt' }, - { directiveName: 'boTitle', attribute: 'title' }, - { directiveName: 'boId', attribute: 'id' }, - { directiveName: 'boStyle', attribute: 'style' }, - { directiveName: 'boDisabled', attribute: 'disabled' }, - { directiveName: 'boValue', attribute: 'value' }, - { directiveName: 'boAttr', attribute: 'attr' }, - - { directiveName: 'boIf', transclude: 'element', terminal: true, priority: 1000 }, - { directiveName: 'boSwitch', require: 'boSwitch', controller: function () { this.cases = {}; } }, - { directiveName: 'boSwitchWhen', transclude: 'element', priority: 800, require: '^boSwitch' }, - { directiveName: 'boSwitchDefault', transclude: 'element', priority: 800, require: '^boSwitch' } - ], - function (boDirective) - { - var childPriority = 200; - return bindonceModule.directive(boDirective.directiveName, function () - { - var bindonceDirective = - { - priority: boDirective.priority || childPriority, - transclude: boDirective.transclude || false, - terminal: boDirective.terminal || false, - require: ['^bindonce'].concat(boDirective.require || []), - controller: boDirective.controller, - compile: function (tElement, tAttrs, transclude) - { - return function (scope, elm, attrs, controllers) - { - var bindonceController = controllers[0]; - var name = attrs.boParent; - if (name && bindonceController.group !== name) - { - var element = bindonceController.element.parent(); - bindonceController = undefined; - var parentValue; - - while (element[0].nodeType !== 9 && element.length) - { - if ((parentValue = element.data('$bindonceController')) - && parentValue.group === name) - { - bindonceController = parentValue; - break; - } - element = element.parent(); - } - if (!bindonceController) - { - throw new Error("No bindonce controller: " + name); - } - } - - bindonceController.addBinder( - { - element: elm, - attr: boDirective.attribute || boDirective.directiveName, - attrs: attrs, - value: attrs[boDirective.directiveName], - interpolate: boDirective.interpolate, - group: name, - transclude: transclude, - controller: controllers.slice(1), - scope: scope - }); - }; - } - }; - - return bindonceDirective; - }); - }) -})(); diff --git a/public/browse/lib/angular-bindonce/bindonce.min.js b/public/browse/lib/angular-bindonce/bindonce.min.js deleted file mode 100644 index 555ded4bf..000000000 --- a/public/browse/lib/angular-bindonce/bindonce.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(){"use strict";var e=angular.module("pasvaz.bindonce",[]);e.directive("bindonce",function(){var e=function(e){if(e&&0!==e.length){var t=angular.lowercase(""+e);e=!("f"===t||"0"===t||"false"===t||"no"===t||"n"===t||"[]"===t)}else e=!1;return e},t=parseInt((/msie (\d+)/.exec(angular.lowercase(navigator.userAgent))||[])[1],10);isNaN(t)&&(t=parseInt((/trident\/.*; rv:(\d+)/.exec(angular.lowercase(navigator.userAgent))||[])[1],10));var r={restrict:"AM",controller:["$scope","$element","$attrs","$interpolate",function(r,a,i,n){var c=function(t,r,a){var i="show"===r?"":"none",n="hide"===r?"":"none";t.css("display",e(a)?i:n)},o=function(e,t){if(angular.isObject(t)&&!angular.isArray(t)){var r=[];angular.forEach(t,function(e,t){e&&r.push(t)}),t=r}t&&e.addClass(angular.isArray(t)?t.join(" "):t)},s=function(e,t){e.transclude(t,function(t){var r=e.element.parent(),a=e.element&&e.element[e.element.length-1],i=r&&r[0]||a&&a.parentNode,n=a&&a.nextSibling||null;angular.forEach(t,function(e){i.insertBefore(e,n)})})},l={watcherRemover:void 0,binders:[],group:i.boName,element:a,ran:!1,addBinder:function(e){this.binders.push(e),this.ran&&this.runBinders()},setupWatcher:function(e){var t=this;this.watcherRemover=r.$watch(e,function(e){void 0!==e&&(t.removeWatcher(),t.checkBindonce(e))},!0)},checkBindonce:function(e){var t=this,r=e.$promise?e.$promise.then:e.then;"function"==typeof r?r(function(){t.runBinders()}):t.runBinders()},removeWatcher:function(){void 0!==this.watcherRemover&&(this.watcherRemover(),this.watcherRemover=void 0)},runBinders:function(){for(;this.binders.length>0;){var r=this.binders.shift();if(!this.group||this.group==r.group){var a=r.scope.$eval(r.interpolate?n(r.value):r.value);switch(r.attr){case"boIf":e(a)&&s(r,r.scope.$new());break;case"boSwitch":var i,l=r.controller[0];(i=l.cases["!"+a]||l.cases["?"])&&(r.scope.$eval(r.attrs.change),angular.forEach(i,function(e){s(e,r.scope.$new())}));break;case"boSwitchWhen":var u=r.controller[0];u.cases["!"+r.attrs.boSwitchWhen]=u.cases["!"+r.attrs.boSwitchWhen]||[],u.cases["!"+r.attrs.boSwitchWhen].push({transclude:r.transclude,element:r.element});break;case"boSwitchDefault":var u=r.controller[0];u.cases["?"]=u.cases["?"]||[],u.cases["?"].push({transclude:r.transclude,element:r.element});break;case"hide":case"show":c(r.element,r.attr,a);break;case"class":o(r.element,a);break;case"text":r.element.text(a);break;case"html":r.element.html(a);break;case"style":r.element.css(a);break;case"disabled":r.element.prop("disabled",a);break;case"src":r.element.attr(r.attr,a),t&&r.element.prop("src",a);break;case"attr":angular.forEach(r.attrs,function(e,t){var a,i;t.match(/^boAttr./)&&r.attrs[t]&&(a=t.replace(/^boAttr/,"").replace(/([a-z])([A-Z])/g,"$1-$2").toLowerCase(),i=r.scope.$eval(r.attrs[t]),r.element.attr(a,i))});break;case"href":case"alt":case"title":case"id":case"value":r.element.attr(r.attr,a)}}}this.ran=!0}};angular.extend(this,l)}],link:function(e,t,r,a){var i=r.bindonce&&e.$eval(r.bindonce);void 0!==i?a.checkBindonce(i):(a.setupWatcher(r.bindonce),t.bind("$destroy",a.removeWatcher))}};return r}),angular.forEach([{directiveName:"boShow",attribute:"show"},{directiveName:"boHide",attribute:"hide"},{directiveName:"boClass",attribute:"class"},{directiveName:"boText",attribute:"text"},{directiveName:"boBind",attribute:"text"},{directiveName:"boHtml",attribute:"html"},{directiveName:"boSrcI",attribute:"src",interpolate:!0},{directiveName:"boSrc",attribute:"src"},{directiveName:"boHrefI",attribute:"href",interpolate:!0},{directiveName:"boHref",attribute:"href"},{directiveName:"boAlt",attribute:"alt"},{directiveName:"boTitle",attribute:"title"},{directiveName:"boId",attribute:"id"},{directiveName:"boStyle",attribute:"style"},{directiveName:"boDisabled",attribute:"disabled"},{directiveName:"boValue",attribute:"value"},{directiveName:"boAttr",attribute:"attr"},{directiveName:"boIf",transclude:"element",terminal:!0,priority:1e3},{directiveName:"boSwitch",require:"boSwitch",controller:function(){this.cases={}}},{directiveName:"boSwitchWhen",transclude:"element",priority:800,require:"^boSwitch"},{directiveName:"boSwitchDefault",transclude:"element",priority:800,require:"^boSwitch"}],function(t){var r=200;return e.directive(t.directiveName,function(){var e={priority:t.priority||r,transclude:t.transclude||!1,terminal:t.terminal||!1,require:["^bindonce"].concat(t.require||[]),controller:t.controller,compile:function(e,r,a){return function(e,r,i,n){var c=n[0],o=i.boParent;if(o&&c.group!==o){var s=c.element.parent();c=void 0;for(var l;9!==s[0].nodeType&&s.length;){if((l=s.data("$bindonceController"))&&l.group===o){c=l;break}s=s.parent()}if(!c)throw new Error("No bindonce controller: "+o)}c.addBinder({element:r,attr:t.attribute||t.directiveName,attrs:i,value:i[t.directiveName],interpolate:t.interpolate,group:o,transclude:a,controller:n.slice(1),scope:e})}}};return e})})}(); \ No newline at end of file diff --git a/public/browse/lib/angular-bindonce/bower.json b/public/browse/lib/angular-bindonce/bower.json deleted file mode 100644 index 924259459..000000000 --- a/public/browse/lib/angular-bindonce/bower.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "angular-bindonce", - "version": "0.3.3", - "main": "bindonce.js", - "description": "Zero watchers binding directives for AngularJS", - "homepage": "https://github.com/Pasvaz/bindonce", - "author": "Pasquale Vazzana ", - "repository": { - "type": "git", - "url": "https://github.com/Pasvaz/bindonce.git" - }, - "license": "MIT", - "ignore": [ - "**/.*", - "node_modules", - "components" - ], - "dependencies": { - }, - "keywords": [ - "angularjs", - "angular", - "directive", - "binding", - "watcher", - "bindonce" - ] -} diff --git a/public/browse/lib/angular-bindonce/package.json b/public/browse/lib/angular-bindonce/package.json deleted file mode 100644 index 924259459..000000000 --- a/public/browse/lib/angular-bindonce/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "angular-bindonce", - "version": "0.3.3", - "main": "bindonce.js", - "description": "Zero watchers binding directives for AngularJS", - "homepage": "https://github.com/Pasvaz/bindonce", - "author": "Pasquale Vazzana ", - "repository": { - "type": "git", - "url": "https://github.com/Pasvaz/bindonce.git" - }, - "license": "MIT", - "ignore": [ - "**/.*", - "node_modules", - "components" - ], - "dependencies": { - }, - "keywords": [ - "angularjs", - "angular", - "directive", - "binding", - "watcher", - "bindonce" - ] -} diff --git a/public/browse/lib/angular-loader/.bower.json b/public/browse/lib/angular-loader/.bower.json deleted file mode 100644 index c0b518149..000000000 --- a/public/browse/lib/angular-loader/.bower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "angular-loader", - "version": "1.3.5", - "main": "./angular-loader.js", - "ignore": [], - "dependencies": { - "angular": "1.3.5" - }, - "homepage": "https://github.com/angular/bower-angular-loader", - "_release": "1.3.5", - "_resolution": { - "type": "version", - "tag": "v1.3.5", - "commit": "afb779fa2e865a1f13f87278586aa71bbea518bb" - }, - "_source": "git://github.com/angular/bower-angular-loader.git", - "_target": "1.3.x", - "_originalSource": "angular-loader" -} \ No newline at end of file diff --git a/public/browse/lib/angular-loader/README.md b/public/browse/lib/angular-loader/README.md deleted file mode 100644 index 0f16d5def..000000000 --- a/public/browse/lib/angular-loader/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# packaged angular-loader - -This repo is for distribution on `npm` and `bower`. The source for this module is in the -[main AngularJS repo](https://github.com/angular/angular.js/blob/master/src/loader.js). -Please file issues and pull requests against that repo. - -## Install - -You can install this package either with `npm` or with `bower`. - -### npm - -```shell -npm install angular-loader -``` - -Add a ` -``` - -Note that this package is not in CommonJS format, so doing `require('angular-loader')` will -return `undefined`. - -### bower - -```shell -bower install angular-loader -``` - -Add a ` -``` - -## Documentation - -Documentation is available on the -[AngularJS docs site](http://docs.angularjs.org/guide/bootstrap). - -## License - -The MIT License - -Copyright (c) 2010-2012 Google, Inc. http://angularjs.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/public/browse/lib/angular-loader/angular-loader.js b/public/browse/lib/angular-loader/angular-loader.js deleted file mode 100644 index 3b27049c1..000000000 --- a/public/browse/lib/angular-loader/angular-loader.js +++ /dev/null @@ -1,405 +0,0 @@ -/** - * @license AngularJS v1.3.5 - * (c) 2010-2014 Google, Inc. http://angularjs.org - * License: MIT - */ - -(function() {'use strict'; - -/** - * @description - * - * This object provides a utility for producing rich Error messages within - * Angular. It can be called as follows: - * - * var exampleMinErr = minErr('example'); - * throw exampleMinErr('one', 'This {0} is {1}', foo, bar); - * - * The above creates an instance of minErr in the example namespace. The - * resulting error will have a namespaced error code of example.one. The - * resulting error will replace {0} with the value of foo, and {1} with the - * value of bar. The object is not restricted in the number of arguments it can - * take. - * - * If fewer arguments are specified than necessary for interpolation, the extra - * interpolation markers will be preserved in the final string. - * - * Since data will be parsed statically during a build step, some restrictions - * are applied with respect to how minErr instances are created and called. - * Instances should have names of the form namespaceMinErr for a minErr created - * using minErr('namespace') . Error codes, namespaces and template strings - * should all be static strings, not variables or general expressions. - * - * @param {string} module The namespace to use for the new minErr instance. - * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning - * error from returned function, for cases when a particular type of error is useful. - * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance - */ - -function minErr(module, ErrorConstructor) { - ErrorConstructor = ErrorConstructor || Error; - return function() { - var code = arguments[0], - prefix = '[' + (module ? module + ':' : '') + code + '] ', - template = arguments[1], - templateArgs = arguments, - - message, i; - - message = prefix + template.replace(/\{\d+\}/g, function(match) { - var index = +match.slice(1, -1), arg; - - if (index + 2 < templateArgs.length) { - return toDebugString(templateArgs[index + 2]); - } - return match; - }); - - message = message + '\nhttp://errors.angularjs.org/1.3.5/' + - (module ? module + '/' : '') + code; - for (i = 2; i < arguments.length; i++) { - message = message + (i == 2 ? '?' : '&') + 'p' + (i - 2) + '=' + - encodeURIComponent(toDebugString(arguments[i])); - } - return new ErrorConstructor(message); - }; -} - -/** - * @ngdoc type - * @name angular.Module - * @module ng - * @description - * - * Interface for configuring angular {@link angular.module modules}. - */ - -function setupModuleLoader(window) { - - var $injectorMinErr = minErr('$injector'); - var ngMinErr = minErr('ng'); - - function ensure(obj, name, factory) { - return obj[name] || (obj[name] = factory()); - } - - var angular = ensure(window, 'angular', Object); - - // We need to expose `angular.$$minErr` to modules such as `ngResource` that reference it during bootstrap - angular.$$minErr = angular.$$minErr || minErr; - - return ensure(angular, 'module', function() { - /** @type {Object.} */ - var modules = {}; - - /** - * @ngdoc function - * @name angular.module - * @module ng - * @description - * - * The `angular.module` is a global place for creating, registering and retrieving Angular - * modules. - * All modules (angular core or 3rd party) that should be available to an application must be - * registered using this mechanism. - * - * When passed two or more arguments, a new module is created. If passed only one argument, an - * existing module (the name passed as the first argument to `module`) is retrieved. - * - * - * # Module - * - * A module is a collection of services, directives, controllers, filters, and configuration information. - * `angular.module` is used to configure the {@link auto.$injector $injector}. - * - * ```js - * // Create a new module - * var myModule = angular.module('myModule', []); - * - * // register a new service - * myModule.value('appName', 'MyCoolApp'); - * - * // configure existing services inside initialization blocks. - * myModule.config(['$locationProvider', function($locationProvider) { - * // Configure existing providers - * $locationProvider.hashPrefix('!'); - * }]); - * ``` - * - * Then you can create an injector and load your modules like this: - * - * ```js - * var injector = angular.injector(['ng', 'myModule']) - * ``` - * - * However it's more likely that you'll just use - * {@link ng.directive:ngApp ngApp} or - * {@link angular.bootstrap} to simplify this process for you. - * - * @param {!string} name The name of the module to create or retrieve. - * @param {!Array.=} requires If specified then new module is being created. If - * unspecified then the module is being retrieved for further configuration. - * @param {Function=} configFn Optional configuration function for the module. Same as - * {@link angular.Module#config Module#config()}. - * @returns {module} new module with the {@link angular.Module} api. - */ - return function module(name, requires, configFn) { - var assertNotHasOwnProperty = function(name, context) { - if (name === 'hasOwnProperty') { - throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context); - } - }; - - assertNotHasOwnProperty(name, 'module'); - if (requires && modules.hasOwnProperty(name)) { - modules[name] = null; - } - return ensure(modules, name, function() { - if (!requires) { - throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " + - "the module name or forgot to load it. If registering a module ensure that you " + - "specify the dependencies as the second argument.", name); - } - - /** @type {!Array.>} */ - var invokeQueue = []; - - /** @type {!Array.} */ - var configBlocks = []; - - /** @type {!Array.} */ - var runBlocks = []; - - var config = invokeLater('$injector', 'invoke', 'push', configBlocks); - - /** @type {angular.Module} */ - var moduleInstance = { - // Private state - _invokeQueue: invokeQueue, - _configBlocks: configBlocks, - _runBlocks: runBlocks, - - /** - * @ngdoc property - * @name angular.Module#requires - * @module ng - * - * @description - * Holds the list of modules which the injector will load before the current module is - * loaded. - */ - requires: requires, - - /** - * @ngdoc property - * @name angular.Module#name - * @module ng - * - * @description - * Name of the module. - */ - name: name, - - - /** - * @ngdoc method - * @name angular.Module#provider - * @module ng - * @param {string} name service name - * @param {Function} providerType Construction function for creating new instance of the - * service. - * @description - * See {@link auto.$provide#provider $provide.provider()}. - */ - provider: invokeLater('$provide', 'provider'), - - /** - * @ngdoc method - * @name angular.Module#factory - * @module ng - * @param {string} name service name - * @param {Function} providerFunction Function for creating new instance of the service. - * @description - * See {@link auto.$provide#factory $provide.factory()}. - */ - factory: invokeLater('$provide', 'factory'), - - /** - * @ngdoc method - * @name angular.Module#service - * @module ng - * @param {string} name service name - * @param {Function} constructor A constructor function that will be instantiated. - * @description - * See {@link auto.$provide#service $provide.service()}. - */ - service: invokeLater('$provide', 'service'), - - /** - * @ngdoc method - * @name angular.Module#value - * @module ng - * @param {string} name service name - * @param {*} object Service instance object. - * @description - * See {@link auto.$provide#value $provide.value()}. - */ - value: invokeLater('$provide', 'value'), - - /** - * @ngdoc method - * @name angular.Module#constant - * @module ng - * @param {string} name constant name - * @param {*} object Constant value. - * @description - * Because the constant are fixed, they get applied before other provide methods. - * See {@link auto.$provide#constant $provide.constant()}. - */ - constant: invokeLater('$provide', 'constant', 'unshift'), - - /** - * @ngdoc method - * @name angular.Module#animation - * @module ng - * @param {string} name animation name - * @param {Function} animationFactory Factory function for creating new instance of an - * animation. - * @description - * - * **NOTE**: animations take effect only if the **ngAnimate** module is loaded. - * - * - * Defines an animation hook that can be later used with - * {@link ngAnimate.$animate $animate} service and directives that use this service. - * - * ```js - * module.animation('.animation-name', function($inject1, $inject2) { - * return { - * eventName : function(element, done) { - * //code to run the animation - * //once complete, then run done() - * return function cancellationFunction(element) { - * //code to cancel the animation - * } - * } - * } - * }) - * ``` - * - * See {@link ng.$animateProvider#register $animateProvider.register()} and - * {@link ngAnimate ngAnimate module} for more information. - */ - animation: invokeLater('$animateProvider', 'register'), - - /** - * @ngdoc method - * @name angular.Module#filter - * @module ng - * @param {string} name Filter name. - * @param {Function} filterFactory Factory function for creating new instance of filter. - * @description - * See {@link ng.$filterProvider#register $filterProvider.register()}. - */ - filter: invokeLater('$filterProvider', 'register'), - - /** - * @ngdoc method - * @name angular.Module#controller - * @module ng - * @param {string|Object} name Controller name, or an object map of controllers where the - * keys are the names and the values are the constructors. - * @param {Function} constructor Controller constructor function. - * @description - * See {@link ng.$controllerProvider#register $controllerProvider.register()}. - */ - controller: invokeLater('$controllerProvider', 'register'), - - /** - * @ngdoc method - * @name angular.Module#directive - * @module ng - * @param {string|Object} name Directive name, or an object map of directives where the - * keys are the names and the values are the factories. - * @param {Function} directiveFactory Factory function for creating new instance of - * directives. - * @description - * See {@link ng.$compileProvider#directive $compileProvider.directive()}. - */ - directive: invokeLater('$compileProvider', 'directive'), - - /** - * @ngdoc method - * @name angular.Module#config - * @module ng - * @param {Function} configFn Execute this function on module load. Useful for service - * configuration. - * @description - * Use this method to register work which needs to be performed on module loading. - * For more about how to configure services, see - * {@link providers#provider-recipe Provider Recipe}. - */ - config: config, - - /** - * @ngdoc method - * @name angular.Module#run - * @module ng - * @param {Function} initializationFn Execute this function after injector creation. - * Useful for application initialization. - * @description - * Use this method to register work which should be performed when the injector is done - * loading all modules. - */ - run: function(block) { - runBlocks.push(block); - return this; - } - }; - - if (configFn) { - config(configFn); - } - - return moduleInstance; - - /** - * @param {string} provider - * @param {string} method - * @param {String=} insertMethod - * @returns {angular.Module} - */ - function invokeLater(provider, method, insertMethod, queue) { - if (!queue) queue = invokeQueue; - return function() { - queue[insertMethod || 'push']([provider, method, arguments]); - return moduleInstance; - }; - } - }); - }; - }); - -} - -setupModuleLoader(window); -})(window); - -/** - * Closure compiler type information - * - * @typedef { { - * requires: !Array., - * invokeQueue: !Array.>, - * - * service: function(string, Function):angular.Module, - * factory: function(string, Function):angular.Module, - * value: function(string, *):angular.Module, - * - * filter: function(string, Function):angular.Module, - * - * init: function(Function):angular.Module - * } } - */ -angular.Module; - diff --git a/public/browse/lib/angular-loader/angular-loader.min.js b/public/browse/lib/angular-loader/angular-loader.min.js deleted file mode 100644 index bc6333ed5..000000000 --- a/public/browse/lib/angular-loader/angular-loader.min.js +++ /dev/null @@ -1,9 +0,0 @@ -/* - AngularJS v1.3.5 - (c) 2010-2014 Google, Inc. http://angularjs.org - License: MIT -*/ -(function(){'use strict';function d(b){return function(){var c=arguments[0],e;e="["+(b?b+":":"")+c+"] http://errors.angularjs.org/1.3.5/"+(b?b+"/":"")+c;for(c=1;c", - "license": "MIT", - "bugs": { - "url": "https://github.com/angular/angular.js/issues" - }, - "homepage": "http://angularjs.org" -} diff --git a/public/browse/lib/angular-mocks/.bower.json b/public/browse/lib/angular-mocks/.bower.json deleted file mode 100644 index e321d3002..000000000 --- a/public/browse/lib/angular-mocks/.bower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "angular-mocks", - "version": "1.3.5", - "main": "./angular-mocks.js", - "ignore": [], - "dependencies": { - "angular": "1.3.5" - }, - "homepage": "https://github.com/angular/bower-angular-mocks", - "_release": "1.3.5", - "_resolution": { - "type": "version", - "tag": "v1.3.5", - "commit": "e5356ca3fa80f824ac7e3d9651156401e6bf2a38" - }, - "_source": "git://github.com/angular/bower-angular-mocks.git", - "_target": "~1.3.x", - "_originalSource": "angular-mocks" -} \ No newline at end of file diff --git a/public/browse/lib/angular-mocks/README.md b/public/browse/lib/angular-mocks/README.md deleted file mode 100644 index 1604ef880..000000000 --- a/public/browse/lib/angular-mocks/README.md +++ /dev/null @@ -1,57 +0,0 @@ -# packaged angular-mocks - -This repo is for distribution on `npm` and `bower`. The source for this module is in the -[main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngMock). -Please file issues and pull requests against that repo. - -## Install - -You can install this package either with `npm` or with `bower`. - -### npm - -```shell -npm install angular-mocks -``` - -The mocks are then available at `node_modules/angular-mocks/angular-mocks.js`. - -Note that this package is not in CommonJS format, so doing `require('angular-mocks')` will -return `undefined`. - -### bower - -```shell -bower install angular-mocks -``` - -The mocks are then available at `bower_components/angular-mocks/angular-mocks.js`. - -## Documentation - -Documentation is available on the -[AngularJS docs site](https://docs.angularjs.org/guide/unit-testing). - -## License - -The MIT License - -Copyright (c) 2010-2012 Google, Inc. http://angularjs.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/public/browse/lib/angular-mocks/angular-mocks.js b/public/browse/lib/angular-mocks/angular-mocks.js deleted file mode 100644 index 3d33b2232..000000000 --- a/public/browse/lib/angular-mocks/angular-mocks.js +++ /dev/null @@ -1,2380 +0,0 @@ -/** - * @license AngularJS v1.3.5 - * (c) 2010-2014 Google, Inc. http://angularjs.org - * License: MIT - */ -(function(window, angular, undefined) { - -'use strict'; - -/** - * @ngdoc object - * @name angular.mock - * @description - * - * Namespace from 'angular-mocks.js' which contains testing related code. - */ -angular.mock = {}; - -/** - * ! This is a private undocumented service ! - * - * @name $browser - * - * @description - * This service is a mock implementation of {@link ng.$browser}. It provides fake - * implementation for commonly used browser apis that are hard to test, e.g. setTimeout, xhr, - * cookies, etc... - * - * The api of this service is the same as that of the real {@link ng.$browser $browser}, except - * that there are several helper methods available which can be used in tests. - */ -angular.mock.$BrowserProvider = function() { - this.$get = function() { - return new angular.mock.$Browser(); - }; -}; - -angular.mock.$Browser = function() { - var self = this; - - this.isMock = true; - self.$$url = "http://server/"; - self.$$lastUrl = self.$$url; // used by url polling fn - self.pollFns = []; - - // TODO(vojta): remove this temporary api - self.$$completeOutstandingRequest = angular.noop; - self.$$incOutstandingRequestCount = angular.noop; - - - // register url polling fn - - self.onUrlChange = function(listener) { - self.pollFns.push( - function() { - if (self.$$lastUrl !== self.$$url || self.$$state !== self.$$lastState) { - self.$$lastUrl = self.$$url; - self.$$lastState = self.$$state; - listener(self.$$url, self.$$state); - } - } - ); - - return listener; - }; - - self.$$checkUrlChange = angular.noop; - - self.cookieHash = {}; - self.lastCookieHash = {}; - self.deferredFns = []; - self.deferredNextId = 0; - - self.defer = function(fn, delay) { - delay = delay || 0; - self.deferredFns.push({time:(self.defer.now + delay), fn:fn, id: self.deferredNextId}); - self.deferredFns.sort(function(a, b) { return a.time - b.time;}); - return self.deferredNextId++; - }; - - - /** - * @name $browser#defer.now - * - * @description - * Current milliseconds mock time. - */ - self.defer.now = 0; - - - self.defer.cancel = function(deferId) { - var fnIndex; - - angular.forEach(self.deferredFns, function(fn, index) { - if (fn.id === deferId) fnIndex = index; - }); - - if (fnIndex !== undefined) { - self.deferredFns.splice(fnIndex, 1); - return true; - } - - return false; - }; - - - /** - * @name $browser#defer.flush - * - * @description - * Flushes all pending requests and executes the defer callbacks. - * - * @param {number=} number of milliseconds to flush. See {@link #defer.now} - */ - self.defer.flush = function(delay) { - if (angular.isDefined(delay)) { - self.defer.now += delay; - } else { - if (self.deferredFns.length) { - self.defer.now = self.deferredFns[self.deferredFns.length - 1].time; - } else { - throw new Error('No deferred tasks to be flushed'); - } - } - - while (self.deferredFns.length && self.deferredFns[0].time <= self.defer.now) { - self.deferredFns.shift().fn(); - } - }; - - self.$$baseHref = '/'; - self.baseHref = function() { - return this.$$baseHref; - }; -}; -angular.mock.$Browser.prototype = { - -/** - * @name $browser#poll - * - * @description - * run all fns in pollFns - */ - poll: function poll() { - angular.forEach(this.pollFns, function(pollFn) { - pollFn(); - }); - }, - - addPollFn: function(pollFn) { - this.pollFns.push(pollFn); - return pollFn; - }, - - url: function(url, replace, state) { - if (angular.isUndefined(state)) { - state = null; - } - if (url) { - this.$$url = url; - // Native pushState serializes & copies the object; simulate it. - this.$$state = angular.copy(state); - return this; - } - - return this.$$url; - }, - - state: function() { - return this.$$state; - }, - - cookies: function(name, value) { - if (name) { - if (angular.isUndefined(value)) { - delete this.cookieHash[name]; - } else { - if (angular.isString(value) && //strings only - value.length <= 4096) { //strict cookie storage limits - this.cookieHash[name] = value; - } - } - } else { - if (!angular.equals(this.cookieHash, this.lastCookieHash)) { - this.lastCookieHash = angular.copy(this.cookieHash); - this.cookieHash = angular.copy(this.cookieHash); - } - return this.cookieHash; - } - }, - - notifyWhenNoOutstandingRequests: function(fn) { - fn(); - } -}; - - -/** - * @ngdoc provider - * @name $exceptionHandlerProvider - * - * @description - * Configures the mock implementation of {@link ng.$exceptionHandler} to rethrow or to log errors - * passed to the `$exceptionHandler`. - */ - -/** - * @ngdoc service - * @name $exceptionHandler - * - * @description - * Mock implementation of {@link ng.$exceptionHandler} that rethrows or logs errors passed - * to it. See {@link ngMock.$exceptionHandlerProvider $exceptionHandlerProvider} for configuration - * information. - * - * - * ```js - * describe('$exceptionHandlerProvider', function() { - * - * it('should capture log messages and exceptions', function() { - * - * module(function($exceptionHandlerProvider) { - * $exceptionHandlerProvider.mode('log'); - * }); - * - * inject(function($log, $exceptionHandler, $timeout) { - * $timeout(function() { $log.log(1); }); - * $timeout(function() { $log.log(2); throw 'banana peel'; }); - * $timeout(function() { $log.log(3); }); - * expect($exceptionHandler.errors).toEqual([]); - * expect($log.assertEmpty()); - * $timeout.flush(); - * expect($exceptionHandler.errors).toEqual(['banana peel']); - * expect($log.log.logs).toEqual([[1], [2], [3]]); - * }); - * }); - * }); - * ``` - */ - -angular.mock.$ExceptionHandlerProvider = function() { - var handler; - - /** - * @ngdoc method - * @name $exceptionHandlerProvider#mode - * - * @description - * Sets the logging mode. - * - * @param {string} mode Mode of operation, defaults to `rethrow`. - * - * - `rethrow`: If any errors are passed to the handler in tests, it typically means that there - * is a bug in the application or test, so this mock will make these tests fail. - * - `log`: Sometimes it is desirable to test that an error is thrown, for this case the `log` - * mode stores an array of errors in `$exceptionHandler.errors`, to allow later - * assertion of them. See {@link ngMock.$log#assertEmpty assertEmpty()} and - * {@link ngMock.$log#reset reset()} - */ - this.mode = function(mode) { - switch (mode) { - case 'rethrow': - handler = function(e) { - throw e; - }; - break; - case 'log': - var errors = []; - - handler = function(e) { - if (arguments.length == 1) { - errors.push(e); - } else { - errors.push([].slice.call(arguments, 0)); - } - }; - - handler.errors = errors; - break; - default: - throw new Error("Unknown mode '" + mode + "', only 'log'/'rethrow' modes are allowed!"); - } - }; - - this.$get = function() { - return handler; - }; - - this.mode('rethrow'); -}; - - -/** - * @ngdoc service - * @name $log - * - * @description - * Mock implementation of {@link ng.$log} that gathers all logged messages in arrays - * (one array per logging level). These arrays are exposed as `logs` property of each of the - * level-specific log function, e.g. for level `error` the array is exposed as `$log.error.logs`. - * - */ -angular.mock.$LogProvider = function() { - var debug = true; - - function concat(array1, array2, index) { - return array1.concat(Array.prototype.slice.call(array2, index)); - } - - this.debugEnabled = function(flag) { - if (angular.isDefined(flag)) { - debug = flag; - return this; - } else { - return debug; - } - }; - - this.$get = function() { - var $log = { - log: function() { $log.log.logs.push(concat([], arguments, 0)); }, - warn: function() { $log.warn.logs.push(concat([], arguments, 0)); }, - info: function() { $log.info.logs.push(concat([], arguments, 0)); }, - error: function() { $log.error.logs.push(concat([], arguments, 0)); }, - debug: function() { - if (debug) { - $log.debug.logs.push(concat([], arguments, 0)); - } - } - }; - - /** - * @ngdoc method - * @name $log#reset - * - * @description - * Reset all of the logging arrays to empty. - */ - $log.reset = function() { - /** - * @ngdoc property - * @name $log#log.logs - * - * @description - * Array of messages logged using {@link ng.$log#log `log()`}. - * - * @example - * ```js - * $log.log('Some Log'); - * var first = $log.log.logs.unshift(); - * ``` - */ - $log.log.logs = []; - /** - * @ngdoc property - * @name $log#info.logs - * - * @description - * Array of messages logged using {@link ng.$log#info `info()`}. - * - * @example - * ```js - * $log.info('Some Info'); - * var first = $log.info.logs.unshift(); - * ``` - */ - $log.info.logs = []; - /** - * @ngdoc property - * @name $log#warn.logs - * - * @description - * Array of messages logged using {@link ng.$log#warn `warn()`}. - * - * @example - * ```js - * $log.warn('Some Warning'); - * var first = $log.warn.logs.unshift(); - * ``` - */ - $log.warn.logs = []; - /** - * @ngdoc property - * @name $log#error.logs - * - * @description - * Array of messages logged using {@link ng.$log#error `error()`}. - * - * @example - * ```js - * $log.error('Some Error'); - * var first = $log.error.logs.unshift(); - * ``` - */ - $log.error.logs = []; - /** - * @ngdoc property - * @name $log#debug.logs - * - * @description - * Array of messages logged using {@link ng.$log#debug `debug()`}. - * - * @example - * ```js - * $log.debug('Some Error'); - * var first = $log.debug.logs.unshift(); - * ``` - */ - $log.debug.logs = []; - }; - - /** - * @ngdoc method - * @name $log#assertEmpty - * - * @description - * Assert that all of the logging methods have no logged messages. If any messages are present, - * an exception is thrown. - */ - $log.assertEmpty = function() { - var errors = []; - angular.forEach(['error', 'warn', 'info', 'log', 'debug'], function(logLevel) { - angular.forEach($log[logLevel].logs, function(log) { - angular.forEach(log, function(logItem) { - errors.push('MOCK $log (' + logLevel + '): ' + String(logItem) + '\n' + - (logItem.stack || '')); - }); - }); - }); - if (errors.length) { - errors.unshift("Expected $log to be empty! Either a message was logged unexpectedly, or " + - "an expected log message was not checked and removed:"); - errors.push(''); - throw new Error(errors.join('\n---------\n')); - } - }; - - $log.reset(); - return $log; - }; -}; - - -/** - * @ngdoc service - * @name $interval - * - * @description - * Mock implementation of the $interval service. - * - * Use {@link ngMock.$interval#flush `$interval.flush(millis)`} to - * move forward by `millis` milliseconds and trigger any functions scheduled to run in that - * time. - * - * @param {function()} fn A function that should be called repeatedly. - * @param {number} delay Number of milliseconds between each function call. - * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat - * indefinitely. - * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise - * will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block. - * @returns {promise} A promise which will be notified on each iteration. - */ -angular.mock.$IntervalProvider = function() { - this.$get = ['$browser', '$rootScope', '$q', '$$q', - function($browser, $rootScope, $q, $$q) { - var repeatFns = [], - nextRepeatId = 0, - now = 0; - - var $interval = function(fn, delay, count, invokeApply) { - var iteration = 0, - skipApply = (angular.isDefined(invokeApply) && !invokeApply), - deferred = (skipApply ? $$q : $q).defer(), - promise = deferred.promise; - - count = (angular.isDefined(count)) ? count : 0; - promise.then(null, null, fn); - - promise.$$intervalId = nextRepeatId; - - function tick() { - deferred.notify(iteration++); - - if (count > 0 && iteration >= count) { - var fnIndex; - deferred.resolve(iteration); - - angular.forEach(repeatFns, function(fn, index) { - if (fn.id === promise.$$intervalId) fnIndex = index; - }); - - if (fnIndex !== undefined) { - repeatFns.splice(fnIndex, 1); - } - } - - if (skipApply) { - $browser.defer.flush(); - } else { - $rootScope.$apply(); - } - } - - repeatFns.push({ - nextTime:(now + delay), - delay: delay, - fn: tick, - id: nextRepeatId, - deferred: deferred - }); - repeatFns.sort(function(a, b) { return a.nextTime - b.nextTime;}); - - nextRepeatId++; - return promise; - }; - /** - * @ngdoc method - * @name $interval#cancel - * - * @description - * Cancels a task associated with the `promise`. - * - * @param {promise} promise A promise from calling the `$interval` function. - * @returns {boolean} Returns `true` if the task was successfully cancelled. - */ - $interval.cancel = function(promise) { - if (!promise) return false; - var fnIndex; - - angular.forEach(repeatFns, function(fn, index) { - if (fn.id === promise.$$intervalId) fnIndex = index; - }); - - if (fnIndex !== undefined) { - repeatFns[fnIndex].deferred.reject('canceled'); - repeatFns.splice(fnIndex, 1); - return true; - } - - return false; - }; - - /** - * @ngdoc method - * @name $interval#flush - * @description - * - * Runs interval tasks scheduled to be run in the next `millis` milliseconds. - * - * @param {number=} millis maximum timeout amount to flush up until. - * - * @return {number} The amount of time moved forward. - */ - $interval.flush = function(millis) { - now += millis; - while (repeatFns.length && repeatFns[0].nextTime <= now) { - var task = repeatFns[0]; - task.fn(); - task.nextTime += task.delay; - repeatFns.sort(function(a, b) { return a.nextTime - b.nextTime;}); - } - return millis; - }; - - return $interval; - }]; -}; - - -/* jshint -W101 */ -/* The R_ISO8061_STR regex is never going to fit into the 100 char limit! - * This directive should go inside the anonymous function but a bug in JSHint means that it would - * not be enacted early enough to prevent the warning. - */ -var R_ISO8061_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?:\:?(\d\d)(?:\:?(\d\d)(?:\.(\d{3}))?)?)?(Z|([+-])(\d\d):?(\d\d)))?$/; - -function jsonStringToDate(string) { - var match; - if (match = string.match(R_ISO8061_STR)) { - var date = new Date(0), - tzHour = 0, - tzMin = 0; - if (match[9]) { - tzHour = int(match[9] + match[10]); - tzMin = int(match[9] + match[11]); - } - date.setUTCFullYear(int(match[1]), int(match[2]) - 1, int(match[3])); - date.setUTCHours(int(match[4] || 0) - tzHour, - int(match[5] || 0) - tzMin, - int(match[6] || 0), - int(match[7] || 0)); - return date; - } - return string; -} - -function int(str) { - return parseInt(str, 10); -} - -function padNumber(num, digits, trim) { - var neg = ''; - if (num < 0) { - neg = '-'; - num = -num; - } - num = '' + num; - while (num.length < digits) num = '0' + num; - if (trim) - num = num.substr(num.length - digits); - return neg + num; -} - - -/** - * @ngdoc type - * @name angular.mock.TzDate - * @description - * - * *NOTE*: this is not an injectable instance, just a globally available mock class of `Date`. - * - * Mock of the Date type which has its timezone specified via constructor arg. - * - * The main purpose is to create Date-like instances with timezone fixed to the specified timezone - * offset, so that we can test code that depends on local timezone settings without dependency on - * the time zone settings of the machine where the code is running. - * - * @param {number} offset Offset of the *desired* timezone in hours (fractions will be honored) - * @param {(number|string)} timestamp Timestamp representing the desired time in *UTC* - * - * @example - * !!!! WARNING !!!!! - * This is not a complete Date object so only methods that were implemented can be called safely. - * To make matters worse, TzDate instances inherit stuff from Date via a prototype. - * - * We do our best to intercept calls to "unimplemented" methods, but since the list of methods is - * incomplete we might be missing some non-standard methods. This can result in errors like: - * "Date.prototype.foo called on incompatible Object". - * - * ```js - * var newYearInBratislava = new TzDate(-1, '2009-12-31T23:00:00Z'); - * newYearInBratislava.getTimezoneOffset() => -60; - * newYearInBratislava.getFullYear() => 2010; - * newYearInBratislava.getMonth() => 0; - * newYearInBratislava.getDate() => 1; - * newYearInBratislava.getHours() => 0; - * newYearInBratislava.getMinutes() => 0; - * newYearInBratislava.getSeconds() => 0; - * ``` - * - */ -angular.mock.TzDate = function(offset, timestamp) { - var self = new Date(0); - if (angular.isString(timestamp)) { - var tsStr = timestamp; - - self.origDate = jsonStringToDate(timestamp); - - timestamp = self.origDate.getTime(); - if (isNaN(timestamp)) - throw { - name: "Illegal Argument", - message: "Arg '" + tsStr + "' passed into TzDate constructor is not a valid date string" - }; - } else { - self.origDate = new Date(timestamp); - } - - var localOffset = new Date(timestamp).getTimezoneOffset(); - self.offsetDiff = localOffset * 60 * 1000 - offset * 1000 * 60 * 60; - self.date = new Date(timestamp + self.offsetDiff); - - self.getTime = function() { - return self.date.getTime() - self.offsetDiff; - }; - - self.toLocaleDateString = function() { - return self.date.toLocaleDateString(); - }; - - self.getFullYear = function() { - return self.date.getFullYear(); - }; - - self.getMonth = function() { - return self.date.getMonth(); - }; - - self.getDate = function() { - return self.date.getDate(); - }; - - self.getHours = function() { - return self.date.getHours(); - }; - - self.getMinutes = function() { - return self.date.getMinutes(); - }; - - self.getSeconds = function() { - return self.date.getSeconds(); - }; - - self.getMilliseconds = function() { - return self.date.getMilliseconds(); - }; - - self.getTimezoneOffset = function() { - return offset * 60; - }; - - self.getUTCFullYear = function() { - return self.origDate.getUTCFullYear(); - }; - - self.getUTCMonth = function() { - return self.origDate.getUTCMonth(); - }; - - self.getUTCDate = function() { - return self.origDate.getUTCDate(); - }; - - self.getUTCHours = function() { - return self.origDate.getUTCHours(); - }; - - self.getUTCMinutes = function() { - return self.origDate.getUTCMinutes(); - }; - - self.getUTCSeconds = function() { - return self.origDate.getUTCSeconds(); - }; - - self.getUTCMilliseconds = function() { - return self.origDate.getUTCMilliseconds(); - }; - - self.getDay = function() { - return self.date.getDay(); - }; - - // provide this method only on browsers that already have it - if (self.toISOString) { - self.toISOString = function() { - return padNumber(self.origDate.getUTCFullYear(), 4) + '-' + - padNumber(self.origDate.getUTCMonth() + 1, 2) + '-' + - padNumber(self.origDate.getUTCDate(), 2) + 'T' + - padNumber(self.origDate.getUTCHours(), 2) + ':' + - padNumber(self.origDate.getUTCMinutes(), 2) + ':' + - padNumber(self.origDate.getUTCSeconds(), 2) + '.' + - padNumber(self.origDate.getUTCMilliseconds(), 3) + 'Z'; - }; - } - - //hide all methods not implemented in this mock that the Date prototype exposes - var unimplementedMethods = ['getUTCDay', - 'getYear', 'setDate', 'setFullYear', 'setHours', 'setMilliseconds', - 'setMinutes', 'setMonth', 'setSeconds', 'setTime', 'setUTCDate', 'setUTCFullYear', - 'setUTCHours', 'setUTCMilliseconds', 'setUTCMinutes', 'setUTCMonth', 'setUTCSeconds', - 'setYear', 'toDateString', 'toGMTString', 'toJSON', 'toLocaleFormat', 'toLocaleString', - 'toLocaleTimeString', 'toSource', 'toString', 'toTimeString', 'toUTCString', 'valueOf']; - - angular.forEach(unimplementedMethods, function(methodName) { - self[methodName] = function() { - throw new Error("Method '" + methodName + "' is not implemented in the TzDate mock"); - }; - }); - - return self; -}; - -//make "tzDateInstance instanceof Date" return true -angular.mock.TzDate.prototype = Date.prototype; -/* jshint +W101 */ - -angular.mock.animate = angular.module('ngAnimateMock', ['ng']) - - .config(['$provide', function($provide) { - - var reflowQueue = []; - $provide.value('$$animateReflow', function(fn) { - var index = reflowQueue.length; - reflowQueue.push(fn); - return function cancel() { - reflowQueue.splice(index, 1); - }; - }); - - $provide.decorator('$animate', ['$delegate', '$$asyncCallback', '$timeout', '$browser', - function($delegate, $$asyncCallback, $timeout, $browser) { - var animate = { - queue: [], - cancel: $delegate.cancel, - enabled: $delegate.enabled, - triggerCallbackEvents: function() { - $$asyncCallback.flush(); - }, - triggerCallbackPromise: function() { - $timeout.flush(0); - }, - triggerCallbacks: function() { - this.triggerCallbackEvents(); - this.triggerCallbackPromise(); - }, - triggerReflow: function() { - angular.forEach(reflowQueue, function(fn) { - fn(); - }); - reflowQueue = []; - } - }; - - angular.forEach( - ['animate','enter','leave','move','addClass','removeClass','setClass'], function(method) { - animate[method] = function() { - animate.queue.push({ - event: method, - element: arguments[0], - options: arguments[arguments.length - 1], - args: arguments - }); - return $delegate[method].apply($delegate, arguments); - }; - }); - - return animate; - }]); - - }]); - - -/** - * @ngdoc function - * @name angular.mock.dump - * @description - * - * *NOTE*: this is not an injectable instance, just a globally available function. - * - * Method for serializing common angular objects (scope, elements, etc..) into strings, useful for - * debugging. - * - * This method is also available on window, where it can be used to display objects on debug - * console. - * - * @param {*} object - any object to turn into string. - * @return {string} a serialized string of the argument - */ -angular.mock.dump = function(object) { - return serialize(object); - - function serialize(object) { - var out; - - if (angular.isElement(object)) { - object = angular.element(object); - out = angular.element('
      '); - angular.forEach(object, function(element) { - out.append(angular.element(element).clone()); - }); - out = out.html(); - } else if (angular.isArray(object)) { - out = []; - angular.forEach(object, function(o) { - out.push(serialize(o)); - }); - out = '[ ' + out.join(', ') + ' ]'; - } else if (angular.isObject(object)) { - if (angular.isFunction(object.$eval) && angular.isFunction(object.$apply)) { - out = serializeScope(object); - } else if (object instanceof Error) { - out = object.stack || ('' + object.name + ': ' + object.message); - } else { - // TODO(i): this prevents methods being logged, - // we should have a better way to serialize objects - out = angular.toJson(object, true); - } - } else { - out = String(object); - } - - return out; - } - - function serializeScope(scope, offset) { - offset = offset || ' '; - var log = [offset + 'Scope(' + scope.$id + '): {']; - for (var key in scope) { - if (Object.prototype.hasOwnProperty.call(scope, key) && !key.match(/^(\$|this)/)) { - log.push(' ' + key + ': ' + angular.toJson(scope[key])); - } - } - var child = scope.$$childHead; - while (child) { - log.push(serializeScope(child, offset + ' ')); - child = child.$$nextSibling; - } - log.push('}'); - return log.join('\n' + offset); - } -}; - -/** - * @ngdoc service - * @name $httpBackend - * @description - * Fake HTTP backend implementation suitable for unit testing applications that use the - * {@link ng.$http $http service}. - * - * *Note*: For fake HTTP backend implementation suitable for end-to-end testing or backend-less - * development please see {@link ngMockE2E.$httpBackend e2e $httpBackend mock}. - * - * During unit testing, we want our unit tests to run quickly and have no external dependencies so - * we don’t want to send [XHR](https://developer.mozilla.org/en/xmlhttprequest) or - * [JSONP](http://en.wikipedia.org/wiki/JSONP) requests to a real server. All we really need is - * to verify whether a certain request has been sent or not, or alternatively just let the - * application make requests, respond with pre-trained responses and assert that the end result is - * what we expect it to be. - * - * This mock implementation can be used to respond with static or dynamic responses via the - * `expect` and `when` apis and their shortcuts (`expectGET`, `whenPOST`, etc). - * - * When an Angular application needs some data from a server, it calls the $http service, which - * sends the request to a real server using $httpBackend service. With dependency injection, it is - * easy to inject $httpBackend mock (which has the same API as $httpBackend) and use it to verify - * the requests and respond with some testing data without sending a request to a real server. - * - * There are two ways to specify what test data should be returned as http responses by the mock - * backend when the code under test makes http requests: - * - * - `$httpBackend.expect` - specifies a request expectation - * - `$httpBackend.when` - specifies a backend definition - * - * - * # Request Expectations vs Backend Definitions - * - * Request expectations provide a way to make assertions about requests made by the application and - * to define responses for those requests. The test will fail if the expected requests are not made - * or they are made in the wrong order. - * - * Backend definitions allow you to define a fake backend for your application which doesn't assert - * if a particular request was made or not, it just returns a trained response if a request is made. - * The test will pass whether or not the request gets made during testing. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
      Request expectationsBackend definitions
      Syntax.expect(...).respond(...).when(...).respond(...)
      Typical usagestrict unit testsloose (black-box) unit testing
      Fulfills multiple requestsNOYES
      Order of requests mattersYESNO
      Request requiredYESNO
      Response requiredoptional (see below)YES
      - * - * In cases where both backend definitions and request expectations are specified during unit - * testing, the request expectations are evaluated first. - * - * If a request expectation has no response specified, the algorithm will search your backend - * definitions for an appropriate response. - * - * If a request didn't match any expectation or if the expectation doesn't have the response - * defined, the backend definitions are evaluated in sequential order to see if any of them match - * the request. The response from the first matched definition is returned. - * - * - * # Flushing HTTP requests - * - * The $httpBackend used in production always responds to requests asynchronously. If we preserved - * this behavior in unit testing, we'd have to create async unit tests, which are hard to write, - * to follow and to maintain. But neither can the testing mock respond synchronously; that would - * change the execution of the code under test. For this reason, the mock $httpBackend has a - * `flush()` method, which allows the test to explicitly flush pending requests. This preserves - * the async api of the backend, while allowing the test to execute synchronously. - * - * - * # Unit testing with mock $httpBackend - * The following code shows how to setup and use the mock backend when unit testing a controller. - * First we create the controller under test: - * - ```js - // The module code - angular - .module('MyApp', []) - .controller('MyController', MyController); - - // The controller code - function MyController($scope, $http) { - var authToken; - - $http.get('/auth.py').success(function(data, status, headers) { - authToken = headers('A-Token'); - $scope.user = data; - }); - - $scope.saveMessage = function(message) { - var headers = { 'Authorization': authToken }; - $scope.status = 'Saving...'; - - $http.post('/add-msg.py', message, { headers: headers } ).success(function(response) { - $scope.status = ''; - }).error(function() { - $scope.status = 'ERROR!'; - }); - }; - } - ``` - * - * Now we setup the mock backend and create the test specs: - * - ```js - // testing controller - describe('MyController', function() { - var $httpBackend, $rootScope, createController, authRequestHandler; - - // Set up the module - beforeEach(module('MyApp')); - - beforeEach(inject(function($injector) { - // Set up the mock http service responses - $httpBackend = $injector.get('$httpBackend'); - // backend definition common for all tests - authRequestHandler = $httpBackend.when('GET', '/auth.py') - .respond({userId: 'userX'}, {'A-Token': 'xxx'}); - - // Get hold of a scope (i.e. the root scope) - $rootScope = $injector.get('$rootScope'); - // The $controller service is used to create instances of controllers - var $controller = $injector.get('$controller'); - - createController = function() { - return $controller('MyController', {'$scope' : $rootScope }); - }; - })); - - - afterEach(function() { - $httpBackend.verifyNoOutstandingExpectation(); - $httpBackend.verifyNoOutstandingRequest(); - }); - - - it('should fetch authentication token', function() { - $httpBackend.expectGET('/auth.py'); - var controller = createController(); - $httpBackend.flush(); - }); - - - it('should fail authentication', function() { - - // Notice how you can change the response even after it was set - authRequestHandler.respond(401, ''); - - $httpBackend.expectGET('/auth.py'); - var controller = createController(); - $httpBackend.flush(); - expect($rootScope.status).toBe('Failed...'); - }); - - - it('should send msg to server', function() { - var controller = createController(); - $httpBackend.flush(); - - // now you don’t care about the authentication, but - // the controller will still send the request and - // $httpBackend will respond without you having to - // specify the expectation and response for this request - - $httpBackend.expectPOST('/add-msg.py', 'message content').respond(201, ''); - $rootScope.saveMessage('message content'); - expect($rootScope.status).toBe('Saving...'); - $httpBackend.flush(); - expect($rootScope.status).toBe(''); - }); - - - it('should send auth header', function() { - var controller = createController(); - $httpBackend.flush(); - - $httpBackend.expectPOST('/add-msg.py', undefined, function(headers) { - // check if the header was send, if it wasn't the expectation won't - // match the request and the test will fail - return headers['Authorization'] == 'xxx'; - }).respond(201, ''); - - $rootScope.saveMessage('whatever'); - $httpBackend.flush(); - }); - }); - ``` - */ -angular.mock.$HttpBackendProvider = function() { - this.$get = ['$rootScope', createHttpBackendMock]; -}; - -/** - * General factory function for $httpBackend mock. - * Returns instance for unit testing (when no arguments specified): - * - passing through is disabled - * - auto flushing is disabled - * - * Returns instance for e2e testing (when `$delegate` and `$browser` specified): - * - passing through (delegating request to real backend) is enabled - * - auto flushing is enabled - * - * @param {Object=} $delegate Real $httpBackend instance (allow passing through if specified) - * @param {Object=} $browser Auto-flushing enabled if specified - * @return {Object} Instance of $httpBackend mock - */ -function createHttpBackendMock($rootScope, $delegate, $browser) { - var definitions = [], - expectations = [], - responses = [], - responsesPush = angular.bind(responses, responses.push), - copy = angular.copy; - - function createResponse(status, data, headers, statusText) { - if (angular.isFunction(status)) return status; - - return function() { - return angular.isNumber(status) - ? [status, data, headers, statusText] - : [200, status, data, headers]; - }; - } - - // TODO(vojta): change params to: method, url, data, headers, callback - function $httpBackend(method, url, data, callback, headers, timeout, withCredentials) { - var xhr = new MockXhr(), - expectation = expectations[0], - wasExpected = false; - - function prettyPrint(data) { - return (angular.isString(data) || angular.isFunction(data) || data instanceof RegExp) - ? data - : angular.toJson(data); - } - - function wrapResponse(wrapped) { - if (!$browser && timeout && timeout.then) timeout.then(handleTimeout); - - return handleResponse; - - function handleResponse() { - var response = wrapped.response(method, url, data, headers); - xhr.$$respHeaders = response[2]; - callback(copy(response[0]), copy(response[1]), xhr.getAllResponseHeaders(), - copy(response[3] || '')); - } - - function handleTimeout() { - for (var i = 0, ii = responses.length; i < ii; i++) { - if (responses[i] === handleResponse) { - responses.splice(i, 1); - callback(-1, undefined, ''); - break; - } - } - } - } - - if (expectation && expectation.match(method, url)) { - if (!expectation.matchData(data)) - throw new Error('Expected ' + expectation + ' with different data\n' + - 'EXPECTED: ' + prettyPrint(expectation.data) + '\nGOT: ' + data); - - if (!expectation.matchHeaders(headers)) - throw new Error('Expected ' + expectation + ' with different headers\n' + - 'EXPECTED: ' + prettyPrint(expectation.headers) + '\nGOT: ' + - prettyPrint(headers)); - - expectations.shift(); - - if (expectation.response) { - responses.push(wrapResponse(expectation)); - return; - } - wasExpected = true; - } - - var i = -1, definition; - while ((definition = definitions[++i])) { - if (definition.match(method, url, data, headers || {})) { - if (definition.response) { - // if $browser specified, we do auto flush all requests - ($browser ? $browser.defer : responsesPush)(wrapResponse(definition)); - } else if (definition.passThrough) { - $delegate(method, url, data, callback, headers, timeout, withCredentials); - } else throw new Error('No response defined !'); - return; - } - } - throw wasExpected ? - new Error('No response defined !') : - new Error('Unexpected request: ' + method + ' ' + url + '\n' + - (expectation ? 'Expected ' + expectation : 'No more request expected')); - } - - /** - * @ngdoc method - * @name $httpBackend#when - * @description - * Creates a new backend definition. - * - * @param {string} method HTTP method. - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives - * data string and returns true if the data is as expected. - * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header - * object and returns true if the headers match the current definition. - * @returns {requestHandler} Returns an object with `respond` method that controls how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - * - * - respond – - * `{function([status,] data[, headers, statusText]) - * | function(function(method, url, data, headers)}` - * – The respond method takes a set of static data to be returned or a function that can - * return an array containing response status (number), response data (string), response - * headers (Object), and the text for the status (string). The respond method returns the - * `requestHandler` object for possible overrides. - */ - $httpBackend.when = function(method, url, data, headers) { - var definition = new MockHttpExpectation(method, url, data, headers), - chain = { - respond: function(status, data, headers, statusText) { - definition.passThrough = undefined; - definition.response = createResponse(status, data, headers, statusText); - return chain; - } - }; - - if ($browser) { - chain.passThrough = function() { - definition.response = undefined; - definition.passThrough = true; - return chain; - }; - } - - definitions.push(definition); - return chain; - }; - - /** - * @ngdoc method - * @name $httpBackend#whenGET - * @description - * Creates a new backend definition for GET requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(Object|function(Object))=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - */ - - /** - * @ngdoc method - * @name $httpBackend#whenHEAD - * @description - * Creates a new backend definition for HEAD requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(Object|function(Object))=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - */ - - /** - * @ngdoc method - * @name $httpBackend#whenDELETE - * @description - * Creates a new backend definition for DELETE requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(Object|function(Object))=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - */ - - /** - * @ngdoc method - * @name $httpBackend#whenPOST - * @description - * Creates a new backend definition for POST requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives - * data string and returns true if the data is as expected. - * @param {(Object|function(Object))=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - */ - - /** - * @ngdoc method - * @name $httpBackend#whenPUT - * @description - * Creates a new backend definition for PUT requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives - * data string and returns true if the data is as expected. - * @param {(Object|function(Object))=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - */ - - /** - * @ngdoc method - * @name $httpBackend#whenJSONP - * @description - * Creates a new backend definition for JSONP requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - */ - createShortMethods('when'); - - - /** - * @ngdoc method - * @name $httpBackend#expect - * @description - * Creates a new request expectation. - * - * @param {string} method HTTP method. - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that - * receives data string and returns true if the data is as expected, or Object if request body - * is in JSON format. - * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header - * object and returns true if the headers match the current expectation. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - * - * - respond – - * `{function([status,] data[, headers, statusText]) - * | function(function(method, url, data, headers)}` - * – The respond method takes a set of static data to be returned or a function that can - * return an array containing response status (number), response data (string), response - * headers (Object), and the text for the status (string). The respond method returns the - * `requestHandler` object for possible overrides. - */ - $httpBackend.expect = function(method, url, data, headers) { - var expectation = new MockHttpExpectation(method, url, data, headers), - chain = { - respond: function(status, data, headers, statusText) { - expectation.response = createResponse(status, data, headers, statusText); - return chain; - } - }; - - expectations.push(expectation); - return chain; - }; - - - /** - * @ngdoc method - * @name $httpBackend#expectGET - * @description - * Creates a new request expectation for GET requests. For more info see `expect()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {Object=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. See #expect for more info. - */ - - /** - * @ngdoc method - * @name $httpBackend#expectHEAD - * @description - * Creates a new request expectation for HEAD requests. For more info see `expect()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {Object=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - */ - - /** - * @ngdoc method - * @name $httpBackend#expectDELETE - * @description - * Creates a new request expectation for DELETE requests. For more info see `expect()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {Object=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - */ - - /** - * @ngdoc method - * @name $httpBackend#expectPOST - * @description - * Creates a new request expectation for POST requests. For more info see `expect()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that - * receives data string and returns true if the data is as expected, or Object if request body - * is in JSON format. - * @param {Object=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - */ - - /** - * @ngdoc method - * @name $httpBackend#expectPUT - * @description - * Creates a new request expectation for PUT requests. For more info see `expect()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that - * receives data string and returns true if the data is as expected, or Object if request body - * is in JSON format. - * @param {Object=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - */ - - /** - * @ngdoc method - * @name $httpBackend#expectPATCH - * @description - * Creates a new request expectation for PATCH requests. For more info see `expect()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that - * receives data string and returns true if the data is as expected, or Object if request body - * is in JSON format. - * @param {Object=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - */ - - /** - * @ngdoc method - * @name $httpBackend#expectJSONP - * @description - * Creates a new request expectation for JSONP requests. For more info see `expect()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @returns {requestHandler} Returns an object with `respond` method that control how a matched - * request is handled. You can save this object for later use and invoke `respond` again in - * order to change how a matched request is handled. - */ - createShortMethods('expect'); - - - /** - * @ngdoc method - * @name $httpBackend#flush - * @description - * Flushes all pending requests using the trained responses. - * - * @param {number=} count Number of responses to flush (in the order they arrived). If undefined, - * all pending requests will be flushed. If there are no pending requests when the flush method - * is called an exception is thrown (as this typically a sign of programming error). - */ - $httpBackend.flush = function(count, digest) { - if (digest !== false) $rootScope.$digest(); - if (!responses.length) throw new Error('No pending request to flush !'); - - if (angular.isDefined(count) && count !== null) { - while (count--) { - if (!responses.length) throw new Error('No more pending request to flush !'); - responses.shift()(); - } - } else { - while (responses.length) { - responses.shift()(); - } - } - $httpBackend.verifyNoOutstandingExpectation(digest); - }; - - - /** - * @ngdoc method - * @name $httpBackend#verifyNoOutstandingExpectation - * @description - * Verifies that all of the requests defined via the `expect` api were made. If any of the - * requests were not made, verifyNoOutstandingExpectation throws an exception. - * - * Typically, you would call this method following each test case that asserts requests using an - * "afterEach" clause. - * - * ```js - * afterEach($httpBackend.verifyNoOutstandingExpectation); - * ``` - */ - $httpBackend.verifyNoOutstandingExpectation = function(digest) { - if (digest !== false) $rootScope.$digest(); - if (expectations.length) { - throw new Error('Unsatisfied requests: ' + expectations.join(', ')); - } - }; - - - /** - * @ngdoc method - * @name $httpBackend#verifyNoOutstandingRequest - * @description - * Verifies that there are no outstanding requests that need to be flushed. - * - * Typically, you would call this method following each test case that asserts requests using an - * "afterEach" clause. - * - * ```js - * afterEach($httpBackend.verifyNoOutstandingRequest); - * ``` - */ - $httpBackend.verifyNoOutstandingRequest = function() { - if (responses.length) { - throw new Error('Unflushed requests: ' + responses.length); - } - }; - - - /** - * @ngdoc method - * @name $httpBackend#resetExpectations - * @description - * Resets all request expectations, but preserves all backend definitions. Typically, you would - * call resetExpectations during a multiple-phase test when you want to reuse the same instance of - * $httpBackend mock. - */ - $httpBackend.resetExpectations = function() { - expectations.length = 0; - responses.length = 0; - }; - - return $httpBackend; - - - function createShortMethods(prefix) { - angular.forEach(['GET', 'DELETE', 'JSONP', 'HEAD'], function(method) { - $httpBackend[prefix + method] = function(url, headers) { - return $httpBackend[prefix](method, url, undefined, headers); - }; - }); - - angular.forEach(['PUT', 'POST', 'PATCH'], function(method) { - $httpBackend[prefix + method] = function(url, data, headers) { - return $httpBackend[prefix](method, url, data, headers); - }; - }); - } -} - -function MockHttpExpectation(method, url, data, headers) { - - this.data = data; - this.headers = headers; - - this.match = function(m, u, d, h) { - if (method != m) return false; - if (!this.matchUrl(u)) return false; - if (angular.isDefined(d) && !this.matchData(d)) return false; - if (angular.isDefined(h) && !this.matchHeaders(h)) return false; - return true; - }; - - this.matchUrl = function(u) { - if (!url) return true; - if (angular.isFunction(url.test)) return url.test(u); - if (angular.isFunction(url)) return url(u); - return url == u; - }; - - this.matchHeaders = function(h) { - if (angular.isUndefined(headers)) return true; - if (angular.isFunction(headers)) return headers(h); - return angular.equals(headers, h); - }; - - this.matchData = function(d) { - if (angular.isUndefined(data)) return true; - if (data && angular.isFunction(data.test)) return data.test(d); - if (data && angular.isFunction(data)) return data(d); - if (data && !angular.isString(data)) { - return angular.equals(angular.fromJson(angular.toJson(data)), angular.fromJson(d)); - } - return data == d; - }; - - this.toString = function() { - return method + ' ' + url; - }; -} - -function createMockXhr() { - return new MockXhr(); -} - -function MockXhr() { - - // hack for testing $http, $httpBackend - MockXhr.$$lastInstance = this; - - this.open = function(method, url, async) { - this.$$method = method; - this.$$url = url; - this.$$async = async; - this.$$reqHeaders = {}; - this.$$respHeaders = {}; - }; - - this.send = function(data) { - this.$$data = data; - }; - - this.setRequestHeader = function(key, value) { - this.$$reqHeaders[key] = value; - }; - - this.getResponseHeader = function(name) { - // the lookup must be case insensitive, - // that's why we try two quick lookups first and full scan last - var header = this.$$respHeaders[name]; - if (header) return header; - - name = angular.lowercase(name); - header = this.$$respHeaders[name]; - if (header) return header; - - header = undefined; - angular.forEach(this.$$respHeaders, function(headerVal, headerName) { - if (!header && angular.lowercase(headerName) == name) header = headerVal; - }); - return header; - }; - - this.getAllResponseHeaders = function() { - var lines = []; - - angular.forEach(this.$$respHeaders, function(value, key) { - lines.push(key + ': ' + value); - }); - return lines.join('\n'); - }; - - this.abort = angular.noop; -} - - -/** - * @ngdoc service - * @name $timeout - * @description - * - * This service is just a simple decorator for {@link ng.$timeout $timeout} service - * that adds a "flush" and "verifyNoPendingTasks" methods. - */ - -angular.mock.$TimeoutDecorator = ['$delegate', '$browser', function($delegate, $browser) { - - /** - * @ngdoc method - * @name $timeout#flush - * @description - * - * Flushes the queue of pending tasks. - * - * @param {number=} delay maximum timeout amount to flush up until - */ - $delegate.flush = function(delay) { - $browser.defer.flush(delay); - }; - - /** - * @ngdoc method - * @name $timeout#verifyNoPendingTasks - * @description - * - * Verifies that there are no pending tasks that need to be flushed. - */ - $delegate.verifyNoPendingTasks = function() { - if ($browser.deferredFns.length) { - throw new Error('Deferred tasks to flush (' + $browser.deferredFns.length + '): ' + - formatPendingTasksAsString($browser.deferredFns)); - } - }; - - function formatPendingTasksAsString(tasks) { - var result = []; - angular.forEach(tasks, function(task) { - result.push('{id: ' + task.id + ', ' + 'time: ' + task.time + '}'); - }); - - return result.join(', '); - } - - return $delegate; -}]; - -angular.mock.$RAFDecorator = ['$delegate', function($delegate) { - var queue = []; - var rafFn = function(fn) { - var index = queue.length; - queue.push(fn); - return function() { - queue.splice(index, 1); - }; - }; - - rafFn.supported = $delegate.supported; - - rafFn.flush = function() { - if (queue.length === 0) { - throw new Error('No rAF callbacks present'); - } - - var length = queue.length; - for (var i = 0; i < length; i++) { - queue[i](); - } - - queue = []; - }; - - return rafFn; -}]; - -angular.mock.$AsyncCallbackDecorator = ['$delegate', function($delegate) { - var callbacks = []; - var addFn = function(fn) { - callbacks.push(fn); - }; - addFn.flush = function() { - angular.forEach(callbacks, function(fn) { - fn(); - }); - callbacks = []; - }; - return addFn; -}]; - -/** - * - */ -angular.mock.$RootElementProvider = function() { - this.$get = function() { - return angular.element('
      '); - }; -}; - -/** - * @ngdoc module - * @name ngMock - * @packageName angular-mocks - * @description - * - * # ngMock - * - * The `ngMock` module provides support to inject and mock Angular services into unit tests. - * In addition, ngMock also extends various core ng services such that they can be - * inspected and controlled in a synchronous manner within test code. - * - * - *
      - * - */ -angular.module('ngMock', ['ng']).provider({ - $browser: angular.mock.$BrowserProvider, - $exceptionHandler: angular.mock.$ExceptionHandlerProvider, - $log: angular.mock.$LogProvider, - $interval: angular.mock.$IntervalProvider, - $httpBackend: angular.mock.$HttpBackendProvider, - $rootElement: angular.mock.$RootElementProvider -}).config(['$provide', function($provide) { - $provide.decorator('$timeout', angular.mock.$TimeoutDecorator); - $provide.decorator('$$rAF', angular.mock.$RAFDecorator); - $provide.decorator('$$asyncCallback', angular.mock.$AsyncCallbackDecorator); - $provide.decorator('$rootScope', angular.mock.$RootScopeDecorator); -}]); - -/** - * @ngdoc module - * @name ngMockE2E - * @module ngMockE2E - * @packageName angular-mocks - * @description - * - * The `ngMockE2E` is an angular module which contains mocks suitable for end-to-end testing. - * Currently there is only one mock present in this module - - * the {@link ngMockE2E.$httpBackend e2e $httpBackend} mock. - */ -angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { - $provide.decorator('$httpBackend', angular.mock.e2e.$httpBackendDecorator); -}]); - -/** - * @ngdoc service - * @name $httpBackend - * @module ngMockE2E - * @description - * Fake HTTP backend implementation suitable for end-to-end testing or backend-less development of - * applications that use the {@link ng.$http $http service}. - * - * *Note*: For fake http backend implementation suitable for unit testing please see - * {@link ngMock.$httpBackend unit-testing $httpBackend mock}. - * - * This implementation can be used to respond with static or dynamic responses via the `when` api - * and its shortcuts (`whenGET`, `whenPOST`, etc) and optionally pass through requests to the - * real $httpBackend for specific requests (e.g. to interact with certain remote apis or to fetch - * templates from a webserver). - * - * As opposed to unit-testing, in an end-to-end testing scenario or in scenario when an application - * is being developed with the real backend api replaced with a mock, it is often desirable for - * certain category of requests to bypass the mock and issue a real http request (e.g. to fetch - * templates or static files from the webserver). To configure the backend with this behavior - * use the `passThrough` request handler of `when` instead of `respond`. - * - * Additionally, we don't want to manually have to flush mocked out requests like we do during unit - * testing. For this reason the e2e $httpBackend flushes mocked out requests - * automatically, closely simulating the behavior of the XMLHttpRequest object. - * - * To setup the application to run with this http backend, you have to create a module that depends - * on the `ngMockE2E` and your application modules and defines the fake backend: - * - * ```js - * myAppDev = angular.module('myAppDev', ['myApp', 'ngMockE2E']); - * myAppDev.run(function($httpBackend) { - * phones = [{name: 'phone1'}, {name: 'phone2'}]; - * - * // returns the current list of phones - * $httpBackend.whenGET('/phones').respond(phones); - * - * // adds a new phone to the phones array - * $httpBackend.whenPOST('/phones').respond(function(method, url, data) { - * var phone = angular.fromJson(data); - * phones.push(phone); - * return [200, phone, {}]; - * }); - * $httpBackend.whenGET(/^\/templates\//).passThrough(); - * //... - * }); - * ``` - * - * Afterwards, bootstrap your app with this new module. - */ - -/** - * @ngdoc method - * @name $httpBackend#when - * @module ngMockE2E - * @description - * Creates a new backend definition. - * - * @param {string} method HTTP method. - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(string|RegExp)=} data HTTP request body. - * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header - * object and returns true if the headers match the current definition. - * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. You can save this object for later use and invoke - * `respond` or `passThrough` again in order to change how a matched request is handled. - * - * - respond – - * `{function([status,] data[, headers, statusText]) - * | function(function(method, url, data, headers)}` - * – The respond method takes a set of static data to be returned or a function that can return - * an array containing response status (number), response data (string), response headers - * (Object), and the text for the status (string). - * - passThrough – `{function()}` – Any request matching a backend definition with - * `passThrough` handler will be passed through to the real backend (an XHR request will be made - * to the server.) - * - Both methods return the `requestHandler` object for possible overrides. - */ - -/** - * @ngdoc method - * @name $httpBackend#whenGET - * @module ngMockE2E - * @description - * Creates a new backend definition for GET requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(Object|function(Object))=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. You can save this object for later use and invoke - * `respond` or `passThrough` again in order to change how a matched request is handled. - */ - -/** - * @ngdoc method - * @name $httpBackend#whenHEAD - * @module ngMockE2E - * @description - * Creates a new backend definition for HEAD requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(Object|function(Object))=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. You can save this object for later use and invoke - * `respond` or `passThrough` again in order to change how a matched request is handled. - */ - -/** - * @ngdoc method - * @name $httpBackend#whenDELETE - * @module ngMockE2E - * @description - * Creates a new backend definition for DELETE requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(Object|function(Object))=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. You can save this object for later use and invoke - * `respond` or `passThrough` again in order to change how a matched request is handled. - */ - -/** - * @ngdoc method - * @name $httpBackend#whenPOST - * @module ngMockE2E - * @description - * Creates a new backend definition for POST requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(string|RegExp)=} data HTTP request body. - * @param {(Object|function(Object))=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. You can save this object for later use and invoke - * `respond` or `passThrough` again in order to change how a matched request is handled. - */ - -/** - * @ngdoc method - * @name $httpBackend#whenPUT - * @module ngMockE2E - * @description - * Creates a new backend definition for PUT requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(string|RegExp)=} data HTTP request body. - * @param {(Object|function(Object))=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. You can save this object for later use and invoke - * `respond` or `passThrough` again in order to change how a matched request is handled. - */ - -/** - * @ngdoc method - * @name $httpBackend#whenPATCH - * @module ngMockE2E - * @description - * Creates a new backend definition for PATCH requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @param {(string|RegExp)=} data HTTP request body. - * @param {(Object|function(Object))=} headers HTTP headers. - * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. You can save this object for later use and invoke - * `respond` or `passThrough` again in order to change how a matched request is handled. - */ - -/** - * @ngdoc method - * @name $httpBackend#whenJSONP - * @module ngMockE2E - * @description - * Creates a new backend definition for JSONP requests. For more info see `when()`. - * - * @param {string|RegExp|function(string)} url HTTP url or function that receives the url - * and returns true if the url match the current definition. - * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that - * control how a matched request is handled. You can save this object for later use and invoke - * `respond` or `passThrough` again in order to change how a matched request is handled. - */ -angular.mock.e2e = {}; -angular.mock.e2e.$httpBackendDecorator = - ['$rootScope', '$delegate', '$browser', createHttpBackendMock]; - - -/** - * @ngdoc type - * @name $rootScope.Scope - * @module ngMock - * @description - * {@link ng.$rootScope.Scope Scope} type decorated with helper methods useful for testing. These - * methods are automatically available on any {@link ng.$rootScope.Scope Scope} instance when - * `ngMock` module is loaded. - * - * In addition to all the regular `Scope` methods, the following helper methods are available: - */ -angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { - - var $rootScopePrototype = Object.getPrototypeOf($delegate); - - $rootScopePrototype.$countChildScopes = countChildScopes; - $rootScopePrototype.$countWatchers = countWatchers; - - return $delegate; - - // ------------------------------------------------------------------------------------------ // - - /** - * @ngdoc method - * @name $rootScope.Scope#$countChildScopes - * @module ngMock - * @description - * Counts all the direct and indirect child scopes of the current scope. - * - * The current scope is excluded from the count. The count includes all isolate child scopes. - * - * @returns {number} Total number of child scopes. - */ - function countChildScopes() { - // jshint validthis: true - var count = 0; // exclude the current scope - var pendingChildHeads = [this.$$childHead]; - var currentScope; - - while (pendingChildHeads.length) { - currentScope = pendingChildHeads.shift(); - - while (currentScope) { - count += 1; - pendingChildHeads.push(currentScope.$$childHead); - currentScope = currentScope.$$nextSibling; - } - } - - return count; - } - - - /** - * @ngdoc method - * @name $rootScope.Scope#$countWatchers - * @module ngMock - * @description - * Counts all the watchers of direct and indirect child scopes of the current scope. - * - * The watchers of the current scope are included in the count and so are all the watchers of - * isolate child scopes. - * - * @returns {number} Total number of watchers. - */ - function countWatchers() { - // jshint validthis: true - var count = this.$$watchers ? this.$$watchers.length : 0; // include the current scope - var pendingChildHeads = [this.$$childHead]; - var currentScope; - - while (pendingChildHeads.length) { - currentScope = pendingChildHeads.shift(); - - while (currentScope) { - count += currentScope.$$watchers ? currentScope.$$watchers.length : 0; - pendingChildHeads.push(currentScope.$$childHead); - currentScope = currentScope.$$nextSibling; - } - } - - return count; - } -}]; - - -if (window.jasmine || window.mocha) { - - var currentSpec = null, - isSpecRunning = function() { - return !!currentSpec; - }; - - - (window.beforeEach || window.setup)(function() { - currentSpec = this; - }); - - (window.afterEach || window.teardown)(function() { - var injector = currentSpec.$injector; - - angular.forEach(currentSpec.$modules, function(module) { - if (module && module.$$hashKey) { - module.$$hashKey = undefined; - } - }); - - currentSpec.$injector = null; - currentSpec.$modules = null; - currentSpec = null; - - if (injector) { - injector.get('$rootElement').off(); - injector.get('$browser').pollFns.length = 0; - } - - // clean up jquery's fragment cache - angular.forEach(angular.element.fragments, function(val, key) { - delete angular.element.fragments[key]; - }); - - MockXhr.$$lastInstance = null; - - angular.forEach(angular.callbacks, function(val, key) { - delete angular.callbacks[key]; - }); - angular.callbacks.counter = 0; - }); - - /** - * @ngdoc function - * @name angular.mock.module - * @description - * - * *NOTE*: This function is also published on window for easy access.
      - * *NOTE*: This function is declared ONLY WHEN running tests with jasmine or mocha - * - * This function registers a module configuration code. It collects the configuration information - * which will be used when the injector is created by {@link angular.mock.inject inject}. - * - * See {@link angular.mock.inject inject} for usage example - * - * @param {...(string|Function|Object)} fns any number of modules which are represented as string - * aliases or as anonymous module initialization functions. The modules are used to - * configure the injector. The 'ng' and 'ngMock' modules are automatically loaded. If an - * object literal is passed they will be registered as values in the module, the key being - * the module name and the value being what is returned. - */ - window.module = angular.mock.module = function() { - var moduleFns = Array.prototype.slice.call(arguments, 0); - return isSpecRunning() ? workFn() : workFn; - ///////////////////// - function workFn() { - if (currentSpec.$injector) { - throw new Error('Injector already created, can not register a module!'); - } else { - var modules = currentSpec.$modules || (currentSpec.$modules = []); - angular.forEach(moduleFns, function(module) { - if (angular.isObject(module) && !angular.isArray(module)) { - modules.push(function($provide) { - angular.forEach(module, function(value, key) { - $provide.value(key, value); - }); - }); - } else { - modules.push(module); - } - }); - } - } - }; - - /** - * @ngdoc function - * @name angular.mock.inject - * @description - * - * *NOTE*: This function is also published on window for easy access.
      - * *NOTE*: This function is declared ONLY WHEN running tests with jasmine or mocha - * - * The inject function wraps a function into an injectable function. The inject() creates new - * instance of {@link auto.$injector $injector} per test, which is then used for - * resolving references. - * - * - * ## Resolving References (Underscore Wrapping) - * Often, we would like to inject a reference once, in a `beforeEach()` block and reuse this - * in multiple `it()` clauses. To be able to do this we must assign the reference to a variable - * that is declared in the scope of the `describe()` block. Since we would, most likely, want - * the variable to have the same name of the reference we have a problem, since the parameter - * to the `inject()` function would hide the outer variable. - * - * To help with this, the injected parameters can, optionally, be enclosed with underscores. - * These are ignored by the injector when the reference name is resolved. - * - * For example, the parameter `_myService_` would be resolved as the reference `myService`. - * Since it is available in the function body as _myService_, we can then assign it to a variable - * defined in an outer scope. - * - * ``` - * // Defined out reference variable outside - * var myService; - * - * // Wrap the parameter in underscores - * beforeEach( inject( function(_myService_){ - * myService = _myService_; - * })); - * - * // Use myService in a series of tests. - * it('makes use of myService', function() { - * myService.doStuff(); - * }); - * - * ``` - * - * See also {@link angular.mock.module angular.mock.module} - * - * ## Example - * Example of what a typical jasmine tests looks like with the inject method. - * ```js - * - * angular.module('myApplicationModule', []) - * .value('mode', 'app') - * .value('version', 'v1.0.1'); - * - * - * describe('MyApp', function() { - * - * // You need to load modules that you want to test, - * // it loads only the "ng" module by default. - * beforeEach(module('myApplicationModule')); - * - * - * // inject() is used to inject arguments of all given functions - * it('should provide a version', inject(function(mode, version) { - * expect(version).toEqual('v1.0.1'); - * expect(mode).toEqual('app'); - * })); - * - * - * // The inject and module method can also be used inside of the it or beforeEach - * it('should override a version and test the new version is injected', function() { - * // module() takes functions or strings (module aliases) - * module(function($provide) { - * $provide.value('version', 'overridden'); // override version here - * }); - * - * inject(function(version) { - * expect(version).toEqual('overridden'); - * }); - * }); - * }); - * - * ``` - * - * @param {...Function} fns any number of functions which will be injected using the injector. - */ - - - - var ErrorAddingDeclarationLocationStack = function(e, errorForStack) { - this.message = e.message; - this.name = e.name; - if (e.line) this.line = e.line; - if (e.sourceId) this.sourceId = e.sourceId; - if (e.stack && errorForStack) - this.stack = e.stack + '\n' + errorForStack.stack; - if (e.stackArray) this.stackArray = e.stackArray; - }; - ErrorAddingDeclarationLocationStack.prototype.toString = Error.prototype.toString; - - window.inject = angular.mock.inject = function() { - var blockFns = Array.prototype.slice.call(arguments, 0); - var errorForStack = new Error('Declaration Location'); - return isSpecRunning() ? workFn.call(currentSpec) : workFn; - ///////////////////// - function workFn() { - var modules = currentSpec.$modules || []; - var strictDi = !!currentSpec.$injectorStrict; - modules.unshift('ngMock'); - modules.unshift('ng'); - var injector = currentSpec.$injector; - if (!injector) { - if (strictDi) { - // If strictDi is enabled, annotate the providerInjector blocks - angular.forEach(modules, function(moduleFn) { - if (typeof moduleFn === "function") { - angular.injector.$$annotate(moduleFn); - } - }); - } - injector = currentSpec.$injector = angular.injector(modules, strictDi); - currentSpec.$injectorStrict = strictDi; - } - for (var i = 0, ii = blockFns.length; i < ii; i++) { - if (currentSpec.$injectorStrict) { - // If the injector is strict / strictDi, and the spec wants to inject using automatic - // annotation, then annotate the function here. - injector.annotate(blockFns[i]); - } - try { - /* jshint -W040 *//* Jasmine explicitly provides a `this` object when calling functions */ - injector.invoke(blockFns[i] || angular.noop, this); - /* jshint +W040 */ - } catch (e) { - if (e.stack && errorForStack) { - throw new ErrorAddingDeclarationLocationStack(e, errorForStack); - } - throw e; - } finally { - errorForStack = null; - } - } - } - }; - - - angular.mock.inject.strictDi = function(value) { - value = arguments.length ? !!value : true; - return isSpecRunning() ? workFn() : workFn; - - function workFn() { - if (value !== currentSpec.$injectorStrict) { - if (currentSpec.$injector) { - throw new Error('Injector already created, can not modify strict annotations'); - } else { - currentSpec.$injectorStrict = value; - } - } - } - }; -} - - -})(window, window.angular); diff --git a/public/browse/lib/angular-mocks/bower.json b/public/browse/lib/angular-mocks/bower.json deleted file mode 100644 index 739097ac6..000000000 --- a/public/browse/lib/angular-mocks/bower.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "angular-mocks", - "version": "1.3.5", - "main": "./angular-mocks.js", - "ignore": [], - "dependencies": { - "angular": "1.3.5" - } -} diff --git a/public/browse/lib/angular-mocks/package.json b/public/browse/lib/angular-mocks/package.json deleted file mode 100644 index a4665805e..000000000 --- a/public/browse/lib/angular-mocks/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "angular-mocks", - "version": "1.3.5", - "description": "AngularJS mocks for testing", - "main": "angular-mocks.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "https://github.com/angular/angular.js.git" - }, - "keywords": [ - "angular", - "framework", - "browser", - "mocks", - "testing", - "client-side" - ], - "author": "Angular Core Team ", - "license": "MIT", - "bugs": { - "url": "https://github.com/angular/angular.js/issues" - }, - "homepage": "http://angularjs.org" -} diff --git a/public/browse/lib/angular-route/.bower.json b/public/browse/lib/angular-route/.bower.json deleted file mode 100644 index 011e7abb2..000000000 --- a/public/browse/lib/angular-route/.bower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "angular-route", - "version": "1.3.5", - "main": "./angular-route.js", - "ignore": [], - "dependencies": { - "angular": "1.3.5" - }, - "homepage": "https://github.com/angular/bower-angular-route", - "_release": "1.3.5", - "_resolution": { - "type": "version", - "tag": "v1.3.5", - "commit": "4a949e84a15e474daa1cf0a4f4fbb3dd1f7536cb" - }, - "_source": "git://github.com/angular/bower-angular-route.git", - "_target": "1.3.x", - "_originalSource": "angular-route" -} \ No newline at end of file diff --git a/public/browse/lib/angular-route/README.md b/public/browse/lib/angular-route/README.md deleted file mode 100644 index b33a0dc33..000000000 --- a/public/browse/lib/angular-route/README.md +++ /dev/null @@ -1,77 +0,0 @@ -# packaged angular-route - -This repo is for distribution on `npm` and `bower`. The source for this module is in the -[main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngRoute). -Please file issues and pull requests against that repo. - -## Install - -You can install this package either with `npm` or with `bower`. - -### npm - -```shell -npm install angular-route -``` - -Add a ` -``` - -Then add `ngRoute` as a dependency for your app: - -```javascript -angular.module('myApp', ['ngRoute']); -``` - -Note that this package is not in CommonJS format, so doing `require('angular-route')` will -return `undefined`. - -### bower - -```shell -bower install angular-route -``` - -Add a ` -``` - -Then add `ngRoute` as a dependency for your app: - -```javascript -angular.module('myApp', ['ngRoute']); -``` - -## Documentation - -Documentation is available on the -[AngularJS docs site](http://docs.angularjs.org/api/ngRoute). - -## License - -The MIT License - -Copyright (c) 2010-2012 Google, Inc. http://angularjs.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/public/browse/lib/angular-route/angular-route.js b/public/browse/lib/angular-route/angular-route.js deleted file mode 100644 index 2959c50b5..000000000 --- a/public/browse/lib/angular-route/angular-route.js +++ /dev/null @@ -1,996 +0,0 @@ -/** - * @license AngularJS v1.3.5 - * (c) 2010-2014 Google, Inc. http://angularjs.org - * License: MIT - */ -(function(window, angular, undefined) {'use strict'; - -/** - * @ngdoc module - * @name ngRoute - * @description - * - * # ngRoute - * - * The `ngRoute` module provides routing and deeplinking services and directives for angular apps. - * - * ## Example - * See {@link ngRoute.$route#example $route} for an example of configuring and using `ngRoute`. - * - * - *
      - */ - /* global -ngRouteModule */ -var ngRouteModule = angular.module('ngRoute', ['ng']). - provider('$route', $RouteProvider), - $routeMinErr = angular.$$minErr('ngRoute'); - -/** - * @ngdoc provider - * @name $routeProvider - * - * @description - * - * Used for configuring routes. - * - * ## Example - * See {@link ngRoute.$route#example $route} for an example of configuring and using `ngRoute`. - * - * ## Dependencies - * Requires the {@link ngRoute `ngRoute`} module to be installed. - */ -function $RouteProvider() { - function inherit(parent, extra) { - return angular.extend(Object.create(parent), extra); - } - - var routes = {}; - - /** - * @ngdoc method - * @name $routeProvider#when - * - * @param {string} path Route path (matched against `$location.path`). If `$location.path` - * contains redundant trailing slash or is missing one, the route will still match and the - * `$location.path` will be updated to add or drop the trailing slash to exactly match the - * route definition. - * - * * `path` can contain named groups starting with a colon: e.g. `:name`. All characters up - * to the next slash are matched and stored in `$routeParams` under the given `name` - * when the route matches. - * * `path` can contain named groups starting with a colon and ending with a star: - * e.g.`:name*`. All characters are eagerly stored in `$routeParams` under the given `name` - * when the route matches. - * * `path` can contain optional named groups with a question mark: e.g.`:name?`. - * - * For example, routes like `/color/:color/largecode/:largecode*\/edit` will match - * `/color/brown/largecode/code/with/slashes/edit` and extract: - * - * * `color: brown` - * * `largecode: code/with/slashes`. - * - * - * @param {Object} route Mapping information to be assigned to `$route.current` on route - * match. - * - * Object properties: - * - * - `controller` – `{(string|function()=}` – Controller fn that should be associated with - * newly created scope or the name of a {@link angular.Module#controller registered - * controller} if passed as a string. - * - `controllerAs` – `{string=}` – A controller alias name. If present the controller will be - * published to scope under the `controllerAs` name. - * - `template` – `{string=|function()=}` – html template as a string or a function that - * returns an html template as a string which should be used by {@link - * ngRoute.directive:ngView ngView} or {@link ng.directive:ngInclude ngInclude} directives. - * This property takes precedence over `templateUrl`. - * - * If `template` is a function, it will be called with the following parameters: - * - * - `{Array.}` - route parameters extracted from the current - * `$location.path()` by applying the current route - * - * - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html - * template that should be used by {@link ngRoute.directive:ngView ngView}. - * - * If `templateUrl` is a function, it will be called with the following parameters: - * - * - `{Array.}` - route parameters extracted from the current - * `$location.path()` by applying the current route - * - * - `resolve` - `{Object.=}` - An optional map of dependencies which should - * be injected into the controller. If any of these dependencies are promises, the router - * will wait for them all to be resolved or one to be rejected before the controller is - * instantiated. - * If all the promises are resolved successfully, the values of the resolved promises are - * injected and {@link ngRoute.$route#$routeChangeSuccess $routeChangeSuccess} event is - * fired. If any of the promises are rejected the - * {@link ngRoute.$route#$routeChangeError $routeChangeError} event is fired. The map object - * is: - * - * - `key` – `{string}`: a name of a dependency to be injected into the controller. - * - `factory` - `{string|function}`: If `string` then it is an alias for a service. - * Otherwise if function, then it is {@link auto.$injector#invoke injected} - * and the return value is treated as the dependency. If the result is a promise, it is - * resolved before its value is injected into the controller. Be aware that - * `ngRoute.$routeParams` will still refer to the previous route within these resolve - * functions. Use `$route.current.params` to access the new route parameters, instead. - * - * - `redirectTo` – {(string|function())=} – value to update - * {@link ng.$location $location} path with and trigger route redirection. - * - * If `redirectTo` is a function, it will be called with the following parameters: - * - * - `{Object.}` - route parameters extracted from the current - * `$location.path()` by applying the current route templateUrl. - * - `{string}` - current `$location.path()` - * - `{Object}` - current `$location.search()` - * - * The custom `redirectTo` function is expected to return a string which will be used - * to update `$location.path()` and `$location.search()`. - * - * - `[reloadOnSearch=true]` - {boolean=} - reload route when only `$location.search()` - * or `$location.hash()` changes. - * - * If the option is set to `false` and url in the browser changes, then - * `$routeUpdate` event is broadcasted on the root scope. - * - * - `[caseInsensitiveMatch=false]` - {boolean=} - match routes without being case sensitive - * - * If the option is set to `true`, then the particular route can be matched without being - * case sensitive - * - * @returns {Object} self - * - * @description - * Adds a new route definition to the `$route` service. - */ - this.when = function(path, route) { - //copy original route object to preserve params inherited from proto chain - var routeCopy = angular.copy(route); - if (angular.isUndefined(routeCopy.reloadOnSearch)) { - routeCopy.reloadOnSearch = true; - } - if (angular.isUndefined(routeCopy.caseInsensitiveMatch)) { - routeCopy.caseInsensitiveMatch = this.caseInsensitiveMatch; - } - routes[path] = angular.extend( - routeCopy, - path && pathRegExp(path, routeCopy) - ); - - // create redirection for trailing slashes - if (path) { - var redirectPath = (path[path.length - 1] == '/') - ? path.substr(0, path.length - 1) - : path + '/'; - - routes[redirectPath] = angular.extend( - {redirectTo: path}, - pathRegExp(redirectPath, routeCopy) - ); - } - - return this; - }; - - /** - * @ngdoc property - * @name $routeProvider#caseInsensitiveMatch - * @description - * - * A boolean property indicating if routes defined - * using this provider should be matched using a case insensitive - * algorithm. Defaults to `false`. - */ - this.caseInsensitiveMatch = false; - - /** - * @param path {string} path - * @param opts {Object} options - * @return {?Object} - * - * @description - * Normalizes the given path, returning a regular expression - * and the original path. - * - * Inspired by pathRexp in visionmedia/express/lib/utils.js. - */ - function pathRegExp(path, opts) { - var insensitive = opts.caseInsensitiveMatch, - ret = { - originalPath: path, - regexp: path - }, - keys = ret.keys = []; - - path = path - .replace(/([().])/g, '\\$1') - .replace(/(\/)?:(\w+)([\?\*])?/g, function(_, slash, key, option) { - var optional = option === '?' ? option : null; - var star = option === '*' ? option : null; - keys.push({ name: key, optional: !!optional }); - slash = slash || ''; - return '' - + (optional ? '' : slash) - + '(?:' - + (optional ? slash : '') - + (star && '(.+?)' || '([^/]+)') - + (optional || '') - + ')' - + (optional || ''); - }) - .replace(/([\/$\*])/g, '\\$1'); - - ret.regexp = new RegExp('^' + path + '$', insensitive ? 'i' : ''); - return ret; - } - - /** - * @ngdoc method - * @name $routeProvider#otherwise - * - * @description - * Sets route definition that will be used on route change when no other route definition - * is matched. - * - * @param {Object|string} params Mapping information to be assigned to `$route.current`. - * If called with a string, the value maps to `redirectTo`. - * @returns {Object} self - */ - this.otherwise = function(params) { - if (typeof params === 'string') { - params = {redirectTo: params}; - } - this.when(null, params); - return this; - }; - - - this.$get = ['$rootScope', - '$location', - '$routeParams', - '$q', - '$injector', - '$templateRequest', - '$sce', - function($rootScope, $location, $routeParams, $q, $injector, $templateRequest, $sce) { - - /** - * @ngdoc service - * @name $route - * @requires $location - * @requires $routeParams - * - * @property {Object} current Reference to the current route definition. - * The route definition contains: - * - * - `controller`: The controller constructor as define in route definition. - * - `locals`: A map of locals which is used by {@link ng.$controller $controller} service for - * controller instantiation. The `locals` contain - * the resolved values of the `resolve` map. Additionally the `locals` also contain: - * - * - `$scope` - The current route scope. - * - `$template` - The current route template HTML. - * - * @property {Object} routes Object with all route configuration Objects as its properties. - * - * @description - * `$route` is used for deep-linking URLs to controllers and views (HTML partials). - * It watches `$location.url()` and tries to map the path to an existing route definition. - * - * Requires the {@link ngRoute `ngRoute`} module to be installed. - * - * You can define routes through {@link ngRoute.$routeProvider $routeProvider}'s API. - * - * The `$route` service is typically used in conjunction with the - * {@link ngRoute.directive:ngView `ngView`} directive and the - * {@link ngRoute.$routeParams `$routeParams`} service. - * - * @example - * This example shows how changing the URL hash causes the `$route` to match a route against the - * URL, and the `ngView` pulls in the partial. - * - * - * - *
      - * Choose: - * Moby | - * Moby: Ch1 | - * Gatsby | - * Gatsby: Ch4 | - * Scarlet Letter
      - * - *
      - * - *
      - * - *
      $location.path() = {{$location.path()}}
      - *
      $route.current.templateUrl = {{$route.current.templateUrl}}
      - *
      $route.current.params = {{$route.current.params}}
      - *
      $route.current.scope.name = {{$route.current.scope.name}}
      - *
      $routeParams = {{$routeParams}}
      - *
      - *
      - * - * - * controller: {{name}}
      - * Book Id: {{params.bookId}}
      - *
      - * - * - * controller: {{name}}
      - * Book Id: {{params.bookId}}
      - * Chapter Id: {{params.chapterId}} - *
      - * - * - * angular.module('ngRouteExample', ['ngRoute']) - * - * .controller('MainController', function($scope, $route, $routeParams, $location) { - * $scope.$route = $route; - * $scope.$location = $location; - * $scope.$routeParams = $routeParams; - * }) - * - * .controller('BookController', function($scope, $routeParams) { - * $scope.name = "BookController"; - * $scope.params = $routeParams; - * }) - * - * .controller('ChapterController', function($scope, $routeParams) { - * $scope.name = "ChapterController"; - * $scope.params = $routeParams; - * }) - * - * .config(function($routeProvider, $locationProvider) { - * $routeProvider - * .when('/Book/:bookId', { - * templateUrl: 'book.html', - * controller: 'BookController', - * resolve: { - * // I will cause a 1 second delay - * delay: function($q, $timeout) { - * var delay = $q.defer(); - * $timeout(delay.resolve, 1000); - * return delay.promise; - * } - * } - * }) - * .when('/Book/:bookId/ch/:chapterId', { - * templateUrl: 'chapter.html', - * controller: 'ChapterController' - * }); - * - * // configure html5 to get links working on jsfiddle - * $locationProvider.html5Mode(true); - * }); - * - * - * - * - * it('should load and compile correct template', function() { - * element(by.linkText('Moby: Ch1')).click(); - * var content = element(by.css('[ng-view]')).getText(); - * expect(content).toMatch(/controller\: ChapterController/); - * expect(content).toMatch(/Book Id\: Moby/); - * expect(content).toMatch(/Chapter Id\: 1/); - * - * element(by.partialLinkText('Scarlet')).click(); - * - * content = element(by.css('[ng-view]')).getText(); - * expect(content).toMatch(/controller\: BookController/); - * expect(content).toMatch(/Book Id\: Scarlet/); - * }); - * - *
      - */ - - /** - * @ngdoc event - * @name $route#$routeChangeStart - * @eventType broadcast on root scope - * @description - * Broadcasted before a route change. At this point the route services starts - * resolving all of the dependencies needed for the route change to occur. - * Typically this involves fetching the view template as well as any dependencies - * defined in `resolve` route property. Once all of the dependencies are resolved - * `$routeChangeSuccess` is fired. - * - * The route change (and the `$location` change that triggered it) can be prevented - * by calling `preventDefault` method of the event. See {@link ng.$rootScope.Scope#$on} - * for more details about event object. - * - * @param {Object} angularEvent Synthetic event object. - * @param {Route} next Future route information. - * @param {Route} current Current route information. - */ - - /** - * @ngdoc event - * @name $route#$routeChangeSuccess - * @eventType broadcast on root scope - * @description - * Broadcasted after a route dependencies are resolved. - * {@link ngRoute.directive:ngView ngView} listens for the directive - * to instantiate the controller and render the view. - * - * @param {Object} angularEvent Synthetic event object. - * @param {Route} current Current route information. - * @param {Route|Undefined} previous Previous route information, or undefined if current is - * first route entered. - */ - - /** - * @ngdoc event - * @name $route#$routeChangeError - * @eventType broadcast on root scope - * @description - * Broadcasted if any of the resolve promises are rejected. - * - * @param {Object} angularEvent Synthetic event object - * @param {Route} current Current route information. - * @param {Route} previous Previous route information. - * @param {Route} rejection Rejection of the promise. Usually the error of the failed promise. - */ - - /** - * @ngdoc event - * @name $route#$routeUpdate - * @eventType broadcast on root scope - * @description - * - * The `reloadOnSearch` property has been set to false, and we are reusing the same - * instance of the Controller. - */ - - var forceReload = false, - preparedRoute, - preparedRouteIsUpdateOnly, - $route = { - routes: routes, - - /** - * @ngdoc method - * @name $route#reload - * - * @description - * Causes `$route` service to reload the current route even if - * {@link ng.$location $location} hasn't changed. - * - * As a result of that, {@link ngRoute.directive:ngView ngView} - * creates new scope and reinstantiates the controller. - */ - reload: function() { - forceReload = true; - $rootScope.$evalAsync(function() { - // Don't support cancellation of a reload for now... - prepareRoute(); - commitRoute(); - }); - }, - - /** - * @ngdoc method - * @name $route#updateParams - * - * @description - * Causes `$route` service to update the current URL, replacing - * current route parameters with those specified in `newParams`. - * Provided property names that match the route's path segment - * definitions will be interpolated into the location's path, while - * remaining properties will be treated as query params. - * - * @param {Object} newParams mapping of URL parameter names to values - */ - updateParams: function(newParams) { - if (this.current && this.current.$$route) { - var searchParams = {}, self=this; - - angular.forEach(Object.keys(newParams), function(key) { - if (!self.current.pathParams[key]) searchParams[key] = newParams[key]; - }); - - newParams = angular.extend({}, this.current.params, newParams); - $location.path(interpolate(this.current.$$route.originalPath, newParams)); - $location.search(angular.extend({}, $location.search(), searchParams)); - } - else { - throw $routeMinErr('norout', 'Tried updating route when with no current route'); - } - } - }; - - $rootScope.$on('$locationChangeStart', prepareRoute); - $rootScope.$on('$locationChangeSuccess', commitRoute); - - return $route; - - ///////////////////////////////////////////////////// - - /** - * @param on {string} current url - * @param route {Object} route regexp to match the url against - * @return {?Object} - * - * @description - * Check if the route matches the current url. - * - * Inspired by match in - * visionmedia/express/lib/router/router.js. - */ - function switchRouteMatcher(on, route) { - var keys = route.keys, - params = {}; - - if (!route.regexp) return null; - - var m = route.regexp.exec(on); - if (!m) return null; - - for (var i = 1, len = m.length; i < len; ++i) { - var key = keys[i - 1]; - - var val = m[i]; - - if (key && val) { - params[key.name] = val; - } - } - return params; - } - - function prepareRoute($locationEvent) { - var lastRoute = $route.current; - - preparedRoute = parseRoute(); - preparedRouteIsUpdateOnly = preparedRoute && lastRoute && preparedRoute.$$route === lastRoute.$$route - && angular.equals(preparedRoute.pathParams, lastRoute.pathParams) - && !preparedRoute.reloadOnSearch && !forceReload; - - if (!preparedRouteIsUpdateOnly && (lastRoute || preparedRoute)) { - if ($rootScope.$broadcast('$routeChangeStart', preparedRoute, lastRoute).defaultPrevented) { - if ($locationEvent) { - $locationEvent.preventDefault(); - } - } - } - } - - function commitRoute() { - var lastRoute = $route.current; - var nextRoute = preparedRoute; - - if (preparedRouteIsUpdateOnly) { - lastRoute.params = nextRoute.params; - angular.copy(lastRoute.params, $routeParams); - $rootScope.$broadcast('$routeUpdate', lastRoute); - } else if (nextRoute || lastRoute) { - forceReload = false; - $route.current = nextRoute; - if (nextRoute) { - if (nextRoute.redirectTo) { - if (angular.isString(nextRoute.redirectTo)) { - $location.path(interpolate(nextRoute.redirectTo, nextRoute.params)).search(nextRoute.params) - .replace(); - } else { - $location.url(nextRoute.redirectTo(nextRoute.pathParams, $location.path(), $location.search())) - .replace(); - } - } - } - - $q.when(nextRoute). - then(function() { - if (nextRoute) { - var locals = angular.extend({}, nextRoute.resolve), - template, templateUrl; - - angular.forEach(locals, function(value, key) { - locals[key] = angular.isString(value) ? - $injector.get(value) : $injector.invoke(value, null, null, key); - }); - - if (angular.isDefined(template = nextRoute.template)) { - if (angular.isFunction(template)) { - template = template(nextRoute.params); - } - } else if (angular.isDefined(templateUrl = nextRoute.templateUrl)) { - if (angular.isFunction(templateUrl)) { - templateUrl = templateUrl(nextRoute.params); - } - templateUrl = $sce.getTrustedResourceUrl(templateUrl); - if (angular.isDefined(templateUrl)) { - nextRoute.loadedTemplateUrl = templateUrl; - template = $templateRequest(templateUrl); - } - } - if (angular.isDefined(template)) { - locals['$template'] = template; - } - return $q.all(locals); - } - }). - // after route change - then(function(locals) { - if (nextRoute == $route.current) { - if (nextRoute) { - nextRoute.locals = locals; - angular.copy(nextRoute.params, $routeParams); - } - $rootScope.$broadcast('$routeChangeSuccess', nextRoute, lastRoute); - } - }, function(error) { - if (nextRoute == $route.current) { - $rootScope.$broadcast('$routeChangeError', nextRoute, lastRoute, error); - } - }); - } - } - - - /** - * @returns {Object} the current active route, by matching it against the URL - */ - function parseRoute() { - // Match a route - var params, match; - angular.forEach(routes, function(route, path) { - if (!match && (params = switchRouteMatcher($location.path(), route))) { - match = inherit(route, { - params: angular.extend({}, $location.search(), params), - pathParams: params}); - match.$$route = route; - } - }); - // No route matched; fallback to "otherwise" route - return match || routes[null] && inherit(routes[null], {params: {}, pathParams:{}}); - } - - /** - * @returns {string} interpolation of the redirect path with the parameters - */ - function interpolate(string, params) { - var result = []; - angular.forEach((string || '').split(':'), function(segment, i) { - if (i === 0) { - result.push(segment); - } else { - var segmentMatch = segment.match(/(\w+)(?:[?*])?(.*)/); - var key = segmentMatch[1]; - result.push(params[key]); - result.push(segmentMatch[2] || ''); - delete params[key]; - } - }); - return result.join(''); - } - }]; -} - -ngRouteModule.provider('$routeParams', $RouteParamsProvider); - - -/** - * @ngdoc service - * @name $routeParams - * @requires $route - * - * @description - * The `$routeParams` service allows you to retrieve the current set of route parameters. - * - * Requires the {@link ngRoute `ngRoute`} module to be installed. - * - * The route parameters are a combination of {@link ng.$location `$location`}'s - * {@link ng.$location#search `search()`} and {@link ng.$location#path `path()`}. - * The `path` parameters are extracted when the {@link ngRoute.$route `$route`} path is matched. - * - * In case of parameter name collision, `path` params take precedence over `search` params. - * - * The service guarantees that the identity of the `$routeParams` object will remain unchanged - * (but its properties will likely change) even when a route change occurs. - * - * Note that the `$routeParams` are only updated *after* a route change completes successfully. - * This means that you cannot rely on `$routeParams` being correct in route resolve functions. - * Instead you can use `$route.current.params` to access the new route's parameters. - * - * @example - * ```js - * // Given: - * // URL: http://server.com/index.html#/Chapter/1/Section/2?search=moby - * // Route: /Chapter/:chapterId/Section/:sectionId - * // - * // Then - * $routeParams ==> {chapterId:'1', sectionId:'2', search:'moby'} - * ``` - */ -function $RouteParamsProvider() { - this.$get = function() { return {}; }; -} - -ngRouteModule.directive('ngView', ngViewFactory); -ngRouteModule.directive('ngView', ngViewFillContentFactory); - - -/** - * @ngdoc directive - * @name ngView - * @restrict ECA - * - * @description - * # Overview - * `ngView` is a directive that complements the {@link ngRoute.$route $route} service by - * including the rendered template of the current route into the main layout (`index.html`) file. - * Every time the current route changes, the included view changes with it according to the - * configuration of the `$route` service. - * - * Requires the {@link ngRoute `ngRoute`} module to be installed. - * - * @animations - * enter - animation is used to bring new content into the browser. - * leave - animation is used to animate existing content away. - * - * The enter and leave animation occur concurrently. - * - * @scope - * @priority 400 - * @param {string=} onload Expression to evaluate whenever the view updates. - * - * @param {string=} autoscroll Whether `ngView` should call {@link ng.$anchorScroll - * $anchorScroll} to scroll the viewport after the view is updated. - * - * - If the attribute is not set, disable scrolling. - * - If the attribute is set without value, enable scrolling. - * - Otherwise enable scrolling only if the `autoscroll` attribute value evaluated - * as an expression yields a truthy value. - * @example - - -
      - Choose: - Moby | - Moby: Ch1 | - Gatsby | - Gatsby: Ch4 | - Scarlet Letter
      - -
      -
      -
      -
      - -
      $location.path() = {{main.$location.path()}}
      -
      $route.current.templateUrl = {{main.$route.current.templateUrl}}
      -
      $route.current.params = {{main.$route.current.params}}
      -
      $routeParams = {{main.$routeParams}}
      -
      -
      - - -
      - controller: {{book.name}}
      - Book Id: {{book.params.bookId}}
      -
      -
      - - -
      - controller: {{chapter.name}}
      - Book Id: {{chapter.params.bookId}}
      - Chapter Id: {{chapter.params.chapterId}} -
      -
      - - - .view-animate-container { - position:relative; - height:100px!important; - position:relative; - background:white; - border:1px solid black; - height:40px; - overflow:hidden; - } - - .view-animate { - padding:10px; - } - - .view-animate.ng-enter, .view-animate.ng-leave { - -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 1.5s; - transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 1.5s; - - display:block; - width:100%; - border-left:1px solid black; - - position:absolute; - top:0; - left:0; - right:0; - bottom:0; - padding:10px; - } - - .view-animate.ng-enter { - left:100%; - } - .view-animate.ng-enter.ng-enter-active { - left:0; - } - .view-animate.ng-leave.ng-leave-active { - left:-100%; - } - - - - angular.module('ngViewExample', ['ngRoute', 'ngAnimate']) - .config(['$routeProvider', '$locationProvider', - function($routeProvider, $locationProvider) { - $routeProvider - .when('/Book/:bookId', { - templateUrl: 'book.html', - controller: 'BookCtrl', - controllerAs: 'book' - }) - .when('/Book/:bookId/ch/:chapterId', { - templateUrl: 'chapter.html', - controller: 'ChapterCtrl', - controllerAs: 'chapter' - }); - - $locationProvider.html5Mode(true); - }]) - .controller('MainCtrl', ['$route', '$routeParams', '$location', - function($route, $routeParams, $location) { - this.$route = $route; - this.$location = $location; - this.$routeParams = $routeParams; - }]) - .controller('BookCtrl', ['$routeParams', function($routeParams) { - this.name = "BookCtrl"; - this.params = $routeParams; - }]) - .controller('ChapterCtrl', ['$routeParams', function($routeParams) { - this.name = "ChapterCtrl"; - this.params = $routeParams; - }]); - - - - - it('should load and compile correct template', function() { - element(by.linkText('Moby: Ch1')).click(); - var content = element(by.css('[ng-view]')).getText(); - expect(content).toMatch(/controller\: ChapterCtrl/); - expect(content).toMatch(/Book Id\: Moby/); - expect(content).toMatch(/Chapter Id\: 1/); - - element(by.partialLinkText('Scarlet')).click(); - - content = element(by.css('[ng-view]')).getText(); - expect(content).toMatch(/controller\: BookCtrl/); - expect(content).toMatch(/Book Id\: Scarlet/); - }); - -
      - */ - - -/** - * @ngdoc event - * @name ngView#$viewContentLoaded - * @eventType emit on the current ngView scope - * @description - * Emitted every time the ngView content is reloaded. - */ -ngViewFactory.$inject = ['$route', '$anchorScroll', '$animate']; -function ngViewFactory($route, $anchorScroll, $animate) { - return { - restrict: 'ECA', - terminal: true, - priority: 400, - transclude: 'element', - link: function(scope, $element, attr, ctrl, $transclude) { - var currentScope, - currentElement, - previousLeaveAnimation, - autoScrollExp = attr.autoscroll, - onloadExp = attr.onload || ''; - - scope.$on('$routeChangeSuccess', update); - update(); - - function cleanupLastView() { - if (previousLeaveAnimation) { - $animate.cancel(previousLeaveAnimation); - previousLeaveAnimation = null; - } - - if (currentScope) { - currentScope.$destroy(); - currentScope = null; - } - if (currentElement) { - previousLeaveAnimation = $animate.leave(currentElement); - previousLeaveAnimation.then(function() { - previousLeaveAnimation = null; - }); - currentElement = null; - } - } - - function update() { - var locals = $route.current && $route.current.locals, - template = locals && locals.$template; - - if (angular.isDefined(template)) { - var newScope = scope.$new(); - var current = $route.current; - - // Note: This will also link all children of ng-view that were contained in the original - // html. If that content contains controllers, ... they could pollute/change the scope. - // However, using ng-view on an element with additional content does not make sense... - // Note: We can't remove them in the cloneAttchFn of $transclude as that - // function is called before linking the content, which would apply child - // directives to non existing elements. - var clone = $transclude(newScope, function(clone) { - $animate.enter(clone, null, currentElement || $element).then(function onNgViewEnter() { - if (angular.isDefined(autoScrollExp) - && (!autoScrollExp || scope.$eval(autoScrollExp))) { - $anchorScroll(); - } - }); - cleanupLastView(); - }); - - currentElement = clone; - currentScope = current.scope = newScope; - currentScope.$emit('$viewContentLoaded'); - currentScope.$eval(onloadExp); - } else { - cleanupLastView(); - } - } - } - }; -} - -// This directive is called during the $transclude call of the first `ngView` directive. -// It will replace and compile the content of the element with the loaded template. -// We need this directive so that the element content is already filled when -// the link function of another directive on the same element as ngView -// is called. -ngViewFillContentFactory.$inject = ['$compile', '$controller', '$route']; -function ngViewFillContentFactory($compile, $controller, $route) { - return { - restrict: 'ECA', - priority: -400, - link: function(scope, $element) { - var current = $route.current, - locals = current.locals; - - $element.html(locals.$template); - - var link = $compile($element.contents()); - - if (current.controller) { - locals.$scope = scope; - var controller = $controller(current.controller, locals); - if (current.controllerAs) { - scope[current.controllerAs] = controller; - } - $element.data('$ngControllerController', controller); - $element.children().data('$ngControllerController', controller); - } - - link(scope); - } - }; -} - - -})(window, window.angular); diff --git a/public/browse/lib/angular-route/angular-route.min.js b/public/browse/lib/angular-route/angular-route.min.js deleted file mode 100644 index b03fc57aa..000000000 --- a/public/browse/lib/angular-route/angular-route.min.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - AngularJS v1.3.5 - (c) 2010-2014 Google, Inc. http://angularjs.org - License: MIT -*/ -(function(p,d,C){'use strict';function v(r,h,g){return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",link:function(a,c,b,f,y){function z(){k&&(g.cancel(k),k=null);l&&(l.$destroy(),l=null);m&&(k=g.leave(m),k.then(function(){k=null}),m=null)}function x(){var b=r.current&&r.current.locals;if(d.isDefined(b&&b.$template)){var b=a.$new(),f=r.current;m=y(b,function(b){g.enter(b,null,m||c).then(function(){!d.isDefined(t)||t&&!a.$eval(t)||h()});z()});l=f.scope=b;l.$emit("$viewContentLoaded"); -l.$eval(w)}else z()}var l,m,k,t=b.autoscroll,w=b.onload||"";a.$on("$routeChangeSuccess",x);x()}}}function A(d,h,g){return{restrict:"ECA",priority:-400,link:function(a,c){var b=g.current,f=b.locals;c.html(f.$template);var y=d(c.contents());b.controller&&(f.$scope=a,f=h(b.controller,f),b.controllerAs&&(a[b.controllerAs]=f),c.data("$ngControllerController",f),c.children().data("$ngControllerController",f));y(a)}}}p=d.module("ngRoute",["ng"]).provider("$route",function(){function r(a,c){return d.extend(Object.create(a), -c)}function h(a,d){var b=d.caseInsensitiveMatch,f={originalPath:a,regexp:a},g=f.keys=[];a=a.replace(/([().])/g,"\\$1").replace(/(\/)?:(\w+)([\?\*])?/g,function(a,d,b,c){a="?"===c?c:null;c="*"===c?c:null;g.push({name:b,optional:!!a});d=d||"";return""+(a?"":d)+"(?:"+(a?d:"")+(c&&"(.+?)"||"([^/]+)")+(a||"")+")"+(a||"")}).replace(/([\/$\*])/g,"\\$1");f.regexp=new RegExp("^"+a+"$",b?"i":"");return f}var g={};this.when=function(a,c){var b=d.copy(c);d.isUndefined(b.reloadOnSearch)&&(b.reloadOnSearch=!0); -d.isUndefined(b.caseInsensitiveMatch)&&(b.caseInsensitiveMatch=this.caseInsensitiveMatch);g[a]=d.extend(b,a&&h(a,b));if(a){var f="/"==a[a.length-1]?a.substr(0,a.length-1):a+"/";g[f]=d.extend({redirectTo:a},h(f,b))}return this};this.caseInsensitiveMatch=!1;this.otherwise=function(a){"string"===typeof a&&(a={redirectTo:a});this.when(null,a);return this};this.$get=["$rootScope","$location","$routeParams","$q","$injector","$templateRequest","$sce",function(a,c,b,f,h,p,x){function l(b){var e=s.current; -(v=(n=k())&&e&&n.$$route===e.$$route&&d.equals(n.pathParams,e.pathParams)&&!n.reloadOnSearch&&!w)||!e&&!n||a.$broadcast("$routeChangeStart",n,e).defaultPrevented&&b&&b.preventDefault()}function m(){var u=s.current,e=n;if(v)u.params=e.params,d.copy(u.params,b),a.$broadcast("$routeUpdate",u);else if(e||u)w=!1,(s.current=e)&&e.redirectTo&&(d.isString(e.redirectTo)?c.path(t(e.redirectTo,e.params)).search(e.params).replace():c.url(e.redirectTo(e.pathParams,c.path(),c.search())).replace()),f.when(e).then(function(){if(e){var a= -d.extend({},e.resolve),b,c;d.forEach(a,function(b,e){a[e]=d.isString(b)?h.get(b):h.invoke(b,null,null,e)});d.isDefined(b=e.template)?d.isFunction(b)&&(b=b(e.params)):d.isDefined(c=e.templateUrl)&&(d.isFunction(c)&&(c=c(e.params)),c=x.getTrustedResourceUrl(c),d.isDefined(c)&&(e.loadedTemplateUrl=c,b=p(c)));d.isDefined(b)&&(a.$template=b);return f.all(a)}}).then(function(c){e==s.current&&(e&&(e.locals=c,d.copy(e.params,b)),a.$broadcast("$routeChangeSuccess",e,u))},function(b){e==s.current&&a.$broadcast("$routeChangeError", -e,u,b)})}function k(){var a,b;d.forEach(g,function(f,g){var q;if(q=!b){var h=c.path();q=f.keys;var l={};if(f.regexp)if(h=f.regexp.exec(h)){for(var k=1,m=h.length;k", - "license": "MIT", - "bugs": { - "url": "https://github.com/angular/angular.js/issues" - }, - "homepage": "http://angularjs.org" -} diff --git a/public/browse/lib/angular/.bower.json b/public/browse/lib/angular/.bower.json deleted file mode 100644 index 802187047..000000000 --- a/public/browse/lib/angular/.bower.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "angular", - "version": "1.3.5", - "main": "./angular.js", - "ignore": [], - "dependencies": {}, - "homepage": "https://github.com/angular/bower-angular", - "_release": "1.3.5", - "_resolution": { - "type": "version", - "tag": "v1.3.5", - "commit": "9acb014af4fd7b0ab001c64fa7bcac454ab4050b" - }, - "_source": "git://github.com/angular/bower-angular.git", - "_target": "1.3.x", - "_originalSource": "angular" -} \ No newline at end of file diff --git a/public/browse/lib/angular/README.md b/public/browse/lib/angular/README.md deleted file mode 100644 index 897fb7f01..000000000 --- a/public/browse/lib/angular/README.md +++ /dev/null @@ -1,67 +0,0 @@ -# packaged angular - -This repo is for distribution on `npm` and `bower`. The source for this module is in the -[main AngularJS repo](https://github.com/angular/angular.js). -Please file issues and pull requests against that repo. - -## Install - -You can install this package either with `npm` or with `bower`. - -### npm - -```shell -npm install angular -``` - -Then add a ` -``` - -Note that this package is not in CommonJS format, so doing `require('angular')` will return `undefined`. -If you're using [Browserify](https://github.com/substack/node-browserify), you can use -[exposify](https://github.com/thlorenz/exposify) to have `require('angular')` return the `angular` -global. - -### bower - -```shell -bower install angular -``` - -Then add a ` -``` - -## Documentation - -Documentation is available on the -[AngularJS docs site](http://docs.angularjs.org/). - -## License - -The MIT License - -Copyright (c) 2010-2012 Google, Inc. http://angularjs.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/public/browse/lib/angular/angular-csp.css b/public/browse/lib/angular/angular-csp.css deleted file mode 100644 index 0ce9d864c..000000000 --- a/public/browse/lib/angular/angular-csp.css +++ /dev/null @@ -1,13 +0,0 @@ -/* Include this file in your html if you are using the CSP mode. */ - -@charset "UTF-8"; - -[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], -.ng-cloak, .x-ng-cloak, -.ng-hide:not(.ng-hide-animate) { - display: none !important; -} - -ng\:form { - display: block; -} diff --git a/public/browse/lib/angular/angular.js b/public/browse/lib/angular/angular.js deleted file mode 100644 index 754f9aaf6..000000000 --- a/public/browse/lib/angular/angular.js +++ /dev/null @@ -1,25917 +0,0 @@ -/** - * @license AngularJS v1.3.5 - * (c) 2010-2014 Google, Inc. http://angularjs.org - * License: MIT - */ -(function(window, document, undefined) {'use strict'; - -/** - * @description - * - * This object provides a utility for producing rich Error messages within - * Angular. It can be called as follows: - * - * var exampleMinErr = minErr('example'); - * throw exampleMinErr('one', 'This {0} is {1}', foo, bar); - * - * The above creates an instance of minErr in the example namespace. The - * resulting error will have a namespaced error code of example.one. The - * resulting error will replace {0} with the value of foo, and {1} with the - * value of bar. The object is not restricted in the number of arguments it can - * take. - * - * If fewer arguments are specified than necessary for interpolation, the extra - * interpolation markers will be preserved in the final string. - * - * Since data will be parsed statically during a build step, some restrictions - * are applied with respect to how minErr instances are created and called. - * Instances should have names of the form namespaceMinErr for a minErr created - * using minErr('namespace') . Error codes, namespaces and template strings - * should all be static strings, not variables or general expressions. - * - * @param {string} module The namespace to use for the new minErr instance. - * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning - * error from returned function, for cases when a particular type of error is useful. - * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance - */ - -function minErr(module, ErrorConstructor) { - ErrorConstructor = ErrorConstructor || Error; - return function() { - var code = arguments[0], - prefix = '[' + (module ? module + ':' : '') + code + '] ', - template = arguments[1], - templateArgs = arguments, - - message, i; - - message = prefix + template.replace(/\{\d+\}/g, function(match) { - var index = +match.slice(1, -1), arg; - - if (index + 2 < templateArgs.length) { - return toDebugString(templateArgs[index + 2]); - } - return match; - }); - - message = message + '\nhttp://errors.angularjs.org/1.3.5/' + - (module ? module + '/' : '') + code; - for (i = 2; i < arguments.length; i++) { - message = message + (i == 2 ? '?' : '&') + 'p' + (i - 2) + '=' + - encodeURIComponent(toDebugString(arguments[i])); - } - return new ErrorConstructor(message); - }; -} - -/* We need to tell jshint what variables are being exported */ -/* global angular: true, - msie: true, - jqLite: true, - jQuery: true, - slice: true, - splice: true, - push: true, - toString: true, - ngMinErr: true, - angularModule: true, - uid: true, - REGEX_STRING_REGEXP: true, - VALIDITY_STATE_PROPERTY: true, - - lowercase: true, - uppercase: true, - manualLowercase: true, - manualUppercase: true, - nodeName_: true, - isArrayLike: true, - forEach: true, - sortedKeys: true, - forEachSorted: true, - reverseParams: true, - nextUid: true, - setHashKey: true, - extend: true, - int: true, - inherit: true, - noop: true, - identity: true, - valueFn: true, - isUndefined: true, - isDefined: true, - isObject: true, - isString: true, - isNumber: true, - isDate: true, - isArray: true, - isFunction: true, - isRegExp: true, - isWindow: true, - isScope: true, - isFile: true, - isBlob: true, - isBoolean: true, - isPromiseLike: true, - trim: true, - escapeForRegexp: true, - isElement: true, - makeMap: true, - includes: true, - arrayRemove: true, - copy: true, - shallowCopy: true, - equals: true, - csp: true, - concat: true, - sliceArgs: true, - bind: true, - toJsonReplacer: true, - toJson: true, - fromJson: true, - startingTag: true, - tryDecodeURIComponent: true, - parseKeyValue: true, - toKeyValue: true, - encodeUriSegment: true, - encodeUriQuery: true, - angularInit: true, - bootstrap: true, - getTestability: true, - snake_case: true, - bindJQuery: true, - assertArg: true, - assertArgFn: true, - assertNotHasOwnProperty: true, - getter: true, - getBlockNodes: true, - hasOwnProperty: true, - createMap: true, - - NODE_TYPE_ELEMENT: true, - NODE_TYPE_TEXT: true, - NODE_TYPE_COMMENT: true, - NODE_TYPE_DOCUMENT: true, - NODE_TYPE_DOCUMENT_FRAGMENT: true, -*/ - -//////////////////////////////////// - -/** - * @ngdoc module - * @name ng - * @module ng - * @description - * - * # ng (core module) - * The ng module is loaded by default when an AngularJS application is started. The module itself - * contains the essential components for an AngularJS application to function. The table below - * lists a high level breakdown of each of the services/factories, filters, directives and testing - * components available within this core module. - * - *
      - */ - -var REGEX_STRING_REGEXP = /^\/(.+)\/([a-z]*)$/; - -// The name of a form control's ValidityState property. -// This is used so that it's possible for internal tests to create mock ValidityStates. -var VALIDITY_STATE_PROPERTY = 'validity'; - -/** - * @ngdoc function - * @name angular.lowercase - * @module ng - * @kind function - * - * @description Converts the specified string to lowercase. - * @param {string} string String to be converted to lowercase. - * @returns {string} Lowercased string. - */ -var lowercase = function(string) {return isString(string) ? string.toLowerCase() : string;}; -var hasOwnProperty = Object.prototype.hasOwnProperty; - -/** - * @ngdoc function - * @name angular.uppercase - * @module ng - * @kind function - * - * @description Converts the specified string to uppercase. - * @param {string} string String to be converted to uppercase. - * @returns {string} Uppercased string. - */ -var uppercase = function(string) {return isString(string) ? string.toUpperCase() : string;}; - - -var manualLowercase = function(s) { - /* jshint bitwise: false */ - return isString(s) - ? s.replace(/[A-Z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) | 32);}) - : s; -}; -var manualUppercase = function(s) { - /* jshint bitwise: false */ - return isString(s) - ? s.replace(/[a-z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) & ~32);}) - : s; -}; - - -// String#toLowerCase and String#toUpperCase don't produce correct results in browsers with Turkish -// locale, for this reason we need to detect this case and redefine lowercase/uppercase methods -// with correct but slower alternatives. -if ('i' !== 'I'.toLowerCase()) { - lowercase = manualLowercase; - uppercase = manualUppercase; -} - - -var - msie, // holds major version number for IE, or NaN if UA is not IE. - jqLite, // delay binding since jQuery could be loaded after us. - jQuery, // delay binding - slice = [].slice, - splice = [].splice, - push = [].push, - toString = Object.prototype.toString, - ngMinErr = minErr('ng'), - - /** @name angular */ - angular = window.angular || (window.angular = {}), - angularModule, - uid = 0; - -/** - * documentMode is an IE-only property - * http://msdn.microsoft.com/en-us/library/ie/cc196988(v=vs.85).aspx - */ -msie = document.documentMode; - - -/** - * @private - * @param {*} obj - * @return {boolean} Returns true if `obj` is an array or array-like object (NodeList, Arguments, - * String ...) - */ -function isArrayLike(obj) { - if (obj == null || isWindow(obj)) { - return false; - } - - var length = obj.length; - - if (obj.nodeType === NODE_TYPE_ELEMENT && length) { - return true; - } - - return isString(obj) || isArray(obj) || length === 0 || - typeof length === 'number' && length > 0 && (length - 1) in obj; -} - -/** - * @ngdoc function - * @name angular.forEach - * @module ng - * @kind function - * - * @description - * Invokes the `iterator` function once for each item in `obj` collection, which can be either an - * object or an array. The `iterator` function is invoked with `iterator(value, key, obj)`, where `value` - * is the value of an object property or an array element, `key` is the object property key or - * array element index and obj is the `obj` itself. Specifying a `context` for the function is optional. - * - * It is worth noting that `.forEach` does not iterate over inherited properties because it filters - * using the `hasOwnProperty` method. - * - * Unlike ES262's - * [Array.prototype.forEach](http://www.ecma-international.org/ecma-262/5.1/#sec-15.4.4.18), - * Providing 'undefined' or 'null' values for `obj` will not throw a TypeError, but rather just - * return the value provided. - * - ```js - var values = {name: 'misko', gender: 'male'}; - var log = []; - angular.forEach(values, function(value, key) { - this.push(key + ': ' + value); - }, log); - expect(log).toEqual(['name: misko', 'gender: male']); - ``` - * - * @param {Object|Array} obj Object to iterate over. - * @param {Function} iterator Iterator function. - * @param {Object=} context Object to become context (`this`) for the iterator function. - * @returns {Object|Array} Reference to `obj`. - */ - -function forEach(obj, iterator, context) { - var key, length; - if (obj) { - if (isFunction(obj)) { - for (key in obj) { - // Need to check if hasOwnProperty exists, - // as on IE8 the result of querySelectorAll is an object without a hasOwnProperty function - if (key != 'prototype' && key != 'length' && key != 'name' && (!obj.hasOwnProperty || obj.hasOwnProperty(key))) { - iterator.call(context, obj[key], key, obj); - } - } - } else if (isArray(obj) || isArrayLike(obj)) { - var isPrimitive = typeof obj !== 'object'; - for (key = 0, length = obj.length; key < length; key++) { - if (isPrimitive || key in obj) { - iterator.call(context, obj[key], key, obj); - } - } - } else if (obj.forEach && obj.forEach !== forEach) { - obj.forEach(iterator, context, obj); - } else { - for (key in obj) { - if (obj.hasOwnProperty(key)) { - iterator.call(context, obj[key], key, obj); - } - } - } - } - return obj; -} - -function sortedKeys(obj) { - return Object.keys(obj).sort(); -} - -function forEachSorted(obj, iterator, context) { - var keys = sortedKeys(obj); - for (var i = 0; i < keys.length; i++) { - iterator.call(context, obj[keys[i]], keys[i]); - } - return keys; -} - - -/** - * when using forEach the params are value, key, but it is often useful to have key, value. - * @param {function(string, *)} iteratorFn - * @returns {function(*, string)} - */ -function reverseParams(iteratorFn) { - return function(value, key) { iteratorFn(key, value); }; -} - -/** - * A consistent way of creating unique IDs in angular. - * - * Using simple numbers allows us to generate 28.6 million unique ids per second for 10 years before - * we hit number precision issues in JavaScript. - * - * Math.pow(2,53) / 60 / 60 / 24 / 365 / 10 = 28.6M - * - * @returns {number} an unique alpha-numeric string - */ -function nextUid() { - return ++uid; -} - - -/** - * Set or clear the hashkey for an object. - * @param obj object - * @param h the hashkey (!truthy to delete the hashkey) - */ -function setHashKey(obj, h) { - if (h) { - obj.$$hashKey = h; - } - else { - delete obj.$$hashKey; - } -} - -/** - * @ngdoc function - * @name angular.extend - * @module ng - * @kind function - * - * @description - * Extends the destination object `dst` by copying own enumerable properties from the `src` object(s) - * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so - * by passing an empty object as the target: `var object = angular.extend({}, object1, object2)`. - * Note: Keep in mind that `angular.extend` does not support recursive merge (deep copy). - * - * @param {Object} dst Destination object. - * @param {...Object} src Source object(s). - * @returns {Object} Reference to `dst`. - */ -function extend(dst) { - var h = dst.$$hashKey; - - for (var i = 1, ii = arguments.length; i < ii; i++) { - var obj = arguments[i]; - if (obj) { - var keys = Object.keys(obj); - for (var j = 0, jj = keys.length; j < jj; j++) { - var key = keys[j]; - dst[key] = obj[key]; - } - } - } - - setHashKey(dst, h); - return dst; -} - -function int(str) { - return parseInt(str, 10); -} - - -function inherit(parent, extra) { - return extend(Object.create(parent), extra); -} - -/** - * @ngdoc function - * @name angular.noop - * @module ng - * @kind function - * - * @description - * A function that performs no operations. This function can be useful when writing code in the - * functional style. - ```js - function foo(callback) { - var result = calculateResult(); - (callback || angular.noop)(result); - } - ``` - */ -function noop() {} -noop.$inject = []; - - -/** - * @ngdoc function - * @name angular.identity - * @module ng - * @kind function - * - * @description - * A function that returns its first argument. This function is useful when writing code in the - * functional style. - * - ```js - function transformer(transformationFn, value) { - return (transformationFn || angular.identity)(value); - }; - ``` - */ -function identity($) {return $;} -identity.$inject = []; - - -function valueFn(value) {return function() {return value;};} - -/** - * @ngdoc function - * @name angular.isUndefined - * @module ng - * @kind function - * - * @description - * Determines if a reference is undefined. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is undefined. - */ -function isUndefined(value) {return typeof value === 'undefined';} - - -/** - * @ngdoc function - * @name angular.isDefined - * @module ng - * @kind function - * - * @description - * Determines if a reference is defined. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is defined. - */ -function isDefined(value) {return typeof value !== 'undefined';} - - -/** - * @ngdoc function - * @name angular.isObject - * @module ng - * @kind function - * - * @description - * Determines if a reference is an `Object`. Unlike `typeof` in JavaScript, `null`s are not - * considered to be objects. Note that JavaScript arrays are objects. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is an `Object` but not `null`. - */ -function isObject(value) { - // http://jsperf.com/isobject4 - return value !== null && typeof value === 'object'; -} - - -/** - * @ngdoc function - * @name angular.isString - * @module ng - * @kind function - * - * @description - * Determines if a reference is a `String`. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is a `String`. - */ -function isString(value) {return typeof value === 'string';} - - -/** - * @ngdoc function - * @name angular.isNumber - * @module ng - * @kind function - * - * @description - * Determines if a reference is a `Number`. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is a `Number`. - */ -function isNumber(value) {return typeof value === 'number';} - - -/** - * @ngdoc function - * @name angular.isDate - * @module ng - * @kind function - * - * @description - * Determines if a value is a date. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is a `Date`. - */ -function isDate(value) { - return toString.call(value) === '[object Date]'; -} - - -/** - * @ngdoc function - * @name angular.isArray - * @module ng - * @kind function - * - * @description - * Determines if a reference is an `Array`. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is an `Array`. - */ -var isArray = Array.isArray; - -/** - * @ngdoc function - * @name angular.isFunction - * @module ng - * @kind function - * - * @description - * Determines if a reference is a `Function`. - * - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is a `Function`. - */ -function isFunction(value) {return typeof value === 'function';} - - -/** - * Determines if a value is a regular expression object. - * - * @private - * @param {*} value Reference to check. - * @returns {boolean} True if `value` is a `RegExp`. - */ -function isRegExp(value) { - return toString.call(value) === '[object RegExp]'; -} - - -/** - * Checks if `obj` is a window object. - * - * @private - * @param {*} obj Object to check - * @returns {boolean} True if `obj` is a window obj. - */ -function isWindow(obj) { - return obj && obj.window === obj; -} - - -function isScope(obj) { - return obj && obj.$evalAsync && obj.$watch; -} - - -function isFile(obj) { - return toString.call(obj) === '[object File]'; -} - - -function isBlob(obj) { - return toString.call(obj) === '[object Blob]'; -} - - -function isBoolean(value) { - return typeof value === 'boolean'; -} - - -function isPromiseLike(obj) { - return obj && isFunction(obj.then); -} - - -var trim = function(value) { - return isString(value) ? value.trim() : value; -}; - -// Copied from: -// http://docs.closure-library.googlecode.com/git/local_closure_goog_string_string.js.source.html#line1021 -// Prereq: s is a string. -var escapeForRegexp = function(s) { - return s.replace(/([-()\[\]{}+?*.$\^|,:#= 0) - array.splice(index, 1); - return value; -} - -/** - * @ngdoc function - * @name angular.copy - * @module ng - * @kind function - * - * @description - * Creates a deep copy of `source`, which should be an object or an array. - * - * * If no destination is supplied, a copy of the object or array is created. - * * If a destination is provided, all of its elements (for array) or properties (for objects) - * are deleted and then all elements/properties from the source are copied to it. - * * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned. - * * If `source` is identical to 'destination' an exception will be thrown. - * - * @param {*} source The source that will be used to make a copy. - * Can be any type, including primitives, `null`, and `undefined`. - * @param {(Object|Array)=} destination Destination into which the source is copied. If - * provided, must be of the same type as `source`. - * @returns {*} The copy or updated `destination`, if `destination` was specified. - * - * @example - - -
      -
      - Name:
      - E-mail:
      - Gender: male - female
      - - -
      -
      form = {{user | json}}
      -
      master = {{master | json}}
      -
      - - -
      -
      - */ -function copy(source, destination, stackSource, stackDest) { - if (isWindow(source) || isScope(source)) { - throw ngMinErr('cpws', - "Can't copy! Making copies of Window or Scope instances is not supported."); - } - - if (!destination) { - destination = source; - if (source) { - if (isArray(source)) { - destination = copy(source, [], stackSource, stackDest); - } else if (isDate(source)) { - destination = new Date(source.getTime()); - } else if (isRegExp(source)) { - destination = new RegExp(source.source, source.toString().match(/[^\/]*$/)[0]); - destination.lastIndex = source.lastIndex; - } else if (isObject(source)) { - var emptyObject = Object.create(Object.getPrototypeOf(source)); - destination = copy(source, emptyObject, stackSource, stackDest); - } - } - } else { - if (source === destination) throw ngMinErr('cpi', - "Can't copy! Source and destination are identical."); - - stackSource = stackSource || []; - stackDest = stackDest || []; - - if (isObject(source)) { - var index = stackSource.indexOf(source); - if (index !== -1) return stackDest[index]; - - stackSource.push(source); - stackDest.push(destination); - } - - var result; - if (isArray(source)) { - destination.length = 0; - for (var i = 0; i < source.length; i++) { - result = copy(source[i], null, stackSource, stackDest); - if (isObject(source[i])) { - stackSource.push(source[i]); - stackDest.push(result); - } - destination.push(result); - } - } else { - var h = destination.$$hashKey; - if (isArray(destination)) { - destination.length = 0; - } else { - forEach(destination, function(value, key) { - delete destination[key]; - }); - } - for (var key in source) { - if (source.hasOwnProperty(key)) { - result = copy(source[key], null, stackSource, stackDest); - if (isObject(source[key])) { - stackSource.push(source[key]); - stackDest.push(result); - } - destination[key] = result; - } - } - setHashKey(destination,h); - } - - } - return destination; -} - -/** - * Creates a shallow copy of an object, an array or a primitive. - * - * Assumes that there are no proto properties for objects. - */ -function shallowCopy(src, dst) { - if (isArray(src)) { - dst = dst || []; - - for (var i = 0, ii = src.length; i < ii; i++) { - dst[i] = src[i]; - } - } else if (isObject(src)) { - dst = dst || {}; - - for (var key in src) { - if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) { - dst[key] = src[key]; - } - } - } - - return dst || src; -} - - -/** - * @ngdoc function - * @name angular.equals - * @module ng - * @kind function - * - * @description - * Determines if two objects or two values are equivalent. Supports value types, regular - * expressions, arrays and objects. - * - * Two objects or values are considered equivalent if at least one of the following is true: - * - * * Both objects or values pass `===` comparison. - * * Both objects or values are of the same type and all of their properties are equal by - * comparing them with `angular.equals`. - * * Both values are NaN. (In JavaScript, NaN == NaN => false. But we consider two NaN as equal) - * * Both values represent the same regular expression (In JavaScript, - * /abc/ == /abc/ => false. But we consider two regular expressions as equal when their textual - * representation matches). - * - * During a property comparison, properties of `function` type and properties with names - * that begin with `$` are ignored. - * - * Scope and DOMWindow objects are being compared only by identify (`===`). - * - * @param {*} o1 Object or value to compare. - * @param {*} o2 Object or value to compare. - * @returns {boolean} True if arguments are equal. - */ -function equals(o1, o2) { - if (o1 === o2) return true; - if (o1 === null || o2 === null) return false; - if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN - var t1 = typeof o1, t2 = typeof o2, length, key, keySet; - if (t1 == t2) { - if (t1 == 'object') { - if (isArray(o1)) { - if (!isArray(o2)) return false; - if ((length = o1.length) == o2.length) { - for (key = 0; key < length; key++) { - if (!equals(o1[key], o2[key])) return false; - } - return true; - } - } else if (isDate(o1)) { - if (!isDate(o2)) return false; - return equals(o1.getTime(), o2.getTime()); - } else if (isRegExp(o1) && isRegExp(o2)) { - return o1.toString() == o2.toString(); - } else { - if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) || isArray(o2)) return false; - keySet = {}; - for (key in o1) { - if (key.charAt(0) === '$' || isFunction(o1[key])) continue; - if (!equals(o1[key], o2[key])) return false; - keySet[key] = true; - } - for (key in o2) { - if (!keySet.hasOwnProperty(key) && - key.charAt(0) !== '$' && - o2[key] !== undefined && - !isFunction(o2[key])) return false; - } - return true; - } - } - } - return false; -} - -var csp = function() { - if (isDefined(csp.isActive_)) return csp.isActive_; - - var active = !!(document.querySelector('[ng-csp]') || - document.querySelector('[data-ng-csp]')); - - if (!active) { - try { - /* jshint -W031, -W054 */ - new Function(''); - /* jshint +W031, +W054 */ - } catch (e) { - active = true; - } - } - - return (csp.isActive_ = active); -}; - - - -function concat(array1, array2, index) { - return array1.concat(slice.call(array2, index)); -} - -function sliceArgs(args, startIndex) { - return slice.call(args, startIndex || 0); -} - - -/* jshint -W101 */ -/** - * @ngdoc function - * @name angular.bind - * @module ng - * @kind function - * - * @description - * Returns a function which calls function `fn` bound to `self` (`self` becomes the `this` for - * `fn`). You can supply optional `args` that are prebound to the function. This feature is also - * known as [partial application](http://en.wikipedia.org/wiki/Partial_application), as - * distinguished from [function currying](http://en.wikipedia.org/wiki/Currying#Contrast_with_partial_function_application). - * - * @param {Object} self Context which `fn` should be evaluated in. - * @param {function()} fn Function to be bound. - * @param {...*} args Optional arguments to be prebound to the `fn` function call. - * @returns {function()} Function that wraps the `fn` with all the specified bindings. - */ -/* jshint +W101 */ -function bind(self, fn) { - var curryArgs = arguments.length > 2 ? sliceArgs(arguments, 2) : []; - if (isFunction(fn) && !(fn instanceof RegExp)) { - return curryArgs.length - ? function() { - return arguments.length - ? fn.apply(self, concat(curryArgs, arguments, 0)) - : fn.apply(self, curryArgs); - } - : function() { - return arguments.length - ? fn.apply(self, arguments) - : fn.call(self); - }; - } else { - // in IE, native methods are not functions so they cannot be bound (note: they don't need to be) - return fn; - } -} - - -function toJsonReplacer(key, value) { - var val = value; - - if (typeof key === 'string' && key.charAt(0) === '$' && key.charAt(1) === '$') { - val = undefined; - } else if (isWindow(value)) { - val = '$WINDOW'; - } else if (value && document === value) { - val = '$DOCUMENT'; - } else if (isScope(value)) { - val = '$SCOPE'; - } - - return val; -} - - -/** - * @ngdoc function - * @name angular.toJson - * @module ng - * @kind function - * - * @description - * Serializes input into a JSON-formatted string. Properties with leading $$ characters will be - * stripped since angular uses this notation internally. - * - * @param {Object|Array|Date|string|number} obj Input to be serialized into JSON. - * @param {boolean=} pretty If set to true, the JSON output will contain newlines and whitespace. - * @returns {string|undefined} JSON-ified string representing `obj`. - */ -function toJson(obj, pretty) { - if (typeof obj === 'undefined') return undefined; - return JSON.stringify(obj, toJsonReplacer, pretty ? ' ' : null); -} - - -/** - * @ngdoc function - * @name angular.fromJson - * @module ng - * @kind function - * - * @description - * Deserializes a JSON string. - * - * @param {string} json JSON string to deserialize. - * @returns {Object|Array|string|number} Deserialized thingy. - */ -function fromJson(json) { - return isString(json) - ? JSON.parse(json) - : json; -} - - -/** - * @returns {string} Returns the string representation of the element. - */ -function startingTag(element) { - element = jqLite(element).clone(); - try { - // turns out IE does not let you set .html() on elements which - // are not allowed to have children. So we just ignore it. - element.empty(); - } catch (e) {} - var elemHtml = jqLite('
      ').append(element).html(); - try { - return element[0].nodeType === NODE_TYPE_TEXT ? lowercase(elemHtml) : - elemHtml. - match(/^(<[^>]+>)/)[1]. - replace(/^<([\w\-]+)/, function(match, nodeName) { return '<' + lowercase(nodeName); }); - } catch (e) { - return lowercase(elemHtml); - } - -} - - -///////////////////////////////////////////////// - -/** - * Tries to decode the URI component without throwing an exception. - * - * @private - * @param str value potential URI component to check. - * @returns {boolean} True if `value` can be decoded - * with the decodeURIComponent function. - */ -function tryDecodeURIComponent(value) { - try { - return decodeURIComponent(value); - } catch (e) { - // Ignore any invalid uri component - } -} - - -/** - * Parses an escaped url query string into key-value pairs. - * @returns {Object.} - */ -function parseKeyValue(/**string*/keyValue) { - var obj = {}, key_value, key; - forEach((keyValue || "").split('&'), function(keyValue) { - if (keyValue) { - key_value = keyValue.replace(/\+/g,'%20').split('='); - key = tryDecodeURIComponent(key_value[0]); - if (isDefined(key)) { - var val = isDefined(key_value[1]) ? tryDecodeURIComponent(key_value[1]) : true; - if (!hasOwnProperty.call(obj, key)) { - obj[key] = val; - } else if (isArray(obj[key])) { - obj[key].push(val); - } else { - obj[key] = [obj[key],val]; - } - } - } - }); - return obj; -} - -function toKeyValue(obj) { - var parts = []; - forEach(obj, function(value, key) { - if (isArray(value)) { - forEach(value, function(arrayValue) { - parts.push(encodeUriQuery(key, true) + - (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true))); - }); - } else { - parts.push(encodeUriQuery(key, true) + - (value === true ? '' : '=' + encodeUriQuery(value, true))); - } - }); - return parts.length ? parts.join('&') : ''; -} - - -/** - * We need our custom method because encodeURIComponent is too aggressive and doesn't follow - * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set (pchar) allowed in path - * segments: - * segment = *pchar - * pchar = unreserved / pct-encoded / sub-delims / ":" / "@" - * pct-encoded = "%" HEXDIG HEXDIG - * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" - * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" - * / "*" / "+" / "," / ";" / "=" - */ -function encodeUriSegment(val) { - return encodeUriQuery(val, true). - replace(/%26/gi, '&'). - replace(/%3D/gi, '='). - replace(/%2B/gi, '+'); -} - - -/** - * This method is intended for encoding *key* or *value* parts of query component. We need a custom - * method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be - * encoded per http://tools.ietf.org/html/rfc3986: - * query = *( pchar / "/" / "?" ) - * pchar = unreserved / pct-encoded / sub-delims / ":" / "@" - * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" - * pct-encoded = "%" HEXDIG HEXDIG - * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" - * / "*" / "+" / "," / ";" / "=" - */ -function encodeUriQuery(val, pctEncodeSpaces) { - return encodeURIComponent(val). - replace(/%40/gi, '@'). - replace(/%3A/gi, ':'). - replace(/%24/g, '$'). - replace(/%2C/gi, ','). - replace(/%3B/gi, ';'). - replace(/%20/g, (pctEncodeSpaces ? '%20' : '+')); -} - -var ngAttrPrefixes = ['ng-', 'data-ng-', 'ng:', 'x-ng-']; - -function getNgAttribute(element, ngAttr) { - var attr, i, ii = ngAttrPrefixes.length; - element = jqLite(element); - for (i = 0; i < ii; ++i) { - attr = ngAttrPrefixes[i] + ngAttr; - if (isString(attr = element.attr(attr))) { - return attr; - } - } - return null; -} - -/** - * @ngdoc directive - * @name ngApp - * @module ng - * - * @element ANY - * @param {angular.Module} ngApp an optional application - * {@link angular.module module} name to load. - * @param {boolean=} ngStrictDi if this attribute is present on the app element, the injector will be - * created in "strict-di" mode. This means that the application will fail to invoke functions which - * do not use explicit function annotation (and are thus unsuitable for minification), as described - * in {@link guide/di the Dependency Injection guide}, and useful debugging info will assist in - * tracking down the root of these bugs. - * - * @description - * - * Use this directive to **auto-bootstrap** an AngularJS application. The `ngApp` directive - * designates the **root element** of the application and is typically placed near the root element - * of the page - e.g. on the `` or `` tags. - * - * Only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp` - * found in the document will be used to define the root element to auto-bootstrap as an - * application. To run multiple applications in an HTML document you must manually bootstrap them using - * {@link angular.bootstrap} instead. AngularJS applications cannot be nested within each other. - * - * You can specify an **AngularJS module** to be used as the root module for the application. This - * module will be loaded into the {@link auto.$injector} when the application is bootstrapped and - * should contain the application code needed or have dependencies on other modules that will - * contain the code. See {@link angular.module} for more information. - * - * In the example below if the `ngApp` directive were not placed on the `html` element then the - * document would not be compiled, the `AppController` would not be instantiated and the `{{ a+b }}` - * would not be resolved to `3`. - * - * `ngApp` is the easiest, and most common, way to bootstrap an application. - * - - -
      - I can add: {{a}} + {{b}} = {{ a+b }} -
      -
      - - angular.module('ngAppDemo', []).controller('ngAppDemoController', function($scope) { - $scope.a = 1; - $scope.b = 2; - }); - -
      - * - * Using `ngStrictDi`, you would see something like this: - * - - -
      -
      - I can add: {{a}} + {{b}} = {{ a+b }} - -

      This renders because the controller does not fail to - instantiate, by using explicit annotation style (see - script.js for details) -

      -
      - -
      - Name:
      - Hello, {{name}}! - -

      This renders because the controller does not fail to - instantiate, by using explicit annotation style - (see script.js for details) -

      -
      - -
      - I can add: {{a}} + {{b}} = {{ a+b }} - -

      The controller could not be instantiated, due to relying - on automatic function annotations (which are disabled in - strict mode). As such, the content of this section is not - interpolated, and there should be an error in your web console. -

      -
      -
      -
      - - angular.module('ngAppStrictDemo', []) - // BadController will fail to instantiate, due to relying on automatic function annotation, - // rather than an explicit annotation - .controller('BadController', function($scope) { - $scope.a = 1; - $scope.b = 2; - }) - // Unlike BadController, GoodController1 and GoodController2 will not fail to be instantiated, - // due to using explicit annotations using the array style and $inject property, respectively. - .controller('GoodController1', ['$scope', function($scope) { - $scope.a = 1; - $scope.b = 2; - }]) - .controller('GoodController2', GoodController2); - function GoodController2($scope) { - $scope.name = "World"; - } - GoodController2.$inject = ['$scope']; - - - div[ng-controller] { - margin-bottom: 1em; - -webkit-border-radius: 4px; - border-radius: 4px; - border: 1px solid; - padding: .5em; - } - div[ng-controller^=Good] { - border-color: #d6e9c6; - background-color: #dff0d8; - color: #3c763d; - } - div[ng-controller^=Bad] { - border-color: #ebccd1; - background-color: #f2dede; - color: #a94442; - margin-bottom: 0; - } - -
      - */ -function angularInit(element, bootstrap) { - var appElement, - module, - config = {}; - - // The element `element` has priority over any other element - forEach(ngAttrPrefixes, function(prefix) { - var name = prefix + 'app'; - - if (!appElement && element.hasAttribute && element.hasAttribute(name)) { - appElement = element; - module = element.getAttribute(name); - } - }); - forEach(ngAttrPrefixes, function(prefix) { - var name = prefix + 'app'; - var candidate; - - if (!appElement && (candidate = element.querySelector('[' + name.replace(':', '\\:') + ']'))) { - appElement = candidate; - module = candidate.getAttribute(name); - } - }); - if (appElement) { - config.strictDi = getNgAttribute(appElement, "strict-di") !== null; - bootstrap(appElement, module ? [module] : [], config); - } -} - -/** - * @ngdoc function - * @name angular.bootstrap - * @module ng - * @description - * Use this function to manually start up angular application. - * - * See: {@link guide/bootstrap Bootstrap} - * - * Note that Protractor based end-to-end tests cannot use this function to bootstrap manually. - * They must use {@link ng.directive:ngApp ngApp}. - * - * Angular will detect if it has been loaded into the browser more than once and only allow the - * first loaded script to be bootstrapped and will report a warning to the browser console for - * each of the subsequent scripts. This prevents strange results in applications, where otherwise - * multiple instances of Angular try to work on the DOM. - * - * ```html - * - * - * - *
      - * {{greeting}} - *
      - * - * - * - * - * - * ``` - * - * @param {DOMElement} element DOM element which is the root of angular application. - * @param {Array=} modules an array of modules to load into the application. - * Each item in the array should be the name of a predefined module or a (DI annotated) - * function that will be invoked by the injector as a run block. - * See: {@link angular.module modules} - * @param {Object=} config an object for defining configuration options for the application. The - * following keys are supported: - * - * * `strictDi` - disable automatic function annotation for the application. This is meant to - * assist in finding bugs which break minified code. Defaults to `false`. - * - * @returns {auto.$injector} Returns the newly created injector for this app. - */ -function bootstrap(element, modules, config) { - if (!isObject(config)) config = {}; - var defaultConfig = { - strictDi: false - }; - config = extend(defaultConfig, config); - var doBootstrap = function() { - element = jqLite(element); - - if (element.injector()) { - var tag = (element[0] === document) ? 'document' : startingTag(element); - //Encode angle brackets to prevent input from being sanitized to empty string #8683 - throw ngMinErr( - 'btstrpd', - "App Already Bootstrapped with this Element '{0}'", - tag.replace(//,'>')); - } - - modules = modules || []; - modules.unshift(['$provide', function($provide) { - $provide.value('$rootElement', element); - }]); - - if (config.debugInfoEnabled) { - // Pushing so that this overrides `debugInfoEnabled` setting defined in user's `modules`. - modules.push(['$compileProvider', function($compileProvider) { - $compileProvider.debugInfoEnabled(true); - }]); - } - - modules.unshift('ng'); - var injector = createInjector(modules, config.strictDi); - injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector', - function bootstrapApply(scope, element, compile, injector) { - scope.$apply(function() { - element.data('$injector', injector); - compile(element)(scope); - }); - }] - ); - return injector; - }; - - var NG_ENABLE_DEBUG_INFO = /^NG_ENABLE_DEBUG_INFO!/; - var NG_DEFER_BOOTSTRAP = /^NG_DEFER_BOOTSTRAP!/; - - if (window && NG_ENABLE_DEBUG_INFO.test(window.name)) { - config.debugInfoEnabled = true; - window.name = window.name.replace(NG_ENABLE_DEBUG_INFO, ''); - } - - if (window && !NG_DEFER_BOOTSTRAP.test(window.name)) { - return doBootstrap(); - } - - window.name = window.name.replace(NG_DEFER_BOOTSTRAP, ''); - angular.resumeBootstrap = function(extraModules) { - forEach(extraModules, function(module) { - modules.push(module); - }); - doBootstrap(); - }; -} - -/** - * @ngdoc function - * @name angular.reloadWithDebugInfo - * @module ng - * @description - * Use this function to reload the current application with debug information turned on. - * This takes precedence over a call to `$compileProvider.debugInfoEnabled(false)`. - * - * See {@link ng.$compileProvider#debugInfoEnabled} for more. - */ -function reloadWithDebugInfo() { - window.name = 'NG_ENABLE_DEBUG_INFO!' + window.name; - window.location.reload(); -} - -/** - * @name angular.getTestability - * @module ng - * @description - * Get the testability service for the instance of Angular on the given - * element. - * @param {DOMElement} element DOM element which is the root of angular application. - */ -function getTestability(rootElement) { - return angular.element(rootElement).injector().get('$$testability'); -} - -var SNAKE_CASE_REGEXP = /[A-Z]/g; -function snake_case(name, separator) { - separator = separator || '_'; - return name.replace(SNAKE_CASE_REGEXP, function(letter, pos) { - return (pos ? separator : '') + letter.toLowerCase(); - }); -} - -var bindJQueryFired = false; -var skipDestroyOnNextJQueryCleanData; -function bindJQuery() { - var originalCleanData; - - if (bindJQueryFired) { - return; - } - - // bind to jQuery if present; - jQuery = window.jQuery; - // Use jQuery if it exists with proper functionality, otherwise default to us. - // Angular 1.2+ requires jQuery 1.7+ for on()/off() support. - // Angular 1.3+ technically requires at least jQuery 2.1+ but it may work with older - // versions. It will not work for sure with jQuery <1.7, though. - if (jQuery && jQuery.fn.on) { - jqLite = jQuery; - extend(jQuery.fn, { - scope: JQLitePrototype.scope, - isolateScope: JQLitePrototype.isolateScope, - controller: JQLitePrototype.controller, - injector: JQLitePrototype.injector, - inheritedData: JQLitePrototype.inheritedData - }); - - // All nodes removed from the DOM via various jQuery APIs like .remove() - // are passed through jQuery.cleanData. Monkey-patch this method to fire - // the $destroy event on all removed nodes. - originalCleanData = jQuery.cleanData; - jQuery.cleanData = function(elems) { - var events; - if (!skipDestroyOnNextJQueryCleanData) { - for (var i = 0, elem; (elem = elems[i]) != null; i++) { - events = jQuery._data(elem, "events"); - if (events && events.$destroy) { - jQuery(elem).triggerHandler('$destroy'); - } - } - } else { - skipDestroyOnNextJQueryCleanData = false; - } - originalCleanData(elems); - }; - } else { - jqLite = JQLite; - } - - angular.element = jqLite; - - // Prevent double-proxying. - bindJQueryFired = true; -} - -/** - * throw error if the argument is falsy. - */ -function assertArg(arg, name, reason) { - if (!arg) { - throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required")); - } - return arg; -} - -function assertArgFn(arg, name, acceptArrayAnnotation) { - if (acceptArrayAnnotation && isArray(arg)) { - arg = arg[arg.length - 1]; - } - - assertArg(isFunction(arg), name, 'not a function, got ' + - (arg && typeof arg === 'object' ? arg.constructor.name || 'Object' : typeof arg)); - return arg; -} - -/** - * throw error if the name given is hasOwnProperty - * @param {String} name the name to test - * @param {String} context the context in which the name is used, such as module or directive - */ -function assertNotHasOwnProperty(name, context) { - if (name === 'hasOwnProperty') { - throw ngMinErr('badname', "hasOwnProperty is not a valid {0} name", context); - } -} - -/** - * Return the value accessible from the object by path. Any undefined traversals are ignored - * @param {Object} obj starting object - * @param {String} path path to traverse - * @param {boolean} [bindFnToScope=true] - * @returns {Object} value as accessible by path - */ -//TODO(misko): this function needs to be removed -function getter(obj, path, bindFnToScope) { - if (!path) return obj; - var keys = path.split('.'); - var key; - var lastInstance = obj; - var len = keys.length; - - for (var i = 0; i < len; i++) { - key = keys[i]; - if (obj) { - obj = (lastInstance = obj)[key]; - } - } - if (!bindFnToScope && isFunction(obj)) { - return bind(lastInstance, obj); - } - return obj; -} - -/** - * Return the DOM siblings between the first and last node in the given array. - * @param {Array} array like object - * @returns {jqLite} jqLite collection containing the nodes - */ -function getBlockNodes(nodes) { - // TODO(perf): just check if all items in `nodes` are siblings and if they are return the original - // collection, otherwise update the original collection. - var node = nodes[0]; - var endNode = nodes[nodes.length - 1]; - var blockNodes = [node]; - - do { - node = node.nextSibling; - if (!node) break; - blockNodes.push(node); - } while (node !== endNode); - - return jqLite(blockNodes); -} - - -/** - * Creates a new object without a prototype. This object is useful for lookup without having to - * guard against prototypically inherited properties via hasOwnProperty. - * - * Related micro-benchmarks: - * - http://jsperf.com/object-create2 - * - http://jsperf.com/proto-map-lookup/2 - * - http://jsperf.com/for-in-vs-object-keys2 - * - * @returns {Object} - */ -function createMap() { - return Object.create(null); -} - -var NODE_TYPE_ELEMENT = 1; -var NODE_TYPE_TEXT = 3; -var NODE_TYPE_COMMENT = 8; -var NODE_TYPE_DOCUMENT = 9; -var NODE_TYPE_DOCUMENT_FRAGMENT = 11; - -/** - * @ngdoc type - * @name angular.Module - * @module ng - * @description - * - * Interface for configuring angular {@link angular.module modules}. - */ - -function setupModuleLoader(window) { - - var $injectorMinErr = minErr('$injector'); - var ngMinErr = minErr('ng'); - - function ensure(obj, name, factory) { - return obj[name] || (obj[name] = factory()); - } - - var angular = ensure(window, 'angular', Object); - - // We need to expose `angular.$$minErr` to modules such as `ngResource` that reference it during bootstrap - angular.$$minErr = angular.$$minErr || minErr; - - return ensure(angular, 'module', function() { - /** @type {Object.} */ - var modules = {}; - - /** - * @ngdoc function - * @name angular.module - * @module ng - * @description - * - * The `angular.module` is a global place for creating, registering and retrieving Angular - * modules. - * All modules (angular core or 3rd party) that should be available to an application must be - * registered using this mechanism. - * - * When passed two or more arguments, a new module is created. If passed only one argument, an - * existing module (the name passed as the first argument to `module`) is retrieved. - * - * - * # Module - * - * A module is a collection of services, directives, controllers, filters, and configuration information. - * `angular.module` is used to configure the {@link auto.$injector $injector}. - * - * ```js - * // Create a new module - * var myModule = angular.module('myModule', []); - * - * // register a new service - * myModule.value('appName', 'MyCoolApp'); - * - * // configure existing services inside initialization blocks. - * myModule.config(['$locationProvider', function($locationProvider) { - * // Configure existing providers - * $locationProvider.hashPrefix('!'); - * }]); - * ``` - * - * Then you can create an injector and load your modules like this: - * - * ```js - * var injector = angular.injector(['ng', 'myModule']) - * ``` - * - * However it's more likely that you'll just use - * {@link ng.directive:ngApp ngApp} or - * {@link angular.bootstrap} to simplify this process for you. - * - * @param {!string} name The name of the module to create or retrieve. - * @param {!Array.=} requires If specified then new module is being created. If - * unspecified then the module is being retrieved for further configuration. - * @param {Function=} configFn Optional configuration function for the module. Same as - * {@link angular.Module#config Module#config()}. - * @returns {module} new module with the {@link angular.Module} api. - */ - return function module(name, requires, configFn) { - var assertNotHasOwnProperty = function(name, context) { - if (name === 'hasOwnProperty') { - throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context); - } - }; - - assertNotHasOwnProperty(name, 'module'); - if (requires && modules.hasOwnProperty(name)) { - modules[name] = null; - } - return ensure(modules, name, function() { - if (!requires) { - throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " + - "the module name or forgot to load it. If registering a module ensure that you " + - "specify the dependencies as the second argument.", name); - } - - /** @type {!Array.>} */ - var invokeQueue = []; - - /** @type {!Array.} */ - var configBlocks = []; - - /** @type {!Array.} */ - var runBlocks = []; - - var config = invokeLater('$injector', 'invoke', 'push', configBlocks); - - /** @type {angular.Module} */ - var moduleInstance = { - // Private state - _invokeQueue: invokeQueue, - _configBlocks: configBlocks, - _runBlocks: runBlocks, - - /** - * @ngdoc property - * @name angular.Module#requires - * @module ng - * - * @description - * Holds the list of modules which the injector will load before the current module is - * loaded. - */ - requires: requires, - - /** - * @ngdoc property - * @name angular.Module#name - * @module ng - * - * @description - * Name of the module. - */ - name: name, - - - /** - * @ngdoc method - * @name angular.Module#provider - * @module ng - * @param {string} name service name - * @param {Function} providerType Construction function for creating new instance of the - * service. - * @description - * See {@link auto.$provide#provider $provide.provider()}. - */ - provider: invokeLater('$provide', 'provider'), - - /** - * @ngdoc method - * @name angular.Module#factory - * @module ng - * @param {string} name service name - * @param {Function} providerFunction Function for creating new instance of the service. - * @description - * See {@link auto.$provide#factory $provide.factory()}. - */ - factory: invokeLater('$provide', 'factory'), - - /** - * @ngdoc method - * @name angular.Module#service - * @module ng - * @param {string} name service name - * @param {Function} constructor A constructor function that will be instantiated. - * @description - * See {@link auto.$provide#service $provide.service()}. - */ - service: invokeLater('$provide', 'service'), - - /** - * @ngdoc method - * @name angular.Module#value - * @module ng - * @param {string} name service name - * @param {*} object Service instance object. - * @description - * See {@link auto.$provide#value $provide.value()}. - */ - value: invokeLater('$provide', 'value'), - - /** - * @ngdoc method - * @name angular.Module#constant - * @module ng - * @param {string} name constant name - * @param {*} object Constant value. - * @description - * Because the constant are fixed, they get applied before other provide methods. - * See {@link auto.$provide#constant $provide.constant()}. - */ - constant: invokeLater('$provide', 'constant', 'unshift'), - - /** - * @ngdoc method - * @name angular.Module#animation - * @module ng - * @param {string} name animation name - * @param {Function} animationFactory Factory function for creating new instance of an - * animation. - * @description - * - * **NOTE**: animations take effect only if the **ngAnimate** module is loaded. - * - * - * Defines an animation hook that can be later used with - * {@link ngAnimate.$animate $animate} service and directives that use this service. - * - * ```js - * module.animation('.animation-name', function($inject1, $inject2) { - * return { - * eventName : function(element, done) { - * //code to run the animation - * //once complete, then run done() - * return function cancellationFunction(element) { - * //code to cancel the animation - * } - * } - * } - * }) - * ``` - * - * See {@link ng.$animateProvider#register $animateProvider.register()} and - * {@link ngAnimate ngAnimate module} for more information. - */ - animation: invokeLater('$animateProvider', 'register'), - - /** - * @ngdoc method - * @name angular.Module#filter - * @module ng - * @param {string} name Filter name. - * @param {Function} filterFactory Factory function for creating new instance of filter. - * @description - * See {@link ng.$filterProvider#register $filterProvider.register()}. - */ - filter: invokeLater('$filterProvider', 'register'), - - /** - * @ngdoc method - * @name angular.Module#controller - * @module ng - * @param {string|Object} name Controller name, or an object map of controllers where the - * keys are the names and the values are the constructors. - * @param {Function} constructor Controller constructor function. - * @description - * See {@link ng.$controllerProvider#register $controllerProvider.register()}. - */ - controller: invokeLater('$controllerProvider', 'register'), - - /** - * @ngdoc method - * @name angular.Module#directive - * @module ng - * @param {string|Object} name Directive name, or an object map of directives where the - * keys are the names and the values are the factories. - * @param {Function} directiveFactory Factory function for creating new instance of - * directives. - * @description - * See {@link ng.$compileProvider#directive $compileProvider.directive()}. - */ - directive: invokeLater('$compileProvider', 'directive'), - - /** - * @ngdoc method - * @name angular.Module#config - * @module ng - * @param {Function} configFn Execute this function on module load. Useful for service - * configuration. - * @description - * Use this method to register work which needs to be performed on module loading. - * For more about how to configure services, see - * {@link providers#provider-recipe Provider Recipe}. - */ - config: config, - - /** - * @ngdoc method - * @name angular.Module#run - * @module ng - * @param {Function} initializationFn Execute this function after injector creation. - * Useful for application initialization. - * @description - * Use this method to register work which should be performed when the injector is done - * loading all modules. - */ - run: function(block) { - runBlocks.push(block); - return this; - } - }; - - if (configFn) { - config(configFn); - } - - return moduleInstance; - - /** - * @param {string} provider - * @param {string} method - * @param {String=} insertMethod - * @returns {angular.Module} - */ - function invokeLater(provider, method, insertMethod, queue) { - if (!queue) queue = invokeQueue; - return function() { - queue[insertMethod || 'push']([provider, method, arguments]); - return moduleInstance; - }; - } - }); - }; - }); - -} - -/* global: toDebugString: true */ - -function serializeObject(obj) { - var seen = []; - - return JSON.stringify(obj, function(key, val) { - val = toJsonReplacer(key, val); - if (isObject(val)) { - - if (seen.indexOf(val) >= 0) return '<>'; - - seen.push(val); - } - return val; - }); -} - -function toDebugString(obj) { - if (typeof obj === 'function') { - return obj.toString().replace(/ \{[\s\S]*$/, ''); - } else if (typeof obj === 'undefined') { - return 'undefined'; - } else if (typeof obj !== 'string') { - return serializeObject(obj); - } - return obj; -} - -/* global angularModule: true, - version: true, - - $LocaleProvider, - $CompileProvider, - - htmlAnchorDirective, - inputDirective, - inputDirective, - formDirective, - scriptDirective, - selectDirective, - styleDirective, - optionDirective, - ngBindDirective, - ngBindHtmlDirective, - ngBindTemplateDirective, - ngClassDirective, - ngClassEvenDirective, - ngClassOddDirective, - ngCspDirective, - ngCloakDirective, - ngControllerDirective, - ngFormDirective, - ngHideDirective, - ngIfDirective, - ngIncludeDirective, - ngIncludeFillContentDirective, - ngInitDirective, - ngNonBindableDirective, - ngPluralizeDirective, - ngRepeatDirective, - ngShowDirective, - ngStyleDirective, - ngSwitchDirective, - ngSwitchWhenDirective, - ngSwitchDefaultDirective, - ngOptionsDirective, - ngTranscludeDirective, - ngModelDirective, - ngListDirective, - ngChangeDirective, - patternDirective, - patternDirective, - requiredDirective, - requiredDirective, - minlengthDirective, - minlengthDirective, - maxlengthDirective, - maxlengthDirective, - ngValueDirective, - ngModelOptionsDirective, - ngAttributeAliasDirectives, - ngEventDirectives, - - $AnchorScrollProvider, - $AnimateProvider, - $BrowserProvider, - $CacheFactoryProvider, - $ControllerProvider, - $DocumentProvider, - $ExceptionHandlerProvider, - $FilterProvider, - $InterpolateProvider, - $IntervalProvider, - $HttpProvider, - $HttpBackendProvider, - $LocationProvider, - $LogProvider, - $ParseProvider, - $RootScopeProvider, - $QProvider, - $$QProvider, - $$SanitizeUriProvider, - $SceProvider, - $SceDelegateProvider, - $SnifferProvider, - $TemplateCacheProvider, - $TemplateRequestProvider, - $$TestabilityProvider, - $TimeoutProvider, - $$RAFProvider, - $$AsyncCallbackProvider, - $WindowProvider -*/ - - -/** - * @ngdoc object - * @name angular.version - * @module ng - * @description - * An object that contains information about the current AngularJS version. This object has the - * following properties: - * - * - `full` – `{string}` – Full version string, such as "0.9.18". - * - `major` – `{number}` – Major version number, such as "0". - * - `minor` – `{number}` – Minor version number, such as "9". - * - `dot` – `{number}` – Dot version number, such as "18". - * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat". - */ -var version = { - full: '1.3.5', // all of these placeholder strings will be replaced by grunt's - major: 1, // package task - minor: 3, - dot: 5, - codeName: 'cybernetic-mercantilism' -}; - - -function publishExternalAPI(angular) { - extend(angular, { - 'bootstrap': bootstrap, - 'copy': copy, - 'extend': extend, - 'equals': equals, - 'element': jqLite, - 'forEach': forEach, - 'injector': createInjector, - 'noop': noop, - 'bind': bind, - 'toJson': toJson, - 'fromJson': fromJson, - 'identity': identity, - 'isUndefined': isUndefined, - 'isDefined': isDefined, - 'isString': isString, - 'isFunction': isFunction, - 'isObject': isObject, - 'isNumber': isNumber, - 'isElement': isElement, - 'isArray': isArray, - 'version': version, - 'isDate': isDate, - 'lowercase': lowercase, - 'uppercase': uppercase, - 'callbacks': {counter: 0}, - 'getTestability': getTestability, - '$$minErr': minErr, - '$$csp': csp, - 'reloadWithDebugInfo': reloadWithDebugInfo - }); - - angularModule = setupModuleLoader(window); - try { - angularModule('ngLocale'); - } catch (e) { - angularModule('ngLocale', []).provider('$locale', $LocaleProvider); - } - - angularModule('ng', ['ngLocale'], ['$provide', - function ngModule($provide) { - // $$sanitizeUriProvider needs to be before $compileProvider as it is used by it. - $provide.provider({ - $$sanitizeUri: $$SanitizeUriProvider - }); - $provide.provider('$compile', $CompileProvider). - directive({ - a: htmlAnchorDirective, - input: inputDirective, - textarea: inputDirective, - form: formDirective, - script: scriptDirective, - select: selectDirective, - style: styleDirective, - option: optionDirective, - ngBind: ngBindDirective, - ngBindHtml: ngBindHtmlDirective, - ngBindTemplate: ngBindTemplateDirective, - ngClass: ngClassDirective, - ngClassEven: ngClassEvenDirective, - ngClassOdd: ngClassOddDirective, - ngCloak: ngCloakDirective, - ngController: ngControllerDirective, - ngForm: ngFormDirective, - ngHide: ngHideDirective, - ngIf: ngIfDirective, - ngInclude: ngIncludeDirective, - ngInit: ngInitDirective, - ngNonBindable: ngNonBindableDirective, - ngPluralize: ngPluralizeDirective, - ngRepeat: ngRepeatDirective, - ngShow: ngShowDirective, - ngStyle: ngStyleDirective, - ngSwitch: ngSwitchDirective, - ngSwitchWhen: ngSwitchWhenDirective, - ngSwitchDefault: ngSwitchDefaultDirective, - ngOptions: ngOptionsDirective, - ngTransclude: ngTranscludeDirective, - ngModel: ngModelDirective, - ngList: ngListDirective, - ngChange: ngChangeDirective, - pattern: patternDirective, - ngPattern: patternDirective, - required: requiredDirective, - ngRequired: requiredDirective, - minlength: minlengthDirective, - ngMinlength: minlengthDirective, - maxlength: maxlengthDirective, - ngMaxlength: maxlengthDirective, - ngValue: ngValueDirective, - ngModelOptions: ngModelOptionsDirective - }). - directive({ - ngInclude: ngIncludeFillContentDirective - }). - directive(ngAttributeAliasDirectives). - directive(ngEventDirectives); - $provide.provider({ - $anchorScroll: $AnchorScrollProvider, - $animate: $AnimateProvider, - $browser: $BrowserProvider, - $cacheFactory: $CacheFactoryProvider, - $controller: $ControllerProvider, - $document: $DocumentProvider, - $exceptionHandler: $ExceptionHandlerProvider, - $filter: $FilterProvider, - $interpolate: $InterpolateProvider, - $interval: $IntervalProvider, - $http: $HttpProvider, - $httpBackend: $HttpBackendProvider, - $location: $LocationProvider, - $log: $LogProvider, - $parse: $ParseProvider, - $rootScope: $RootScopeProvider, - $q: $QProvider, - $$q: $$QProvider, - $sce: $SceProvider, - $sceDelegate: $SceDelegateProvider, - $sniffer: $SnifferProvider, - $templateCache: $TemplateCacheProvider, - $templateRequest: $TemplateRequestProvider, - $$testability: $$TestabilityProvider, - $timeout: $TimeoutProvider, - $window: $WindowProvider, - $$rAF: $$RAFProvider, - $$asyncCallback: $$AsyncCallbackProvider - }); - } - ]); -} - -/* global JQLitePrototype: true, - addEventListenerFn: true, - removeEventListenerFn: true, - BOOLEAN_ATTR: true, - ALIASED_ATTR: true, -*/ - -////////////////////////////////// -//JQLite -////////////////////////////////// - -/** - * @ngdoc function - * @name angular.element - * @module ng - * @kind function - * - * @description - * Wraps a raw DOM element or HTML string as a [jQuery](http://jquery.com) element. - * - * If jQuery is available, `angular.element` is an alias for the - * [jQuery](http://api.jquery.com/jQuery/) function. If jQuery is not available, `angular.element` - * delegates to Angular's built-in subset of jQuery, called "jQuery lite" or "jqLite." - * - *
      jqLite is a tiny, API-compatible subset of jQuery that allows - * Angular to manipulate the DOM in a cross-browser compatible way. **jqLite** implements only the most - * commonly needed functionality with the goal of having a very small footprint.
      - * - * To use jQuery, simply load it before `DOMContentLoaded` event fired. - * - *
      **Note:** all element references in Angular are always wrapped with jQuery or - * jqLite; they are never raw DOM references.
      - * - * ## Angular's jqLite - * jqLite provides only the following jQuery methods: - * - * - [`addClass()`](http://api.jquery.com/addClass/) - * - [`after()`](http://api.jquery.com/after/) - * - [`append()`](http://api.jquery.com/append/) - * - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters - * - [`bind()`](http://api.jquery.com/bind/) - Does not support namespaces, selectors or eventData - * - [`children()`](http://api.jquery.com/children/) - Does not support selectors - * - [`clone()`](http://api.jquery.com/clone/) - * - [`contents()`](http://api.jquery.com/contents/) - * - [`css()`](http://api.jquery.com/css/) - Only retrieves inline-styles, does not call `getComputedStyle()` - * - [`data()`](http://api.jquery.com/data/) - * - [`detach()`](http://api.jquery.com/detach/) - * - [`empty()`](http://api.jquery.com/empty/) - * - [`eq()`](http://api.jquery.com/eq/) - * - [`find()`](http://api.jquery.com/find/) - Limited to lookups by tag name - * - [`hasClass()`](http://api.jquery.com/hasClass/) - * - [`html()`](http://api.jquery.com/html/) - * - [`next()`](http://api.jquery.com/next/) - Does not support selectors - * - [`on()`](http://api.jquery.com/on/) - Does not support namespaces, selectors or eventData - * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces or selectors - * - [`one()`](http://api.jquery.com/one/) - Does not support namespaces or selectors - * - [`parent()`](http://api.jquery.com/parent/) - Does not support selectors - * - [`prepend()`](http://api.jquery.com/prepend/) - * - [`prop()`](http://api.jquery.com/prop/) - * - [`ready()`](http://api.jquery.com/ready/) - * - [`remove()`](http://api.jquery.com/remove/) - * - [`removeAttr()`](http://api.jquery.com/removeAttr/) - * - [`removeClass()`](http://api.jquery.com/removeClass/) - * - [`removeData()`](http://api.jquery.com/removeData/) - * - [`replaceWith()`](http://api.jquery.com/replaceWith/) - * - [`text()`](http://api.jquery.com/text/) - * - [`toggleClass()`](http://api.jquery.com/toggleClass/) - * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers. - * - [`unbind()`](http://api.jquery.com/unbind/) - Does not support namespaces - * - [`val()`](http://api.jquery.com/val/) - * - [`wrap()`](http://api.jquery.com/wrap/) - * - * ## jQuery/jqLite Extras - * Angular also provides the following additional methods and events to both jQuery and jqLite: - * - * ### Events - * - `$destroy` - AngularJS intercepts all jqLite/jQuery's DOM destruction apis and fires this event - * on all DOM nodes being removed. This can be used to clean up any 3rd party bindings to the DOM - * element before it is removed. - * - * ### Methods - * - `controller(name)` - retrieves the controller of the current element or its parent. By default - * retrieves controller associated with the `ngController` directive. If `name` is provided as - * camelCase directive name, then the controller for this directive will be retrieved (e.g. - * `'ngModel'`). - * - `injector()` - retrieves the injector of the current element or its parent. - * - `scope()` - retrieves the {@link ng.$rootScope.Scope scope} of the current - * element or its parent. Requires {@link guide/production#disabling-debug-data Debug Data} to - * be enabled. - * - `isolateScope()` - retrieves an isolate {@link ng.$rootScope.Scope scope} if one is attached directly to the - * current element. This getter should be used only on elements that contain a directive which starts a new isolate - * scope. Calling `scope()` on this element always returns the original non-isolate scope. - * Requires {@link guide/production#disabling-debug-data Debug Data} to be enabled. - * - `inheritedData()` - same as `data()`, but walks up the DOM until a value is found or the top - * parent element is reached. - * - * @param {string|DOMElement} element HTML string or DOMElement to be wrapped into jQuery. - * @returns {Object} jQuery object. - */ - -JQLite.expando = 'ng339'; - -var jqCache = JQLite.cache = {}, - jqId = 1, - addEventListenerFn = function(element, type, fn) { - element.addEventListener(type, fn, false); - }, - removeEventListenerFn = function(element, type, fn) { - element.removeEventListener(type, fn, false); - }; - -/* - * !!! This is an undocumented "private" function !!! - */ -JQLite._data = function(node) { - //jQuery always returns an object on cache miss - return this.cache[node[this.expando]] || {}; -}; - -function jqNextId() { return ++jqId; } - - -var SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g; -var MOZ_HACK_REGEXP = /^moz([A-Z])/; -var MOUSE_EVENT_MAP= { mouseleave: "mouseout", mouseenter: "mouseover"}; -var jqLiteMinErr = minErr('jqLite'); - -/** - * Converts snake_case to camelCase. - * Also there is special case for Moz prefix starting with upper case letter. - * @param name Name to normalize - */ -function camelCase(name) { - return name. - replace(SPECIAL_CHARS_REGEXP, function(_, separator, letter, offset) { - return offset ? letter.toUpperCase() : letter; - }). - replace(MOZ_HACK_REGEXP, 'Moz$1'); -} - -var SINGLE_TAG_REGEXP = /^<(\w+)\s*\/?>(?:<\/\1>|)$/; -var HTML_REGEXP = /<|&#?\w+;/; -var TAG_NAME_REGEXP = /<([\w:]+)/; -var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi; - -var wrapMap = { - 'option': [1, ''], - - 'thead': [1, '', '
      '], - 'col': [2, '', '
      '], - 'tr': [2, '', '
      '], - 'td': [3, '', '
      '], - '_default': [0, "", ""] -}; - -wrapMap.optgroup = wrapMap.option; -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - - -function jqLiteIsTextNode(html) { - return !HTML_REGEXP.test(html); -} - -function jqLiteAcceptsData(node) { - // The window object can accept data but has no nodeType - // Otherwise we are only interested in elements (1) and documents (9) - var nodeType = node.nodeType; - return nodeType === NODE_TYPE_ELEMENT || !nodeType || nodeType === NODE_TYPE_DOCUMENT; -} - -function jqLiteBuildFragment(html, context) { - var tmp, tag, wrap, - fragment = context.createDocumentFragment(), - nodes = [], i; - - if (jqLiteIsTextNode(html)) { - // Convert non-html into a text node - nodes.push(context.createTextNode(html)); - } else { - // Convert html into DOM nodes - tmp = tmp || fragment.appendChild(context.createElement("div")); - tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase(); - wrap = wrapMap[tag] || wrapMap._default; - tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1>") + wrap[2]; - - // Descend through wrappers to the right content - i = wrap[0]; - while (i--) { - tmp = tmp.lastChild; - } - - nodes = concat(nodes, tmp.childNodes); - - tmp = fragment.firstChild; - tmp.textContent = ""; - } - - // Remove wrapper from fragment - fragment.textContent = ""; - fragment.innerHTML = ""; // Clear inner HTML - forEach(nodes, function(node) { - fragment.appendChild(node); - }); - - return fragment; -} - -function jqLiteParseHTML(html, context) { - context = context || document; - var parsed; - - if ((parsed = SINGLE_TAG_REGEXP.exec(html))) { - return [context.createElement(parsed[1])]; - } - - if ((parsed = jqLiteBuildFragment(html, context))) { - return parsed.childNodes; - } - - return []; -} - -///////////////////////////////////////////// -function JQLite(element) { - if (element instanceof JQLite) { - return element; - } - - var argIsString; - - if (isString(element)) { - element = trim(element); - argIsString = true; - } - if (!(this instanceof JQLite)) { - if (argIsString && element.charAt(0) != '<') { - throw jqLiteMinErr('nosel', 'Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element'); - } - return new JQLite(element); - } - - if (argIsString) { - jqLiteAddNodes(this, jqLiteParseHTML(element)); - } else { - jqLiteAddNodes(this, element); - } -} - -function jqLiteClone(element) { - return element.cloneNode(true); -} - -function jqLiteDealoc(element, onlyDescendants) { - if (!onlyDescendants) jqLiteRemoveData(element); - - if (element.querySelectorAll) { - var descendants = element.querySelectorAll('*'); - for (var i = 0, l = descendants.length; i < l; i++) { - jqLiteRemoveData(descendants[i]); - } - } -} - -function jqLiteOff(element, type, fn, unsupported) { - if (isDefined(unsupported)) throw jqLiteMinErr('offargs', 'jqLite#off() does not support the `selector` argument'); - - var expandoStore = jqLiteExpandoStore(element); - var events = expandoStore && expandoStore.events; - var handle = expandoStore && expandoStore.handle; - - if (!handle) return; //no listeners registered - - if (!type) { - for (type in events) { - if (type !== '$destroy') { - removeEventListenerFn(element, type, handle); - } - delete events[type]; - } - } else { - forEach(type.split(' '), function(type) { - if (isDefined(fn)) { - var listenerFns = events[type]; - arrayRemove(listenerFns || [], fn); - if (listenerFns && listenerFns.length > 0) { - return; - } - } - - removeEventListenerFn(element, type, handle); - delete events[type]; - }); - } -} - -function jqLiteRemoveData(element, name) { - var expandoId = element.ng339; - var expandoStore = expandoId && jqCache[expandoId]; - - if (expandoStore) { - if (name) { - delete expandoStore.data[name]; - return; - } - - if (expandoStore.handle) { - if (expandoStore.events.$destroy) { - expandoStore.handle({}, '$destroy'); - } - jqLiteOff(element); - } - delete jqCache[expandoId]; - element.ng339 = undefined; // don't delete DOM expandos. IE and Chrome don't like it - } -} - - -function jqLiteExpandoStore(element, createIfNecessary) { - var expandoId = element.ng339, - expandoStore = expandoId && jqCache[expandoId]; - - if (createIfNecessary && !expandoStore) { - element.ng339 = expandoId = jqNextId(); - expandoStore = jqCache[expandoId] = {events: {}, data: {}, handle: undefined}; - } - - return expandoStore; -} - - -function jqLiteData(element, key, value) { - if (jqLiteAcceptsData(element)) { - - var isSimpleSetter = isDefined(value); - var isSimpleGetter = !isSimpleSetter && key && !isObject(key); - var massGetter = !key; - var expandoStore = jqLiteExpandoStore(element, !isSimpleGetter); - var data = expandoStore && expandoStore.data; - - if (isSimpleSetter) { // data('key', value) - data[key] = value; - } else { - if (massGetter) { // data() - return data; - } else { - if (isSimpleGetter) { // data('key') - // don't force creation of expandoStore if it doesn't exist yet - return data && data[key]; - } else { // mass-setter: data({key1: val1, key2: val2}) - extend(data, key); - } - } - } - } -} - -function jqLiteHasClass(element, selector) { - if (!element.getAttribute) return false; - return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " "). - indexOf(" " + selector + " ") > -1); -} - -function jqLiteRemoveClass(element, cssClasses) { - if (cssClasses && element.setAttribute) { - forEach(cssClasses.split(' '), function(cssClass) { - element.setAttribute('class', trim( - (" " + (element.getAttribute('class') || '') + " ") - .replace(/[\n\t]/g, " ") - .replace(" " + trim(cssClass) + " ", " ")) - ); - }); - } -} - -function jqLiteAddClass(element, cssClasses) { - if (cssClasses && element.setAttribute) { - var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ') - .replace(/[\n\t]/g, " "); - - forEach(cssClasses.split(' '), function(cssClass) { - cssClass = trim(cssClass); - if (existingClasses.indexOf(' ' + cssClass + ' ') === -1) { - existingClasses += cssClass + ' '; - } - }); - - element.setAttribute('class', trim(existingClasses)); - } -} - - -function jqLiteAddNodes(root, elements) { - // THIS CODE IS VERY HOT. Don't make changes without benchmarking. - - if (elements) { - - // if a Node (the most common case) - if (elements.nodeType) { - root[root.length++] = elements; - } else { - var length = elements.length; - - // if an Array or NodeList and not a Window - if (typeof length === 'number' && elements.window !== elements) { - if (length) { - for (var i = 0; i < length; i++) { - root[root.length++] = elements[i]; - } - } - } else { - root[root.length++] = elements; - } - } - } -} - - -function jqLiteController(element, name) { - return jqLiteInheritedData(element, '$' + (name || 'ngController') + 'Controller'); -} - -function jqLiteInheritedData(element, name, value) { - // if element is the document object work with the html element instead - // this makes $(document).scope() possible - if (element.nodeType == NODE_TYPE_DOCUMENT) { - element = element.documentElement; - } - var names = isArray(name) ? name : [name]; - - while (element) { - for (var i = 0, ii = names.length; i < ii; i++) { - if ((value = jqLite.data(element, names[i])) !== undefined) return value; - } - - // If dealing with a document fragment node with a host element, and no parent, use the host - // element as the parent. This enables directives within a Shadow DOM or polyfilled Shadow DOM - // to lookup parent controllers. - element = element.parentNode || (element.nodeType === NODE_TYPE_DOCUMENT_FRAGMENT && element.host); - } -} - -function jqLiteEmpty(element) { - jqLiteDealoc(element, true); - while (element.firstChild) { - element.removeChild(element.firstChild); - } -} - -function jqLiteRemove(element, keepData) { - if (!keepData) jqLiteDealoc(element); - var parent = element.parentNode; - if (parent) parent.removeChild(element); -} - - -function jqLiteDocumentLoaded(action, win) { - win = win || window; - if (win.document.readyState === 'complete') { - // Force the action to be run async for consistent behaviour - // from the action's point of view - // i.e. it will definitely not be in a $apply - win.setTimeout(action); - } else { - // No need to unbind this handler as load is only ever called once - jqLite(win).on('load', action); - } -} - -////////////////////////////////////////// -// Functions which are declared directly. -////////////////////////////////////////// -var JQLitePrototype = JQLite.prototype = { - ready: function(fn) { - var fired = false; - - function trigger() { - if (fired) return; - fired = true; - fn(); - } - - // check if document is already loaded - if (document.readyState === 'complete') { - setTimeout(trigger); - } else { - this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9 - // we can not use jqLite since we are not done loading and jQuery could be loaded later. - // jshint -W064 - JQLite(window).on('load', trigger); // fallback to window.onload for others - // jshint +W064 - } - }, - toString: function() { - var value = []; - forEach(this, function(e) { value.push('' + e);}); - return '[' + value.join(', ') + ']'; - }, - - eq: function(index) { - return (index >= 0) ? jqLite(this[index]) : jqLite(this[this.length + index]); - }, - - length: 0, - push: push, - sort: [].sort, - splice: [].splice -}; - -////////////////////////////////////////// -// Functions iterating getter/setters. -// these functions return self on setter and -// value on get. -////////////////////////////////////////// -var BOOLEAN_ATTR = {}; -forEach('multiple,selected,checked,disabled,readOnly,required,open'.split(','), function(value) { - BOOLEAN_ATTR[lowercase(value)] = value; -}); -var BOOLEAN_ELEMENTS = {}; -forEach('input,select,option,textarea,button,form,details'.split(','), function(value) { - BOOLEAN_ELEMENTS[value] = true; -}); -var ALIASED_ATTR = { - 'ngMinlength': 'minlength', - 'ngMaxlength': 'maxlength', - 'ngMin': 'min', - 'ngMax': 'max', - 'ngPattern': 'pattern' -}; - -function getBooleanAttrName(element, name) { - // check dom last since we will most likely fail on name - var booleanAttr = BOOLEAN_ATTR[name.toLowerCase()]; - - // booleanAttr is here twice to minimize DOM access - return booleanAttr && BOOLEAN_ELEMENTS[nodeName_(element)] && booleanAttr; -} - -function getAliasedAttrName(element, name) { - var nodeName = element.nodeName; - return (nodeName === 'INPUT' || nodeName === 'TEXTAREA') && ALIASED_ATTR[name]; -} - -forEach({ - data: jqLiteData, - removeData: jqLiteRemoveData -}, function(fn, name) { - JQLite[name] = fn; -}); - -forEach({ - data: jqLiteData, - inheritedData: jqLiteInheritedData, - - scope: function(element) { - // Can't use jqLiteData here directly so we stay compatible with jQuery! - return jqLite.data(element, '$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']); - }, - - isolateScope: function(element) { - // Can't use jqLiteData here directly so we stay compatible with jQuery! - return jqLite.data(element, '$isolateScope') || jqLite.data(element, '$isolateScopeNoTemplate'); - }, - - controller: jqLiteController, - - injector: function(element) { - return jqLiteInheritedData(element, '$injector'); - }, - - removeAttr: function(element, name) { - element.removeAttribute(name); - }, - - hasClass: jqLiteHasClass, - - css: function(element, name, value) { - name = camelCase(name); - - if (isDefined(value)) { - element.style[name] = value; - } else { - return element.style[name]; - } - }, - - attr: function(element, name, value) { - var lowercasedName = lowercase(name); - if (BOOLEAN_ATTR[lowercasedName]) { - if (isDefined(value)) { - if (!!value) { - element[name] = true; - element.setAttribute(name, lowercasedName); - } else { - element[name] = false; - element.removeAttribute(lowercasedName); - } - } else { - return (element[name] || - (element.attributes.getNamedItem(name) || noop).specified) - ? lowercasedName - : undefined; - } - } else if (isDefined(value)) { - element.setAttribute(name, value); - } else if (element.getAttribute) { - // the extra argument "2" is to get the right thing for a.href in IE, see jQuery code - // some elements (e.g. Document) don't have get attribute, so return undefined - var ret = element.getAttribute(name, 2); - // normalize non-existing attributes to undefined (as jQuery) - return ret === null ? undefined : ret; - } - }, - - prop: function(element, name, value) { - if (isDefined(value)) { - element[name] = value; - } else { - return element[name]; - } - }, - - text: (function() { - getText.$dv = ''; - return getText; - - function getText(element, value) { - if (isUndefined(value)) { - var nodeType = element.nodeType; - return (nodeType === NODE_TYPE_ELEMENT || nodeType === NODE_TYPE_TEXT) ? element.textContent : ''; - } - element.textContent = value; - } - })(), - - val: function(element, value) { - if (isUndefined(value)) { - if (element.multiple && nodeName_(element) === 'select') { - var result = []; - forEach(element.options, function(option) { - if (option.selected) { - result.push(option.value || option.text); - } - }); - return result.length === 0 ? null : result; - } - return element.value; - } - element.value = value; - }, - - html: function(element, value) { - if (isUndefined(value)) { - return element.innerHTML; - } - jqLiteDealoc(element, true); - element.innerHTML = value; - }, - - empty: jqLiteEmpty -}, function(fn, name) { - /** - * Properties: writes return selection, reads return first value - */ - JQLite.prototype[name] = function(arg1, arg2) { - var i, key; - var nodeCount = this.length; - - // jqLiteHasClass has only two arguments, but is a getter-only fn, so we need to special-case it - // in a way that survives minification. - // jqLiteEmpty takes no arguments but is a setter. - if (fn !== jqLiteEmpty && - (((fn.length == 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2) === undefined)) { - if (isObject(arg1)) { - - // we are a write, but the object properties are the key/values - for (i = 0; i < nodeCount; i++) { - if (fn === jqLiteData) { - // data() takes the whole object in jQuery - fn(this[i], arg1); - } else { - for (key in arg1) { - fn(this[i], key, arg1[key]); - } - } - } - // return self for chaining - return this; - } else { - // we are a read, so read the first child. - // TODO: do we still need this? - var value = fn.$dv; - // Only if we have $dv do we iterate over all, otherwise it is just the first element. - var jj = (value === undefined) ? Math.min(nodeCount, 1) : nodeCount; - for (var j = 0; j < jj; j++) { - var nodeValue = fn(this[j], arg1, arg2); - value = value ? value + nodeValue : nodeValue; - } - return value; - } - } else { - // we are a write, so apply to all children - for (i = 0; i < nodeCount; i++) { - fn(this[i], arg1, arg2); - } - // return self for chaining - return this; - } - }; -}); - -function createEventHandler(element, events) { - var eventHandler = function(event, type) { - // jQuery specific api - event.isDefaultPrevented = function() { - return event.defaultPrevented; - }; - - var eventFns = events[type || event.type]; - var eventFnsLength = eventFns ? eventFns.length : 0; - - if (!eventFnsLength) return; - - if (isUndefined(event.immediatePropagationStopped)) { - var originalStopImmediatePropagation = event.stopImmediatePropagation; - event.stopImmediatePropagation = function() { - event.immediatePropagationStopped = true; - - if (event.stopPropagation) { - event.stopPropagation(); - } - - if (originalStopImmediatePropagation) { - originalStopImmediatePropagation.call(event); - } - }; - } - - event.isImmediatePropagationStopped = function() { - return event.immediatePropagationStopped === true; - }; - - // Copy event handlers in case event handlers array is modified during execution. - if ((eventFnsLength > 1)) { - eventFns = shallowCopy(eventFns); - } - - for (var i = 0; i < eventFnsLength; i++) { - if (!event.isImmediatePropagationStopped()) { - eventFns[i].call(element, event); - } - } - }; - - // TODO: this is a hack for angularMocks/clearDataCache that makes it possible to deregister all - // events on `element` - eventHandler.elem = element; - return eventHandler; -} - -////////////////////////////////////////// -// Functions iterating traversal. -// These functions chain results into a single -// selector. -////////////////////////////////////////// -forEach({ - removeData: jqLiteRemoveData, - - on: function jqLiteOn(element, type, fn, unsupported) { - if (isDefined(unsupported)) throw jqLiteMinErr('onargs', 'jqLite#on() does not support the `selector` or `eventData` parameters'); - - // Do not add event handlers to non-elements because they will not be cleaned up. - if (!jqLiteAcceptsData(element)) { - return; - } - - var expandoStore = jqLiteExpandoStore(element, true); - var events = expandoStore.events; - var handle = expandoStore.handle; - - if (!handle) { - handle = expandoStore.handle = createEventHandler(element, events); - } - - // http://jsperf.com/string-indexof-vs-split - var types = type.indexOf(' ') >= 0 ? type.split(' ') : [type]; - var i = types.length; - - while (i--) { - type = types[i]; - var eventFns = events[type]; - - if (!eventFns) { - events[type] = []; - - if (type === 'mouseenter' || type === 'mouseleave') { - // Refer to jQuery's implementation of mouseenter & mouseleave - // Read about mouseenter and mouseleave: - // http://www.quirksmode.org/js/events_mouse.html#link8 - - jqLiteOn(element, MOUSE_EVENT_MAP[type], function(event) { - var target = this, related = event.relatedTarget; - // For mousenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if (!related || (related !== target && !target.contains(related))) { - handle(event, type); - } - }); - - } else { - if (type !== '$destroy') { - addEventListenerFn(element, type, handle); - } - } - eventFns = events[type]; - } - eventFns.push(fn); - } - }, - - off: jqLiteOff, - - one: function(element, type, fn) { - element = jqLite(element); - - //add the listener twice so that when it is called - //you can remove the original function and still be - //able to call element.off(ev, fn) normally - element.on(type, function onFn() { - element.off(type, fn); - element.off(type, onFn); - }); - element.on(type, fn); - }, - - replaceWith: function(element, replaceNode) { - var index, parent = element.parentNode; - jqLiteDealoc(element); - forEach(new JQLite(replaceNode), function(node) { - if (index) { - parent.insertBefore(node, index.nextSibling); - } else { - parent.replaceChild(node, element); - } - index = node; - }); - }, - - children: function(element) { - var children = []; - forEach(element.childNodes, function(element) { - if (element.nodeType === NODE_TYPE_ELEMENT) - children.push(element); - }); - return children; - }, - - contents: function(element) { - return element.contentDocument || element.childNodes || []; - }, - - append: function(element, node) { - var nodeType = element.nodeType; - if (nodeType !== NODE_TYPE_ELEMENT && nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT) return; - - node = new JQLite(node); - - for (var i = 0, ii = node.length; i < ii; i++) { - var child = node[i]; - element.appendChild(child); - } - }, - - prepend: function(element, node) { - if (element.nodeType === NODE_TYPE_ELEMENT) { - var index = element.firstChild; - forEach(new JQLite(node), function(child) { - element.insertBefore(child, index); - }); - } - }, - - wrap: function(element, wrapNode) { - wrapNode = jqLite(wrapNode).eq(0).clone()[0]; - var parent = element.parentNode; - if (parent) { - parent.replaceChild(wrapNode, element); - } - wrapNode.appendChild(element); - }, - - remove: jqLiteRemove, - - detach: function(element) { - jqLiteRemove(element, true); - }, - - after: function(element, newElement) { - var index = element, parent = element.parentNode; - newElement = new JQLite(newElement); - - for (var i = 0, ii = newElement.length; i < ii; i++) { - var node = newElement[i]; - parent.insertBefore(node, index.nextSibling); - index = node; - } - }, - - addClass: jqLiteAddClass, - removeClass: jqLiteRemoveClass, - - toggleClass: function(element, selector, condition) { - if (selector) { - forEach(selector.split(' '), function(className) { - var classCondition = condition; - if (isUndefined(classCondition)) { - classCondition = !jqLiteHasClass(element, className); - } - (classCondition ? jqLiteAddClass : jqLiteRemoveClass)(element, className); - }); - } - }, - - parent: function(element) { - var parent = element.parentNode; - return parent && parent.nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT ? parent : null; - }, - - next: function(element) { - return element.nextElementSibling; - }, - - find: function(element, selector) { - if (element.getElementsByTagName) { - return element.getElementsByTagName(selector); - } else { - return []; - } - }, - - clone: jqLiteClone, - - triggerHandler: function(element, event, extraParameters) { - - var dummyEvent, eventFnsCopy, handlerArgs; - var eventName = event.type || event; - var expandoStore = jqLiteExpandoStore(element); - var events = expandoStore && expandoStore.events; - var eventFns = events && events[eventName]; - - if (eventFns) { - // Create a dummy event to pass to the handlers - dummyEvent = { - preventDefault: function() { this.defaultPrevented = true; }, - isDefaultPrevented: function() { return this.defaultPrevented === true; }, - stopImmediatePropagation: function() { this.immediatePropagationStopped = true; }, - isImmediatePropagationStopped: function() { return this.immediatePropagationStopped === true; }, - stopPropagation: noop, - type: eventName, - target: element - }; - - // If a custom event was provided then extend our dummy event with it - if (event.type) { - dummyEvent = extend(dummyEvent, event); - } - - // Copy event handlers in case event handlers array is modified during execution. - eventFnsCopy = shallowCopy(eventFns); - handlerArgs = extraParameters ? [dummyEvent].concat(extraParameters) : [dummyEvent]; - - forEach(eventFnsCopy, function(fn) { - if (!dummyEvent.isImmediatePropagationStopped()) { - fn.apply(element, handlerArgs); - } - }); - } - } -}, function(fn, name) { - /** - * chaining functions - */ - JQLite.prototype[name] = function(arg1, arg2, arg3) { - var value; - - for (var i = 0, ii = this.length; i < ii; i++) { - if (isUndefined(value)) { - value = fn(this[i], arg1, arg2, arg3); - if (isDefined(value)) { - // any function which returns a value needs to be wrapped - value = jqLite(value); - } - } else { - jqLiteAddNodes(value, fn(this[i], arg1, arg2, arg3)); - } - } - return isDefined(value) ? value : this; - }; - - // bind legacy bind/unbind to on/off - JQLite.prototype.bind = JQLite.prototype.on; - JQLite.prototype.unbind = JQLite.prototype.off; -}); - -/** - * Computes a hash of an 'obj'. - * Hash of a: - * string is string - * number is number as string - * object is either result of calling $$hashKey function on the object or uniquely generated id, - * that is also assigned to the $$hashKey property of the object. - * - * @param obj - * @returns {string} hash string such that the same input will have the same hash string. - * The resulting string key is in 'type:hashKey' format. - */ -function hashKey(obj, nextUidFn) { - var key = obj && obj.$$hashKey; - - if (key) { - if (typeof key === 'function') { - key = obj.$$hashKey(); - } - return key; - } - - var objType = typeof obj; - if (objType == 'function' || (objType == 'object' && obj !== null)) { - key = obj.$$hashKey = objType + ':' + (nextUidFn || nextUid)(); - } else { - key = objType + ':' + obj; - } - - return key; -} - -/** - * HashMap which can use objects as keys - */ -function HashMap(array, isolatedUid) { - if (isolatedUid) { - var uid = 0; - this.nextUid = function() { - return ++uid; - }; - } - forEach(array, this.put, this); -} -HashMap.prototype = { - /** - * Store key value pair - * @param key key to store can be any type - * @param value value to store can be any type - */ - put: function(key, value) { - this[hashKey(key, this.nextUid)] = value; - }, - - /** - * @param key - * @returns {Object} the value for the key - */ - get: function(key) { - return this[hashKey(key, this.nextUid)]; - }, - - /** - * Remove the key/value pair - * @param key - */ - remove: function(key) { - var value = this[key = hashKey(key, this.nextUid)]; - delete this[key]; - return value; - } -}; - -/** - * @ngdoc function - * @module ng - * @name angular.injector - * @kind function - * - * @description - * Creates an injector object that can be used for retrieving services as well as for - * dependency injection (see {@link guide/di dependency injection}). - * - * @param {Array.} modules A list of module functions or their aliases. See - * {@link angular.module}. The `ng` module must be explicitly added. - * @param {boolean=} [strictDi=false] Whether the injector should be in strict mode, which - * disallows argument name annotation inference. - * @returns {injector} Injector object. See {@link auto.$injector $injector}. - * - * @example - * Typical usage - * ```js - * // create an injector - * var $injector = angular.injector(['ng']); - * - * // use the injector to kick off your application - * // use the type inference to auto inject arguments, or use implicit injection - * $injector.invoke(function($rootScope, $compile, $document) { - * $compile($document)($rootScope); - * $rootScope.$digest(); - * }); - * ``` - * - * Sometimes you want to get access to the injector of a currently running Angular app - * from outside Angular. Perhaps, you want to inject and compile some markup after the - * application has been bootstrapped. You can do this using the extra `injector()` added - * to JQuery/jqLite elements. See {@link angular.element}. - * - * *This is fairly rare but could be the case if a third party library is injecting the - * markup.* - * - * In the following example a new block of HTML containing a `ng-controller` - * directive is added to the end of the document body by JQuery. We then compile and link - * it into the current AngularJS scope. - * - * ```js - * var $div = $('
      {{content.label}}
      '); - * $(document.body).append($div); - * - * angular.element(document).injector().invoke(function($compile) { - * var scope = angular.element($div).scope(); - * $compile($div)(scope); - * }); - * ``` - */ - - -/** - * @ngdoc module - * @name auto - * @description - * - * Implicit module which gets automatically added to each {@link auto.$injector $injector}. - */ - -var FN_ARGS = /^function\s*[^\(]*\(\s*([^\)]*)\)/m; -var FN_ARG_SPLIT = /,/; -var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/; -var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg; -var $injectorMinErr = minErr('$injector'); - -function anonFn(fn) { - // For anonymous functions, showing at the very least the function signature can help in - // debugging. - var fnText = fn.toString().replace(STRIP_COMMENTS, ''), - args = fnText.match(FN_ARGS); - if (args) { - return 'function(' + (args[1] || '').replace(/[\s\r\n]+/, ' ') + ')'; - } - return 'fn'; -} - -function annotate(fn, strictDi, name) { - var $inject, - fnText, - argDecl, - last; - - if (typeof fn === 'function') { - if (!($inject = fn.$inject)) { - $inject = []; - if (fn.length) { - if (strictDi) { - if (!isString(name) || !name) { - name = fn.name || anonFn(fn); - } - throw $injectorMinErr('strictdi', - '{0} is not using explicit annotation and cannot be invoked in strict mode', name); - } - fnText = fn.toString().replace(STRIP_COMMENTS, ''); - argDecl = fnText.match(FN_ARGS); - forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg) { - arg.replace(FN_ARG, function(all, underscore, name) { - $inject.push(name); - }); - }); - } - fn.$inject = $inject; - } - } else if (isArray(fn)) { - last = fn.length - 1; - assertArgFn(fn[last], 'fn'); - $inject = fn.slice(0, last); - } else { - assertArgFn(fn, 'fn', true); - } - return $inject; -} - -/////////////////////////////////////// - -/** - * @ngdoc service - * @name $injector - * - * @description - * - * `$injector` is used to retrieve object instances as defined by - * {@link auto.$provide provider}, instantiate types, invoke methods, - * and load modules. - * - * The following always holds true: - * - * ```js - * var $injector = angular.injector(); - * expect($injector.get('$injector')).toBe($injector); - * expect($injector.invoke(function($injector) { - * return $injector; - * })).toBe($injector); - * ``` - * - * # Injection Function Annotation - * - * JavaScript does not have annotations, and annotations are needed for dependency injection. The - * following are all valid ways of annotating function with injection arguments and are equivalent. - * - * ```js - * // inferred (only works if code not minified/obfuscated) - * $injector.invoke(function(serviceA){}); - * - * // annotated - * function explicit(serviceA) {}; - * explicit.$inject = ['serviceA']; - * $injector.invoke(explicit); - * - * // inline - * $injector.invoke(['serviceA', function(serviceA){}]); - * ``` - * - * ## Inference - * - * In JavaScript calling `toString()` on a function returns the function definition. The definition - * can then be parsed and the function arguments can be extracted. This method of discovering - * annotations is disallowed when the injector is in strict mode. - * *NOTE:* This does not work with minification, and obfuscation tools since these tools change the - * argument names. - * - * ## `$inject` Annotation - * By adding an `$inject` property onto a function the injection parameters can be specified. - * - * ## Inline - * As an array of injection names, where the last item in the array is the function to call. - */ - -/** - * @ngdoc method - * @name $injector#get - * - * @description - * Return an instance of the service. - * - * @param {string} name The name of the instance to retrieve. - * @return {*} The instance. - */ - -/** - * @ngdoc method - * @name $injector#invoke - * - * @description - * Invoke the method and supply the method arguments from the `$injector`. - * - * @param {!Function} fn The function to invoke. Function parameters are injected according to the - * {@link guide/di $inject Annotation} rules. - * @param {Object=} self The `this` for the invoked method. - * @param {Object=} locals Optional object. If preset then any argument names are read from this - * object first, before the `$injector` is consulted. - * @returns {*} the value returned by the invoked `fn` function. - */ - -/** - * @ngdoc method - * @name $injector#has - * - * @description - * Allows the user to query if the particular service exists. - * - * @param {string} name Name of the service to query. - * @returns {boolean} `true` if injector has given service. - */ - -/** - * @ngdoc method - * @name $injector#instantiate - * @description - * Create a new instance of JS type. The method takes a constructor function, invokes the new - * operator, and supplies all of the arguments to the constructor function as specified by the - * constructor annotation. - * - * @param {Function} Type Annotated constructor function. - * @param {Object=} locals Optional object. If preset then any argument names are read from this - * object first, before the `$injector` is consulted. - * @returns {Object} new instance of `Type`. - */ - -/** - * @ngdoc method - * @name $injector#annotate - * - * @description - * Returns an array of service names which the function is requesting for injection. This API is - * used by the injector to determine which services need to be injected into the function when the - * function is invoked. There are three ways in which the function can be annotated with the needed - * dependencies. - * - * # Argument names - * - * The simplest form is to extract the dependencies from the arguments of the function. This is done - * by converting the function into a string using `toString()` method and extracting the argument - * names. - * ```js - * // Given - * function MyController($scope, $route) { - * // ... - * } - * - * // Then - * expect(injector.annotate(MyController)).toEqual(['$scope', '$route']); - * ``` - * - * You can disallow this method by using strict injection mode. - * - * This method does not work with code minification / obfuscation. For this reason the following - * annotation strategies are supported. - * - * # The `$inject` property - * - * If a function has an `$inject` property and its value is an array of strings, then the strings - * represent names of services to be injected into the function. - * ```js - * // Given - * var MyController = function(obfuscatedScope, obfuscatedRoute) { - * // ... - * } - * // Define function dependencies - * MyController['$inject'] = ['$scope', '$route']; - * - * // Then - * expect(injector.annotate(MyController)).toEqual(['$scope', '$route']); - * ``` - * - * # The array notation - * - * It is often desirable to inline Injected functions and that's when setting the `$inject` property - * is very inconvenient. In these situations using the array notation to specify the dependencies in - * a way that survives minification is a better choice: - * - * ```js - * // We wish to write this (not minification / obfuscation safe) - * injector.invoke(function($compile, $rootScope) { - * // ... - * }); - * - * // We are forced to write break inlining - * var tmpFn = function(obfuscatedCompile, obfuscatedRootScope) { - * // ... - * }; - * tmpFn.$inject = ['$compile', '$rootScope']; - * injector.invoke(tmpFn); - * - * // To better support inline function the inline annotation is supported - * injector.invoke(['$compile', '$rootScope', function(obfCompile, obfRootScope) { - * // ... - * }]); - * - * // Therefore - * expect(injector.annotate( - * ['$compile', '$rootScope', function(obfus_$compile, obfus_$rootScope) {}]) - * ).toEqual(['$compile', '$rootScope']); - * ``` - * - * @param {Function|Array.} fn Function for which dependent service names need to - * be retrieved as described above. - * - * @param {boolean=} [strictDi=false] Disallow argument name annotation inference. - * - * @returns {Array.} The names of the services which the function requires. - */ - - - - -/** - * @ngdoc service - * @name $provide - * - * @description - * - * The {@link auto.$provide $provide} service has a number of methods for registering components - * with the {@link auto.$injector $injector}. Many of these functions are also exposed on - * {@link angular.Module}. - * - * An Angular **service** is a singleton object created by a **service factory**. These **service - * factories** are functions which, in turn, are created by a **service provider**. - * The **service providers** are constructor functions. When instantiated they must contain a - * property called `$get`, which holds the **service factory** function. - * - * When you request a service, the {@link auto.$injector $injector} is responsible for finding the - * correct **service provider**, instantiating it and then calling its `$get` **service factory** - * function to get the instance of the **service**. - * - * Often services have no configuration options and there is no need to add methods to the service - * provider. The provider will be no more than a constructor function with a `$get` property. For - * these cases the {@link auto.$provide $provide} service has additional helper methods to register - * services without specifying a provider. - * - * * {@link auto.$provide#provider provider(provider)} - registers a **service provider** with the - * {@link auto.$injector $injector} - * * {@link auto.$provide#constant constant(obj)} - registers a value/object that can be accessed by - * providers and services. - * * {@link auto.$provide#value value(obj)} - registers a value/object that can only be accessed by - * services, not providers. - * * {@link auto.$provide#factory factory(fn)} - registers a service **factory function**, `fn`, - * that will be wrapped in a **service provider** object, whose `$get` property will contain the - * given factory function. - * * {@link auto.$provide#service service(class)} - registers a **constructor function**, `class` - * that will be wrapped in a **service provider** object, whose `$get` property will instantiate - * a new object using the given constructor function. - * - * See the individual methods for more information and examples. - */ - -/** - * @ngdoc method - * @name $provide#provider - * @description - * - * Register a **provider function** with the {@link auto.$injector $injector}. Provider functions - * are constructor functions, whose instances are responsible for "providing" a factory for a - * service. - * - * Service provider names start with the name of the service they provide followed by `Provider`. - * For example, the {@link ng.$log $log} service has a provider called - * {@link ng.$logProvider $logProvider}. - * - * Service provider objects can have additional methods which allow configuration of the provider - * and its service. Importantly, you can configure what kind of service is created by the `$get` - * method, or how that service will act. For example, the {@link ng.$logProvider $logProvider} has a - * method {@link ng.$logProvider#debugEnabled debugEnabled} - * which lets you specify whether the {@link ng.$log $log} service will log debug messages to the - * console or not. - * - * @param {string} name The name of the instance. NOTE: the provider will be available under `name + - 'Provider'` key. - * @param {(Object|function())} provider If the provider is: - * - * - `Object`: then it should have a `$get` method. The `$get` method will be invoked using - * {@link auto.$injector#invoke $injector.invoke()} when an instance needs to be created. - * - `Constructor`: a new instance of the provider will be created using - * {@link auto.$injector#instantiate $injector.instantiate()}, then treated as `object`. - * - * @returns {Object} registered provider instance - - * @example - * - * The following example shows how to create a simple event tracking service and register it using - * {@link auto.$provide#provider $provide.provider()}. - * - * ```js - * // Define the eventTracker provider - * function EventTrackerProvider() { - * var trackingUrl = '/track'; - * - * // A provider method for configuring where the tracked events should been saved - * this.setTrackingUrl = function(url) { - * trackingUrl = url; - * }; - * - * // The service factory function - * this.$get = ['$http', function($http) { - * var trackedEvents = {}; - * return { - * // Call this to track an event - * event: function(event) { - * var count = trackedEvents[event] || 0; - * count += 1; - * trackedEvents[event] = count; - * return count; - * }, - * // Call this to save the tracked events to the trackingUrl - * save: function() { - * $http.post(trackingUrl, trackedEvents); - * } - * }; - * }]; - * } - * - * describe('eventTracker', function() { - * var postSpy; - * - * beforeEach(module(function($provide) { - * // Register the eventTracker provider - * $provide.provider('eventTracker', EventTrackerProvider); - * })); - * - * beforeEach(module(function(eventTrackerProvider) { - * // Configure eventTracker provider - * eventTrackerProvider.setTrackingUrl('/custom-track'); - * })); - * - * it('tracks events', inject(function(eventTracker) { - * expect(eventTracker.event('login')).toEqual(1); - * expect(eventTracker.event('login')).toEqual(2); - * })); - * - * it('saves to the tracking url', inject(function(eventTracker, $http) { - * postSpy = spyOn($http, 'post'); - * eventTracker.event('login'); - * eventTracker.save(); - * expect(postSpy).toHaveBeenCalled(); - * expect(postSpy.mostRecentCall.args[0]).not.toEqual('/track'); - * expect(postSpy.mostRecentCall.args[0]).toEqual('/custom-track'); - * expect(postSpy.mostRecentCall.args[1]).toEqual({ 'login': 1 }); - * })); - * }); - * ``` - */ - -/** - * @ngdoc method - * @name $provide#factory - * @description - * - * Register a **service factory**, which will be called to return the service instance. - * This is short for registering a service where its provider consists of only a `$get` property, - * which is the given service factory function. - * You should use {@link auto.$provide#factory $provide.factory(getFn)} if you do not need to - * configure your service in a provider. - * - * @param {string} name The name of the instance. - * @param {function()} $getFn The $getFn for the instance creation. Internally this is a short hand - * for `$provide.provider(name, {$get: $getFn})`. - * @returns {Object} registered provider instance - * - * @example - * Here is an example of registering a service - * ```js - * $provide.factory('ping', ['$http', function($http) { - * return function ping() { - * return $http.send('/ping'); - * }; - * }]); - * ``` - * You would then inject and use this service like this: - * ```js - * someModule.controller('Ctrl', ['ping', function(ping) { - * ping(); - * }]); - * ``` - */ - - -/** - * @ngdoc method - * @name $provide#service - * @description - * - * Register a **service constructor**, which will be invoked with `new` to create the service - * instance. - * This is short for registering a service where its provider's `$get` property is the service - * constructor function that will be used to instantiate the service instance. - * - * You should use {@link auto.$provide#service $provide.service(class)} if you define your service - * as a type/class. - * - * @param {string} name The name of the instance. - * @param {Function} constructor A class (constructor function) that will be instantiated. - * @returns {Object} registered provider instance - * - * @example - * Here is an example of registering a service using - * {@link auto.$provide#service $provide.service(class)}. - * ```js - * var Ping = function($http) { - * this.$http = $http; - * }; - * - * Ping.$inject = ['$http']; - * - * Ping.prototype.send = function() { - * return this.$http.get('/ping'); - * }; - * $provide.service('ping', Ping); - * ``` - * You would then inject and use this service like this: - * ```js - * someModule.controller('Ctrl', ['ping', function(ping) { - * ping.send(); - * }]); - * ``` - */ - - -/** - * @ngdoc method - * @name $provide#value - * @description - * - * Register a **value service** with the {@link auto.$injector $injector}, such as a string, a - * number, an array, an object or a function. This is short for registering a service where its - * provider's `$get` property is a factory function that takes no arguments and returns the **value - * service**. - * - * Value services are similar to constant services, except that they cannot be injected into a - * module configuration function (see {@link angular.Module#config}) but they can be overridden by - * an Angular - * {@link auto.$provide#decorator decorator}. - * - * @param {string} name The name of the instance. - * @param {*} value The value. - * @returns {Object} registered provider instance - * - * @example - * Here are some examples of creating value services. - * ```js - * $provide.value('ADMIN_USER', 'admin'); - * - * $provide.value('RoleLookup', { admin: 0, writer: 1, reader: 2 }); - * - * $provide.value('halfOf', function(value) { - * return value / 2; - * }); - * ``` - */ - - -/** - * @ngdoc method - * @name $provide#constant - * @description - * - * Register a **constant service**, such as a string, a number, an array, an object or a function, - * with the {@link auto.$injector $injector}. Unlike {@link auto.$provide#value value} it can be - * injected into a module configuration function (see {@link angular.Module#config}) and it cannot - * be overridden by an Angular {@link auto.$provide#decorator decorator}. - * - * @param {string} name The name of the constant. - * @param {*} value The constant value. - * @returns {Object} registered instance - * - * @example - * Here a some examples of creating constants: - * ```js - * $provide.constant('SHARD_HEIGHT', 306); - * - * $provide.constant('MY_COLOURS', ['red', 'blue', 'grey']); - * - * $provide.constant('double', function(value) { - * return value * 2; - * }); - * ``` - */ - - -/** - * @ngdoc method - * @name $provide#decorator - * @description - * - * Register a **service decorator** with the {@link auto.$injector $injector}. A service decorator - * intercepts the creation of a service, allowing it to override or modify the behaviour of the - * service. The object returned by the decorator may be the original service, or a new service - * object which replaces or wraps and delegates to the original service. - * - * @param {string} name The name of the service to decorate. - * @param {function()} decorator This function will be invoked when the service needs to be - * instantiated and should return the decorated service instance. The function is called using - * the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable. - * Local injection arguments: - * - * * `$delegate` - The original service instance, which can be monkey patched, configured, - * decorated or delegated to. - * - * @example - * Here we decorate the {@link ng.$log $log} service to convert warnings to errors by intercepting - * calls to {@link ng.$log#error $log.warn()}. - * ```js - * $provide.decorator('$log', ['$delegate', function($delegate) { - * $delegate.warn = $delegate.error; - * return $delegate; - * }]); - * ``` - */ - - -function createInjector(modulesToLoad, strictDi) { - strictDi = (strictDi === true); - var INSTANTIATING = {}, - providerSuffix = 'Provider', - path = [], - loadedModules = new HashMap([], true), - providerCache = { - $provide: { - provider: supportObject(provider), - factory: supportObject(factory), - service: supportObject(service), - value: supportObject(value), - constant: supportObject(constant), - decorator: decorator - } - }, - providerInjector = (providerCache.$injector = - createInternalInjector(providerCache, function() { - throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- ')); - })), - instanceCache = {}, - instanceInjector = (instanceCache.$injector = - createInternalInjector(instanceCache, function(servicename) { - var provider = providerInjector.get(servicename + providerSuffix); - return instanceInjector.invoke(provider.$get, provider, undefined, servicename); - })); - - - forEach(loadModules(modulesToLoad), function(fn) { instanceInjector.invoke(fn || noop); }); - - return instanceInjector; - - //////////////////////////////////// - // $provider - //////////////////////////////////// - - function supportObject(delegate) { - return function(key, value) { - if (isObject(key)) { - forEach(key, reverseParams(delegate)); - } else { - return delegate(key, value); - } - }; - } - - function provider(name, provider_) { - assertNotHasOwnProperty(name, 'service'); - if (isFunction(provider_) || isArray(provider_)) { - provider_ = providerInjector.instantiate(provider_); - } - if (!provider_.$get) { - throw $injectorMinErr('pget', "Provider '{0}' must define $get factory method.", name); - } - return providerCache[name + providerSuffix] = provider_; - } - - function enforceReturnValue(name, factory) { - return function enforcedReturnValue() { - var result = instanceInjector.invoke(factory, this, undefined, name); - if (isUndefined(result)) { - throw $injectorMinErr('undef', "Provider '{0}' must return a value from $get factory method.", name); - } - return result; - }; - } - - function factory(name, factoryFn, enforce) { - return provider(name, { - $get: enforce !== false ? enforceReturnValue(name, factoryFn) : factoryFn - }); - } - - function service(name, constructor) { - return factory(name, ['$injector', function($injector) { - return $injector.instantiate(constructor); - }]); - } - - function value(name, val) { return factory(name, valueFn(val), false); } - - function constant(name, value) { - assertNotHasOwnProperty(name, 'constant'); - providerCache[name] = value; - instanceCache[name] = value; - } - - function decorator(serviceName, decorFn) { - var origProvider = providerInjector.get(serviceName + providerSuffix), - orig$get = origProvider.$get; - - origProvider.$get = function() { - var origInstance = instanceInjector.invoke(orig$get, origProvider); - return instanceInjector.invoke(decorFn, null, {$delegate: origInstance}); - }; - } - - //////////////////////////////////// - // Module Loading - //////////////////////////////////// - function loadModules(modulesToLoad) { - var runBlocks = [], moduleFn; - forEach(modulesToLoad, function(module) { - if (loadedModules.get(module)) return; - loadedModules.put(module, true); - - function runInvokeQueue(queue) { - var i, ii; - for (i = 0, ii = queue.length; i < ii; i++) { - var invokeArgs = queue[i], - provider = providerInjector.get(invokeArgs[0]); - - provider[invokeArgs[1]].apply(provider, invokeArgs[2]); - } - } - - try { - if (isString(module)) { - moduleFn = angularModule(module); - runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks); - runInvokeQueue(moduleFn._invokeQueue); - runInvokeQueue(moduleFn._configBlocks); - } else if (isFunction(module)) { - runBlocks.push(providerInjector.invoke(module)); - } else if (isArray(module)) { - runBlocks.push(providerInjector.invoke(module)); - } else { - assertArgFn(module, 'module'); - } - } catch (e) { - if (isArray(module)) { - module = module[module.length - 1]; - } - if (e.message && e.stack && e.stack.indexOf(e.message) == -1) { - // Safari & FF's stack traces don't contain error.message content - // unlike those of Chrome and IE - // So if stack doesn't contain message, we create a new string that contains both. - // Since error.stack is read-only in Safari, I'm overriding e and not e.stack here. - /* jshint -W022 */ - e = e.message + '\n' + e.stack; - } - throw $injectorMinErr('modulerr', "Failed to instantiate module {0} due to:\n{1}", - module, e.stack || e.message || e); - } - }); - return runBlocks; - } - - //////////////////////////////////// - // internal Injector - //////////////////////////////////// - - function createInternalInjector(cache, factory) { - - function getService(serviceName) { - if (cache.hasOwnProperty(serviceName)) { - if (cache[serviceName] === INSTANTIATING) { - throw $injectorMinErr('cdep', 'Circular dependency found: {0}', - serviceName + ' <- ' + path.join(' <- ')); - } - return cache[serviceName]; - } else { - try { - path.unshift(serviceName); - cache[serviceName] = INSTANTIATING; - return cache[serviceName] = factory(serviceName); - } catch (err) { - if (cache[serviceName] === INSTANTIATING) { - delete cache[serviceName]; - } - throw err; - } finally { - path.shift(); - } - } - } - - function invoke(fn, self, locals, serviceName) { - if (typeof locals === 'string') { - serviceName = locals; - locals = null; - } - - var args = [], - $inject = annotate(fn, strictDi, serviceName), - length, i, - key; - - for (i = 0, length = $inject.length; i < length; i++) { - key = $inject[i]; - if (typeof key !== 'string') { - throw $injectorMinErr('itkn', - 'Incorrect injection token! Expected service name as string, got {0}', key); - } - args.push( - locals && locals.hasOwnProperty(key) - ? locals[key] - : getService(key) - ); - } - if (isArray(fn)) { - fn = fn[length]; - } - - // http://jsperf.com/angularjs-invoke-apply-vs-switch - // #5388 - return fn.apply(self, args); - } - - function instantiate(Type, locals, serviceName) { - // Check if Type is annotated and use just the given function at n-1 as parameter - // e.g. someModule.factory('greeter', ['$window', function(renamed$window) {}]); - // Object creation: http://jsperf.com/create-constructor/2 - var instance = Object.create((isArray(Type) ? Type[Type.length - 1] : Type).prototype); - var returnedValue = invoke(Type, instance, locals, serviceName); - - return isObject(returnedValue) || isFunction(returnedValue) ? returnedValue : instance; - } - - return { - invoke: invoke, - instantiate: instantiate, - get: getService, - annotate: annotate, - has: function(name) { - return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name); - } - }; - } -} - -createInjector.$$annotate = annotate; - -/** - * @ngdoc provider - * @name $anchorScrollProvider - * - * @description - * Use `$anchorScrollProvider` to disable automatic scrolling whenever - * {@link ng.$location#hash $location.hash()} changes. - */ -function $AnchorScrollProvider() { - - var autoScrollingEnabled = true; - - /** - * @ngdoc method - * @name $anchorScrollProvider#disableAutoScrolling - * - * @description - * By default, {@link ng.$anchorScroll $anchorScroll()} will automatically detect changes to - * {@link ng.$location#hash $location.hash()} and scroll to the element matching the new hash.
      - * Use this method to disable automatic scrolling. - * - * If automatic scrolling is disabled, one must explicitly call - * {@link ng.$anchorScroll $anchorScroll()} in order to scroll to the element related to the - * current hash. - */ - this.disableAutoScrolling = function() { - autoScrollingEnabled = false; - }; - - /** - * @ngdoc service - * @name $anchorScroll - * @kind function - * @requires $window - * @requires $location - * @requires $rootScope - * - * @description - * When called, it checks the current value of {@link ng.$location#hash $location.hash()} and - * scrolls to the related element, according to the rules specified in the - * [Html5 spec](http://dev.w3.org/html5/spec/Overview.html#the-indicated-part-of-the-document). - * - * It also watches the {@link ng.$location#hash $location.hash()} and automatically scrolls to - * match any anchor whenever it changes. This can be disabled by calling - * {@link ng.$anchorScrollProvider#disableAutoScrolling $anchorScrollProvider.disableAutoScrolling()}. - * - * Additionally, you can use its {@link ng.$anchorScroll#yOffset yOffset} property to specify a - * vertical scroll-offset (either fixed or dynamic). - * - * @property {(number|function|jqLite)} yOffset - * If set, specifies a vertical scroll-offset. This is often useful when there are fixed - * positioned elements at the top of the page, such as navbars, headers etc. - * - * `yOffset` can be specified in various ways: - * - **number**: A fixed number of pixels to be used as offset.

      - * - **function**: A getter function called everytime `$anchorScroll()` is executed. Must return - * a number representing the offset (in pixels).

      - * - **jqLite**: A jqLite/jQuery element to be used for specifying the offset. The distance from - * the top of the page to the element's bottom will be used as offset.
      - * **Note**: The element will be taken into account only as long as its `position` is set to - * `fixed`. This option is useful, when dealing with responsive navbars/headers that adjust - * their height and/or positioning according to the viewport's size. - * - *
      - *
      - * In order for `yOffset` to work properly, scrolling should take place on the document's root and - * not some child element. - *
      - * - * @example - - -
      - Go to bottom - You're at the bottom! -
      -
      - - angular.module('anchorScrollExample', []) - .controller('ScrollController', ['$scope', '$location', '$anchorScroll', - function ($scope, $location, $anchorScroll) { - $scope.gotoBottom = function() { - // set the location.hash to the id of - // the element you wish to scroll to. - $location.hash('bottom'); - - // call $anchorScroll() - $anchorScroll(); - }; - }]); - - - #scrollArea { - height: 280px; - overflow: auto; - } - - #bottom { - display: block; - margin-top: 2000px; - } - -
      - * - *
      - * The example below illustrates the use of a vertical scroll-offset (specified as a fixed value). - * See {@link ng.$anchorScroll#yOffset $anchorScroll.yOffset} for more details. - * - * @example - - - -
      - Anchor {{x}} of 5 -
      -
      - - angular.module('anchorScrollOffsetExample', []) - .run(['$anchorScroll', function($anchorScroll) { - $anchorScroll.yOffset = 50; // always scroll by 50 extra pixels - }]) - .controller('headerCtrl', ['$anchorScroll', '$location', '$scope', - function ($anchorScroll, $location, $scope) { - $scope.gotoAnchor = function(x) { - var newHash = 'anchor' + x; - if ($location.hash() !== newHash) { - // set the $location.hash to `newHash` and - // $anchorScroll will automatically scroll to it - $location.hash('anchor' + x); - } else { - // call $anchorScroll() explicitly, - // since $location.hash hasn't changed - $anchorScroll(); - } - }; - } - ]); - - - body { - padding-top: 50px; - } - - .anchor { - border: 2px dashed DarkOrchid; - padding: 10px 10px 200px 10px; - } - - .fixed-header { - background-color: rgba(0, 0, 0, 0.2); - height: 50px; - position: fixed; - top: 0; left: 0; right: 0; - } - - .fixed-header > a { - display: inline-block; - margin: 5px 15px; - } - -
      - */ - this.$get = ['$window', '$location', '$rootScope', function($window, $location, $rootScope) { - var document = $window.document; - - // Helper function to get first anchor from a NodeList - // (using `Array#some()` instead of `angular#forEach()` since it's more performant - // and working in all supported browsers.) - function getFirstAnchor(list) { - var result = null; - Array.prototype.some.call(list, function(element) { - if (nodeName_(element) === 'a') { - result = element; - return true; - } - }); - return result; - } - - function getYOffset() { - - var offset = scroll.yOffset; - - if (isFunction(offset)) { - offset = offset(); - } else if (isElement(offset)) { - var elem = offset[0]; - var style = $window.getComputedStyle(elem); - if (style.position !== 'fixed') { - offset = 0; - } else { - offset = elem.getBoundingClientRect().bottom; - } - } else if (!isNumber(offset)) { - offset = 0; - } - - return offset; - } - - function scrollTo(elem) { - if (elem) { - elem.scrollIntoView(); - - var offset = getYOffset(); - - if (offset) { - // `offset` is the number of pixels we should scroll UP in order to align `elem` properly. - // This is true ONLY if the call to `elem.scrollIntoView()` initially aligns `elem` at the - // top of the viewport. - // - // IF the number of pixels from the top of `elem` to the end of the page's content is less - // than the height of the viewport, then `elem.scrollIntoView()` will align the `elem` some - // way down the page. - // - // This is often the case for elements near the bottom of the page. - // - // In such cases we do not need to scroll the whole `offset` up, just the difference between - // the top of the element and the offset, which is enough to align the top of `elem` at the - // desired position. - var elemTop = elem.getBoundingClientRect().top; - $window.scrollBy(0, elemTop - offset); - } - } else { - $window.scrollTo(0, 0); - } - } - - function scroll() { - var hash = $location.hash(), elm; - - // empty hash, scroll to the top of the page - if (!hash) scrollTo(null); - - // element with given id - else if ((elm = document.getElementById(hash))) scrollTo(elm); - - // first anchor with given name :-D - else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) scrollTo(elm); - - // no element and hash == 'top', scroll to the top of the page - else if (hash === 'top') scrollTo(null); - } - - // does not scroll when user clicks on anchor link that is currently on - // (no url change, no $location.hash() change), browser native does scroll - if (autoScrollingEnabled) { - $rootScope.$watch(function autoScrollWatch() {return $location.hash();}, - function autoScrollWatchAction(newVal, oldVal) { - // skip the initial scroll if $location.hash is empty - if (newVal === oldVal && newVal === '') return; - - jqLiteDocumentLoaded(function() { - $rootScope.$evalAsync(scroll); - }); - }); - } - - return scroll; - }]; -} - -var $animateMinErr = minErr('$animate'); - -/** - * @ngdoc provider - * @name $animateProvider - * - * @description - * Default implementation of $animate that doesn't perform any animations, instead just - * synchronously performs DOM - * updates and calls done() callbacks. - * - * In order to enable animations the ngAnimate module has to be loaded. - * - * To see the functional implementation check out src/ngAnimate/animate.js - */ -var $AnimateProvider = ['$provide', function($provide) { - - - this.$$selectors = {}; - - - /** - * @ngdoc method - * @name $animateProvider#register - * - * @description - * Registers a new injectable animation factory function. The factory function produces the - * animation object which contains callback functions for each event that is expected to be - * animated. - * - * * `eventFn`: `function(Element, doneFunction)` The element to animate, the `doneFunction` - * must be called once the element animation is complete. If a function is returned then the - * animation service will use this function to cancel the animation whenever a cancel event is - * triggered. - * - * - * ```js - * return { - * eventFn : function(element, done) { - * //code to run the animation - * //once complete, then run done() - * return function cancellationFunction() { - * //code to cancel the animation - * } - * } - * } - * ``` - * - * @param {string} name The name of the animation. - * @param {Function} factory The factory function that will be executed to return the animation - * object. - */ - this.register = function(name, factory) { - var key = name + '-animation'; - if (name && name.charAt(0) != '.') throw $animateMinErr('notcsel', - "Expecting class selector starting with '.' got '{0}'.", name); - this.$$selectors[name.substr(1)] = key; - $provide.factory(key, factory); - }; - - /** - * @ngdoc method - * @name $animateProvider#classNameFilter - * - * @description - * Sets and/or returns the CSS class regular expression that is checked when performing - * an animation. Upon bootstrap the classNameFilter value is not set at all and will - * therefore enable $animate to attempt to perform an animation on any element. - * When setting the classNameFilter value, animations will only be performed on elements - * that successfully match the filter expression. This in turn can boost performance - * for low-powered devices as well as applications containing a lot of structural operations. - * @param {RegExp=} expression The className expression which will be checked against all animations - * @return {RegExp} The current CSS className expression value. If null then there is no expression value - */ - this.classNameFilter = function(expression) { - if (arguments.length === 1) { - this.$$classNameFilter = (expression instanceof RegExp) ? expression : null; - } - return this.$$classNameFilter; - }; - - this.$get = ['$$q', '$$asyncCallback', '$rootScope', function($$q, $$asyncCallback, $rootScope) { - - var currentDefer; - - function runAnimationPostDigest(fn) { - var cancelFn, defer = $$q.defer(); - defer.promise.$$cancelFn = function ngAnimateMaybeCancel() { - cancelFn && cancelFn(); - }; - - $rootScope.$$postDigest(function ngAnimatePostDigest() { - cancelFn = fn(function ngAnimateNotifyComplete() { - defer.resolve(); - }); - }); - - return defer.promise; - } - - function resolveElementClasses(element, classes) { - var toAdd = [], toRemove = []; - - var hasClasses = createMap(); - forEach((element.attr('class') || '').split(/\s+/), function(className) { - hasClasses[className] = true; - }); - - forEach(classes, function(status, className) { - var hasClass = hasClasses[className]; - - // If the most recent class manipulation (via $animate) was to remove the class, and the - // element currently has the class, the class is scheduled for removal. Otherwise, if - // the most recent class manipulation (via $animate) was to add the class, and the - // element does not currently have the class, the class is scheduled to be added. - if (status === false && hasClass) { - toRemove.push(className); - } else if (status === true && !hasClass) { - toAdd.push(className); - } - }); - - return (toAdd.length + toRemove.length) > 0 && - [toAdd.length ? toAdd : null, toRemove.length ? toRemove : null]; - } - - function cachedClassManipulation(cache, classes, op) { - for (var i=0, ii = classes.length; i < ii; ++i) { - var className = classes[i]; - cache[className] = op; - } - } - - function asyncPromise() { - // only serve one instance of a promise in order to save CPU cycles - if (!currentDefer) { - currentDefer = $$q.defer(); - $$asyncCallback(function() { - currentDefer.resolve(); - currentDefer = null; - }); - } - return currentDefer.promise; - } - - function applyStyles(element, options) { - if (angular.isObject(options)) { - var styles = extend(options.from || {}, options.to || {}); - element.css(styles); - } - } - - /** - * - * @ngdoc service - * @name $animate - * @description The $animate service provides rudimentary DOM manipulation functions to - * insert, remove and move elements within the DOM, as well as adding and removing classes. - * This service is the core service used by the ngAnimate $animator service which provides - * high-level animation hooks for CSS and JavaScript. - * - * $animate is available in the AngularJS core, however, the ngAnimate module must be included - * to enable full out animation support. Otherwise, $animate will only perform simple DOM - * manipulation operations. - * - * To learn more about enabling animation support, click here to visit the {@link ngAnimate - * ngAnimate module page} as well as the {@link ngAnimate.$animate ngAnimate $animate service - * page}. - */ - return { - animate: function(element, from, to) { - applyStyles(element, { from: from, to: to }); - return asyncPromise(); - }, - - /** - * - * @ngdoc method - * @name $animate#enter - * @kind function - * @description Inserts the element into the DOM either after the `after` element or - * as the first child within the `parent` element. When the function is called a promise - * is returned that will be resolved at a later time. - * @param {DOMElement} element the element which will be inserted into the DOM - * @param {DOMElement} parent the parent element which will append the element as - * a child (if the after element is not present) - * @param {DOMElement} after the sibling element which will append the element - * after itself - * @param {object=} options an optional collection of styles that will be applied to the element. - * @return {Promise} the animation callback promise - */ - enter: function(element, parent, after, options) { - applyStyles(element, options); - after ? after.after(element) - : parent.prepend(element); - return asyncPromise(); - }, - - /** - * - * @ngdoc method - * @name $animate#leave - * @kind function - * @description Removes the element from the DOM. When the function is called a promise - * is returned that will be resolved at a later time. - * @param {DOMElement} element the element which will be removed from the DOM - * @param {object=} options an optional collection of options that will be applied to the element. - * @return {Promise} the animation callback promise - */ - leave: function(element, options) { - element.remove(); - return asyncPromise(); - }, - - /** - * - * @ngdoc method - * @name $animate#move - * @kind function - * @description Moves the position of the provided element within the DOM to be placed - * either after the `after` element or inside of the `parent` element. When the function - * is called a promise is returned that will be resolved at a later time. - * - * @param {DOMElement} element the element which will be moved around within the - * DOM - * @param {DOMElement} parent the parent element where the element will be - * inserted into (if the after element is not present) - * @param {DOMElement} after the sibling element where the element will be - * positioned next to - * @param {object=} options an optional collection of options that will be applied to the element. - * @return {Promise} the animation callback promise - */ - move: function(element, parent, after, options) { - // Do not remove element before insert. Removing will cause data associated with the - // element to be dropped. Insert will implicitly do the remove. - return this.enter(element, parent, after, options); - }, - - /** - * - * @ngdoc method - * @name $animate#addClass - * @kind function - * @description Adds the provided className CSS class value to the provided element. - * When the function is called a promise is returned that will be resolved at a later time. - * @param {DOMElement} element the element which will have the className value - * added to it - * @param {string} className the CSS class which will be added to the element - * @param {object=} options an optional collection of options that will be applied to the element. - * @return {Promise} the animation callback promise - */ - addClass: function(element, className, options) { - return this.setClass(element, className, [], options); - }, - - $$addClassImmediately: function(element, className, options) { - element = jqLite(element); - className = !isString(className) - ? (isArray(className) ? className.join(' ') : '') - : className; - forEach(element, function(element) { - jqLiteAddClass(element, className); - }); - applyStyles(element, options); - return asyncPromise(); - }, - - /** - * - * @ngdoc method - * @name $animate#removeClass - * @kind function - * @description Removes the provided className CSS class value from the provided element. - * When the function is called a promise is returned that will be resolved at a later time. - * @param {DOMElement} element the element which will have the className value - * removed from it - * @param {string} className the CSS class which will be removed from the element - * @param {object=} options an optional collection of options that will be applied to the element. - * @return {Promise} the animation callback promise - */ - removeClass: function(element, className, options) { - return this.setClass(element, [], className, options); - }, - - $$removeClassImmediately: function(element, className, options) { - element = jqLite(element); - className = !isString(className) - ? (isArray(className) ? className.join(' ') : '') - : className; - forEach(element, function(element) { - jqLiteRemoveClass(element, className); - }); - applyStyles(element, options); - return asyncPromise(); - }, - - /** - * - * @ngdoc method - * @name $animate#setClass - * @kind function - * @description Adds and/or removes the given CSS classes to and from the element. - * When the function is called a promise is returned that will be resolved at a later time. - * @param {DOMElement} element the element which will have its CSS classes changed - * removed from it - * @param {string} add the CSS classes which will be added to the element - * @param {string} remove the CSS class which will be removed from the element - * @param {object=} options an optional collection of options that will be applied to the element. - * @return {Promise} the animation callback promise - */ - setClass: function(element, add, remove, options) { - var self = this; - var STORAGE_KEY = '$$animateClasses'; - var createdCache = false; - element = jqLite(element); - - var cache = element.data(STORAGE_KEY); - if (!cache) { - cache = { - classes: {}, - options: options - }; - createdCache = true; - } else if (options && cache.options) { - cache.options = angular.extend(cache.options || {}, options); - } - - var classes = cache.classes; - - add = isArray(add) ? add : add.split(' '); - remove = isArray(remove) ? remove : remove.split(' '); - cachedClassManipulation(classes, add, true); - cachedClassManipulation(classes, remove, false); - - if (createdCache) { - cache.promise = runAnimationPostDigest(function(done) { - var cache = element.data(STORAGE_KEY); - element.removeData(STORAGE_KEY); - - // in the event that the element is removed before postDigest - // is run then the cache will be undefined and there will be - // no need anymore to add or remove and of the element classes - if (cache) { - var classes = resolveElementClasses(element, cache.classes); - if (classes) { - self.$$setClassImmediately(element, classes[0], classes[1], cache.options); - } - } - - done(); - }); - element.data(STORAGE_KEY, cache); - } - - return cache.promise; - }, - - $$setClassImmediately: function(element, add, remove, options) { - add && this.$$addClassImmediately(element, add); - remove && this.$$removeClassImmediately(element, remove); - applyStyles(element, options); - return asyncPromise(); - }, - - enabled: noop, - cancel: noop - }; - }]; -}]; - -function $$AsyncCallbackProvider() { - this.$get = ['$$rAF', '$timeout', function($$rAF, $timeout) { - return $$rAF.supported - ? function(fn) { return $$rAF(fn); } - : function(fn) { - return $timeout(fn, 0, false); - }; - }]; -} - -/* global stripHash: true */ - -/** - * ! This is a private undocumented service ! - * - * @name $browser - * @requires $log - * @description - * This object has two goals: - * - * - hide all the global state in the browser caused by the window object - * - abstract away all the browser specific features and inconsistencies - * - * For tests we provide {@link ngMock.$browser mock implementation} of the `$browser` - * service, which can be used for convenient testing of the application without the interaction with - * the real browser apis. - */ -/** - * @param {object} window The global window object. - * @param {object} document jQuery wrapped document. - * @param {object} $log window.console or an object with the same interface. - * @param {object} $sniffer $sniffer service - */ -function Browser(window, document, $log, $sniffer) { - var self = this, - rawDocument = document[0], - location = window.location, - history = window.history, - setTimeout = window.setTimeout, - clearTimeout = window.clearTimeout, - pendingDeferIds = {}; - - self.isMock = false; - - var outstandingRequestCount = 0; - var outstandingRequestCallbacks = []; - - // TODO(vojta): remove this temporary api - self.$$completeOutstandingRequest = completeOutstandingRequest; - self.$$incOutstandingRequestCount = function() { outstandingRequestCount++; }; - - /** - * Executes the `fn` function(supports currying) and decrements the `outstandingRequestCallbacks` - * counter. If the counter reaches 0, all the `outstandingRequestCallbacks` are executed. - */ - function completeOutstandingRequest(fn) { - try { - fn.apply(null, sliceArgs(arguments, 1)); - } finally { - outstandingRequestCount--; - if (outstandingRequestCount === 0) { - while (outstandingRequestCallbacks.length) { - try { - outstandingRequestCallbacks.pop()(); - } catch (e) { - $log.error(e); - } - } - } - } - } - - /** - * @private - * Note: this method is used only by scenario runner - * TODO(vojta): prefix this method with $$ ? - * @param {function()} callback Function that will be called when no outstanding request - */ - self.notifyWhenNoOutstandingRequests = function(callback) { - // force browser to execute all pollFns - this is needed so that cookies and other pollers fire - // at some deterministic time in respect to the test runner's actions. Leaving things up to the - // regular poller would result in flaky tests. - forEach(pollFns, function(pollFn) { pollFn(); }); - - if (outstandingRequestCount === 0) { - callback(); - } else { - outstandingRequestCallbacks.push(callback); - } - }; - - ////////////////////////////////////////////////////////////// - // Poll Watcher API - ////////////////////////////////////////////////////////////// - var pollFns = [], - pollTimeout; - - /** - * @name $browser#addPollFn - * - * @param {function()} fn Poll function to add - * - * @description - * Adds a function to the list of functions that poller periodically executes, - * and starts polling if not started yet. - * - * @returns {function()} the added function - */ - self.addPollFn = function(fn) { - if (isUndefined(pollTimeout)) startPoller(100, setTimeout); - pollFns.push(fn); - return fn; - }; - - /** - * @param {number} interval How often should browser call poll functions (ms) - * @param {function()} setTimeout Reference to a real or fake `setTimeout` function. - * - * @description - * Configures the poller to run in the specified intervals, using the specified - * setTimeout fn and kicks it off. - */ - function startPoller(interval, setTimeout) { - (function check() { - forEach(pollFns, function(pollFn) { pollFn(); }); - pollTimeout = setTimeout(check, interval); - })(); - } - - ////////////////////////////////////////////////////////////// - // URL API - ////////////////////////////////////////////////////////////// - - var cachedState, lastHistoryState, - lastBrowserUrl = location.href, - baseElement = document.find('base'), - reloadLocation = null; - - cacheState(); - lastHistoryState = cachedState; - - /** - * @name $browser#url - * - * @description - * GETTER: - * Without any argument, this method just returns current value of location.href. - * - * SETTER: - * With at least one argument, this method sets url to new value. - * If html5 history api supported, pushState/replaceState is used, otherwise - * location.href/location.replace is used. - * Returns its own instance to allow chaining - * - * NOTE: this api is intended for use only by the $location service. Please use the - * {@link ng.$location $location service} to change url. - * - * @param {string} url New url (when used as setter) - * @param {boolean=} replace Should new url replace current history record? - * @param {object=} state object to use with pushState/replaceState - */ - self.url = function(url, replace, state) { - // In modern browsers `history.state` is `null` by default; treating it separately - // from `undefined` would cause `$browser.url('/foo')` to change `history.state` - // to undefined via `pushState`. Instead, let's change `undefined` to `null` here. - if (isUndefined(state)) { - state = null; - } - - // Android Browser BFCache causes location, history reference to become stale. - if (location !== window.location) location = window.location; - if (history !== window.history) history = window.history; - - // setter - if (url) { - var sameState = lastHistoryState === state; - - // Don't change anything if previous and current URLs and states match. This also prevents - // IE<10 from getting into redirect loop when in LocationHashbangInHtml5Url mode. - // See https://github.com/angular/angular.js/commit/ffb2701 - if (lastBrowserUrl === url && (!$sniffer.history || sameState)) { - return self; - } - var sameBase = lastBrowserUrl && stripHash(lastBrowserUrl) === stripHash(url); - lastBrowserUrl = url; - lastHistoryState = state; - // Don't use history API if only the hash changed - // due to a bug in IE10/IE11 which leads - // to not firing a `hashchange` nor `popstate` event - // in some cases (see #9143). - if ($sniffer.history && (!sameBase || !sameState)) { - history[replace ? 'replaceState' : 'pushState'](state, '', url); - cacheState(); - // Do the assignment again so that those two variables are referentially identical. - lastHistoryState = cachedState; - } else { - if (!sameBase) { - reloadLocation = url; - } - if (replace) { - location.replace(url); - } else { - location.href = url; - } - } - return self; - // getter - } else { - // - reloadLocation is needed as browsers don't allow to read out - // the new location.href if a reload happened. - // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172 - return reloadLocation || location.href.replace(/%27/g,"'"); - } - }; - - /** - * @name $browser#state - * - * @description - * This method is a getter. - * - * Return history.state or null if history.state is undefined. - * - * @returns {object} state - */ - self.state = function() { - return cachedState; - }; - - var urlChangeListeners = [], - urlChangeInit = false; - - function cacheStateAndFireUrlChange() { - cacheState(); - fireUrlChange(); - } - - // This variable should be used *only* inside the cacheState function. - var lastCachedState = null; - function cacheState() { - // This should be the only place in $browser where `history.state` is read. - cachedState = window.history.state; - cachedState = isUndefined(cachedState) ? null : cachedState; - - // Prevent callbacks fo fire twice if both hashchange & popstate were fired. - if (equals(cachedState, lastCachedState)) { - cachedState = lastCachedState; - } - lastCachedState = cachedState; - } - - function fireUrlChange() { - if (lastBrowserUrl === self.url() && lastHistoryState === cachedState) { - return; - } - - lastBrowserUrl = self.url(); - lastHistoryState = cachedState; - forEach(urlChangeListeners, function(listener) { - listener(self.url(), cachedState); - }); - } - - /** - * @name $browser#onUrlChange - * - * @description - * Register callback function that will be called, when url changes. - * - * It's only called when the url is changed from outside of angular: - * - user types different url into address bar - * - user clicks on history (forward/back) button - * - user clicks on a link - * - * It's not called when url is changed by $browser.url() method - * - * The listener gets called with new url as parameter. - * - * NOTE: this api is intended for use only by the $location service. Please use the - * {@link ng.$location $location service} to monitor url changes in angular apps. - * - * @param {function(string)} listener Listener function to be called when url changes. - * @return {function(string)} Returns the registered listener fn - handy if the fn is anonymous. - */ - self.onUrlChange = function(callback) { - // TODO(vojta): refactor to use node's syntax for events - if (!urlChangeInit) { - // We listen on both (hashchange/popstate) when available, as some browsers (e.g. Opera) - // don't fire popstate when user change the address bar and don't fire hashchange when url - // changed by push/replaceState - - // html5 history api - popstate event - if ($sniffer.history) jqLite(window).on('popstate', cacheStateAndFireUrlChange); - // hashchange event - jqLite(window).on('hashchange', cacheStateAndFireUrlChange); - - urlChangeInit = true; - } - - urlChangeListeners.push(callback); - return callback; - }; - - /** - * Checks whether the url has changed outside of Angular. - * Needs to be exported to be able to check for changes that have been done in sync, - * as hashchange/popstate events fire in async. - */ - self.$$checkUrlChange = fireUrlChange; - - ////////////////////////////////////////////////////////////// - // Misc API - ////////////////////////////////////////////////////////////// - - /** - * @name $browser#baseHref - * - * @description - * Returns current - * (always relative - without domain) - * - * @returns {string} The current base href - */ - self.baseHref = function() { - var href = baseElement.attr('href'); - return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : ''; - }; - - ////////////////////////////////////////////////////////////// - // Cookies API - ////////////////////////////////////////////////////////////// - var lastCookies = {}; - var lastCookieString = ''; - var cookiePath = self.baseHref(); - - function safeDecodeURIComponent(str) { - try { - return decodeURIComponent(str); - } catch (e) { - return str; - } - } - - /** - * @name $browser#cookies - * - * @param {string=} name Cookie name - * @param {string=} value Cookie value - * - * @description - * The cookies method provides a 'private' low level access to browser cookies. - * It is not meant to be used directly, use the $cookie service instead. - * - * The return values vary depending on the arguments that the method was called with as follows: - * - * - cookies() -> hash of all cookies, this is NOT a copy of the internal state, so do not modify - * it - * - cookies(name, value) -> set name to value, if value is undefined delete the cookie - * - cookies(name) -> the same as (name, undefined) == DELETES (no one calls it right now that - * way) - * - * @returns {Object} Hash of all cookies (if called without any parameter) - */ - self.cookies = function(name, value) { - var cookieLength, cookieArray, cookie, i, index; - - if (name) { - if (value === undefined) { - rawDocument.cookie = encodeURIComponent(name) + "=;path=" + cookiePath + - ";expires=Thu, 01 Jan 1970 00:00:00 GMT"; - } else { - if (isString(value)) { - cookieLength = (rawDocument.cookie = encodeURIComponent(name) + '=' + encodeURIComponent(value) + - ';path=' + cookiePath).length + 1; - - // per http://www.ietf.org/rfc/rfc2109.txt browser must allow at minimum: - // - 300 cookies - // - 20 cookies per unique domain - // - 4096 bytes per cookie - if (cookieLength > 4096) { - $log.warn("Cookie '" + name + - "' possibly not set or overflowed because it was too large (" + - cookieLength + " > 4096 bytes)!"); - } - } - } - } else { - if (rawDocument.cookie !== lastCookieString) { - lastCookieString = rawDocument.cookie; - cookieArray = lastCookieString.split("; "); - lastCookies = {}; - - for (i = 0; i < cookieArray.length; i++) { - cookie = cookieArray[i]; - index = cookie.indexOf('='); - if (index > 0) { //ignore nameless cookies - name = safeDecodeURIComponent(cookie.substring(0, index)); - // the first value that is seen for a cookie is the most - // specific one. values for the same cookie name that - // follow are for less specific paths. - if (lastCookies[name] === undefined) { - lastCookies[name] = safeDecodeURIComponent(cookie.substring(index + 1)); - } - } - } - } - return lastCookies; - } - }; - - - /** - * @name $browser#defer - * @param {function()} fn A function, who's execution should be deferred. - * @param {number=} [delay=0] of milliseconds to defer the function execution. - * @returns {*} DeferId that can be used to cancel the task via `$browser.defer.cancel()`. - * - * @description - * Executes a fn asynchronously via `setTimeout(fn, delay)`. - * - * Unlike when calling `setTimeout` directly, in test this function is mocked and instead of using - * `setTimeout` in tests, the fns are queued in an array, which can be programmatically flushed - * via `$browser.defer.flush()`. - * - */ - self.defer = function(fn, delay) { - var timeoutId; - outstandingRequestCount++; - timeoutId = setTimeout(function() { - delete pendingDeferIds[timeoutId]; - completeOutstandingRequest(fn); - }, delay || 0); - pendingDeferIds[timeoutId] = true; - return timeoutId; - }; - - - /** - * @name $browser#defer.cancel - * - * @description - * Cancels a deferred task identified with `deferId`. - * - * @param {*} deferId Token returned by the `$browser.defer` function. - * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully - * canceled. - */ - self.defer.cancel = function(deferId) { - if (pendingDeferIds[deferId]) { - delete pendingDeferIds[deferId]; - clearTimeout(deferId); - completeOutstandingRequest(noop); - return true; - } - return false; - }; - -} - -function $BrowserProvider() { - this.$get = ['$window', '$log', '$sniffer', '$document', - function($window, $log, $sniffer, $document) { - return new Browser($window, $document, $log, $sniffer); - }]; -} - -/** - * @ngdoc service - * @name $cacheFactory - * - * @description - * Factory that constructs {@link $cacheFactory.Cache Cache} objects and gives access to - * them. - * - * ```js - * - * var cache = $cacheFactory('cacheId'); - * expect($cacheFactory.get('cacheId')).toBe(cache); - * expect($cacheFactory.get('noSuchCacheId')).not.toBeDefined(); - * - * cache.put("key", "value"); - * cache.put("another key", "another value"); - * - * // We've specified no options on creation - * expect(cache.info()).toEqual({id: 'cacheId', size: 2}); - * - * ``` - * - * - * @param {string} cacheId Name or id of the newly created cache. - * @param {object=} options Options object that specifies the cache behavior. Properties: - * - * - `{number=}` `capacity` — turns the cache into LRU cache. - * - * @returns {object} Newly created cache object with the following set of methods: - * - * - `{object}` `info()` — Returns id, size, and options of cache. - * - `{{*}}` `put({string} key, {*} value)` — Puts a new key-value pair into the cache and returns - * it. - * - `{{*}}` `get({string} key)` — Returns cached value for `key` or undefined for cache miss. - * - `{void}` `remove({string} key)` — Removes a key-value pair from the cache. - * - `{void}` `removeAll()` — Removes all cached values. - * - `{void}` `destroy()` — Removes references to this cache from $cacheFactory. - * - * @example - - -
      - - - - -

      Cached Values

      -
      - - : - -
      - -

      Cache Info

      -
      - - : - -
      -
      -
      - - angular.module('cacheExampleApp', []). - controller('CacheController', ['$scope', '$cacheFactory', function($scope, $cacheFactory) { - $scope.keys = []; - $scope.cache = $cacheFactory('cacheId'); - $scope.put = function(key, value) { - if ($scope.cache.get(key) === undefined) { - $scope.keys.push(key); - } - $scope.cache.put(key, value === undefined ? null : value); - }; - }]); - - - p { - margin: 10px 0 3px; - } - -
      - */ -function $CacheFactoryProvider() { - - this.$get = function() { - var caches = {}; - - function cacheFactory(cacheId, options) { - if (cacheId in caches) { - throw minErr('$cacheFactory')('iid', "CacheId '{0}' is already taken!", cacheId); - } - - var size = 0, - stats = extend({}, options, {id: cacheId}), - data = {}, - capacity = (options && options.capacity) || Number.MAX_VALUE, - lruHash = {}, - freshEnd = null, - staleEnd = null; - - /** - * @ngdoc type - * @name $cacheFactory.Cache - * - * @description - * A cache object used to store and retrieve data, primarily used by - * {@link $http $http} and the {@link ng.directive:script script} directive to cache - * templates and other data. - * - * ```js - * angular.module('superCache') - * .factory('superCache', ['$cacheFactory', function($cacheFactory) { - * return $cacheFactory('super-cache'); - * }]); - * ``` - * - * Example test: - * - * ```js - * it('should behave like a cache', inject(function(superCache) { - * superCache.put('key', 'value'); - * superCache.put('another key', 'another value'); - * - * expect(superCache.info()).toEqual({ - * id: 'super-cache', - * size: 2 - * }); - * - * superCache.remove('another key'); - * expect(superCache.get('another key')).toBeUndefined(); - * - * superCache.removeAll(); - * expect(superCache.info()).toEqual({ - * id: 'super-cache', - * size: 0 - * }); - * })); - * ``` - */ - return caches[cacheId] = { - - /** - * @ngdoc method - * @name $cacheFactory.Cache#put - * @kind function - * - * @description - * Inserts a named entry into the {@link $cacheFactory.Cache Cache} object to be - * retrieved later, and incrementing the size of the cache if the key was not already - * present in the cache. If behaving like an LRU cache, it will also remove stale - * entries from the set. - * - * It will not insert undefined values into the cache. - * - * @param {string} key the key under which the cached data is stored. - * @param {*} value the value to store alongside the key. If it is undefined, the key - * will not be stored. - * @returns {*} the value stored. - */ - put: function(key, value) { - if (capacity < Number.MAX_VALUE) { - var lruEntry = lruHash[key] || (lruHash[key] = {key: key}); - - refresh(lruEntry); - } - - if (isUndefined(value)) return; - if (!(key in data)) size++; - data[key] = value; - - if (size > capacity) { - this.remove(staleEnd.key); - } - - return value; - }, - - /** - * @ngdoc method - * @name $cacheFactory.Cache#get - * @kind function - * - * @description - * Retrieves named data stored in the {@link $cacheFactory.Cache Cache} object. - * - * @param {string} key the key of the data to be retrieved - * @returns {*} the value stored. - */ - get: function(key) { - if (capacity < Number.MAX_VALUE) { - var lruEntry = lruHash[key]; - - if (!lruEntry) return; - - refresh(lruEntry); - } - - return data[key]; - }, - - - /** - * @ngdoc method - * @name $cacheFactory.Cache#remove - * @kind function - * - * @description - * Removes an entry from the {@link $cacheFactory.Cache Cache} object. - * - * @param {string} key the key of the entry to be removed - */ - remove: function(key) { - if (capacity < Number.MAX_VALUE) { - var lruEntry = lruHash[key]; - - if (!lruEntry) return; - - if (lruEntry == freshEnd) freshEnd = lruEntry.p; - if (lruEntry == staleEnd) staleEnd = lruEntry.n; - link(lruEntry.n,lruEntry.p); - - delete lruHash[key]; - } - - delete data[key]; - size--; - }, - - - /** - * @ngdoc method - * @name $cacheFactory.Cache#removeAll - * @kind function - * - * @description - * Clears the cache object of any entries. - */ - removeAll: function() { - data = {}; - size = 0; - lruHash = {}; - freshEnd = staleEnd = null; - }, - - - /** - * @ngdoc method - * @name $cacheFactory.Cache#destroy - * @kind function - * - * @description - * Destroys the {@link $cacheFactory.Cache Cache} object entirely, - * removing it from the {@link $cacheFactory $cacheFactory} set. - */ - destroy: function() { - data = null; - stats = null; - lruHash = null; - delete caches[cacheId]; - }, - - - /** - * @ngdoc method - * @name $cacheFactory.Cache#info - * @kind function - * - * @description - * Retrieve information regarding a particular {@link $cacheFactory.Cache Cache}. - * - * @returns {object} an object with the following properties: - *
        - *
      • **id**: the id of the cache instance
      • - *
      • **size**: the number of entries kept in the cache instance
      • - *
      • **...**: any additional properties from the options object when creating the - * cache.
      • - *
      - */ - info: function() { - return extend({}, stats, {size: size}); - } - }; - - - /** - * makes the `entry` the freshEnd of the LRU linked list - */ - function refresh(entry) { - if (entry != freshEnd) { - if (!staleEnd) { - staleEnd = entry; - } else if (staleEnd == entry) { - staleEnd = entry.n; - } - - link(entry.n, entry.p); - link(entry, freshEnd); - freshEnd = entry; - freshEnd.n = null; - } - } - - - /** - * bidirectionally links two entries of the LRU linked list - */ - function link(nextEntry, prevEntry) { - if (nextEntry != prevEntry) { - if (nextEntry) nextEntry.p = prevEntry; //p stands for previous, 'prev' didn't minify - if (prevEntry) prevEntry.n = nextEntry; //n stands for next, 'next' didn't minify - } - } - } - - - /** - * @ngdoc method - * @name $cacheFactory#info - * - * @description - * Get information about all the caches that have been created - * - * @returns {Object} - key-value map of `cacheId` to the result of calling `cache#info` - */ - cacheFactory.info = function() { - var info = {}; - forEach(caches, function(cache, cacheId) { - info[cacheId] = cache.info(); - }); - return info; - }; - - - /** - * @ngdoc method - * @name $cacheFactory#get - * - * @description - * Get access to a cache object by the `cacheId` used when it was created. - * - * @param {string} cacheId Name or id of a cache to access. - * @returns {object} Cache object identified by the cacheId or undefined if no such cache. - */ - cacheFactory.get = function(cacheId) { - return caches[cacheId]; - }; - - - return cacheFactory; - }; -} - -/** - * @ngdoc service - * @name $templateCache - * - * @description - * The first time a template is used, it is loaded in the template cache for quick retrieval. You - * can load templates directly into the cache in a `script` tag, or by consuming the - * `$templateCache` service directly. - * - * Adding via the `script` tag: - * - * ```html - * - * ``` - * - * **Note:** the `script` tag containing the template does not need to be included in the `head` of - * the document, but it must be a descendent of the {@link ng.$rootElement $rootElement} (IE, - * element with ng-app attribute), otherwise the template will be ignored. - * - * Adding via the $templateCache service: - * - * ```js - * var myApp = angular.module('myApp', []); - * myApp.run(function($templateCache) { - * $templateCache.put('templateId.html', 'This is the content of the template'); - * }); - * ``` - * - * To retrieve the template later, simply use it in your HTML: - * ```html - *
      - * ``` - * - * or get it via Javascript: - * ```js - * $templateCache.get('templateId.html') - * ``` - * - * See {@link ng.$cacheFactory $cacheFactory}. - * - */ -function $TemplateCacheProvider() { - this.$get = ['$cacheFactory', function($cacheFactory) { - return $cacheFactory('templates'); - }]; -} - -/* ! VARIABLE/FUNCTION NAMING CONVENTIONS THAT APPLY TO THIS FILE! - * - * DOM-related variables: - * - * - "node" - DOM Node - * - "element" - DOM Element or Node - * - "$node" or "$element" - jqLite-wrapped node or element - * - * - * Compiler related stuff: - * - * - "linkFn" - linking fn of a single directive - * - "nodeLinkFn" - function that aggregates all linking fns for a particular node - * - "childLinkFn" - function that aggregates all linking fns for child nodes of a particular node - * - "compositeLinkFn" - function that aggregates all linking fns for a compilation root (nodeList) - */ - - -/** - * @ngdoc service - * @name $compile - * @kind function - * - * @description - * Compiles an HTML string or DOM into a template and produces a template function, which - * can then be used to link {@link ng.$rootScope.Scope `scope`} and the template together. - * - * The compilation is a process of walking the DOM tree and matching DOM elements to - * {@link ng.$compileProvider#directive directives}. - * - *
      - * **Note:** This document is an in-depth reference of all directive options. - * For a gentle introduction to directives with examples of common use cases, - * see the {@link guide/directive directive guide}. - *
      - * - * ## Comprehensive Directive API - * - * There are many different options for a directive. - * - * The difference resides in the return value of the factory function. - * You can either return a "Directive Definition Object" (see below) that defines the directive properties, - * or just the `postLink` function (all other properties will have the default values). - * - *
      - * **Best Practice:** It's recommended to use the "directive definition object" form. - *
      - * - * Here's an example directive declared with a Directive Definition Object: - * - * ```js - * var myModule = angular.module(...); - * - * myModule.directive('directiveName', function factory(injectables) { - * var directiveDefinitionObject = { - * priority: 0, - * template: '
      ', // or // function(tElement, tAttrs) { ... }, - * // or - * // templateUrl: 'directive.html', // or // function(tElement, tAttrs) { ... }, - * transclude: false, - * restrict: 'A', - * templateNamespace: 'html', - * scope: false, - * controller: function($scope, $element, $attrs, $transclude, otherInjectables) { ... }, - * controllerAs: 'stringAlias', - * require: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'], - * compile: function compile(tElement, tAttrs, transclude) { - * return { - * pre: function preLink(scope, iElement, iAttrs, controller) { ... }, - * post: function postLink(scope, iElement, iAttrs, controller) { ... } - * } - * // or - * // return function postLink( ... ) { ... } - * }, - * // or - * // link: { - * // pre: function preLink(scope, iElement, iAttrs, controller) { ... }, - * // post: function postLink(scope, iElement, iAttrs, controller) { ... } - * // } - * // or - * // link: function postLink( ... ) { ... } - * }; - * return directiveDefinitionObject; - * }); - * ``` - * - *
      - * **Note:** Any unspecified options will use the default value. You can see the default values below. - *
      - * - * Therefore the above can be simplified as: - * - * ```js - * var myModule = angular.module(...); - * - * myModule.directive('directiveName', function factory(injectables) { - * var directiveDefinitionObject = { - * link: function postLink(scope, iElement, iAttrs) { ... } - * }; - * return directiveDefinitionObject; - * // or - * // return function postLink(scope, iElement, iAttrs) { ... } - * }); - * ``` - * - * - * - * ### Directive Definition Object - * - * The directive definition object provides instructions to the {@link ng.$compile - * compiler}. The attributes are: - * - * #### `multiElement` - * When this property is set to true, the HTML compiler will collect DOM nodes between - * nodes with the attributes `directive-name-start` and `directive-name-end`, and group them - * together as the directive elements. It is recomended that this feature be used on directives - * which are not strictly behavioural (such as {@link ngClick}), and which - * do not manipulate or replace child nodes (such as {@link ngInclude}). - * - * #### `priority` - * When there are multiple directives defined on a single DOM element, sometimes it - * is necessary to specify the order in which the directives are applied. The `priority` is used - * to sort the directives before their `compile` functions get called. Priority is defined as a - * number. Directives with greater numerical `priority` are compiled first. Pre-link functions - * are also run in priority order, but post-link functions are run in reverse order. The order - * of directives with the same priority is undefined. The default priority is `0`. - * - * #### `terminal` - * If set to true then the current `priority` will be the last set of directives - * which will execute (any directives at the current priority will still execute - * as the order of execution on same `priority` is undefined). Note that expressions - * and other directives used in the directive's template will also be excluded from execution. - * - * #### `scope` - * **If set to `true`,** then a new scope will be created for this directive. If multiple directives on the - * same element request a new scope, only one new scope is created. The new scope rule does not - * apply for the root of the template since the root of the template always gets a new scope. - * - * **If set to `{}` (object hash),** then a new "isolate" scope is created. The 'isolate' scope differs from - * normal scope in that it does not prototypically inherit from the parent scope. This is useful - * when creating reusable components, which should not accidentally read or modify data in the - * parent scope. - * - * The 'isolate' scope takes an object hash which defines a set of local scope properties - * derived from the parent scope. These local properties are useful for aliasing values for - * templates. Locals definition is a hash of local scope property to its source: - * - * * `@` or `@attr` - bind a local scope property to the value of DOM attribute. The result is - * always a string since DOM attributes are strings. If no `attr` name is specified then the - * attribute name is assumed to be the same as the local name. - * Given `` and widget definition - * of `scope: { localName:'@myAttr' }`, then widget scope property `localName` will reflect - * the interpolated value of `hello {{name}}`. As the `name` attribute changes so will the - * `localName` property on the widget scope. The `name` is read from the parent scope (not - * component scope). - * - * * `=` or `=attr` - set up bi-directional binding between a local scope property and the - * parent scope property of name defined via the value of the `attr` attribute. If no `attr` - * name is specified then the attribute name is assumed to be the same as the local name. - * Given `` and widget definition of - * `scope: { localModel:'=myAttr' }`, then widget scope property `localModel` will reflect the - * value of `parentModel` on the parent scope. Any changes to `parentModel` will be reflected - * in `localModel` and any changes in `localModel` will reflect in `parentModel`. If the parent - * scope property doesn't exist, it will throw a NON_ASSIGNABLE_MODEL_EXPRESSION exception. You - * can avoid this behavior using `=?` or `=?attr` in order to flag the property as optional. If - * you want to shallow watch for changes (i.e. $watchCollection instead of $watch) you can use - * `=*` or `=*attr` (`=*?` or `=*?attr` if the property is optional). - * - * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope. - * If no `attr` name is specified then the attribute name is assumed to be the same as the - * local name. Given `` and widget definition of - * `scope: { localFn:'&myAttr' }`, then isolate scope property `localFn` will point to - * a function wrapper for the `count = count + value` expression. Often it's desirable to - * pass data from the isolated scope via an expression to the parent scope, this can be - * done by passing a map of local variable names and values into the expression wrapper fn. - * For example, if the expression is `increment(amount)` then we can specify the amount value - * by calling the `localFn` as `localFn({amount: 22})`. - * - * - * #### `bindToController` - * When an isolate scope is used for a component (see above), and `controllerAs` is used, `bindToController: true` will - * allow a component to have its properties bound to the controller, rather than to scope. When the controller - * is instantiated, the initial values of the isolate scope bindings are already available. - * - * #### `controller` - * Controller constructor function. The controller is instantiated before the - * pre-linking phase and it is shared with other directives (see - * `require` attribute). This allows the directives to communicate with each other and augment - * each other's behavior. The controller is injectable (and supports bracket notation) with the following locals: - * - * * `$scope` - Current scope associated with the element - * * `$element` - Current element - * * `$attrs` - Current attributes object for the element - * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope: - * `function([scope], cloneLinkingFn, futureParentElement)`. - * * `scope`: optional argument to override the scope. - * * `cloneLinkingFn`: optional argument to create clones of the original transcluded content. - * * `futureParentElement`: - * * defines the parent to which the `cloneLinkingFn` will add the cloned elements. - * * default: `$element.parent()` resp. `$element` for `transclude:'element'` resp. `transclude:true`. - * * only needed for transcludes that are allowed to contain non html elements (e.g. SVG elements) - * and when the `cloneLinkinFn` is passed, - * as those elements need to created and cloned in a special way when they are defined outside their - * usual containers (e.g. like ``). - * * See also the `directive.templateNamespace` property. - * - * - * #### `require` - * Require another directive and inject its controller as the fourth argument to the linking function. The - * `require` takes a string name (or array of strings) of the directive(s) to pass in. If an array is used, the - * injected argument will be an array in corresponding order. If no such directive can be - * found, or if the directive does not have a controller, then an error is raised. The name can be prefixed with: - * - * * (no prefix) - Locate the required controller on the current element. Throw an error if not found. - * * `?` - Attempt to locate the required controller or pass `null` to the `link` fn if not found. - * * `^` - Locate the required controller by searching the element and its parents. Throw an error if not found. - * * `^^` - Locate the required controller by searching the element's parents. Throw an error if not found. - * * `?^` - Attempt to locate the required controller by searching the element and its parents or pass - * `null` to the `link` fn if not found. - * * `?^^` - Attempt to locate the required controller by searching the element's parents, or pass - * `null` to the `link` fn if not found. - * - * - * #### `controllerAs` - * Controller alias at the directive scope. An alias for the controller so it - * can be referenced at the directive template. The directive needs to define a scope for this - * configuration to be used. Useful in the case when directive is used as component. - * - * - * #### `restrict` - * String of subset of `EACM` which restricts the directive to a specific directive - * declaration style. If omitted, the defaults (elements and attributes) are used. - * - * * `E` - Element name (default): `` - * * `A` - Attribute (default): `
      ` - * * `C` - Class: `
      ` - * * `M` - Comment: `` - * - * - * #### `templateNamespace` - * String representing the document type used by the markup in the template. - * AngularJS needs this information as those elements need to be created and cloned - * in a special way when they are defined outside their usual containers like `` and ``. - * - * * `html` - All root nodes in the template are HTML. Root nodes may also be - * top-level elements such as `` or ``. - * * `svg` - The root nodes in the template are SVG elements (excluding ``). - * * `math` - The root nodes in the template are MathML elements (excluding ``). - * - * If no `templateNamespace` is specified, then the namespace is considered to be `html`. - * - * #### `template` - * HTML markup that may: - * * Replace the contents of the directive's element (default). - * * Replace the directive's element itself (if `replace` is true - DEPRECATED). - * * Wrap the contents of the directive's element (if `transclude` is true). - * - * Value may be: - * - * * A string. For example `
      {{delete_str}}
      `. - * * A function which takes two arguments `tElement` and `tAttrs` (described in the `compile` - * function api below) and returns a string value. - * - * - * #### `templateUrl` - * This is similar to `template` but the template is loaded from the specified URL, asynchronously. - * - * Because template loading is asynchronous the compiler will suspend compilation of directives on that element - * for later when the template has been resolved. In the meantime it will continue to compile and link - * sibling and parent elements as though this element had not contained any directives. - * - * The compiler does not suspend the entire compilation to wait for templates to be loaded because this - * would result in the whole app "stalling" until all templates are loaded asynchronously - even in the - * case when only one deeply nested directive has `templateUrl`. - * - * Template loading is asynchronous even if the template has been preloaded into the {@link $templateCache} - * - * You can specify `templateUrl` as a string representing the URL or as a function which takes two - * arguments `tElement` and `tAttrs` (described in the `compile` function api below) and returns - * a string value representing the url. In either case, the template URL is passed through {@link - * $sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}. - * - * - * #### `replace` ([*DEPRECATED*!], will be removed in next major release - i.e. v2.0) - * specify what the template should replace. Defaults to `false`. - * - * * `true` - the template will replace the directive's element. - * * `false` - the template will replace the contents of the directive's element. - * - * The replacement process migrates all of the attributes / classes from the old element to the new - * one. See the {@link guide/directive#template-expanding-directive - * Directives Guide} for an example. - * - * There are very few scenarios where element replacement is required for the application function, - * the main one being reusable custom components that are used within SVG contexts - * (because SVG doesn't work with custom elements in the DOM tree). - * - * #### `transclude` - * Extract the contents of the element where the directive appears and make it available to the directive. - * The contents are compiled and provided to the directive as a **transclusion function**. See the - * {@link $compile#transclusion Transclusion} section below. - * - * There are two kinds of transclusion depending upon whether you want to transclude just the contents of the - * directive's element or the entire element: - * - * * `true` - transclude the content (i.e. the child nodes) of the directive's element. - * * `'element'` - transclude the whole of the directive's element including any directives on this - * element that defined at a lower priority than this directive. When used, the `template` - * property is ignored. - * - * - * #### `compile` - * - * ```js - * function compile(tElement, tAttrs, transclude) { ... } - * ``` - * - * The compile function deals with transforming the template DOM. Since most directives do not do - * template transformation, it is not used often. The compile function takes the following arguments: - * - * * `tElement` - template element - The element where the directive has been declared. It is - * safe to do template transformation on the element and child elements only. - * - * * `tAttrs` - template attributes - Normalized list of attributes declared on this element shared - * between all directive compile functions. - * - * * `transclude` - [*DEPRECATED*!] A transclude linking function: `function(scope, cloneLinkingFn)` - * - *
      - * **Note:** The template instance and the link instance may be different objects if the template has - * been cloned. For this reason it is **not** safe to do anything other than DOM transformations that - * apply to all cloned DOM nodes within the compile function. Specifically, DOM listener registration - * should be done in a linking function rather than in a compile function. - *
      - - *
      - * **Note:** The compile function cannot handle directives that recursively use themselves in their - * own templates or compile functions. Compiling these directives results in an infinite loop and a - * stack overflow errors. - * - * This can be avoided by manually using $compile in the postLink function to imperatively compile - * a directive's template instead of relying on automatic template compilation via `template` or - * `templateUrl` declaration or manual compilation inside the compile function. - *
      - * - *
      - * **Note:** The `transclude` function that is passed to the compile function is deprecated, as it - * e.g. does not know about the right outer scope. Please use the transclude function that is passed - * to the link function instead. - *
      - - * A compile function can have a return value which can be either a function or an object. - * - * * returning a (post-link) function - is equivalent to registering the linking function via the - * `link` property of the config object when the compile function is empty. - * - * * returning an object with function(s) registered via `pre` and `post` properties - allows you to - * control when a linking function should be called during the linking phase. See info about - * pre-linking and post-linking functions below. - * - * - * #### `link` - * This property is used only if the `compile` property is not defined. - * - * ```js - * function link(scope, iElement, iAttrs, controller, transcludeFn) { ... } - * ``` - * - * The link function is responsible for registering DOM listeners as well as updating the DOM. It is - * executed after the template has been cloned. This is where most of the directive logic will be - * put. - * - * * `scope` - {@link ng.$rootScope.Scope Scope} - The scope to be used by the - * directive for registering {@link ng.$rootScope.Scope#$watch watches}. - * - * * `iElement` - instance element - The element where the directive is to be used. It is safe to - * manipulate the children of the element only in `postLink` function since the children have - * already been linked. - * - * * `iAttrs` - instance attributes - Normalized list of attributes declared on this element shared - * between all directive linking functions. - * - * * `controller` - a controller instance - A controller instance if at least one directive on the - * element defines a controller. The controller is shared among all the directives, which allows - * the directives to use the controllers as a communication channel. - * - * * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope. - * This is the same as the `$transclude` - * parameter of directive controllers, see there for details. - * `function([scope], cloneLinkingFn, futureParentElement)`. - * - * #### Pre-linking function - * - * Executed before the child elements are linked. Not safe to do DOM transformation since the - * compiler linking function will fail to locate the correct elements for linking. - * - * #### Post-linking function - * - * Executed after the child elements are linked. - * - * Note that child elements that contain `templateUrl` directives will not have been compiled - * and linked since they are waiting for their template to load asynchronously and their own - * compilation and linking has been suspended until that occurs. - * - * It is safe to do DOM transformation in the post-linking function on elements that are not waiting - * for their async templates to be resolved. - * - * - * ### Transclusion - * - * Transclusion is the process of extracting a collection of DOM element from one part of the DOM and - * copying them to another part of the DOM, while maintaining their connection to the original AngularJS - * scope from where they were taken. - * - * Transclusion is used (often with {@link ngTransclude}) to insert the - * original contents of a directive's element into a specified place in the template of the directive. - * The benefit of transclusion, over simply moving the DOM elements manually, is that the transcluded - * content has access to the properties on the scope from which it was taken, even if the directive - * has isolated scope. - * See the {@link guide/directive#creating-a-directive-that-wraps-other-elements Directives Guide}. - * - * This makes it possible for the widget to have private state for its template, while the transcluded - * content has access to its originating scope. - * - *
      - * **Note:** When testing an element transclude directive you must not place the directive at the root of the - * DOM fragment that is being compiled. See {@link guide/unit-testing#testing-transclusion-directives - * Testing Transclusion Directives}. - *
      - * - * #### Transclusion Functions - * - * When a directive requests transclusion, the compiler extracts its contents and provides a **transclusion - * function** to the directive's `link` function and `controller`. This transclusion function is a special - * **linking function** that will return the compiled contents linked to a new transclusion scope. - * - *
      - * If you are just using {@link ngTransclude} then you don't need to worry about this function, since - * ngTransclude will deal with it for us. - *
      - * - * If you want to manually control the insertion and removal of the transcluded content in your directive - * then you must use this transclude function. When you call a transclude function it returns a a jqLite/JQuery - * object that contains the compiled DOM, which is linked to the correct transclusion scope. - * - * When you call a transclusion function you can pass in a **clone attach function**. This function accepts - * two parameters, `function(clone, scope) { ... }`, where the `clone` is a fresh compiled copy of your transcluded - * content and the `scope` is the newly created transclusion scope, to which the clone is bound. - * - *
      - * **Best Practice**: Always provide a `cloneFn` (clone attach function) when you call a translude function - * since you then get a fresh clone of the original DOM and also have access to the new transclusion scope. - *
      - * - * It is normal practice to attach your transcluded content (`clone`) to the DOM inside your **clone - * attach function**: - * - * ```js - * var transcludedContent, transclusionScope; - * - * $transclude(function(clone, scope) { - * element.append(clone); - * transcludedContent = clone; - * transclusionScope = scope; - * }); - * ``` - * - * Later, if you want to remove the transcluded content from your DOM then you should also destroy the - * associated transclusion scope: - * - * ```js - * transcludedContent.remove(); - * transclusionScope.$destroy(); - * ``` - * - *
      - * **Best Practice**: if you intend to add and remove transcluded content manually in your directive - * (by calling the transclude function to get the DOM and and calling `element.remove()` to remove it), - * then you are also responsible for calling `$destroy` on the transclusion scope. - *
      - * - * The built-in DOM manipulation directives, such as {@link ngIf}, {@link ngSwitch} and {@link ngRepeat} - * automatically destroy their transluded clones as necessary so you do not need to worry about this if - * you are simply using {@link ngTransclude} to inject the transclusion into your directive. - * - * - * #### Transclusion Scopes - * - * When you call a transclude function it returns a DOM fragment that is pre-bound to a **transclusion - * scope**. This scope is special, in that it is a child of the directive's scope (and so gets destroyed - * when the directive's scope gets destroyed) but it inherits the properties of the scope from which it - * was taken. - * - * For example consider a directive that uses transclusion and isolated scope. The DOM hierarchy might look - * like this: - * - * ```html - *
      - *
      - *
      - *
      - *
      - *
      - * ``` - * - * The `$parent` scope hierarchy will look like this: - * - * ``` - * - $rootScope - * - isolate - * - transclusion - * ``` - * - * but the scopes will inherit prototypically from different scopes to their `$parent`. - * - * ``` - * - $rootScope - * - transclusion - * - isolate - * ``` - * - * - * ### Attributes - * - * The {@link ng.$compile.directive.Attributes Attributes} object - passed as a parameter in the - * `link()` or `compile()` functions. It has a variety of uses. - * - * accessing *Normalized attribute names:* - * Directives like 'ngBind' can be expressed in many ways: 'ng:bind', `data-ng-bind`, or 'x-ng-bind'. - * the attributes object allows for normalized access to - * the attributes. - * - * * *Directive inter-communication:* All directives share the same instance of the attributes - * object which allows the directives to use the attributes object as inter directive - * communication. - * - * * *Supports interpolation:* Interpolation attributes are assigned to the attribute object - * allowing other directives to read the interpolated value. - * - * * *Observing interpolated attributes:* Use `$observe` to observe the value changes of attributes - * that contain interpolation (e.g. `src="{{bar}}"`). Not only is this very efficient but it's also - * the only way to easily get the actual value because during the linking phase the interpolation - * hasn't been evaluated yet and so the value is at this time set to `undefined`. - * - * ```js - * function linkingFn(scope, elm, attrs, ctrl) { - * // get the attribute value - * console.log(attrs.ngModel); - * - * // change the attribute - * attrs.$set('ngModel', 'new value'); - * - * // observe changes to interpolated attribute - * attrs.$observe('ngModel', function(value) { - * console.log('ngModel has changed value to ' + value); - * }); - * } - * ``` - * - * ## Example - * - *
      - * **Note**: Typically directives are registered with `module.directive`. The example below is - * to illustrate how `$compile` works. - *
      - * - - - -
      -
      -
      -
      -
      -
      - - it('should auto compile', function() { - var textarea = $('textarea'); - var output = $('div[compile]'); - // The initial state reads 'Hello Angular'. - expect(output.getText()).toBe('Hello Angular'); - textarea.clear(); - textarea.sendKeys('{{name}}!'); - expect(output.getText()).toBe('Angular!'); - }); - -
      - - * - * - * @param {string|DOMElement} element Element or HTML string to compile into a template function. - * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives - DEPRECATED. - * - *
      - * **Note:** Passing a `transclude` function to the $compile function is deprecated, as it - * e.g. will not use the right outer scope. Please pass the transclude function as a - * `parentBoundTranscludeFn` to the link function instead. - *
      - * - * @param {number} maxPriority only apply directives lower than given priority (Only effects the - * root element(s), not their children) - * @returns {function(scope, cloneAttachFn=, options=)} a link function which is used to bind template - * (a DOM element/tree) to a scope. Where: - * - * * `scope` - A {@link ng.$rootScope.Scope Scope} to bind to. - * * `cloneAttachFn` - If `cloneAttachFn` is provided, then the link function will clone the - * `template` and call the `cloneAttachFn` function allowing the caller to attach the - * cloned elements to the DOM document at the appropriate place. The `cloneAttachFn` is - * called as:
      `cloneAttachFn(clonedElement, scope)` where: - * - * * `clonedElement` - is a clone of the original `element` passed into the compiler. - * * `scope` - is the current scope with which the linking function is working with. - * - * * `options` - An optional object hash with linking options. If `options` is provided, then the following - * keys may be used to control linking behavior: - * - * * `parentBoundTranscludeFn` - the transclude function made available to - * directives; if given, it will be passed through to the link functions of - * directives found in `element` during compilation. - * * `transcludeControllers` - an object hash with keys that map controller names - * to controller instances; if given, it will make the controllers - * available to directives. - * * `futureParentElement` - defines the parent to which the `cloneAttachFn` will add - * the cloned elements; only needed for transcludes that are allowed to contain non html - * elements (e.g. SVG elements). See also the directive.controller property. - * - * Calling the linking function returns the element of the template. It is either the original - * element passed in, or the clone of the element if the `cloneAttachFn` is provided. - * - * After linking the view is not updated until after a call to $digest which typically is done by - * Angular automatically. - * - * If you need access to the bound view, there are two ways to do it: - * - * - If you are not asking the linking function to clone the template, create the DOM element(s) - * before you send them to the compiler and keep this reference around. - * ```js - * var element = $compile('

      {{total}}

      ')(scope); - * ``` - * - * - if on the other hand, you need the element to be cloned, the view reference from the original - * example would not point to the clone, but rather to the original template that was cloned. In - * this case, you can access the clone via the cloneAttachFn: - * ```js - * var templateElement = angular.element('

      {{total}}

      '), - * scope = ....; - * - * var clonedElement = $compile(templateElement)(scope, function(clonedElement, scope) { - * //attach the clone to DOM document at the right place - * }); - * - * //now we have reference to the cloned DOM via `clonedElement` - * ``` - * - * - * For information on how the compiler works, see the - * {@link guide/compiler Angular HTML Compiler} section of the Developer Guide. - */ - -var $compileMinErr = minErr('$compile'); - -/** - * @ngdoc provider - * @name $compileProvider - * - * @description - */ -$CompileProvider.$inject = ['$provide', '$$sanitizeUriProvider']; -function $CompileProvider($provide, $$sanitizeUriProvider) { - var hasDirectives = {}, - Suffix = 'Directive', - COMMENT_DIRECTIVE_REGEXP = /^\s*directive\:\s*([\w\-]+)\s+(.*)$/, - CLASS_DIRECTIVE_REGEXP = /(([\w\-]+)(?:\:([^;]+))?;?)/, - ALL_OR_NOTHING_ATTRS = makeMap('ngSrc,ngSrcset,src,srcset'), - REQUIRE_PREFIX_REGEXP = /^(?:(\^\^?)?(\?)?(\^\^?)?)?/; - - // Ref: http://developers.whatwg.org/webappapis.html#event-handler-idl-attributes - // The assumption is that future DOM event attribute names will begin with - // 'on' and be composed of only English letters. - var EVENT_HANDLER_ATTR_REGEXP = /^(on[a-z]+|formaction)$/; - - function parseIsolateBindings(scope, directiveName) { - var LOCAL_REGEXP = /^\s*([@&]|=(\*?))(\??)\s*(\w*)\s*$/; - - var bindings = {}; - - forEach(scope, function(definition, scopeName) { - var match = definition.match(LOCAL_REGEXP); - - if (!match) { - throw $compileMinErr('iscp', - "Invalid isolate scope definition for directive '{0}'." + - " Definition: {... {1}: '{2}' ...}", - directiveName, scopeName, definition); - } - - bindings[scopeName] = { - mode: match[1][0], - collection: match[2] === '*', - optional: match[3] === '?', - attrName: match[4] || scopeName - }; - }); - - return bindings; - } - - /** - * @ngdoc method - * @name $compileProvider#directive - * @kind function - * - * @description - * Register a new directive with the compiler. - * - * @param {string|Object} name Name of the directive in camel-case (i.e. ngBind which - * will match as ng-bind), or an object map of directives where the keys are the - * names and the values are the factories. - * @param {Function|Array} directiveFactory An injectable directive factory function. See - * {@link guide/directive} for more info. - * @returns {ng.$compileProvider} Self for chaining. - */ - this.directive = function registerDirective(name, directiveFactory) { - assertNotHasOwnProperty(name, 'directive'); - if (isString(name)) { - assertArg(directiveFactory, 'directiveFactory'); - if (!hasDirectives.hasOwnProperty(name)) { - hasDirectives[name] = []; - $provide.factory(name + Suffix, ['$injector', '$exceptionHandler', - function($injector, $exceptionHandler) { - var directives = []; - forEach(hasDirectives[name], function(directiveFactory, index) { - try { - var directive = $injector.invoke(directiveFactory); - if (isFunction(directive)) { - directive = { compile: valueFn(directive) }; - } else if (!directive.compile && directive.link) { - directive.compile = valueFn(directive.link); - } - directive.priority = directive.priority || 0; - directive.index = index; - directive.name = directive.name || name; - directive.require = directive.require || (directive.controller && directive.name); - directive.restrict = directive.restrict || 'EA'; - if (isObject(directive.scope)) { - directive.$$isolateBindings = parseIsolateBindings(directive.scope, directive.name); - } - directives.push(directive); - } catch (e) { - $exceptionHandler(e); - } - }); - return directives; - }]); - } - hasDirectives[name].push(directiveFactory); - } else { - forEach(name, reverseParams(registerDirective)); - } - return this; - }; - - - /** - * @ngdoc method - * @name $compileProvider#aHrefSanitizationWhitelist - * @kind function - * - * @description - * Retrieves or overrides the default regular expression that is used for whitelisting of safe - * urls during a[href] sanitization. - * - * The sanitization is a security measure aimed at preventing XSS attacks via html links. - * - * Any url about to be assigned to a[href] via data-binding is first normalized and turned into - * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist` - * regular expression. If a match is found, the original url is written into the dom. Otherwise, - * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. - * - * @param {RegExp=} regexp New regexp to whitelist urls with. - * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for - * chaining otherwise. - */ - this.aHrefSanitizationWhitelist = function(regexp) { - if (isDefined(regexp)) { - $$sanitizeUriProvider.aHrefSanitizationWhitelist(regexp); - return this; - } else { - return $$sanitizeUriProvider.aHrefSanitizationWhitelist(); - } - }; - - - /** - * @ngdoc method - * @name $compileProvider#imgSrcSanitizationWhitelist - * @kind function - * - * @description - * Retrieves or overrides the default regular expression that is used for whitelisting of safe - * urls during img[src] sanitization. - * - * The sanitization is a security measure aimed at prevent XSS attacks via html links. - * - * Any url about to be assigned to img[src] via data-binding is first normalized and turned into - * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist` - * regular expression. If a match is found, the original url is written into the dom. Otherwise, - * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. - * - * @param {RegExp=} regexp New regexp to whitelist urls with. - * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for - * chaining otherwise. - */ - this.imgSrcSanitizationWhitelist = function(regexp) { - if (isDefined(regexp)) { - $$sanitizeUriProvider.imgSrcSanitizationWhitelist(regexp); - return this; - } else { - return $$sanitizeUriProvider.imgSrcSanitizationWhitelist(); - } - }; - - /** - * @ngdoc method - * @name $compileProvider#debugInfoEnabled - * - * @param {boolean=} enabled update the debugInfoEnabled state if provided, otherwise just return the - * current debugInfoEnabled state - * @returns {*} current value if used as getter or itself (chaining) if used as setter - * - * @kind function - * - * @description - * Call this method to enable/disable various debug runtime information in the compiler such as adding - * binding information and a reference to the current scope on to DOM elements. - * If enabled, the compiler will add the following to DOM elements that have been bound to the scope - * * `ng-binding` CSS class - * * `$binding` data property containing an array of the binding expressions - * - * You may want to disable this in production for a significant performance boost. See - * {@link guide/production#disabling-debug-data Disabling Debug Data} for more. - * - * The default value is true. - */ - var debugInfoEnabled = true; - this.debugInfoEnabled = function(enabled) { - if (isDefined(enabled)) { - debugInfoEnabled = enabled; - return this; - } - return debugInfoEnabled; - }; - - this.$get = [ - '$injector', '$interpolate', '$exceptionHandler', '$templateRequest', '$parse', - '$controller', '$rootScope', '$document', '$sce', '$animate', '$$sanitizeUri', - function($injector, $interpolate, $exceptionHandler, $templateRequest, $parse, - $controller, $rootScope, $document, $sce, $animate, $$sanitizeUri) { - - var Attributes = function(element, attributesToCopy) { - if (attributesToCopy) { - var keys = Object.keys(attributesToCopy); - var i, l, key; - - for (i = 0, l = keys.length; i < l; i++) { - key = keys[i]; - this[key] = attributesToCopy[key]; - } - } else { - this.$attr = {}; - } - - this.$$element = element; - }; - - Attributes.prototype = { - $normalize: directiveNormalize, - - - /** - * @ngdoc method - * @name $compile.directive.Attributes#$addClass - * @kind function - * - * @description - * Adds the CSS class value specified by the classVal parameter to the element. If animations - * are enabled then an animation will be triggered for the class addition. - * - * @param {string} classVal The className value that will be added to the element - */ - $addClass: function(classVal) { - if (classVal && classVal.length > 0) { - $animate.addClass(this.$$element, classVal); - } - }, - - /** - * @ngdoc method - * @name $compile.directive.Attributes#$removeClass - * @kind function - * - * @description - * Removes the CSS class value specified by the classVal parameter from the element. If - * animations are enabled then an animation will be triggered for the class removal. - * - * @param {string} classVal The className value that will be removed from the element - */ - $removeClass: function(classVal) { - if (classVal && classVal.length > 0) { - $animate.removeClass(this.$$element, classVal); - } - }, - - /** - * @ngdoc method - * @name $compile.directive.Attributes#$updateClass - * @kind function - * - * @description - * Adds and removes the appropriate CSS class values to the element based on the difference - * between the new and old CSS class values (specified as newClasses and oldClasses). - * - * @param {string} newClasses The current CSS className value - * @param {string} oldClasses The former CSS className value - */ - $updateClass: function(newClasses, oldClasses) { - var toAdd = tokenDifference(newClasses, oldClasses); - if (toAdd && toAdd.length) { - $animate.addClass(this.$$element, toAdd); - } - - var toRemove = tokenDifference(oldClasses, newClasses); - if (toRemove && toRemove.length) { - $animate.removeClass(this.$$element, toRemove); - } - }, - - /** - * Set a normalized attribute on the element in a way such that all directives - * can share the attribute. This function properly handles boolean attributes. - * @param {string} key Normalized key. (ie ngAttribute) - * @param {string|boolean} value The value to set. If `null` attribute will be deleted. - * @param {boolean=} writeAttr If false, does not write the value to DOM element attribute. - * Defaults to true. - * @param {string=} attrName Optional none normalized name. Defaults to key. - */ - $set: function(key, value, writeAttr, attrName) { - // TODO: decide whether or not to throw an error if "class" - //is set through this function since it may cause $updateClass to - //become unstable. - - var node = this.$$element[0], - booleanKey = getBooleanAttrName(node, key), - aliasedKey = getAliasedAttrName(node, key), - observer = key, - nodeName; - - if (booleanKey) { - this.$$element.prop(key, value); - attrName = booleanKey; - } else if (aliasedKey) { - this[aliasedKey] = value; - observer = aliasedKey; - } - - this[key] = value; - - // translate normalized key to actual key - if (attrName) { - this.$attr[key] = attrName; - } else { - attrName = this.$attr[key]; - if (!attrName) { - this.$attr[key] = attrName = snake_case(key, '-'); - } - } - - nodeName = nodeName_(this.$$element); - - if ((nodeName === 'a' && key === 'href') || - (nodeName === 'img' && key === 'src')) { - // sanitize a[href] and img[src] values - this[key] = value = $$sanitizeUri(value, key === 'src'); - } else if (nodeName === 'img' && key === 'srcset') { - // sanitize img[srcset] values - var result = ""; - - // first check if there are spaces because it's not the same pattern - var trimmedSrcset = trim(value); - // ( 999x ,| 999w ,| ,|, ) - var srcPattern = /(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/; - var pattern = /\s/.test(trimmedSrcset) ? srcPattern : /(,)/; - - // split srcset into tuple of uri and descriptor except for the last item - var rawUris = trimmedSrcset.split(pattern); - - // for each tuples - var nbrUrisWith2parts = Math.floor(rawUris.length / 2); - for (var i = 0; i < nbrUrisWith2parts; i++) { - var innerIdx = i * 2; - // sanitize the uri - result += $$sanitizeUri(trim(rawUris[innerIdx]), true); - // add the descriptor - result += (" " + trim(rawUris[innerIdx + 1])); - } - - // split the last item into uri and descriptor - var lastTuple = trim(rawUris[i * 2]).split(/\s/); - - // sanitize the last uri - result += $$sanitizeUri(trim(lastTuple[0]), true); - - // and add the last descriptor if any - if (lastTuple.length === 2) { - result += (" " + trim(lastTuple[1])); - } - this[key] = value = result; - } - - if (writeAttr !== false) { - if (value === null || value === undefined) { - this.$$element.removeAttr(attrName); - } else { - this.$$element.attr(attrName, value); - } - } - - // fire observers - var $$observers = this.$$observers; - $$observers && forEach($$observers[observer], function(fn) { - try { - fn(value); - } catch (e) { - $exceptionHandler(e); - } - }); - }, - - - /** - * @ngdoc method - * @name $compile.directive.Attributes#$observe - * @kind function - * - * @description - * Observes an interpolated attribute. - * - * The observer function will be invoked once during the next `$digest` following - * compilation. The observer is then invoked whenever the interpolated value - * changes. - * - * @param {string} key Normalized key. (ie ngAttribute) . - * @param {function(interpolatedValue)} fn Function that will be called whenever - the interpolated value of the attribute changes. - * See the {@link guide/directive#text-and-attribute-bindings Directives} guide for more info. - * @returns {function()} Returns a deregistration function for this observer. - */ - $observe: function(key, fn) { - var attrs = this, - $$observers = (attrs.$$observers || (attrs.$$observers = createMap())), - listeners = ($$observers[key] || ($$observers[key] = [])); - - listeners.push(fn); - $rootScope.$evalAsync(function() { - if (!listeners.$$inter && attrs.hasOwnProperty(key)) { - // no one registered attribute interpolation function, so lets call it manually - fn(attrs[key]); - } - }); - - return function() { - arrayRemove(listeners, fn); - }; - } - }; - - - function safeAddClass($element, className) { - try { - $element.addClass(className); - } catch (e) { - // ignore, since it means that we are trying to set class on - // SVG element, where class name is read-only. - } - } - - - var startSymbol = $interpolate.startSymbol(), - endSymbol = $interpolate.endSymbol(), - denormalizeTemplate = (startSymbol == '{{' || endSymbol == '}}') - ? identity - : function denormalizeTemplate(template) { - return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol); - }, - NG_ATTR_BINDING = /^ngAttr[A-Z]/; - - compile.$$addBindingInfo = debugInfoEnabled ? function $$addBindingInfo($element, binding) { - var bindings = $element.data('$binding') || []; - - if (isArray(binding)) { - bindings = bindings.concat(binding); - } else { - bindings.push(binding); - } - - $element.data('$binding', bindings); - } : noop; - - compile.$$addBindingClass = debugInfoEnabled ? function $$addBindingClass($element) { - safeAddClass($element, 'ng-binding'); - } : noop; - - compile.$$addScopeInfo = debugInfoEnabled ? function $$addScopeInfo($element, scope, isolated, noTemplate) { - var dataName = isolated ? (noTemplate ? '$isolateScopeNoTemplate' : '$isolateScope') : '$scope'; - $element.data(dataName, scope); - } : noop; - - compile.$$addScopeClass = debugInfoEnabled ? function $$addScopeClass($element, isolated) { - safeAddClass($element, isolated ? 'ng-isolate-scope' : 'ng-scope'); - } : noop; - - return compile; - - //================================ - - function compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, - previousCompileContext) { - if (!($compileNodes instanceof jqLite)) { - // jquery always rewraps, whereas we need to preserve the original selector so that we can - // modify it. - $compileNodes = jqLite($compileNodes); - } - // We can not compile top level text elements since text nodes can be merged and we will - // not be able to attach scope data to them, so we will wrap them in - forEach($compileNodes, function(node, index) { - if (node.nodeType == NODE_TYPE_TEXT && node.nodeValue.match(/\S+/) /* non-empty */ ) { - $compileNodes[index] = jqLite(node).wrap('').parent()[0]; - } - }); - var compositeLinkFn = - compileNodes($compileNodes, transcludeFn, $compileNodes, - maxPriority, ignoreDirective, previousCompileContext); - compile.$$addScopeClass($compileNodes); - var namespace = null; - return function publicLinkFn(scope, cloneConnectFn, options) { - assertArg(scope, 'scope'); - - options = options || {}; - var parentBoundTranscludeFn = options.parentBoundTranscludeFn, - transcludeControllers = options.transcludeControllers, - futureParentElement = options.futureParentElement; - - // When `parentBoundTranscludeFn` is passed, it is a - // `controllersBoundTransclude` function (it was previously passed - // as `transclude` to directive.link) so we must unwrap it to get - // its `boundTranscludeFn` - if (parentBoundTranscludeFn && parentBoundTranscludeFn.$$boundTransclude) { - parentBoundTranscludeFn = parentBoundTranscludeFn.$$boundTransclude; - } - - if (!namespace) { - namespace = detectNamespaceForChildElements(futureParentElement); - } - var $linkNode; - if (namespace !== 'html') { - // When using a directive with replace:true and templateUrl the $compileNodes - // (or a child element inside of them) - // might change, so we need to recreate the namespace adapted compileNodes - // for call to the link function. - // Note: This will already clone the nodes... - $linkNode = jqLite( - wrapTemplate(namespace, jqLite('
      ').append($compileNodes).html()) - ); - } else if (cloneConnectFn) { - // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart - // and sometimes changes the structure of the DOM. - $linkNode = JQLitePrototype.clone.call($compileNodes); - } else { - $linkNode = $compileNodes; - } - - if (transcludeControllers) { - for (var controllerName in transcludeControllers) { - $linkNode.data('$' + controllerName + 'Controller', transcludeControllers[controllerName].instance); - } - } - - compile.$$addScopeInfo($linkNode, scope); - - if (cloneConnectFn) cloneConnectFn($linkNode, scope); - if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode, parentBoundTranscludeFn); - return $linkNode; - }; - } - - function detectNamespaceForChildElements(parentElement) { - // TODO: Make this detect MathML as well... - var node = parentElement && parentElement[0]; - if (!node) { - return 'html'; - } else { - return nodeName_(node) !== 'foreignobject' && node.toString().match(/SVG/) ? 'svg' : 'html'; - } - } - - /** - * Compile function matches each node in nodeList against the directives. Once all directives - * for a particular node are collected their compile functions are executed. The compile - * functions return values - the linking functions - are combined into a composite linking - * function, which is the a linking function for the node. - * - * @param {NodeList} nodeList an array of nodes or NodeList to compile - * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the - * scope argument is auto-generated to the new child of the transcluded parent scope. - * @param {DOMElement=} $rootElement If the nodeList is the root of the compilation tree then - * the rootElement must be set the jqLite collection of the compile root. This is - * needed so that the jqLite collection items can be replaced with widgets. - * @param {number=} maxPriority Max directive priority. - * @returns {Function} A composite linking function of all of the matched directives or null. - */ - function compileNodes(nodeList, transcludeFn, $rootElement, maxPriority, ignoreDirective, - previousCompileContext) { - var linkFns = [], - attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound, nodeLinkFnFound; - - for (var i = 0; i < nodeList.length; i++) { - attrs = new Attributes(); - - // we must always refer to nodeList[i] since the nodes can be replaced underneath us. - directives = collectDirectives(nodeList[i], [], attrs, i === 0 ? maxPriority : undefined, - ignoreDirective); - - nodeLinkFn = (directives.length) - ? applyDirectivesToNode(directives, nodeList[i], attrs, transcludeFn, $rootElement, - null, [], [], previousCompileContext) - : null; - - if (nodeLinkFn && nodeLinkFn.scope) { - compile.$$addScopeClass(attrs.$$element); - } - - childLinkFn = (nodeLinkFn && nodeLinkFn.terminal || - !(childNodes = nodeList[i].childNodes) || - !childNodes.length) - ? null - : compileNodes(childNodes, - nodeLinkFn ? ( - (nodeLinkFn.transcludeOnThisElement || !nodeLinkFn.templateOnThisElement) - && nodeLinkFn.transclude) : transcludeFn); - - if (nodeLinkFn || childLinkFn) { - linkFns.push(i, nodeLinkFn, childLinkFn); - linkFnFound = true; - nodeLinkFnFound = nodeLinkFnFound || nodeLinkFn; - } - - //use the previous context only for the first element in the virtual group - previousCompileContext = null; - } - - // return a linking function if we have found anything, null otherwise - return linkFnFound ? compositeLinkFn : null; - - function compositeLinkFn(scope, nodeList, $rootElement, parentBoundTranscludeFn) { - var nodeLinkFn, childLinkFn, node, childScope, i, ii, idx, childBoundTranscludeFn; - var stableNodeList; - - - if (nodeLinkFnFound) { - // copy nodeList so that if a nodeLinkFn removes or adds an element at this DOM level our - // offsets don't get screwed up - var nodeListLength = nodeList.length; - stableNodeList = new Array(nodeListLength); - - // create a sparse array by only copying the elements which have a linkFn - for (i = 0; i < linkFns.length; i+=3) { - idx = linkFns[i]; - stableNodeList[idx] = nodeList[idx]; - } - } else { - stableNodeList = nodeList; - } - - for (i = 0, ii = linkFns.length; i < ii;) { - node = stableNodeList[linkFns[i++]]; - nodeLinkFn = linkFns[i++]; - childLinkFn = linkFns[i++]; - - if (nodeLinkFn) { - if (nodeLinkFn.scope) { - childScope = scope.$new(); - compile.$$addScopeInfo(jqLite(node), childScope); - } else { - childScope = scope; - } - - if (nodeLinkFn.transcludeOnThisElement) { - childBoundTranscludeFn = createBoundTranscludeFn( - scope, nodeLinkFn.transclude, parentBoundTranscludeFn, - nodeLinkFn.elementTranscludeOnThisElement); - - } else if (!nodeLinkFn.templateOnThisElement && parentBoundTranscludeFn) { - childBoundTranscludeFn = parentBoundTranscludeFn; - - } else if (!parentBoundTranscludeFn && transcludeFn) { - childBoundTranscludeFn = createBoundTranscludeFn(scope, transcludeFn); - - } else { - childBoundTranscludeFn = null; - } - - nodeLinkFn(childLinkFn, childScope, node, $rootElement, childBoundTranscludeFn); - - } else if (childLinkFn) { - childLinkFn(scope, node.childNodes, undefined, parentBoundTranscludeFn); - } - } - } - } - - function createBoundTranscludeFn(scope, transcludeFn, previousBoundTranscludeFn, elementTransclusion) { - - var boundTranscludeFn = function(transcludedScope, cloneFn, controllers, futureParentElement, containingScope) { - - if (!transcludedScope) { - transcludedScope = scope.$new(false, containingScope); - transcludedScope.$$transcluded = true; - } - - return transcludeFn(transcludedScope, cloneFn, { - parentBoundTranscludeFn: previousBoundTranscludeFn, - transcludeControllers: controllers, - futureParentElement: futureParentElement - }); - }; - - return boundTranscludeFn; - } - - /** - * Looks for directives on the given node and adds them to the directive collection which is - * sorted. - * - * @param node Node to search. - * @param directives An array to which the directives are added to. This array is sorted before - * the function returns. - * @param attrs The shared attrs object which is used to populate the normalized attributes. - * @param {number=} maxPriority Max directive priority. - */ - function collectDirectives(node, directives, attrs, maxPriority, ignoreDirective) { - var nodeType = node.nodeType, - attrsMap = attrs.$attr, - match, - className; - - switch (nodeType) { - case NODE_TYPE_ELEMENT: /* Element */ - // use the node name: - addDirective(directives, - directiveNormalize(nodeName_(node)), 'E', maxPriority, ignoreDirective); - - // iterate over the attributes - for (var attr, name, nName, ngAttrName, value, isNgAttr, nAttrs = node.attributes, - j = 0, jj = nAttrs && nAttrs.length; j < jj; j++) { - var attrStartName = false; - var attrEndName = false; - - attr = nAttrs[j]; - name = attr.name; - value = trim(attr.value); - - // support ngAttr attribute binding - ngAttrName = directiveNormalize(name); - if (isNgAttr = NG_ATTR_BINDING.test(ngAttrName)) { - name = snake_case(ngAttrName.substr(6), '-'); - } - - var directiveNName = ngAttrName.replace(/(Start|End)$/, ''); - if (directiveIsMultiElement(directiveNName)) { - if (ngAttrName === directiveNName + 'Start') { - attrStartName = name; - attrEndName = name.substr(0, name.length - 5) + 'end'; - name = name.substr(0, name.length - 6); - } - } - - nName = directiveNormalize(name.toLowerCase()); - attrsMap[nName] = name; - if (isNgAttr || !attrs.hasOwnProperty(nName)) { - attrs[nName] = value; - if (getBooleanAttrName(node, nName)) { - attrs[nName] = true; // presence means true - } - } - addAttrInterpolateDirective(node, directives, value, nName, isNgAttr); - addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName, - attrEndName); - } - - // use class as directive - className = node.className; - if (isString(className) && className !== '') { - while (match = CLASS_DIRECTIVE_REGEXP.exec(className)) { - nName = directiveNormalize(match[2]); - if (addDirective(directives, nName, 'C', maxPriority, ignoreDirective)) { - attrs[nName] = trim(match[3]); - } - className = className.substr(match.index + match[0].length); - } - } - break; - case NODE_TYPE_TEXT: /* Text Node */ - addTextInterpolateDirective(directives, node.nodeValue); - break; - case NODE_TYPE_COMMENT: /* Comment */ - try { - match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue); - if (match) { - nName = directiveNormalize(match[1]); - if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) { - attrs[nName] = trim(match[2]); - } - } - } catch (e) { - // turns out that under some circumstances IE9 throws errors when one attempts to read - // comment's node value. - // Just ignore it and continue. (Can't seem to reproduce in test case.) - } - break; - } - - directives.sort(byPriority); - return directives; - } - - /** - * Given a node with an directive-start it collects all of the siblings until it finds - * directive-end. - * @param node - * @param attrStart - * @param attrEnd - * @returns {*} - */ - function groupScan(node, attrStart, attrEnd) { - var nodes = []; - var depth = 0; - if (attrStart && node.hasAttribute && node.hasAttribute(attrStart)) { - do { - if (!node) { - throw $compileMinErr('uterdir', - "Unterminated attribute, found '{0}' but no matching '{1}' found.", - attrStart, attrEnd); - } - if (node.nodeType == NODE_TYPE_ELEMENT) { - if (node.hasAttribute(attrStart)) depth++; - if (node.hasAttribute(attrEnd)) depth--; - } - nodes.push(node); - node = node.nextSibling; - } while (depth > 0); - } else { - nodes.push(node); - } - - return jqLite(nodes); - } - - /** - * Wrapper for linking function which converts normal linking function into a grouped - * linking function. - * @param linkFn - * @param attrStart - * @param attrEnd - * @returns {Function} - */ - function groupElementsLinkFnWrapper(linkFn, attrStart, attrEnd) { - return function(scope, element, attrs, controllers, transcludeFn) { - element = groupScan(element[0], attrStart, attrEnd); - return linkFn(scope, element, attrs, controllers, transcludeFn); - }; - } - - /** - * Once the directives have been collected, their compile functions are executed. This method - * is responsible for inlining directive templates as well as terminating the application - * of the directives if the terminal directive has been reached. - * - * @param {Array} directives Array of collected directives to execute their compile function. - * this needs to be pre-sorted by priority order. - * @param {Node} compileNode The raw DOM node to apply the compile functions to - * @param {Object} templateAttrs The shared attribute function - * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the - * scope argument is auto-generated to the new - * child of the transcluded parent scope. - * @param {JQLite} jqCollection If we are working on the root of the compile tree then this - * argument has the root jqLite array so that we can replace nodes - * on it. - * @param {Object=} originalReplaceDirective An optional directive that will be ignored when - * compiling the transclusion. - * @param {Array.} preLinkFns - * @param {Array.} postLinkFns - * @param {Object} previousCompileContext Context used for previous compilation of the current - * node - * @returns {Function} linkFn - */ - function applyDirectivesToNode(directives, compileNode, templateAttrs, transcludeFn, - jqCollection, originalReplaceDirective, preLinkFns, postLinkFns, - previousCompileContext) { - previousCompileContext = previousCompileContext || {}; - - var terminalPriority = -Number.MAX_VALUE, - newScopeDirective, - controllerDirectives = previousCompileContext.controllerDirectives, - controllers, - newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective, - templateDirective = previousCompileContext.templateDirective, - nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective, - hasTranscludeDirective = false, - hasTemplate = false, - hasElementTranscludeDirective = previousCompileContext.hasElementTranscludeDirective, - $compileNode = templateAttrs.$$element = jqLite(compileNode), - directive, - directiveName, - $template, - replaceDirective = originalReplaceDirective, - childTranscludeFn = transcludeFn, - linkFn, - directiveValue; - - // executes all directives on the current element - for (var i = 0, ii = directives.length; i < ii; i++) { - directive = directives[i]; - var attrStart = directive.$$start; - var attrEnd = directive.$$end; - - // collect multiblock sections - if (attrStart) { - $compileNode = groupScan(compileNode, attrStart, attrEnd); - } - $template = undefined; - - if (terminalPriority > directive.priority) { - break; // prevent further processing of directives - } - - if (directiveValue = directive.scope) { - - // skip the check for directives with async templates, we'll check the derived sync - // directive when the template arrives - if (!directive.templateUrl) { - if (isObject(directiveValue)) { - // This directive is trying to add an isolated scope. - // Check that there is no scope of any kind already - assertNoDuplicate('new/isolated scope', newIsolateScopeDirective || newScopeDirective, - directive, $compileNode); - newIsolateScopeDirective = directive; - } else { - // This directive is trying to add a child scope. - // Check that there is no isolated scope already - assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive, - $compileNode); - } - } - - newScopeDirective = newScopeDirective || directive; - } - - directiveName = directive.name; - - if (!directive.templateUrl && directive.controller) { - directiveValue = directive.controller; - controllerDirectives = controllerDirectives || {}; - assertNoDuplicate("'" + directiveName + "' controller", - controllerDirectives[directiveName], directive, $compileNode); - controllerDirectives[directiveName] = directive; - } - - if (directiveValue = directive.transclude) { - hasTranscludeDirective = true; - - // Special case ngIf and ngRepeat so that we don't complain about duplicate transclusion. - // This option should only be used by directives that know how to safely handle element transclusion, - // where the transcluded nodes are added or replaced after linking. - if (!directive.$$tlb) { - assertNoDuplicate('transclusion', nonTlbTranscludeDirective, directive, $compileNode); - nonTlbTranscludeDirective = directive; - } - - if (directiveValue == 'element') { - hasElementTranscludeDirective = true; - terminalPriority = directive.priority; - $template = $compileNode; - $compileNode = templateAttrs.$$element = - jqLite(document.createComment(' ' + directiveName + ': ' + - templateAttrs[directiveName] + ' ')); - compileNode = $compileNode[0]; - replaceWith(jqCollection, sliceArgs($template), compileNode); - - childTranscludeFn = compile($template, transcludeFn, terminalPriority, - replaceDirective && replaceDirective.name, { - // Don't pass in: - // - controllerDirectives - otherwise we'll create duplicates controllers - // - newIsolateScopeDirective or templateDirective - combining templates with - // element transclusion doesn't make sense. - // - // We need only nonTlbTranscludeDirective so that we prevent putting transclusion - // on the same element more than once. - nonTlbTranscludeDirective: nonTlbTranscludeDirective - }); - } else { - $template = jqLite(jqLiteClone(compileNode)).contents(); - $compileNode.empty(); // clear contents - childTranscludeFn = compile($template, transcludeFn); - } - } - - if (directive.template) { - hasTemplate = true; - assertNoDuplicate('template', templateDirective, directive, $compileNode); - templateDirective = directive; - - directiveValue = (isFunction(directive.template)) - ? directive.template($compileNode, templateAttrs) - : directive.template; - - directiveValue = denormalizeTemplate(directiveValue); - - if (directive.replace) { - replaceDirective = directive; - if (jqLiteIsTextNode(directiveValue)) { - $template = []; - } else { - $template = removeComments(wrapTemplate(directive.templateNamespace, trim(directiveValue))); - } - compileNode = $template[0]; - - if ($template.length != 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) { - throw $compileMinErr('tplrt', - "Template for directive '{0}' must have exactly one root element. {1}", - directiveName, ''); - } - - replaceWith(jqCollection, $compileNode, compileNode); - - var newTemplateAttrs = {$attr: {}}; - - // combine directives from the original node and from the template: - // - take the array of directives for this element - // - split it into two parts, those that already applied (processed) and those that weren't (unprocessed) - // - collect directives from the template and sort them by priority - // - combine directives as: processed + template + unprocessed - var templateDirectives = collectDirectives(compileNode, [], newTemplateAttrs); - var unprocessedDirectives = directives.splice(i + 1, directives.length - (i + 1)); - - if (newIsolateScopeDirective) { - markDirectivesAsIsolate(templateDirectives); - } - directives = directives.concat(templateDirectives).concat(unprocessedDirectives); - mergeTemplateAttributes(templateAttrs, newTemplateAttrs); - - ii = directives.length; - } else { - $compileNode.html(directiveValue); - } - } - - if (directive.templateUrl) { - hasTemplate = true; - assertNoDuplicate('template', templateDirective, directive, $compileNode); - templateDirective = directive; - - if (directive.replace) { - replaceDirective = directive; - } - - nodeLinkFn = compileTemplateUrl(directives.splice(i, directives.length - i), $compileNode, - templateAttrs, jqCollection, hasTranscludeDirective && childTranscludeFn, preLinkFns, postLinkFns, { - controllerDirectives: controllerDirectives, - newIsolateScopeDirective: newIsolateScopeDirective, - templateDirective: templateDirective, - nonTlbTranscludeDirective: nonTlbTranscludeDirective - }); - ii = directives.length; - } else if (directive.compile) { - try { - linkFn = directive.compile($compileNode, templateAttrs, childTranscludeFn); - if (isFunction(linkFn)) { - addLinkFns(null, linkFn, attrStart, attrEnd); - } else if (linkFn) { - addLinkFns(linkFn.pre, linkFn.post, attrStart, attrEnd); - } - } catch (e) { - $exceptionHandler(e, startingTag($compileNode)); - } - } - - if (directive.terminal) { - nodeLinkFn.terminal = true; - terminalPriority = Math.max(terminalPriority, directive.priority); - } - - } - - nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true; - nodeLinkFn.transcludeOnThisElement = hasTranscludeDirective; - nodeLinkFn.elementTranscludeOnThisElement = hasElementTranscludeDirective; - nodeLinkFn.templateOnThisElement = hasTemplate; - nodeLinkFn.transclude = childTranscludeFn; - - previousCompileContext.hasElementTranscludeDirective = hasElementTranscludeDirective; - - // might be normal or delayed nodeLinkFn depending on if templateUrl is present - return nodeLinkFn; - - //////////////////// - - function addLinkFns(pre, post, attrStart, attrEnd) { - if (pre) { - if (attrStart) pre = groupElementsLinkFnWrapper(pre, attrStart, attrEnd); - pre.require = directive.require; - pre.directiveName = directiveName; - if (newIsolateScopeDirective === directive || directive.$$isolateScope) { - pre = cloneAndAnnotateFn(pre, {isolateScope: true}); - } - preLinkFns.push(pre); - } - if (post) { - if (attrStart) post = groupElementsLinkFnWrapper(post, attrStart, attrEnd); - post.require = directive.require; - post.directiveName = directiveName; - if (newIsolateScopeDirective === directive || directive.$$isolateScope) { - post = cloneAndAnnotateFn(post, {isolateScope: true}); - } - postLinkFns.push(post); - } - } - - - function getControllers(directiveName, require, $element, elementControllers) { - var value, retrievalMethod = 'data', optional = false; - var $searchElement = $element; - var match; - if (isString(require)) { - match = require.match(REQUIRE_PREFIX_REGEXP); - require = require.substring(match[0].length); - - if (match[3]) { - if (match[1]) match[3] = null; - else match[1] = match[3]; - } - if (match[1] === '^') { - retrievalMethod = 'inheritedData'; - } else if (match[1] === '^^') { - retrievalMethod = 'inheritedData'; - $searchElement = $element.parent(); - } - if (match[2] === '?') { - optional = true; - } - - value = null; - - if (elementControllers && retrievalMethod === 'data') { - if (value = elementControllers[require]) { - value = value.instance; - } - } - value = value || $searchElement[retrievalMethod]('$' + require + 'Controller'); - - if (!value && !optional) { - throw $compileMinErr('ctreq', - "Controller '{0}', required by directive '{1}', can't be found!", - require, directiveName); - } - return value || null; - } else if (isArray(require)) { - value = []; - forEach(require, function(require) { - value.push(getControllers(directiveName, require, $element, elementControllers)); - }); - } - return value; - } - - - function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn) { - var i, ii, linkFn, controller, isolateScope, elementControllers, transcludeFn, $element, - attrs; - - if (compileNode === linkNode) { - attrs = templateAttrs; - $element = templateAttrs.$$element; - } else { - $element = jqLite(linkNode); - attrs = new Attributes($element, templateAttrs); - } - - if (newIsolateScopeDirective) { - isolateScope = scope.$new(true); - } - - if (boundTranscludeFn) { - // track `boundTranscludeFn` so it can be unwrapped if `transcludeFn` - // is later passed as `parentBoundTranscludeFn` to `publicLinkFn` - transcludeFn = controllersBoundTransclude; - transcludeFn.$$boundTransclude = boundTranscludeFn; - } - - if (controllerDirectives) { - // TODO: merge `controllers` and `elementControllers` into single object. - controllers = {}; - elementControllers = {}; - forEach(controllerDirectives, function(directive) { - var locals = { - $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope, - $element: $element, - $attrs: attrs, - $transclude: transcludeFn - }, controllerInstance; - - controller = directive.controller; - if (controller == '@') { - controller = attrs[directive.name]; - } - - controllerInstance = $controller(controller, locals, true, directive.controllerAs); - - // For directives with element transclusion the element is a comment, - // but jQuery .data doesn't support attaching data to comment nodes as it's hard to - // clean up (http://bugs.jquery.com/ticket/8335). - // Instead, we save the controllers for the element in a local hash and attach to .data - // later, once we have the actual element. - elementControllers[directive.name] = controllerInstance; - if (!hasElementTranscludeDirective) { - $element.data('$' + directive.name + 'Controller', controllerInstance.instance); - } - - controllers[directive.name] = controllerInstance; - }); - } - - if (newIsolateScopeDirective) { - compile.$$addScopeInfo($element, isolateScope, true, !(templateDirective && (templateDirective === newIsolateScopeDirective || - templateDirective === newIsolateScopeDirective.$$originalDirective))); - compile.$$addScopeClass($element, true); - - var isolateScopeController = controllers && controllers[newIsolateScopeDirective.name]; - var isolateBindingContext = isolateScope; - if (isolateScopeController && isolateScopeController.identifier && - newIsolateScopeDirective.bindToController === true) { - isolateBindingContext = isolateScopeController.instance; - } - - forEach(isolateScope.$$isolateBindings = newIsolateScopeDirective.$$isolateBindings, function(definition, scopeName) { - var attrName = definition.attrName, - optional = definition.optional, - mode = definition.mode, // @, =, or & - lastValue, - parentGet, parentSet, compare; - - switch (mode) { - - case '@': - attrs.$observe(attrName, function(value) { - isolateBindingContext[scopeName] = value; - }); - attrs.$$observers[attrName].$$scope = scope; - if (attrs[attrName]) { - // If the attribute has been provided then we trigger an interpolation to ensure - // the value is there for use in the link fn - isolateBindingContext[scopeName] = $interpolate(attrs[attrName])(scope); - } - break; - - case '=': - if (optional && !attrs[attrName]) { - return; - } - parentGet = $parse(attrs[attrName]); - if (parentGet.literal) { - compare = equals; - } else { - compare = function(a, b) { return a === b || (a !== a && b !== b); }; - } - parentSet = parentGet.assign || function() { - // reset the change, or we will throw this exception on every $digest - lastValue = isolateBindingContext[scopeName] = parentGet(scope); - throw $compileMinErr('nonassign', - "Expression '{0}' used with directive '{1}' is non-assignable!", - attrs[attrName], newIsolateScopeDirective.name); - }; - lastValue = isolateBindingContext[scopeName] = parentGet(scope); - var parentValueWatch = function parentValueWatch(parentValue) { - if (!compare(parentValue, isolateBindingContext[scopeName])) { - // we are out of sync and need to copy - if (!compare(parentValue, lastValue)) { - // parent changed and it has precedence - isolateBindingContext[scopeName] = parentValue; - } else { - // if the parent can be assigned then do so - parentSet(scope, parentValue = isolateBindingContext[scopeName]); - } - } - return lastValue = parentValue; - }; - parentValueWatch.$stateful = true; - var unwatch; - if (definition.collection) { - unwatch = scope.$watchCollection(attrs[attrName], parentValueWatch); - } else { - unwatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal); - } - isolateScope.$on('$destroy', unwatch); - break; - - case '&': - parentGet = $parse(attrs[attrName]); - isolateBindingContext[scopeName] = function(locals) { - return parentGet(scope, locals); - }; - break; - } - }); - } - if (controllers) { - forEach(controllers, function(controller) { - controller(); - }); - controllers = null; - } - - // PRELINKING - for (i = 0, ii = preLinkFns.length; i < ii; i++) { - linkFn = preLinkFns[i]; - invokeLinkFn(linkFn, - linkFn.isolateScope ? isolateScope : scope, - $element, - attrs, - linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers), - transcludeFn - ); - } - - // RECURSION - // We only pass the isolate scope, if the isolate directive has a template, - // otherwise the child elements do not belong to the isolate directive. - var scopeToChild = scope; - if (newIsolateScopeDirective && (newIsolateScopeDirective.template || newIsolateScopeDirective.templateUrl === null)) { - scopeToChild = isolateScope; - } - childLinkFn && childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn); - - // POSTLINKING - for (i = postLinkFns.length - 1; i >= 0; i--) { - linkFn = postLinkFns[i]; - invokeLinkFn(linkFn, - linkFn.isolateScope ? isolateScope : scope, - $element, - attrs, - linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers), - transcludeFn - ); - } - - // This is the function that is injected as `$transclude`. - // Note: all arguments are optional! - function controllersBoundTransclude(scope, cloneAttachFn, futureParentElement) { - var transcludeControllers; - - // No scope passed in: - if (!isScope(scope)) { - futureParentElement = cloneAttachFn; - cloneAttachFn = scope; - scope = undefined; - } - - if (hasElementTranscludeDirective) { - transcludeControllers = elementControllers; - } - if (!futureParentElement) { - futureParentElement = hasElementTranscludeDirective ? $element.parent() : $element; - } - return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild); - } - } - } - - function markDirectivesAsIsolate(directives) { - // mark all directives as needing isolate scope. - for (var j = 0, jj = directives.length; j < jj; j++) { - directives[j] = inherit(directives[j], {$$isolateScope: true}); - } - } - - /** - * looks up the directive and decorates it with exception handling and proper parameters. We - * call this the boundDirective. - * - * @param {string} name name of the directive to look up. - * @param {string} location The directive must be found in specific format. - * String containing any of theses characters: - * - * * `E`: element name - * * `A': attribute - * * `C`: class - * * `M`: comment - * @returns {boolean} true if directive was added. - */ - function addDirective(tDirectives, name, location, maxPriority, ignoreDirective, startAttrName, - endAttrName) { - if (name === ignoreDirective) return null; - var match = null; - if (hasDirectives.hasOwnProperty(name)) { - for (var directive, directives = $injector.get(name + Suffix), - i = 0, ii = directives.length; i < ii; i++) { - try { - directive = directives[i]; - if ((maxPriority === undefined || maxPriority > directive.priority) && - directive.restrict.indexOf(location) != -1) { - if (startAttrName) { - directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName}); - } - tDirectives.push(directive); - match = directive; - } - } catch (e) { $exceptionHandler(e); } - } - } - return match; - } - - - /** - * looks up the directive and returns true if it is a multi-element directive, - * and therefore requires DOM nodes between -start and -end markers to be grouped - * together. - * - * @param {string} name name of the directive to look up. - * @returns true if directive was registered as multi-element. - */ - function directiveIsMultiElement(name) { - if (hasDirectives.hasOwnProperty(name)) { - for (var directive, directives = $injector.get(name + Suffix), - i = 0, ii = directives.length; i < ii; i++) { - directive = directives[i]; - if (directive.multiElement) { - return true; - } - } - } - return false; - } - - /** - * When the element is replaced with HTML template then the new attributes - * on the template need to be merged with the existing attributes in the DOM. - * The desired effect is to have both of the attributes present. - * - * @param {object} dst destination attributes (original DOM) - * @param {object} src source attributes (from the directive template) - */ - function mergeTemplateAttributes(dst, src) { - var srcAttr = src.$attr, - dstAttr = dst.$attr, - $element = dst.$$element; - - // reapply the old attributes to the new element - forEach(dst, function(value, key) { - if (key.charAt(0) != '$') { - if (src[key] && src[key] !== value) { - value += (key === 'style' ? ';' : ' ') + src[key]; - } - dst.$set(key, value, true, srcAttr[key]); - } - }); - - // copy the new attributes on the old attrs object - forEach(src, function(value, key) { - if (key == 'class') { - safeAddClass($element, value); - dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value; - } else if (key == 'style') { - $element.attr('style', $element.attr('style') + ';' + value); - dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value; - // `dst` will never contain hasOwnProperty as DOM parser won't let it. - // You will get an "InvalidCharacterError: DOM Exception 5" error if you - // have an attribute like "has-own-property" or "data-has-own-property", etc. - } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) { - dst[key] = value; - dstAttr[key] = srcAttr[key]; - } - }); - } - - - function compileTemplateUrl(directives, $compileNode, tAttrs, - $rootElement, childTranscludeFn, preLinkFns, postLinkFns, previousCompileContext) { - var linkQueue = [], - afterTemplateNodeLinkFn, - afterTemplateChildLinkFn, - beforeTemplateCompileNode = $compileNode[0], - origAsyncDirective = directives.shift(), - // The fact that we have to copy and patch the directive seems wrong! - derivedSyncDirective = extend({}, origAsyncDirective, { - templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective - }), - templateUrl = (isFunction(origAsyncDirective.templateUrl)) - ? origAsyncDirective.templateUrl($compileNode, tAttrs) - : origAsyncDirective.templateUrl, - templateNamespace = origAsyncDirective.templateNamespace; - - $compileNode.empty(); - - $templateRequest($sce.getTrustedResourceUrl(templateUrl)) - .then(function(content) { - var compileNode, tempTemplateAttrs, $template, childBoundTranscludeFn; - - content = denormalizeTemplate(content); - - if (origAsyncDirective.replace) { - if (jqLiteIsTextNode(content)) { - $template = []; - } else { - $template = removeComments(wrapTemplate(templateNamespace, trim(content))); - } - compileNode = $template[0]; - - if ($template.length != 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) { - throw $compileMinErr('tplrt', - "Template for directive '{0}' must have exactly one root element. {1}", - origAsyncDirective.name, templateUrl); - } - - tempTemplateAttrs = {$attr: {}}; - replaceWith($rootElement, $compileNode, compileNode); - var templateDirectives = collectDirectives(compileNode, [], tempTemplateAttrs); - - if (isObject(origAsyncDirective.scope)) { - markDirectivesAsIsolate(templateDirectives); - } - directives = templateDirectives.concat(directives); - mergeTemplateAttributes(tAttrs, tempTemplateAttrs); - } else { - compileNode = beforeTemplateCompileNode; - $compileNode.html(content); - } - - directives.unshift(derivedSyncDirective); - - afterTemplateNodeLinkFn = applyDirectivesToNode(directives, compileNode, tAttrs, - childTranscludeFn, $compileNode, origAsyncDirective, preLinkFns, postLinkFns, - previousCompileContext); - forEach($rootElement, function(node, i) { - if (node == compileNode) { - $rootElement[i] = $compileNode[0]; - } - }); - afterTemplateChildLinkFn = compileNodes($compileNode[0].childNodes, childTranscludeFn); - - while (linkQueue.length) { - var scope = linkQueue.shift(), - beforeTemplateLinkNode = linkQueue.shift(), - linkRootElement = linkQueue.shift(), - boundTranscludeFn = linkQueue.shift(), - linkNode = $compileNode[0]; - - if (scope.$$destroyed) continue; - - if (beforeTemplateLinkNode !== beforeTemplateCompileNode) { - var oldClasses = beforeTemplateLinkNode.className; - - if (!(previousCompileContext.hasElementTranscludeDirective && - origAsyncDirective.replace)) { - // it was cloned therefore we have to clone as well. - linkNode = jqLiteClone(compileNode); - } - replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode); - - // Copy in CSS classes from original node - safeAddClass(jqLite(linkNode), oldClasses); - } - if (afterTemplateNodeLinkFn.transcludeOnThisElement) { - childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn); - } else { - childBoundTranscludeFn = boundTranscludeFn; - } - afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, linkNode, $rootElement, - childBoundTranscludeFn); - } - linkQueue = null; - }); - - return function delayedNodeLinkFn(ignoreChildLinkFn, scope, node, rootElement, boundTranscludeFn) { - var childBoundTranscludeFn = boundTranscludeFn; - if (scope.$$destroyed) return; - if (linkQueue) { - linkQueue.push(scope, - node, - rootElement, - childBoundTranscludeFn); - } else { - if (afterTemplateNodeLinkFn.transcludeOnThisElement) { - childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn); - } - afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, childBoundTranscludeFn); - } - }; - } - - - /** - * Sorting function for bound directives. - */ - function byPriority(a, b) { - var diff = b.priority - a.priority; - if (diff !== 0) return diff; - if (a.name !== b.name) return (a.name < b.name) ? -1 : 1; - return a.index - b.index; - } - - - function assertNoDuplicate(what, previousDirective, directive, element) { - if (previousDirective) { - throw $compileMinErr('multidir', 'Multiple directives [{0}, {1}] asking for {2} on: {3}', - previousDirective.name, directive.name, what, startingTag(element)); - } - } - - - function addTextInterpolateDirective(directives, text) { - var interpolateFn = $interpolate(text, true); - if (interpolateFn) { - directives.push({ - priority: 0, - compile: function textInterpolateCompileFn(templateNode) { - var templateNodeParent = templateNode.parent(), - hasCompileParent = !!templateNodeParent.length; - - // When transcluding a template that has bindings in the root - // we don't have a parent and thus need to add the class during linking fn. - if (hasCompileParent) compile.$$addBindingClass(templateNodeParent); - - return function textInterpolateLinkFn(scope, node) { - var parent = node.parent(); - if (!hasCompileParent) compile.$$addBindingClass(parent); - compile.$$addBindingInfo(parent, interpolateFn.expressions); - scope.$watch(interpolateFn, function interpolateFnWatchAction(value) { - node[0].nodeValue = value; - }); - }; - } - }); - } - } - - - function wrapTemplate(type, template) { - type = lowercase(type || 'html'); - switch (type) { - case 'svg': - case 'math': - var wrapper = document.createElement('div'); - wrapper.innerHTML = '<' + type + '>' + template + ''; - return wrapper.childNodes[0].childNodes; - default: - return template; - } - } - - - function getTrustedContext(node, attrNormalizedName) { - if (attrNormalizedName == "srcdoc") { - return $sce.HTML; - } - var tag = nodeName_(node); - // maction[xlink:href] can source SVG. It's not limited to . - if (attrNormalizedName == "xlinkHref" || - (tag == "form" && attrNormalizedName == "action") || - (tag != "img" && (attrNormalizedName == "src" || - attrNormalizedName == "ngSrc"))) { - return $sce.RESOURCE_URL; - } - } - - - function addAttrInterpolateDirective(node, directives, value, name, allOrNothing) { - var interpolateFn = $interpolate(value, true); - - // no interpolation found -> ignore - if (!interpolateFn) return; - - - if (name === "multiple" && nodeName_(node) === "select") { - throw $compileMinErr("selmulti", - "Binding to the 'multiple' attribute is not supported. Element: {0}", - startingTag(node)); - } - - directives.push({ - priority: 100, - compile: function() { - return { - pre: function attrInterpolatePreLinkFn(scope, element, attr) { - var $$observers = (attr.$$observers || (attr.$$observers = {})); - - if (EVENT_HANDLER_ATTR_REGEXP.test(name)) { - throw $compileMinErr('nodomevents', - "Interpolations for HTML DOM event attributes are disallowed. Please use the " + - "ng- versions (such as ng-click instead of onclick) instead."); - } - - // If the attribute was removed, then we are done - if (!attr[name]) { - return; - } - - // we need to interpolate again, in case the attribute value has been updated - // (e.g. by another directive's compile function) - interpolateFn = $interpolate(attr[name], true, getTrustedContext(node, name), - ALL_OR_NOTHING_ATTRS[name] || allOrNothing); - - // if attribute was updated so that there is no interpolation going on we don't want to - // register any observers - if (!interpolateFn) return; - - // initialize attr object so that it's ready in case we need the value for isolate - // scope initialization, otherwise the value would not be available from isolate - // directive's linking fn during linking phase - attr[name] = interpolateFn(scope); - - ($$observers[name] || ($$observers[name] = [])).$$inter = true; - (attr.$$observers && attr.$$observers[name].$$scope || scope). - $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) { - //special case for class attribute addition + removal - //so that class changes can tap into the animation - //hooks provided by the $animate service. Be sure to - //skip animations when the first digest occurs (when - //both the new and the old values are the same) since - //the CSS classes are the non-interpolated values - if (name === 'class' && newValue != oldValue) { - attr.$updateClass(newValue, oldValue); - } else { - attr.$set(name, newValue); - } - }); - } - }; - } - }); - } - - - /** - * This is a special jqLite.replaceWith, which can replace items which - * have no parents, provided that the containing jqLite collection is provided. - * - * @param {JqLite=} $rootElement The root of the compile tree. Used so that we can replace nodes - * in the root of the tree. - * @param {JqLite} elementsToRemove The jqLite element which we are going to replace. We keep - * the shell, but replace its DOM node reference. - * @param {Node} newNode The new DOM node. - */ - function replaceWith($rootElement, elementsToRemove, newNode) { - var firstElementToRemove = elementsToRemove[0], - removeCount = elementsToRemove.length, - parent = firstElementToRemove.parentNode, - i, ii; - - if ($rootElement) { - for (i = 0, ii = $rootElement.length; i < ii; i++) { - if ($rootElement[i] == firstElementToRemove) { - $rootElement[i++] = newNode; - for (var j = i, j2 = j + removeCount - 1, - jj = $rootElement.length; - j < jj; j++, j2++) { - if (j2 < jj) { - $rootElement[j] = $rootElement[j2]; - } else { - delete $rootElement[j]; - } - } - $rootElement.length -= removeCount - 1; - - // If the replaced element is also the jQuery .context then replace it - // .context is a deprecated jQuery api, so we should set it only when jQuery set it - // http://api.jquery.com/context/ - if ($rootElement.context === firstElementToRemove) { - $rootElement.context = newNode; - } - break; - } - } - } - - if (parent) { - parent.replaceChild(newNode, firstElementToRemove); - } - - // TODO(perf): what's this document fragment for? is it needed? can we at least reuse it? - var fragment = document.createDocumentFragment(); - fragment.appendChild(firstElementToRemove); - - // Copy over user data (that includes Angular's $scope etc.). Don't copy private - // data here because there's no public interface in jQuery to do that and copying over - // event listeners (which is the main use of private data) wouldn't work anyway. - jqLite(newNode).data(jqLite(firstElementToRemove).data()); - - // Remove data of the replaced element. We cannot just call .remove() - // on the element it since that would deallocate scope that is needed - // for the new node. Instead, remove the data "manually". - if (!jQuery) { - delete jqLite.cache[firstElementToRemove[jqLite.expando]]; - } else { - // jQuery 2.x doesn't expose the data storage. Use jQuery.cleanData to clean up after - // the replaced element. The cleanData version monkey-patched by Angular would cause - // the scope to be trashed and we do need the very same scope to work with the new - // element. However, we cannot just cache the non-patched version and use it here as - // that would break if another library patches the method after Angular does (one - // example is jQuery UI). Instead, set a flag indicating scope destroying should be - // skipped this one time. - skipDestroyOnNextJQueryCleanData = true; - jQuery.cleanData([firstElementToRemove]); - } - - for (var k = 1, kk = elementsToRemove.length; k < kk; k++) { - var element = elementsToRemove[k]; - jqLite(element).remove(); // must do this way to clean up expando - fragment.appendChild(element); - delete elementsToRemove[k]; - } - - elementsToRemove[0] = newNode; - elementsToRemove.length = 1; - } - - - function cloneAndAnnotateFn(fn, annotation) { - return extend(function() { return fn.apply(null, arguments); }, fn, annotation); - } - - - function invokeLinkFn(linkFn, scope, $element, attrs, controllers, transcludeFn) { - try { - linkFn(scope, $element, attrs, controllers, transcludeFn); - } catch (e) { - $exceptionHandler(e, startingTag($element)); - } - } - }]; -} - -var PREFIX_REGEXP = /^((?:x|data)[\:\-_])/i; -/** - * Converts all accepted directives format into proper directive name. - * All of these will become 'myDirective': - * my:Directive - * my-directive - * x-my-directive - * data-my:directive - * - * Also there is special case for Moz prefix starting with upper case letter. - * @param name Name to normalize - */ -function directiveNormalize(name) { - return camelCase(name.replace(PREFIX_REGEXP, '')); -} - -/** - * @ngdoc type - * @name $compile.directive.Attributes - * - * @description - * A shared object between directive compile / linking functions which contains normalized DOM - * element attributes. The values reflect current binding state `{{ }}`. The normalization is - * needed since all of these are treated as equivalent in Angular: - * - * ``` - * - * ``` - */ - -/** - * @ngdoc property - * @name $compile.directive.Attributes#$attr - * - * @description - * A map of DOM element attribute names to the normalized name. This is - * needed to do reverse lookup from normalized name back to actual name. - */ - - -/** - * @ngdoc method - * @name $compile.directive.Attributes#$set - * @kind function - * - * @description - * Set DOM element attribute value. - * - * - * @param {string} name Normalized element attribute name of the property to modify. The name is - * reverse-translated using the {@link ng.$compile.directive.Attributes#$attr $attr} - * property to the original name. - * @param {string} value Value to set the attribute to. The value can be an interpolated string. - */ - - - -/** - * Closure compiler type information - */ - -function nodesetLinkingFn( - /* angular.Scope */ scope, - /* NodeList */ nodeList, - /* Element */ rootElement, - /* function(Function) */ boundTranscludeFn -) {} - -function directiveLinkingFn( - /* nodesetLinkingFn */ nodesetLinkingFn, - /* angular.Scope */ scope, - /* Node */ node, - /* Element */ rootElement, - /* function(Function) */ boundTranscludeFn -) {} - -function tokenDifference(str1, str2) { - var values = '', - tokens1 = str1.split(/\s+/), - tokens2 = str2.split(/\s+/); - - outer: - for (var i = 0; i < tokens1.length; i++) { - var token = tokens1[i]; - for (var j = 0; j < tokens2.length; j++) { - if (token == tokens2[j]) continue outer; - } - values += (values.length > 0 ? ' ' : '') + token; - } - return values; -} - -function removeComments(jqNodes) { - jqNodes = jqLite(jqNodes); - var i = jqNodes.length; - - if (i <= 1) { - return jqNodes; - } - - while (i--) { - var node = jqNodes[i]; - if (node.nodeType === NODE_TYPE_COMMENT) { - splice.call(jqNodes, i, 1); - } - } - return jqNodes; -} - -/** - * @ngdoc provider - * @name $controllerProvider - * @description - * The {@link ng.$controller $controller service} is used by Angular to create new - * controllers. - * - * This provider allows controller registration via the - * {@link ng.$controllerProvider#register register} method. - */ -function $ControllerProvider() { - var controllers = {}, - globals = false, - CNTRL_REG = /^(\S+)(\s+as\s+(\w+))?$/; - - - /** - * @ngdoc method - * @name $controllerProvider#register - * @param {string|Object} name Controller name, or an object map of controllers where the keys are - * the names and the values are the constructors. - * @param {Function|Array} constructor Controller constructor fn (optionally decorated with DI - * annotations in the array notation). - */ - this.register = function(name, constructor) { - assertNotHasOwnProperty(name, 'controller'); - if (isObject(name)) { - extend(controllers, name); - } else { - controllers[name] = constructor; - } - }; - - /** - * @ngdoc method - * @name $controllerProvider#allowGlobals - * @description If called, allows `$controller` to find controller constructors on `window` - */ - this.allowGlobals = function() { - globals = true; - }; - - - this.$get = ['$injector', '$window', function($injector, $window) { - - /** - * @ngdoc service - * @name $controller - * @requires $injector - * - * @param {Function|string} constructor If called with a function then it's considered to be the - * controller constructor function. Otherwise it's considered to be a string which is used - * to retrieve the controller constructor using the following steps: - * - * * check if a controller with given name is registered via `$controllerProvider` - * * check if evaluating the string on the current scope returns a constructor - * * if $controllerProvider#allowGlobals, check `window[constructor]` on the global - * `window` object (not recommended) - * - * The string can use the `controller as property` syntax, where the controller instance is published - * as the specified property on the `scope`; the `scope` must be injected into `locals` param for this - * to work correctly. - * - * @param {Object} locals Injection locals for Controller. - * @return {Object} Instance of given controller. - * - * @description - * `$controller` service is responsible for instantiating controllers. - * - * It's just a simple call to {@link auto.$injector $injector}, but extracted into - * a service, so that one can override this service with [BC version](https://gist.github.com/1649788). - */ - return function(expression, locals, later, ident) { - // PRIVATE API: - // param `later` --- indicates that the controller's constructor is invoked at a later time. - // If true, $controller will allocate the object with the correct - // prototype chain, but will not invoke the controller until a returned - // callback is invoked. - // param `ident` --- An optional label which overrides the label parsed from the controller - // expression, if any. - var instance, match, constructor, identifier; - later = later === true; - if (ident && isString(ident)) { - identifier = ident; - } - - if (isString(expression)) { - match = expression.match(CNTRL_REG), - constructor = match[1], - identifier = identifier || match[3]; - expression = controllers.hasOwnProperty(constructor) - ? controllers[constructor] - : getter(locals.$scope, constructor, true) || - (globals ? getter($window, constructor, true) : undefined); - - assertArgFn(expression, constructor, true); - } - - if (later) { - // Instantiate controller later: - // This machinery is used to create an instance of the object before calling the - // controller's constructor itself. - // - // This allows properties to be added to the controller before the constructor is - // invoked. Primarily, this is used for isolate scope bindings in $compile. - // - // This feature is not intended for use by applications, and is thus not documented - // publicly. - // Object creation: http://jsperf.com/create-constructor/2 - var controllerPrototype = (isArray(expression) ? - expression[expression.length - 1] : expression).prototype; - instance = Object.create(controllerPrototype); - - if (identifier) { - addIdentifier(locals, identifier, instance, constructor || expression.name); - } - - return extend(function() { - $injector.invoke(expression, instance, locals, constructor); - return instance; - }, { - instance: instance, - identifier: identifier - }); - } - - instance = $injector.instantiate(expression, locals, constructor); - - if (identifier) { - addIdentifier(locals, identifier, instance, constructor || expression.name); - } - - return instance; - }; - - function addIdentifier(locals, identifier, instance, name) { - if (!(locals && isObject(locals.$scope))) { - throw minErr('$controller')('noscp', - "Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.", - name, identifier); - } - - locals.$scope[identifier] = instance; - } - }]; -} - -/** - * @ngdoc service - * @name $document - * @requires $window - * - * @description - * A {@link angular.element jQuery or jqLite} wrapper for the browser's `window.document` object. - * - * @example - - -
      -

      $document title:

      -

      window.document title:

      -
      -
      - - angular.module('documentExample', []) - .controller('ExampleController', ['$scope', '$document', function($scope, $document) { - $scope.title = $document[0].title; - $scope.windowTitle = angular.element(window.document)[0].title; - }]); - -
      - */ -function $DocumentProvider() { - this.$get = ['$window', function(window) { - return jqLite(window.document); - }]; -} - -/** - * @ngdoc service - * @name $exceptionHandler - * @requires ng.$log - * - * @description - * Any uncaught exception in angular expressions is delegated to this service. - * The default implementation simply delegates to `$log.error` which logs it into - * the browser console. - * - * In unit tests, if `angular-mocks.js` is loaded, this service is overridden by - * {@link ngMock.$exceptionHandler mock $exceptionHandler} which aids in testing. - * - * ## Example: - * - * ```js - * angular.module('exceptionOverride', []).factory('$exceptionHandler', function() { - * return function(exception, cause) { - * exception.message += ' (caused by "' + cause + '")'; - * throw exception; - * }; - * }); - * ``` - * - * This example will override the normal action of `$exceptionHandler`, to make angular - * exceptions fail hard when they happen, instead of just logging to the console. - * - *
      - * Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind` - * methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler} - * (unless executed during a digest). - * - * If you wish, you can manually delegate exceptions, e.g. - * `try { ... } catch(e) { $exceptionHandler(e); }` - * - * @param {Error} exception Exception associated with the error. - * @param {string=} cause optional information about the context in which - * the error was thrown. - * - */ -function $ExceptionHandlerProvider() { - this.$get = ['$log', function($log) { - return function(exception, cause) { - $log.error.apply($log, arguments); - }; - }]; -} - -var APPLICATION_JSON = 'application/json'; -var CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': APPLICATION_JSON + ';charset=utf-8'}; -var JSON_START = /^\s*(\[|\{[^\{])/; -var JSON_END = /[\}\]]\s*$/; -var JSON_PROTECTION_PREFIX = /^\)\]\}',?\n/; - -function defaultHttpResponseTransform(data, headers) { - if (isString(data)) { - // strip json vulnerability protection prefix - data = data.replace(JSON_PROTECTION_PREFIX, ''); - var contentType = headers('Content-Type'); - if ((contentType && contentType.indexOf(APPLICATION_JSON) === 0 && data.trim()) || - (JSON_START.test(data) && JSON_END.test(data))) { - data = fromJson(data); - } - } - return data; -} - -/** - * Parse headers into key value object - * - * @param {string} headers Raw headers as a string - * @returns {Object} Parsed headers as key value object - */ -function parseHeaders(headers) { - var parsed = createMap(), key, val, i; - - if (!headers) return parsed; - - forEach(headers.split('\n'), function(line) { - i = line.indexOf(':'); - key = lowercase(trim(line.substr(0, i))); - val = trim(line.substr(i + 1)); - - if (key) { - parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val; - } - }); - - return parsed; -} - - -/** - * Returns a function that provides access to parsed headers. - * - * Headers are lazy parsed when first requested. - * @see parseHeaders - * - * @param {(string|Object)} headers Headers to provide access to. - * @returns {function(string=)} Returns a getter function which if called with: - * - * - if called with single an argument returns a single header value or null - * - if called with no arguments returns an object containing all headers. - */ -function headersGetter(headers) { - var headersObj = isObject(headers) ? headers : undefined; - - return function(name) { - if (!headersObj) headersObj = parseHeaders(headers); - - if (name) { - var value = headersObj[lowercase(name)]; - if (value === void 0) { - value = null; - } - return value; - } - - return headersObj; - }; -} - - -/** - * Chain all given functions - * - * This function is used for both request and response transforming - * - * @param {*} data Data to transform. - * @param {function(string=)} headers Http headers getter fn. - * @param {(Function|Array.)} fns Function or an array of functions. - * @returns {*} Transformed data. - */ -function transformData(data, headers, fns) { - if (isFunction(fns)) - return fns(data, headers); - - forEach(fns, function(fn) { - data = fn(data, headers); - }); - - return data; -} - - -function isSuccess(status) { - return 200 <= status && status < 300; -} - - -/** - * @ngdoc provider - * @name $httpProvider - * @description - * Use `$httpProvider` to change the default behavior of the {@link ng.$http $http} service. - * */ -function $HttpProvider() { - /** - * @ngdoc property - * @name $httpProvider#defaults - * @description - * - * Object containing default values for all {@link ng.$http $http} requests. - * - * - **`defaults.cache`** - {Object} - an object built with {@link ng.$cacheFactory `$cacheFactory`} - * that will provide the cache for all requests who set their `cache` property to `true`. - * If you set the `default.cache = false` then only requests that specify their own custom - * cache object will be cached. See {@link $http#caching $http Caching} for more information. - * - * - **`defaults.xsrfCookieName`** - {string} - Name of cookie containing the XSRF token. - * Defaults value is `'XSRF-TOKEN'`. - * - * - **`defaults.xsrfHeaderName`** - {string} - Name of HTTP header to populate with the - * XSRF token. Defaults value is `'X-XSRF-TOKEN'`. - * - * - **`defaults.headers`** - {Object} - Default headers for all $http requests. - * Refer to {@link ng.$http#setting-http-headers $http} for documentation on - * setting default headers. - * - **`defaults.headers.common`** - * - **`defaults.headers.post`** - * - **`defaults.headers.put`** - * - **`defaults.headers.patch`** - * - **/ - var defaults = this.defaults = { - // transform incoming response data - transformResponse: [defaultHttpResponseTransform], - - // transform outgoing request data - transformRequest: [function(d) { - return isObject(d) && !isFile(d) && !isBlob(d) ? toJson(d) : d; - }], - - // default headers - headers: { - common: { - 'Accept': 'application/json, text/plain, */*' - }, - post: shallowCopy(CONTENT_TYPE_APPLICATION_JSON), - put: shallowCopy(CONTENT_TYPE_APPLICATION_JSON), - patch: shallowCopy(CONTENT_TYPE_APPLICATION_JSON) - }, - - xsrfCookieName: 'XSRF-TOKEN', - xsrfHeaderName: 'X-XSRF-TOKEN' - }; - - var useApplyAsync = false; - /** - * @ngdoc method - * @name $httpProvider#useApplyAsync - * @description - * - * Configure $http service to combine processing of multiple http responses received at around - * the same time via {@link ng.$rootScope.Scope#$applyAsync $rootScope.$applyAsync}. This can result in - * significant performance improvement for bigger applications that make many HTTP requests - * concurrently (common during application bootstrap). - * - * Defaults to false. If no value is specifed, returns the current configured value. - * - * @param {boolean=} value If true, when requests are loaded, they will schedule a deferred - * "apply" on the next tick, giving time for subsequent requests in a roughly ~10ms window - * to load and share the same digest cycle. - * - * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining. - * otherwise, returns the current configured value. - **/ - this.useApplyAsync = function(value) { - if (isDefined(value)) { - useApplyAsync = !!value; - return this; - } - return useApplyAsync; - }; - - /** - * @ngdoc property - * @name $httpProvider#interceptors - * @description - * - * Array containing service factories for all synchronous or asynchronous {@link ng.$http $http} - * pre-processing of request or postprocessing of responses. - * - * These service factories are ordered by request, i.e. they are applied in the same order as the - * array, on request, but reverse order, on response. - * - * {@link ng.$http#interceptors Interceptors detailed info} - **/ - var interceptorFactories = this.interceptors = []; - - this.$get = ['$httpBackend', '$browser', '$cacheFactory', '$rootScope', '$q', '$injector', - function($httpBackend, $browser, $cacheFactory, $rootScope, $q, $injector) { - - var defaultCache = $cacheFactory('$http'); - - /** - * Interceptors stored in reverse order. Inner interceptors before outer interceptors. - * The reversal is needed so that we can build up the interception chain around the - * server request. - */ - var reversedInterceptors = []; - - forEach(interceptorFactories, function(interceptorFactory) { - reversedInterceptors.unshift(isString(interceptorFactory) - ? $injector.get(interceptorFactory) : $injector.invoke(interceptorFactory)); - }); - - /** - * @ngdoc service - * @kind function - * @name $http - * @requires ng.$httpBackend - * @requires $cacheFactory - * @requires $rootScope - * @requires $q - * @requires $injector - * - * @description - * The `$http` service is a core Angular service that facilitates communication with the remote - * HTTP servers via the browser's [XMLHttpRequest](https://developer.mozilla.org/en/xmlhttprequest) - * object or via [JSONP](http://en.wikipedia.org/wiki/JSONP). - * - * For unit testing applications that use `$http` service, see - * {@link ngMock.$httpBackend $httpBackend mock}. - * - * For a higher level of abstraction, please check out the {@link ngResource.$resource - * $resource} service. - * - * The $http API is based on the {@link ng.$q deferred/promise APIs} exposed by - * the $q service. While for simple usage patterns this doesn't matter much, for advanced usage - * it is important to familiarize yourself with these APIs and the guarantees they provide. - * - * - * ## General usage - * The `$http` service is a function which takes a single argument — a configuration object — - * that is used to generate an HTTP request and returns a {@link ng.$q promise} - * with two $http specific methods: `success` and `error`. - * - * ```js - * // Simple GET request example : - * $http.get('/someUrl'). - * success(function(data, status, headers, config) { - * // this callback will be called asynchronously - * // when the response is available - * }). - * error(function(data, status, headers, config) { - * // called asynchronously if an error occurs - * // or server returns response with an error status. - * }); - * ``` - * - * ```js - * // Simple POST request example (passing data) : - * $http.post('/someUrl', {msg:'hello word!'}). - * success(function(data, status, headers, config) { - * // this callback will be called asynchronously - * // when the response is available - * }). - * error(function(data, status, headers, config) { - * // called asynchronously if an error occurs - * // or server returns response with an error status. - * }); - * ``` - * - * - * Since the returned value of calling the $http function is a `promise`, you can also use - * the `then` method to register callbacks, and these callbacks will receive a single argument – - * an object representing the response. See the API signature and type info below for more - * details. - * - * A response status code between 200 and 299 is considered a success status and - * will result in the success callback being called. Note that if the response is a redirect, - * XMLHttpRequest will transparently follow it, meaning that the error callback will not be - * called for such responses. - * - * ## Writing Unit Tests that use $http - * When unit testing (using {@link ngMock ngMock}), it is necessary to call - * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending - * request using trained responses. - * - * ``` - * $httpBackend.expectGET(...); - * $http.get(...); - * $httpBackend.flush(); - * ``` - * - * ## Shortcut methods - * - * Shortcut methods are also available. All shortcut methods require passing in the URL, and - * request data must be passed in for POST/PUT requests. - * - * ```js - * $http.get('/someUrl').success(successCallback); - * $http.post('/someUrl', data).success(successCallback); - * ``` - * - * Complete list of shortcut methods: - * - * - {@link ng.$http#get $http.get} - * - {@link ng.$http#head $http.head} - * - {@link ng.$http#post $http.post} - * - {@link ng.$http#put $http.put} - * - {@link ng.$http#delete $http.delete} - * - {@link ng.$http#jsonp $http.jsonp} - * - {@link ng.$http#patch $http.patch} - * - * - * ## Setting HTTP Headers - * - * The $http service will automatically add certain HTTP headers to all requests. These defaults - * can be fully configured by accessing the `$httpProvider.defaults.headers` configuration - * object, which currently contains this default configuration: - * - * - `$httpProvider.defaults.headers.common` (headers that are common for all requests): - * - `Accept: application/json, text/plain, * / *` - * - `$httpProvider.defaults.headers.post`: (header defaults for POST requests) - * - `Content-Type: application/json` - * - `$httpProvider.defaults.headers.put` (header defaults for PUT requests) - * - `Content-Type: application/json` - * - * To add or overwrite these defaults, simply add or remove a property from these configuration - * objects. To add headers for an HTTP method other than POST or PUT, simply add a new object - * with the lowercased HTTP method name as the key, e.g. - * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }. - * - * The defaults can also be set at runtime via the `$http.defaults` object in the same - * fashion. For example: - * - * ``` - * module.run(function($http) { - * $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w' - * }); - * ``` - * - * In addition, you can supply a `headers` property in the config object passed when - * calling `$http(config)`, which overrides the defaults without changing them globally. - * - * To explicitly remove a header automatically added via $httpProvider.defaults.headers on a per request basis, - * Use the `headers` property, setting the desired header to `undefined`. For example: - * - * ```js - * var req = { - * method: 'POST', - * url: 'http://example.com', - * headers: { - * 'Content-Type': undefined - * }, - * data: { test: 'test' }, - * } - * - * $http(req).success(function(){...}).error(function(){...}); - * ``` - * - * ## Transforming Requests and Responses - * - * Both requests and responses can be transformed using transformation functions: `transformRequest` - * and `transformResponse`. These properties can be a single function that returns - * the transformed value (`{function(data, headersGetter)`) or an array of such transformation functions, - * which allows you to `push` or `unshift` a new transformation function into the transformation chain. - * - * ### Default Transformations - * - * The `$httpProvider` provider and `$http` service expose `defaults.transformRequest` and - * `defaults.transformResponse` properties. If a request does not provide its own transformations - * then these will be applied. - * - * You can augment or replace the default transformations by modifying these properties by adding to or - * replacing the array. - * - * Angular provides the following default transformations: - * - * Request transformations (`$httpProvider.defaults.transformRequest` and `$http.defaults.transformRequest`): - * - * - If the `data` property of the request configuration object contains an object, serialize it - * into JSON format. - * - * Response transformations (`$httpProvider.defaults.transformResponse` and `$http.defaults.transformResponse`): - * - * - If XSRF prefix is detected, strip it (see Security Considerations section below). - * - If JSON response is detected, deserialize it using a JSON parser. - * - * - * ### Overriding the Default Transformations Per Request - * - * If you wish override the request/response transformations only for a single request then provide - * `transformRequest` and/or `transformResponse` properties on the configuration object passed - * into `$http`. - * - * Note that if you provide these properties on the config object the default transformations will be - * overwritten. If you wish to augment the default transformations then you must include them in your - * local transformation array. - * - * The following code demonstrates adding a new response transformation to be run after the default response - * transformations have been run. - * - * ```js - * function appendTransform(defaults, transform) { - * - * // We can't guarantee that the default transformation is an array - * defaults = angular.isArray(defaults) ? defaults : [defaults]; - * - * // Append the new transformation to the defaults - * return defaults.concat(transform); - * } - * - * $http({ - * url: '...', - * method: 'GET', - * transformResponse: appendTransform($http.defaults.transformResponse, function(value) { - * return doTransform(value); - * }) - * }); - * ``` - * - * - * ## Caching - * - * To enable caching, set the request configuration `cache` property to `true` (to use default - * cache) or to a custom cache object (built with {@link ng.$cacheFactory `$cacheFactory`}). - * When the cache is enabled, `$http` stores the response from the server in the specified - * cache. The next time the same request is made, the response is served from the cache without - * sending a request to the server. - * - * Note that even if the response is served from cache, delivery of the data is asynchronous in - * the same way that real requests are. - * - * If there are multiple GET requests for the same URL that should be cached using the same - * cache, but the cache is not populated yet, only one request to the server will be made and - * the remaining requests will be fulfilled using the response from the first request. - * - * You can change the default cache to a new object (built with - * {@link ng.$cacheFactory `$cacheFactory`}) by updating the - * {@link ng.$http#defaults `$http.defaults.cache`} property. All requests who set - * their `cache` property to `true` will now use this cache object. - * - * If you set the default cache to `false` then only requests that specify their own custom - * cache object will be cached. - * - * ## Interceptors - * - * Before you start creating interceptors, be sure to understand the - * {@link ng.$q $q and deferred/promise APIs}. - * - * For purposes of global error handling, authentication, or any kind of synchronous or - * asynchronous pre-processing of request or postprocessing of responses, it is desirable to be - * able to intercept requests before they are handed to the server and - * responses before they are handed over to the application code that - * initiated these requests. The interceptors leverage the {@link ng.$q - * promise APIs} to fulfill this need for both synchronous and asynchronous pre-processing. - * - * The interceptors are service factories that are registered with the `$httpProvider` by - * adding them to the `$httpProvider.interceptors` array. The factory is called and - * injected with dependencies (if specified) and returns the interceptor. - * - * There are two kinds of interceptors (and two kinds of rejection interceptors): - * - * * `request`: interceptors get called with a http `config` object. The function is free to - * modify the `config` object or create a new one. The function needs to return the `config` - * object directly, or a promise containing the `config` or a new `config` object. - * * `requestError`: interceptor gets called when a previous interceptor threw an error or - * resolved with a rejection. - * * `response`: interceptors get called with http `response` object. The function is free to - * modify the `response` object or create a new one. The function needs to return the `response` - * object directly, or as a promise containing the `response` or a new `response` object. - * * `responseError`: interceptor gets called when a previous interceptor threw an error or - * resolved with a rejection. - * - * - * ```js - * // register the interceptor as a service - * $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) { - * return { - * // optional method - * 'request': function(config) { - * // do something on success - * return config; - * }, - * - * // optional method - * 'requestError': function(rejection) { - * // do something on error - * if (canRecover(rejection)) { - * return responseOrNewPromise - * } - * return $q.reject(rejection); - * }, - * - * - * - * // optional method - * 'response': function(response) { - * // do something on success - * return response; - * }, - * - * // optional method - * 'responseError': function(rejection) { - * // do something on error - * if (canRecover(rejection)) { - * return responseOrNewPromise - * } - * return $q.reject(rejection); - * } - * }; - * }); - * - * $httpProvider.interceptors.push('myHttpInterceptor'); - * - * - * // alternatively, register the interceptor via an anonymous factory - * $httpProvider.interceptors.push(function($q, dependency1, dependency2) { - * return { - * 'request': function(config) { - * // same as above - * }, - * - * 'response': function(response) { - * // same as above - * } - * }; - * }); - * ``` - * - * ## Security Considerations - * - * When designing web applications, consider security threats from: - * - * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx) - * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) - * - * Both server and the client must cooperate in order to eliminate these threats. Angular comes - * pre-configured with strategies that address these issues, but for this to work backend server - * cooperation is required. - * - * ### JSON Vulnerability Protection - * - * A [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx) - * allows third party website to turn your JSON resource URL into - * [JSONP](http://en.wikipedia.org/wiki/JSONP) request under some conditions. To - * counter this your server can prefix all JSON requests with following string `")]}',\n"`. - * Angular will automatically strip the prefix before processing it as JSON. - * - * For example if your server needs to return: - * ```js - * ['one','two'] - * ``` - * - * which is vulnerable to attack, your server can return: - * ```js - * )]}', - * ['one','two'] - * ``` - * - * Angular will strip the prefix, before processing the JSON. - * - * - * ### Cross Site Request Forgery (XSRF) Protection - * - * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is a technique by which - * an unauthorized site can gain your user's private data. Angular provides a mechanism - * to counter XSRF. When performing XHR requests, the $http service reads a token from a cookie - * (by default, `XSRF-TOKEN`) and sets it as an HTTP header (`X-XSRF-TOKEN`). Since only - * JavaScript that runs on your domain could read the cookie, your server can be assured that - * the XHR came from JavaScript running on your domain. The header will not be set for - * cross-domain requests. - * - * To take advantage of this, your server needs to set a token in a JavaScript readable session - * cookie called `XSRF-TOKEN` on the first HTTP GET request. On subsequent XHR requests the - * server can verify that the cookie matches `X-XSRF-TOKEN` HTTP header, and therefore be sure - * that only JavaScript running on your domain could have sent the request. The token must be - * unique for each user and must be verifiable by the server (to prevent the JavaScript from - * making up its own tokens). We recommend that the token is a digest of your site's - * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography)) - * for added security. - * - * The name of the headers can be specified using the xsrfHeaderName and xsrfCookieName - * properties of either $httpProvider.defaults at config-time, $http.defaults at run-time, - * or the per-request config object. - * - * - * @param {object} config Object describing the request to be made and how it should be - * processed. The object has following properties: - * - * - **method** – `{string}` – HTTP method (e.g. 'GET', 'POST', etc) - * - **url** – `{string}` – Absolute or relative URL of the resource that is being requested. - * - **params** – `{Object.}` – Map of strings or objects which will be turned - * to `?key1=value1&key2=value2` after the url. If the value is not a string, it will be - * JSONified. - * - **data** – `{string|Object}` – Data to be sent as the request message data. - * - **headers** – `{Object}` – Map of strings or functions which return strings representing - * HTTP headers to send to the server. If the return value of a function is null, the - * header will not be sent. - * - **xsrfHeaderName** – `{string}` – Name of HTTP header to populate with the XSRF token. - * - **xsrfCookieName** – `{string}` – Name of cookie containing the XSRF token. - * - **transformRequest** – - * `{function(data, headersGetter)|Array.}` – - * transform function or an array of such functions. The transform function takes the http - * request body and headers and returns its transformed (typically serialized) version. - * See {@link ng.$http#overriding-the-default-transformations-per-request - * Overriding the Default Transformations} - * - **transformResponse** – - * `{function(data, headersGetter)|Array.}` – - * transform function or an array of such functions. The transform function takes the http - * response body and headers and returns its transformed (typically deserialized) version. - * See {@link ng.$http#overriding-the-default-transformations-per-request - * Overriding the Default Transformations} - * - **cache** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the - * GET request, otherwise if a cache instance built with - * {@link ng.$cacheFactory $cacheFactory}, this cache will be used for - * caching. - * - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise} - * that should abort the request when resolved. - * - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the - * XHR object. See [requests with credentials](https://developer.mozilla.org/docs/Web/HTTP/Access_control_CORS#Requests_with_credentials) - * for more information. - * - **responseType** - `{string}` - see - * [requestType](https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType). - * - * @returns {HttpPromise} Returns a {@link ng.$q promise} object with the - * standard `then` method and two http specific methods: `success` and `error`. The `then` - * method takes two arguments a success and an error callback which will be called with a - * response object. The `success` and `error` methods take a single argument - a function that - * will be called when the request succeeds or fails respectively. The arguments passed into - * these functions are destructured representation of the response object passed into the - * `then` method. The response object has these properties: - * - * - **data** – `{string|Object}` – The response body transformed with the transform - * functions. - * - **status** – `{number}` – HTTP status code of the response. - * - **headers** – `{function([headerName])}` – Header getter function. - * - **config** – `{Object}` – The configuration object that was used to generate the request. - * - **statusText** – `{string}` – HTTP status text of the response. - * - * @property {Array.} pendingRequests Array of config objects for currently pending - * requests. This is primarily meant to be used for debugging purposes. - * - * - * @example - - -
      - - -
      - - - -
      http status code: {{status}}
      -
      http response data: {{data}}
      -
      -
      - - angular.module('httpExample', []) - .controller('FetchController', ['$scope', '$http', '$templateCache', - function($scope, $http, $templateCache) { - $scope.method = 'GET'; - $scope.url = 'http-hello.html'; - - $scope.fetch = function() { - $scope.code = null; - $scope.response = null; - - $http({method: $scope.method, url: $scope.url, cache: $templateCache}). - success(function(data, status) { - $scope.status = status; - $scope.data = data; - }). - error(function(data, status) { - $scope.data = data || "Request failed"; - $scope.status = status; - }); - }; - - $scope.updateModel = function(method, url) { - $scope.method = method; - $scope.url = url; - }; - }]); - - - Hello, $http! - - - var status = element(by.binding('status')); - var data = element(by.binding('data')); - var fetchBtn = element(by.id('fetchbtn')); - var sampleGetBtn = element(by.id('samplegetbtn')); - var sampleJsonpBtn = element(by.id('samplejsonpbtn')); - var invalidJsonpBtn = element(by.id('invalidjsonpbtn')); - - it('should make an xhr GET request', function() { - sampleGetBtn.click(); - fetchBtn.click(); - expect(status.getText()).toMatch('200'); - expect(data.getText()).toMatch(/Hello, \$http!/); - }); - -// Commented out due to flakes. See https://github.com/angular/angular.js/issues/9185 -// it('should make a JSONP request to angularjs.org', function() { -// sampleJsonpBtn.click(); -// fetchBtn.click(); -// expect(status.getText()).toMatch('200'); -// expect(data.getText()).toMatch(/Super Hero!/); -// }); - - it('should make JSONP request to invalid URL and invoke the error handler', - function() { - invalidJsonpBtn.click(); - fetchBtn.click(); - expect(status.getText()).toMatch('0'); - expect(data.getText()).toMatch('Request failed'); - }); - -
      - */ - function $http(requestConfig) { - var config = { - method: 'get', - transformRequest: defaults.transformRequest, - transformResponse: defaults.transformResponse - }; - var headers = mergeHeaders(requestConfig); - - if (!angular.isObject(requestConfig)) { - throw minErr('$http')('badreq', 'Http request configuration must be an object. Received: {0}', requestConfig); - } - - extend(config, requestConfig); - config.headers = headers; - config.method = uppercase(config.method); - - var serverRequest = function(config) { - headers = config.headers; - var reqData = transformData(config.data, headersGetter(headers), config.transformRequest); - - // strip content-type if data is undefined - if (isUndefined(reqData)) { - forEach(headers, function(value, header) { - if (lowercase(header) === 'content-type') { - delete headers[header]; - } - }); - } - - if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) { - config.withCredentials = defaults.withCredentials; - } - - // send request - return sendReq(config, reqData, headers).then(transformResponse, transformResponse); - }; - - var chain = [serverRequest, undefined]; - var promise = $q.when(config); - - // apply interceptors - forEach(reversedInterceptors, function(interceptor) { - if (interceptor.request || interceptor.requestError) { - chain.unshift(interceptor.request, interceptor.requestError); - } - if (interceptor.response || interceptor.responseError) { - chain.push(interceptor.response, interceptor.responseError); - } - }); - - while (chain.length) { - var thenFn = chain.shift(); - var rejectFn = chain.shift(); - - promise = promise.then(thenFn, rejectFn); - } - - promise.success = function(fn) { - promise.then(function(response) { - fn(response.data, response.status, response.headers, config); - }); - return promise; - }; - - promise.error = function(fn) { - promise.then(null, function(response) { - fn(response.data, response.status, response.headers, config); - }); - return promise; - }; - - return promise; - - function transformResponse(response) { - // make a copy since the response must be cacheable - var resp = extend({}, response); - if (!response.data) { - resp.data = response.data; - } else { - resp.data = transformData(response.data, response.headers, config.transformResponse); - } - return (isSuccess(response.status)) - ? resp - : $q.reject(resp); - } - - function mergeHeaders(config) { - var defHeaders = defaults.headers, - reqHeaders = extend({}, config.headers), - defHeaderName, lowercaseDefHeaderName, reqHeaderName; - - defHeaders = extend({}, defHeaders.common, defHeaders[lowercase(config.method)]); - - // using for-in instead of forEach to avoid unecessary iteration after header has been found - defaultHeadersIteration: - for (defHeaderName in defHeaders) { - lowercaseDefHeaderName = lowercase(defHeaderName); - - for (reqHeaderName in reqHeaders) { - if (lowercase(reqHeaderName) === lowercaseDefHeaderName) { - continue defaultHeadersIteration; - } - } - - reqHeaders[defHeaderName] = defHeaders[defHeaderName]; - } - - // execute if header value is a function for merged headers - execHeaders(reqHeaders); - return reqHeaders; - - function execHeaders(headers) { - var headerContent; - - forEach(headers, function(headerFn, header) { - if (isFunction(headerFn)) { - headerContent = headerFn(); - if (headerContent != null) { - headers[header] = headerContent; - } else { - delete headers[header]; - } - } - }); - } - } - } - - $http.pendingRequests = []; - - /** - * @ngdoc method - * @name $http#get - * - * @description - * Shortcut method to perform `GET` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - - /** - * @ngdoc method - * @name $http#delete - * - * @description - * Shortcut method to perform `DELETE` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - - /** - * @ngdoc method - * @name $http#head - * - * @description - * Shortcut method to perform `HEAD` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - - /** - * @ngdoc method - * @name $http#jsonp - * - * @description - * Shortcut method to perform `JSONP` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request. - * The name of the callback should be the string `JSON_CALLBACK`. - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - createShortMethods('get', 'delete', 'head', 'jsonp'); - - /** - * @ngdoc method - * @name $http#post - * - * @description - * Shortcut method to perform `POST` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request - * @param {*} data Request content - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - - /** - * @ngdoc method - * @name $http#put - * - * @description - * Shortcut method to perform `PUT` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request - * @param {*} data Request content - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - - /** - * @ngdoc method - * @name $http#patch - * - * @description - * Shortcut method to perform `PATCH` request. - * - * @param {string} url Relative or absolute URL specifying the destination of the request - * @param {*} data Request content - * @param {Object=} config Optional configuration object - * @returns {HttpPromise} Future object - */ - createShortMethodsWithData('post', 'put', 'patch'); - - /** - * @ngdoc property - * @name $http#defaults - * - * @description - * Runtime equivalent of the `$httpProvider.defaults` property. Allows configuration of - * default headers, withCredentials as well as request and response transformations. - * - * See "Setting HTTP Headers" and "Transforming Requests and Responses" sections above. - */ - $http.defaults = defaults; - - - return $http; - - - function createShortMethods(names) { - forEach(arguments, function(name) { - $http[name] = function(url, config) { - return $http(extend(config || {}, { - method: name, - url: url - })); - }; - }); - } - - - function createShortMethodsWithData(name) { - forEach(arguments, function(name) { - $http[name] = function(url, data, config) { - return $http(extend(config || {}, { - method: name, - url: url, - data: data - })); - }; - }); - } - - - /** - * Makes the request. - * - * !!! ACCESSES CLOSURE VARS: - * $httpBackend, defaults, $log, $rootScope, defaultCache, $http.pendingRequests - */ - function sendReq(config, reqData, reqHeaders) { - var deferred = $q.defer(), - promise = deferred.promise, - cache, - cachedResp, - url = buildUrl(config.url, config.params); - - $http.pendingRequests.push(config); - promise.then(removePendingReq, removePendingReq); - - - if ((config.cache || defaults.cache) && config.cache !== false && - (config.method === 'GET' || config.method === 'JSONP')) { - cache = isObject(config.cache) ? config.cache - : isObject(defaults.cache) ? defaults.cache - : defaultCache; - } - - if (cache) { - cachedResp = cache.get(url); - if (isDefined(cachedResp)) { - if (isPromiseLike(cachedResp)) { - // cached request has already been sent, but there is no response yet - cachedResp.then(removePendingReq, removePendingReq); - return cachedResp; - } else { - // serving from cache - if (isArray(cachedResp)) { - resolvePromise(cachedResp[1], cachedResp[0], shallowCopy(cachedResp[2]), cachedResp[3]); - } else { - resolvePromise(cachedResp, 200, {}, 'OK'); - } - } - } else { - // put the promise for the non-transformed response into cache as a placeholder - cache.put(url, promise); - } - } - - - // if we won't have the response in cache, set the xsrf headers and - // send the request to the backend - if (isUndefined(cachedResp)) { - var xsrfValue = urlIsSameOrigin(config.url) - ? $browser.cookies()[config.xsrfCookieName || defaults.xsrfCookieName] - : undefined; - if (xsrfValue) { - reqHeaders[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue; - } - - $httpBackend(config.method, url, reqData, done, reqHeaders, config.timeout, - config.withCredentials, config.responseType); - } - - return promise; - - - /** - * Callback registered to $httpBackend(): - * - caches the response if desired - * - resolves the raw $http promise - * - calls $apply - */ - function done(status, response, headersString, statusText) { - if (cache) { - if (isSuccess(status)) { - cache.put(url, [status, response, parseHeaders(headersString), statusText]); - } else { - // remove promise from the cache - cache.remove(url); - } - } - - function resolveHttpPromise() { - resolvePromise(response, status, headersString, statusText); - } - - if (useApplyAsync) { - $rootScope.$applyAsync(resolveHttpPromise); - } else { - resolveHttpPromise(); - if (!$rootScope.$$phase) $rootScope.$apply(); - } - } - - - /** - * Resolves the raw $http promise. - */ - function resolvePromise(response, status, headers, statusText) { - // normalize internal statuses to 0 - status = Math.max(status, 0); - - (isSuccess(status) ? deferred.resolve : deferred.reject)({ - data: response, - status: status, - headers: headersGetter(headers), - config: config, - statusText: statusText - }); - } - - - function removePendingReq() { - var idx = $http.pendingRequests.indexOf(config); - if (idx !== -1) $http.pendingRequests.splice(idx, 1); - } - } - - - function buildUrl(url, params) { - if (!params) return url; - var parts = []; - forEachSorted(params, function(value, key) { - if (value === null || isUndefined(value)) return; - if (!isArray(value)) value = [value]; - - forEach(value, function(v) { - if (isObject(v)) { - if (isDate(v)) { - v = v.toISOString(); - } else { - v = toJson(v); - } - } - parts.push(encodeUriQuery(key) + '=' + - encodeUriQuery(v)); - }); - }); - if (parts.length > 0) { - url += ((url.indexOf('?') == -1) ? '?' : '&') + parts.join('&'); - } - return url; - } - }]; -} - -function createXhr() { - return new window.XMLHttpRequest(); -} - -/** - * @ngdoc service - * @name $httpBackend - * @requires $window - * @requires $document - * - * @description - * HTTP backend used by the {@link ng.$http service} that delegates to - * XMLHttpRequest object or JSONP and deals with browser incompatibilities. - * - * You should never need to use this service directly, instead use the higher-level abstractions: - * {@link ng.$http $http} or {@link ngResource.$resource $resource}. - * - * During testing this implementation is swapped with {@link ngMock.$httpBackend mock - * $httpBackend} which can be trained with responses. - */ -function $HttpBackendProvider() { - this.$get = ['$browser', '$window', '$document', function($browser, $window, $document) { - return createHttpBackend($browser, createXhr, $browser.defer, $window.angular.callbacks, $document[0]); - }]; -} - -function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDocument) { - // TODO(vojta): fix the signature - return function(method, url, post, callback, headers, timeout, withCredentials, responseType) { - $browser.$$incOutstandingRequestCount(); - url = url || $browser.url(); - - if (lowercase(method) == 'jsonp') { - var callbackId = '_' + (callbacks.counter++).toString(36); - callbacks[callbackId] = function(data) { - callbacks[callbackId].data = data; - callbacks[callbackId].called = true; - }; - - var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId), - callbackId, function(status, text) { - completeRequest(callback, status, callbacks[callbackId].data, "", text); - callbacks[callbackId] = noop; - }); - } else { - - var xhr = createXhr(); - - xhr.open(method, url, true); - forEach(headers, function(value, key) { - if (isDefined(value)) { - xhr.setRequestHeader(key, value); - } - }); - - xhr.onload = function requestLoaded() { - var statusText = xhr.statusText || ''; - - // responseText is the old-school way of retrieving response (supported by IE8 & 9) - // response/responseType properties were introduced in XHR Level2 spec (supported by IE10) - var response = ('response' in xhr) ? xhr.response : xhr.responseText; - - // normalize IE9 bug (http://bugs.jquery.com/ticket/1450) - var status = xhr.status === 1223 ? 204 : xhr.status; - - // fix status code when it is 0 (0 status is undocumented). - // Occurs when accessing file resources or on Android 4.1 stock browser - // while retrieving files from application cache. - if (status === 0) { - status = response ? 200 : urlResolve(url).protocol == 'file' ? 404 : 0; - } - - completeRequest(callback, - status, - response, - xhr.getAllResponseHeaders(), - statusText); - }; - - var requestError = function() { - // The response is always empty - // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error - completeRequest(callback, -1, null, null, ''); - }; - - xhr.onerror = requestError; - xhr.onabort = requestError; - - if (withCredentials) { - xhr.withCredentials = true; - } - - if (responseType) { - try { - xhr.responseType = responseType; - } catch (e) { - // WebKit added support for the json responseType value on 09/03/2013 - // https://bugs.webkit.org/show_bug.cgi?id=73648. Versions of Safari prior to 7 are - // known to throw when setting the value "json" as the response type. Other older - // browsers implementing the responseType - // - // The json response type can be ignored if not supported, because JSON payloads are - // parsed on the client-side regardless. - if (responseType !== 'json') { - throw e; - } - } - } - - xhr.send(post || null); - } - - if (timeout > 0) { - var timeoutId = $browserDefer(timeoutRequest, timeout); - } else if (isPromiseLike(timeout)) { - timeout.then(timeoutRequest); - } - - - function timeoutRequest() { - jsonpDone && jsonpDone(); - xhr && xhr.abort(); - } - - function completeRequest(callback, status, response, headersString, statusText) { - // cancel timeout and subsequent timeout promise resolution - if (timeoutId !== undefined) { - $browserDefer.cancel(timeoutId); - } - jsonpDone = xhr = null; - - callback(status, response, headersString, statusText); - $browser.$$completeOutstandingRequest(noop); - } - }; - - function jsonpReq(url, callbackId, done) { - // we can't use jQuery/jqLite here because jQuery does crazy shit with script elements, e.g.: - // - fetches local scripts via XHR and evals them - // - adds and immediately removes script elements from the document - var script = rawDocument.createElement('script'), callback = null; - script.type = "text/javascript"; - script.src = url; - script.async = true; - - callback = function(event) { - removeEventListenerFn(script, "load", callback); - removeEventListenerFn(script, "error", callback); - rawDocument.body.removeChild(script); - script = null; - var status = -1; - var text = "unknown"; - - if (event) { - if (event.type === "load" && !callbacks[callbackId].called) { - event = { type: "error" }; - } - text = event.type; - status = event.type === "error" ? 404 : 200; - } - - if (done) { - done(status, text); - } - }; - - addEventListenerFn(script, "load", callback); - addEventListenerFn(script, "error", callback); - rawDocument.body.appendChild(script); - return callback; - } -} - -var $interpolateMinErr = minErr('$interpolate'); - -/** - * @ngdoc provider - * @name $interpolateProvider - * - * @description - * - * Used for configuring the interpolation markup. Defaults to `{{` and `}}`. - * - * @example - - - -
      - //demo.label// -
      -
      - - it('should interpolate binding with custom symbols', function() { - expect(element(by.binding('demo.label')).getText()).toBe('This binding is brought you by // interpolation symbols.'); - }); - -
      - */ -function $InterpolateProvider() { - var startSymbol = '{{'; - var endSymbol = '}}'; - - /** - * @ngdoc method - * @name $interpolateProvider#startSymbol - * @description - * Symbol to denote start of expression in the interpolated string. Defaults to `{{`. - * - * @param {string=} value new value to set the starting symbol to. - * @returns {string|self} Returns the symbol when used as getter and self if used as setter. - */ - this.startSymbol = function(value) { - if (value) { - startSymbol = value; - return this; - } else { - return startSymbol; - } - }; - - /** - * @ngdoc method - * @name $interpolateProvider#endSymbol - * @description - * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`. - * - * @param {string=} value new value to set the ending symbol to. - * @returns {string|self} Returns the symbol when used as getter and self if used as setter. - */ - this.endSymbol = function(value) { - if (value) { - endSymbol = value; - return this; - } else { - return endSymbol; - } - }; - - - this.$get = ['$parse', '$exceptionHandler', '$sce', function($parse, $exceptionHandler, $sce) { - var startSymbolLength = startSymbol.length, - endSymbolLength = endSymbol.length, - escapedStartRegexp = new RegExp(startSymbol.replace(/./g, escape), 'g'), - escapedEndRegexp = new RegExp(endSymbol.replace(/./g, escape), 'g'); - - function escape(ch) { - return '\\\\\\' + ch; - } - - /** - * @ngdoc service - * @name $interpolate - * @kind function - * - * @requires $parse - * @requires $sce - * - * @description - * - * Compiles a string with markup into an interpolation function. This service is used by the - * HTML {@link ng.$compile $compile} service for data binding. See - * {@link ng.$interpolateProvider $interpolateProvider} for configuring the - * interpolation markup. - * - * - * ```js - * var $interpolate = ...; // injected - * var exp = $interpolate('Hello {{name | uppercase}}!'); - * expect(exp({name:'Angular'}).toEqual('Hello ANGULAR!'); - * ``` - * - * `$interpolate` takes an optional fourth argument, `allOrNothing`. If `allOrNothing` is - * `true`, the interpolation function will return `undefined` unless all embedded expressions - * evaluate to a value other than `undefined`. - * - * ```js - * var $interpolate = ...; // injected - * var context = {greeting: 'Hello', name: undefined }; - * - * // default "forgiving" mode - * var exp = $interpolate('{{greeting}} {{name}}!'); - * expect(exp(context)).toEqual('Hello !'); - * - * // "allOrNothing" mode - * exp = $interpolate('{{greeting}} {{name}}!', false, null, true); - * expect(exp(context)).toBeUndefined(); - * context.name = 'Angular'; - * expect(exp(context)).toEqual('Hello Angular!'); - * ``` - * - * `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior. - * - * ####Escaped Interpolation - * $interpolate provides a mechanism for escaping interpolation markers. Start and end markers - * can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash). - * It will be rendered as a regular start/end marker, and will not be interpreted as an expression - * or binding. - * - * This enables web-servers to prevent script injection attacks and defacing attacks, to some - * degree, while also enabling code examples to work without relying on the - * {@link ng.directive:ngNonBindable ngNonBindable} directive. - * - * **For security purposes, it is strongly encouraged that web servers escape user-supplied data, - * replacing angle brackets (<, >) with &lt; and &gt; respectively, and replacing all - * interpolation start/end markers with their escaped counterparts.** - * - * Escaped interpolation markers are only replaced with the actual interpolation markers in rendered - * output when the $interpolate service processes the text. So, for HTML elements interpolated - * by {@link ng.$compile $compile}, or otherwise interpolated with the `mustHaveExpression` parameter - * set to `true`, the interpolated text must contain an unescaped interpolation expression. As such, - * this is typically useful only when user-data is used in rendering a template from the server, or - * when otherwise untrusted data is used by a directive. - * - * - * - *
      - *

      {{apptitle}}: \{\{ username = "defaced value"; \}\} - *

      - *

      {{username}} attempts to inject code which will deface the - * application, but fails to accomplish their task, because the server has correctly - * escaped the interpolation start/end markers with REVERSE SOLIDUS U+005C (backslash) - * characters.

      - *

      Instead, the result of the attempted script injection is visible, and can be removed - * from the database by an administrator.

      - *
      - *
      - *
      - * - * @param {string} text The text with markup to interpolate. - * @param {boolean=} mustHaveExpression if set to true then the interpolation string must have - * embedded expression in order to return an interpolation function. Strings with no - * embedded expression will return null for the interpolation function. - * @param {string=} trustedContext when provided, the returned function passes the interpolated - * result through {@link ng.$sce#getTrusted $sce.getTrusted(interpolatedResult, - * trustedContext)} before returning it. Refer to the {@link ng.$sce $sce} service that - * provides Strict Contextual Escaping for details. - * @param {boolean=} allOrNothing if `true`, then the returned function returns undefined - * unless all embedded expressions evaluate to a value other than `undefined`. - * @returns {function(context)} an interpolation function which is used to compute the - * interpolated string. The function has these parameters: - * - * - `context`: evaluation context for all expressions embedded in the interpolated text - */ - function $interpolate(text, mustHaveExpression, trustedContext, allOrNothing) { - allOrNothing = !!allOrNothing; - var startIndex, - endIndex, - index = 0, - expressions = [], - parseFns = [], - textLength = text.length, - exp, - concat = [], - expressionPositions = []; - - while (index < textLength) { - if (((startIndex = text.indexOf(startSymbol, index)) != -1) && - ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) != -1)) { - if (index !== startIndex) { - concat.push(unescapeText(text.substring(index, startIndex))); - } - exp = text.substring(startIndex + startSymbolLength, endIndex); - expressions.push(exp); - parseFns.push($parse(exp, parseStringifyInterceptor)); - index = endIndex + endSymbolLength; - expressionPositions.push(concat.length); - concat.push(''); - } else { - // we did not find an interpolation, so we have to add the remainder to the separators array - if (index !== textLength) { - concat.push(unescapeText(text.substring(index))); - } - break; - } - } - - // Concatenating expressions makes it hard to reason about whether some combination of - // concatenated values are unsafe to use and could easily lead to XSS. By requiring that a - // single expression be used for iframe[src], object[src], etc., we ensure that the value - // that's used is assigned or constructed by some JS code somewhere that is more testable or - // make it obvious that you bound the value to some user controlled value. This helps reduce - // the load when auditing for XSS issues. - if (trustedContext && concat.length > 1) { - throw $interpolateMinErr('noconcat', - "Error while interpolating: {0}\nStrict Contextual Escaping disallows " + - "interpolations that concatenate multiple expressions when a trusted value is " + - "required. See http://docs.angularjs.org/api/ng.$sce", text); - } - - if (!mustHaveExpression || expressions.length) { - var compute = function(values) { - for (var i = 0, ii = expressions.length; i < ii; i++) { - if (allOrNothing && isUndefined(values[i])) return; - concat[expressionPositions[i]] = values[i]; - } - return concat.join(''); - }; - - var getValue = function(value) { - return trustedContext ? - $sce.getTrusted(trustedContext, value) : - $sce.valueOf(value); - }; - - var stringify = function(value) { - if (value == null) { // null || undefined - return ''; - } - switch (typeof value) { - case 'string': - break; - case 'number': - value = '' + value; - break; - default: - value = toJson(value); - } - - return value; - }; - - return extend(function interpolationFn(context) { - var i = 0; - var ii = expressions.length; - var values = new Array(ii); - - try { - for (; i < ii; i++) { - values[i] = parseFns[i](context); - } - - return compute(values); - } catch (err) { - var newErr = $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text, - err.toString()); - $exceptionHandler(newErr); - } - - }, { - // all of these properties are undocumented for now - exp: text, //just for compatibility with regular watchers created via $watch - expressions: expressions, - $$watchDelegate: function(scope, listener, objectEquality) { - var lastValue; - return scope.$watchGroup(parseFns, function interpolateFnWatcher(values, oldValues) { - var currValue = compute(values); - if (isFunction(listener)) { - listener.call(this, currValue, values !== oldValues ? lastValue : currValue, scope); - } - lastValue = currValue; - }, objectEquality); - } - }); - } - - function unescapeText(text) { - return text.replace(escapedStartRegexp, startSymbol). - replace(escapedEndRegexp, endSymbol); - } - - function parseStringifyInterceptor(value) { - try { - value = getValue(value); - return allOrNothing && !isDefined(value) ? value : stringify(value); - } catch (err) { - var newErr = $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text, - err.toString()); - $exceptionHandler(newErr); - } - } - } - - - /** - * @ngdoc method - * @name $interpolate#startSymbol - * @description - * Symbol to denote the start of expression in the interpolated string. Defaults to `{{`. - * - * Use {@link ng.$interpolateProvider#startSymbol `$interpolateProvider.startSymbol`} to change - * the symbol. - * - * @returns {string} start symbol. - */ - $interpolate.startSymbol = function() { - return startSymbol; - }; - - - /** - * @ngdoc method - * @name $interpolate#endSymbol - * @description - * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`. - * - * Use {@link ng.$interpolateProvider#endSymbol `$interpolateProvider.endSymbol`} to change - * the symbol. - * - * @returns {string} end symbol. - */ - $interpolate.endSymbol = function() { - return endSymbol; - }; - - return $interpolate; - }]; -} - -function $IntervalProvider() { - this.$get = ['$rootScope', '$window', '$q', '$$q', - function($rootScope, $window, $q, $$q) { - var intervals = {}; - - - /** - * @ngdoc service - * @name $interval - * - * @description - * Angular's wrapper for `window.setInterval`. The `fn` function is executed every `delay` - * milliseconds. - * - * The return value of registering an interval function is a promise. This promise will be - * notified upon each tick of the interval, and will be resolved after `count` iterations, or - * run indefinitely if `count` is not defined. The value of the notification will be the - * number of iterations that have run. - * To cancel an interval, call `$interval.cancel(promise)`. - * - * In tests you can use {@link ngMock.$interval#flush `$interval.flush(millis)`} to - * move forward by `millis` milliseconds and trigger any functions scheduled to run in that - * time. - * - *
      - * **Note**: Intervals created by this service must be explicitly destroyed when you are finished - * with them. In particular they are not automatically destroyed when a controller's scope or a - * directive's element are destroyed. - * You should take this into consideration and make sure to always cancel the interval at the - * appropriate moment. See the example below for more details on how and when to do this. - *
      - * - * @param {function()} fn A function that should be called repeatedly. - * @param {number} delay Number of milliseconds between each function call. - * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat - * indefinitely. - * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise - * will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block. - * @returns {promise} A promise which will be notified on each iteration. - * - * @example - * - * - * - * - *
      - *
      - * Date format:
      - * Current time is: - *
      - * Blood 1 : {{blood_1}} - * Blood 2 : {{blood_2}} - * - * - * - *
      - *
      - * - *
      - *
      - */ - function interval(fn, delay, count, invokeApply) { - var setInterval = $window.setInterval, - clearInterval = $window.clearInterval, - iteration = 0, - skipApply = (isDefined(invokeApply) && !invokeApply), - deferred = (skipApply ? $$q : $q).defer(), - promise = deferred.promise; - - count = isDefined(count) ? count : 0; - - promise.then(null, null, fn); - - promise.$$intervalId = setInterval(function tick() { - deferred.notify(iteration++); - - if (count > 0 && iteration >= count) { - deferred.resolve(iteration); - clearInterval(promise.$$intervalId); - delete intervals[promise.$$intervalId]; - } - - if (!skipApply) $rootScope.$apply(); - - }, delay); - - intervals[promise.$$intervalId] = deferred; - - return promise; - } - - - /** - * @ngdoc method - * @name $interval#cancel - * - * @description - * Cancels a task associated with the `promise`. - * - * @param {promise} promise returned by the `$interval` function. - * @returns {boolean} Returns `true` if the task was successfully canceled. - */ - interval.cancel = function(promise) { - if (promise && promise.$$intervalId in intervals) { - intervals[promise.$$intervalId].reject('canceled'); - $window.clearInterval(promise.$$intervalId); - delete intervals[promise.$$intervalId]; - return true; - } - return false; - }; - - return interval; - }]; -} - -/** - * @ngdoc service - * @name $locale - * - * @description - * $locale service provides localization rules for various Angular components. As of right now the - * only public api is: - * - * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`) - */ -function $LocaleProvider() { - this.$get = function() { - return { - id: 'en-us', - - NUMBER_FORMATS: { - DECIMAL_SEP: '.', - GROUP_SEP: ',', - PATTERNS: [ - { // Decimal Pattern - minInt: 1, - minFrac: 0, - maxFrac: 3, - posPre: '', - posSuf: '', - negPre: '-', - negSuf: '', - gSize: 3, - lgSize: 3 - },{ //Currency Pattern - minInt: 1, - minFrac: 2, - maxFrac: 2, - posPre: '\u00A4', - posSuf: '', - negPre: '(\u00A4', - negSuf: ')', - gSize: 3, - lgSize: 3 - } - ], - CURRENCY_SYM: '$' - }, - - DATETIME_FORMATS: { - MONTH: - 'January,February,March,April,May,June,July,August,September,October,November,December' - .split(','), - SHORTMONTH: 'Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec'.split(','), - DAY: 'Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday'.split(','), - SHORTDAY: 'Sun,Mon,Tue,Wed,Thu,Fri,Sat'.split(','), - AMPMS: ['AM','PM'], - medium: 'MMM d, y h:mm:ss a', - 'short': 'M/d/yy h:mm a', - fullDate: 'EEEE, MMMM d, y', - longDate: 'MMMM d, y', - mediumDate: 'MMM d, y', - shortDate: 'M/d/yy', - mediumTime: 'h:mm:ss a', - shortTime: 'h:mm a' - }, - - pluralCat: function(num) { - if (num === 1) { - return 'one'; - } - return 'other'; - } - }; - }; -} - -var PATH_MATCH = /^([^\?#]*)(\?([^#]*))?(#(.*))?$/, - DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21}; -var $locationMinErr = minErr('$location'); - - -/** - * Encode path using encodeUriSegment, ignoring forward slashes - * - * @param {string} path Path to encode - * @returns {string} - */ -function encodePath(path) { - var segments = path.split('/'), - i = segments.length; - - while (i--) { - segments[i] = encodeUriSegment(segments[i]); - } - - return segments.join('/'); -} - -function parseAbsoluteUrl(absoluteUrl, locationObj) { - var parsedUrl = urlResolve(absoluteUrl); - - locationObj.$$protocol = parsedUrl.protocol; - locationObj.$$host = parsedUrl.hostname; - locationObj.$$port = int(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null; -} - - -function parseAppUrl(relativeUrl, locationObj) { - var prefixed = (relativeUrl.charAt(0) !== '/'); - if (prefixed) { - relativeUrl = '/' + relativeUrl; - } - var match = urlResolve(relativeUrl); - locationObj.$$path = decodeURIComponent(prefixed && match.pathname.charAt(0) === '/' ? - match.pathname.substring(1) : match.pathname); - locationObj.$$search = parseKeyValue(match.search); - locationObj.$$hash = decodeURIComponent(match.hash); - - // make sure path starts with '/'; - if (locationObj.$$path && locationObj.$$path.charAt(0) != '/') { - locationObj.$$path = '/' + locationObj.$$path; - } -} - - -/** - * - * @param {string} begin - * @param {string} whole - * @returns {string} returns text from whole after begin or undefined if it does not begin with - * expected string. - */ -function beginsWith(begin, whole) { - if (whole.indexOf(begin) === 0) { - return whole.substr(begin.length); - } -} - - -function stripHash(url) { - var index = url.indexOf('#'); - return index == -1 ? url : url.substr(0, index); -} - - -function stripFile(url) { - return url.substr(0, stripHash(url).lastIndexOf('/') + 1); -} - -/* return the server only (scheme://host:port) */ -function serverBase(url) { - return url.substring(0, url.indexOf('/', url.indexOf('//') + 2)); -} - - -/** - * LocationHtml5Url represents an url - * This object is exposed as $location service when HTML5 mode is enabled and supported - * - * @constructor - * @param {string} appBase application base URL - * @param {string} basePrefix url path prefix - */ -function LocationHtml5Url(appBase, basePrefix) { - this.$$html5 = true; - basePrefix = basePrefix || ''; - var appBaseNoFile = stripFile(appBase); - parseAbsoluteUrl(appBase, this); - - - /** - * Parse given html5 (regular) url string into properties - * @param {string} url HTML5 url - * @private - */ - this.$$parse = function(url) { - var pathUrl = beginsWith(appBaseNoFile, url); - if (!isString(pathUrl)) { - throw $locationMinErr('ipthprfx', 'Invalid url "{0}", missing path prefix "{1}".', url, - appBaseNoFile); - } - - parseAppUrl(pathUrl, this); - - if (!this.$$path) { - this.$$path = '/'; - } - - this.$$compose(); - }; - - /** - * Compose url and update `absUrl` property - * @private - */ - this.$$compose = function() { - var search = toKeyValue(this.$$search), - hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : ''; - - this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; - this.$$absUrl = appBaseNoFile + this.$$url.substr(1); // first char is always '/' - }; - - this.$$parseLinkUrl = function(url, relHref) { - if (relHref && relHref[0] === '#') { - // special case for links to hash fragments: - // keep the old url and only replace the hash fragment - this.hash(relHref.slice(1)); - return true; - } - var appUrl, prevAppUrl; - var rewrittenUrl; - - if ((appUrl = beginsWith(appBase, url)) !== undefined) { - prevAppUrl = appUrl; - if ((appUrl = beginsWith(basePrefix, appUrl)) !== undefined) { - rewrittenUrl = appBaseNoFile + (beginsWith('/', appUrl) || appUrl); - } else { - rewrittenUrl = appBase + prevAppUrl; - } - } else if ((appUrl = beginsWith(appBaseNoFile, url)) !== undefined) { - rewrittenUrl = appBaseNoFile + appUrl; - } else if (appBaseNoFile == url + '/') { - rewrittenUrl = appBaseNoFile; - } - if (rewrittenUrl) { - this.$$parse(rewrittenUrl); - } - return !!rewrittenUrl; - }; -} - - -/** - * LocationHashbangUrl represents url - * This object is exposed as $location service when developer doesn't opt into html5 mode. - * It also serves as the base class for html5 mode fallback on legacy browsers. - * - * @constructor - * @param {string} appBase application base URL - * @param {string} hashPrefix hashbang prefix - */ -function LocationHashbangUrl(appBase, hashPrefix) { - var appBaseNoFile = stripFile(appBase); - - parseAbsoluteUrl(appBase, this); - - - /** - * Parse given hashbang url into properties - * @param {string} url Hashbang url - * @private - */ - this.$$parse = function(url) { - var withoutBaseUrl = beginsWith(appBase, url) || beginsWith(appBaseNoFile, url); - var withoutHashUrl = withoutBaseUrl.charAt(0) == '#' - ? beginsWith(hashPrefix, withoutBaseUrl) - : (this.$$html5) - ? withoutBaseUrl - : ''; - - if (!isString(withoutHashUrl)) { - throw $locationMinErr('ihshprfx', 'Invalid url "{0}", missing hash prefix "{1}".', url, - hashPrefix); - } - parseAppUrl(withoutHashUrl, this); - - this.$$path = removeWindowsDriveName(this.$$path, withoutHashUrl, appBase); - - this.$$compose(); - - /* - * In Windows, on an anchor node on documents loaded from - * the filesystem, the browser will return a pathname - * prefixed with the drive name ('/C:/path') when a - * pathname without a drive is set: - * * a.setAttribute('href', '/foo') - * * a.pathname === '/C:/foo' //true - * - * Inside of Angular, we're always using pathnames that - * do not include drive names for routing. - */ - function removeWindowsDriveName(path, url, base) { - /* - Matches paths for file protocol on windows, - such as /C:/foo/bar, and captures only /foo/bar. - */ - var windowsFilePathExp = /^\/[A-Z]:(\/.*)/; - - var firstPathSegmentMatch; - - //Get the relative path from the input URL. - if (url.indexOf(base) === 0) { - url = url.replace(base, ''); - } - - // The input URL intentionally contains a first path segment that ends with a colon. - if (windowsFilePathExp.exec(url)) { - return path; - } - - firstPathSegmentMatch = windowsFilePathExp.exec(path); - return firstPathSegmentMatch ? firstPathSegmentMatch[1] : path; - } - }; - - /** - * Compose hashbang url and update `absUrl` property - * @private - */ - this.$$compose = function() { - var search = toKeyValue(this.$$search), - hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : ''; - - this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; - this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : ''); - }; - - this.$$parseLinkUrl = function(url, relHref) { - if (stripHash(appBase) == stripHash(url)) { - this.$$parse(url); - return true; - } - return false; - }; -} - - -/** - * LocationHashbangUrl represents url - * This object is exposed as $location service when html5 history api is enabled but the browser - * does not support it. - * - * @constructor - * @param {string} appBase application base URL - * @param {string} hashPrefix hashbang prefix - */ -function LocationHashbangInHtml5Url(appBase, hashPrefix) { - this.$$html5 = true; - LocationHashbangUrl.apply(this, arguments); - - var appBaseNoFile = stripFile(appBase); - - this.$$parseLinkUrl = function(url, relHref) { - if (relHref && relHref[0] === '#') { - // special case for links to hash fragments: - // keep the old url and only replace the hash fragment - this.hash(relHref.slice(1)); - return true; - } - - var rewrittenUrl; - var appUrl; - - if (appBase == stripHash(url)) { - rewrittenUrl = url; - } else if ((appUrl = beginsWith(appBaseNoFile, url))) { - rewrittenUrl = appBase + hashPrefix + appUrl; - } else if (appBaseNoFile === url + '/') { - rewrittenUrl = appBaseNoFile; - } - if (rewrittenUrl) { - this.$$parse(rewrittenUrl); - } - return !!rewrittenUrl; - }; - - this.$$compose = function() { - var search = toKeyValue(this.$$search), - hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : ''; - - this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; - // include hashPrefix in $$absUrl when $$url is empty so IE8 & 9 do not reload page because of removal of '#' - this.$$absUrl = appBase + hashPrefix + this.$$url; - }; - -} - - -var locationPrototype = { - - /** - * Are we in html5 mode? - * @private - */ - $$html5: false, - - /** - * Has any change been replacing? - * @private - */ - $$replace: false, - - /** - * @ngdoc method - * @name $location#absUrl - * - * @description - * This method is getter only. - * - * Return full url representation with all segments encoded according to rules specified in - * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt). - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var absUrl = $location.absUrl(); - * // => "http://example.com/#/some/path?foo=bar&baz=xoxo" - * ``` - * - * @return {string} full url - */ - absUrl: locationGetter('$$absUrl'), - - /** - * @ngdoc method - * @name $location#url - * - * @description - * This method is getter / setter. - * - * Return url (e.g. `/path?a=b#hash`) when called without any parameter. - * - * Change path, search and hash, when called with parameter and return `$location`. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var url = $location.url(); - * // => "/some/path?foo=bar&baz=xoxo" - * ``` - * - * @param {string=} url New url without base prefix (e.g. `/path?a=b#hash`) - * @return {string} url - */ - url: function(url) { - if (isUndefined(url)) - return this.$$url; - - var match = PATH_MATCH.exec(url); - if (match[1] || url === '') this.path(decodeURIComponent(match[1])); - if (match[2] || match[1] || url === '') this.search(match[3] || ''); - this.hash(match[5] || ''); - - return this; - }, - - /** - * @ngdoc method - * @name $location#protocol - * - * @description - * This method is getter only. - * - * Return protocol of current url. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var protocol = $location.protocol(); - * // => "http" - * ``` - * - * @return {string} protocol of current url - */ - protocol: locationGetter('$$protocol'), - - /** - * @ngdoc method - * @name $location#host - * - * @description - * This method is getter only. - * - * Return host of current url. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var host = $location.host(); - * // => "example.com" - * ``` - * - * @return {string} host of current url. - */ - host: locationGetter('$$host'), - - /** - * @ngdoc method - * @name $location#port - * - * @description - * This method is getter only. - * - * Return port of current url. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var port = $location.port(); - * // => 80 - * ``` - * - * @return {Number} port - */ - port: locationGetter('$$port'), - - /** - * @ngdoc method - * @name $location#path - * - * @description - * This method is getter / setter. - * - * Return path of current url when called without any parameter. - * - * Change path when called with parameter and return `$location`. - * - * Note: Path should always begin with forward slash (/), this method will add the forward slash - * if it is missing. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var path = $location.path(); - * // => "/some/path" - * ``` - * - * @param {(string|number)=} path New path - * @return {string} path - */ - path: locationGetterSetter('$$path', function(path) { - path = path !== null ? path.toString() : ''; - return path.charAt(0) == '/' ? path : '/' + path; - }), - - /** - * @ngdoc method - * @name $location#search - * - * @description - * This method is getter / setter. - * - * Return search part (as object) of current url when called without any parameter. - * - * Change search part when called with parameter and return `$location`. - * - * - * ```js - * // given url http://example.com/#/some/path?foo=bar&baz=xoxo - * var searchObject = $location.search(); - * // => {foo: 'bar', baz: 'xoxo'} - * - * // set foo to 'yipee' - * $location.search('foo', 'yipee'); - * // $location.search() => {foo: 'yipee', baz: 'xoxo'} - * ``` - * - * @param {string|Object.|Object.>} search New search params - string or - * hash object. - * - * When called with a single argument the method acts as a setter, setting the `search` component - * of `$location` to the specified value. - * - * If the argument is a hash object containing an array of values, these values will be encoded - * as duplicate search parameters in the url. - * - * @param {(string|Number|Array|boolean)=} paramValue If `search` is a string or number, then `paramValue` - * will override only a single search property. - * - * If `paramValue` is an array, it will override the property of the `search` component of - * `$location` specified via the first argument. - * - * If `paramValue` is `null`, the property specified via the first argument will be deleted. - * - * If `paramValue` is `true`, the property specified via the first argument will be added with no - * value nor trailing equal sign. - * - * @return {Object} If called with no arguments returns the parsed `search` object. If called with - * one or more arguments returns `$location` object itself. - */ - search: function(search, paramValue) { - switch (arguments.length) { - case 0: - return this.$$search; - case 1: - if (isString(search) || isNumber(search)) { - search = search.toString(); - this.$$search = parseKeyValue(search); - } else if (isObject(search)) { - search = copy(search, {}); - // remove object undefined or null properties - forEach(search, function(value, key) { - if (value == null) delete search[key]; - }); - - this.$$search = search; - } else { - throw $locationMinErr('isrcharg', - 'The first argument of the `$location#search()` call must be a string or an object.'); - } - break; - default: - if (isUndefined(paramValue) || paramValue === null) { - delete this.$$search[search]; - } else { - this.$$search[search] = paramValue; - } - } - - this.$$compose(); - return this; - }, - - /** - * @ngdoc method - * @name $location#hash - * - * @description - * This method is getter / setter. - * - * Return hash fragment when called without any parameter. - * - * Change hash fragment when called with parameter and return `$location`. - * - * - * ```js - * // given url http://example.com/some/path?foo=bar&baz=xoxo#hashValue - * var hash = $location.hash(); - * // => "hashValue" - * ``` - * - * @param {(string|number)=} hash New hash fragment - * @return {string} hash - */ - hash: locationGetterSetter('$$hash', function(hash) { - return hash !== null ? hash.toString() : ''; - }), - - /** - * @ngdoc method - * @name $location#replace - * - * @description - * If called, all changes to $location during current `$digest` will be replacing current history - * record, instead of adding new one. - */ - replace: function() { - this.$$replace = true; - return this; - } -}; - -forEach([LocationHashbangInHtml5Url, LocationHashbangUrl, LocationHtml5Url], function(Location) { - Location.prototype = Object.create(locationPrototype); - - /** - * @ngdoc method - * @name $location#state - * - * @description - * This method is getter / setter. - * - * Return the history state object when called without any parameter. - * - * Change the history state object when called with one parameter and return `$location`. - * The state object is later passed to `pushState` or `replaceState`. - * - * NOTE: This method is supported only in HTML5 mode and only in browsers supporting - * the HTML5 History API (i.e. methods `pushState` and `replaceState`). If you need to support - * older browsers (like IE9 or Android < 4.0), don't use this method. - * - * @param {object=} state State object for pushState or replaceState - * @return {object} state - */ - Location.prototype.state = function(state) { - if (!arguments.length) - return this.$$state; - - if (Location !== LocationHtml5Url || !this.$$html5) { - throw $locationMinErr('nostate', 'History API state support is available only ' + - 'in HTML5 mode and only in browsers supporting HTML5 History API'); - } - // The user might modify `stateObject` after invoking `$location.state(stateObject)` - // but we're changing the $$state reference to $browser.state() during the $digest - // so the modification window is narrow. - this.$$state = isUndefined(state) ? null : state; - - return this; - }; -}); - - -function locationGetter(property) { - return function() { - return this[property]; - }; -} - - -function locationGetterSetter(property, preprocess) { - return function(value) { - if (isUndefined(value)) - return this[property]; - - this[property] = preprocess(value); - this.$$compose(); - - return this; - }; -} - - -/** - * @ngdoc service - * @name $location - * - * @requires $rootElement - * - * @description - * The $location service parses the URL in the browser address bar (based on the - * [window.location](https://developer.mozilla.org/en/window.location)) and makes the URL - * available to your application. Changes to the URL in the address bar are reflected into - * $location service and changes to $location are reflected into the browser address bar. - * - * **The $location service:** - * - * - Exposes the current URL in the browser address bar, so you can - * - Watch and observe the URL. - * - Change the URL. - * - Synchronizes the URL with the browser when the user - * - Changes the address bar. - * - Clicks the back or forward button (or clicks a History link). - * - Clicks on a link. - * - Represents the URL object as a set of methods (protocol, host, port, path, search, hash). - * - * For more information see {@link guide/$location Developer Guide: Using $location} - */ - -/** - * @ngdoc provider - * @name $locationProvider - * @description - * Use the `$locationProvider` to configure how the application deep linking paths are stored. - */ -function $LocationProvider() { - var hashPrefix = '', - html5Mode = { - enabled: false, - requireBase: true, - rewriteLinks: true - }; - - /** - * @ngdoc method - * @name $locationProvider#hashPrefix - * @description - * @param {string=} prefix Prefix for hash part (containing path and search) - * @returns {*} current value if used as getter or itself (chaining) if used as setter - */ - this.hashPrefix = function(prefix) { - if (isDefined(prefix)) { - hashPrefix = prefix; - return this; - } else { - return hashPrefix; - } - }; - - /** - * @ngdoc method - * @name $locationProvider#html5Mode - * @description - * @param {(boolean|Object)=} mode If boolean, sets `html5Mode.enabled` to value. - * If object, sets `enabled`, `requireBase` and `rewriteLinks` to respective values. Supported - * properties: - * - **enabled** – `{boolean}` – (default: false) If true, will rely on `history.pushState` to - * change urls where supported. Will fall back to hash-prefixed paths in browsers that do not - * support `pushState`. - * - **requireBase** - `{boolean}` - (default: `true`) When html5Mode is enabled, specifies - * whether or not a tag is required to be present. If `enabled` and `requireBase` are - * true, and a base tag is not present, an error will be thrown when `$location` is injected. - * See the {@link guide/$location $location guide for more information} - * - **rewriteLinks** - `{boolean}` - (default: `true`) When html5Mode is enabled, - * enables/disables url rewriting for relative links. - * - * @returns {Object} html5Mode object if used as getter or itself (chaining) if used as setter - */ - this.html5Mode = function(mode) { - if (isBoolean(mode)) { - html5Mode.enabled = mode; - return this; - } else if (isObject(mode)) { - - if (isBoolean(mode.enabled)) { - html5Mode.enabled = mode.enabled; - } - - if (isBoolean(mode.requireBase)) { - html5Mode.requireBase = mode.requireBase; - } - - if (isBoolean(mode.rewriteLinks)) { - html5Mode.rewriteLinks = mode.rewriteLinks; - } - - return this; - } else { - return html5Mode; - } - }; - - /** - * @ngdoc event - * @name $location#$locationChangeStart - * @eventType broadcast on root scope - * @description - * Broadcasted before a URL will change. - * - * This change can be prevented by calling - * `preventDefault` method of the event. See {@link ng.$rootScope.Scope#$on} for more - * details about event object. Upon successful change - * {@link ng.$location#$locationChangeSuccess $locationChangeSuccess} is fired. - * - * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when - * the browser supports the HTML5 History API. - * - * @param {Object} angularEvent Synthetic event object. - * @param {string} newUrl New URL - * @param {string=} oldUrl URL that was before it was changed. - * @param {string=} newState New history state object - * @param {string=} oldState History state object that was before it was changed. - */ - - /** - * @ngdoc event - * @name $location#$locationChangeSuccess - * @eventType broadcast on root scope - * @description - * Broadcasted after a URL was changed. - * - * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when - * the browser supports the HTML5 History API. - * - * @param {Object} angularEvent Synthetic event object. - * @param {string} newUrl New URL - * @param {string=} oldUrl URL that was before it was changed. - * @param {string=} newState New history state object - * @param {string=} oldState History state object that was before it was changed. - */ - - this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement', - function($rootScope, $browser, $sniffer, $rootElement) { - var $location, - LocationMode, - baseHref = $browser.baseHref(), // if base[href] is undefined, it defaults to '' - initialUrl = $browser.url(), - appBase; - - if (html5Mode.enabled) { - if (!baseHref && html5Mode.requireBase) { - throw $locationMinErr('nobase', - "$location in HTML5 mode requires a tag to be present!"); - } - appBase = serverBase(initialUrl) + (baseHref || '/'); - LocationMode = $sniffer.history ? LocationHtml5Url : LocationHashbangInHtml5Url; - } else { - appBase = stripHash(initialUrl); - LocationMode = LocationHashbangUrl; - } - $location = new LocationMode(appBase, '#' + hashPrefix); - $location.$$parseLinkUrl(initialUrl, initialUrl); - - $location.$$state = $browser.state(); - - var IGNORE_URI_REGEXP = /^\s*(javascript|mailto):/i; - - function setBrowserUrlWithFallback(url, replace, state) { - var oldUrl = $location.url(); - var oldState = $location.$$state; - try { - $browser.url(url, replace, state); - - // Make sure $location.state() returns referentially identical (not just deeply equal) - // state object; this makes possible quick checking if the state changed in the digest - // loop. Checking deep equality would be too expensive. - $location.$$state = $browser.state(); - } catch (e) { - // Restore old values if pushState fails - $location.url(oldUrl); - $location.$$state = oldState; - - throw e; - } - } - - $rootElement.on('click', function(event) { - // TODO(vojta): rewrite link when opening in new tab/window (in legacy browser) - // currently we open nice url link and redirect then - - if (!html5Mode.rewriteLinks || event.ctrlKey || event.metaKey || event.which == 2) return; - - var elm = jqLite(event.target); - - // traverse the DOM up to find first A tag - while (nodeName_(elm[0]) !== 'a') { - // ignore rewriting if no A tag (reached root element, or no parent - removed from document) - if (elm[0] === $rootElement[0] || !(elm = elm.parent())[0]) return; - } - - var absHref = elm.prop('href'); - // get the actual href attribute - see - // http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx - var relHref = elm.attr('href') || elm.attr('xlink:href'); - - if (isObject(absHref) && absHref.toString() === '[object SVGAnimatedString]') { - // SVGAnimatedString.animVal should be identical to SVGAnimatedString.baseVal, unless during - // an animation. - absHref = urlResolve(absHref.animVal).href; - } - - // Ignore when url is started with javascript: or mailto: - if (IGNORE_URI_REGEXP.test(absHref)) return; - - if (absHref && !elm.attr('target') && !event.isDefaultPrevented()) { - if ($location.$$parseLinkUrl(absHref, relHref)) { - // We do a preventDefault for all urls that are part of the angular application, - // in html5mode and also without, so that we are able to abort navigation without - // getting double entries in the location history. - event.preventDefault(); - // update location manually - if ($location.absUrl() != $browser.url()) { - $rootScope.$apply(); - // hack to work around FF6 bug 684208 when scenario runner clicks on links - window.angular['ff-684208-preventDefault'] = true; - } - } - } - }); - - - // rewrite hashbang url <> html5 url - if ($location.absUrl() != initialUrl) { - $browser.url($location.absUrl(), true); - } - - var initializing = true; - - // update $location when $browser url changes - $browser.onUrlChange(function(newUrl, newState) { - $rootScope.$evalAsync(function() { - var oldUrl = $location.absUrl(); - var oldState = $location.$$state; - var defaultPrevented; - - $location.$$parse(newUrl); - $location.$$state = newState; - - defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl, - newState, oldState).defaultPrevented; - - // if the location was changed by a `$locationChangeStart` handler then stop - // processing this location change - if ($location.absUrl() !== newUrl) return; - - if (defaultPrevented) { - $location.$$parse(oldUrl); - $location.$$state = oldState; - setBrowserUrlWithFallback(oldUrl, false, oldState); - } else { - initializing = false; - afterLocationChange(oldUrl, oldState); - } - }); - if (!$rootScope.$$phase) $rootScope.$digest(); - }); - - // update browser - $rootScope.$watch(function $locationWatch() { - var oldUrl = $browser.url(); - var oldState = $browser.state(); - var currentReplace = $location.$$replace; - var urlOrStateChanged = oldUrl !== $location.absUrl() || - ($location.$$html5 && $sniffer.history && oldState !== $location.$$state); - - if (initializing || urlOrStateChanged) { - initializing = false; - - $rootScope.$evalAsync(function() { - var newUrl = $location.absUrl(); - var defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl, - $location.$$state, oldState).defaultPrevented; - - // if the location was changed by a `$locationChangeStart` handler then stop - // processing this location change - if ($location.absUrl() !== newUrl) return; - - if (defaultPrevented) { - $location.$$parse(oldUrl); - $location.$$state = oldState; - } else { - if (urlOrStateChanged) { - setBrowserUrlWithFallback(newUrl, currentReplace, - oldState === $location.$$state ? null : $location.$$state); - } - afterLocationChange(oldUrl, oldState); - } - }); - } - - $location.$$replace = false; - - // we don't need to return anything because $evalAsync will make the digest loop dirty when - // there is a change - }); - - return $location; - - function afterLocationChange(oldUrl, oldState) { - $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl, - $location.$$state, oldState); - } -}]; -} - -/** - * @ngdoc service - * @name $log - * @requires $window - * - * @description - * Simple service for logging. Default implementation safely writes the message - * into the browser's console (if present). - * - * The main purpose of this service is to simplify debugging and troubleshooting. - * - * The default is to log `debug` messages. You can use - * {@link ng.$logProvider ng.$logProvider#debugEnabled} to change this. - * - * @example - - - angular.module('logExample', []) - .controller('LogController', ['$scope', '$log', function($scope, $log) { - $scope.$log = $log; - $scope.message = 'Hello World!'; - }]); - - -
      -

      Reload this page with open console, enter text and hit the log button...

      - Message: - - - - - -
      -
      -
      - */ - -/** - * @ngdoc provider - * @name $logProvider - * @description - * Use the `$logProvider` to configure how the application logs messages - */ -function $LogProvider() { - var debug = true, - self = this; - - /** - * @ngdoc method - * @name $logProvider#debugEnabled - * @description - * @param {boolean=} flag enable or disable debug level messages - * @returns {*} current value if used as getter or itself (chaining) if used as setter - */ - this.debugEnabled = function(flag) { - if (isDefined(flag)) { - debug = flag; - return this; - } else { - return debug; - } - }; - - this.$get = ['$window', function($window) { - return { - /** - * @ngdoc method - * @name $log#log - * - * @description - * Write a log message - */ - log: consoleLog('log'), - - /** - * @ngdoc method - * @name $log#info - * - * @description - * Write an information message - */ - info: consoleLog('info'), - - /** - * @ngdoc method - * @name $log#warn - * - * @description - * Write a warning message - */ - warn: consoleLog('warn'), - - /** - * @ngdoc method - * @name $log#error - * - * @description - * Write an error message - */ - error: consoleLog('error'), - - /** - * @ngdoc method - * @name $log#debug - * - * @description - * Write a debug message - */ - debug: (function() { - var fn = consoleLog('debug'); - - return function() { - if (debug) { - fn.apply(self, arguments); - } - }; - }()) - }; - - function formatError(arg) { - if (arg instanceof Error) { - if (arg.stack) { - arg = (arg.message && arg.stack.indexOf(arg.message) === -1) - ? 'Error: ' + arg.message + '\n' + arg.stack - : arg.stack; - } else if (arg.sourceURL) { - arg = arg.message + '\n' + arg.sourceURL + ':' + arg.line; - } - } - return arg; - } - - function consoleLog(type) { - var console = $window.console || {}, - logFn = console[type] || console.log || noop, - hasApply = false; - - // Note: reading logFn.apply throws an error in IE11 in IE8 document mode. - // The reason behind this is that console.log has type "object" in IE8... - try { - hasApply = !!logFn.apply; - } catch (e) {} - - if (hasApply) { - return function() { - var args = []; - forEach(arguments, function(arg) { - args.push(formatError(arg)); - }); - return logFn.apply(console, args); - }; - } - - // we are IE which either doesn't have window.console => this is noop and we do nothing, - // or we are IE where console.log doesn't have apply so we log at least first 2 args - return function(arg1, arg2) { - logFn(arg1, arg2 == null ? '' : arg2); - }; - } - }]; -} - -var $parseMinErr = minErr('$parse'); - -// Sandboxing Angular Expressions -// ------------------------------ -// Angular expressions are generally considered safe because these expressions only have direct -// access to `$scope` and locals. However, one can obtain the ability to execute arbitrary JS code by -// obtaining a reference to native JS functions such as the Function constructor. -// -// As an example, consider the following Angular expression: -// -// {}.toString.constructor('alert("evil JS code")') -// -// This sandboxing technique is not perfect and doesn't aim to be. The goal is to prevent exploits -// against the expression language, but not to prevent exploits that were enabled by exposing -// sensitive JavaScript or browser APIs on Scope. Exposing such objects on a Scope is never a good -// practice and therefore we are not even trying to protect against interaction with an object -// explicitly exposed in this way. -// -// In general, it is not possible to access a Window object from an angular expression unless a -// window or some DOM object that has a reference to window is published onto a Scope. -// Similarly we prevent invocations of function known to be dangerous, as well as assignments to -// native objects. -// -// See https://docs.angularjs.org/guide/security - - -function ensureSafeMemberName(name, fullExpression) { - if (name === "__defineGetter__" || name === "__defineSetter__" - || name === "__lookupGetter__" || name === "__lookupSetter__" - || name === "__proto__") { - throw $parseMinErr('isecfld', - 'Attempting to access a disallowed field in Angular expressions! ' - + 'Expression: {0}', fullExpression); - } - return name; -} - -function ensureSafeObject(obj, fullExpression) { - // nifty check if obj is Function that is fast and works across iframes and other contexts - if (obj) { - if (obj.constructor === obj) { - throw $parseMinErr('isecfn', - 'Referencing Function in Angular expressions is disallowed! Expression: {0}', - fullExpression); - } else if (// isWindow(obj) - obj.window === obj) { - throw $parseMinErr('isecwindow', - 'Referencing the Window in Angular expressions is disallowed! Expression: {0}', - fullExpression); - } else if (// isElement(obj) - obj.children && (obj.nodeName || (obj.prop && obj.attr && obj.find))) { - throw $parseMinErr('isecdom', - 'Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}', - fullExpression); - } else if (// block Object so that we can't get hold of dangerous Object.* methods - obj === Object) { - throw $parseMinErr('isecobj', - 'Referencing Object in Angular expressions is disallowed! Expression: {0}', - fullExpression); - } - } - return obj; -} - -var CALL = Function.prototype.call; -var APPLY = Function.prototype.apply; -var BIND = Function.prototype.bind; - -function ensureSafeFunction(obj, fullExpression) { - if (obj) { - if (obj.constructor === obj) { - throw $parseMinErr('isecfn', - 'Referencing Function in Angular expressions is disallowed! Expression: {0}', - fullExpression); - } else if (obj === CALL || obj === APPLY || obj === BIND) { - throw $parseMinErr('isecff', - 'Referencing call, apply or bind in Angular expressions is disallowed! Expression: {0}', - fullExpression); - } - } -} - -//Keyword constants -var CONSTANTS = createMap(); -forEach({ - 'null': function() { return null; }, - 'true': function() { return true; }, - 'false': function() { return false; }, - 'undefined': function() {} -}, function(constantGetter, name) { - constantGetter.constant = constantGetter.literal = constantGetter.sharedGetter = true; - CONSTANTS[name] = constantGetter; -}); - -//Not quite a constant, but can be lex/parsed the same -CONSTANTS['this'] = function(self) { return self; }; -CONSTANTS['this'].sharedGetter = true; - - -//Operators - will be wrapped by binaryFn/unaryFn/assignment/filter -var OPERATORS = extend(createMap(), { - '+':function(self, locals, a, b) { - a=a(self, locals); b=b(self, locals); - if (isDefined(a)) { - if (isDefined(b)) { - return a + b; - } - return a; - } - return isDefined(b) ? b : undefined;}, - '-':function(self, locals, a, b) { - a=a(self, locals); b=b(self, locals); - return (isDefined(a) ? a : 0) - (isDefined(b) ? b : 0); - }, - '*':function(self, locals, a, b) {return a(self, locals) * b(self, locals);}, - '/':function(self, locals, a, b) {return a(self, locals) / b(self, locals);}, - '%':function(self, locals, a, b) {return a(self, locals) % b(self, locals);}, - '===':function(self, locals, a, b) {return a(self, locals) === b(self, locals);}, - '!==':function(self, locals, a, b) {return a(self, locals) !== b(self, locals);}, - '==':function(self, locals, a, b) {return a(self, locals) == b(self, locals);}, - '!=':function(self, locals, a, b) {return a(self, locals) != b(self, locals);}, - '<':function(self, locals, a, b) {return a(self, locals) < b(self, locals);}, - '>':function(self, locals, a, b) {return a(self, locals) > b(self, locals);}, - '<=':function(self, locals, a, b) {return a(self, locals) <= b(self, locals);}, - '>=':function(self, locals, a, b) {return a(self, locals) >= b(self, locals);}, - '&&':function(self, locals, a, b) {return a(self, locals) && b(self, locals);}, - '||':function(self, locals, a, b) {return a(self, locals) || b(self, locals);}, - '!':function(self, locals, a) {return !a(self, locals);}, - - //Tokenized as operators but parsed as assignment/filters - '=':true, - '|':true -}); -var ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'}; - - -///////////////////////////////////////// - - -/** - * @constructor - */ -var Lexer = function(options) { - this.options = options; -}; - -Lexer.prototype = { - constructor: Lexer, - - lex: function(text) { - this.text = text; - this.index = 0; - this.tokens = []; - - while (this.index < this.text.length) { - var ch = this.text.charAt(this.index); - if (ch === '"' || ch === "'") { - this.readString(ch); - } else if (this.isNumber(ch) || ch === '.' && this.isNumber(this.peek())) { - this.readNumber(); - } else if (this.isIdent(ch)) { - this.readIdent(); - } else if (this.is(ch, '(){}[].,;:?')) { - this.tokens.push({index: this.index, text: ch}); - this.index++; - } else if (this.isWhitespace(ch)) { - this.index++; - } else { - var ch2 = ch + this.peek(); - var ch3 = ch2 + this.peek(2); - var op1 = OPERATORS[ch]; - var op2 = OPERATORS[ch2]; - var op3 = OPERATORS[ch3]; - if (op1 || op2 || op3) { - var token = op3 ? ch3 : (op2 ? ch2 : ch); - this.tokens.push({index: this.index, text: token, operator: true}); - this.index += token.length; - } else { - this.throwError('Unexpected next character ', this.index, this.index + 1); - } - } - } - return this.tokens; - }, - - is: function(ch, chars) { - return chars.indexOf(ch) !== -1; - }, - - peek: function(i) { - var num = i || 1; - return (this.index + num < this.text.length) ? this.text.charAt(this.index + num) : false; - }, - - isNumber: function(ch) { - return ('0' <= ch && ch <= '9') && typeof ch === "string"; - }, - - isWhitespace: function(ch) { - // IE treats non-breaking space as \u00A0 - return (ch === ' ' || ch === '\r' || ch === '\t' || - ch === '\n' || ch === '\v' || ch === '\u00A0'); - }, - - isIdent: function(ch) { - return ('a' <= ch && ch <= 'z' || - 'A' <= ch && ch <= 'Z' || - '_' === ch || ch === '$'); - }, - - isExpOperator: function(ch) { - return (ch === '-' || ch === '+' || this.isNumber(ch)); - }, - - throwError: function(error, start, end) { - end = end || this.index; - var colStr = (isDefined(start) - ? 's ' + start + '-' + this.index + ' [' + this.text.substring(start, end) + ']' - : ' ' + end); - throw $parseMinErr('lexerr', 'Lexer Error: {0} at column{1} in expression [{2}].', - error, colStr, this.text); - }, - - readNumber: function() { - var number = ''; - var start = this.index; - while (this.index < this.text.length) { - var ch = lowercase(this.text.charAt(this.index)); - if (ch == '.' || this.isNumber(ch)) { - number += ch; - } else { - var peekCh = this.peek(); - if (ch == 'e' && this.isExpOperator(peekCh)) { - number += ch; - } else if (this.isExpOperator(ch) && - peekCh && this.isNumber(peekCh) && - number.charAt(number.length - 1) == 'e') { - number += ch; - } else if (this.isExpOperator(ch) && - (!peekCh || !this.isNumber(peekCh)) && - number.charAt(number.length - 1) == 'e') { - this.throwError('Invalid exponent'); - } else { - break; - } - } - this.index++; - } - this.tokens.push({ - index: start, - text: number, - constant: true, - value: Number(number) - }); - }, - - readIdent: function() { - var start = this.index; - while (this.index < this.text.length) { - var ch = this.text.charAt(this.index); - if (!(this.isIdent(ch) || this.isNumber(ch))) { - break; - } - this.index++; - } - this.tokens.push({ - index: start, - text: this.text.slice(start, this.index), - identifier: true - }); - }, - - readString: function(quote) { - var start = this.index; - this.index++; - var string = ''; - var rawString = quote; - var escape = false; - while (this.index < this.text.length) { - var ch = this.text.charAt(this.index); - rawString += ch; - if (escape) { - if (ch === 'u') { - var hex = this.text.substring(this.index + 1, this.index + 5); - if (!hex.match(/[\da-f]{4}/i)) - this.throwError('Invalid unicode escape [\\u' + hex + ']'); - this.index += 4; - string += String.fromCharCode(parseInt(hex, 16)); - } else { - var rep = ESCAPE[ch]; - string = string + (rep || ch); - } - escape = false; - } else if (ch === '\\') { - escape = true; - } else if (ch === quote) { - this.index++; - this.tokens.push({ - index: start, - text: rawString, - constant: true, - value: string - }); - return; - } else { - string += ch; - } - this.index++; - } - this.throwError('Unterminated quote', start); - } -}; - - -function isConstant(exp) { - return exp.constant; -} - -/** - * @constructor - */ -var Parser = function(lexer, $filter, options) { - this.lexer = lexer; - this.$filter = $filter; - this.options = options; -}; - -Parser.ZERO = extend(function() { - return 0; -}, { - sharedGetter: true, - constant: true -}); - -Parser.prototype = { - constructor: Parser, - - parse: function(text) { - this.text = text; - this.tokens = this.lexer.lex(text); - - var value = this.statements(); - - if (this.tokens.length !== 0) { - this.throwError('is an unexpected token', this.tokens[0]); - } - - value.literal = !!value.literal; - value.constant = !!value.constant; - - return value; - }, - - primary: function() { - var primary; - if (this.expect('(')) { - primary = this.filterChain(); - this.consume(')'); - } else if (this.expect('[')) { - primary = this.arrayDeclaration(); - } else if (this.expect('{')) { - primary = this.object(); - } else if (this.peek().identifier) { - primary = this.identifier(); - } else if (this.peek().constant) { - primary = this.constant(); - } else { - this.throwError('not a primary expression', this.peek()); - } - - var next, context; - while ((next = this.expect('(', '[', '.'))) { - if (next.text === '(') { - primary = this.functionCall(primary, context); - context = null; - } else if (next.text === '[') { - context = primary; - primary = this.objectIndex(primary); - } else if (next.text === '.') { - context = primary; - primary = this.fieldAccess(primary); - } else { - this.throwError('IMPOSSIBLE'); - } - } - return primary; - }, - - throwError: function(msg, token) { - throw $parseMinErr('syntax', - 'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].', - token.text, msg, (token.index + 1), this.text, this.text.substring(token.index)); - }, - - peekToken: function() { - if (this.tokens.length === 0) - throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text); - return this.tokens[0]; - }, - - peek: function(e1, e2, e3, e4) { - return this.peekAhead(0, e1, e2, e3, e4); - }, - peekAhead: function(i, e1, e2, e3, e4) { - if (this.tokens.length > i) { - var token = this.tokens[i]; - var t = token.text; - if (t === e1 || t === e2 || t === e3 || t === e4 || - (!e1 && !e2 && !e3 && !e4)) { - return token; - } - } - return false; - }, - - expect: function(e1, e2, e3, e4) { - var token = this.peek(e1, e2, e3, e4); - if (token) { - this.tokens.shift(); - return token; - } - return false; - }, - - consume: function(e1) { - if (this.tokens.length === 0) { - throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text); - } - - var token = this.expect(e1); - if (!token) { - this.throwError('is unexpected, expecting [' + e1 + ']', this.peek()); - } - return token; - }, - - unaryFn: function(op, right) { - var fn = OPERATORS[op]; - return extend(function $parseUnaryFn(self, locals) { - return fn(self, locals, right); - }, { - constant:right.constant, - inputs: [right] - }); - }, - - binaryFn: function(left, op, right, isBranching) { - var fn = OPERATORS[op]; - return extend(function $parseBinaryFn(self, locals) { - return fn(self, locals, left, right); - }, { - constant: left.constant && right.constant, - inputs: !isBranching && [left, right] - }); - }, - - identifier: function() { - var id = this.consume().text; - - //Continue reading each `.identifier` unless it is a method invocation - while (this.peek('.') && this.peekAhead(1).identifier && !this.peekAhead(2, '(')) { - id += this.consume().text + this.consume().text; - } - - return CONSTANTS[id] || getterFn(id, this.options, this.text); - }, - - constant: function() { - var value = this.consume().value; - - return extend(function $parseConstant() { - return value; - }, { - constant: true, - literal: true - }); - }, - - statements: function() { - var statements = []; - while (true) { - if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']')) - statements.push(this.filterChain()); - if (!this.expect(';')) { - // optimize for the common case where there is only one statement. - // TODO(size): maybe we should not support multiple statements? - return (statements.length === 1) - ? statements[0] - : function $parseStatements(self, locals) { - var value; - for (var i = 0, ii = statements.length; i < ii; i++) { - value = statements[i](self, locals); - } - return value; - }; - } - } - }, - - filterChain: function() { - var left = this.expression(); - var token; - while ((token = this.expect('|'))) { - left = this.filter(left); - } - return left; - }, - - filter: function(inputFn) { - var fn = this.$filter(this.consume().text); - var argsFn; - var args; - - if (this.peek(':')) { - argsFn = []; - args = []; // we can safely reuse the array - while (this.expect(':')) { - argsFn.push(this.expression()); - } - } - - var inputs = [inputFn].concat(argsFn || []); - - return extend(function $parseFilter(self, locals) { - var input = inputFn(self, locals); - if (args) { - args[0] = input; - - var i = argsFn.length; - while (i--) { - args[i + 1] = argsFn[i](self, locals); - } - - return fn.apply(undefined, args); - } - - return fn(input); - }, { - constant: !fn.$stateful && inputs.every(isConstant), - inputs: !fn.$stateful && inputs - }); - }, - - expression: function() { - return this.assignment(); - }, - - assignment: function() { - var left = this.ternary(); - var right; - var token; - if ((token = this.expect('='))) { - if (!left.assign) { - this.throwError('implies assignment but [' + - this.text.substring(0, token.index) + '] can not be assigned to', token); - } - right = this.ternary(); - return extend(function $parseAssignment(scope, locals) { - return left.assign(scope, right(scope, locals), locals); - }, { - inputs: [left, right] - }); - } - return left; - }, - - ternary: function() { - var left = this.logicalOR(); - var middle; - var token; - if ((token = this.expect('?'))) { - middle = this.assignment(); - if (this.consume(':')) { - var right = this.assignment(); - - return extend(function $parseTernary(self, locals) { - return left(self, locals) ? middle(self, locals) : right(self, locals); - }, { - constant: left.constant && middle.constant && right.constant - }); - } - } - - return left; - }, - - logicalOR: function() { - var left = this.logicalAND(); - var token; - while ((token = this.expect('||'))) { - left = this.binaryFn(left, token.text, this.logicalAND(), true); - } - return left; - }, - - logicalAND: function() { - var left = this.equality(); - var token; - if ((token = this.expect('&&'))) { - left = this.binaryFn(left, token.text, this.logicalAND(), true); - } - return left; - }, - - equality: function() { - var left = this.relational(); - var token; - if ((token = this.expect('==','!=','===','!=='))) { - left = this.binaryFn(left, token.text, this.equality()); - } - return left; - }, - - relational: function() { - var left = this.additive(); - var token; - if ((token = this.expect('<', '>', '<=', '>='))) { - left = this.binaryFn(left, token.text, this.relational()); - } - return left; - }, - - additive: function() { - var left = this.multiplicative(); - var token; - while ((token = this.expect('+','-'))) { - left = this.binaryFn(left, token.text, this.multiplicative()); - } - return left; - }, - - multiplicative: function() { - var left = this.unary(); - var token; - while ((token = this.expect('*','/','%'))) { - left = this.binaryFn(left, token.text, this.unary()); - } - return left; - }, - - unary: function() { - var token; - if (this.expect('+')) { - return this.primary(); - } else if ((token = this.expect('-'))) { - return this.binaryFn(Parser.ZERO, token.text, this.unary()); - } else if ((token = this.expect('!'))) { - return this.unaryFn(token.text, this.unary()); - } else { - return this.primary(); - } - }, - - fieldAccess: function(object) { - var expression = this.text; - var field = this.consume().text; - var getter = getterFn(field, this.options, expression); - - return extend(function $parseFieldAccess(scope, locals, self) { - return getter(self || object(scope, locals)); - }, { - assign: function(scope, value, locals) { - var o = object(scope, locals); - if (!o) object.assign(scope, o = {}); - return setter(o, field, value, expression); - } - }); - }, - - objectIndex: function(obj) { - var expression = this.text; - - var indexFn = this.expression(); - this.consume(']'); - - return extend(function $parseObjectIndex(self, locals) { - var o = obj(self, locals), - i = indexFn(self, locals), - v; - - ensureSafeMemberName(i, expression); - if (!o) return undefined; - v = ensureSafeObject(o[i], expression); - return v; - }, { - assign: function(self, value, locals) { - var key = ensureSafeMemberName(indexFn(self, locals), expression); - // prevent overwriting of Function.constructor which would break ensureSafeObject check - var o = ensureSafeObject(obj(self, locals), expression); - if (!o) obj.assign(self, o = {}); - return o[key] = value; - } - }); - }, - - functionCall: function(fnGetter, contextGetter) { - var argsFn = []; - if (this.peekToken().text !== ')') { - do { - argsFn.push(this.expression()); - } while (this.expect(',')); - } - this.consume(')'); - - var expressionText = this.text; - // we can safely reuse the array across invocations - var args = argsFn.length ? [] : null; - - return function $parseFunctionCall(scope, locals) { - var context = contextGetter ? contextGetter(scope, locals) : scope; - var fn = fnGetter(scope, locals, context) || noop; - - if (args) { - var i = argsFn.length; - while (i--) { - args[i] = ensureSafeObject(argsFn[i](scope, locals), expressionText); - } - } - - ensureSafeObject(context, expressionText); - ensureSafeFunction(fn, expressionText); - - // IE doesn't have apply for some native functions - var v = fn.apply - ? fn.apply(context, args) - : fn(args[0], args[1], args[2], args[3], args[4]); - - return ensureSafeObject(v, expressionText); - }; - }, - - // This is used with json array declaration - arrayDeclaration: function() { - var elementFns = []; - if (this.peekToken().text !== ']') { - do { - if (this.peek(']')) { - // Support trailing commas per ES5.1. - break; - } - elementFns.push(this.expression()); - } while (this.expect(',')); - } - this.consume(']'); - - return extend(function $parseArrayLiteral(self, locals) { - var array = []; - for (var i = 0, ii = elementFns.length; i < ii; i++) { - array.push(elementFns[i](self, locals)); - } - return array; - }, { - literal: true, - constant: elementFns.every(isConstant), - inputs: elementFns - }); - }, - - object: function() { - var keys = [], valueFns = []; - if (this.peekToken().text !== '}') { - do { - if (this.peek('}')) { - // Support trailing commas per ES5.1. - break; - } - var token = this.consume(); - if (token.constant) { - keys.push(token.value); - } else if (token.identifier) { - keys.push(token.text); - } else { - this.throwError("invalid key", token); - } - this.consume(':'); - valueFns.push(this.expression()); - } while (this.expect(',')); - } - this.consume('}'); - - return extend(function $parseObjectLiteral(self, locals) { - var object = {}; - for (var i = 0, ii = valueFns.length; i < ii; i++) { - object[keys[i]] = valueFns[i](self, locals); - } - return object; - }, { - literal: true, - constant: valueFns.every(isConstant), - inputs: valueFns - }); - } -}; - - -////////////////////////////////////////////////// -// Parser helper functions -////////////////////////////////////////////////// - -function setter(obj, path, setValue, fullExp) { - ensureSafeObject(obj, fullExp); - - var element = path.split('.'), key; - for (var i = 0; element.length > 1; i++) { - key = ensureSafeMemberName(element.shift(), fullExp); - var propertyObj = ensureSafeObject(obj[key], fullExp); - if (!propertyObj) { - propertyObj = {}; - obj[key] = propertyObj; - } - obj = propertyObj; - } - key = ensureSafeMemberName(element.shift(), fullExp); - ensureSafeObject(obj[key], fullExp); - obj[key] = setValue; - return setValue; -} - -var getterFnCacheDefault = createMap(); -var getterFnCacheExpensive = createMap(); - -function isPossiblyDangerousMemberName(name) { - return name == 'constructor'; -} - -/** - * Implementation of the "Black Hole" variant from: - * - http://jsperf.com/angularjs-parse-getter/4 - * - http://jsperf.com/path-evaluation-simplified/7 - */ -function cspSafeGetterFn(key0, key1, key2, key3, key4, fullExp, expensiveChecks) { - ensureSafeMemberName(key0, fullExp); - ensureSafeMemberName(key1, fullExp); - ensureSafeMemberName(key2, fullExp); - ensureSafeMemberName(key3, fullExp); - ensureSafeMemberName(key4, fullExp); - var eso = function(o) { - return ensureSafeObject(o, fullExp); - }; - var eso0 = (expensiveChecks || isPossiblyDangerousMemberName(key0)) ? eso : identity; - var eso1 = (expensiveChecks || isPossiblyDangerousMemberName(key1)) ? eso : identity; - var eso2 = (expensiveChecks || isPossiblyDangerousMemberName(key2)) ? eso : identity; - var eso3 = (expensiveChecks || isPossiblyDangerousMemberName(key3)) ? eso : identity; - var eso4 = (expensiveChecks || isPossiblyDangerousMemberName(key4)) ? eso : identity; - - return function cspSafeGetter(scope, locals) { - var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope; - - if (pathVal == null) return pathVal; - pathVal = eso0(pathVal[key0]); - - if (!key1) return pathVal; - if (pathVal == null) return undefined; - pathVal = eso1(pathVal[key1]); - - if (!key2) return pathVal; - if (pathVal == null) return undefined; - pathVal = eso2(pathVal[key2]); - - if (!key3) return pathVal; - if (pathVal == null) return undefined; - pathVal = eso3(pathVal[key3]); - - if (!key4) return pathVal; - if (pathVal == null) return undefined; - pathVal = eso4(pathVal[key4]); - - return pathVal; - }; -} - -function getterFnWithEnsureSafeObject(fn, fullExpression) { - return function(s, l) { - return fn(s, l, ensureSafeObject, fullExpression); - }; -} - -function getterFn(path, options, fullExp) { - var expensiveChecks = options.expensiveChecks; - var getterFnCache = (expensiveChecks ? getterFnCacheExpensive : getterFnCacheDefault); - var fn = getterFnCache[path]; - if (fn) return fn; - - - var pathKeys = path.split('.'), - pathKeysLength = pathKeys.length; - - // http://jsperf.com/angularjs-parse-getter/6 - if (options.csp) { - if (pathKeysLength < 6) { - fn = cspSafeGetterFn(pathKeys[0], pathKeys[1], pathKeys[2], pathKeys[3], pathKeys[4], fullExp, expensiveChecks); - } else { - fn = function cspSafeGetter(scope, locals) { - var i = 0, val; - do { - val = cspSafeGetterFn(pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++], - pathKeys[i++], fullExp, expensiveChecks)(scope, locals); - - locals = undefined; // clear after first iteration - scope = val; - } while (i < pathKeysLength); - return val; - }; - } - } else { - var code = ''; - if (expensiveChecks) { - code += 's = eso(s, fe);\nl = eso(l, fe);\n'; - } - var needsEnsureSafeObject = expensiveChecks; - forEach(pathKeys, function(key, index) { - ensureSafeMemberName(key, fullExp); - var lookupJs = (index - // we simply dereference 's' on any .dot notation - ? 's' - // but if we are first then we check locals first, and if so read it first - : '((l&&l.hasOwnProperty("' + key + '"))?l:s)') + '.' + key; - if (expensiveChecks || isPossiblyDangerousMemberName(key)) { - lookupJs = 'eso(' + lookupJs + ', fe)'; - needsEnsureSafeObject = true; - } - code += 'if(s == null) return undefined;\n' + - 's=' + lookupJs + ';\n'; - }); - code += 'return s;'; - - /* jshint -W054 */ - var evaledFnGetter = new Function('s', 'l', 'eso', 'fe', code); // s=scope, l=locals, eso=ensureSafeObject - /* jshint +W054 */ - evaledFnGetter.toString = valueFn(code); - if (needsEnsureSafeObject) { - evaledFnGetter = getterFnWithEnsureSafeObject(evaledFnGetter, fullExp); - } - fn = evaledFnGetter; - } - - fn.sharedGetter = true; - fn.assign = function(self, value) { - return setter(self, path, value, path); - }; - getterFnCache[path] = fn; - return fn; -} - -var objectValueOf = Object.prototype.valueOf; - -function getValueOf(value) { - return isFunction(value.valueOf) ? value.valueOf() : objectValueOf.call(value); -} - -/////////////////////////////////// - -/** - * @ngdoc service - * @name $parse - * @kind function - * - * @description - * - * Converts Angular {@link guide/expression expression} into a function. - * - * ```js - * var getter = $parse('user.name'); - * var setter = getter.assign; - * var context = {user:{name:'angular'}}; - * var locals = {user:{name:'local'}}; - * - * expect(getter(context)).toEqual('angular'); - * setter(context, 'newValue'); - * expect(context.user.name).toEqual('newValue'); - * expect(getter(context, locals)).toEqual('local'); - * ``` - * - * - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: - * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - * - * The returned function also has the following properties: - * * `literal` – `{boolean}` – whether the expression's top-level node is a JavaScript - * literal. - * * `constant` – `{boolean}` – whether the expression is made entirely of JavaScript - * constant literals. - * * `assign` – `{?function(context, value)}` – if the expression is assignable, this will be - * set to a function to change its value on the given context. - * - */ - - -/** - * @ngdoc provider - * @name $parseProvider - * - * @description - * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse} - * service. - */ -function $ParseProvider() { - var cacheDefault = createMap(); - var cacheExpensive = createMap(); - - - - this.$get = ['$filter', '$sniffer', function($filter, $sniffer) { - var $parseOptions = { - csp: $sniffer.csp, - expensiveChecks: false - }, - $parseOptionsExpensive = { - csp: $sniffer.csp, - expensiveChecks: true - }; - - function wrapSharedExpression(exp) { - var wrapped = exp; - - if (exp.sharedGetter) { - wrapped = function $parseWrapper(self, locals) { - return exp(self, locals); - }; - wrapped.literal = exp.literal; - wrapped.constant = exp.constant; - wrapped.assign = exp.assign; - } - - return wrapped; - } - - return function $parse(exp, interceptorFn, expensiveChecks) { - var parsedExpression, oneTime, cacheKey; - - switch (typeof exp) { - case 'string': - cacheKey = exp = exp.trim(); - - var cache = (expensiveChecks ? cacheExpensive : cacheDefault); - parsedExpression = cache[cacheKey]; - - if (!parsedExpression) { - if (exp.charAt(0) === ':' && exp.charAt(1) === ':') { - oneTime = true; - exp = exp.substring(2); - } - - var parseOptions = expensiveChecks ? $parseOptionsExpensive : $parseOptions; - var lexer = new Lexer(parseOptions); - var parser = new Parser(lexer, $filter, parseOptions); - parsedExpression = parser.parse(exp); - - if (parsedExpression.constant) { - parsedExpression.$$watchDelegate = constantWatchDelegate; - } else if (oneTime) { - //oneTime is not part of the exp passed to the Parser so we may have to - //wrap the parsedExpression before adding a $$watchDelegate - parsedExpression = wrapSharedExpression(parsedExpression); - parsedExpression.$$watchDelegate = parsedExpression.literal ? - oneTimeLiteralWatchDelegate : oneTimeWatchDelegate; - } else if (parsedExpression.inputs) { - parsedExpression.$$watchDelegate = inputsWatchDelegate; - } - - cache[cacheKey] = parsedExpression; - } - return addInterceptor(parsedExpression, interceptorFn); - - case 'function': - return addInterceptor(exp, interceptorFn); - - default: - return addInterceptor(noop, interceptorFn); - } - }; - - function collectExpressionInputs(inputs, list) { - for (var i = 0, ii = inputs.length; i < ii; i++) { - var input = inputs[i]; - if (!input.constant) { - if (input.inputs) { - collectExpressionInputs(input.inputs, list); - } else if (list.indexOf(input) === -1) { // TODO(perf) can we do better? - list.push(input); - } - } - } - - return list; - } - - function expressionInputDirtyCheck(newValue, oldValueOfValue) { - - if (newValue == null || oldValueOfValue == null) { // null/undefined - return newValue === oldValueOfValue; - } - - if (typeof newValue === 'object') { - - // attempt to convert the value to a primitive type - // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can - // be cheaply dirty-checked - newValue = getValueOf(newValue); - - if (typeof newValue === 'object') { - // objects/arrays are not supported - deep-watching them would be too expensive - return false; - } - - // fall-through to the primitive equality check - } - - //Primitive or NaN - return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue); - } - - function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression) { - var inputExpressions = parsedExpression.$$inputs || - (parsedExpression.$$inputs = collectExpressionInputs(parsedExpression.inputs, [])); - - var lastResult; - - if (inputExpressions.length === 1) { - var oldInputValue = expressionInputDirtyCheck; // init to something unique so that equals check fails - inputExpressions = inputExpressions[0]; - return scope.$watch(function expressionInputWatch(scope) { - var newInputValue = inputExpressions(scope); - if (!expressionInputDirtyCheck(newInputValue, oldInputValue)) { - lastResult = parsedExpression(scope); - oldInputValue = newInputValue && getValueOf(newInputValue); - } - return lastResult; - }, listener, objectEquality); - } - - var oldInputValueOfValues = []; - for (var i = 0, ii = inputExpressions.length; i < ii; i++) { - oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails - } - - return scope.$watch(function expressionInputsWatch(scope) { - var changed = false; - - for (var i = 0, ii = inputExpressions.length; i < ii; i++) { - var newInputValue = inputExpressions[i](scope); - if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) { - oldInputValueOfValues[i] = newInputValue && getValueOf(newInputValue); - } - } - - if (changed) { - lastResult = parsedExpression(scope); - } - - return lastResult; - }, listener, objectEquality); - } - - function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) { - var unwatch, lastValue; - return unwatch = scope.$watch(function oneTimeWatch(scope) { - return parsedExpression(scope); - }, function oneTimeListener(value, old, scope) { - lastValue = value; - if (isFunction(listener)) { - listener.apply(this, arguments); - } - if (isDefined(value)) { - scope.$$postDigest(function() { - if (isDefined(lastValue)) { - unwatch(); - } - }); - } - }, objectEquality); - } - - function oneTimeLiteralWatchDelegate(scope, listener, objectEquality, parsedExpression) { - var unwatch, lastValue; - return unwatch = scope.$watch(function oneTimeWatch(scope) { - return parsedExpression(scope); - }, function oneTimeListener(value, old, scope) { - lastValue = value; - if (isFunction(listener)) { - listener.call(this, value, old, scope); - } - if (isAllDefined(value)) { - scope.$$postDigest(function() { - if (isAllDefined(lastValue)) unwatch(); - }); - } - }, objectEquality); - - function isAllDefined(value) { - var allDefined = true; - forEach(value, function(val) { - if (!isDefined(val)) allDefined = false; - }); - return allDefined; - } - } - - function constantWatchDelegate(scope, listener, objectEquality, parsedExpression) { - var unwatch; - return unwatch = scope.$watch(function constantWatch(scope) { - return parsedExpression(scope); - }, function constantListener(value, old, scope) { - if (isFunction(listener)) { - listener.apply(this, arguments); - } - unwatch(); - }, objectEquality); - } - - function addInterceptor(parsedExpression, interceptorFn) { - if (!interceptorFn) return parsedExpression; - var watchDelegate = parsedExpression.$$watchDelegate; - - var regularWatch = - watchDelegate !== oneTimeLiteralWatchDelegate && - watchDelegate !== oneTimeWatchDelegate; - - var fn = regularWatch ? function regularInterceptedExpression(scope, locals) { - var value = parsedExpression(scope, locals); - return interceptorFn(value, scope, locals); - } : function oneTimeInterceptedExpression(scope, locals) { - var value = parsedExpression(scope, locals); - var result = interceptorFn(value, scope, locals); - // we only return the interceptor's result if the - // initial value is defined (for bind-once) - return isDefined(value) ? result : value; - }; - - // Propagate $$watchDelegates other then inputsWatchDelegate - if (parsedExpression.$$watchDelegate && - parsedExpression.$$watchDelegate !== inputsWatchDelegate) { - fn.$$watchDelegate = parsedExpression.$$watchDelegate; - } else if (!interceptorFn.$stateful) { - // If there is an interceptor, but no watchDelegate then treat the interceptor like - // we treat filters - it is assumed to be a pure function unless flagged with $stateful - fn.$$watchDelegate = inputsWatchDelegate; - fn.inputs = [parsedExpression]; - } - - return fn; - } - }]; -} - -/** - * @ngdoc service - * @name $q - * @requires $rootScope - * - * @description - * A service that helps you run functions asynchronously, and use their return values (or exceptions) - * when they are done processing. - * - * This is an implementation of promises/deferred objects inspired by - * [Kris Kowal's Q](https://github.com/kriskowal/q). - * - * $q can be used in two fashions --- one which is more similar to Kris Kowal's Q or jQuery's Deferred - * implementations, and the other which resembles ES6 promises to some degree. - * - * # $q constructor - * - * The streamlined ES6 style promise is essentially just using $q as a constructor which takes a `resolver` - * function as the first argument. This is similar to the native Promise implementation from ES6 Harmony, - * see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise). - * - * While the constructor-style use is supported, not all of the supporting methods from ES6 Harmony promises are - * available yet. - * - * It can be used like so: - * - * ```js - * // for the purpose of this example let's assume that variables `$q` and `okToGreet` - * // are available in the current lexical scope (they could have been injected or passed in). - * - * function asyncGreet(name) { - * // perform some asynchronous operation, resolve or reject the promise when appropriate. - * return $q(function(resolve, reject) { - * setTimeout(function() { - * if (okToGreet(name)) { - * resolve('Hello, ' + name + '!'); - * } else { - * reject('Greeting ' + name + ' is not allowed.'); - * } - * }, 1000); - * }); - * } - * - * var promise = asyncGreet('Robin Hood'); - * promise.then(function(greeting) { - * alert('Success: ' + greeting); - * }, function(reason) { - * alert('Failed: ' + reason); - * }); - * ``` - * - * Note: progress/notify callbacks are not currently supported via the ES6-style interface. - * - * However, the more traditional CommonJS-style usage is still available, and documented below. - * - * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an - * interface for interacting with an object that represents the result of an action that is - * performed asynchronously, and may or may not be finished at any given point in time. - * - * From the perspective of dealing with error handling, deferred and promise APIs are to - * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming. - * - * ```js - * // for the purpose of this example let's assume that variables `$q` and `okToGreet` - * // are available in the current lexical scope (they could have been injected or passed in). - * - * function asyncGreet(name) { - * var deferred = $q.defer(); - * - * setTimeout(function() { - * deferred.notify('About to greet ' + name + '.'); - * - * if (okToGreet(name)) { - * deferred.resolve('Hello, ' + name + '!'); - * } else { - * deferred.reject('Greeting ' + name + ' is not allowed.'); - * } - * }, 1000); - * - * return deferred.promise; - * } - * - * var promise = asyncGreet('Robin Hood'); - * promise.then(function(greeting) { - * alert('Success: ' + greeting); - * }, function(reason) { - * alert('Failed: ' + reason); - * }, function(update) { - * alert('Got notification: ' + update); - * }); - * ``` - * - * At first it might not be obvious why this extra complexity is worth the trouble. The payoff - * comes in the way of guarantees that promise and deferred APIs make, see - * https://github.com/kriskowal/uncommonjs/blob/master/promises/specification.md. - * - * Additionally the promise api allows for composition that is very hard to do with the - * traditional callback ([CPS](http://en.wikipedia.org/wiki/Continuation-passing_style)) approach. - * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the - * section on serial or parallel joining of promises. - * - * # The Deferred API - * - * A new instance of deferred is constructed by calling `$q.defer()`. - * - * The purpose of the deferred object is to expose the associated Promise instance as well as APIs - * that can be used for signaling the successful or unsuccessful completion, as well as the status - * of the task. - * - * **Methods** - * - * - `resolve(value)` – resolves the derived promise with the `value`. If the value is a rejection - * constructed via `$q.reject`, the promise will be rejected instead. - * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to - * resolving it with a rejection constructed via `$q.reject`. - * - `notify(value)` - provides updates on the status of the promise's execution. This may be called - * multiple times before the promise is either resolved or rejected. - * - * **Properties** - * - * - promise – `{Promise}` – promise object associated with this deferred. - * - * - * # The Promise API - * - * A new promise instance is created when a deferred instance is created and can be retrieved by - * calling `deferred.promise`. - * - * The purpose of the promise object is to allow for interested parties to get access to the result - * of the deferred task when it completes. - * - * **Methods** - * - * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or - * will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously - * as soon as the result is available. The callbacks are called with a single argument: the result - * or rejection reason. Additionally, the notify callback may be called zero or more times to - * provide a progress indication, before the promise is resolved or rejected. - * - * This method *returns a new promise* which is resolved or rejected via the return value of the - * `successCallback`, `errorCallback`. It also notifies via the return value of the - * `notifyCallback` method. The promise cannot be resolved or rejected from the notifyCallback - * method. - * - * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)` - * - * - `finally(callback, notifyCallback)` – allows you to observe either the fulfillment or rejection of a promise, - * but to do so without modifying the final value. This is useful to release resources or do some - * clean-up that needs to be done whether the promise was rejected or resolved. See the [full - * specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for - * more information. - * - * # Chaining promises - * - * Because calling the `then` method of a promise returns a new derived promise, it is easily - * possible to create a chain of promises: - * - * ```js - * promiseB = promiseA.then(function(result) { - * return result + 1; - * }); - * - * // promiseB will be resolved immediately after promiseA is resolved and its value - * // will be the result of promiseA incremented by 1 - * ``` - * - * It is possible to create chains of any length and since a promise can be resolved with another - * promise (which will defer its resolution further), it is possible to pause/defer resolution of - * the promises at any point in the chain. This makes it possible to implement powerful APIs like - * $http's response interceptors. - * - * - * # Differences between Kris Kowal's Q and $q - * - * There are two main differences: - * - * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation - * mechanism in angular, which means faster propagation of resolution or rejection into your - * models and avoiding unnecessary browser repaints, which would result in flickering UI. - * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains - * all the important functionality needed for common async tasks. - * - * # Testing - * - * ```js - * it('should simulate promise', inject(function($q, $rootScope) { - * var deferred = $q.defer(); - * var promise = deferred.promise; - * var resolvedValue; - * - * promise.then(function(value) { resolvedValue = value; }); - * expect(resolvedValue).toBeUndefined(); - * - * // Simulate resolving of promise - * deferred.resolve(123); - * // Note that the 'then' function does not get called synchronously. - * // This is because we want the promise API to always be async, whether or not - * // it got called synchronously or asynchronously. - * expect(resolvedValue).toBeUndefined(); - * - * // Propagate promise resolution to 'then' functions using $apply(). - * $rootScope.$apply(); - * expect(resolvedValue).toEqual(123); - * })); - * ``` - * - * @param {function(function, function)} resolver Function which is responsible for resolving or - * rejecting the newly created promise. The first parameter is a function which resolves the - * promise, the second parameter is a function which rejects the promise. - * - * @returns {Promise} The newly created promise. - */ -function $QProvider() { - - this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) { - return qFactory(function(callback) { - $rootScope.$evalAsync(callback); - }, $exceptionHandler); - }]; -} - -function $$QProvider() { - this.$get = ['$browser', '$exceptionHandler', function($browser, $exceptionHandler) { - return qFactory(function(callback) { - $browser.defer(callback); - }, $exceptionHandler); - }]; -} - -/** - * Constructs a promise manager. - * - * @param {function(function)} nextTick Function for executing functions in the next turn. - * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for - * debugging purposes. - * @returns {object} Promise manager. - */ -function qFactory(nextTick, exceptionHandler) { - var $qMinErr = minErr('$q', TypeError); - function callOnce(self, resolveFn, rejectFn) { - var called = false; - function wrap(fn) { - return function(value) { - if (called) return; - called = true; - fn.call(self, value); - }; - } - - return [wrap(resolveFn), wrap(rejectFn)]; - } - - /** - * @ngdoc method - * @name ng.$q#defer - * @kind function - * - * @description - * Creates a `Deferred` object which represents a task which will finish in the future. - * - * @returns {Deferred} Returns a new instance of deferred. - */ - var defer = function() { - return new Deferred(); - }; - - function Promise() { - this.$$state = { status: 0 }; - } - - Promise.prototype = { - then: function(onFulfilled, onRejected, progressBack) { - var result = new Deferred(); - - this.$$state.pending = this.$$state.pending || []; - this.$$state.pending.push([result, onFulfilled, onRejected, progressBack]); - if (this.$$state.status > 0) scheduleProcessQueue(this.$$state); - - return result.promise; - }, - - "catch": function(callback) { - return this.then(null, callback); - }, - - "finally": function(callback, progressBack) { - return this.then(function(value) { - return handleCallback(value, true, callback); - }, function(error) { - return handleCallback(error, false, callback); - }, progressBack); - } - }; - - //Faster, more basic than angular.bind http://jsperf.com/angular-bind-vs-custom-vs-native - function simpleBind(context, fn) { - return function(value) { - fn.call(context, value); - }; - } - - function processQueue(state) { - var fn, promise, pending; - - pending = state.pending; - state.processScheduled = false; - state.pending = undefined; - for (var i = 0, ii = pending.length; i < ii; ++i) { - promise = pending[i][0]; - fn = pending[i][state.status]; - try { - if (isFunction(fn)) { - promise.resolve(fn(state.value)); - } else if (state.status === 1) { - promise.resolve(state.value); - } else { - promise.reject(state.value); - } - } catch (e) { - promise.reject(e); - exceptionHandler(e); - } - } - } - - function scheduleProcessQueue(state) { - if (state.processScheduled || !state.pending) return; - state.processScheduled = true; - nextTick(function() { processQueue(state); }); - } - - function Deferred() { - this.promise = new Promise(); - //Necessary to support unbound execution :/ - this.resolve = simpleBind(this, this.resolve); - this.reject = simpleBind(this, this.reject); - this.notify = simpleBind(this, this.notify); - } - - Deferred.prototype = { - resolve: function(val) { - if (this.promise.$$state.status) return; - if (val === this.promise) { - this.$$reject($qMinErr( - 'qcycle', - "Expected promise to be resolved with value other than itself '{0}'", - val)); - } - else { - this.$$resolve(val); - } - - }, - - $$resolve: function(val) { - var then, fns; - - fns = callOnce(this, this.$$resolve, this.$$reject); - try { - if ((isObject(val) || isFunction(val))) then = val && val.then; - if (isFunction(then)) { - this.promise.$$state.status = -1; - then.call(val, fns[0], fns[1], this.notify); - } else { - this.promise.$$state.value = val; - this.promise.$$state.status = 1; - scheduleProcessQueue(this.promise.$$state); - } - } catch (e) { - fns[1](e); - exceptionHandler(e); - } - }, - - reject: function(reason) { - if (this.promise.$$state.status) return; - this.$$reject(reason); - }, - - $$reject: function(reason) { - this.promise.$$state.value = reason; - this.promise.$$state.status = 2; - scheduleProcessQueue(this.promise.$$state); - }, - - notify: function(progress) { - var callbacks = this.promise.$$state.pending; - - if ((this.promise.$$state.status <= 0) && callbacks && callbacks.length) { - nextTick(function() { - var callback, result; - for (var i = 0, ii = callbacks.length; i < ii; i++) { - result = callbacks[i][0]; - callback = callbacks[i][3]; - try { - result.notify(isFunction(callback) ? callback(progress) : progress); - } catch (e) { - exceptionHandler(e); - } - } - }); - } - } - }; - - /** - * @ngdoc method - * @name $q#reject - * @kind function - * - * @description - * Creates a promise that is resolved as rejected with the specified `reason`. This api should be - * used to forward rejection in a chain of promises. If you are dealing with the last promise in - * a promise chain, you don't need to worry about it. - * - * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of - * `reject` as the `throw` keyword in JavaScript. This also means that if you "catch" an error via - * a promise error callback and you want to forward the error to the promise derived from the - * current promise, you have to "rethrow" the error by returning a rejection constructed via - * `reject`. - * - * ```js - * promiseB = promiseA.then(function(result) { - * // success: do something and resolve promiseB - * // with the old or a new result - * return result; - * }, function(reason) { - * // error: handle the error if possible and - * // resolve promiseB with newPromiseOrValue, - * // otherwise forward the rejection to promiseB - * if (canHandle(reason)) { - * // handle the error and recover - * return newPromiseOrValue; - * } - * return $q.reject(reason); - * }); - * ``` - * - * @param {*} reason Constant, message, exception or an object representing the rejection reason. - * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`. - */ - var reject = function(reason) { - var result = new Deferred(); - result.reject(reason); - return result.promise; - }; - - var makePromise = function makePromise(value, resolved) { - var result = new Deferred(); - if (resolved) { - result.resolve(value); - } else { - result.reject(value); - } - return result.promise; - }; - - var handleCallback = function handleCallback(value, isResolved, callback) { - var callbackOutput = null; - try { - if (isFunction(callback)) callbackOutput = callback(); - } catch (e) { - return makePromise(e, false); - } - if (isPromiseLike(callbackOutput)) { - return callbackOutput.then(function() { - return makePromise(value, isResolved); - }, function(error) { - return makePromise(error, false); - }); - } else { - return makePromise(value, isResolved); - } - }; - - /** - * @ngdoc method - * @name $q#when - * @kind function - * - * @description - * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. - * This is useful when you are dealing with an object that might or might not be a promise, or if - * the promise comes from a source that can't be trusted. - * - * @param {*} value Value or a promise - * @returns {Promise} Returns a promise of the passed value or promise - */ - - - var when = function(value, callback, errback, progressBack) { - var result = new Deferred(); - result.resolve(value); - return result.promise.then(callback, errback, progressBack); - }; - - /** - * @ngdoc method - * @name $q#all - * @kind function - * - * @description - * Combines multiple promises into a single promise that is resolved when all of the input - * promises are resolved. - * - * @param {Array.|Object.} promises An array or hash of promises. - * @returns {Promise} Returns a single promise that will be resolved with an array/hash of values, - * each value corresponding to the promise at the same index/key in the `promises` array/hash. - * If any of the promises is resolved with a rejection, this resulting promise will be rejected - * with the same rejection value. - */ - - function all(promises) { - var deferred = new Deferred(), - counter = 0, - results = isArray(promises) ? [] : {}; - - forEach(promises, function(promise, key) { - counter++; - when(promise).then(function(value) { - if (results.hasOwnProperty(key)) return; - results[key] = value; - if (!(--counter)) deferred.resolve(results); - }, function(reason) { - if (results.hasOwnProperty(key)) return; - deferred.reject(reason); - }); - }); - - if (counter === 0) { - deferred.resolve(results); - } - - return deferred.promise; - } - - var $Q = function Q(resolver) { - if (!isFunction(resolver)) { - throw $qMinErr('norslvr', "Expected resolverFn, got '{0}'", resolver); - } - - if (!(this instanceof Q)) { - // More useful when $Q is the Promise itself. - return new Q(resolver); - } - - var deferred = new Deferred(); - - function resolveFn(value) { - deferred.resolve(value); - } - - function rejectFn(reason) { - deferred.reject(reason); - } - - resolver(resolveFn, rejectFn); - - return deferred.promise; - }; - - $Q.defer = defer; - $Q.reject = reject; - $Q.when = when; - $Q.all = all; - - return $Q; -} - -function $$RAFProvider() { //rAF - this.$get = ['$window', '$timeout', function($window, $timeout) { - var requestAnimationFrame = $window.requestAnimationFrame || - $window.webkitRequestAnimationFrame || - $window.mozRequestAnimationFrame; - - var cancelAnimationFrame = $window.cancelAnimationFrame || - $window.webkitCancelAnimationFrame || - $window.mozCancelAnimationFrame || - $window.webkitCancelRequestAnimationFrame; - - var rafSupported = !!requestAnimationFrame; - var raf = rafSupported - ? function(fn) { - var id = requestAnimationFrame(fn); - return function() { - cancelAnimationFrame(id); - }; - } - : function(fn) { - var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666 - return function() { - $timeout.cancel(timer); - }; - }; - - raf.supported = rafSupported; - - return raf; - }]; -} - -/** - * DESIGN NOTES - * - * The design decisions behind the scope are heavily favored for speed and memory consumption. - * - * The typical use of scope is to watch the expressions, which most of the time return the same - * value as last time so we optimize the operation. - * - * Closures construction is expensive in terms of speed as well as memory: - * - No closures, instead use prototypical inheritance for API - * - Internal state needs to be stored on scope directly, which means that private state is - * exposed as $$____ properties - * - * Loop operations are optimized by using while(count--) { ... } - * - this means that in order to keep the same order of execution as addition we have to add - * items to the array at the beginning (unshift) instead of at the end (push) - * - * Child scopes are created and removed often - * - Using an array would be slow since inserts in middle are expensive so we use linked list - * - * There are few watches then a lot of observers. This is why you don't want the observer to be - * implemented in the same way as watch. Watch requires return of initialization function which - * are expensive to construct. - */ - - -/** - * @ngdoc provider - * @name $rootScopeProvider - * @description - * - * Provider for the $rootScope service. - */ - -/** - * @ngdoc method - * @name $rootScopeProvider#digestTtl - * @description - * - * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and - * assuming that the model is unstable. - * - * The current default is 10 iterations. - * - * In complex applications it's possible that the dependencies between `$watch`s will result in - * several digest iterations. However if an application needs more than the default 10 digest - * iterations for its model to stabilize then you should investigate what is causing the model to - * continuously change during the digest. - * - * Increasing the TTL could have performance implications, so you should not change it without - * proper justification. - * - * @param {number} limit The number of digest iterations. - */ - - -/** - * @ngdoc service - * @name $rootScope - * @description - * - * Every application has a single root {@link ng.$rootScope.Scope scope}. - * All other scopes are descendant scopes of the root scope. Scopes provide separation - * between the model and the view, via a mechanism for watching the model for changes. - * They also provide an event emission/broadcast and subscription facility. See the - * {@link guide/scope developer guide on scopes}. - */ -function $RootScopeProvider() { - var TTL = 10; - var $rootScopeMinErr = minErr('$rootScope'); - var lastDirtyWatch = null; - var applyAsyncId = null; - - this.digestTtl = function(value) { - if (arguments.length) { - TTL = value; - } - return TTL; - }; - - this.$get = ['$injector', '$exceptionHandler', '$parse', '$browser', - function($injector, $exceptionHandler, $parse, $browser) { - - /** - * @ngdoc type - * @name $rootScope.Scope - * - * @description - * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the - * {@link auto.$injector $injector}. Child scopes are created using the - * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when - * compiled HTML template is executed.) - * - * Here is a simple scope snippet to show how you can interact with the scope. - * ```html - * - * ``` - * - * # Inheritance - * A scope can inherit from a parent scope, as in this example: - * ```js - var parent = $rootScope; - var child = parent.$new(); - - parent.salutation = "Hello"; - child.name = "World"; - expect(child.salutation).toEqual('Hello'); - - child.salutation = "Welcome"; - expect(child.salutation).toEqual('Welcome'); - expect(parent.salutation).toEqual('Hello'); - * ``` - * - * When interacting with `Scope` in tests, additional helper methods are available on the - * instances of `Scope` type. See {@link ngMock.$rootScope.Scope ngMock Scope} for additional - * details. - * - * - * @param {Object.=} providers Map of service factory which need to be - * provided for the current scope. Defaults to {@link ng}. - * @param {Object.=} instanceCache Provides pre-instantiated services which should - * append/override services provided by `providers`. This is handy - * when unit-testing and having the need to override a default - * service. - * @returns {Object} Newly created scope. - * - */ - function Scope() { - this.$id = nextUid(); - this.$$phase = this.$parent = this.$$watchers = - this.$$nextSibling = this.$$prevSibling = - this.$$childHead = this.$$childTail = null; - this.$root = this; - this.$$destroyed = false; - this.$$listeners = {}; - this.$$listenerCount = {}; - this.$$isolateBindings = null; - } - - /** - * @ngdoc property - * @name $rootScope.Scope#$id - * - * @description - * Unique scope ID (monotonically increasing) useful for debugging. - */ - - /** - * @ngdoc property - * @name $rootScope.Scope#$parent - * - * @description - * Reference to the parent scope. - */ - - /** - * @ngdoc property - * @name $rootScope.Scope#$root - * - * @description - * Reference to the root scope. - */ - - Scope.prototype = { - constructor: Scope, - /** - * @ngdoc method - * @name $rootScope.Scope#$new - * @kind function - * - * @description - * Creates a new child {@link ng.$rootScope.Scope scope}. - * - * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} event. - * The scope can be removed from the scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}. - * - * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is - * desired for the scope and its child scopes to be permanently detached from the parent and - * thus stop participating in model change detection and listener notification by invoking. - * - * @param {boolean} isolate If true, then the scope does not prototypically inherit from the - * parent scope. The scope is isolated, as it can not see parent scope properties. - * When creating widgets, it is useful for the widget to not accidentally read parent - * state. - * - * @param {Scope} [parent=this] The {@link ng.$rootScope.Scope `Scope`} that will be the `$parent` - * of the newly created scope. Defaults to `this` scope if not provided. - * This is used when creating a transclude scope to correctly place it - * in the scope hierarchy while maintaining the correct prototypical - * inheritance. - * - * @returns {Object} The newly created child scope. - * - */ - $new: function(isolate, parent) { - var child; - - parent = parent || this; - - if (isolate) { - child = new Scope(); - child.$root = this.$root; - } else { - // Only create a child scope class if somebody asks for one, - // but cache it to allow the VM to optimize lookups. - if (!this.$$ChildScope) { - this.$$ChildScope = function ChildScope() { - this.$$watchers = this.$$nextSibling = - this.$$childHead = this.$$childTail = null; - this.$$listeners = {}; - this.$$listenerCount = {}; - this.$id = nextUid(); - this.$$ChildScope = null; - }; - this.$$ChildScope.prototype = this; - } - child = new this.$$ChildScope(); - } - child.$parent = parent; - child.$$prevSibling = parent.$$childTail; - if (parent.$$childHead) { - parent.$$childTail.$$nextSibling = child; - parent.$$childTail = child; - } else { - parent.$$childHead = parent.$$childTail = child; - } - - // When the new scope is not isolated or we inherit from `this`, and - // the parent scope is destroyed, the property `$$destroyed` is inherited - // prototypically. In all other cases, this property needs to be set - // when the parent scope is destroyed. - // The listener needs to be added after the parent is set - if (isolate || parent != this) child.$on('$destroy', destroyChild); - - return child; - - function destroyChild() { - child.$$destroyed = true; - } - }, - - /** - * @ngdoc method - * @name $rootScope.Scope#$watch - * @kind function - * - * @description - * Registers a `listener` callback to be executed whenever the `watchExpression` changes. - * - * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest - * $digest()} and should return the value that will be watched. (Since - * {@link ng.$rootScope.Scope#$digest $digest()} reruns when it detects changes the - * `watchExpression` can execute multiple times per - * {@link ng.$rootScope.Scope#$digest $digest()} and should be idempotent.) - * - The `listener` is called only when the value from the current `watchExpression` and the - * previous call to `watchExpression` are not equal (with the exception of the initial run, - * see below). Inequality is determined according to reference inequality, - * [strict comparison](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Comparison_Operators) - * via the `!==` Javascript operator, unless `objectEquality == true` - * (see next point) - * - When `objectEquality == true`, inequality of the `watchExpression` is determined - * according to the {@link angular.equals} function. To save the value of the object for - * later comparison, the {@link angular.copy} function is used. This therefore means that - * watching complex objects will have adverse memory and performance implications. - * - The watch `listener` may change the model, which may trigger other `listener`s to fire. - * This is achieved by rerunning the watchers until no changes are detected. The rerun - * iteration limit is 10 to prevent an infinite loop deadlock. - * - * - * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called, - * you can register a `watchExpression` function with no `listener`. (Since `watchExpression` - * can execute multiple times per {@link ng.$rootScope.Scope#$digest $digest} cycle when a - * change is detected, be prepared for multiple calls to your listener.) - * - * After a watcher is registered with the scope, the `listener` fn is called asynchronously - * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the - * watcher. In rare cases, this is undesirable because the listener is called when the result - * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you - * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the - * listener was called due to initialization. - * - * - * - * # Example - * ```js - // let's assume that scope was dependency injected as the $rootScope - var scope = $rootScope; - scope.name = 'misko'; - scope.counter = 0; - - expect(scope.counter).toEqual(0); - scope.$watch('name', function(newValue, oldValue) { - scope.counter = scope.counter + 1; - }); - expect(scope.counter).toEqual(0); - - scope.$digest(); - // the listener is always called during the first $digest loop after it was registered - expect(scope.counter).toEqual(1); - - scope.$digest(); - // but now it will not be called unless the value changes - expect(scope.counter).toEqual(1); - - scope.name = 'adam'; - scope.$digest(); - expect(scope.counter).toEqual(2); - - - - // Using a function as a watchExpression - var food; - scope.foodCounter = 0; - expect(scope.foodCounter).toEqual(0); - scope.$watch( - // This function returns the value being watched. It is called for each turn of the $digest loop - function() { return food; }, - // This is the change listener, called when the value returned from the above function changes - function(newValue, oldValue) { - if ( newValue !== oldValue ) { - // Only increment the counter if the value changed - scope.foodCounter = scope.foodCounter + 1; - } - } - ); - // No digest has been run so the counter will be zero - expect(scope.foodCounter).toEqual(0); - - // Run the digest but since food has not changed count will still be zero - scope.$digest(); - expect(scope.foodCounter).toEqual(0); - - // Update food and run digest. Now the counter will increment - food = 'cheeseburger'; - scope.$digest(); - expect(scope.foodCounter).toEqual(1); - - * ``` - * - * - * - * @param {(function()|string)} watchExpression Expression that is evaluated on each - * {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers - * a call to the `listener`. - * - * - `string`: Evaluated as {@link guide/expression expression} - * - `function(scope)`: called with current `scope` as a parameter. - * @param {function(newVal, oldVal, scope)} listener Callback called whenever the value - * of `watchExpression` changes. - * - * - `newVal` contains the current value of the `watchExpression` - * - `oldVal` contains the previous value of the `watchExpression` - * - `scope` refers to the current scope - * @param {boolean=} objectEquality Compare for object equality using {@link angular.equals} instead of - * comparing for reference equality. - * @returns {function()} Returns a deregistration function for this listener. - */ - $watch: function(watchExp, listener, objectEquality) { - var get = $parse(watchExp); - - if (get.$$watchDelegate) { - return get.$$watchDelegate(this, listener, objectEquality, get); - } - var scope = this, - array = scope.$$watchers, - watcher = { - fn: listener, - last: initWatchVal, - get: get, - exp: watchExp, - eq: !!objectEquality - }; - - lastDirtyWatch = null; - - if (!isFunction(listener)) { - watcher.fn = noop; - } - - if (!array) { - array = scope.$$watchers = []; - } - // we use unshift since we use a while loop in $digest for speed. - // the while loop reads in reverse order. - array.unshift(watcher); - - return function deregisterWatch() { - arrayRemove(array, watcher); - lastDirtyWatch = null; - }; - }, - - /** - * @ngdoc method - * @name $rootScope.Scope#$watchGroup - * @kind function - * - * @description - * A variant of {@link ng.$rootScope.Scope#$watch $watch()} where it watches an array of `watchExpressions`. - * If any one expression in the collection changes the `listener` is executed. - * - * - The items in the `watchExpressions` array are observed via standard $watch operation and are examined on every - * call to $digest() to see if any items changes. - * - The `listener` is called whenever any expression in the `watchExpressions` array changes. - * - * @param {Array.} watchExpressions Array of expressions that will be individually - * watched using {@link ng.$rootScope.Scope#$watch $watch()} - * - * @param {function(newValues, oldValues, scope)} listener Callback called whenever the return value of any - * expression in `watchExpressions` changes - * The `newValues` array contains the current values of the `watchExpressions`, with the indexes matching - * those of `watchExpression` - * and the `oldValues` array contains the previous values of the `watchExpressions`, with the indexes matching - * those of `watchExpression` - * The `scope` refers to the current scope. - * @returns {function()} Returns a de-registration function for all listeners. - */ - $watchGroup: function(watchExpressions, listener) { - var oldValues = new Array(watchExpressions.length); - var newValues = new Array(watchExpressions.length); - var deregisterFns = []; - var self = this; - var changeReactionScheduled = false; - var firstRun = true; - - if (!watchExpressions.length) { - // No expressions means we call the listener ASAP - var shouldCall = true; - self.$evalAsync(function() { - if (shouldCall) listener(newValues, newValues, self); - }); - return function deregisterWatchGroup() { - shouldCall = false; - }; - } - - if (watchExpressions.length === 1) { - // Special case size of one - return this.$watch(watchExpressions[0], function watchGroupAction(value, oldValue, scope) { - newValues[0] = value; - oldValues[0] = oldValue; - listener(newValues, (value === oldValue) ? newValues : oldValues, scope); - }); - } - - forEach(watchExpressions, function(expr, i) { - var unwatchFn = self.$watch(expr, function watchGroupSubAction(value, oldValue) { - newValues[i] = value; - oldValues[i] = oldValue; - if (!changeReactionScheduled) { - changeReactionScheduled = true; - self.$evalAsync(watchGroupAction); - } - }); - deregisterFns.push(unwatchFn); - }); - - function watchGroupAction() { - changeReactionScheduled = false; - - if (firstRun) { - firstRun = false; - listener(newValues, newValues, self); - } else { - listener(newValues, oldValues, self); - } - } - - return function deregisterWatchGroup() { - while (deregisterFns.length) { - deregisterFns.shift()(); - } - }; - }, - - - /** - * @ngdoc method - * @name $rootScope.Scope#$watchCollection - * @kind function - * - * @description - * Shallow watches the properties of an object and fires whenever any of the properties change - * (for arrays, this implies watching the array items; for object maps, this implies watching - * the properties). If a change is detected, the `listener` callback is fired. - * - * - The `obj` collection is observed via standard $watch operation and is examined on every - * call to $digest() to see if any items have been added, removed, or moved. - * - The `listener` is called whenever anything within the `obj` has changed. Examples include - * adding, removing, and moving items belonging to an object or array. - * - * - * # Example - * ```js - $scope.names = ['igor', 'matias', 'misko', 'james']; - $scope.dataCount = 4; - - $scope.$watchCollection('names', function(newNames, oldNames) { - $scope.dataCount = newNames.length; - }); - - expect($scope.dataCount).toEqual(4); - $scope.$digest(); - - //still at 4 ... no changes - expect($scope.dataCount).toEqual(4); - - $scope.names.pop(); - $scope.$digest(); - - //now there's been a change - expect($scope.dataCount).toEqual(3); - * ``` - * - * - * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The - * expression value should evaluate to an object or an array which is observed on each - * {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the - * collection will trigger a call to the `listener`. - * - * @param {function(newCollection, oldCollection, scope)} listener a callback function called - * when a change is detected. - * - The `newCollection` object is the newly modified data obtained from the `obj` expression - * - The `oldCollection` object is a copy of the former collection data. - * Due to performance considerations, the`oldCollection` value is computed only if the - * `listener` function declares two or more arguments. - * - The `scope` argument refers to the current scope. - * - * @returns {function()} Returns a de-registration function for this listener. When the - * de-registration function is executed, the internal watch operation is terminated. - */ - $watchCollection: function(obj, listener) { - $watchCollectionInterceptor.$stateful = true; - - var self = this; - // the current value, updated on each dirty-check run - var newValue; - // a shallow copy of the newValue from the last dirty-check run, - // updated to match newValue during dirty-check run - var oldValue; - // a shallow copy of the newValue from when the last change happened - var veryOldValue; - // only track veryOldValue if the listener is asking for it - var trackVeryOldValue = (listener.length > 1); - var changeDetected = 0; - var changeDetector = $parse(obj, $watchCollectionInterceptor); - var internalArray = []; - var internalObject = {}; - var initRun = true; - var oldLength = 0; - - function $watchCollectionInterceptor(_value) { - newValue = _value; - var newLength, key, bothNaN, newItem, oldItem; - - // If the new value is undefined, then return undefined as the watch may be a one-time watch - if (isUndefined(newValue)) return; - - if (!isObject(newValue)) { // if primitive - if (oldValue !== newValue) { - oldValue = newValue; - changeDetected++; - } - } else if (isArrayLike(newValue)) { - if (oldValue !== internalArray) { - // we are transitioning from something which was not an array into array. - oldValue = internalArray; - oldLength = oldValue.length = 0; - changeDetected++; - } - - newLength = newValue.length; - - if (oldLength !== newLength) { - // if lengths do not match we need to trigger change notification - changeDetected++; - oldValue.length = oldLength = newLength; - } - // copy the items to oldValue and look for changes. - for (var i = 0; i < newLength; i++) { - oldItem = oldValue[i]; - newItem = newValue[i]; - - bothNaN = (oldItem !== oldItem) && (newItem !== newItem); - if (!bothNaN && (oldItem !== newItem)) { - changeDetected++; - oldValue[i] = newItem; - } - } - } else { - if (oldValue !== internalObject) { - // we are transitioning from something which was not an object into object. - oldValue = internalObject = {}; - oldLength = 0; - changeDetected++; - } - // copy the items to oldValue and look for changes. - newLength = 0; - for (key in newValue) { - if (newValue.hasOwnProperty(key)) { - newLength++; - newItem = newValue[key]; - oldItem = oldValue[key]; - - if (key in oldValue) { - bothNaN = (oldItem !== oldItem) && (newItem !== newItem); - if (!bothNaN && (oldItem !== newItem)) { - changeDetected++; - oldValue[key] = newItem; - } - } else { - oldLength++; - oldValue[key] = newItem; - changeDetected++; - } - } - } - if (oldLength > newLength) { - // we used to have more keys, need to find them and destroy them. - changeDetected++; - for (key in oldValue) { - if (!newValue.hasOwnProperty(key)) { - oldLength--; - delete oldValue[key]; - } - } - } - } - return changeDetected; - } - - function $watchCollectionAction() { - if (initRun) { - initRun = false; - listener(newValue, newValue, self); - } else { - listener(newValue, veryOldValue, self); - } - - // make a copy for the next time a collection is changed - if (trackVeryOldValue) { - if (!isObject(newValue)) { - //primitive - veryOldValue = newValue; - } else if (isArrayLike(newValue)) { - veryOldValue = new Array(newValue.length); - for (var i = 0; i < newValue.length; i++) { - veryOldValue[i] = newValue[i]; - } - } else { // if object - veryOldValue = {}; - for (var key in newValue) { - if (hasOwnProperty.call(newValue, key)) { - veryOldValue[key] = newValue[key]; - } - } - } - } - } - - return this.$watch(changeDetector, $watchCollectionAction); - }, - - /** - * @ngdoc method - * @name $rootScope.Scope#$digest - * @kind function - * - * @description - * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and - * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change - * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers} - * until no more listeners are firing. This means that it is possible to get into an infinite - * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of - * iterations exceeds 10. - * - * Usually, you don't call `$digest()` directly in - * {@link ng.directive:ngController controllers} or in - * {@link ng.$compileProvider#directive directives}. - * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within - * a {@link ng.$compileProvider#directive directive}), which will force a `$digest()`. - * - * If you want to be notified whenever `$digest()` is called, - * you can register a `watchExpression` function with - * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`. - * - * In unit tests, you may need to call `$digest()` to simulate the scope life cycle. - * - * # Example - * ```js - var scope = ...; - scope.name = 'misko'; - scope.counter = 0; - - expect(scope.counter).toEqual(0); - scope.$watch('name', function(newValue, oldValue) { - scope.counter = scope.counter + 1; - }); - expect(scope.counter).toEqual(0); - - scope.$digest(); - // the listener is always called during the first $digest loop after it was registered - expect(scope.counter).toEqual(1); - - scope.$digest(); - // but now it will not be called unless the value changes - expect(scope.counter).toEqual(1); - - scope.name = 'adam'; - scope.$digest(); - expect(scope.counter).toEqual(2); - * ``` - * - */ - $digest: function() { - var watch, value, last, - watchers, - length, - dirty, ttl = TTL, - next, current, target = this, - watchLog = [], - logIdx, logMsg, asyncTask; - - beginPhase('$digest'); - // Check for changes to browser url that happened in sync before the call to $digest - $browser.$$checkUrlChange(); - - if (this === $rootScope && applyAsyncId !== null) { - // If this is the root scope, and $applyAsync has scheduled a deferred $apply(), then - // cancel the scheduled $apply and flush the queue of expressions to be evaluated. - $browser.defer.cancel(applyAsyncId); - flushApplyAsync(); - } - - lastDirtyWatch = null; - - do { // "while dirty" loop - dirty = false; - current = target; - - while (asyncQueue.length) { - try { - asyncTask = asyncQueue.shift(); - asyncTask.scope.$eval(asyncTask.expression); - } catch (e) { - $exceptionHandler(e); - } - lastDirtyWatch = null; - } - - traverseScopesLoop: - do { // "traverse the scopes" loop - if ((watchers = current.$$watchers)) { - // process our watches - length = watchers.length; - while (length--) { - try { - watch = watchers[length]; - // Most common watches are on primitives, in which case we can short - // circuit it with === operator, only when === fails do we use .equals - if (watch) { - if ((value = watch.get(current)) !== (last = watch.last) && - !(watch.eq - ? equals(value, last) - : (typeof value === 'number' && typeof last === 'number' - && isNaN(value) && isNaN(last)))) { - dirty = true; - lastDirtyWatch = watch; - watch.last = watch.eq ? copy(value, null) : value; - watch.fn(value, ((last === initWatchVal) ? value : last), current); - if (ttl < 5) { - logIdx = 4 - ttl; - if (!watchLog[logIdx]) watchLog[logIdx] = []; - watchLog[logIdx].push({ - msg: isFunction(watch.exp) ? 'fn: ' + (watch.exp.name || watch.exp.toString()) : watch.exp, - newVal: value, - oldVal: last - }); - } - } else if (watch === lastDirtyWatch) { - // If the most recently dirty watcher is now clean, short circuit since the remaining watchers - // have already been tested. - dirty = false; - break traverseScopesLoop; - } - } - } catch (e) { - $exceptionHandler(e); - } - } - } - - // Insanity Warning: scope depth-first traversal - // yes, this code is a bit crazy, but it works and we have tests to prove it! - // this piece should be kept in sync with the traversal in $broadcast - if (!(next = (current.$$childHead || - (current !== target && current.$$nextSibling)))) { - while (current !== target && !(next = current.$$nextSibling)) { - current = current.$parent; - } - } - } while ((current = next)); - - // `break traverseScopesLoop;` takes us to here - - if ((dirty || asyncQueue.length) && !(ttl--)) { - clearPhase(); - throw $rootScopeMinErr('infdig', - '{0} $digest() iterations reached. Aborting!\n' + - 'Watchers fired in the last 5 iterations: {1}', - TTL, watchLog); - } - - } while (dirty || asyncQueue.length); - - clearPhase(); - - while (postDigestQueue.length) { - try { - postDigestQueue.shift()(); - } catch (e) { - $exceptionHandler(e); - } - } - }, - - - /** - * @ngdoc event - * @name $rootScope.Scope#$destroy - * @eventType broadcast on scope being destroyed - * - * @description - * Broadcasted when a scope and its children are being destroyed. - * - * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to - * clean up DOM bindings before an element is removed from the DOM. - */ - - /** - * @ngdoc method - * @name $rootScope.Scope#$destroy - * @kind function - * - * @description - * Removes the current scope (and all of its children) from the parent scope. Removal implies - * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer - * propagate to the current scope and its children. Removal also implies that the current - * scope is eligible for garbage collection. - * - * The `$destroy()` is usually used by directives such as - * {@link ng.directive:ngRepeat ngRepeat} for managing the - * unrolling of the loop. - * - * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope. - * Application code can register a `$destroy` event handler that will give it a chance to - * perform any necessary cleanup. - * - * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to - * clean up DOM bindings before an element is removed from the DOM. - */ - $destroy: function() { - // we can't destroy the root scope or a scope that has been already destroyed - if (this.$$destroyed) return; - var parent = this.$parent; - - this.$broadcast('$destroy'); - this.$$destroyed = true; - if (this === $rootScope) return; - - for (var eventName in this.$$listenerCount) { - decrementListenerCount(this, this.$$listenerCount[eventName], eventName); - } - - // sever all the references to parent scopes (after this cleanup, the current scope should - // not be retained by any of our references and should be eligible for garbage collection) - if (parent.$$childHead == this) parent.$$childHead = this.$$nextSibling; - if (parent.$$childTail == this) parent.$$childTail = this.$$prevSibling; - if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling; - if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling; - - // Disable listeners, watchers and apply/digest methods - this.$destroy = this.$digest = this.$apply = this.$evalAsync = this.$applyAsync = noop; - this.$on = this.$watch = this.$watchGroup = function() { return noop; }; - this.$$listeners = {}; - - // All of the code below is bogus code that works around V8's memory leak via optimized code - // and inline caches. - // - // see: - // - https://code.google.com/p/v8/issues/detail?id=2073#c26 - // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909 - // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451 - - this.$parent = this.$$nextSibling = this.$$prevSibling = this.$$childHead = - this.$$childTail = this.$root = this.$$watchers = null; - }, - - /** - * @ngdoc method - * @name $rootScope.Scope#$eval - * @kind function - * - * @description - * Executes the `expression` on the current scope and returns the result. Any exceptions in - * the expression are propagated (uncaught). This is useful when evaluating Angular - * expressions. - * - * # Example - * ```js - var scope = ng.$rootScope.Scope(); - scope.a = 1; - scope.b = 2; - - expect(scope.$eval('a+b')).toEqual(3); - expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3); - * ``` - * - * @param {(string|function())=} expression An angular expression to be executed. - * - * - `string`: execute using the rules as defined in {@link guide/expression expression}. - * - `function(scope)`: execute the function with the current `scope` parameter. - * - * @param {(object)=} locals Local variables object, useful for overriding values in scope. - * @returns {*} The result of evaluating the expression. - */ - $eval: function(expr, locals) { - return $parse(expr)(this, locals); - }, - - /** - * @ngdoc method - * @name $rootScope.Scope#$evalAsync - * @kind function - * - * @description - * Executes the expression on the current scope at a later point in time. - * - * The `$evalAsync` makes no guarantees as to when the `expression` will be executed, only - * that: - * - * - it will execute after the function that scheduled the evaluation (preferably before DOM - * rendering). - * - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after - * `expression` execution. - * - * Any exceptions from the execution of the expression are forwarded to the - * {@link ng.$exceptionHandler $exceptionHandler} service. - * - * __Note:__ if this function is called outside of a `$digest` cycle, a new `$digest` cycle - * will be scheduled. However, it is encouraged to always call code that changes the model - * from within an `$apply` call. That includes code evaluated via `$evalAsync`. - * - * @param {(string|function())=} expression An angular expression to be executed. - * - * - `string`: execute using the rules as defined in {@link guide/expression expression}. - * - `function(scope)`: execute the function with the current `scope` parameter. - * - */ - $evalAsync: function(expr) { - // if we are outside of an $digest loop and this is the first time we are scheduling async - // task also schedule async auto-flush - if (!$rootScope.$$phase && !asyncQueue.length) { - $browser.defer(function() { - if (asyncQueue.length) { - $rootScope.$digest(); - } - }); - } - - asyncQueue.push({scope: this, expression: expr}); - }, - - $$postDigest: function(fn) { - postDigestQueue.push(fn); - }, - - /** - * @ngdoc method - * @name $rootScope.Scope#$apply - * @kind function - * - * @description - * `$apply()` is used to execute an expression in angular from outside of the angular - * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries). - * Because we are calling into the angular framework we need to perform proper scope life - * cycle of {@link ng.$exceptionHandler exception handling}, - * {@link ng.$rootScope.Scope#$digest executing watches}. - * - * ## Life cycle - * - * # Pseudo-Code of `$apply()` - * ```js - function $apply(expr) { - try { - return $eval(expr); - } catch (e) { - $exceptionHandler(e); - } finally { - $root.$digest(); - } - } - * ``` - * - * - * Scope's `$apply()` method transitions through the following stages: - * - * 1. The {@link guide/expression expression} is executed using the - * {@link ng.$rootScope.Scope#$eval $eval()} method. - * 2. Any exceptions from the execution of the expression are forwarded to the - * {@link ng.$exceptionHandler $exceptionHandler} service. - * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the - * expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method. - * - * - * @param {(string|function())=} exp An angular expression to be executed. - * - * - `string`: execute using the rules as defined in {@link guide/expression expression}. - * - `function(scope)`: execute the function with current `scope` parameter. - * - * @returns {*} The result of evaluating the expression. - */ - $apply: function(expr) { - try { - beginPhase('$apply'); - return this.$eval(expr); - } catch (e) { - $exceptionHandler(e); - } finally { - clearPhase(); - try { - $rootScope.$digest(); - } catch (e) { - $exceptionHandler(e); - throw e; - } - } - }, - - /** - * @ngdoc method - * @name $rootScope.Scope#$applyAsync - * @kind function - * - * @description - * Schedule the invokation of $apply to occur at a later time. The actual time difference - * varies across browsers, but is typically around ~10 milliseconds. - * - * This can be used to queue up multiple expressions which need to be evaluated in the same - * digest. - * - * @param {(string|function())=} exp An angular expression to be executed. - * - * - `string`: execute using the rules as defined in {@link guide/expression expression}. - * - `function(scope)`: execute the function with current `scope` parameter. - */ - $applyAsync: function(expr) { - var scope = this; - expr && applyAsyncQueue.push($applyAsyncExpression); - scheduleApplyAsync(); - - function $applyAsyncExpression() { - scope.$eval(expr); - } - }, - - /** - * @ngdoc method - * @name $rootScope.Scope#$on - * @kind function - * - * @description - * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for - * discussion of event life cycle. - * - * The event listener function format is: `function(event, args...)`. The `event` object - * passed into the listener has the following attributes: - * - * - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or - * `$broadcast`-ed. - * - `currentScope` - `{Scope}`: the scope that is currently handling the event. Once the - * event propagates through the scope hierarchy, this property is set to null. - * - `name` - `{string}`: name of the event. - * - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel - * further event propagation (available only for events that were `$emit`-ed). - * - `preventDefault` - `{function}`: calling `preventDefault` sets `defaultPrevented` flag - * to true. - * - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called. - * - * @param {string} name Event name to listen on. - * @param {function(event, ...args)} listener Function to call when the event is emitted. - * @returns {function()} Returns a deregistration function for this listener. - */ - $on: function(name, listener) { - var namedListeners = this.$$listeners[name]; - if (!namedListeners) { - this.$$listeners[name] = namedListeners = []; - } - namedListeners.push(listener); - - var current = this; - do { - if (!current.$$listenerCount[name]) { - current.$$listenerCount[name] = 0; - } - current.$$listenerCount[name]++; - } while ((current = current.$parent)); - - var self = this; - return function() { - var indexOfListener = namedListeners.indexOf(listener); - if (indexOfListener !== -1) { - namedListeners[indexOfListener] = null; - decrementListenerCount(self, 1, name); - } - }; - }, - - - /** - * @ngdoc method - * @name $rootScope.Scope#$emit - * @kind function - * - * @description - * Dispatches an event `name` upwards through the scope hierarchy notifying the - * registered {@link ng.$rootScope.Scope#$on} listeners. - * - * The event life cycle starts at the scope on which `$emit` was called. All - * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get - * notified. Afterwards, the event traverses upwards toward the root scope and calls all - * registered listeners along the way. The event will stop propagating if one of the listeners - * cancels it. - * - * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed - * onto the {@link ng.$exceptionHandler $exceptionHandler} service. - * - * @param {string} name Event name to emit. - * @param {...*} args Optional one or more arguments which will be passed onto the event listeners. - * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}). - */ - $emit: function(name, args) { - var empty = [], - namedListeners, - scope = this, - stopPropagation = false, - event = { - name: name, - targetScope: scope, - stopPropagation: function() {stopPropagation = true;}, - preventDefault: function() { - event.defaultPrevented = true; - }, - defaultPrevented: false - }, - listenerArgs = concat([event], arguments, 1), - i, length; - - do { - namedListeners = scope.$$listeners[name] || empty; - event.currentScope = scope; - for (i = 0, length = namedListeners.length; i < length; i++) { - - // if listeners were deregistered, defragment the array - if (!namedListeners[i]) { - namedListeners.splice(i, 1); - i--; - length--; - continue; - } - try { - //allow all listeners attached to the current scope to run - namedListeners[i].apply(null, listenerArgs); - } catch (e) { - $exceptionHandler(e); - } - } - //if any listener on the current scope stops propagation, prevent bubbling - if (stopPropagation) { - event.currentScope = null; - return event; - } - //traverse upwards - scope = scope.$parent; - } while (scope); - - event.currentScope = null; - - return event; - }, - - - /** - * @ngdoc method - * @name $rootScope.Scope#$broadcast - * @kind function - * - * @description - * Dispatches an event `name` downwards to all child scopes (and their children) notifying the - * registered {@link ng.$rootScope.Scope#$on} listeners. - * - * The event life cycle starts at the scope on which `$broadcast` was called. All - * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get - * notified. Afterwards, the event propagates to all direct and indirect scopes of the current - * scope and calls all registered listeners along the way. The event cannot be canceled. - * - * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed - * onto the {@link ng.$exceptionHandler $exceptionHandler} service. - * - * @param {string} name Event name to broadcast. - * @param {...*} args Optional one or more arguments which will be passed onto the event listeners. - * @return {Object} Event object, see {@link ng.$rootScope.Scope#$on} - */ - $broadcast: function(name, args) { - var target = this, - current = target, - next = target, - event = { - name: name, - targetScope: target, - preventDefault: function() { - event.defaultPrevented = true; - }, - defaultPrevented: false - }; - - if (!target.$$listenerCount[name]) return event; - - var listenerArgs = concat([event], arguments, 1), - listeners, i, length; - - //down while you can, then up and next sibling or up and next sibling until back at root - while ((current = next)) { - event.currentScope = current; - listeners = current.$$listeners[name] || []; - for (i = 0, length = listeners.length; i < length; i++) { - // if listeners were deregistered, defragment the array - if (!listeners[i]) { - listeners.splice(i, 1); - i--; - length--; - continue; - } - - try { - listeners[i].apply(null, listenerArgs); - } catch (e) { - $exceptionHandler(e); - } - } - - // Insanity Warning: scope depth-first traversal - // yes, this code is a bit crazy, but it works and we have tests to prove it! - // this piece should be kept in sync with the traversal in $digest - // (though it differs due to having the extra check for $$listenerCount) - if (!(next = ((current.$$listenerCount[name] && current.$$childHead) || - (current !== target && current.$$nextSibling)))) { - while (current !== target && !(next = current.$$nextSibling)) { - current = current.$parent; - } - } - } - - event.currentScope = null; - return event; - } - }; - - var $rootScope = new Scope(); - - //The internal queues. Expose them on the $rootScope for debugging/testing purposes. - var asyncQueue = $rootScope.$$asyncQueue = []; - var postDigestQueue = $rootScope.$$postDigestQueue = []; - var applyAsyncQueue = $rootScope.$$applyAsyncQueue = []; - - return $rootScope; - - - function beginPhase(phase) { - if ($rootScope.$$phase) { - throw $rootScopeMinErr('inprog', '{0} already in progress', $rootScope.$$phase); - } - - $rootScope.$$phase = phase; - } - - function clearPhase() { - $rootScope.$$phase = null; - } - - - function decrementListenerCount(current, count, name) { - do { - current.$$listenerCount[name] -= count; - - if (current.$$listenerCount[name] === 0) { - delete current.$$listenerCount[name]; - } - } while ((current = current.$parent)); - } - - /** - * function used as an initial value for watchers. - * because it's unique we can easily tell it apart from other values - */ - function initWatchVal() {} - - function flushApplyAsync() { - while (applyAsyncQueue.length) { - try { - applyAsyncQueue.shift()(); - } catch (e) { - $exceptionHandler(e); - } - } - applyAsyncId = null; - } - - function scheduleApplyAsync() { - if (applyAsyncId === null) { - applyAsyncId = $browser.defer(function() { - $rootScope.$apply(flushApplyAsync); - }); - } - } - }]; -} - -/** - * @description - * Private service to sanitize uris for links and images. Used by $compile and $sanitize. - */ -function $$SanitizeUriProvider() { - var aHrefSanitizationWhitelist = /^\s*(https?|ftp|mailto|tel|file):/, - imgSrcSanitizationWhitelist = /^\s*((https?|ftp|file|blob):|data:image\/)/; - - /** - * @description - * Retrieves or overrides the default regular expression that is used for whitelisting of safe - * urls during a[href] sanitization. - * - * The sanitization is a security measure aimed at prevent XSS attacks via html links. - * - * Any url about to be assigned to a[href] via data-binding is first normalized and turned into - * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist` - * regular expression. If a match is found, the original url is written into the dom. Otherwise, - * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. - * - * @param {RegExp=} regexp New regexp to whitelist urls with. - * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for - * chaining otherwise. - */ - this.aHrefSanitizationWhitelist = function(regexp) { - if (isDefined(regexp)) { - aHrefSanitizationWhitelist = regexp; - return this; - } - return aHrefSanitizationWhitelist; - }; - - - /** - * @description - * Retrieves or overrides the default regular expression that is used for whitelisting of safe - * urls during img[src] sanitization. - * - * The sanitization is a security measure aimed at prevent XSS attacks via html links. - * - * Any url about to be assigned to img[src] via data-binding is first normalized and turned into - * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist` - * regular expression. If a match is found, the original url is written into the dom. Otherwise, - * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. - * - * @param {RegExp=} regexp New regexp to whitelist urls with. - * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for - * chaining otherwise. - */ - this.imgSrcSanitizationWhitelist = function(regexp) { - if (isDefined(regexp)) { - imgSrcSanitizationWhitelist = regexp; - return this; - } - return imgSrcSanitizationWhitelist; - }; - - this.$get = function() { - return function sanitizeUri(uri, isImage) { - var regex = isImage ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist; - var normalizedVal; - normalizedVal = urlResolve(uri).href; - if (normalizedVal !== '' && !normalizedVal.match(regex)) { - return 'unsafe:' + normalizedVal; - } - return uri; - }; - }; -} - -var $sceMinErr = minErr('$sce'); - -var SCE_CONTEXTS = { - HTML: 'html', - CSS: 'css', - URL: 'url', - // RESOURCE_URL is a subtype of URL used in contexts where a privileged resource is sourced from a - // url. (e.g. ng-include, script src, templateUrl) - RESOURCE_URL: 'resourceUrl', - JS: 'js' -}; - -// Helper functions follow. - -function adjustMatcher(matcher) { - if (matcher === 'self') { - return matcher; - } else if (isString(matcher)) { - // Strings match exactly except for 2 wildcards - '*' and '**'. - // '*' matches any character except those from the set ':/.?&'. - // '**' matches any character (like .* in a RegExp). - // More than 2 *'s raises an error as it's ill defined. - if (matcher.indexOf('***') > -1) { - throw $sceMinErr('iwcard', - 'Illegal sequence *** in string matcher. String: {0}', matcher); - } - matcher = escapeForRegexp(matcher). - replace('\\*\\*', '.*'). - replace('\\*', '[^:/.?&;]*'); - return new RegExp('^' + matcher + '$'); - } else if (isRegExp(matcher)) { - // The only other type of matcher allowed is a Regexp. - // Match entire URL / disallow partial matches. - // Flags are reset (i.e. no global, ignoreCase or multiline) - return new RegExp('^' + matcher.source + '$'); - } else { - throw $sceMinErr('imatcher', - 'Matchers may only be "self", string patterns or RegExp objects'); - } -} - - -function adjustMatchers(matchers) { - var adjustedMatchers = []; - if (isDefined(matchers)) { - forEach(matchers, function(matcher) { - adjustedMatchers.push(adjustMatcher(matcher)); - }); - } - return adjustedMatchers; -} - - -/** - * @ngdoc service - * @name $sceDelegate - * @kind function - * - * @description - * - * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict - * Contextual Escaping (SCE)} services to AngularJS. - * - * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of - * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS. This is - * because, while the `$sce` provides numerous shorthand methods, etc., you really only need to - * override 3 core functions (`trustAs`, `getTrusted` and `valueOf`) to replace the way things - * work because `$sce` delegates to `$sceDelegate` for these operations. - * - * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} to configure this service. - * - * The default instance of `$sceDelegate` should work out of the box with little pain. While you - * can override it completely to change the behavior of `$sce`, the common case would - * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting - * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as - * templates. Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist - * $sceDelegateProvider.resourceUrlWhitelist} and {@link - * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist} - */ - -/** - * @ngdoc provider - * @name $sceDelegateProvider - * @description - * - * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate - * $sceDelegate} service. This allows one to get/set the whitelists and blacklists used to ensure - * that the URLs used for sourcing Angular templates are safe. Refer {@link - * ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist} and - * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist} - * - * For the general details about this service in Angular, read the main page for {@link ng.$sce - * Strict Contextual Escaping (SCE)}. - * - * **Example**: Consider the following case. - * - * - your app is hosted at url `http://myapp.example.com/` - * - but some of your templates are hosted on other domains you control such as - * `http://srv01.assets.example.com/`,  `http://srv02.assets.example.com/`, etc. - * - and you have an open redirect at `http://myapp.example.com/clickThru?...`. - * - * Here is what a secure configuration for this scenario might look like: - * - * ``` - * angular.module('myApp', []).config(function($sceDelegateProvider) { - * $sceDelegateProvider.resourceUrlWhitelist([ - * // Allow same origin resource loads. - * 'self', - * // Allow loading from our assets domain. Notice the difference between * and **. - * 'http://srv*.assets.example.com/**' - * ]); - * - * // The blacklist overrides the whitelist so the open redirect here is blocked. - * $sceDelegateProvider.resourceUrlBlacklist([ - * 'http://myapp.example.com/clickThru**' - * ]); - * }); - * ``` - */ - -function $SceDelegateProvider() { - this.SCE_CONTEXTS = SCE_CONTEXTS; - - // Resource URLs can also be trusted by policy. - var resourceUrlWhitelist = ['self'], - resourceUrlBlacklist = []; - - /** - * @ngdoc method - * @name $sceDelegateProvider#resourceUrlWhitelist - * @kind function - * - * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value - * provided. This must be an array or null. A snapshot of this array is used so further - * changes to the array are ignored. - * - * Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items - * allowed in this array. - * - * Note: **an empty whitelist array will block all URLs**! - * - * @return {Array} the currently set whitelist array. - * - * The **default value** when no whitelist has been explicitly set is `['self']` allowing only - * same origin resource requests. - * - * @description - * Sets/Gets the whitelist of trusted resource URLs. - */ - this.resourceUrlWhitelist = function(value) { - if (arguments.length) { - resourceUrlWhitelist = adjustMatchers(value); - } - return resourceUrlWhitelist; - }; - - /** - * @ngdoc method - * @name $sceDelegateProvider#resourceUrlBlacklist - * @kind function - * - * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value - * provided. This must be an array or null. A snapshot of this array is used so further - * changes to the array are ignored. - * - * Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items - * allowed in this array. - * - * The typical usage for the blacklist is to **block - * [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as - * these would otherwise be trusted but actually return content from the redirected domain. - * - * Finally, **the blacklist overrides the whitelist** and has the final say. - * - * @return {Array} the currently set blacklist array. - * - * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there - * is no blacklist.) - * - * @description - * Sets/Gets the blacklist of trusted resource URLs. - */ - - this.resourceUrlBlacklist = function(value) { - if (arguments.length) { - resourceUrlBlacklist = adjustMatchers(value); - } - return resourceUrlBlacklist; - }; - - this.$get = ['$injector', function($injector) { - - var htmlSanitizer = function htmlSanitizer(html) { - throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.'); - }; - - if ($injector.has('$sanitize')) { - htmlSanitizer = $injector.get('$sanitize'); - } - - - function matchUrl(matcher, parsedUrl) { - if (matcher === 'self') { - return urlIsSameOrigin(parsedUrl); - } else { - // definitely a regex. See adjustMatchers() - return !!matcher.exec(parsedUrl.href); - } - } - - function isResourceUrlAllowedByPolicy(url) { - var parsedUrl = urlResolve(url.toString()); - var i, n, allowed = false; - // Ensure that at least one item from the whitelist allows this url. - for (i = 0, n = resourceUrlWhitelist.length; i < n; i++) { - if (matchUrl(resourceUrlWhitelist[i], parsedUrl)) { - allowed = true; - break; - } - } - if (allowed) { - // Ensure that no item from the blacklist blocked this url. - for (i = 0, n = resourceUrlBlacklist.length; i < n; i++) { - if (matchUrl(resourceUrlBlacklist[i], parsedUrl)) { - allowed = false; - break; - } - } - } - return allowed; - } - - function generateHolderType(Base) { - var holderType = function TrustedValueHolderType(trustedValue) { - this.$$unwrapTrustedValue = function() { - return trustedValue; - }; - }; - if (Base) { - holderType.prototype = new Base(); - } - holderType.prototype.valueOf = function sceValueOf() { - return this.$$unwrapTrustedValue(); - }; - holderType.prototype.toString = function sceToString() { - return this.$$unwrapTrustedValue().toString(); - }; - return holderType; - } - - var trustedValueHolderBase = generateHolderType(), - byType = {}; - - byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase); - byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase); - byType[SCE_CONTEXTS.URL] = generateHolderType(trustedValueHolderBase); - byType[SCE_CONTEXTS.JS] = generateHolderType(trustedValueHolderBase); - byType[SCE_CONTEXTS.RESOURCE_URL] = generateHolderType(byType[SCE_CONTEXTS.URL]); - - /** - * @ngdoc method - * @name $sceDelegate#trustAs - * - * @description - * Returns an object that is trusted by angular for use in specified strict - * contextual escaping contexts (such as ng-bind-html, ng-include, any src - * attribute interpolation, any dom event binding attribute interpolation - * such as for onclick, etc.) that uses the provided value. - * See {@link ng.$sce $sce} for enabling strict contextual escaping. - * - * @param {string} type The kind of context in which this value is safe for use. e.g. url, - * resourceUrl, html, js and css. - * @param {*} value The value that that should be considered trusted/safe. - * @returns {*} A value that can be used to stand in for the provided `value` in places - * where Angular expects a $sce.trustAs() return value. - */ - function trustAs(type, trustedValue) { - var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null); - if (!Constructor) { - throw $sceMinErr('icontext', - 'Attempted to trust a value in invalid context. Context: {0}; Value: {1}', - type, trustedValue); - } - if (trustedValue === null || trustedValue === undefined || trustedValue === '') { - return trustedValue; - } - // All the current contexts in SCE_CONTEXTS happen to be strings. In order to avoid trusting - // mutable objects, we ensure here that the value passed in is actually a string. - if (typeof trustedValue !== 'string') { - throw $sceMinErr('itype', - 'Attempted to trust a non-string value in a content requiring a string: Context: {0}', - type); - } - return new Constructor(trustedValue); - } - - /** - * @ngdoc method - * @name $sceDelegate#valueOf - * - * @description - * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs - * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link - * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}. - * - * If the passed parameter is not a value that had been returned by {@link - * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, returns it as-is. - * - * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} - * call or anything else. - * @returns {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs - * `$sceDelegate.trustAs`} if `value` is the result of such a call. Otherwise, returns - * `value` unchanged. - */ - function valueOf(maybeTrusted) { - if (maybeTrusted instanceof trustedValueHolderBase) { - return maybeTrusted.$$unwrapTrustedValue(); - } else { - return maybeTrusted; - } - } - - /** - * @ngdoc method - * @name $sceDelegate#getTrusted - * - * @description - * Takes the result of a {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call and - * returns the originally supplied value if the queried context type is a supertype of the - * created type. If this condition isn't satisfied, throws an exception. - * - * @param {string} type The kind of context in which this value is to be used. - * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs - * `$sceDelegate.trustAs`} call. - * @returns {*} The value the was originally provided to {@link ng.$sceDelegate#trustAs - * `$sceDelegate.trustAs`} if valid in this context. Otherwise, throws an exception. - */ - function getTrusted(type, maybeTrusted) { - if (maybeTrusted === null || maybeTrusted === undefined || maybeTrusted === '') { - return maybeTrusted; - } - var constructor = (byType.hasOwnProperty(type) ? byType[type] : null); - if (constructor && maybeTrusted instanceof constructor) { - return maybeTrusted.$$unwrapTrustedValue(); - } - // If we get here, then we may only take one of two actions. - // 1. sanitize the value for the requested type, or - // 2. throw an exception. - if (type === SCE_CONTEXTS.RESOURCE_URL) { - if (isResourceUrlAllowedByPolicy(maybeTrusted)) { - return maybeTrusted; - } else { - throw $sceMinErr('insecurl', - 'Blocked loading resource from url not allowed by $sceDelegate policy. URL: {0}', - maybeTrusted.toString()); - } - } else if (type === SCE_CONTEXTS.HTML) { - return htmlSanitizer(maybeTrusted); - } - throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.'); - } - - return { trustAs: trustAs, - getTrusted: getTrusted, - valueOf: valueOf }; - }]; -} - - -/** - * @ngdoc provider - * @name $sceProvider - * @description - * - * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service. - * - enable/disable Strict Contextual Escaping (SCE) in a module - * - override the default implementation with a custom delegate - * - * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}. - */ - -/* jshint maxlen: false*/ - -/** - * @ngdoc service - * @name $sce - * @kind function - * - * @description - * - * `$sce` is a service that provides Strict Contextual Escaping services to AngularJS. - * - * # Strict Contextual Escaping - * - * Strict Contextual Escaping (SCE) is a mode in which AngularJS requires bindings in certain - * contexts to result in a value that is marked as safe to use for that context. One example of - * such a context is binding arbitrary html controlled by the user via `ng-bind-html`. We refer - * to these contexts as privileged or SCE contexts. - * - * As of version 1.2, Angular ships with SCE enabled by default. - * - * Note: When enabled (the default), IE<11 in quirks mode is not supported. In this mode, IE<11 allow - * one to execute arbitrary javascript by the use of the expression() syntax. Refer - * to learn more about them. - * You can ensure your document is in standards mode and not quirks mode by adding `` - * to the top of your HTML document. - * - * SCE assists in writing code in way that (a) is secure by default and (b) makes auditing for - * security vulnerabilities such as XSS, clickjacking, etc. a lot easier. - * - * Here's an example of a binding in a privileged context: - * - * ``` - * - *
      - * ``` - * - * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user. With SCE - * disabled, this application allows the user to render arbitrary HTML into the DIV. - * In a more realistic example, one may be rendering user comments, blog articles, etc. via - * bindings. (HTML is just one example of a context where rendering user controlled input creates - * security vulnerabilities.) - * - * For the case of HTML, you might use a library, either on the client side, or on the server side, - * to sanitize unsafe HTML before binding to the value and rendering it in the document. - * - * How would you ensure that every place that used these types of bindings was bound to a value that - * was sanitized by your library (or returned as safe for rendering by your server?) How can you - * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some - * properties/fields and forgot to update the binding to the sanitized value? - * - * To be secure by default, you want to ensure that any such bindings are disallowed unless you can - * determine that something explicitly says it's safe to use a value for binding in that - * context. You can then audit your code (a simple grep would do) to ensure that this is only done - * for those values that you can easily tell are safe - because they were received from your server, - * sanitized by your library, etc. You can organize your codebase to help with this - perhaps - * allowing only the files in a specific directory to do this. Ensuring that the internal API - * exposed by that code doesn't markup arbitrary values as safe then becomes a more manageable task. - * - * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs} - * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to - * obtain values that will be accepted by SCE / privileged contexts. - * - * - * ## How does it work? - * - * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted - * $sce.getTrusted(context, value)} rather than to the value directly. Directives use {@link - * ng.$sce#parseAs $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs the - * {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals. - * - * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link - * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}. Here's the actual code (slightly - * simplified): - * - * ``` - * var ngBindHtmlDirective = ['$sce', function($sce) { - * return function(scope, element, attr) { - * scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) { - * element.html(value || ''); - * }); - * }; - * }]; - * ``` - * - * ## Impact on loading templates - * - * This applies both to the {@link ng.directive:ngInclude `ng-include`} directive as well as - * `templateUrl`'s specified by {@link guide/directive directives}. - * - * By default, Angular only loads templates from the same domain and protocol as the application - * document. This is done by calling {@link ng.$sce#getTrustedResourceUrl - * $sce.getTrustedResourceUrl} on the template URL. To load templates from other domains and/or - * protocols, you may either either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist - * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value. - * - * *Please note*: - * The browser's - * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest) - * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/) - * policy apply in addition to this and may further restrict whether the template is successfully - * loaded. This means that without the right CORS policy, loading templates from a different domain - * won't work on all browsers. Also, loading templates from `file://` URL does not work on some - * browsers. - * - * ## This feels like too much overhead - * - * It's important to remember that SCE only applies to interpolation expressions. - * - * If your expressions are constant literals, they're automatically trusted and you don't need to - * call `$sce.trustAs` on them (remember to include the `ngSanitize` module) (e.g. - * `
      `) just works. - * - * Additionally, `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them - * through {@link ng.$sce#getTrusted $sce.getTrusted}. SCE doesn't play a role here. - * - * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load - * templates in `ng-include` from your application's domain without having to even know about SCE. - * It blocks loading templates from other domains or loading templates over http from an https - * served document. You can change these by setting your own custom {@link - * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link - * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs. - * - * This significantly reduces the overhead. It is far easier to pay the small overhead and have an - * application that's secure and can be audited to verify that with much more ease than bolting - * security onto an application later. - * - * - * ## What trusted context types are supported? - * - * | Context | Notes | - * |---------------------|----------------| - * | `$sce.HTML` | For HTML that's safe to source into the application. The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. If an unsafe value is encountered and the {@link ngSanitize $sanitize} module is present this will sanitize the value instead of throwing an error. | - * | `$sce.CSS` | For CSS that's safe to source into the application. Currently unused. Feel free to use it in your own directives. | - * | `$sce.URL` | For URLs that are safe to follow as links. Currently unused (`
      Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. | - * | `$sce.JS` | For JavaScript that is safe to execute in your application's context. Currently unused. Feel free to use it in your own directives. | - * - * ## Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist}
      - * - * Each element in these arrays must be one of the following: - * - * - **'self'** - * - The special **string**, `'self'`, can be used to match against all URLs of the **same - * domain** as the application document using the **same protocol**. - * - **String** (except the special value `'self'`) - * - The string is matched against the full *normalized / absolute URL* of the resource - * being tested (substring matches are not good enough.) - * - There are exactly **two wildcard sequences** - `*` and `**`. All other characters - * match themselves. - * - `*`: matches zero or more occurrences of any character other than one of the following 6 - * characters: '`:`', '`/`', '`.`', '`?`', '`&`' and ';'. It's a useful wildcard for use - * in a whitelist. - * - `**`: matches zero or more occurrences of *any* character. As such, it's not - * not appropriate to use in for a scheme, domain, etc. as it would match too much. (e.g. - * http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might - * not have been the intention.) Its usage at the very end of the path is ok. (e.g. - * http://foo.example.com/templates/**). - * - **RegExp** (*see caveat below*) - * - *Caveat*: While regular expressions are powerful and offer great flexibility, their syntax - * (and all the inevitable escaping) makes them *harder to maintain*. It's easy to - * accidentally introduce a bug when one updates a complex expression (imho, all regexes should - * have good test coverage.). For instance, the use of `.` in the regex is correct only in a - * small number of cases. A `.` character in the regex used when matching the scheme or a - * subdomain could be matched against a `:` or literal `.` that was likely not intended. It - * is highly recommended to use the string patterns and only fall back to regular expressions - * if they as a last resort. - * - The regular expression must be an instance of RegExp (i.e. not a string.) It is - * matched against the **entire** *normalized / absolute URL* of the resource being tested - * (even when the RegExp did not have the `^` and `$` codes.) In addition, any flags - * present on the RegExp (such as multiline, global, ignoreCase) are ignored. - * - If you are generating your JavaScript from some other templating engine (not - * recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)), - * remember to escape your regular expression (and be aware that you might need more than - * one level of escaping depending on your templating engine and the way you interpolated - * the value.) Do make use of your platform's escaping mechanism as it might be good - * enough before coding your own. e.g. Ruby has - * [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape) - * and Python has [re.escape](http://docs.python.org/library/re.html#re.escape). - * Javascript lacks a similar built in function for escaping. Take a look at Google - * Closure library's [goog.string.regExpEscape(s)]( - * http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962). - * - * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} for an example. - * - * ## Show me an example using SCE. - * - * - * - *
      - *

      - * User comments
      - * By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when - * $sanitize is available. If $sanitize isn't available, this results in an error instead of an - * exploit. - *
      - *
      - * {{userComment.name}}: - * - *
      - *
      - *
      - *
      - *
      - * - * - * angular.module('mySceApp', ['ngSanitize']) - * .controller('AppController', ['$http', '$templateCache', '$sce', - * function($http, $templateCache, $sce) { - * var self = this; - * $http.get("test_data.json", {cache: $templateCache}).success(function(userComments) { - * self.userComments = userComments; - * }); - * self.explicitlyTrustedHtml = $sce.trustAsHtml( - * 'Hover over this text.'); - * }]); - * - * - * - * [ - * { "name": "Alice", - * "htmlComment": - * "Is anyone reading this?" - * }, - * { "name": "Bob", - * "htmlComment": "Yes! Am I the only other one?" - * } - * ] - * - * - * - * describe('SCE doc demo', function() { - * it('should sanitize untrusted values', function() { - * expect(element.all(by.css('.htmlComment')).first().getInnerHtml()) - * .toBe('Is anyone reading this?'); - * }); - * - * it('should NOT sanitize explicitly trusted values', function() { - * expect(element(by.id('explicitlyTrustedHtml')).getInnerHtml()).toBe( - * 'Hover over this text.'); - * }); - * }); - * - *
      - * - * - * - * ## Can I disable SCE completely? - * - * Yes, you can. However, this is strongly discouraged. SCE gives you a lot of security benefits - * for little coding overhead. It will be much harder to take an SCE disabled application and - * either secure it on your own or enable SCE at a later stage. It might make sense to disable SCE - * for cases where you have a lot of existing code that was written before SCE was introduced and - * you're migrating them a module at a time. - * - * That said, here's how you can completely disable SCE: - * - * ``` - * angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) { - * // Completely disable SCE. For demonstration purposes only! - * // Do not use in new projects. - * $sceProvider.enabled(false); - * }); - * ``` - * - */ -/* jshint maxlen: 100 */ - -function $SceProvider() { - var enabled = true; - - /** - * @ngdoc method - * @name $sceProvider#enabled - * @kind function - * - * @param {boolean=} value If provided, then enables/disables SCE. - * @return {boolean} true if SCE is enabled, false otherwise. - * - * @description - * Enables/disables SCE and returns the current value. - */ - this.enabled = function(value) { - if (arguments.length) { - enabled = !!value; - } - return enabled; - }; - - - /* Design notes on the default implementation for SCE. - * - * The API contract for the SCE delegate - * ------------------------------------- - * The SCE delegate object must provide the following 3 methods: - * - * - trustAs(contextEnum, value) - * This method is used to tell the SCE service that the provided value is OK to use in the - * contexts specified by contextEnum. It must return an object that will be accepted by - * getTrusted() for a compatible contextEnum and return this value. - * - * - valueOf(value) - * For values that were not produced by trustAs(), return them as is. For values that were - * produced by trustAs(), return the corresponding input value to trustAs. Basically, if - * trustAs is wrapping the given values into some type, this operation unwraps it when given - * such a value. - * - * - getTrusted(contextEnum, value) - * This function should return the a value that is safe to use in the context specified by - * contextEnum or throw and exception otherwise. - * - * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be - * opaque or wrapped in some holder object. That happens to be an implementation detail. For - * instance, an implementation could maintain a registry of all trusted objects by context. In - * such a case, trustAs() would return the same object that was passed in. getTrusted() would - * return the same object passed in if it was found in the registry under a compatible context or - * throw an exception otherwise. An implementation might only wrap values some of the time based - * on some criteria. getTrusted() might return a value and not throw an exception for special - * constants or objects even if not wrapped. All such implementations fulfill this contract. - * - * - * A note on the inheritance model for SCE contexts - * ------------------------------------------------ - * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types. This - * is purely an implementation details. - * - * The contract is simply this: - * - * getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value) - * will also succeed. - * - * Inheritance happens to capture this in a natural way. In some future, we - * may not use inheritance anymore. That is OK because no code outside of - * sce.js and sceSpecs.js would need to be aware of this detail. - */ - - this.$get = ['$parse', '$sceDelegate', function( - $parse, $sceDelegate) { - // Prereq: Ensure that we're not running in IE<11 quirks mode. In that mode, IE < 11 allow - // the "expression(javascript expression)" syntax which is insecure. - if (enabled && msie < 8) { - throw $sceMinErr('iequirks', - 'Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks ' + - 'mode. You can fix this by adding the text to the top of your HTML ' + - 'document. See http://docs.angularjs.org/api/ng.$sce for more information.'); - } - - var sce = shallowCopy(SCE_CONTEXTS); - - /** - * @ngdoc method - * @name $sce#isEnabled - * @kind function - * - * @return {Boolean} true if SCE is enabled, false otherwise. If you want to set the value, you - * have to do it at module config time on {@link ng.$sceProvider $sceProvider}. - * - * @description - * Returns a boolean indicating if SCE is enabled. - */ - sce.isEnabled = function() { - return enabled; - }; - sce.trustAs = $sceDelegate.trustAs; - sce.getTrusted = $sceDelegate.getTrusted; - sce.valueOf = $sceDelegate.valueOf; - - if (!enabled) { - sce.trustAs = sce.getTrusted = function(type, value) { return value; }; - sce.valueOf = identity; - } - - /** - * @ngdoc method - * @name $sce#parseAs - * - * @description - * Converts Angular {@link guide/expression expression} into a function. This is like {@link - * ng.$parse $parse} and is identical when the expression is a literal constant. Otherwise, it - * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*, - * *result*)} - * - * @param {string} type The kind of SCE context in which this result will be used. - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: - * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - */ - sce.parseAs = function sceParseAs(type, expr) { - var parsed = $parse(expr); - if (parsed.literal && parsed.constant) { - return parsed; - } else { - return $parse(expr, function(value) { - return sce.getTrusted(type, value); - }); - } - }; - - /** - * @ngdoc method - * @name $sce#trustAs - * - * @description - * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}. As such, - * returns an object that is trusted by angular for use in specified strict contextual - * escaping contexts (such as ng-bind-html, ng-include, any src attribute - * interpolation, any dom event binding attribute interpolation such as for onclick, etc.) - * that uses the provided value. See * {@link ng.$sce $sce} for enabling strict contextual - * escaping. - * - * @param {string} type The kind of context in which this value is safe for use. e.g. url, - * resource_url, html, js and css. - * @param {*} value The value that that should be considered trusted/safe. - * @returns {*} A value that can be used to stand in for the provided `value` in places - * where Angular expects a $sce.trustAs() return value. - */ - - /** - * @ngdoc method - * @name $sce#trustAsHtml - * - * @description - * Shorthand method. `$sce.trustAsHtml(value)` → - * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`} - * - * @param {*} value The value to trustAs. - * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedHtml - * $sce.getTrustedHtml(value)} to obtain the original value. (privileged directives - * only accept expressions that are either literal constants or are the - * return value of {@link ng.$sce#trustAs $sce.trustAs}.) - */ - - /** - * @ngdoc method - * @name $sce#trustAsUrl - * - * @description - * Shorthand method. `$sce.trustAsUrl(value)` → - * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`} - * - * @param {*} value The value to trustAs. - * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedUrl - * $sce.getTrustedUrl(value)} to obtain the original value. (privileged directives - * only accept expressions that are either literal constants or are the - * return value of {@link ng.$sce#trustAs $sce.trustAs}.) - */ - - /** - * @ngdoc method - * @name $sce#trustAsResourceUrl - * - * @description - * Shorthand method. `$sce.trustAsResourceUrl(value)` → - * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`} - * - * @param {*} value The value to trustAs. - * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedResourceUrl - * $sce.getTrustedResourceUrl(value)} to obtain the original value. (privileged directives - * only accept expressions that are either literal constants or are the return - * value of {@link ng.$sce#trustAs $sce.trustAs}.) - */ - - /** - * @ngdoc method - * @name $sce#trustAsJs - * - * @description - * Shorthand method. `$sce.trustAsJs(value)` → - * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`} - * - * @param {*} value The value to trustAs. - * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedJs - * $sce.getTrustedJs(value)} to obtain the original value. (privileged directives - * only accept expressions that are either literal constants or are the - * return value of {@link ng.$sce#trustAs $sce.trustAs}.) - */ - - /** - * @ngdoc method - * @name $sce#getTrusted - * - * @description - * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}. As such, - * takes the result of a {@link ng.$sce#trustAs `$sce.trustAs`}() call and returns the - * originally supplied value if the queried context type is a supertype of the created type. - * If this condition isn't satisfied, throws an exception. - * - * @param {string} type The kind of context in which this value is to be used. - * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs `$sce.trustAs`} - * call. - * @returns {*} The value the was originally provided to - * {@link ng.$sce#trustAs `$sce.trustAs`} if valid in this context. - * Otherwise, throws an exception. - */ - - /** - * @ngdoc method - * @name $sce#getTrustedHtml - * - * @description - * Shorthand method. `$sce.getTrustedHtml(value)` → - * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`} - * - * @param {*} value The value to pass to `$sce.getTrusted`. - * @returns {*} The return value of `$sce.getTrusted($sce.HTML, value)` - */ - - /** - * @ngdoc method - * @name $sce#getTrustedCss - * - * @description - * Shorthand method. `$sce.getTrustedCss(value)` → - * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`} - * - * @param {*} value The value to pass to `$sce.getTrusted`. - * @returns {*} The return value of `$sce.getTrusted($sce.CSS, value)` - */ - - /** - * @ngdoc method - * @name $sce#getTrustedUrl - * - * @description - * Shorthand method. `$sce.getTrustedUrl(value)` → - * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`} - * - * @param {*} value The value to pass to `$sce.getTrusted`. - * @returns {*} The return value of `$sce.getTrusted($sce.URL, value)` - */ - - /** - * @ngdoc method - * @name $sce#getTrustedResourceUrl - * - * @description - * Shorthand method. `$sce.getTrustedResourceUrl(value)` → - * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`} - * - * @param {*} value The value to pass to `$sceDelegate.getTrusted`. - * @returns {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)` - */ - - /** - * @ngdoc method - * @name $sce#getTrustedJs - * - * @description - * Shorthand method. `$sce.getTrustedJs(value)` → - * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`} - * - * @param {*} value The value to pass to `$sce.getTrusted`. - * @returns {*} The return value of `$sce.getTrusted($sce.JS, value)` - */ - - /** - * @ngdoc method - * @name $sce#parseAsHtml - * - * @description - * Shorthand method. `$sce.parseAsHtml(expression string)` → - * {@link ng.$sce#parseAs `$sce.parseAs($sce.HTML, value)`} - * - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: - * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - */ - - /** - * @ngdoc method - * @name $sce#parseAsCss - * - * @description - * Shorthand method. `$sce.parseAsCss(value)` → - * {@link ng.$sce#parseAs `$sce.parseAs($sce.CSS, value)`} - * - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: - * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - */ - - /** - * @ngdoc method - * @name $sce#parseAsUrl - * - * @description - * Shorthand method. `$sce.parseAsUrl(value)` → - * {@link ng.$sce#parseAs `$sce.parseAs($sce.URL, value)`} - * - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: - * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - */ - - /** - * @ngdoc method - * @name $sce#parseAsResourceUrl - * - * @description - * Shorthand method. `$sce.parseAsResourceUrl(value)` → - * {@link ng.$sce#parseAs `$sce.parseAs($sce.RESOURCE_URL, value)`} - * - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: - * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - */ - - /** - * @ngdoc method - * @name $sce#parseAsJs - * - * @description - * Shorthand method. `$sce.parseAsJs(value)` → - * {@link ng.$sce#parseAs `$sce.parseAs($sce.JS, value)`} - * - * @param {string} expression String expression to compile. - * @returns {function(context, locals)} a function which represents the compiled expression: - * - * * `context` – `{object}` – an object against which any expressions embedded in the strings - * are evaluated against (typically a scope object). - * * `locals` – `{object=}` – local variables context object, useful for overriding values in - * `context`. - */ - - // Shorthand delegations. - var parse = sce.parseAs, - getTrusted = sce.getTrusted, - trustAs = sce.trustAs; - - forEach(SCE_CONTEXTS, function(enumValue, name) { - var lName = lowercase(name); - sce[camelCase("parse_as_" + lName)] = function(expr) { - return parse(enumValue, expr); - }; - sce[camelCase("get_trusted_" + lName)] = function(value) { - return getTrusted(enumValue, value); - }; - sce[camelCase("trust_as_" + lName)] = function(value) { - return trustAs(enumValue, value); - }; - }); - - return sce; - }]; -} - -/** - * !!! This is an undocumented "private" service !!! - * - * @name $sniffer - * @requires $window - * @requires $document - * - * @property {boolean} history Does the browser support html5 history api ? - * @property {boolean} transitions Does the browser support CSS transition events ? - * @property {boolean} animations Does the browser support CSS animation events ? - * - * @description - * This is very simple implementation of testing browser's features. - */ -function $SnifferProvider() { - this.$get = ['$window', '$document', function($window, $document) { - var eventSupport = {}, - android = - int((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]), - boxee = /Boxee/i.test(($window.navigator || {}).userAgent), - document = $document[0] || {}, - vendorPrefix, - vendorRegex = /^(Moz|webkit|ms)(?=[A-Z])/, - bodyStyle = document.body && document.body.style, - transitions = false, - animations = false, - match; - - if (bodyStyle) { - for (var prop in bodyStyle) { - if (match = vendorRegex.exec(prop)) { - vendorPrefix = match[0]; - vendorPrefix = vendorPrefix.substr(0, 1).toUpperCase() + vendorPrefix.substr(1); - break; - } - } - - if (!vendorPrefix) { - vendorPrefix = ('WebkitOpacity' in bodyStyle) && 'webkit'; - } - - transitions = !!(('transition' in bodyStyle) || (vendorPrefix + 'Transition' in bodyStyle)); - animations = !!(('animation' in bodyStyle) || (vendorPrefix + 'Animation' in bodyStyle)); - - if (android && (!transitions || !animations)) { - transitions = isString(document.body.style.webkitTransition); - animations = isString(document.body.style.webkitAnimation); - } - } - - - return { - // Android has history.pushState, but it does not update location correctly - // so let's not use the history API at all. - // http://code.google.com/p/android/issues/detail?id=17471 - // https://github.com/angular/angular.js/issues/904 - - // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has - // so let's not use the history API also - // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined - // jshint -W018 - history: !!($window.history && $window.history.pushState && !(android < 4) && !boxee), - // jshint +W018 - hasEvent: function(event) { - // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have - // it. In particular the event is not fired when backspace or delete key are pressed or - // when cut operation is performed. - if (event == 'input' && msie == 9) return false; - - if (isUndefined(eventSupport[event])) { - var divElm = document.createElement('div'); - eventSupport[event] = 'on' + event in divElm; - } - - return eventSupport[event]; - }, - csp: csp(), - vendorPrefix: vendorPrefix, - transitions: transitions, - animations: animations, - android: android - }; - }]; -} - -var $compileMinErr = minErr('$compile'); - -/** - * @ngdoc service - * @name $templateRequest - * - * @description - * The `$templateRequest` service downloads the provided template using `$http` and, upon success, - * stores the contents inside of `$templateCache`. If the HTTP request fails or the response data - * of the HTTP request is empty then a `$compile` error will be thrown (the exception can be thwarted - * by setting the 2nd parameter of the function to true). - * - * @param {string} tpl The HTTP request template URL - * @param {boolean=} ignoreRequestError Whether or not to ignore the exception when the request fails or the template is empty - * - * @return {Promise} the HTTP Promise for the given. - * - * @property {number} totalPendingRequests total amount of pending template requests being downloaded. - */ -function $TemplateRequestProvider() { - this.$get = ['$templateCache', '$http', '$q', function($templateCache, $http, $q) { - function handleRequestFn(tpl, ignoreRequestError) { - var self = handleRequestFn; - self.totalPendingRequests++; - - var transformResponse = $http.defaults && $http.defaults.transformResponse; - - if (isArray(transformResponse)) { - transformResponse = transformResponse.filter(function(transformer) { - return transformer !== defaultHttpResponseTransform; - }); - } else if (transformResponse === defaultHttpResponseTransform) { - transformResponse = null; - } - - var httpOptions = { - cache: $templateCache, - transformResponse: transformResponse - }; - - return $http.get(tpl, httpOptions) - .then(function(response) { - var html = response.data; - self.totalPendingRequests--; - $templateCache.put(tpl, html); - return html; - }, handleError); - - function handleError(resp) { - self.totalPendingRequests--; - if (!ignoreRequestError) { - throw $compileMinErr('tpload', 'Failed to load template: {0}', tpl); - } - return $q.reject(resp); - } - } - - handleRequestFn.totalPendingRequests = 0; - - return handleRequestFn; - }]; -} - -function $$TestabilityProvider() { - this.$get = ['$rootScope', '$browser', '$location', - function($rootScope, $browser, $location) { - - /** - * @name $testability - * - * @description - * The private $$testability service provides a collection of methods for use when debugging - * or by automated test and debugging tools. - */ - var testability = {}; - - /** - * @name $$testability#findBindings - * - * @description - * Returns an array of elements that are bound (via ng-bind or {{}}) - * to expressions matching the input. - * - * @param {Element} element The element root to search from. - * @param {string} expression The binding expression to match. - * @param {boolean} opt_exactMatch If true, only returns exact matches - * for the expression. Filters and whitespace are ignored. - */ - testability.findBindings = function(element, expression, opt_exactMatch) { - var bindings = element.getElementsByClassName('ng-binding'); - var matches = []; - forEach(bindings, function(binding) { - var dataBinding = angular.element(binding).data('$binding'); - if (dataBinding) { - forEach(dataBinding, function(bindingName) { - if (opt_exactMatch) { - var matcher = new RegExp('(^|\\s)' + escapeForRegexp(expression) + '(\\s|\\||$)'); - if (matcher.test(bindingName)) { - matches.push(binding); - } - } else { - if (bindingName.indexOf(expression) != -1) { - matches.push(binding); - } - } - }); - } - }); - return matches; - }; - - /** - * @name $$testability#findModels - * - * @description - * Returns an array of elements that are two-way found via ng-model to - * expressions matching the input. - * - * @param {Element} element The element root to search from. - * @param {string} expression The model expression to match. - * @param {boolean} opt_exactMatch If true, only returns exact matches - * for the expression. - */ - testability.findModels = function(element, expression, opt_exactMatch) { - var prefixes = ['ng-', 'data-ng-', 'ng\\:']; - for (var p = 0; p < prefixes.length; ++p) { - var attributeEquals = opt_exactMatch ? '=' : '*='; - var selector = '[' + prefixes[p] + 'model' + attributeEquals + '"' + expression + '"]'; - var elements = element.querySelectorAll(selector); - if (elements.length) { - return elements; - } - } - }; - - /** - * @name $$testability#getLocation - * - * @description - * Shortcut for getting the location in a browser agnostic way. Returns - * the path, search, and hash. (e.g. /path?a=b#hash) - */ - testability.getLocation = function() { - return $location.url(); - }; - - /** - * @name $$testability#setLocation - * - * @description - * Shortcut for navigating to a location without doing a full page reload. - * - * @param {string} url The location url (path, search and hash, - * e.g. /path?a=b#hash) to go to. - */ - testability.setLocation = function(url) { - if (url !== $location.url()) { - $location.url(url); - $rootScope.$digest(); - } - }; - - /** - * @name $$testability#whenStable - * - * @description - * Calls the callback when $timeout and $http requests are completed. - * - * @param {function} callback - */ - testability.whenStable = function(callback) { - $browser.notifyWhenNoOutstandingRequests(callback); - }; - - return testability; - }]; -} - -function $TimeoutProvider() { - this.$get = ['$rootScope', '$browser', '$q', '$$q', '$exceptionHandler', - function($rootScope, $browser, $q, $$q, $exceptionHandler) { - var deferreds = {}; - - - /** - * @ngdoc service - * @name $timeout - * - * @description - * Angular's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch - * block and delegates any exceptions to - * {@link ng.$exceptionHandler $exceptionHandler} service. - * - * The return value of registering a timeout function is a promise, which will be resolved when - * the timeout is reached and the timeout function is executed. - * - * To cancel a timeout request, call `$timeout.cancel(promise)`. - * - * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to - * synchronously flush the queue of deferred functions. - * - * @param {function()} fn A function, whose execution should be delayed. - * @param {number=} [delay=0] Delay in milliseconds. - * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise - * will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block. - * @returns {Promise} Promise that will be resolved when the timeout is reached. The value this - * promise will be resolved with is the return value of the `fn` function. - * - */ - function timeout(fn, delay, invokeApply) { - var skipApply = (isDefined(invokeApply) && !invokeApply), - deferred = (skipApply ? $$q : $q).defer(), - promise = deferred.promise, - timeoutId; - - timeoutId = $browser.defer(function() { - try { - deferred.resolve(fn()); - } catch (e) { - deferred.reject(e); - $exceptionHandler(e); - } - finally { - delete deferreds[promise.$$timeoutId]; - } - - if (!skipApply) $rootScope.$apply(); - }, delay); - - promise.$$timeoutId = timeoutId; - deferreds[timeoutId] = deferred; - - return promise; - } - - - /** - * @ngdoc method - * @name $timeout#cancel - * - * @description - * Cancels a task associated with the `promise`. As a result of this, the promise will be - * resolved with a rejection. - * - * @param {Promise=} promise Promise returned by the `$timeout` function. - * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully - * canceled. - */ - timeout.cancel = function(promise) { - if (promise && promise.$$timeoutId in deferreds) { - deferreds[promise.$$timeoutId].reject('canceled'); - delete deferreds[promise.$$timeoutId]; - return $browser.defer.cancel(promise.$$timeoutId); - } - return false; - }; - - return timeout; - }]; -} - -// NOTE: The usage of window and document instead of $window and $document here is -// deliberate. This service depends on the specific behavior of anchor nodes created by the -// browser (resolving and parsing URLs) that is unlikely to be provided by mock objects and -// cause us to break tests. In addition, when the browser resolves a URL for XHR, it -// doesn't know about mocked locations and resolves URLs to the real document - which is -// exactly the behavior needed here. There is little value is mocking these out for this -// service. -var urlParsingNode = document.createElement("a"); -var originUrl = urlResolve(window.location.href); - - -/** - * - * Implementation Notes for non-IE browsers - * ---------------------------------------- - * Assigning a URL to the href property of an anchor DOM node, even one attached to the DOM, - * results both in the normalizing and parsing of the URL. Normalizing means that a relative - * URL will be resolved into an absolute URL in the context of the application document. - * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related - * properties are all populated to reflect the normalized URL. This approach has wide - * compatibility - Safari 1+, Mozilla 1+, Opera 7+,e etc. See - * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html - * - * Implementation Notes for IE - * --------------------------- - * IE >= 8 and <= 10 normalizes the URL when assigned to the anchor node similar to the other - * browsers. However, the parsed components will not be set if the URL assigned did not specify - * them. (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.) We - * work around that by performing the parsing in a 2nd step by taking a previously normalized - * URL (e.g. by assigning to a.href) and assigning it a.href again. This correctly populates the - * properties such as protocol, hostname, port, etc. - * - * IE7 does not normalize the URL when assigned to an anchor node. (Apparently, it does, if one - * uses the inner HTML approach to assign the URL as part of an HTML snippet - - * http://stackoverflow.com/a/472729) However, setting img[src] does normalize the URL. - * Unfortunately, setting img[src] to something like "javascript:foo" on IE throws an exception. - * Since the primary usage for normalizing URLs is to sanitize such URLs, we can't use that - * method and IE < 8 is unsupported. - * - * References: - * http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement - * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html - * http://url.spec.whatwg.org/#urlutils - * https://github.com/angular/angular.js/pull/2902 - * http://james.padolsey.com/javascript/parsing-urls-with-the-dom/ - * - * @kind function - * @param {string} url The URL to be parsed. - * @description Normalizes and parses a URL. - * @returns {object} Returns the normalized URL as a dictionary. - * - * | member name | Description | - * |---------------|----------------| - * | href | A normalized version of the provided URL if it was not an absolute URL | - * | protocol | The protocol including the trailing colon | - * | host | The host and port (if the port is non-default) of the normalizedUrl | - * | search | The search params, minus the question mark | - * | hash | The hash string, minus the hash symbol - * | hostname | The hostname - * | port | The port, without ":" - * | pathname | The pathname, beginning with "/" - * - */ -function urlResolve(url) { - var href = url; - - if (msie) { - // Normalize before parse. Refer Implementation Notes on why this is - // done in two steps on IE. - urlParsingNode.setAttribute("href", href); - href = urlParsingNode.href; - } - - urlParsingNode.setAttribute('href', href); - - // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils - return { - href: urlParsingNode.href, - protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '', - host: urlParsingNode.host, - search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '', - hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '', - hostname: urlParsingNode.hostname, - port: urlParsingNode.port, - pathname: (urlParsingNode.pathname.charAt(0) === '/') - ? urlParsingNode.pathname - : '/' + urlParsingNode.pathname - }; -} - -/** - * Parse a request URL and determine whether this is a same-origin request as the application document. - * - * @param {string|object} requestUrl The url of the request as a string that will be resolved - * or a parsed URL object. - * @returns {boolean} Whether the request is for the same origin as the application document. - */ -function urlIsSameOrigin(requestUrl) { - var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl; - return (parsed.protocol === originUrl.protocol && - parsed.host === originUrl.host); -} - -/** - * @ngdoc service - * @name $window - * - * @description - * A reference to the browser's `window` object. While `window` - * is globally available in JavaScript, it causes testability problems, because - * it is a global variable. In angular we always refer to it through the - * `$window` service, so it may be overridden, removed or mocked for testing. - * - * Expressions, like the one defined for the `ngClick` directive in the example - * below, are evaluated with respect to the current scope. Therefore, there is - * no risk of inadvertently coding in a dependency on a global value in such an - * expression. - * - * @example - - - -
      - - -
      -
      - - it('should display the greeting in the input box', function() { - element(by.model('greeting')).sendKeys('Hello, E2E Tests'); - // If we click the button it will block the test runner - // element(':button').click(); - }); - -
      - */ -function $WindowProvider() { - this.$get = valueFn(window); -} - -/* global currencyFilter: true, - dateFilter: true, - filterFilter: true, - jsonFilter: true, - limitToFilter: true, - lowercaseFilter: true, - numberFilter: true, - orderByFilter: true, - uppercaseFilter: true, - */ - -/** - * @ngdoc provider - * @name $filterProvider - * @description - * - * Filters are just functions which transform input to an output. However filters need to be - * Dependency Injected. To achieve this a filter definition consists of a factory function which is - * annotated with dependencies and is responsible for creating a filter function. - * - * ```js - * // Filter registration - * function MyModule($provide, $filterProvider) { - * // create a service to demonstrate injection (not always needed) - * $provide.value('greet', function(name){ - * return 'Hello ' + name + '!'; - * }); - * - * // register a filter factory which uses the - * // greet service to demonstrate DI. - * $filterProvider.register('greet', function(greet){ - * // return the filter function which uses the greet service - * // to generate salutation - * return function(text) { - * // filters need to be forgiving so check input validity - * return text && greet(text) || text; - * }; - * }); - * } - * ``` - * - * The filter function is registered with the `$injector` under the filter name suffix with - * `Filter`. - * - * ```js - * it('should be the same instance', inject( - * function($filterProvider) { - * $filterProvider.register('reverse', function(){ - * return ...; - * }); - * }, - * function($filter, reverseFilter) { - * expect($filter('reverse')).toBe(reverseFilter); - * }); - * ``` - * - * - * For more information about how angular filters work, and how to create your own filters, see - * {@link guide/filter Filters} in the Angular Developer Guide. - */ - -/** - * @ngdoc service - * @name $filter - * @kind function - * @description - * Filters are used for formatting data displayed to the user. - * - * The general syntax in templates is as follows: - * - * {{ expression [| filter_name[:parameter_value] ... ] }} - * - * @param {String} name Name of the filter function to retrieve - * @return {Function} the filter function - * @example - - -
      -

      {{ originalText }}

      -

      {{ filteredText }}

      -
      -
      - - - angular.module('filterExample', []) - .controller('MainCtrl', function($scope, $filter) { - $scope.originalText = 'hello'; - $scope.filteredText = $filter('uppercase')($scope.originalText); - }); - -
      - */ -$FilterProvider.$inject = ['$provide']; -function $FilterProvider($provide) { - var suffix = 'Filter'; - - /** - * @ngdoc method - * @name $filterProvider#register - * @param {string|Object} name Name of the filter function, or an object map of filters where - * the keys are the filter names and the values are the filter factories. - * @returns {Object} Registered filter instance, or if a map of filters was provided then a map - * of the registered filter instances. - */ - function register(name, factory) { - if (isObject(name)) { - var filters = {}; - forEach(name, function(filter, key) { - filters[key] = register(key, filter); - }); - return filters; - } else { - return $provide.factory(name + suffix, factory); - } - } - this.register = register; - - this.$get = ['$injector', function($injector) { - return function(name) { - return $injector.get(name + suffix); - }; - }]; - - //////////////////////////////////////// - - /* global - currencyFilter: false, - dateFilter: false, - filterFilter: false, - jsonFilter: false, - limitToFilter: false, - lowercaseFilter: false, - numberFilter: false, - orderByFilter: false, - uppercaseFilter: false, - */ - - register('currency', currencyFilter); - register('date', dateFilter); - register('filter', filterFilter); - register('json', jsonFilter); - register('limitTo', limitToFilter); - register('lowercase', lowercaseFilter); - register('number', numberFilter); - register('orderBy', orderByFilter); - register('uppercase', uppercaseFilter); -} - -/** - * @ngdoc filter - * @name filter - * @kind function - * - * @description - * Selects a subset of items from `array` and returns it as a new array. - * - * @param {Array} array The source array. - * @param {string|Object|function()} expression The predicate to be used for selecting items from - * `array`. - * - * Can be one of: - * - * - `string`: The string is evaluated as an expression and the resulting value is used for substring match against - * the contents of the `array`. All strings or objects with string properties in `array` that contain this string - * will be returned. The predicate can be negated by prefixing the string with `!`. - * - * - `Object`: A pattern object can be used to filter specific properties on objects contained - * by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items - * which have property `name` containing "M" and property `phone` containing "1". A special - * property name `$` can be used (as in `{$:"text"}`) to accept a match against any - * property of the object. That's equivalent to the simple substring match with a `string` - * as described above. The predicate can be negated by prefixing the string with `!`. - * For Example `{name: "!M"}` predicate will return an array of items which have property `name` - * not containing "M". - * - * - `function(value, index)`: A predicate function can be used to write arbitrary filters. The - * function is called for each element of `array`. The final result is an array of those - * elements that the predicate returned true for. - * - * @param {function(actual, expected)|true|undefined} comparator Comparator which is used in - * determining if the expected value (from the filter expression) and actual value (from - * the object in the array) should be considered a match. - * - * Can be one of: - * - * - `function(actual, expected)`: - * The function will be given the object value and the predicate value to compare and - * should return true if the item should be included in filtered result. - * - * - `true`: A shorthand for `function(actual, expected) { return angular.equals(expected, actual)}`. - * this is essentially strict comparison of expected and actual. - * - * - `false|undefined`: A short hand for a function which will look for a substring match in case - * insensitive way. - * - * @example - - -
      - - Search: - - - - - - -
      NamePhone
      {{friend.name}}{{friend.phone}}
      -
      - Any:
      - Name only
      - Phone only
      - Equality
      - - - - - - -
      NamePhone
      {{friendObj.name}}{{friendObj.phone}}
      -
      - - var expectFriendNames = function(expectedNames, key) { - element.all(by.repeater(key + ' in friends').column(key + '.name')).then(function(arr) { - arr.forEach(function(wd, i) { - expect(wd.getText()).toMatch(expectedNames[i]); - }); - }); - }; - - it('should search across all fields when filtering with a string', function() { - var searchText = element(by.model('searchText')); - searchText.clear(); - searchText.sendKeys('m'); - expectFriendNames(['Mary', 'Mike', 'Adam'], 'friend'); - - searchText.clear(); - searchText.sendKeys('76'); - expectFriendNames(['John', 'Julie'], 'friend'); - }); - - it('should search in specific fields when filtering with a predicate object', function() { - var searchAny = element(by.model('search.$')); - searchAny.clear(); - searchAny.sendKeys('i'); - expectFriendNames(['Mary', 'Mike', 'Julie', 'Juliette'], 'friendObj'); - }); - it('should use a equal comparison when comparator is true', function() { - var searchName = element(by.model('search.name')); - var strict = element(by.model('strict')); - searchName.clear(); - searchName.sendKeys('Julie'); - strict.click(); - expectFriendNames(['Julie'], 'friendObj'); - }); - -
      - */ -function filterFilter() { - return function(array, expression, comparator) { - if (!isArray(array)) return array; - - var comparatorType = typeof(comparator), - predicates = []; - - predicates.check = function(value, index) { - for (var j = 0; j < predicates.length; j++) { - if (!predicates[j](value, index)) { - return false; - } - } - return true; - }; - - if (comparatorType !== 'function') { - if (comparatorType === 'boolean' && comparator) { - comparator = function(obj, text) { - return angular.equals(obj, text); - }; - } else { - comparator = function(obj, text) { - if (obj && text && typeof obj === 'object' && typeof text === 'object') { - for (var objKey in obj) { - if (objKey.charAt(0) !== '$' && hasOwnProperty.call(obj, objKey) && - comparator(obj[objKey], text[objKey])) { - return true; - } - } - return false; - } - text = ('' + text).toLowerCase(); - return ('' + obj).toLowerCase().indexOf(text) > -1; - }; - } - } - - var search = function(obj, text) { - if (typeof text === 'string' && text.charAt(0) === '!') { - return !search(obj, text.substr(1)); - } - switch (typeof obj) { - case 'boolean': - case 'number': - case 'string': - return comparator(obj, text); - case 'object': - switch (typeof text) { - case 'object': - return comparator(obj, text); - default: - for (var objKey in obj) { - if (objKey.charAt(0) !== '$' && search(obj[objKey], text)) { - return true; - } - } - break; - } - return false; - case 'array': - for (var i = 0; i < obj.length; i++) { - if (search(obj[i], text)) { - return true; - } - } - return false; - default: - return false; - } - }; - switch (typeof expression) { - case 'boolean': - case 'number': - case 'string': - // Set up expression object and fall through - expression = {$:expression}; - // jshint -W086 - case 'object': - // jshint +W086 - for (var key in expression) { - (function(path) { - if (typeof expression[path] === 'undefined') return; - predicates.push(function(value) { - return search(path == '$' ? value : (value && value[path]), expression[path]); - }); - })(key); - } - break; - case 'function': - predicates.push(expression); - break; - default: - return array; - } - var filtered = []; - for (var j = 0; j < array.length; j++) { - var value = array[j]; - if (predicates.check(value, j)) { - filtered.push(value); - } - } - return filtered; - }; -} - -/** - * @ngdoc filter - * @name currency - * @kind function - * - * @description - * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default - * symbol for current locale is used. - * - * @param {number} amount Input to filter. - * @param {string=} symbol Currency symbol or identifier to be displayed. - * @param {number=} fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale - * @returns {string} Formatted number. - * - * - * @example - - - -
      -
      - default currency symbol ($): {{amount | currency}}
      - custom currency identifier (USD$): {{amount | currency:"USD$"}} - no fractions (0): {{amount | currency:"USD$":0}} -
      -
      - - it('should init with 1234.56', function() { - expect(element(by.id('currency-default')).getText()).toBe('$1,234.56'); - expect(element(by.id('currency-custom')).getText()).toBe('USD$1,234.56'); - expect(element(by.id('currency-no-fractions')).getText()).toBe('USD$1,235'); - }); - it('should update', function() { - if (browser.params.browser == 'safari') { - // Safari does not understand the minus key. See - // https://github.com/angular/protractor/issues/481 - return; - } - element(by.model('amount')).clear(); - element(by.model('amount')).sendKeys('-1234'); - expect(element(by.id('currency-default')).getText()).toBe('($1,234.00)'); - expect(element(by.id('currency-custom')).getText()).toBe('(USD$1,234.00)'); - expect(element(by.id('currency-no-fractions')).getText()).toBe('(USD$1,234)'); - }); - -
      - */ -currencyFilter.$inject = ['$locale']; -function currencyFilter($locale) { - var formats = $locale.NUMBER_FORMATS; - return function(amount, currencySymbol, fractionSize) { - if (isUndefined(currencySymbol)) { - currencySymbol = formats.CURRENCY_SYM; - } - - if (isUndefined(fractionSize)) { - fractionSize = formats.PATTERNS[1].maxFrac; - } - - // if null or undefined pass it through - return (amount == null) - ? amount - : formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, fractionSize). - replace(/\u00A4/g, currencySymbol); - }; -} - -/** - * @ngdoc filter - * @name number - * @kind function - * - * @description - * Formats a number as text. - * - * If the input is not a number an empty string is returned. - * - * @param {number|string} number Number to format. - * @param {(number|string)=} fractionSize Number of decimal places to round the number to. - * If this is not provided then the fraction size is computed from the current locale's number - * formatting pattern. In the case of the default locale, it will be 3. - * @returns {string} Number rounded to decimalPlaces and places a “,” after each third digit. - * - * @example - - - -
      - Enter number:
      - Default formatting: {{val | number}}
      - No fractions: {{val | number:0}}
      - Negative number: {{-val | number:4}} -
      -
      - - it('should format numbers', function() { - expect(element(by.id('number-default')).getText()).toBe('1,234.568'); - expect(element(by.binding('val | number:0')).getText()).toBe('1,235'); - expect(element(by.binding('-val | number:4')).getText()).toBe('-1,234.5679'); - }); - - it('should update', function() { - element(by.model('val')).clear(); - element(by.model('val')).sendKeys('3374.333'); - expect(element(by.id('number-default')).getText()).toBe('3,374.333'); - expect(element(by.binding('val | number:0')).getText()).toBe('3,374'); - expect(element(by.binding('-val | number:4')).getText()).toBe('-3,374.3330'); - }); - -
      - */ - - -numberFilter.$inject = ['$locale']; -function numberFilter($locale) { - var formats = $locale.NUMBER_FORMATS; - return function(number, fractionSize) { - - // if null or undefined pass it through - return (number == null) - ? number - : formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP, - fractionSize); - }; -} - -var DECIMAL_SEP = '.'; -function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) { - if (!isFinite(number) || isObject(number)) return ''; - - var isNegative = number < 0; - number = Math.abs(number); - var numStr = number + '', - formatedText = '', - parts = []; - - var hasExponent = false; - if (numStr.indexOf('e') !== -1) { - var match = numStr.match(/([\d\.]+)e(-?)(\d+)/); - if (match && match[2] == '-' && match[3] > fractionSize + 1) { - numStr = '0'; - number = 0; - } else { - formatedText = numStr; - hasExponent = true; - } - } - - if (!hasExponent) { - var fractionLen = (numStr.split(DECIMAL_SEP)[1] || '').length; - - // determine fractionSize if it is not specified - if (isUndefined(fractionSize)) { - fractionSize = Math.min(Math.max(pattern.minFrac, fractionLen), pattern.maxFrac); - } - - // safely round numbers in JS without hitting imprecisions of floating-point arithmetics - // inspired by: - // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/round - number = +(Math.round(+(number.toString() + 'e' + fractionSize)).toString() + 'e' + -fractionSize); - - if (number === 0) { - isNegative = false; - } - - var fraction = ('' + number).split(DECIMAL_SEP); - var whole = fraction[0]; - fraction = fraction[1] || ''; - - var i, pos = 0, - lgroup = pattern.lgSize, - group = pattern.gSize; - - if (whole.length >= (lgroup + group)) { - pos = whole.length - lgroup; - for (i = 0; i < pos; i++) { - if ((pos - i) % group === 0 && i !== 0) { - formatedText += groupSep; - } - formatedText += whole.charAt(i); - } - } - - for (i = pos; i < whole.length; i++) { - if ((whole.length - i) % lgroup === 0 && i !== 0) { - formatedText += groupSep; - } - formatedText += whole.charAt(i); - } - - // format fraction part. - while (fraction.length < fractionSize) { - fraction += '0'; - } - - if (fractionSize && fractionSize !== "0") formatedText += decimalSep + fraction.substr(0, fractionSize); - } else { - - if (fractionSize > 0 && number > -1 && number < 1) { - formatedText = number.toFixed(fractionSize); - } - } - - parts.push(isNegative ? pattern.negPre : pattern.posPre, - formatedText, - isNegative ? pattern.negSuf : pattern.posSuf); - return parts.join(''); -} - -function padNumber(num, digits, trim) { - var neg = ''; - if (num < 0) { - neg = '-'; - num = -num; - } - num = '' + num; - while (num.length < digits) num = '0' + num; - if (trim) - num = num.substr(num.length - digits); - return neg + num; -} - - -function dateGetter(name, size, offset, trim) { - offset = offset || 0; - return function(date) { - var value = date['get' + name](); - if (offset > 0 || value > -offset) - value += offset; - if (value === 0 && offset == -12) value = 12; - return padNumber(value, size, trim); - }; -} - -function dateStrGetter(name, shortForm) { - return function(date, formats) { - var value = date['get' + name](); - var get = uppercase(shortForm ? ('SHORT' + name) : name); - - return formats[get][value]; - }; -} - -function timeZoneGetter(date) { - var zone = -1 * date.getTimezoneOffset(); - var paddedZone = (zone >= 0) ? "+" : ""; - - paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) + - padNumber(Math.abs(zone % 60), 2); - - return paddedZone; -} - -function getFirstThursdayOfYear(year) { - // 0 = index of January - var dayOfWeekOnFirst = (new Date(year, 0, 1)).getDay(); - // 4 = index of Thursday (+1 to account for 1st = 5) - // 11 = index of *next* Thursday (+1 account for 1st = 12) - return new Date(year, 0, ((dayOfWeekOnFirst <= 4) ? 5 : 12) - dayOfWeekOnFirst); -} - -function getThursdayThisWeek(datetime) { - return new Date(datetime.getFullYear(), datetime.getMonth(), - // 4 = index of Thursday - datetime.getDate() + (4 - datetime.getDay())); -} - -function weekGetter(size) { - return function(date) { - var firstThurs = getFirstThursdayOfYear(date.getFullYear()), - thisThurs = getThursdayThisWeek(date); - - var diff = +thisThurs - +firstThurs, - result = 1 + Math.round(diff / 6.048e8); // 6.048e8 ms per week - - return padNumber(result, size); - }; -} - -function ampmGetter(date, formats) { - return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1]; -} - -var DATE_FORMATS = { - yyyy: dateGetter('FullYear', 4), - yy: dateGetter('FullYear', 2, 0, true), - y: dateGetter('FullYear', 1), - MMMM: dateStrGetter('Month'), - MMM: dateStrGetter('Month', true), - MM: dateGetter('Month', 2, 1), - M: dateGetter('Month', 1, 1), - dd: dateGetter('Date', 2), - d: dateGetter('Date', 1), - HH: dateGetter('Hours', 2), - H: dateGetter('Hours', 1), - hh: dateGetter('Hours', 2, -12), - h: dateGetter('Hours', 1, -12), - mm: dateGetter('Minutes', 2), - m: dateGetter('Minutes', 1), - ss: dateGetter('Seconds', 2), - s: dateGetter('Seconds', 1), - // while ISO 8601 requires fractions to be prefixed with `.` or `,` - // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions - sss: dateGetter('Milliseconds', 3), - EEEE: dateStrGetter('Day'), - EEE: dateStrGetter('Day', true), - a: ampmGetter, - Z: timeZoneGetter, - ww: weekGetter(2), - w: weekGetter(1) -}; - -var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEw']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|w+))(.*)/, - NUMBER_STRING = /^\-?\d+$/; - -/** - * @ngdoc filter - * @name date - * @kind function - * - * @description - * Formats `date` to a string based on the requested `format`. - * - * `format` string can be composed of the following elements: - * - * * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010) - * * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10) - * * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199) - * * `'MMMM'`: Month in year (January-December) - * * `'MMM'`: Month in year (Jan-Dec) - * * `'MM'`: Month in year, padded (01-12) - * * `'M'`: Month in year (1-12) - * * `'dd'`: Day in month, padded (01-31) - * * `'d'`: Day in month (1-31) - * * `'EEEE'`: Day in Week,(Sunday-Saturday) - * * `'EEE'`: Day in Week, (Sun-Sat) - * * `'HH'`: Hour in day, padded (00-23) - * * `'H'`: Hour in day (0-23) - * * `'hh'`: Hour in AM/PM, padded (01-12) - * * `'h'`: Hour in AM/PM, (1-12) - * * `'mm'`: Minute in hour, padded (00-59) - * * `'m'`: Minute in hour (0-59) - * * `'ss'`: Second in minute, padded (00-59) - * * `'s'`: Second in minute (0-59) - * * `'.sss' or ',sss'`: Millisecond in second, padded (000-999) - * * `'a'`: AM/PM marker - * * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200) - * * `'ww'`: ISO-8601 week of year (00-53) - * * `'w'`: ISO-8601 week of year (0-53) - * - * `format` string can also be one of the following predefined - * {@link guide/i18n localizable formats}: - * - * * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale - * (e.g. Sep 3, 2010 12:05:08 PM) - * * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US locale (e.g. 9/3/10 12:05 PM) - * * `'fullDate'`: equivalent to `'EEEE, MMMM d, y'` for en_US locale - * (e.g. Friday, September 3, 2010) - * * `'longDate'`: equivalent to `'MMMM d, y'` for en_US locale (e.g. September 3, 2010) - * * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US locale (e.g. Sep 3, 2010) - * * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10) - * * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 PM) - * * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 PM) - * - * `format` string can contain literal values. These need to be escaped by surrounding with single quotes (e.g. - * `"h 'in the morning'"`). In order to output a single quote, escape it - i.e., two single quotes in a sequence - * (e.g. `"h 'o''clock'"`). - * - * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or - * number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its - * shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is - * specified in the string input, the time is considered to be in the local timezone. - * @param {string=} format Formatting rules (see Description). If not specified, - * `mediumDate` is used. - * @param {string=} timezone Timezone to be used for formatting. Right now, only `'UTC'` is supported. - * If not specified, the timezone of the browser will be used. - * @returns {string} Formatted string or the input if input is not recognized as date/millis. - * - * @example - - - {{1288323623006 | date:'medium'}}: - {{1288323623006 | date:'medium'}}
      - {{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}: - {{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}
      - {{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}: - {{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}
      - {{1288323623006 | date:"MM/dd/yyyy 'at' h:mma"}}: - {{'1288323623006' | date:"MM/dd/yyyy 'at' h:mma"}}
      -
      - - it('should format date', function() { - expect(element(by.binding("1288323623006 | date:'medium'")).getText()). - toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (AM|PM)/); - expect(element(by.binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).getText()). - toMatch(/2010\-10\-2\d \d{2}:\d{2}:\d{2} (\-|\+)?\d{4}/); - expect(element(by.binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).getText()). - toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/); - expect(element(by.binding("'1288323623006' | date:\"MM/dd/yyyy 'at' h:mma\"")).getText()). - toMatch(/10\/2\d\/2010 at \d{1,2}:\d{2}(AM|PM)/); - }); - -
      - */ -dateFilter.$inject = ['$locale']; -function dateFilter($locale) { - - - var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/; - // 1 2 3 4 5 6 7 8 9 10 11 - function jsonStringToDate(string) { - var match; - if (match = string.match(R_ISO8601_STR)) { - var date = new Date(0), - tzHour = 0, - tzMin = 0, - dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear, - timeSetter = match[8] ? date.setUTCHours : date.setHours; - - if (match[9]) { - tzHour = int(match[9] + match[10]); - tzMin = int(match[9] + match[11]); - } - dateSetter.call(date, int(match[1]), int(match[2]) - 1, int(match[3])); - var h = int(match[4] || 0) - tzHour; - var m = int(match[5] || 0) - tzMin; - var s = int(match[6] || 0); - var ms = Math.round(parseFloat('0.' + (match[7] || 0)) * 1000); - timeSetter.call(date, h, m, s, ms); - return date; - } - return string; - } - - - return function(date, format, timezone) { - var text = '', - parts = [], - fn, match; - - format = format || 'mediumDate'; - format = $locale.DATETIME_FORMATS[format] || format; - if (isString(date)) { - date = NUMBER_STRING.test(date) ? int(date) : jsonStringToDate(date); - } - - if (isNumber(date)) { - date = new Date(date); - } - - if (!isDate(date)) { - return date; - } - - while (format) { - match = DATE_FORMATS_SPLIT.exec(format); - if (match) { - parts = concat(parts, match, 1); - format = parts.pop(); - } else { - parts.push(format); - format = null; - } - } - - if (timezone && timezone === 'UTC') { - date = new Date(date.getTime()); - date.setMinutes(date.getMinutes() + date.getTimezoneOffset()); - } - forEach(parts, function(value) { - fn = DATE_FORMATS[value]; - text += fn ? fn(date, $locale.DATETIME_FORMATS) - : value.replace(/(^'|'$)/g, '').replace(/''/g, "'"); - }); - - return text; - }; -} - - -/** - * @ngdoc filter - * @name json - * @kind function - * - * @description - * Allows you to convert a JavaScript object into JSON string. - * - * This filter is mostly useful for debugging. When using the double curly {{value}} notation - * the binding is automatically converted to JSON. - * - * @param {*} object Any JavaScript object (including arrays and primitive types) to filter. - * @returns {string} JSON string. - * - * - * @example - - -
      {{ {'name':'value'} | json }}
      -
      - - it('should jsonify filtered objects', function() { - expect(element(by.binding("{'name':'value'}")).getText()).toMatch(/\{\n "name": ?"value"\n}/); - }); - -
      - * - */ -function jsonFilter() { - return function(object) { - return toJson(object, true); - }; -} - - -/** - * @ngdoc filter - * @name lowercase - * @kind function - * @description - * Converts string to lowercase. - * @see angular.lowercase - */ -var lowercaseFilter = valueFn(lowercase); - - -/** - * @ngdoc filter - * @name uppercase - * @kind function - * @description - * Converts string to uppercase. - * @see angular.uppercase - */ -var uppercaseFilter = valueFn(uppercase); - -/** - * @ngdoc filter - * @name limitTo - * @kind function - * - * @description - * Creates a new array or string containing only a specified number of elements. The elements - * are taken from either the beginning or the end of the source array, string or number, as specified by - * the value and sign (positive or negative) of `limit`. If a number is used as input, it is - * converted to a string. - * - * @param {Array|string|number} input Source array, string or number to be limited. - * @param {string|number} limit The length of the returned array or string. If the `limit` number - * is positive, `limit` number of items from the beginning of the source array/string are copied. - * If the number is negative, `limit` number of items from the end of the source array/string - * are copied. The `limit` will be trimmed if it exceeds `array.length` - * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array - * had less than `limit` elements. - * - * @example - - - -
      - Limit {{numbers}} to: -

      Output numbers: {{ numbers | limitTo:numLimit }}

      - Limit {{letters}} to: -

      Output letters: {{ letters | limitTo:letterLimit }}

      - Limit {{longNumber}} to: -

      Output long number: {{ longNumber | limitTo:longNumberLimit }}

      -
      -
      - - var numLimitInput = element(by.model('numLimit')); - var letterLimitInput = element(by.model('letterLimit')); - var longNumberLimitInput = element(by.model('longNumberLimit')); - var limitedNumbers = element(by.binding('numbers | limitTo:numLimit')); - var limitedLetters = element(by.binding('letters | limitTo:letterLimit')); - var limitedLongNumber = element(by.binding('longNumber | limitTo:longNumberLimit')); - - it('should limit the number array to first three items', function() { - expect(numLimitInput.getAttribute('value')).toBe('3'); - expect(letterLimitInput.getAttribute('value')).toBe('3'); - expect(longNumberLimitInput.getAttribute('value')).toBe('3'); - expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3]'); - expect(limitedLetters.getText()).toEqual('Output letters: abc'); - expect(limitedLongNumber.getText()).toEqual('Output long number: 234'); - }); - - // There is a bug in safari and protractor that doesn't like the minus key - // it('should update the output when -3 is entered', function() { - // numLimitInput.clear(); - // numLimitInput.sendKeys('-3'); - // letterLimitInput.clear(); - // letterLimitInput.sendKeys('-3'); - // longNumberLimitInput.clear(); - // longNumberLimitInput.sendKeys('-3'); - // expect(limitedNumbers.getText()).toEqual('Output numbers: [7,8,9]'); - // expect(limitedLetters.getText()).toEqual('Output letters: ghi'); - // expect(limitedLongNumber.getText()).toEqual('Output long number: 342'); - // }); - - it('should not exceed the maximum size of input array', function() { - numLimitInput.clear(); - numLimitInput.sendKeys('100'); - letterLimitInput.clear(); - letterLimitInput.sendKeys('100'); - longNumberLimitInput.clear(); - longNumberLimitInput.sendKeys('100'); - expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3,4,5,6,7,8,9]'); - expect(limitedLetters.getText()).toEqual('Output letters: abcdefghi'); - expect(limitedLongNumber.getText()).toEqual('Output long number: 2345432342'); - }); - -
      -*/ -function limitToFilter() { - return function(input, limit) { - if (isNumber(input)) input = input.toString(); - if (!isArray(input) && !isString(input)) return input; - - if (Math.abs(Number(limit)) === Infinity) { - limit = Number(limit); - } else { - limit = int(limit); - } - - if (isString(input)) { - //NaN check on limit - if (limit) { - return limit >= 0 ? input.slice(0, limit) : input.slice(limit, input.length); - } else { - return ""; - } - } - - var out = [], - i, n; - - // if abs(limit) exceeds maximum length, trim it - if (limit > input.length) - limit = input.length; - else if (limit < -input.length) - limit = -input.length; - - if (limit > 0) { - i = 0; - n = limit; - } else { - i = input.length + limit; - n = input.length; - } - - for (; i < n; i++) { - out.push(input[i]); - } - - return out; - }; -} - -/** - * @ngdoc filter - * @name orderBy - * @kind function - * - * @description - * Orders a specified `array` by the `expression` predicate. It is ordered alphabetically - * for strings and numerically for numbers. Note: if you notice numbers are not being sorted - * correctly, make sure they are actually being saved as numbers and not strings. - * - * @param {Array} array The array to sort. - * @param {function(*)|string|Array.<(function(*)|string)>=} expression A predicate to be - * used by the comparator to determine the order of elements. - * - * Can be one of: - * - * - `function`: Getter function. The result of this function will be sorted using the - * `<`, `=`, `>` operator. - * - `string`: An Angular expression. The result of this expression is used to compare elements - * (for example `name` to sort by a property called `name` or `name.substr(0, 3)` to sort by - * 3 first characters of a property called `name`). The result of a constant expression - * is interpreted as a property name to be used in comparisons (for example `"special name"` - * to sort object by the value of their `special name` property). An expression can be - * optionally prefixed with `+` or `-` to control ascending or descending sort order - * (for example, `+name` or `-name`). If no property is provided, (e.g. `'+'`) then the array - * element itself is used to compare where sorting. - * - `Array`: An array of function or string predicates. The first predicate in the array - * is used for sorting, but when two items are equivalent, the next predicate is used. - * - * If the predicate is missing or empty then it defaults to `'+'`. - * - * @param {boolean=} reverse Reverse the order of the array. - * @returns {Array} Sorted copy of the source array. - * - * @example - - - -
      -
      Sorting predicate = {{predicate}}; reverse = {{reverse}}
      -
      - [ unsorted ] - - - - - - - - - - - -
      Name - (^)Phone NumberAge
      {{friend.name}}{{friend.phone}}{{friend.age}}
      -
      -
      -
      - * - * It's also possible to call the orderBy filter manually, by injecting `$filter`, retrieving the - * filter routine with `$filter('orderBy')`, and calling the returned filter routine with the - * desired parameters. - * - * Example: - * - * @example - - -
      - - - - - - - - - - - -
      Name - (^)Phone NumberAge
      {{friend.name}}{{friend.phone}}{{friend.age}}
      -
      -
      - - - angular.module('orderByExample', []) - .controller('ExampleController', ['$scope', '$filter', function($scope, $filter) { - var orderBy = $filter('orderBy'); - $scope.friends = [ - { name: 'John', phone: '555-1212', age: 10 }, - { name: 'Mary', phone: '555-9876', age: 19 }, - { name: 'Mike', phone: '555-4321', age: 21 }, - { name: 'Adam', phone: '555-5678', age: 35 }, - { name: 'Julie', phone: '555-8765', age: 29 } - ]; - $scope.order = function(predicate, reverse) { - $scope.friends = orderBy($scope.friends, predicate, reverse); - }; - $scope.order('-age',false); - }]); - -
      - */ -orderByFilter.$inject = ['$parse']; -function orderByFilter($parse) { - return function(array, sortPredicate, reverseOrder) { - if (!(isArrayLike(array))) return array; - sortPredicate = isArray(sortPredicate) ? sortPredicate : [sortPredicate]; - if (sortPredicate.length === 0) { sortPredicate = ['+']; } - sortPredicate = sortPredicate.map(function(predicate) { - var descending = false, get = predicate || identity; - if (isString(predicate)) { - if ((predicate.charAt(0) == '+' || predicate.charAt(0) == '-')) { - descending = predicate.charAt(0) == '-'; - predicate = predicate.substring(1); - } - if (predicate === '') { - // Effectively no predicate was passed so we compare identity - return reverseComparator(function(a, b) { - return compare(a, b); - }, descending); - } - get = $parse(predicate); - if (get.constant) { - var key = get(); - return reverseComparator(function(a, b) { - return compare(a[key], b[key]); - }, descending); - } - } - return reverseComparator(function(a, b) { - return compare(get(a),get(b)); - }, descending); - }); - return slice.call(array).sort(reverseComparator(comparator, reverseOrder)); - - function comparator(o1, o2) { - for (var i = 0; i < sortPredicate.length; i++) { - var comp = sortPredicate[i](o1, o2); - if (comp !== 0) return comp; - } - return 0; - } - function reverseComparator(comp, descending) { - return descending - ? function(a, b) {return comp(b,a);} - : comp; - } - function compare(v1, v2) { - var t1 = typeof v1; - var t2 = typeof v2; - if (t1 == t2) { - if (isDate(v1) && isDate(v2)) { - v1 = v1.valueOf(); - v2 = v2.valueOf(); - } - if (t1 == "string") { - v1 = v1.toLowerCase(); - v2 = v2.toLowerCase(); - } - if (v1 === v2) return 0; - return v1 < v2 ? -1 : 1; - } else { - return t1 < t2 ? -1 : 1; - } - } - }; -} - -function ngDirective(directive) { - if (isFunction(directive)) { - directive = { - link: directive - }; - } - directive.restrict = directive.restrict || 'AC'; - return valueFn(directive); -} - -/** - * @ngdoc directive - * @name a - * @restrict E - * - * @description - * Modifies the default behavior of the html A tag so that the default action is prevented when - * the href attribute is empty. - * - * This change permits the easy creation of action links with the `ngClick` directive - * without changing the location or causing page reloads, e.g.: - * `Add Item` - */ -var htmlAnchorDirective = valueFn({ - restrict: 'E', - compile: function(element, attr) { - if (!attr.href && !attr.xlinkHref && !attr.name) { - return function(scope, element) { - // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute. - var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ? - 'xlink:href' : 'href'; - element.on('click', function(event) { - // if we have no href url, then don't navigate anywhere. - if (!element.attr(href)) { - event.preventDefault(); - } - }); - }; - } - } -}); - -/** - * @ngdoc directive - * @name ngHref - * @restrict A - * @priority 99 - * - * @description - * Using Angular markup like `{{hash}}` in an href attribute will - * make the link go to the wrong URL if the user clicks it before - * Angular has a chance to replace the `{{hash}}` markup with its - * value. Until Angular replaces the markup the link will be broken - * and will most likely return a 404 error. The `ngHref` directive - * solves this problem. - * - * The wrong way to write it: - * ```html - * link1 - * ``` - * - * The correct way to write it: - * ```html - * link1 - * ``` - * - * @element A - * @param {template} ngHref any string which can contain `{{}}` markup. - * - * @example - * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes - * in links and their different behaviors: - - -
      - link 1 (link, don't reload)
      - link 2 (link, don't reload)
      - link 3 (link, reload!)
      - anchor (link, don't reload)
      - anchor (no link)
      - link (link, change location) -
      - - it('should execute ng-click but not reload when href without value', function() { - element(by.id('link-1')).click(); - expect(element(by.model('value')).getAttribute('value')).toEqual('1'); - expect(element(by.id('link-1')).getAttribute('href')).toBe(''); - }); - - it('should execute ng-click but not reload when href empty string', function() { - element(by.id('link-2')).click(); - expect(element(by.model('value')).getAttribute('value')).toEqual('2'); - expect(element(by.id('link-2')).getAttribute('href')).toBe(''); - }); - - it('should execute ng-click and change url when ng-href specified', function() { - expect(element(by.id('link-3')).getAttribute('href')).toMatch(/\/123$/); - - element(by.id('link-3')).click(); - - // At this point, we navigate away from an Angular page, so we need - // to use browser.driver to get the base webdriver. - - browser.wait(function() { - return browser.driver.getCurrentUrl().then(function(url) { - return url.match(/\/123$/); - }); - }, 5000, 'page should navigate to /123'); - }); - - xit('should execute ng-click but not reload when href empty string and name specified', function() { - element(by.id('link-4')).click(); - expect(element(by.model('value')).getAttribute('value')).toEqual('4'); - expect(element(by.id('link-4')).getAttribute('href')).toBe(''); - }); - - it('should execute ng-click but not reload when no href but name specified', function() { - element(by.id('link-5')).click(); - expect(element(by.model('value')).getAttribute('value')).toEqual('5'); - expect(element(by.id('link-5')).getAttribute('href')).toBe(null); - }); - - it('should only change url when only ng-href', function() { - element(by.model('value')).clear(); - element(by.model('value')).sendKeys('6'); - expect(element(by.id('link-6')).getAttribute('href')).toMatch(/\/6$/); - - element(by.id('link-6')).click(); - - // At this point, we navigate away from an Angular page, so we need - // to use browser.driver to get the base webdriver. - browser.wait(function() { - return browser.driver.getCurrentUrl().then(function(url) { - return url.match(/\/6$/); - }); - }, 5000, 'page should navigate to /6'); - }); - -
      - */ - -/** - * @ngdoc directive - * @name ngSrc - * @restrict A - * @priority 99 - * - * @description - * Using Angular markup like `{{hash}}` in a `src` attribute doesn't - * work right: The browser will fetch from the URL with the literal - * text `{{hash}}` until Angular replaces the expression inside - * `{{hash}}`. The `ngSrc` directive solves this problem. - * - * The buggy way to write it: - * ```html - * - * ``` - * - * The correct way to write it: - * ```html - * - * ``` - * - * @element IMG - * @param {template} ngSrc any string which can contain `{{}}` markup. - */ - -/** - * @ngdoc directive - * @name ngSrcset - * @restrict A - * @priority 99 - * - * @description - * Using Angular markup like `{{hash}}` in a `srcset` attribute doesn't - * work right: The browser will fetch from the URL with the literal - * text `{{hash}}` until Angular replaces the expression inside - * `{{hash}}`. The `ngSrcset` directive solves this problem. - * - * The buggy way to write it: - * ```html - * - * ``` - * - * The correct way to write it: - * ```html - * - * ``` - * - * @element IMG - * @param {template} ngSrcset any string which can contain `{{}}` markup. - */ - -/** - * @ngdoc directive - * @name ngDisabled - * @restrict A - * @priority 100 - * - * @description - * - * We shouldn't do this, because it will make the button enabled on Chrome/Firefox but not on IE8 and older IEs: - * ```html - *
      - * - *
      - * ``` - * - * The HTML specification does not require browsers to preserve the values of boolean attributes - * such as disabled. (Their presence means true and their absence means false.) - * If we put an Angular interpolation expression into such an attribute then the - * binding information would be lost when the browser removes the attribute. - * The `ngDisabled` directive solves this problem for the `disabled` attribute. - * This complementary directive is not removed by the browser and so provides - * a permanent reliable place to store the binding information. - * - * @example - - - Click me to toggle:
      - -
      - - it('should toggle button', function() { - expect(element(by.css('button')).getAttribute('disabled')).toBeFalsy(); - element(by.model('checked')).click(); - expect(element(by.css('button')).getAttribute('disabled')).toBeTruthy(); - }); - -
      - * - * @element INPUT - * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy, - * then special attribute "disabled" will be set on the element - */ - - -/** - * @ngdoc directive - * @name ngChecked - * @restrict A - * @priority 100 - * - * @description - * The HTML specification does not require browsers to preserve the values of boolean attributes - * such as checked. (Their presence means true and their absence means false.) - * If we put an Angular interpolation expression into such an attribute then the - * binding information would be lost when the browser removes the attribute. - * The `ngChecked` directive solves this problem for the `checked` attribute. - * This complementary directive is not removed by the browser and so provides - * a permanent reliable place to store the binding information. - * @example - - - Check me to check both:
      - -
      - - it('should check both checkBoxes', function() { - expect(element(by.id('checkSlave')).getAttribute('checked')).toBeFalsy(); - element(by.model('master')).click(); - expect(element(by.id('checkSlave')).getAttribute('checked')).toBeTruthy(); - }); - -
      - * - * @element INPUT - * @param {expression} ngChecked If the {@link guide/expression expression} is truthy, - * then special attribute "checked" will be set on the element - */ - - -/** - * @ngdoc directive - * @name ngReadonly - * @restrict A - * @priority 100 - * - * @description - * The HTML specification does not require browsers to preserve the values of boolean attributes - * such as readonly. (Their presence means true and their absence means false.) - * If we put an Angular interpolation expression into such an attribute then the - * binding information would be lost when the browser removes the attribute. - * The `ngReadonly` directive solves this problem for the `readonly` attribute. - * This complementary directive is not removed by the browser and so provides - * a permanent reliable place to store the binding information. - * @example - - - Check me to make text readonly:
      - -
      - - it('should toggle readonly attr', function() { - expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy(); - element(by.model('checked')).click(); - expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy(); - }); - -
      - * - * @element INPUT - * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy, - * then special attribute "readonly" will be set on the element - */ - - -/** - * @ngdoc directive - * @name ngSelected - * @restrict A - * @priority 100 - * - * @description - * The HTML specification does not require browsers to preserve the values of boolean attributes - * such as selected. (Their presence means true and their absence means false.) - * If we put an Angular interpolation expression into such an attribute then the - * binding information would be lost when the browser removes the attribute. - * The `ngSelected` directive solves this problem for the `selected` attribute. - * This complementary directive is not removed by the browser and so provides - * a permanent reliable place to store the binding information. - * - * @example - - - Check me to select:
      - -
      - - it('should select Greetings!', function() { - expect(element(by.id('greet')).getAttribute('selected')).toBeFalsy(); - element(by.model('selected')).click(); - expect(element(by.id('greet')).getAttribute('selected')).toBeTruthy(); - }); - -
      - * - * @element OPTION - * @param {expression} ngSelected If the {@link guide/expression expression} is truthy, - * then special attribute "selected" will be set on the element - */ - -/** - * @ngdoc directive - * @name ngOpen - * @restrict A - * @priority 100 - * - * @description - * The HTML specification does not require browsers to preserve the values of boolean attributes - * such as open. (Their presence means true and their absence means false.) - * If we put an Angular interpolation expression into such an attribute then the - * binding information would be lost when the browser removes the attribute. - * The `ngOpen` directive solves this problem for the `open` attribute. - * This complementary directive is not removed by the browser and so provides - * a permanent reliable place to store the binding information. - * @example - - - Check me check multiple:
      -
      - Show/Hide me -
      -
      - - it('should toggle open', function() { - expect(element(by.id('details')).getAttribute('open')).toBeFalsy(); - element(by.model('open')).click(); - expect(element(by.id('details')).getAttribute('open')).toBeTruthy(); - }); - -
      - * - * @element DETAILS - * @param {expression} ngOpen If the {@link guide/expression expression} is truthy, - * then special attribute "open" will be set on the element - */ - -var ngAttributeAliasDirectives = {}; - - -// boolean attrs are evaluated -forEach(BOOLEAN_ATTR, function(propName, attrName) { - // binding to multiple is not supported - if (propName == "multiple") return; - - var normalized = directiveNormalize('ng-' + attrName); - ngAttributeAliasDirectives[normalized] = function() { - return { - restrict: 'A', - priority: 100, - link: function(scope, element, attr) { - scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) { - attr.$set(attrName, !!value); - }); - } - }; - }; -}); - -// aliased input attrs are evaluated -forEach(ALIASED_ATTR, function(htmlAttr, ngAttr) { - ngAttributeAliasDirectives[ngAttr] = function() { - return { - priority: 100, - link: function(scope, element, attr) { - //special case ngPattern when a literal regular expression value - //is used as the expression (this way we don't have to watch anything). - if (ngAttr === "ngPattern" && attr.ngPattern.charAt(0) == "/") { - var match = attr.ngPattern.match(REGEX_STRING_REGEXP); - if (match) { - attr.$set("ngPattern", new RegExp(match[1], match[2])); - return; - } - } - - scope.$watch(attr[ngAttr], function ngAttrAliasWatchAction(value) { - attr.$set(ngAttr, value); - }); - } - }; - }; -}); - -// ng-src, ng-srcset, ng-href are interpolated -forEach(['src', 'srcset', 'href'], function(attrName) { - var normalized = directiveNormalize('ng-' + attrName); - ngAttributeAliasDirectives[normalized] = function() { - return { - priority: 99, // it needs to run after the attributes are interpolated - link: function(scope, element, attr) { - var propName = attrName, - name = attrName; - - if (attrName === 'href' && - toString.call(element.prop('href')) === '[object SVGAnimatedString]') { - name = 'xlinkHref'; - attr.$attr[name] = 'xlink:href'; - propName = null; - } - - attr.$observe(normalized, function(value) { - if (!value) { - if (attrName === 'href') { - attr.$set(name, null); - } - return; - } - - attr.$set(name, value); - - // on IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist - // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need - // to set the property as well to achieve the desired effect. - // we use attr[attrName] value since $set can sanitize the url. - if (msie && propName) element.prop(propName, attr[name]); - }); - } - }; - }; -}); - -/* global -nullFormCtrl, -SUBMITTED_CLASS, addSetValidityMethod: true - */ -var nullFormCtrl = { - $addControl: noop, - $$renameControl: nullFormRenameControl, - $removeControl: noop, - $setValidity: noop, - $setDirty: noop, - $setPristine: noop, - $setSubmitted: noop -}, -SUBMITTED_CLASS = 'ng-submitted'; - -function nullFormRenameControl(control, name) { - control.$name = name; -} - -/** - * @ngdoc type - * @name form.FormController - * - * @property {boolean} $pristine True if user has not interacted with the form yet. - * @property {boolean} $dirty True if user has already interacted with the form. - * @property {boolean} $valid True if all of the containing forms and controls are valid. - * @property {boolean} $invalid True if at least one containing control or form is invalid. - * @property {boolean} $submitted True if user has submitted the form even if its invalid. - * - * @property {Object} $error Is an object hash, containing references to controls or - * forms with failing validators, where: - * - * - keys are validation tokens (error names), - * - values are arrays of controls or forms that have a failing validator for given error name. - * - * Built-in validation tokens: - * - * - `email` - * - `max` - * - `maxlength` - * - `min` - * - `minlength` - * - `number` - * - `pattern` - * - `required` - * - `url` - * - `date` - * - `datetimelocal` - * - `time` - * - `week` - * - `month` - * - * @description - * `FormController` keeps track of all its controls and nested forms as well as the state of them, - * such as being valid/invalid or dirty/pristine. - * - * Each {@link ng.directive:form form} directive creates an instance - * of `FormController`. - * - */ -//asks for $scope to fool the BC controller module -FormController.$inject = ['$element', '$attrs', '$scope', '$animate', '$interpolate']; -function FormController(element, attrs, $scope, $animate, $interpolate) { - var form = this, - controls = []; - - var parentForm = form.$$parentForm = element.parent().controller('form') || nullFormCtrl; - - // init state - form.$error = {}; - form.$$success = {}; - form.$pending = undefined; - form.$name = $interpolate(attrs.name || attrs.ngForm || '')($scope); - form.$dirty = false; - form.$pristine = true; - form.$valid = true; - form.$invalid = false; - form.$submitted = false; - - parentForm.$addControl(form); - - /** - * @ngdoc method - * @name form.FormController#$rollbackViewValue - * - * @description - * Rollback all form controls pending updates to the `$modelValue`. - * - * Updates may be pending by a debounced event or because the input is waiting for a some future - * event defined in `ng-model-options`. This method is typically needed by the reset button of - * a form that uses `ng-model-options` to pend updates. - */ - form.$rollbackViewValue = function() { - forEach(controls, function(control) { - control.$rollbackViewValue(); - }); - }; - - /** - * @ngdoc method - * @name form.FormController#$commitViewValue - * - * @description - * Commit all form controls pending updates to the `$modelValue`. - * - * Updates may be pending by a debounced event or because the input is waiting for a some future - * event defined in `ng-model-options`. This method is rarely needed as `NgModelController` - * usually handles calling this in response to input events. - */ - form.$commitViewValue = function() { - forEach(controls, function(control) { - control.$commitViewValue(); - }); - }; - - /** - * @ngdoc method - * @name form.FormController#$addControl - * - * @description - * Register a control with the form. - * - * Input elements using ngModelController do this automatically when they are linked. - */ - form.$addControl = function(control) { - // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored - // and not added to the scope. Now we throw an error. - assertNotHasOwnProperty(control.$name, 'input'); - controls.push(control); - - if (control.$name) { - form[control.$name] = control; - } - }; - - // Private API: rename a form control - form.$$renameControl = function(control, newName) { - var oldName = control.$name; - - if (form[oldName] === control) { - delete form[oldName]; - } - form[newName] = control; - control.$name = newName; - }; - - /** - * @ngdoc method - * @name form.FormController#$removeControl - * - * @description - * Deregister a control from the form. - * - * Input elements using ngModelController do this automatically when they are destroyed. - */ - form.$removeControl = function(control) { - if (control.$name && form[control.$name] === control) { - delete form[control.$name]; - } - forEach(form.$pending, function(value, name) { - form.$setValidity(name, null, control); - }); - forEach(form.$error, function(value, name) { - form.$setValidity(name, null, control); - }); - - arrayRemove(controls, control); - }; - - - /** - * @ngdoc method - * @name form.FormController#$setValidity - * - * @description - * Sets the validity of a form control. - * - * This method will also propagate to parent forms. - */ - addSetValidityMethod({ - ctrl: this, - $element: element, - set: function(object, property, control) { - var list = object[property]; - if (!list) { - object[property] = [control]; - } else { - var index = list.indexOf(control); - if (index === -1) { - list.push(control); - } - } - }, - unset: function(object, property, control) { - var list = object[property]; - if (!list) { - return; - } - arrayRemove(list, control); - if (list.length === 0) { - delete object[property]; - } - }, - parentForm: parentForm, - $animate: $animate - }); - - /** - * @ngdoc method - * @name form.FormController#$setDirty - * - * @description - * Sets the form to a dirty state. - * - * This method can be called to add the 'ng-dirty' class and set the form to a dirty - * state (ng-dirty class). This method will also propagate to parent forms. - */ - form.$setDirty = function() { - $animate.removeClass(element, PRISTINE_CLASS); - $animate.addClass(element, DIRTY_CLASS); - form.$dirty = true; - form.$pristine = false; - parentForm.$setDirty(); - }; - - /** - * @ngdoc method - * @name form.FormController#$setPristine - * - * @description - * Sets the form to its pristine state. - * - * This method can be called to remove the 'ng-dirty' class and set the form to its pristine - * state (ng-pristine class). This method will also propagate to all the controls contained - * in this form. - * - * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after - * saving or resetting it. - */ - form.$setPristine = function() { - $animate.setClass(element, PRISTINE_CLASS, DIRTY_CLASS + ' ' + SUBMITTED_CLASS); - form.$dirty = false; - form.$pristine = true; - form.$submitted = false; - forEach(controls, function(control) { - control.$setPristine(); - }); - }; - - /** - * @ngdoc method - * @name form.FormController#$setUntouched - * - * @description - * Sets the form to its untouched state. - * - * This method can be called to remove the 'ng-touched' class and set the form controls to their - * untouched state (ng-untouched class). - * - * Setting a form controls back to their untouched state is often useful when setting the form - * back to its pristine state. - */ - form.$setUntouched = function() { - forEach(controls, function(control) { - control.$setUntouched(); - }); - }; - - /** - * @ngdoc method - * @name form.FormController#$setSubmitted - * - * @description - * Sets the form to its submitted state. - */ - form.$setSubmitted = function() { - $animate.addClass(element, SUBMITTED_CLASS); - form.$submitted = true; - parentForm.$setSubmitted(); - }; -} - -/** - * @ngdoc directive - * @name ngForm - * @restrict EAC - * - * @description - * Nestable alias of {@link ng.directive:form `form`} directive. HTML - * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a - * sub-group of controls needs to be determined. - * - * Note: the purpose of `ngForm` is to group controls, - * but not to be a replacement for the `
      ` tag with all of its capabilities - * (e.g. posting to the server, ...). - * - * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into - * related scope, under this name. - * - */ - - /** - * @ngdoc directive - * @name form - * @restrict E - * - * @description - * Directive that instantiates - * {@link form.FormController FormController}. - * - * If the `name` attribute is specified, the form controller is published onto the current scope under - * this name. - * - * # Alias: {@link ng.directive:ngForm `ngForm`} - * - * In Angular forms can be nested. This means that the outer form is valid when all of the child - * forms are valid as well. However, browsers do not allow nesting of `` elements, so - * Angular provides the {@link ng.directive:ngForm `ngForm`} directive which behaves identically to - * `` but can be nested. This allows you to have nested forms, which is very useful when - * using Angular validation directives in forms that are dynamically generated using the - * {@link ng.directive:ngRepeat `ngRepeat`} directive. Since you cannot dynamically generate the `name` - * attribute of input elements using interpolation, you have to wrap each set of repeated inputs in an - * `ngForm` directive and nest these in an outer `form` element. - * - * - * # CSS classes - * - `ng-valid` is set if the form is valid. - * - `ng-invalid` is set if the form is invalid. - * - `ng-pristine` is set if the form is pristine. - * - `ng-dirty` is set if the form is dirty. - * - `ng-submitted` is set if the form was submitted. - * - * Keep in mind that ngAnimate can detect each of these classes when added and removed. - * - * - * # Submitting a form and preventing the default action - * - * Since the role of forms in client-side Angular applications is different than in classical - * roundtrip apps, it is desirable for the browser not to translate the form submission into a full - * page reload that sends the data to the server. Instead some javascript logic should be triggered - * to handle the form submission in an application-specific way. - * - * For this reason, Angular prevents the default action (form submission to the server) unless the - * `` element has an `action` attribute specified. - * - * You can use one of the following two ways to specify what javascript method should be called when - * a form is submitted: - * - * - {@link ng.directive:ngSubmit ngSubmit} directive on the form element - * - {@link ng.directive:ngClick ngClick} directive on the first - * button or input field of type submit (input[type=submit]) - * - * To prevent double execution of the handler, use only one of the {@link ng.directive:ngSubmit ngSubmit} - * or {@link ng.directive:ngClick ngClick} directives. - * This is because of the following form submission rules in the HTML specification: - * - * - If a form has only one input field then hitting enter in this field triggers form submit - * (`ngSubmit`) - * - if a form has 2+ input fields and no buttons or input[type=submit] then hitting enter - * doesn't trigger submit - * - if a form has one or more input fields and one or more buttons or input[type=submit] then - * hitting enter in any of the input fields will trigger the click handler on the *first* button or - * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`) - * - * Any pending `ngModelOptions` changes will take place immediately when an enclosing form is - * submitted. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit` - * to have access to the updated model. - * - * ## Animation Hooks - * - * Animations in ngForm are triggered when any of the associated CSS classes are added and removed. - * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any - * other validations that are performed within the form. Animations in ngForm are similar to how - * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well - * as JS animations. - * - * The following example shows a simple way to utilize CSS transitions to style a form element - * that has been rendered as invalid after it has been validated: - * - *
      - * //be sure to include ngAnimate as a module to hook into more
      - * //advanced animations
      - * .my-form {
      - *   transition:0.5s linear all;
      - *   background: white;
      - * }
      - * .my-form.ng-invalid {
      - *   background: red;
      - *   color:white;
      - * }
      - * 
      - * - * @example - - - - - - userType: - Required!
      - userType = {{userType}}
      - myForm.input.$valid = {{myForm.input.$valid}}
      - myForm.input.$error = {{myForm.input.$error}}
      - myForm.$valid = {{myForm.$valid}}
      - myForm.$error.required = {{!!myForm.$error.required}}
      - -
      - - it('should initialize to model', function() { - var userType = element(by.binding('userType')); - var valid = element(by.binding('myForm.input.$valid')); - - expect(userType.getText()).toContain('guest'); - expect(valid.getText()).toContain('true'); - }); - - it('should be invalid if empty', function() { - var userType = element(by.binding('userType')); - var valid = element(by.binding('myForm.input.$valid')); - var userInput = element(by.model('userType')); - - userInput.clear(); - userInput.sendKeys(''); - - expect(userType.getText()).toEqual('userType ='); - expect(valid.getText()).toContain('false'); - }); - -
      - * - * @param {string=} name Name of the form. If specified, the form controller will be published into - * related scope, under this name. - */ -var formDirectiveFactory = function(isNgForm) { - return ['$timeout', function($timeout) { - var formDirective = { - name: 'form', - restrict: isNgForm ? 'EAC' : 'E', - controller: FormController, - compile: function ngFormCompile(formElement) { - // Setup initial state of the control - formElement.addClass(PRISTINE_CLASS).addClass(VALID_CLASS); - - return { - pre: function ngFormPreLink(scope, formElement, attr, controller) { - // if `action` attr is not present on the form, prevent the default action (submission) - if (!('action' in attr)) { - // we can't use jq events because if a form is destroyed during submission the default - // action is not prevented. see #1238 - // - // IE 9 is not affected because it doesn't fire a submit event and try to do a full - // page reload if the form was destroyed by submission of the form via a click handler - // on a button in the form. Looks like an IE9 specific bug. - var handleFormSubmission = function(event) { - scope.$apply(function() { - controller.$commitViewValue(); - controller.$setSubmitted(); - }); - - event.preventDefault(); - }; - - addEventListenerFn(formElement[0], 'submit', handleFormSubmission); - - // unregister the preventDefault listener so that we don't not leak memory but in a - // way that will achieve the prevention of the default action. - formElement.on('$destroy', function() { - $timeout(function() { - removeEventListenerFn(formElement[0], 'submit', handleFormSubmission); - }, 0, false); - }); - } - - var parentFormCtrl = controller.$$parentForm, - alias = controller.$name; - - if (alias) { - setter(scope, alias, controller, alias); - attr.$observe(attr.name ? 'name' : 'ngForm', function(newValue) { - if (alias === newValue) return; - setter(scope, alias, undefined, alias); - alias = newValue; - setter(scope, alias, controller, alias); - parentFormCtrl.$$renameControl(controller, alias); - }); - } - formElement.on('$destroy', function() { - parentFormCtrl.$removeControl(controller); - if (alias) { - setter(scope, alias, undefined, alias); - } - extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards - }); - } - }; - } - }; - - return formDirective; - }]; -}; - -var formDirective = formDirectiveFactory(); -var ngFormDirective = formDirectiveFactory(true); - -/* global VALID_CLASS: true, - INVALID_CLASS: true, - PRISTINE_CLASS: true, - DIRTY_CLASS: true, - UNTOUCHED_CLASS: true, - TOUCHED_CLASS: true, -*/ - -// Regex code is obtained from SO: https://stackoverflow.com/questions/3143070/javascript-regex-iso-datetime#answer-3143231 -var ISO_DATE_REGEXP = /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/; -var URL_REGEXP = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/; -var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i; -var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/; -var DATE_REGEXP = /^(\d{4})-(\d{2})-(\d{2})$/; -var DATETIMELOCAL_REGEXP = /^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/; -var WEEK_REGEXP = /^(\d{4})-W(\d\d)$/; -var MONTH_REGEXP = /^(\d{4})-(\d\d)$/; -var TIME_REGEXP = /^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/; -var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/; - -var $ngModelMinErr = new minErr('ngModel'); - -var inputType = { - - /** - * @ngdoc input - * @name input[text] - * - * @description - * Standard HTML text input with angular data binding, inherited by most of the `input` elements. - * - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string=} name Property name of the form under which the control is published. - * @param {string=} required Adds `required` validation error key if the value is not entered. - * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to - * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of - * `required` when you want to data-bind to the `required` attribute. - * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than - * minlength. - * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than - * maxlength. Setting the attribute to a negative or non-numeric value, allows view values of - * any length. - * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string - * that contains the regular expression body that will be converted to a regular expression - * as in the ngPattern directive. - * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match - * a RegExp found by evaluating the Angular expression given in the attribute value. - * If the expression evaluates to a RegExp object then this is used directly. - * If the expression is a string then it will be converted to a RegExp after wrapping it in `^` and `$` - * characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input. - * This parameter is ignored for input[type=password] controls, which will never trim the - * input. - * - * @example - - - -
      - Single word: - - Required! - - Single word only! - - text = {{text}}
      - myForm.input.$valid = {{myForm.input.$valid}}
      - myForm.input.$error = {{myForm.input.$error}}
      - myForm.$valid = {{myForm.$valid}}
      - myForm.$error.required = {{!!myForm.$error.required}}
      -
      -
      - - var text = element(by.binding('text')); - var valid = element(by.binding('myForm.input.$valid')); - var input = element(by.model('text')); - - it('should initialize to model', function() { - expect(text.getText()).toContain('guest'); - expect(valid.getText()).toContain('true'); - }); - - it('should be invalid if empty', function() { - input.clear(); - input.sendKeys(''); - - expect(text.getText()).toEqual('text ='); - expect(valid.getText()).toContain('false'); - }); - - it('should be invalid if multi word', function() { - input.clear(); - input.sendKeys('hello world'); - - expect(valid.getText()).toContain('false'); - }); - -
      - */ - 'text': textInputType, - - /** - * @ngdoc input - * @name input[date] - * - * @description - * Input with date validation and transformation. In browsers that do not yet support - * the HTML5 date input, a text element will be used. In that case, text must be entered in a valid ISO-8601 - * date format (yyyy-MM-dd), for example: `2009-01-06`. Since many - * modern browsers do not yet support this input type, it is important to provide cues to users on the - * expected input format via a placeholder or label. - * - * The model must always be a Date object, otherwise Angular will throw an error. - * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string. - * - * The timezone to be used to read/write the `Date` instance in the model can be defined using - * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser. - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string=} name Property name of the form under which the control is published. - * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a - * valid ISO date string (yyyy-MM-dd). - * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be - * a valid ISO date string (yyyy-MM-dd). - * @param {string=} required Sets `required` validation error key if the value is not entered. - * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to - * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of - * `required` when you want to data-bind to the `required` attribute. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * - * @example - - - -
      - Pick a date in 2013: - - - Required! - - Not a valid date! - value = {{value | date: "yyyy-MM-dd"}}
      - myForm.input.$valid = {{myForm.input.$valid}}
      - myForm.input.$error = {{myForm.input.$error}}
      - myForm.$valid = {{myForm.$valid}}
      - myForm.$error.required = {{!!myForm.$error.required}}
      -
      -
      - - var value = element(by.binding('value | date: "yyyy-MM-dd"')); - var valid = element(by.binding('myForm.input.$valid')); - var input = element(by.model('value')); - - // currently protractor/webdriver does not support - // sending keys to all known HTML5 input controls - // for various browsers (see https://github.com/angular/protractor/issues/562). - function setInput(val) { - // set the value of the element and force validation. - var scr = "var ipt = document.getElementById('exampleInput'); " + - "ipt.value = '" + val + "';" + - "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });"; - browser.executeScript(scr); - } - - it('should initialize to model', function() { - expect(value.getText()).toContain('2013-10-22'); - expect(valid.getText()).toContain('myForm.input.$valid = true'); - }); - - it('should be invalid if empty', function() { - setInput(''); - expect(value.getText()).toEqual('value ='); - expect(valid.getText()).toContain('myForm.input.$valid = false'); - }); - - it('should be invalid if over max', function() { - setInput('2015-01-01'); - expect(value.getText()).toContain(''); - expect(valid.getText()).toContain('myForm.input.$valid = false'); - }); - -
      - */ - 'date': createDateInputType('date', DATE_REGEXP, - createDateParser(DATE_REGEXP, ['yyyy', 'MM', 'dd']), - 'yyyy-MM-dd'), - - /** - * @ngdoc input - * @name input[datetime-local] - * - * @description - * Input with datetime validation and transformation. In browsers that do not yet support - * the HTML5 date input, a text element will be used. In that case, the text must be entered in a valid ISO-8601 - * local datetime format (yyyy-MM-ddTHH:mm:ss), for example: `2010-12-28T14:57:00`. - * - * The model must always be a Date object, otherwise Angular will throw an error. - * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string. - * - * The timezone to be used to read/write the `Date` instance in the model can be defined using - * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser. - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string=} name Property name of the form under which the control is published. - * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a - * valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). - * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be - * a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). - * @param {string=} required Sets `required` validation error key if the value is not entered. - * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to - * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of - * `required` when you want to data-bind to the `required` attribute. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * - * @example - - - -
      - Pick a date between in 2013: - - - Required! - - Not a valid date! - value = {{value | date: "yyyy-MM-ddTHH:mm:ss"}}
      - myForm.input.$valid = {{myForm.input.$valid}}
      - myForm.input.$error = {{myForm.input.$error}}
      - myForm.$valid = {{myForm.$valid}}
      - myForm.$error.required = {{!!myForm.$error.required}}
      -
      -
      - - var value = element(by.binding('value | date: "yyyy-MM-ddTHH:mm:ss"')); - var valid = element(by.binding('myForm.input.$valid')); - var input = element(by.model('value')); - - // currently protractor/webdriver does not support - // sending keys to all known HTML5 input controls - // for various browsers (https://github.com/angular/protractor/issues/562). - function setInput(val) { - // set the value of the element and force validation. - var scr = "var ipt = document.getElementById('exampleInput'); " + - "ipt.value = '" + val + "';" + - "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });"; - browser.executeScript(scr); - } - - it('should initialize to model', function() { - expect(value.getText()).toContain('2010-12-28T14:57:00'); - expect(valid.getText()).toContain('myForm.input.$valid = true'); - }); - - it('should be invalid if empty', function() { - setInput(''); - expect(value.getText()).toEqual('value ='); - expect(valid.getText()).toContain('myForm.input.$valid = false'); - }); - - it('should be invalid if over max', function() { - setInput('2015-01-01T23:59:00'); - expect(value.getText()).toContain(''); - expect(valid.getText()).toContain('myForm.input.$valid = false'); - }); - -
      - */ - 'datetime-local': createDateInputType('datetimelocal', DATETIMELOCAL_REGEXP, - createDateParser(DATETIMELOCAL_REGEXP, ['yyyy', 'MM', 'dd', 'HH', 'mm', 'ss', 'sss']), - 'yyyy-MM-ddTHH:mm:ss.sss'), - - /** - * @ngdoc input - * @name input[time] - * - * @description - * Input with time validation and transformation. In browsers that do not yet support - * the HTML5 date input, a text element will be used. In that case, the text must be entered in a valid ISO-8601 - * local time format (HH:mm:ss), for example: `14:57:00`. Model must be a Date object. This binding will always output a - * Date object to the model of January 1, 1970, or local date `new Date(1970, 0, 1, HH, mm, ss)`. - * - * The model must always be a Date object, otherwise Angular will throw an error. - * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string. - * - * The timezone to be used to read/write the `Date` instance in the model can be defined using - * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser. - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string=} name Property name of the form under which the control is published. - * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a - * valid ISO time format (HH:mm:ss). - * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be a - * valid ISO time format (HH:mm:ss). - * @param {string=} required Sets `required` validation error key if the value is not entered. - * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to - * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of - * `required` when you want to data-bind to the `required` attribute. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * - * @example - - - -
      - Pick a between 8am and 5pm: - - - Required! - - Not a valid date! - value = {{value | date: "HH:mm:ss"}}
      - myForm.input.$valid = {{myForm.input.$valid}}
      - myForm.input.$error = {{myForm.input.$error}}
      - myForm.$valid = {{myForm.$valid}}
      - myForm.$error.required = {{!!myForm.$error.required}}
      -
      -
      - - var value = element(by.binding('value | date: "HH:mm:ss"')); - var valid = element(by.binding('myForm.input.$valid')); - var input = element(by.model('value')); - - // currently protractor/webdriver does not support - // sending keys to all known HTML5 input controls - // for various browsers (https://github.com/angular/protractor/issues/562). - function setInput(val) { - // set the value of the element and force validation. - var scr = "var ipt = document.getElementById('exampleInput'); " + - "ipt.value = '" + val + "';" + - "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });"; - browser.executeScript(scr); - } - - it('should initialize to model', function() { - expect(value.getText()).toContain('14:57:00'); - expect(valid.getText()).toContain('myForm.input.$valid = true'); - }); - - it('should be invalid if empty', function() { - setInput(''); - expect(value.getText()).toEqual('value ='); - expect(valid.getText()).toContain('myForm.input.$valid = false'); - }); - - it('should be invalid if over max', function() { - setInput('23:59:00'); - expect(value.getText()).toContain(''); - expect(valid.getText()).toContain('myForm.input.$valid = false'); - }); - -
      - */ - 'time': createDateInputType('time', TIME_REGEXP, - createDateParser(TIME_REGEXP, ['HH', 'mm', 'ss', 'sss']), - 'HH:mm:ss.sss'), - - /** - * @ngdoc input - * @name input[week] - * - * @description - * Input with week-of-the-year validation and transformation to Date. In browsers that do not yet support - * the HTML5 week input, a text element will be used. In that case, the text must be entered in a valid ISO-8601 - * week format (yyyy-W##), for example: `2013-W02`. - * - * The model must always be a Date object, otherwise Angular will throw an error. - * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string. - * - * The timezone to be used to read/write the `Date` instance in the model can be defined using - * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser. - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string=} name Property name of the form under which the control is published. - * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a - * valid ISO week format (yyyy-W##). - * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be - * a valid ISO week format (yyyy-W##). - * @param {string=} required Sets `required` validation error key if the value is not entered. - * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to - * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of - * `required` when you want to data-bind to the `required` attribute. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * - * @example - - - -
      - Pick a date between in 2013: - - - Required! - - Not a valid date! - value = {{value | date: "yyyy-Www"}}
      - myForm.input.$valid = {{myForm.input.$valid}}
      - myForm.input.$error = {{myForm.input.$error}}
      - myForm.$valid = {{myForm.$valid}}
      - myForm.$error.required = {{!!myForm.$error.required}}
      -
      -
      - - var value = element(by.binding('value | date: "yyyy-Www"')); - var valid = element(by.binding('myForm.input.$valid')); - var input = element(by.model('value')); - - // currently protractor/webdriver does not support - // sending keys to all known HTML5 input controls - // for various browsers (https://github.com/angular/protractor/issues/562). - function setInput(val) { - // set the value of the element and force validation. - var scr = "var ipt = document.getElementById('exampleInput'); " + - "ipt.value = '" + val + "';" + - "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });"; - browser.executeScript(scr); - } - - it('should initialize to model', function() { - expect(value.getText()).toContain('2013-W01'); - expect(valid.getText()).toContain('myForm.input.$valid = true'); - }); - - it('should be invalid if empty', function() { - setInput(''); - expect(value.getText()).toEqual('value ='); - expect(valid.getText()).toContain('myForm.input.$valid = false'); - }); - - it('should be invalid if over max', function() { - setInput('2015-W01'); - expect(value.getText()).toContain(''); - expect(valid.getText()).toContain('myForm.input.$valid = false'); - }); - -
      - */ - 'week': createDateInputType('week', WEEK_REGEXP, weekParser, 'yyyy-Www'), - - /** - * @ngdoc input - * @name input[month] - * - * @description - * Input with month validation and transformation. In browsers that do not yet support - * the HTML5 month input, a text element will be used. In that case, the text must be entered in a valid ISO-8601 - * month format (yyyy-MM), for example: `2009-01`. - * - * The model must always be a Date object, otherwise Angular will throw an error. - * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string. - * If the model is not set to the first of the month, the next view to model update will set it - * to the first of the month. - * - * The timezone to be used to read/write the `Date` instance in the model can be defined using - * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser. - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string=} name Property name of the form under which the control is published. - * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be - * a valid ISO month format (yyyy-MM). - * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must - * be a valid ISO month format (yyyy-MM). - * @param {string=} required Sets `required` validation error key if the value is not entered. - * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to - * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of - * `required` when you want to data-bind to the `required` attribute. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * - * @example - - - -
      - Pick a month int 2013: - - - Required! - - Not a valid month! - value = {{value | date: "yyyy-MM"}}
      - myForm.input.$valid = {{myForm.input.$valid}}
      - myForm.input.$error = {{myForm.input.$error}}
      - myForm.$valid = {{myForm.$valid}}
      - myForm.$error.required = {{!!myForm.$error.required}}
      -
      -
      - - var value = element(by.binding('value | date: "yyyy-MM"')); - var valid = element(by.binding('myForm.input.$valid')); - var input = element(by.model('value')); - - // currently protractor/webdriver does not support - // sending keys to all known HTML5 input controls - // for various browsers (https://github.com/angular/protractor/issues/562). - function setInput(val) { - // set the value of the element and force validation. - var scr = "var ipt = document.getElementById('exampleInput'); " + - "ipt.value = '" + val + "';" + - "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });"; - browser.executeScript(scr); - } - - it('should initialize to model', function() { - expect(value.getText()).toContain('2013-10'); - expect(valid.getText()).toContain('myForm.input.$valid = true'); - }); - - it('should be invalid if empty', function() { - setInput(''); - expect(value.getText()).toEqual('value ='); - expect(valid.getText()).toContain('myForm.input.$valid = false'); - }); - - it('should be invalid if over max', function() { - setInput('2015-01'); - expect(value.getText()).toContain(''); - expect(valid.getText()).toContain('myForm.input.$valid = false'); - }); - -
      - */ - 'month': createDateInputType('month', MONTH_REGEXP, - createDateParser(MONTH_REGEXP, ['yyyy', 'MM']), - 'yyyy-MM'), - - /** - * @ngdoc input - * @name input[number] - * - * @description - * Text input with number validation and transformation. Sets the `number` validation - * error if not a valid number. - * - * The model must always be a number, otherwise Angular will throw an error. - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string=} name Property name of the form under which the control is published. - * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. - * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. - * @param {string=} required Sets `required` validation error key if the value is not entered. - * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to - * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of - * `required` when you want to data-bind to the `required` attribute. - * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than - * minlength. - * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than - * maxlength. Setting the attribute to a negative or non-numeric value, allows view values of - * any length. - * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string - * that contains the regular expression body that will be converted to a regular expression - * as in the ngPattern directive. - * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match - * a RegExp found by evaluating the Angular expression given in the attribute value. - * If the expression evaluates to a RegExp object then this is used directly. - * If the expression is a string then it will be converted to a RegExp after wrapping it in `^` and `$` - * characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * - * @example - - - -
      - Number: - - Required! - - Not valid number! - value = {{value}}
      - myForm.input.$valid = {{myForm.input.$valid}}
      - myForm.input.$error = {{myForm.input.$error}}
      - myForm.$valid = {{myForm.$valid}}
      - myForm.$error.required = {{!!myForm.$error.required}}
      -
      -
      - - var value = element(by.binding('value')); - var valid = element(by.binding('myForm.input.$valid')); - var input = element(by.model('value')); - - it('should initialize to model', function() { - expect(value.getText()).toContain('12'); - expect(valid.getText()).toContain('true'); - }); - - it('should be invalid if empty', function() { - input.clear(); - input.sendKeys(''); - expect(value.getText()).toEqual('value ='); - expect(valid.getText()).toContain('false'); - }); - - it('should be invalid if over max', function() { - input.clear(); - input.sendKeys('123'); - expect(value.getText()).toEqual('value ='); - expect(valid.getText()).toContain('false'); - }); - -
      - */ - 'number': numberInputType, - - - /** - * @ngdoc input - * @name input[url] - * - * @description - * Text input with URL validation. Sets the `url` validation error key if the content is not a - * valid URL. - * - *
      - * **Note:** `input[url]` uses a regex to validate urls that is derived from the regex - * used in Chromium. If you need stricter validation, you can use `ng-pattern` or modify - * the built-in validators (see the {@link guide/forms Forms guide}) - *
      - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string=} name Property name of the form under which the control is published. - * @param {string=} required Sets `required` validation error key if the value is not entered. - * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to - * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of - * `required` when you want to data-bind to the `required` attribute. - * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than - * minlength. - * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than - * maxlength. Setting the attribute to a negative or non-numeric value, allows view values of - * any length. - * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string - * that contains the regular expression body that will be converted to a regular expression - * as in the ngPattern directive. - * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match - * a RegExp found by evaluating the Angular expression given in the attribute value. - * If the expression evaluates to a RegExp object then this is used directly. - * If the expression is a string then it will be converted to a RegExp after wrapping it in `^` and `$` - * characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * - * @example - - - -
      - URL: - - Required! - - Not valid url! - text = {{text}}
      - myForm.input.$valid = {{myForm.input.$valid}}
      - myForm.input.$error = {{myForm.input.$error}}
      - myForm.$valid = {{myForm.$valid}}
      - myForm.$error.required = {{!!myForm.$error.required}}
      - myForm.$error.url = {{!!myForm.$error.url}}
      -
      -
      - - var text = element(by.binding('text')); - var valid = element(by.binding('myForm.input.$valid')); - var input = element(by.model('text')); - - it('should initialize to model', function() { - expect(text.getText()).toContain('http://google.com'); - expect(valid.getText()).toContain('true'); - }); - - it('should be invalid if empty', function() { - input.clear(); - input.sendKeys(''); - - expect(text.getText()).toEqual('text ='); - expect(valid.getText()).toContain('false'); - }); - - it('should be invalid if not url', function() { - input.clear(); - input.sendKeys('box'); - - expect(valid.getText()).toContain('false'); - }); - -
      - */ - 'url': urlInputType, - - - /** - * @ngdoc input - * @name input[email] - * - * @description - * Text input with email validation. Sets the `email` validation error key if not a valid email - * address. - * - *
      - * **Note:** `input[email]` uses a regex to validate email addresses that is derived from the regex - * used in Chromium. If you need stricter validation (e.g. requiring a top-level domain), you can - * use `ng-pattern` or modify the built-in validators (see the {@link guide/forms Forms guide}) - *
      - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string=} name Property name of the form under which the control is published. - * @param {string=} required Sets `required` validation error key if the value is not entered. - * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to - * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of - * `required` when you want to data-bind to the `required` attribute. - * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than - * minlength. - * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than - * maxlength. Setting the attribute to a negative or non-numeric value, allows view values of - * any length. - * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string - * that contains the regular expression body that will be converted to a regular expression - * as in the ngPattern directive. - * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match - * a RegExp found by evaluating the Angular expression given in the attribute value. - * If the expression evaluates to a RegExp object then this is used directly. - * If the expression is a string then it will be converted to a RegExp after wrapping it in `^` and `$` - * characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * - * @example - - - -
      - Email: - - Required! - - Not valid email! - text = {{text}}
      - myForm.input.$valid = {{myForm.input.$valid}}
      - myForm.input.$error = {{myForm.input.$error}}
      - myForm.$valid = {{myForm.$valid}}
      - myForm.$error.required = {{!!myForm.$error.required}}
      - myForm.$error.email = {{!!myForm.$error.email}}
      -
      -
      - - var text = element(by.binding('text')); - var valid = element(by.binding('myForm.input.$valid')); - var input = element(by.model('text')); - - it('should initialize to model', function() { - expect(text.getText()).toContain('me@example.com'); - expect(valid.getText()).toContain('true'); - }); - - it('should be invalid if empty', function() { - input.clear(); - input.sendKeys(''); - expect(text.getText()).toEqual('text ='); - expect(valid.getText()).toContain('false'); - }); - - it('should be invalid if not email', function() { - input.clear(); - input.sendKeys('xxx'); - - expect(valid.getText()).toContain('false'); - }); - -
      - */ - 'email': emailInputType, - - - /** - * @ngdoc input - * @name input[radio] - * - * @description - * HTML radio button. - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string} value The value to which the expression should be set when selected. - * @param {string=} name Property name of the form under which the control is published. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * @param {string} ngValue Angular expression which sets the value to which the expression should - * be set when selected. - * - * @example - - - -
      - Red
      - Green
      - Blue
      - color = {{color | json}}
      -
      - Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`. -
      - - it('should change state', function() { - var color = element(by.binding('color')); - - expect(color.getText()).toContain('blue'); - - element.all(by.model('color')).get(0).click(); - - expect(color.getText()).toContain('red'); - }); - -
      - */ - 'radio': radioInputType, - - - /** - * @ngdoc input - * @name input[checkbox] - * - * @description - * HTML checkbox. - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string=} name Property name of the form under which the control is published. - * @param {expression=} ngTrueValue The value to which the expression should be set when selected. - * @param {expression=} ngFalseValue The value to which the expression should be set when not selected. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * - * @example - - - -
      - Value1:
      - Value2:
      - value1 = {{value1}}
      - value2 = {{value2}}
      -
      -
      - - it('should change state', function() { - var value1 = element(by.binding('value1')); - var value2 = element(by.binding('value2')); - - expect(value1.getText()).toContain('true'); - expect(value2.getText()).toContain('YES'); - - element(by.model('value1')).click(); - element(by.model('value2')).click(); - - expect(value1.getText()).toContain('false'); - expect(value2.getText()).toContain('NO'); - }); - -
      - */ - 'checkbox': checkboxInputType, - - 'hidden': noop, - 'button': noop, - 'submit': noop, - 'reset': noop, - 'file': noop -}; - -function stringBasedInputType(ctrl) { - ctrl.$formatters.push(function(value) { - return ctrl.$isEmpty(value) ? value : value.toString(); - }); -} - -function textInputType(scope, element, attr, ctrl, $sniffer, $browser) { - baseInputType(scope, element, attr, ctrl, $sniffer, $browser); - stringBasedInputType(ctrl); -} - -function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) { - var placeholder = element[0].placeholder, noevent = {}; - var type = lowercase(element[0].type); - - // In composition mode, users are still inputing intermediate text buffer, - // hold the listener until composition is done. - // More about composition events: https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent - if (!$sniffer.android) { - var composing = false; - - element.on('compositionstart', function(data) { - composing = true; - }); - - element.on('compositionend', function() { - composing = false; - listener(); - }); - } - - var listener = function(ev) { - if (composing) return; - var value = element.val(), - event = ev && ev.type; - - // IE (11 and under) seem to emit an 'input' event if the placeholder value changes. - // We don't want to dirty the value when this happens, so we abort here. Unfortunately, - // IE also sends input events for other non-input-related things, (such as focusing on a - // form control), so this change is not entirely enough to solve this. - if (msie && (ev || noevent).type === 'input' && element[0].placeholder !== placeholder) { - placeholder = element[0].placeholder; - return; - } - - // By default we will trim the value - // If the attribute ng-trim exists we will avoid trimming - // If input type is 'password', the value is never trimmed - if (type !== 'password' && (!attr.ngTrim || attr.ngTrim !== 'false')) { - value = trim(value); - } - - // If a control is suffering from bad input (due to native validators), browsers discard its - // value, so it may be necessary to revalidate (by calling $setViewValue again) even if the - // control's value is the same empty value twice in a row. - if (ctrl.$viewValue !== value || (value === '' && ctrl.$$hasNativeValidators)) { - ctrl.$setViewValue(value, event); - } - }; - - // if the browser does support "input" event, we are fine - except on IE9 which doesn't fire the - // input event on backspace, delete or cut - if ($sniffer.hasEvent('input')) { - element.on('input', listener); - } else { - var timeout; - - var deferListener = function(ev) { - if (!timeout) { - timeout = $browser.defer(function() { - listener(ev); - timeout = null; - }); - } - }; - - element.on('keydown', function(event) { - var key = event.keyCode; - - // ignore - // command modifiers arrows - if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40)) return; - - deferListener(event); - }); - - // if user modifies input value using context menu in IE, we need "paste" and "cut" events to catch it - if ($sniffer.hasEvent('paste')) { - element.on('paste cut', deferListener); - } - } - - // if user paste into input using mouse on older browser - // or form autocomplete on newer browser, we need "change" event to catch it - element.on('change', listener); - - ctrl.$render = function() { - element.val(ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue); - }; -} - -function weekParser(isoWeek, existingDate) { - if (isDate(isoWeek)) { - return isoWeek; - } - - if (isString(isoWeek)) { - WEEK_REGEXP.lastIndex = 0; - var parts = WEEK_REGEXP.exec(isoWeek); - if (parts) { - var year = +parts[1], - week = +parts[2], - hours = 0, - minutes = 0, - seconds = 0, - milliseconds = 0, - firstThurs = getFirstThursdayOfYear(year), - addDays = (week - 1) * 7; - - if (existingDate) { - hours = existingDate.getHours(); - minutes = existingDate.getMinutes(); - seconds = existingDate.getSeconds(); - milliseconds = existingDate.getMilliseconds(); - } - - return new Date(year, 0, firstThurs.getDate() + addDays, hours, minutes, seconds, milliseconds); - } - } - - return NaN; -} - -function createDateParser(regexp, mapping) { - return function(iso, date) { - var parts, map; - - if (isDate(iso)) { - return iso; - } - - if (isString(iso)) { - // When a date is JSON'ified to wraps itself inside of an extra - // set of double quotes. This makes the date parsing code unable - // to match the date string and parse it as a date. - if (iso.charAt(0) == '"' && iso.charAt(iso.length - 1) == '"') { - iso = iso.substring(1, iso.length - 1); - } - if (ISO_DATE_REGEXP.test(iso)) { - return new Date(iso); - } - regexp.lastIndex = 0; - parts = regexp.exec(iso); - - if (parts) { - parts.shift(); - if (date) { - map = { - yyyy: date.getFullYear(), - MM: date.getMonth() + 1, - dd: date.getDate(), - HH: date.getHours(), - mm: date.getMinutes(), - ss: date.getSeconds(), - sss: date.getMilliseconds() / 1000 - }; - } else { - map = { yyyy: 1970, MM: 1, dd: 1, HH: 0, mm: 0, ss: 0, sss: 0 }; - } - - forEach(parts, function(part, index) { - if (index < mapping.length) { - map[mapping[index]] = +part; - } - }); - return new Date(map.yyyy, map.MM - 1, map.dd, map.HH, map.mm, map.ss || 0, map.sss * 1000 || 0); - } - } - - return NaN; - }; -} - -function createDateInputType(type, regexp, parseDate, format) { - return function dynamicDateInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter) { - badInputChecker(scope, element, attr, ctrl); - baseInputType(scope, element, attr, ctrl, $sniffer, $browser); - var timezone = ctrl && ctrl.$options && ctrl.$options.timezone; - var previousDate; - - ctrl.$$parserName = type; - ctrl.$parsers.push(function(value) { - if (ctrl.$isEmpty(value)) return null; - if (regexp.test(value)) { - // Note: We cannot read ctrl.$modelValue, as there might be a different - // parser/formatter in the processing chain so that the model - // contains some different data format! - var parsedDate = parseDate(value, previousDate); - if (timezone === 'UTC') { - parsedDate.setMinutes(parsedDate.getMinutes() - parsedDate.getTimezoneOffset()); - } - return parsedDate; - } - return undefined; - }); - - ctrl.$formatters.push(function(value) { - if (value && !isDate(value)) { - throw $ngModelMinErr('datefmt', 'Expected `{0}` to be a date', value); - } - if (isValidDate(value)) { - previousDate = value; - if (previousDate && timezone === 'UTC') { - var timezoneOffset = 60000 * previousDate.getTimezoneOffset(); - previousDate = new Date(previousDate.getTime() + timezoneOffset); - } - return $filter('date')(value, format, timezone); - } else { - previousDate = null; - return ''; - } - }); - - if (isDefined(attr.min) || attr.ngMin) { - var minVal; - ctrl.$validators.min = function(value) { - return !isValidDate(value) || isUndefined(minVal) || parseDate(value) >= minVal; - }; - attr.$observe('min', function(val) { - minVal = parseObservedDateValue(val); - ctrl.$validate(); - }); - } - - if (isDefined(attr.max) || attr.ngMax) { - var maxVal; - ctrl.$validators.max = function(value) { - return !isValidDate(value) || isUndefined(maxVal) || parseDate(value) <= maxVal; - }; - attr.$observe('max', function(val) { - maxVal = parseObservedDateValue(val); - ctrl.$validate(); - }); - } - - function isValidDate(value) { - // Invalid Date: getTime() returns NaN - return value && !(value.getTime && value.getTime() !== value.getTime()); - } - - function parseObservedDateValue(val) { - return isDefined(val) ? (isDate(val) ? val : parseDate(val)) : undefined; - } - }; -} - -function badInputChecker(scope, element, attr, ctrl) { - var node = element[0]; - var nativeValidation = ctrl.$$hasNativeValidators = isObject(node.validity); - if (nativeValidation) { - ctrl.$parsers.push(function(value) { - var validity = element.prop(VALIDITY_STATE_PROPERTY) || {}; - // Detect bug in FF35 for input[email] (https://bugzilla.mozilla.org/show_bug.cgi?id=1064430): - // - also sets validity.badInput (should only be validity.typeMismatch). - // - see http://www.whatwg.org/specs/web-apps/current-work/multipage/forms.html#e-mail-state-(type=email) - // - can ignore this case as we can still read out the erroneous email... - return validity.badInput && !validity.typeMismatch ? undefined : value; - }); - } -} - -function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) { - badInputChecker(scope, element, attr, ctrl); - baseInputType(scope, element, attr, ctrl, $sniffer, $browser); - - ctrl.$$parserName = 'number'; - ctrl.$parsers.push(function(value) { - if (ctrl.$isEmpty(value)) return null; - if (NUMBER_REGEXP.test(value)) return parseFloat(value); - return undefined; - }); - - ctrl.$formatters.push(function(value) { - if (!ctrl.$isEmpty(value)) { - if (!isNumber(value)) { - throw $ngModelMinErr('numfmt', 'Expected `{0}` to be a number', value); - } - value = value.toString(); - } - return value; - }); - - if (attr.min || attr.ngMin) { - var minVal; - ctrl.$validators.min = function(value) { - return ctrl.$isEmpty(value) || isUndefined(minVal) || value >= minVal; - }; - - attr.$observe('min', function(val) { - if (isDefined(val) && !isNumber(val)) { - val = parseFloat(val, 10); - } - minVal = isNumber(val) && !isNaN(val) ? val : undefined; - // TODO(matsko): implement validateLater to reduce number of validations - ctrl.$validate(); - }); - } - - if (attr.max || attr.ngMax) { - var maxVal; - ctrl.$validators.max = function(value) { - return ctrl.$isEmpty(value) || isUndefined(maxVal) || value <= maxVal; - }; - - attr.$observe('max', function(val) { - if (isDefined(val) && !isNumber(val)) { - val = parseFloat(val, 10); - } - maxVal = isNumber(val) && !isNaN(val) ? val : undefined; - // TODO(matsko): implement validateLater to reduce number of validations - ctrl.$validate(); - }); - } -} - -function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) { - // Note: no badInputChecker here by purpose as `url` is only a validation - // in browsers, i.e. we can always read out input.value even if it is not valid! - baseInputType(scope, element, attr, ctrl, $sniffer, $browser); - stringBasedInputType(ctrl); - - ctrl.$$parserName = 'url'; - ctrl.$validators.url = function(modelValue, viewValue) { - var value = modelValue || viewValue; - return ctrl.$isEmpty(value) || URL_REGEXP.test(value); - }; -} - -function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) { - // Note: no badInputChecker here by purpose as `url` is only a validation - // in browsers, i.e. we can always read out input.value even if it is not valid! - baseInputType(scope, element, attr, ctrl, $sniffer, $browser); - stringBasedInputType(ctrl); - - ctrl.$$parserName = 'email'; - ctrl.$validators.email = function(modelValue, viewValue) { - var value = modelValue || viewValue; - return ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value); - }; -} - -function radioInputType(scope, element, attr, ctrl) { - // make the name unique, if not defined - if (isUndefined(attr.name)) { - element.attr('name', nextUid()); - } - - var listener = function(ev) { - if (element[0].checked) { - ctrl.$setViewValue(attr.value, ev && ev.type); - } - }; - - element.on('click', listener); - - ctrl.$render = function() { - var value = attr.value; - element[0].checked = (value == ctrl.$viewValue); - }; - - attr.$observe('value', ctrl.$render); -} - -function parseConstantExpr($parse, context, name, expression, fallback) { - var parseFn; - if (isDefined(expression)) { - parseFn = $parse(expression); - if (!parseFn.constant) { - throw minErr('ngModel')('constexpr', 'Expected constant expression for `{0}`, but saw ' + - '`{1}`.', name, expression); - } - return parseFn(context); - } - return fallback; -} - -function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter, $parse) { - var trueValue = parseConstantExpr($parse, scope, 'ngTrueValue', attr.ngTrueValue, true); - var falseValue = parseConstantExpr($parse, scope, 'ngFalseValue', attr.ngFalseValue, false); - - var listener = function(ev) { - ctrl.$setViewValue(element[0].checked, ev && ev.type); - }; - - element.on('click', listener); - - ctrl.$render = function() { - element[0].checked = ctrl.$viewValue; - }; - - // Override the standard `$isEmpty` because the $viewValue of an empty checkbox is always set to `false` - // This is because of the parser below, which compares the `$modelValue` with `trueValue` to convert - // it to a boolean. - ctrl.$isEmpty = function(value) { - return value === false; - }; - - ctrl.$formatters.push(function(value) { - return equals(value, trueValue); - }); - - ctrl.$parsers.push(function(value) { - return value ? trueValue : falseValue; - }); -} - - -/** - * @ngdoc directive - * @name textarea - * @restrict E - * - * @description - * HTML textarea element control with angular data-binding. The data-binding and validation - * properties of this element are exactly the same as those of the - * {@link ng.directive:input input element}. - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string=} name Property name of the form under which the control is published. - * @param {string=} required Sets `required` validation error key if the value is not entered. - * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to - * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of - * `required` when you want to data-bind to the `required` attribute. - * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than - * minlength. - * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than - * maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any - * length. - * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the - * RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for - * patterns defined as scope expressions. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input. - */ - - -/** - * @ngdoc directive - * @name input - * @restrict E - * - * @description - * HTML input element control. When used together with {@link ngModel `ngModel`}, it provides data-binding, - * input state control, and validation. - * Input control follows HTML5 input types and polyfills the HTML5 validation behavior for older browsers. - * - *
      - * **Note:** Not every feature offered is available for all input types. - * Specifically, data binding and event handling via `ng-model` is unsupported for `input[file]`. - *
      - * - * @param {string} ngModel Assignable angular expression to data-bind to. - * @param {string=} name Property name of the form under which the control is published. - * @param {string=} required Sets `required` validation error key if the value is not entered. - * @param {boolean=} ngRequired Sets `required` attribute if set to true - * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than - * minlength. - * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than - * maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any - * length. - * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the - * RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for - * patterns defined as scope expressions. - * @param {string=} ngChange Angular expression to be executed when input changes due to user - * interaction with the input element. - * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input. - * This parameter is ignored for input[type=password] controls, which will never trim the - * input. - * - * @example - - - -
      -
      - User name: - - Required!
      - Last name: - - Too short! - - Too long!
      -
      -
      - user = {{user}}
      - myForm.userName.$valid = {{myForm.userName.$valid}}
      - myForm.userName.$error = {{myForm.userName.$error}}
      - myForm.lastName.$valid = {{myForm.lastName.$valid}}
      - myForm.lastName.$error = {{myForm.lastName.$error}}
      - myForm.$valid = {{myForm.$valid}}
      - myForm.$error.required = {{!!myForm.$error.required}}
      - myForm.$error.minlength = {{!!myForm.$error.minlength}}
      - myForm.$error.maxlength = {{!!myForm.$error.maxlength}}
      -
      -
      - - var user = element(by.exactBinding('user')); - var userNameValid = element(by.binding('myForm.userName.$valid')); - var lastNameValid = element(by.binding('myForm.lastName.$valid')); - var lastNameError = element(by.binding('myForm.lastName.$error')); - var formValid = element(by.binding('myForm.$valid')); - var userNameInput = element(by.model('user.name')); - var userLastInput = element(by.model('user.last')); - - it('should initialize to model', function() { - expect(user.getText()).toContain('{"name":"guest","last":"visitor"}'); - expect(userNameValid.getText()).toContain('true'); - expect(formValid.getText()).toContain('true'); - }); - - it('should be invalid if empty when required', function() { - userNameInput.clear(); - userNameInput.sendKeys(''); - - expect(user.getText()).toContain('{"last":"visitor"}'); - expect(userNameValid.getText()).toContain('false'); - expect(formValid.getText()).toContain('false'); - }); - - it('should be valid if empty when min length is set', function() { - userLastInput.clear(); - userLastInput.sendKeys(''); - - expect(user.getText()).toContain('{"name":"guest","last":""}'); - expect(lastNameValid.getText()).toContain('true'); - expect(formValid.getText()).toContain('true'); - }); - - it('should be invalid if less than required min length', function() { - userLastInput.clear(); - userLastInput.sendKeys('xx'); - - expect(user.getText()).toContain('{"name":"guest"}'); - expect(lastNameValid.getText()).toContain('false'); - expect(lastNameError.getText()).toContain('minlength'); - expect(formValid.getText()).toContain('false'); - }); - - it('should be invalid if longer than max length', function() { - userLastInput.clear(); - userLastInput.sendKeys('some ridiculously long name'); - - expect(user.getText()).toContain('{"name":"guest"}'); - expect(lastNameValid.getText()).toContain('false'); - expect(lastNameError.getText()).toContain('maxlength'); - expect(formValid.getText()).toContain('false'); - }); - -
      - */ -var inputDirective = ['$browser', '$sniffer', '$filter', '$parse', - function($browser, $sniffer, $filter, $parse) { - return { - restrict: 'E', - require: ['?ngModel'], - link: { - pre: function(scope, element, attr, ctrls) { - if (ctrls[0]) { - (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrls[0], $sniffer, - $browser, $filter, $parse); - } - } - } - }; -}]; - -var VALID_CLASS = 'ng-valid', - INVALID_CLASS = 'ng-invalid', - PRISTINE_CLASS = 'ng-pristine', - DIRTY_CLASS = 'ng-dirty', - UNTOUCHED_CLASS = 'ng-untouched', - TOUCHED_CLASS = 'ng-touched', - PENDING_CLASS = 'ng-pending'; - -/** - * @ngdoc type - * @name ngModel.NgModelController - * - * @property {string} $viewValue Actual string value in the view. - * @property {*} $modelValue The value in the model that the control is bound to. - * @property {Array.} $parsers Array of functions to execute, as a pipeline, whenever - the control reads value from the DOM. The functions are called in array order, each passing - its return value through to the next. The last return value is forwarded to the - {@link ngModel.NgModelController#$validators `$validators`} collection. - -Parsers are used to sanitize / convert the {@link ngModel.NgModelController#$viewValue -`$viewValue`}. - -Returning `undefined` from a parser means a parse error occurred. In that case, -no {@link ngModel.NgModelController#$validators `$validators`} will run and the `ngModel` -will be set to `undefined` unless {@link ngModelOptions `ngModelOptions.allowInvalid`} -is set to `true`. The parse error is stored in `ngModel.$error.parse`. - - * - * @property {Array.} $formatters Array of functions to execute, as a pipeline, whenever - the model value changes. The functions are called in reverse array order, each passing the value through to the - next. The last return value is used as the actual DOM value. - Used to format / convert values for display in the control. - * ```js - * function formatter(value) { - * if (value) { - * return value.toUpperCase(); - * } - * } - * ngModel.$formatters.push(formatter); - * ``` - * - * @property {Object.} $validators A collection of validators that are applied - * whenever the model value changes. The key value within the object refers to the name of the - * validator while the function refers to the validation operation. The validation operation is - * provided with the model value as an argument and must return a true or false value depending - * on the response of that validation. - * - * ```js - * ngModel.$validators.validCharacters = function(modelValue, viewValue) { - * var value = modelValue || viewValue; - * return /[0-9]+/.test(value) && - * /[a-z]+/.test(value) && - * /[A-Z]+/.test(value) && - * /\W+/.test(value); - * }; - * ``` - * - * @property {Object.} $asyncValidators A collection of validations that are expected to - * perform an asynchronous validation (e.g. a HTTP request). The validation function that is provided - * is expected to return a promise when it is run during the model validation process. Once the promise - * is delivered then the validation status will be set to true when fulfilled and false when rejected. - * When the asynchronous validators are triggered, each of the validators will run in parallel and the model - * value will only be updated once all validators have been fulfilled. As long as an asynchronous validator - * is unfulfilled, its key will be added to the controllers `$pending` property. Also, all asynchronous validators - * will only run once all synchronous validators have passed. - * - * Please note that if $http is used then it is important that the server returns a success HTTP response code - * in order to fulfill the validation and a status level of `4xx` in order to reject the validation. - * - * ```js - * ngModel.$asyncValidators.uniqueUsername = function(modelValue, viewValue) { - * var value = modelValue || viewValue; - * - * // Lookup user by username - * return $http.get('/api/users/' + value). - * then(function resolved() { - * //username exists, this means validation fails - * return $q.reject('exists'); - * }, function rejected() { - * //username does not exist, therefore this validation passes - * return true; - * }); - * }; - * ``` - * - * @property {Array.} $viewChangeListeners Array of functions to execute whenever the - * view value has changed. It is called with no arguments, and its return value is ignored. - * This can be used in place of additional $watches against the model value. - * - * @property {Object} $error An object hash with all failing validator ids as keys. - * @property {Object} $pending An object hash with all pending validator ids as keys. - * - * @property {boolean} $untouched True if control has not lost focus yet. - * @property {boolean} $touched True if control has lost focus. - * @property {boolean} $pristine True if user has not interacted with the control yet. - * @property {boolean} $dirty True if user has already interacted with the control. - * @property {boolean} $valid True if there is no error. - * @property {boolean} $invalid True if at least one error on the control. - * @property {string} $name The name attribute of the control. - * - * @description - * - * `NgModelController` provides API for the {@link ngModel `ngModel`} directive. - * The controller contains services for data-binding, validation, CSS updates, and value formatting - * and parsing. It purposefully does not contain any logic which deals with DOM rendering or - * listening to DOM events. - * Such DOM related logic should be provided by other directives which make use of - * `NgModelController` for data-binding to control elements. - * Angular provides this DOM logic for most {@link input `input`} elements. - * At the end of this page you can find a {@link ngModel.NgModelController#custom-control-example - * custom control example} that uses `ngModelController` to bind to `contenteditable` elements. - * - * @example - * ### Custom Control Example - * This example shows how to use `NgModelController` with a custom control to achieve - * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`) - * collaborate together to achieve the desired result. - * - * Note that `contenteditable` is an HTML5 attribute, which tells the browser to let the element - * contents be edited in place by the user. This will not work on older browsers. - * - * We are using the {@link ng.service:$sce $sce} service here and include the {@link ngSanitize $sanitize} - * module to automatically remove "bad" content like inline event listener (e.g. ``). - * However, as we are using `$sce` the model can still decide to provide unsafe content if it marks - * that content using the `$sce` service. - * - * - - [contenteditable] { - border: 1px solid black; - background-color: white; - min-height: 20px; - } - - .ng-invalid { - border: 1px solid red; - } - - - - angular.module('customControl', ['ngSanitize']). - directive('contenteditable', ['$sce', function($sce) { - return { - restrict: 'A', // only activate on element attribute - require: '?ngModel', // get a hold of NgModelController - link: function(scope, element, attrs, ngModel) { - if (!ngModel) return; // do nothing if no ng-model - - // Specify how UI should be updated - ngModel.$render = function() { - element.html($sce.getTrustedHtml(ngModel.$viewValue || '')); - }; - - // Listen for change events to enable binding - element.on('blur keyup change', function() { - scope.$evalAsync(read); - }); - read(); // initialize - - // Write data to the model - function read() { - var html = element.html(); - // When we clear the content editable the browser leaves a
      behind - // If strip-br attribute is provided then we strip this out - if ( attrs.stripBr && html == '
      ' ) { - html = ''; - } - ngModel.$setViewValue(html); - } - } - }; - }]); -
      - -
      -
      Change me!
      - Required! -
      - -
      -
      - - it('should data-bind and become invalid', function() { - if (browser.params.browser == 'safari' || browser.params.browser == 'firefox') { - // SafariDriver can't handle contenteditable - // and Firefox driver can't clear contenteditables very well - return; - } - var contentEditable = element(by.css('[contenteditable]')); - var content = 'Change me!'; - - expect(contentEditable.getText()).toEqual(content); - - contentEditable.clear(); - contentEditable.sendKeys(protractor.Key.BACK_SPACE); - expect(contentEditable.getText()).toEqual(''); - expect(contentEditable.getAttribute('class')).toMatch(/ng-invalid-required/); - }); - - *
      - * - * - */ -var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate', '$timeout', '$rootScope', '$q', '$interpolate', - function($scope, $exceptionHandler, $attr, $element, $parse, $animate, $timeout, $rootScope, $q, $interpolate) { - this.$viewValue = Number.NaN; - this.$modelValue = Number.NaN; - this.$$rawModelValue = undefined; // stores the parsed modelValue / model set from scope regardless of validity. - this.$validators = {}; - this.$asyncValidators = {}; - this.$parsers = []; - this.$formatters = []; - this.$viewChangeListeners = []; - this.$untouched = true; - this.$touched = false; - this.$pristine = true; - this.$dirty = false; - this.$valid = true; - this.$invalid = false; - this.$error = {}; // keep invalid keys here - this.$$success = {}; // keep valid keys here - this.$pending = undefined; // keep pending keys here - this.$name = $interpolate($attr.name || '', false)($scope); - - - var parsedNgModel = $parse($attr.ngModel), - parsedNgModelAssign = parsedNgModel.assign, - ngModelGet = parsedNgModel, - ngModelSet = parsedNgModelAssign, - pendingDebounce = null, - ctrl = this; - - this.$$setOptions = function(options) { - ctrl.$options = options; - if (options && options.getterSetter) { - var invokeModelGetter = $parse($attr.ngModel + '()'), - invokeModelSetter = $parse($attr.ngModel + '($$$p)'); - - ngModelGet = function($scope) { - var modelValue = parsedNgModel($scope); - if (isFunction(modelValue)) { - modelValue = invokeModelGetter($scope); - } - return modelValue; - }; - ngModelSet = function($scope, newValue) { - if (isFunction(parsedNgModel($scope))) { - invokeModelSetter($scope, {$$$p: ctrl.$modelValue}); - } else { - parsedNgModelAssign($scope, ctrl.$modelValue); - } - }; - } else if (!parsedNgModel.assign) { - throw $ngModelMinErr('nonassign', "Expression '{0}' is non-assignable. Element: {1}", - $attr.ngModel, startingTag($element)); - } - }; - - /** - * @ngdoc method - * @name ngModel.NgModelController#$render - * - * @description - * Called when the view needs to be updated. It is expected that the user of the ng-model - * directive will implement this method. - * - * The `$render()` method is invoked in the following situations: - * - * * `$rollbackViewValue()` is called. If we are rolling back the view value to the last - * committed value then `$render()` is called to update the input control. - * * The value referenced by `ng-model` is changed programmatically and both the `$modelValue` and - * the `$viewValue` are different to last time. - * - * Since `ng-model` does not do a deep watch, `$render()` is only invoked if the values of - * `$modelValue` and `$viewValue` are actually different to their previous value. If `$modelValue` - * or `$viewValue` are objects (rather than a string or number) then `$render()` will not be - * invoked if you only change a property on the objects. - */ - this.$render = noop; - - /** - * @ngdoc method - * @name ngModel.NgModelController#$isEmpty - * - * @description - * This is called when we need to determine if the value of an input is empty. - * - * For instance, the required directive does this to work out if the input has data or not. - * - * The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`. - * - * You can override this for input directives whose concept of being empty is different to the - * default. The `checkboxInputType` directive does this because in its case a value of `false` - * implies empty. - * - * @param {*} value The value of the input to check for emptiness. - * @returns {boolean} True if `value` is "empty". - */ - this.$isEmpty = function(value) { - return isUndefined(value) || value === '' || value === null || value !== value; - }; - - var parentForm = $element.inheritedData('$formController') || nullFormCtrl, - currentValidationRunId = 0; - - /** - * @ngdoc method - * @name ngModel.NgModelController#$setValidity - * - * @description - * Change the validity state, and notify the form. - * - * This method can be called within $parsers/$formatters or a custom validation implementation. - * However, in most cases it should be sufficient to use the `ngModel.$validators` and - * `ngModel.$asyncValidators` collections which will call `$setValidity` automatically. - * - * @param {string} validationErrorKey Name of the validator. The `validationErrorKey` will be assigned - * to either `$error[validationErrorKey]` or `$pending[validationErrorKey]` - * (for unfulfilled `$asyncValidators`), so that it is available for data-binding. - * The `validationErrorKey` should be in camelCase and will get converted into dash-case - * for class name. Example: `myError` will result in `ng-valid-my-error` and `ng-invalid-my-error` - * class and can be bound to as `{{someForm.someControl.$error.myError}}` . - * @param {boolean} isValid Whether the current state is valid (true), invalid (false), pending (undefined), - * or skipped (null). Pending is used for unfulfilled `$asyncValidators`. - * Skipped is used by Angular when validators do not run because of parse errors and - * when `$asyncValidators` do not run because any of the `$validators` failed. - */ - addSetValidityMethod({ - ctrl: this, - $element: $element, - set: function(object, property) { - object[property] = true; - }, - unset: function(object, property) { - delete object[property]; - }, - parentForm: parentForm, - $animate: $animate - }); - - /** - * @ngdoc method - * @name ngModel.NgModelController#$setPristine - * - * @description - * Sets the control to its pristine state. - * - * This method can be called to remove the `ng-dirty` class and set the control to its pristine - * state (`ng-pristine` class). A model is considered to be pristine when the control - * has not been changed from when first compiled. - */ - this.$setPristine = function() { - ctrl.$dirty = false; - ctrl.$pristine = true; - $animate.removeClass($element, DIRTY_CLASS); - $animate.addClass($element, PRISTINE_CLASS); - }; - - /** - * @ngdoc method - * @name ngModel.NgModelController#$setDirty - * - * @description - * Sets the control to its dirty state. - * - * This method can be called to remove the `ng-pristine` class and set the control to its dirty - * state (`ng-dirty` class). A model is considered to be dirty when the control has been changed - * from when first compiled. - */ - this.$setDirty = function() { - ctrl.$dirty = true; - ctrl.$pristine = false; - $animate.removeClass($element, PRISTINE_CLASS); - $animate.addClass($element, DIRTY_CLASS); - parentForm.$setDirty(); - }; - - /** - * @ngdoc method - * @name ngModel.NgModelController#$setUntouched - * - * @description - * Sets the control to its untouched state. - * - * This method can be called to remove the `ng-touched` class and set the control to its - * untouched state (`ng-untouched` class). Upon compilation, a model is set as untouched - * by default, however this function can be used to restore that state if the model has - * already been touched by the user. - */ - this.$setUntouched = function() { - ctrl.$touched = false; - ctrl.$untouched = true; - $animate.setClass($element, UNTOUCHED_CLASS, TOUCHED_CLASS); - }; - - /** - * @ngdoc method - * @name ngModel.NgModelController#$setTouched - * - * @description - * Sets the control to its touched state. - * - * This method can be called to remove the `ng-untouched` class and set the control to its - * touched state (`ng-touched` class). A model is considered to be touched when the user has - * first focused the control element and then shifted focus away from the control (blur event). - */ - this.$setTouched = function() { - ctrl.$touched = true; - ctrl.$untouched = false; - $animate.setClass($element, TOUCHED_CLASS, UNTOUCHED_CLASS); - }; - - /** - * @ngdoc method - * @name ngModel.NgModelController#$rollbackViewValue - * - * @description - * Cancel an update and reset the input element's value to prevent an update to the `$modelValue`, - * which may be caused by a pending debounced event or because the input is waiting for a some - * future event. - * - * If you have an input that uses `ng-model-options` to set up debounced events or events such - * as blur you can have a situation where there is a period when the `$viewValue` - * is out of synch with the ngModel's `$modelValue`. - * - * In this case, you can run into difficulties if you try to update the ngModel's `$modelValue` - * programmatically before these debounced/future events have resolved/occurred, because Angular's - * dirty checking mechanism is not able to tell whether the model has actually changed or not. - * - * The `$rollbackViewValue()` method should be called before programmatically changing the model of an - * input which may have such events pending. This is important in order to make sure that the - * input field will be updated with the new model value and any pending operations are cancelled. - * - * - * - * angular.module('cancel-update-example', []) - * - * .controller('CancelUpdateController', ['$scope', function($scope) { - * $scope.resetWithCancel = function(e) { - * if (e.keyCode == 27) { - * $scope.myForm.myInput1.$rollbackViewValue(); - * $scope.myValue = ''; - * } - * }; - * $scope.resetWithoutCancel = function(e) { - * if (e.keyCode == 27) { - * $scope.myValue = ''; - * } - * }; - * }]); - * - * - *
      - *

      Try typing something in each input. See that the model only updates when you - * blur off the input. - *

      - *

      Now see what happens if you start typing then press the Escape key

      - * - *
      - *

      With $rollbackViewValue()

      - *
      - * myValue: "{{ myValue }}" - * - *

      Without $rollbackViewValue()

      - *
      - * myValue: "{{ myValue }}" - *
      - *
      - *
      - *
      - */ - this.$rollbackViewValue = function() { - $timeout.cancel(pendingDebounce); - ctrl.$viewValue = ctrl.$$lastCommittedViewValue; - ctrl.$render(); - }; - - /** - * @ngdoc method - * @name ngModel.NgModelController#$validate - * - * @description - * Runs each of the registered validators (first synchronous validators and then - * asynchronous validators). - * If the validity changes to invalid, the model will be set to `undefined`, - * unless {@link ngModelOptions `ngModelOptions.allowInvalid`} is `true`. - * If the validity changes to valid, it will set the model to the last available valid - * modelValue, i.e. either the last parsed value or the last value set from the scope. - */ - this.$validate = function() { - // ignore $validate before model is initialized - if (isNumber(ctrl.$modelValue) && isNaN(ctrl.$modelValue)) { - return; - } - - var viewValue = ctrl.$$lastCommittedViewValue; - // Note: we use the $$rawModelValue as $modelValue might have been - // set to undefined during a view -> model update that found validation - // errors. We can't parse the view here, since that could change - // the model although neither viewValue nor the model on the scope changed - var modelValue = ctrl.$$rawModelValue; - - // Check if the there's a parse error, so we don't unset it accidentially - var parserName = ctrl.$$parserName || 'parse'; - var parserValid = ctrl.$error[parserName] ? false : undefined; - - var prevValid = ctrl.$valid; - var prevModelValue = ctrl.$modelValue; - - var allowInvalid = ctrl.$options && ctrl.$options.allowInvalid; - - ctrl.$$runValidators(parserValid, modelValue, viewValue, function(allValid) { - // If there was no change in validity, don't update the model - // This prevents changing an invalid modelValue to undefined - if (!allowInvalid && prevValid !== allValid) { - // Note: Don't check ctrl.$valid here, as we could have - // external validators (e.g. calculated on the server), - // that just call $setValidity and need the model value - // to calculate their validity. - ctrl.$modelValue = allValid ? modelValue : undefined; - - if (ctrl.$modelValue !== prevModelValue) { - ctrl.$$writeModelToScope(); - } - } - }); - - }; - - this.$$runValidators = function(parseValid, modelValue, viewValue, doneCallback) { - currentValidationRunId++; - var localValidationRunId = currentValidationRunId; - - // check parser error - if (!processParseErrors(parseValid)) { - validationDone(false); - return; - } - if (!processSyncValidators()) { - validationDone(false); - return; - } - processAsyncValidators(); - - function processParseErrors(parseValid) { - var errorKey = ctrl.$$parserName || 'parse'; - if (parseValid === undefined) { - setValidity(errorKey, null); - } else { - setValidity(errorKey, parseValid); - if (!parseValid) { - forEach(ctrl.$validators, function(v, name) { - setValidity(name, null); - }); - forEach(ctrl.$asyncValidators, function(v, name) { - setValidity(name, null); - }); - return false; - } - } - return true; - } - - function processSyncValidators() { - var syncValidatorsValid = true; - forEach(ctrl.$validators, function(validator, name) { - var result = validator(modelValue, viewValue); - syncValidatorsValid = syncValidatorsValid && result; - setValidity(name, result); - }); - if (!syncValidatorsValid) { - forEach(ctrl.$asyncValidators, function(v, name) { - setValidity(name, null); - }); - return false; - } - return true; - } - - function processAsyncValidators() { - var validatorPromises = []; - var allValid = true; - forEach(ctrl.$asyncValidators, function(validator, name) { - var promise = validator(modelValue, viewValue); - if (!isPromiseLike(promise)) { - throw $ngModelMinErr("$asyncValidators", - "Expected asynchronous validator to return a promise but got '{0}' instead.", promise); - } - setValidity(name, undefined); - validatorPromises.push(promise.then(function() { - setValidity(name, true); - }, function(error) { - allValid = false; - setValidity(name, false); - })); - }); - if (!validatorPromises.length) { - validationDone(true); - } else { - $q.all(validatorPromises).then(function() { - validationDone(allValid); - }, noop); - } - } - - function setValidity(name, isValid) { - if (localValidationRunId === currentValidationRunId) { - ctrl.$setValidity(name, isValid); - } - } - - function validationDone(allValid) { - if (localValidationRunId === currentValidationRunId) { - - doneCallback(allValid); - } - } - }; - - /** - * @ngdoc method - * @name ngModel.NgModelController#$commitViewValue - * - * @description - * Commit a pending update to the `$modelValue`. - * - * Updates may be pending by a debounced event or because the input is waiting for a some future - * event defined in `ng-model-options`. this method is rarely needed as `NgModelController` - * usually handles calling this in response to input events. - */ - this.$commitViewValue = function() { - var viewValue = ctrl.$viewValue; - - $timeout.cancel(pendingDebounce); - - // If the view value has not changed then we should just exit, except in the case where there is - // a native validator on the element. In this case the validation state may have changed even though - // the viewValue has stayed empty. - if (ctrl.$$lastCommittedViewValue === viewValue && (viewValue !== '' || !ctrl.$$hasNativeValidators)) { - return; - } - ctrl.$$lastCommittedViewValue = viewValue; - - // change to dirty - if (ctrl.$pristine) { - this.$setDirty(); - } - this.$$parseAndValidate(); - }; - - this.$$parseAndValidate = function() { - var viewValue = ctrl.$$lastCommittedViewValue; - var modelValue = viewValue; - var parserValid = isUndefined(modelValue) ? undefined : true; - - if (parserValid) { - for (var i = 0; i < ctrl.$parsers.length; i++) { - modelValue = ctrl.$parsers[i](modelValue); - if (isUndefined(modelValue)) { - parserValid = false; - break; - } - } - } - if (isNumber(ctrl.$modelValue) && isNaN(ctrl.$modelValue)) { - // ctrl.$modelValue has not been touched yet... - ctrl.$modelValue = ngModelGet($scope); - } - var prevModelValue = ctrl.$modelValue; - var allowInvalid = ctrl.$options && ctrl.$options.allowInvalid; - ctrl.$$rawModelValue = modelValue; - if (allowInvalid) { - ctrl.$modelValue = modelValue; - writeToModelIfNeeded(); - } - ctrl.$$runValidators(parserValid, modelValue, viewValue, function(allValid) { - if (!allowInvalid) { - // Note: Don't check ctrl.$valid here, as we could have - // external validators (e.g. calculated on the server), - // that just call $setValidity and need the model value - // to calculate their validity. - ctrl.$modelValue = allValid ? modelValue : undefined; - writeToModelIfNeeded(); - } - }); - - function writeToModelIfNeeded() { - if (ctrl.$modelValue !== prevModelValue) { - ctrl.$$writeModelToScope(); - } - } - }; - - this.$$writeModelToScope = function() { - ngModelSet($scope, ctrl.$modelValue); - forEach(ctrl.$viewChangeListeners, function(listener) { - try { - listener(); - } catch (e) { - $exceptionHandler(e); - } - }); - }; - - /** - * @ngdoc method - * @name ngModel.NgModelController#$setViewValue - * - * @description - * Update the view value. - * - * This method should be called when an input directive want to change the view value; typically, - * this is done from within a DOM event handler. - * - * For example {@link ng.directive:input input} calls it when the value of the input changes and - * {@link ng.directive:select select} calls it when an option is selected. - * - * If the new `value` is an object (rather than a string or a number), we should make a copy of the - * object before passing it to `$setViewValue`. This is because `ngModel` does not perform a deep - * watch of objects, it only looks for a change of identity. If you only change the property of - * the object then ngModel will not realise that the object has changed and will not invoke the - * `$parsers` and `$validators` pipelines. - * - * For this reason, you should not change properties of the copy once it has been passed to - * `$setViewValue`. Otherwise you may cause the model value on the scope to change incorrectly. - * - * When this method is called, the new `value` will be staged for committing through the `$parsers` - * and `$validators` pipelines. If there are no special {@link ngModelOptions} specified then the staged - * value sent directly for processing, finally to be applied to `$modelValue` and then the - * **expression** specified in the `ng-model` attribute. - * - * Lastly, all the registered change listeners, in the `$viewChangeListeners` list, are called. - * - * In case the {@link ng.directive:ngModelOptions ngModelOptions} directive is used with `updateOn` - * and the `default` trigger is not listed, all those actions will remain pending until one of the - * `updateOn` events is triggered on the DOM element. - * All these actions will be debounced if the {@link ng.directive:ngModelOptions ngModelOptions} - * directive is used with a custom debounce for this particular event. - * - * Note that calling this function does not trigger a `$digest`. - * - * @param {string} value Value from the view. - * @param {string} trigger Event that triggered the update. - */ - this.$setViewValue = function(value, trigger) { - ctrl.$viewValue = value; - if (!ctrl.$options || ctrl.$options.updateOnDefault) { - ctrl.$$debounceViewValueCommit(trigger); - } - }; - - this.$$debounceViewValueCommit = function(trigger) { - var debounceDelay = 0, - options = ctrl.$options, - debounce; - - if (options && isDefined(options.debounce)) { - debounce = options.debounce; - if (isNumber(debounce)) { - debounceDelay = debounce; - } else if (isNumber(debounce[trigger])) { - debounceDelay = debounce[trigger]; - } else if (isNumber(debounce['default'])) { - debounceDelay = debounce['default']; - } - } - - $timeout.cancel(pendingDebounce); - if (debounceDelay) { - pendingDebounce = $timeout(function() { - ctrl.$commitViewValue(); - }, debounceDelay); - } else if ($rootScope.$$phase) { - ctrl.$commitViewValue(); - } else { - $scope.$apply(function() { - ctrl.$commitViewValue(); - }); - } - }; - - // model -> value - // Note: we cannot use a normal scope.$watch as we want to detect the following: - // 1. scope value is 'a' - // 2. user enters 'b' - // 3. ng-change kicks in and reverts scope value to 'a' - // -> scope value did not change since the last digest as - // ng-change executes in apply phase - // 4. view should be changed back to 'a' - $scope.$watch(function ngModelWatch() { - var modelValue = ngModelGet($scope); - - // if scope model value and ngModel value are out of sync - // TODO(perf): why not move this to the action fn? - if (modelValue !== ctrl.$modelValue) { - ctrl.$modelValue = ctrl.$$rawModelValue = modelValue; - - var formatters = ctrl.$formatters, - idx = formatters.length; - - var viewValue = modelValue; - while (idx--) { - viewValue = formatters[idx](viewValue); - } - if (ctrl.$viewValue !== viewValue) { - ctrl.$viewValue = ctrl.$$lastCommittedViewValue = viewValue; - ctrl.$render(); - - ctrl.$$runValidators(undefined, modelValue, viewValue, noop); - } - } - - return modelValue; - }); -}]; - - -/** - * @ngdoc directive - * @name ngModel - * - * @element input - * @priority 1 - * - * @description - * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a - * property on the scope using {@link ngModel.NgModelController NgModelController}, - * which is created and exposed by this directive. - * - * `ngModel` is responsible for: - * - * - Binding the view into the model, which other directives such as `input`, `textarea` or `select` - * require. - * - Providing validation behavior (i.e. required, number, email, url). - * - Keeping the state of the control (valid/invalid, dirty/pristine, touched/untouched, validation errors). - * - Setting related css classes on the element (`ng-valid`, `ng-invalid`, `ng-dirty`, `ng-pristine`, `ng-touched`, `ng-untouched`) including animations. - * - Registering the control with its parent {@link ng.directive:form form}. - * - * Note: `ngModel` will try to bind to the property given by evaluating the expression on the - * current scope. If the property doesn't already exist on this scope, it will be created - * implicitly and added to the scope. - * - * For best practices on using `ngModel`, see: - * - * - [Understanding Scopes](https://github.com/angular/angular.js/wiki/Understanding-Scopes) - * - * For basic examples, how to use `ngModel`, see: - * - * - {@link ng.directive:input input} - * - {@link input[text] text} - * - {@link input[checkbox] checkbox} - * - {@link input[radio] radio} - * - {@link input[number] number} - * - {@link input[email] email} - * - {@link input[url] url} - * - {@link input[date] date} - * - {@link input[datetime-local] datetime-local} - * - {@link input[time] time} - * - {@link input[month] month} - * - {@link input[week] week} - * - {@link ng.directive:select select} - * - {@link ng.directive:textarea textarea} - * - * # CSS classes - * The following CSS classes are added and removed on the associated input/select/textarea element - * depending on the validity of the model. - * - * - `ng-valid`: the model is valid - * - `ng-invalid`: the model is invalid - * - `ng-valid-[key]`: for each valid key added by `$setValidity` - * - `ng-invalid-[key]`: for each invalid key added by `$setValidity` - * - `ng-pristine`: the control hasn't been interacted with yet - * - `ng-dirty`: the control has been interacted with - * - `ng-touched`: the control has been blurred - * - `ng-untouched`: the control hasn't been blurred - * - `ng-pending`: any `$asyncValidators` are unfulfilled - * - * Keep in mind that ngAnimate can detect each of these classes when added and removed. - * - * ## Animation Hooks - * - * Animations within models are triggered when any of the associated CSS classes are added and removed - * on the input element which is attached to the model. These classes are: `.ng-pristine`, `.ng-dirty`, - * `.ng-invalid` and `.ng-valid` as well as any other validations that are performed on the model itself. - * The animations that are triggered within ngModel are similar to how they work in ngClass and - * animations can be hooked into using CSS transitions, keyframes as well as JS animations. - * - * The following example shows a simple way to utilize CSS transitions to style an input element - * that has been rendered as invalid after it has been validated: - * - *
      - * //be sure to include ngAnimate as a module to hook into more
      - * //advanced animations
      - * .my-input {
      - *   transition:0.5s linear all;
      - *   background: white;
      - * }
      - * .my-input.ng-invalid {
      - *   background: red;
      - *   color:white;
      - * }
      - * 
      - * - * @example - * - - - - Update input to see transitions when valid/invalid. - Integer is a valid value. -
      - -
      -
      - *
      - * - * ## Binding to a getter/setter - * - * Sometimes it's helpful to bind `ngModel` to a getter/setter function. A getter/setter is a - * function that returns a representation of the model when called with zero arguments, and sets - * the internal state of a model when called with an argument. It's sometimes useful to use this - * for models that have an internal representation that's different than what the model exposes - * to the view. - * - *
      - * **Best Practice:** It's best to keep getters fast because Angular is likely to call them more - * frequently than other parts of your code. - *
      - * - * You use this behavior by adding `ng-model-options="{ getterSetter: true }"` to an element that - * has `ng-model` attached to it. You can also add `ng-model-options="{ getterSetter: true }"` to - * a `
      `, which will enable this behavior for all ``s within it. See - * {@link ng.directive:ngModelOptions `ngModelOptions`} for more. - * - * The following example shows how to use `ngModel` with a getter/setter: - * - * @example - * - -
      - - Name: - - -
      user.name = 
      -
      -
      - - angular.module('getterSetterExample', []) - .controller('ExampleController', ['$scope', function($scope) { - var _name = 'Brian'; - $scope.user = { - name: function(newName) { - if (angular.isDefined(newName)) { - _name = newName; - } - return _name; - } - }; - }]); - - *
      - */ -var ngModelDirective = ['$rootScope', function($rootScope) { - return { - restrict: 'A', - require: ['ngModel', '^?form', '^?ngModelOptions'], - controller: NgModelController, - // Prelink needs to run before any input directive - // so that we can set the NgModelOptions in NgModelController - // before anyone else uses it. - priority: 1, - compile: function ngModelCompile(element) { - // Setup initial state of the control - element.addClass(PRISTINE_CLASS).addClass(UNTOUCHED_CLASS).addClass(VALID_CLASS); - - return { - pre: function ngModelPreLink(scope, element, attr, ctrls) { - var modelCtrl = ctrls[0], - formCtrl = ctrls[1] || nullFormCtrl; - - modelCtrl.$$setOptions(ctrls[2] && ctrls[2].$options); - - // notify others, especially parent forms - formCtrl.$addControl(modelCtrl); - - attr.$observe('name', function(newValue) { - if (modelCtrl.$name !== newValue) { - formCtrl.$$renameControl(modelCtrl, newValue); - } - }); - - scope.$on('$destroy', function() { - formCtrl.$removeControl(modelCtrl); - }); - }, - post: function ngModelPostLink(scope, element, attr, ctrls) { - var modelCtrl = ctrls[0]; - if (modelCtrl.$options && modelCtrl.$options.updateOn) { - element.on(modelCtrl.$options.updateOn, function(ev) { - modelCtrl.$$debounceViewValueCommit(ev && ev.type); - }); - } - - element.on('blur', function(ev) { - if (modelCtrl.$touched) return; - - if ($rootScope.$$phase) { - scope.$evalAsync(modelCtrl.$setTouched); - } else { - scope.$apply(modelCtrl.$setTouched); - } - }); - } - }; - } - }; -}]; - - -/** - * @ngdoc directive - * @name ngChange - * - * @description - * Evaluate the given expression when the user changes the input. - * The expression is evaluated immediately, unlike the JavaScript onchange event - * which only triggers at the end of a change (usually, when the user leaves the - * form element or presses the return key). - * - * The `ngChange` expression is only evaluated when a change in the input value causes - * a new value to be committed to the model. - * - * It will not be evaluated: - * * if the value returned from the `$parsers` transformation pipeline has not changed - * * if the input has continued to be invalid since the model will stay `null` - * * if the model is changed programmatically and not by a change to the input value - * - * - * Note, this directive requires `ngModel` to be present. - * - * @element input - * @param {expression} ngChange {@link guide/expression Expression} to evaluate upon change - * in input value. - * - * @example - * - * - * - *
      - * - * - *
      - * debug = {{confirmed}}
      - * counter = {{counter}}
      - *
      - *
      - * - * var counter = element(by.binding('counter')); - * var debug = element(by.binding('confirmed')); - * - * it('should evaluate the expression if changing from view', function() { - * expect(counter.getText()).toContain('0'); - * - * element(by.id('ng-change-example1')).click(); - * - * expect(counter.getText()).toContain('1'); - * expect(debug.getText()).toContain('true'); - * }); - * - * it('should not evaluate the expression if changing from model', function() { - * element(by.id('ng-change-example2')).click(); - - * expect(counter.getText()).toContain('0'); - * expect(debug.getText()).toContain('true'); - * }); - * - *
      - */ -var ngChangeDirective = valueFn({ - restrict: 'A', - require: 'ngModel', - link: function(scope, element, attr, ctrl) { - ctrl.$viewChangeListeners.push(function() { - scope.$eval(attr.ngChange); - }); - } -}); - - -var requiredDirective = function() { - return { - restrict: 'A', - require: '?ngModel', - link: function(scope, elm, attr, ctrl) { - if (!ctrl) return; - attr.required = true; // force truthy in case we are on non input element - - ctrl.$validators.required = function(modelValue, viewValue) { - return !attr.required || !ctrl.$isEmpty(viewValue); - }; - - attr.$observe('required', function() { - ctrl.$validate(); - }); - } - }; -}; - - -var patternDirective = function() { - return { - restrict: 'A', - require: '?ngModel', - link: function(scope, elm, attr, ctrl) { - if (!ctrl) return; - - var regexp, patternExp = attr.ngPattern || attr.pattern; - attr.$observe('pattern', function(regex) { - if (isString(regex) && regex.length > 0) { - regex = new RegExp('^' + regex + '$'); - } - - if (regex && !regex.test) { - throw minErr('ngPattern')('noregexp', - 'Expected {0} to be a RegExp but was {1}. Element: {2}', patternExp, - regex, startingTag(elm)); - } - - regexp = regex || undefined; - ctrl.$validate(); - }); - - ctrl.$validators.pattern = function(value) { - return ctrl.$isEmpty(value) || isUndefined(regexp) || regexp.test(value); - }; - } - }; -}; - - -var maxlengthDirective = function() { - return { - restrict: 'A', - require: '?ngModel', - link: function(scope, elm, attr, ctrl) { - if (!ctrl) return; - - var maxlength = -1; - attr.$observe('maxlength', function(value) { - var intVal = int(value); - maxlength = isNaN(intVal) ? -1 : intVal; - ctrl.$validate(); - }); - ctrl.$validators.maxlength = function(modelValue, viewValue) { - return (maxlength < 0) || ctrl.$isEmpty(modelValue) || (viewValue.length <= maxlength); - }; - } - }; -}; - -var minlengthDirective = function() { - return { - restrict: 'A', - require: '?ngModel', - link: function(scope, elm, attr, ctrl) { - if (!ctrl) return; - - var minlength = 0; - attr.$observe('minlength', function(value) { - minlength = int(value) || 0; - ctrl.$validate(); - }); - ctrl.$validators.minlength = function(modelValue, viewValue) { - return ctrl.$isEmpty(viewValue) || viewValue.length >= minlength; - }; - } - }; -}; - - -/** - * @ngdoc directive - * @name ngList - * - * @description - * Text input that converts between a delimited string and an array of strings. The default - * delimiter is a comma followed by a space - equivalent to `ng-list=", "`. You can specify a custom - * delimiter as the value of the `ngList` attribute - for example, `ng-list=" | "`. - * - * The behaviour of the directive is affected by the use of the `ngTrim` attribute. - * * If `ngTrim` is set to `"false"` then whitespace around both the separator and each - * list item is respected. This implies that the user of the directive is responsible for - * dealing with whitespace but also allows you to use whitespace as a delimiter, such as a - * tab or newline character. - * * Otherwise whitespace around the delimiter is ignored when splitting (although it is respected - * when joining the list items back together) and whitespace around each list item is stripped - * before it is added to the model. - * - * ### Example with Validation - * - * - * - * angular.module('listExample', []) - * .controller('ExampleController', ['$scope', function($scope) { - * $scope.names = ['morpheus', 'neo', 'trinity']; - * }]); - * - * - *
      - * List: - * - * Required! - *
      - * names = {{names}}
      - * myForm.namesInput.$valid = {{myForm.namesInput.$valid}}
      - * myForm.namesInput.$error = {{myForm.namesInput.$error}}
      - * myForm.$valid = {{myForm.$valid}}
      - * myForm.$error.required = {{!!myForm.$error.required}}
      - *
      - *
      - * - * var listInput = element(by.model('names')); - * var names = element(by.exactBinding('names')); - * var valid = element(by.binding('myForm.namesInput.$valid')); - * var error = element(by.css('span.error')); - * - * it('should initialize to model', function() { - * expect(names.getText()).toContain('["morpheus","neo","trinity"]'); - * expect(valid.getText()).toContain('true'); - * expect(error.getCssValue('display')).toBe('none'); - * }); - * - * it('should be invalid if empty', function() { - * listInput.clear(); - * listInput.sendKeys(''); - * - * expect(names.getText()).toContain(''); - * expect(valid.getText()).toContain('false'); - * expect(error.getCssValue('display')).not.toBe('none'); - * }); - * - *
      - * - * ### Example - splitting on whitespace - * - * - * - *
      {{ list | json }}
      - *
      - * - * it("should split the text by newlines", function() { - * var listInput = element(by.model('list')); - * var output = element(by.binding('list | json')); - * listInput.sendKeys('abc\ndef\nghi'); - * expect(output.getText()).toContain('[\n "abc",\n "def",\n "ghi"\n]'); - * }); - * - *
      - * - * @element input - * @param {string=} ngList optional delimiter that should be used to split the value. - */ -var ngListDirective = function() { - return { - restrict: 'A', - priority: 100, - require: 'ngModel', - link: function(scope, element, attr, ctrl) { - // We want to control whitespace trimming so we use this convoluted approach - // to access the ngList attribute, which doesn't pre-trim the attribute - var ngList = element.attr(attr.$attr.ngList) || ', '; - var trimValues = attr.ngTrim !== 'false'; - var separator = trimValues ? trim(ngList) : ngList; - - var parse = function(viewValue) { - // If the viewValue is invalid (say required but empty) it will be `undefined` - if (isUndefined(viewValue)) return; - - var list = []; - - if (viewValue) { - forEach(viewValue.split(separator), function(value) { - if (value) list.push(trimValues ? trim(value) : value); - }); - } - - return list; - }; - - ctrl.$parsers.push(parse); - ctrl.$formatters.push(function(value) { - if (isArray(value)) { - return value.join(ngList); - } - - return undefined; - }); - - // Override the standard $isEmpty because an empty array means the input is empty. - ctrl.$isEmpty = function(value) { - return !value || !value.length; - }; - } - }; -}; - - -var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/; -/** - * @ngdoc directive - * @name ngValue - * - * @description - * Binds the given expression to the value of `
      - - it('should load template defined inside script tag', function() { - element(by.css('#tpl-link')).click(); - expect(element(by.css('#tpl-content')).getText()).toMatch(/Content of the template/); - }); - - - */ -var scriptDirective = ['$templateCache', function($templateCache) { - return { - restrict: 'E', - terminal: true, - compile: function(element, attr) { - if (attr.type == 'text/ng-template') { - var templateUrl = attr.id, - text = element[0].text; - - $templateCache.put(templateUrl, text); - } - } - }; -}]; - -var ngOptionsMinErr = minErr('ngOptions'); -/** - * @ngdoc directive - * @name select - * @restrict E - * - * @description - * HTML `SELECT` element with angular data-binding. - * - * # `ngOptions` - * - * The `ngOptions` attribute can be used to dynamically generate a list of `