From 2ab61c2b4bdd03c068f654091469c25507933d62 Mon Sep 17 00:00:00 2001 From: larissafazza <73025368+larissafazza@users.noreply.github.com> Date: Thu, 11 Nov 2021 17:05:31 -0300 Subject: [PATCH 1/3] =?UTF-8?q?adiciona=20link=20do=20curr=C3=ADculo=20na?= =?UTF-8?q?=20sess=C3=A3o=20de=20cr=C3=A9ditos=20na=20tutorial=20blade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/lang/pt.json | 4 +++- resources/views/tutorial.blade.php | 17 +++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/resources/lang/pt.json b/resources/lang/pt.json index 53011e4c..4c8be3ab 100644 --- a/resources/lang/pt.json +++ b/resources/lang/pt.json @@ -489,6 +489,8 @@ "The number of datatypeproperties in your current ontology": "O número de propriedades de dado na sua ontologia atual", "General Information": "Informações Gerais", "Save the ontology first to see its IRI": "Salve a ontologia primeiro para poder ver o IRI", - "Untitled Ontology": "Ontologia não nomeada" + "Untitled Ontology": "Ontologia não nomeada", + + "Currently, the Onto4ALL team is composed of 8 people:":"Atualmente, o time é composto por 8 pessoas:" } diff --git a/resources/views/tutorial.blade.php b/resources/views/tutorial.blade.php index 8cc32f29..96b32529 100644 --- a/resources/views/tutorial.blade.php +++ b/resources/views/tutorial.blade.php @@ -548,6 +548,7 @@
{{__('Onto4All was developed by')}} Lucas Piazzi{{__(', as part of a Scientific Initiation project linked to the Computer Science Department of the Federal University of Juiz de Fora (UFJF), also composed of')}} Dr Fabrício Martins Mendonça{{__('(Project Advisor)')}}, Tiago Carvalho,Pedro Henrique Alves. +
{{__('Currently, the Onto4ALL team is composed of 8 people:')}}
@@ -557,10 +558,10 @@ - - - - + + + + @@ -569,10 +570,10 @@ - - - - + + + +
Eduardo Felipe
Fabrício
Mendonça		Lucas
Piazzi		Maurício
Almeida		Eduardo
Feipe		Fabrício
Mendonça		Lucas
Piazzi		Maurício
Almeida		Eduardo
Felipe
Jeanne EmygdioVinicius Corbelli
Jeanne
Emygdio		Larissa
Fazza		Guilherme
Noronha		Vinicius
Corbelli		Jeanne
Emygdio		Larissa
Fazza		Guilherme
Noronha		Vinicius
Corbelli
From 3c223651754821cbf7ce9bb1bad3d23df163a500 Mon Sep 17 00:00:00 2001 From: larissafazza <73025368+larissafazza@users.noreply.github.com> Date: Thu, 11 Nov 2021 17:05:57 -0300 Subject: [PATCH 2/3] conserta link do tutorial na navbar --- resources/views/vendor/adminlte/page.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/vendor/adminlte/page.blade.php b/resources/views/vendor/adminlte/page.blade.php index 43dfaaec..c44e4e58 100644 --- a/resources/views/vendor/adminlte/page.blade.php +++ b/resources/views/vendor/adminlte/page.blade.php @@ -127,7 +127,7 @@
  • - Tutorial + Tutorial
    {{__('Ontologies')}} From bddfe868bf65526f0b2d58a9621aefda93504105 Mon Sep 17 00:00:00 2001 From: larissafazza <73025368+larissafazza@users.noreply.github.com> Date: Thu, 12 May 2022 11:57:13 -0300 Subject: [PATCH 3/3] conserta select colaboradores --- public/css/admin-pages.css | 22 +++++++++++++++++++ public/grapheditor/styles/grapheditor.css | 21 ++++++++++++++++++ resources/lang/pt.json | 5 +++-- resources/views/index.blade.php | 9 ++++---- .../ontologies/ontologies-edit.blade.php | 7 +++++- 5 files changed, 57 insertions(+), 7 deletions(-) diff --git a/public/css/admin-pages.css b/public/css/admin-pages.css index a0a9c9cf..780e0303 100644 --- a/public/css/admin-pages.css +++ b/public/css/admin-pages.css @@ -42,4 +42,26 @@ .box-profile:focus .overlay { opacity: 1; +} + + +/*syling select 2 from collaborators in the edit blade menu*/ + + +.select2-container--classic.select2-container--open .select2-dropdown{ + height:30px; +} +.select2-container--classic .select2-results>.select2-results__options{ + height:30px; +} +.select2-container--classic .select2-results__option--highlighted.select2-results__option--selectable{ + background-color: #E4E4E4; + color: #333333; +} +.select2-container--classic .select2-results__option--highlighted.select2-results__option--selectable:hover{ + background-color: #064c72; + color: #eee; +} +.select2-container--classic.select2-container--open .select2-dropdown{ + border-color:#E4E4E4; } \ No newline at end of file diff --git a/public/grapheditor/styles/grapheditor.css b/public/grapheditor/styles/grapheditor.css index 1024ce4a..741a1bbc 100644 --- a/public/grapheditor/styles/grapheditor.css +++ b/public/grapheditor/styles/grapheditor.css @@ -1888,3 +1888,24 @@ div.picker { z-index: 10007; } margin:5px; } + +/*syling select 2 from collaborators in the edit blade menu*/ + + +.select2-container--classic.select2-container--open .select2-dropdown{ + height:30px; +} +.select2-container--classic .select2-results>.select2-results__options{ + height:30px; +} +.select2-container--classic .select2-results__option--highlighted.select2-results__option--selectable{ + background-color: #E4E4E4; + color: #333333; +} +.select2-container--classic .select2-results__option--highlighted.select2-results__option--selectable:hover{ + background-color: #064c72; + color: #eee; +} +.select2-container--classic.select2-container--open .select2-dropdown{ + border-color:#E4E4E4; +} diff --git a/resources/lang/pt.json b/resources/lang/pt.json index 289096de..ffef1632 100644 --- a/resources/lang/pt.json +++ b/resources/lang/pt.json @@ -463,8 +463,9 @@ "This editor is in beta testing, bugs can happen. We are working to implement new features and fix bugs, if you have any problem please contact us through the help menu.": "Este editor está em teste beta, podem ocorrer bugs. Estamos trabalhando para implementar novos recursos e corrigir bugs, se você tiver algum problema entre em contato conosco através do menu de ajuda.", "Collaborators": "Colaboradores", "You": "Você", - "Insert usernames to share your ontology with other Onto4ALL users": "Insira nomes de usuário para compartilhar sua ontologia com outros usuários Onto4ALL", - "Insert usernames here": "Insira os nomes de usário aqui", + "Insert the email accounts to share your ontology with other Onto4ALL users": "Insira os emails para compartilhar sua ontologia com outros usuários Onto4ALL", + "Insert email accounts here": "Insira o email dos usuários aqui", + "Search for the users":"Digite os emails dos usuários", "Collaborators will be able to edit this ontology": "Os colaboradores poderão editar esta ontologia", "Report": "Relatório", "Last Updated Ontology": "Última ontologia atualizada", diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index ac198d59..1008b694 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -109,7 +109,7 @@
    -
    +
    @@ -613,13 +613,14 @@
    - - {{__('Insert usernames to share your ontology with other Onto4ALL users')}} ({{__('Collaborators will be able to edit this ontology')}}) - + @foreach($users as $user) @if($user->id == Auth::user()->id) @else - + @endif @endforeach diff --git a/resources/views/ontologies/ontologies-edit.blade.php b/resources/views/ontologies/ontologies-edit.blade.php index c529bda0..6627870d 100644 --- a/resources/views/ontologies/ontologies-edit.blade.php +++ b/resources/views/ontologies/ontologies-edit.blade.php @@ -159,8 +159,13 @@ class="form-control">