Kaydet (Commit) 38045fc6 authored tarafından ertansoftware's avatar ertansoftware

Merge branch 'master' of https://github.com/mertcelen/liman

# Conflicts:
#	app/Http/Controllers/PermissionController.php
#	public/js/liman.js
#	resources/views/layouts/app.blade.php
#	resources/views/modal.blade.php
#	resources/views/server/one.blade.php
#	routes/web.php
üst a61e4662
......@@ -148,3 +148,117 @@ body {
padding: 10px;
height: 500px; /* Should be removed. Only for demonstration */
}
li.dropdown {
list-style-type: none;
}
.dropdown a {
text-decoration: none;
}
.dropdown [data-toggle="dropdown"] {
position: relative;
display: block;
color: white;
background: #2980B9;
-moz-box-shadow: 0 1px 0 #409ad5 inset, 0 -1px 0 #20638f inset;
-webkit-box-shadow: 0 1px 0 #409ad5 inset, 0 -1px 0 #20638f inset;
box-shadow: 0 1px 0 #409ad5 inset, 0 -1px 0 #20638f inset;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
padding: 10px;
}
.dropdown [data-toggle="dropdown"]:hover {
background: #2c89c6;
}
.dropdown .icon-arrow {
position: absolute;
display: block;
font-size: 0.7em;
color: #fff;
top: 14px;
right: 10px;
}
.dropdown .icon-arrow.open {
-moz-transform: rotate(-180deg);
-ms-transform: rotate(-180deg);
-webkit-transform: rotate(-180deg);
transform: rotate(-180deg);
-moz-transition: -moz-transform 0.6s;
-o-transition: -o-transform 0.6s;
-webkit-transition: -webkit-transform 0.6s;
transition: transform 0.6s;
}
.dropdown .icon-arrow.close {
-moz-transform: rotate(0deg);
-ms-transform: rotate(0deg);
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
-moz-transition: -moz-transform 0.6s;
-o-transition: -o-transform 0.6s;
-webkit-transition: -webkit-transform 0.6s;
transition: transform 0.6s;
}
.dropdown .icon-arrow:before {
content: '\25BC';
}
.dropdown .dropdown-menu {
max-height: 0;
overflow: hidden;
list-style: none;
padding: 0;
margin: 0;
}
.dropdown .dropdown-menu li{
padding: 0;
display: block;
color: #6f6f6f;
background: #f6f6f6;
width: 100%;
-moz-box-shadow: 0 1px 0 white inset, 0 -1px 0 #d5d5d5 inset;
-webkit-box-shadow: 0 1px 0 white inset, 0 -1px 0 #d5d5d5 inset;
box-shadow: 0 1px 0 white inset, 0 -1px 0 #d5d5d5 inset;
text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.3);
padding: 10px 10px;
}
.dropdown .show, .dropdown .hide {
-moz-transform-origin: 50% 0%;
-ms-transform-origin: 50% 0%;
-webkit-transform-origin: 50% 0%;
transform-origin: 50% 0%;
}
.dropdown .show {
display: block;
max-height: 9999px;
-moz-transform: scaleY(1);
-ms-transform: scaleY(1);
-webkit-transform: scaleY(1);
transform: scaleY(1);
-moz-transition: max-height 1s ease-in-out;
-o-transition: max-height 1s ease-in-out;
-webkit-transition: max-height 1s ease-in-out;
transition: max-height 1s ease-in-out;
}
.dropdown .hide {
max-height: 0;
-moz-transform: scaleY(0);
-ms-transform: scaleY(0);
-webkit-transform: scaleY(0);
transform: scaleY(0);
-moz-transition: max-height 0.6s ease-out;
-o-transition: max-height 0.6s ease-out;
-webkit-transition: max-height 0.6s ease-out;
transition: max-height 0.6s ease-out;
}
.card {
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
transition: 0.3s;
width: 100%;
}
.card:hover {
box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
}
.container {
padding: 2px 16px;
}
@if(is_array($scripts))
@each('__system__.content',$scripts,'scripts')
@else
<td>{{$scripts->name}} </td>
<td>{{$scripts->description}}</td>
@endif
\ No newline at end of file
......@@ -3,3 +3,5 @@
@else
<a href="#" class="list-group-item list-group-item-action" onclick="details()">{{$file}}</a>
@endif
......@@ -3,8 +3,8 @@
{{__("Zone Ekle")}}
</button>
<div class="dropdown-menu">
<button class="dropdown-item" data-toggle="modal" data-target="#add_forward_zone">Forward Zone Ekle</a>
<button class="dropdown-item" data-toggle="modal" data-target="#add_reverse_zone">Reverse Zone Ekle</a>
<button class="dropdown-item" data-toggle="modal" data-target="#add_forward_zone">Forward Zone Ekle</button>
<button class="dropdown-item" data-toggle="modal" data-target="#add_reverse_zone">Reverse Zone Ekle</button>
</div>
</div>
......
......@@ -4,22 +4,48 @@
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h2>{{$extension->name}} Ayarları</h2>
</div>
<div class="row">
<div class="col-3">
<div class="list-group">
@each('__system__.dropdown',$files,'file')
</div>
<li class="dropdown">
<a href="#" data-toggle="dropdown">Files<i class="icon-arrow"></i></a>
<ul class="dropdown-menu">
<li>@each('__system__.dropdown',$files,'file')</li>
</ul>
</li>
</div>
<div class="col-9">
<div class="form-group">
<textarea class="form-control" id="exampleFormControlTextarea1" rows="25"></textarea>
<div class="card">
<buttton id="ekle"class="btn btn-success">ekle</buttton>
<table class="table">
<thead>
<tr>
<th scope="col">Script Adı</th>
<th scope="col">Script Description</th>
</tr>
</thead>
<tbody>
@each('__system__.content',$scripts,'scripts')
</tbody>
</table>
</div>
</div>
</div>
</div>
<script>
function details() {
$('.list-group-item').removeClass('active');$("#" + id).addClass('active')
//$('.list-group-item').removeClass('active');$("#" + id).addClass('active')
}
</script>
@include('modal',[
"id"=>"ekle",
"title" => "Betik Ekleme",
"url" => route('server_update'),
"next" => "reload",
"submit_text" => "Düzenle"
])
@endsection
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment