Skip to content

Larissa #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Piazzi merged 3 commits into from
Oct 5, 2021
Merged

Larissa #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e9099e
Conserta erro no log out
larissafazza Oct 3, 2021
7ca8d15
corrige uso da navbar
larissafazza Oct 5, 2021
5131b22
Apaga input name do modal de editar ontologia
larissafazza Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions public/grapheditor/styles/grapheditor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,11 @@


/* --------------------------------------------ONTO4ALL------------------------------------------------------------*/
header {
pointer-events: none;
}

.sidebar-menu>li>a {
padding-right: 15px !important;
}

.logo, .navbar-custom-menu, .sidebar-toggle, .geMenubar {
pointer-events: all !important;
}


.gePaletteContainer, .geMenubarContainer {
padding-left: 52px !important;
Expand Down Expand Up @@ -99,7 +93,7 @@ header {

#ontology-name {
pointer-events: none;
color: #62a0bb;
color: #FFFFFF;
}
.toolbar-icon {
margin-right: 3px;
Expand Down Expand Up @@ -145,6 +139,9 @@ header {
border-radius: 15px;
padding: 3px !important;
margin: 2px;
text-align: right;
float: right;
margin-right: 250px;
}

.unsaved {
Expand Down Expand Up @@ -268,6 +265,7 @@ aside {
background-color:#ffffff;
font-size:0px;
outline:none;
margin-top: 50px;
}
.geMenubar, .geToolbar {
white-space:nowrap;
Expand Down Expand Up @@ -443,6 +441,7 @@ aside {
}
.geMenubarContainer, .geToolbarContainer, .geHsplit, .geVsplit {
background-color:#fbfbfb;
margin-top: 50px;
}
.geMenubar {
padding:0px 2px 0px 2px;
Expand Down Expand Up @@ -553,6 +552,7 @@ div.mxWindow .geButton {
overflow:hidden;
position:absolute;
overflow:auto;
margin-top: 50px;
}
.geTabContainer {
border-top:1px solid #e5e5e5;
Expand Down Expand Up @@ -632,6 +632,7 @@ div.mxWindow .geButton {
box-shadow:0 2px 6px 2px rgba(60,64,67,.15);
border-radius:6px;
_filter:progid:DXImageTransform.Microsoft.DropShadow(OffX=2, OffY=2, Color='#d5d5d5', Positive='true');
margin-top: 60px;
}
.geFooterContainer {
background:#e5e5e5;
Expand Down
2 changes: 1 addition & 1 deletion public/js/EditorFunctions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function setVisible(selector, visible) {

function buildMenu() {
// Append the extra Onto4all buttons in the toolbar
if(document.getElementsByClassName('geToolbar')[0].childElementCount < 22 || document.getElementsByClassName('geMenubar')[0].childElementCount < 8)
if(document.getElementsByClassName('geToolbar')[0].childElementCount < 22)
{
$(".geToolbar").append('<div class="geSeparator"> </div>');
$(".geToolbar").append(toolbarIcon);
Expand Down
8 changes: 4 additions & 4 deletions public/js/OntologyManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ document.addEventListener("DOMContentLoaded", function() {
editor.setGraphXml(doc.documentElement);
//console.log(data);
if(getLanguage() =='en')
ontologyName.innerHTML = '<i class="fa fa-fw fa-object-group"></i> Current Ontology:' + data['name'];
ontologyName.innerHTML = '<i class="fa fa-fw fa-object-group"></i> ' + data['name'];
else
ontologyName.innerHTML = '<i class="fa fa-fw fa-object-group"></i> Ontologia Atual:' + data['name'];
ontologyName.innerHTML = '<i class="fa fa-fw fa-object-group"></i> ' + data['name'];
document.getElementById('id').value = data['id'];
document.getElementById('name').value = data['name'];
document.getElementById('publication-date').value = data['publication_date'];
Expand Down Expand Up @@ -68,6 +68,7 @@ document.addEventListener("DOMContentLoaded", function() {
document.getElementById('save-ontology').innerHTML='<div class="overlay"><i style="color: white !important;" class="fa fa-refresh fa-spin"></i></div>';
document.getElementById('save-ontology').style.backgroundColor = "#00a65a";
document.getElementById('save-ontology').style.borderColor = "#00a65a";
document.getElementById('name').value = document.getElementById("ontology-name").textContent;
$.ajax({
/* the route pointing to the post function */
url: '/' + getLanguage() + '/updateOrCreate',
Expand Down Expand Up @@ -98,7 +99,7 @@ document.addEventListener("DOMContentLoaded", function() {
/* remind that 'data' is the response of the OntologyController */
success: function (data) {
updateSaveButtonInFrontEnd(true);
document.getElementById('ontology-name').innerHTML='<i class="fa fa-fw fa-object-group"></i> Current Ontology:'+ document.getElementById('name').value;
document.getElementById('ontology-name').innerHTML='<i class="fa fa-fw fa-object-group"></i> '+ document.getElementById('name').value;
document.getElementById('id').value=data['id'];
document.getElementById('title').textContent = document.getElementById('name').value + ' | Onto4ALL - Ontology Graphical Editor';
},
Expand All @@ -113,7 +114,6 @@ document.addEventListener("DOMContentLoaded", function() {

});


// Reads the current ontology XML and then writes the report on a string for download
document.addEventListener("DOMContentLoaded", function() {
document.getElementById('download-ontology-report').addEventListener('click', function () {
Expand Down
127 changes: 4 additions & 123 deletions resources/views/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,112 +7,6 @@
@stop

@section('content')
<div style="position:absolute; top:0; right:0;z-index:1000; background-color:#fbfbfb; width: 180px; " class="navbar-custom-menu">
<ul class="nav navbar-nav" style="float: right">
@php
$amount = Auth::user()->unreadNotifications->count();
@endphp
<li id="notifications-menu" class="dropdown notifications-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
<i class="fa fa-bell-o"></i>
<span id="notification-counter" class="label label-warning">{{$amount > 0 ? $amount : ''}}</span>
</a>
<ul class="dropdown-menu">
<li class="header">{{__('You have')}} {{$amount}} {{__('new notifications')}}</li>
<li>
<!-- inner menu: contains the actual data -->
<ul class="notification-menu menu">
@foreach(Auth::user()->notifications->take(5) as $notification)
<li>
<!-- start notification -->
<a href="{{route('notifications.show', ['locale' => app()->getLocale(), 'notificationId' => $notification->id, 'notificationType' => $notification->data['type']])}}">
<h5>
@if($notification->data['type'] == 'Onto4All Contact')
{{__('New message: ')}}
@endif
{{__($notification->data['title'])}}
<br>
<small>
<i class="fa fa-clock-o"><i> | </i></i>{{ date(" d-m-Y | H:i", strtotime($notification->created_at))}}
</small>
</h5>
</a>
</li>
@endforeach
</ul>
</li>
<li class="footer"><a href="{{route('notifications.index', app()->getLocale())}}">{{__('See all notifications')}}</a></li>
</ul>
</li>
<li class="dropdown user user-menu">
<!-- Menu Toggle Button -->
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
<!-- The user image in the navbar-->
<i class="fa fa-user"></i>
<!-- hidden-xs hides the username on small devices so only the image appears. -->
<span class="hidden-xs">{{Auth::user()->name}}</span>
</a>
<ul class="dropdown-menu">
<!-- The user image in the menu -->
<li class="user-header @if(Route::currentRouteName() == 'thesaurus-editor') thesauru-box @endif" style="background-color: #222d32;">
<img src="{{asset('css/images/LogoDark.png')}}" class="img-circle" alt="User Image">
<p>
{{Auth::user()->name}}
<small>{{Auth::user()->email}}</small>
</p>
</li>
<!-- Menu Body -->
<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>
</div>
<div class="col-xs-4 text-center border-right">
<a class="user-body-link" href="{{route('ontologies.index', app()->getLocale())}}">{{__('Ontologies')}}</a>
</div>
<div class="col-xs-4 text-center">
<a class="user-body-link" href="{{route('help', app()->getLocale())}}">{{__('Help')}}</a>
</div>
</div>
<!-- /.row -->
</li>
<!-- Menu Footer-->
<li class="user-footer">

<div class="pull-left">
<a href="{{route('user.edit', ['user' => Auth::user()->id, 'locale' => app()->getLocale()])}}" class="btn btn-default btn-flat">
<i class="fa fa-cog"></i> {{__('Account Settings')}}
</a>
</div>
<div class="pull-right">
<a class="btn btn-default btn-flat" href="#" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
<i class="fa fa-fw fa-power-off"></i> {{__('Log Out')}}
</a>
<form id="logout-form" action="{{ url(config('adminlte.logout_url', 'auth/logout')) }}" method="POST" style="display: none;">
@csrf
@if(config('adminlte.logout_method'))
{{ method_field(config('adminlte.logout_method')) }}
@endif
</form>
</div>

</li>
</ul>
</li>
<li>
<a id="control-sidebar" title="{{__('Show/Hide the Sidebar')}}" href="#" data-toggle="control-sidebar"><i class="fa fa-1.5x fa-fw fa-bars "></i></a>
</li>
@if(config('adminlte.right_sidebar') and (config('adminlte.layout') != 'top-nav'))
<!-- Control Sidebar Toggle Button -->
<li>
<a href="#" data-toggle="control-sidebar" @if(!config('adminlte.right_sidebar_slide')) data-controlsidebar-slide="false" @endif>
<i class="{{config('adminlte.right_sidebar_icon')}}"></i>
</a>
</li>
@endif
</ul>
</div>

<!-- Warning Console -->
<div id="warnings-console" class="box box-default box-solid direct-chat direct-chat-warning no-warnings collapsed-box">
Expand Down Expand Up @@ -571,15 +465,7 @@
<!-- ./Toolbar icons -->

<!-- Menubar Icons -->
<a id="open-ontology" class="geItem menubar-icon" data-toggle="modal" data-target="#ontology-manager">
{{__('Ontology Manager')}}
</a>
<a id="edit-ontology" class="geItem menubar-icon" data-toggle="modal" data-target="#edit-ontology-modal">
{{__('Edit Ontology')}}
</a>
<a id="ontology-name" class="geItem menubar-icon">
{{__('Current Ontology: None')}}
</a>

<a id="save-ontology" class="geItem btn btn-default unsaved menubar-icon">
<i class="fa fa-fw fa-cloud-upload"></i> {{__('Unsaved changes. Click here to save')}}
</a>
Expand All @@ -596,14 +482,9 @@
</div>
<div class="modal-body">
<input id="id" name="id" type="hidden">
<div class="row">
<div class="col-md-12">
<div class="form-group">
<label>{{__('Name')}}</label>
<input id="name" required value="{{__('New_Ontology')}}" name="name" type="text" class="form-control" placeholder="">
</div>
</div>
</div>
<input id="name" name="name" type="hidden">


<div class="row">
<div class="col-md-3">
<div class="form-group">
Expand Down
22 changes: 20 additions & 2 deletions resources/views/vendor/adminlte/page.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<b>Onto4ALL</b>
</span>
</a>
@if(Route::currentRouteName() !== 'home' && Route::currentRouteName() !== 'thesaurus-editor')
@if(Route::currentRouteName() !== 'thesaurus-editor')
<nav class="navbar navbar-static-top">
<!-- Sidebar toggle button-->
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
Expand All @@ -38,7 +38,25 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>

<!-- <div class="navbar-custom-menu"> -->
@if(Route::currentRouteName() == 'home')
<ul class="nav navbar-nav" style="font-size: 16px;">
<li contentEditable="true">
<a id="ontology-name" class="geItem">{{__('New Ontology')}}</a>
</li>
<li>
<a id="open-ontology" class="geItem" data-toggle="modal" data-target="#ontology-manager">
<i class="fa fa-fw fa-folder-open-o"></i>{{__(' Ontology Manager')}}
</a>
</li>
<li>
<a id="edit-ontology" class="geItem" data-toggle="modal" data-target="#edit-ontology-modal">
<i class="fa fa-fw fa-edit"></i>{{__(' Edit Ontology')}}
</a>
</li>
</ul>
@endif
<!-- </div> -->
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
@php
Expand Down
2 changes: 1 addition & 1 deletion routes/web.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
|
*/

Route::get('/logout', [LoginController::class, 'logout']);
Route::post('/logout', [LoginController::class, 'logout']);
Route::get('/', function () {
return redirect(app()->getLocale());
});
Expand Down