conserta select colaboradores

Piazzi · May 12, 2022 · bddfe86 · bddfe86
1 parent 88a0200
commit bddfe86
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 7 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",

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>