Merge pull request #112 from Piazzi/larissa

Larissa
Piazzi · May 12, 2022 · ac7b19f · ac7b19f
2 parents a45d1c2 + bddfe86
commit ac7b19f
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 16 deletions.
diff --git 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;
 }
diff --git 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
@@ -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",
@@ -490,6 +491,8 @@
     "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",
+
+    "Currently, the Onto4ALL team is composed of 8 people:":"Atualmente, o time é composto por 8 pessoas:",
     "Chat with other collaborators of this ontology, messages are saved and can be read at any time between collaborators.": "Converse com outros colaboradores dessa ontologia, as mensagens são salvas e podem ser lidas a qualquer momento entre os colaboradores.",
     "Enter message...": "Digite a mensagem..."
 }

diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
@@ -109,7 +109,7 @@
             <div class="direct-chat-msg"></div>
         </div>
 
-        <div class="box-footer" style="">
+        <div class="box-footer">
             <form action="#" method="post" id='form_send_msg' autocomplete="off">
                 <div class="input-group">
                     <input type="text" name="message" id='message' autocomplete="off" placeholder="{{__('Enter message...')}}." class="form-control" disabled>
@@ -613,13 +613,14 @@
                 </div>
                 <div class="form-group">
                     <label>{{__('Collaborators')}}</label>
-                    <span>- {{__('Insert usernames to share your ontology with other Onto4ALL users')}}</span> <strong style="color: #761c19">({{__('Collaborators will be able to edit this ontology')}})</strong>
-                    <select data-placeholder="{{__('Insert usernames here')}}" id="collaborators-select" style="width: 100%; " class="js-example-basic-multiple" name="collaborators[]" multiple="multiple">
+                    <span>- {{__('Insert the email accounts to share your ontology with other Onto4ALL users')}}</span> <strong style="color: #761c19">({{__('Collaborators will be able to edit this ontology')}})</strong>
+                    <select data-placeholder="{{__('Insert email accounts here')}}" id="collaborators-select" style="width: 100%;" class="js-example-basic-multiple" name="collaborators[]" multiple="multiple">
+                        <option disabled style="color:#761c19" value="Disabled">{{__('Search for the users')}}</option>
                         @foreach($users as $user)
                         @if($user->id == Auth::user()->id)
                         <option value="{{$user->id}}" selected="selected" locked="locked">{{__('You')}}</option>
                         @else
-                        <option value="{{$user->id}}">{{$user->name}}</option>
+                        <option value="{{$user->id}}">{{$user->email}}</option>
                         @endif
                         @endforeach
                     </select>

diff --git a/resources/views/ontologies/ontologies-edit.blade.php b/resources/views/ontologies/ontologies-edit.blade.php
@@ -159,8 +159,13 @@ class="form-control">
                 <div class="form-group">
                     <label>{{__('Collaborators')}}</label>
                     <select id="collaborators-select" class="js-example-basic-multiple" name="collaborators[]" multiple="multiple">
+                        <option disabled style="color:#761c19" value="Disabled">{{__('Search for the users')}}</option>
                         @foreach($users as $user)
-                            <option @foreach($ontology->users as $collaborator) @if($collaborator->id == $user->id)selected @endif @endforeach value="{{$user->id}}" data-image="/storage/img/profile/profile_default.png">{{$user->name}}</option>
+                        @if($user->id == Auth::user()->id)
+                        <option value="{{$user->id}}" selected="selected" locked="locked">{{__('You')}}</option>
+                        @else
+                            <option @foreach($ontology->users as $collaborator) @if($collaborator->id == $user->id)selected @endif @endforeach value="{{$user->id}}" data-image="/storage/img/profile/profile_default.png">{{$user->email}}</option>
+                        @endif
                         @endforeach
                     </select>
                 </div>

diff --git a/resources/views/tutorial.blade.php b/resources/views/tutorial.blade.php
@@ -548,6 +548,7 @@
                     <dd>{{__('Onto4All was developed by')}} <a href="https://github.com/Piazzi/">Lucas Piazzi</a>{{__(', 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')}}
                         <a href="professorfabriciomendonca.com.br/">Dr Fabrício Martins Mendonça</a>{{__('(Project Advisor)')}},
                         <a href="https://github.com/carvalhotiago">Tiago Carvalho</a>,<a href="https://github.com/pedroalves4">Pedro Henrique Alves</a>.
+                        <dd>{{__('Currently, the Onto4ALL team is composed of 8 people:')}}
                     <div class="credits-section">
                         <table class="credits-table">
                             <tr>
@@ -557,10 +558,10 @@
                                 <td><img alt="Eduardo Felipe" src="{{asset('css/images/Landing-Page/Foto (4).png')}}"></td>
                             </tr>
                             <tr>
-                                <td>Fabrício<br>Mendonça</td>
-                                <td>Lucas<br>Piazzi</td>
-                                <td>Maurício<br>Almeida</td>
-                                <td>Eduardo<br>Feipe</td>
+                                <td><a href="https://www.linkedin.com/in/fabr%C3%ADcio-martins-mendon%C3%A7a-96a9a363/" target="_blank">Fabrício<br>Mendonça</a></td>
+                                <td><a href="https://www.linkedin.com/in/lucas-piazzi/" target="_blank" >Lucas<br>Piazzi</a></td>
+                                <td><a href="http://buscatextual.cnpq.br/buscatextual/visualizacv.do?id=K4736072J0&tokenCaptchar=03AGdBq25bgaGokp1PzAEdVTbO5iCQ_ejIXJQKBvhPuYqSLqIabmHgZlIud-EGU4onu_8Zsvhrcfg_ipOG8oU7WQctRjm7GcCJN0o2h4_Lr0H4nc8yWN-bpAdNMK1_P4VhyS4wxtiikTiPcRf7X2do-3oTwYchjh9Op2C8hNr9pEDpgFeo40Y9KjkSzZolLvQn3YU_xVIuFzT3b5h_6EJRrzw0w_UNDX3f2Whthk0eVUJ9SK_-A3QpmHrsqbSp1E1w655fkopURzkvM0PyltCPlZfacuGPSvMNDttiQZHG9aP3TEk0dnLY_8M3nDZad5oyzt8L1uVX62dlzMIEWvi9I04pTWdJbo3ZOcGbK_rrDyBtuY6NLvgzqia0-30xefOc1rVvPZPWH0mxcR6zdQbcHcbtufMjFVMfI427IcpxGijj6hXg42wZqpfZ2BiZ2jPsMgoPVjd0XcrnZpmHLqg5bIEh5lmagUbRpZX4BevqnQbOCYXrDyZmCrQNSlSr_NHh_LWyO-YY_K2JKoZmAMoI0IOKqO1BPCJkLg" target="_blank">Maurício<br>Almeida</a></td>
+                                <td><a href="http://buscatextual.cnpq.br/buscatextual/visualizacv.do?id=K4273313Y0&tokenCaptchar=03AGdBq25Qv2JKb1ZAQoxcXgvyyy-2BOeyQTk_K5XfIAsxDC2qKGXGfGHkgIZkNm5-y8JHpmMgInLZQRAHNcahyAmiSRHSzXk-HCEXxgjA9XPyCqrQj9BaCXVLC03OhwkhD5RmtmehObJs-VqxuDKJ5RB7Z80Agl6Xcj1QIVbMrS1Uu65I-J26DzmXrGjZR08dC-soqNMGpiOWs_ErNsUYLG9SdAJUoNNR3STVR0KMpcX0QVoE1VUurna9fqw7LDcxXnMGyzL4thQ3Dpn4J92O628fxwCoWWgZ-gz7K8XXtc1XtZOG7VOejQc0NubpuYZ3bbxpC-qoAdUHpdgw-soOuxAVXOchkEHAkdyvENXMMdcAh4wirrMeV0YmNJhUX0f9ZIGRkzq6Hn7RC78-31taBgqGqZy1IxlX_xtHD3YsEWtMY-792Za8ZqBYuWq9kpwoOKkg3ynZM56BniukseakG4KtIDgH-BaNu4h6UGjKnw0FI8lygeo-qWl72ZvL5SIezj2RGhNhENOQ3aK6OU0ZDjJrwOelA_NHcg" target="_blank">Eduardo<br>Felipe</a></td>
                             </tr>
                             <tr>
                                 <td><img alt="Jeanne Emygdio" src="{{asset('css/images/Landing-Page/Foto (5).png')}}"></td>
@@ -569,10 +570,10 @@
                                 <td><img alt="Vinicius Corbelli" src="{{asset('css/images/Landing-Page/Foto (8).png')}}"></td>
                             </tr>
                             <tr>
-                                <td>Jeanne<br>Emygdio</td>
-                                <td>Larissa<br>Fazza</td>
-                                <td>Guilherme<br>Noronha</td>
-                                <td>Vinicius<br>Corbelli</td>
+                                <td><a href="https://www.linkedin.com/in/jeannelouizeemygdio/" target="_blank">Jeanne<br>Emygdio</a></td>
+                                <td><a href="https://www.linkedin.com/in/larissa-rezende-fazza-8a9b28204/" target="_blank">Larissa<br>Fazza</a></td>
+                                <td><a href="https://www.linkedin.com/in/noronha2001/?locale=pt_BR" target="_blank">Guilherme<br>Noronha</a></td>
+                                <td><a href="https://www.linkedin.com/in/viniciuscorbelli/" target="_blank">Vinicius<br>Corbelli</a></td>
                             </tr>
                         </table>
                     </div>

diff --git a/resources/views/vendor/adminlte/page.blade.php b/resources/views/vendor/adminlte/page.blade.php
@@ -134,7 +134,7 @@
                                     <li class="user-body">
                                         <div class="row">
                                             <div class="col-xs-4 text-center border-right">
-                                                <a class="user-body-link" href="{{route('user.edit', ['user' => Auth::user()->id, 'locale' => app()->getLocale()])}}"> Tutorial</a>
+                                                <a class="user-body-link" href="{{route('tutorial', app()->getLocale())}}"> Tutorial</a>
                                             </div>
                                             <div class="col-xs-4 text-center border-right">
                                                 <a class="user-body-link" href="{{route('ontologies.index', app()->getLocale())}}">{{__('Ontologies')}}</a>