minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into module_blog

Browse Source
This commit is contained in:
Michal Kváček
2016-09-13 03:53:29 +02:00
parent f8127f3ed6 48c0abbe89
commit 5b29082ca6
8 changed files with 129 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/admin/css/vendor.css
Vendored
+21 -6
View File
@@ -9520,11 +9520,11 @@ pre code {
border-bottom-width: 2px;
}
.table-striped tbody tr:nth-of-type(odd) {
.table-striped tbody tr:nth-of-type(odd), .rows-striped .row:nth-of-type(odd) {
background-color: #F9F9F9;
}
.table-hover tbody tr:hover {
.table-hover tbody tr:hover, .rows-striped .row:hover {
background-color: #F5F5F5;
}
@@ -14168,7 +14168,7 @@ img {
}
.users-list img {
border-radius: 500px;
border-radius: 50%;
padding: 3px;
}
@@ -14191,7 +14191,6 @@ img {
.timeline > li {
position: relative;
}
.timeline > li:before,
@@ -14204,7 +14203,6 @@ img {
clear: both;
}
.timeline > li > .timeline-panel {
width: 46%;
float: left;
@@ -14250,7 +14248,7 @@ img {
top: 26px;
left: 50%;
margin-left: -14px;
background-color: #ddd;
background-color: #DDD;
z-index: 100;
border-radius: 50%;
}
@@ -14349,6 +14347,7 @@ img {
.ace-editor-container {
position: relative;
}
.ace-editor {
position: absolute !important;
width: 100%;
@@ -14367,4 +14366,20 @@ img {
.header-block img {
margin-right: 10px;
}
.truncate {
width: 90%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.bold {
font-weight: bold;
}
.p-tb-15 {
padding-top: 15px;
padding-bottom: 15px;
}
resources/assets/admin/js/app.js
+37 -21
View File
@@ -1346,7 +1346,6 @@ $ (function () {
});
$ (function () {
$ ("body").addClass ("loaded");
@@ -1364,7 +1363,6 @@ $ (function () {
}
});
/**
* Makes slug from input string
*
@@ -1401,24 +1399,45 @@ function slugify(text, trimSpaces) {
// bind some custom methods
$ (document).ready (function () {
$ ('.confirm').click (function () {
var confirmMessage = $ (this).data ('confirm-message');
var previousTitle, previousMessage;
// set some default message
if (typeof confirmMessage == 'undefined') {
confirmMessage = 'Really?';
}
$ ('.confirm').click (function (e) {
return confirm (confirmMessage);
var titleElement = $ ('#confirmation-title');
var messageElement = $ ('#confirmation-message');
previousTitle = titleElement.text ();
previousMessage = messageElement.text ();
var confirmTitle = $ (this).data ('title');
var confirmMessage = $ (this).data ('message');
var href = $ (this).attr ('href');
$ ('#confirm-button').attr ('href', href);
if (confirmTitle)
titleElement.text (confirmTitle);
if (confirmMessage)
messageElement.text (confirmMessage);
$ ('#confirm-modal').modal ('show');
e.preventDefault ();
});
$('#lockUrl').change(function () {
$ ('#confirm-modal').on ('hidden.bs.modal', function () {
$ ('#confirmation-title').text (previousTitle);
$ ('#confirmation-message').text (previousMessage);
});
$ ('#lockUrl').change (function () {
$ ('.slug-source').keyup ();
});
$ ('.slug-target').keyup (function () {
$ (this).val (slugify ($ (this).val (), false));
$('#lockUrl').prop('checked', true);
$ ('#lockUrl').prop ('checked', true);
});
$ ('.slug-source').keyup (function () {
@@ -1430,22 +1449,19 @@ $ (document).ready (function () {
target.val (slugify (source.val (), true));
});
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$ (function () {
$ ('[data-toggle="tooltip"]').tooltip ()
});
// find if any error occured and mark tab with that error
$('.has-error').each(function () {
var error = $(this);
var tabCard = error.closest('.tab-pane');
$ ('.has-error').each (function () {
var error = $ (this);
var tabCard = error.closest ('.tab-pane');
$("#"+tabCard.prop('id')+"-tab").addClass('tab-with-error');
$ ("#" + tabCard.prop ('id') + "-tab").addClass ('tab-with-error');
});
});
/***********************************************
* NProgress Settings
***********************************************/
resources/lang/cs/admin/common.php
+7 -3
View File
@@ -1,6 +1,10 @@
<?php
return [
"admin" => "Administrace",
"logout" => "Odhlášení",
"logoutSuccessfull" => "Odhlášení proběhlo úspěšně",
"admin" => "Administrace",
"confirmation" => "Opravdu chcete vykonat tuto akci?",
"confirmationTitle" => "Opravdu?",
"logout" => "Odhlášení",
"logoutSuccessfull" => "Odhlášení proběhlo úspěšně",
"no" => "Ne",
"yes" => "Ano",
];
resources/lang/en/admin/common.php
+5 -1
View File
@@ -2,5 +2,9 @@
return [
'admin' => 'Administration',
'logout' => 'Log out',
'logoutSuccessfull' => 'Logout was successfull.'
'logoutSuccessfull' => 'Logout was successfull.',
'yes' => 'Yes',
'no' => 'No',
'confirmationTitle' => 'Really?',
'confirmation' => 'Do you really want to perform this action?',
];
resources/views/admin/content/overview.blade.php
+39 -51
View File
@@ -4,9 +4,9 @@
@section('headerButtons')
@if($module)
<a href="{{route('content.new', ['moduleId' => $module->id])}}" class="btn btn-primary btn-sm rounded-s">
<i class="fa fa-plus"></i>
</a>
<a href="{{route('content.new', ['moduleId' => $module->id])}}" class="btn btn-primary btn-sm rounded-s">
<i class="fa fa-plus"></i>
</a>
@endif
@endsection
@@ -21,21 +21,19 @@
</div>
@endif
@if (count($pages))
<table class="table item-list full-width content-overview table-striped table-bordered table-hover">
<tr>
<th></th>
<th>@lang('admin/contents.title')</th>
<th>@lang('admin/contents.status')</th>
<th>@lang('admin/contents.moduleName')</th>
<th>@lang('admin/contents.createdAt')</th>
<th>@lang('admin/contents.actions')</th>
</tr>
<div class="item-list rows-striped">
<div class="row bold p-tb-15">
<div class="col-md-1 hidden-sm-down"></div>
<div class="col-xs-10 col-md-3 col-lg-4">@lang('admin/contents.title')</div>
<div class="col-lg-2 col-md-3 hidden-sm-down">@lang('admin/contents.status')</div>
<div class="col-lg-2 col-md-3 hidden-sm-down">@lang('admin/contents.moduleName')</div>
<div class="col-lg-2 hidden-md-down">@lang('admin/contents.createdAt')</div>
<div class="col-xs-2 col-lg-1">@lang('admin/contents.actions')</div>
</div>
@foreach($pages as $page)
<tr>
<td class="text-center with-placeholder">
<div class="row p-tb-15">
<div class="col-md-1 hidden-sm-down text-center with-placeholder">
<a href="{{route('content.edit', ['id' => $page->id])}}">
@if(!empty($page->title_photo))
<img src="@upload($page->title_photo)" class="placeholder" alt="{{$page->title}}" />
@@ -44,20 +42,20 @@
alt="{{$page->title}}" />
@endif
</a>
</td>
<td>
</div>
<div class="col-xs-10 col-md-3 col-lg-4">
<a href="{{route('content.edit', ['id' => $page->id])}}">
{{$page->title}}
</a>
</td>
<td>{{$statuses[$page->status]}}</td>
<td>
</div>
<div class="col-lg-2 col-md-3 hidden-sm-down">{{$statuses[$page->status]}}</div>
<div class="col-lg-2 col-md-3 hidden-sm-down">
<a href="{{route('content.overview', ['moduleId' => $page->module_id])}}">
{{trans($page->module_name)}}
</a>
</td>
<td>@date($page->created_at)</td>
<td class="text-center">
</div>
<div class="col-lg-2 hidden-md-down">@date($page->created_at)</div>
<div class="col-xs-2 col-lg-1 text-center">
<div class="item-actions-dropdown">
<a class="item-actions-toggle-btn">
<span class="inactive">
@@ -71,65 +69,54 @@
<ul class="item-actions-list">
@if(!$page->is_homepage)
<li>
<a href="{{route('content.setHomepage', ['id' => $page->id])}}"
class="button tiny success">
<a href="{{route('content.setHomepage', ['id' => $page->id])}}" data-toggle="tooltip" title="@lang('admin/contents.setHomepage')">
<i class="fa fa-home"></i>
{{--@lang('admin/contents.setHomepage')--}}
</a>
</li>
@endif
<li>
<a class="edit" href="{{route('content.edit', ['id' => $page->id])}}"
class="button tiny success">
<a class="edit" href="{{route('content.edit', ['id' => $page->id])}}" data-toggle="tooltip" title="@lang('admin/contents.editPlain')">
<i class="fa fa-pencil"></i>
{{-- @lang('admin/contents.editPlain')--}}
</a>
</li>
@if($page->status == \App\Models\Content::STATUS_DRAFT)
<li>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PUBLIC])}}"
class="button tiny success">
class="confirm" data-toggle="tooltip" title="@lang('admin/contents.makePublic')">
<i class="fa fa-eye"></i>
{{-- @lang('admin/contents.makePublic')--}}
</a>
</li>
<li>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PROTECTED])}}"
class="button tiny warning" data-toggle="modal"
data-target="#confirm-modal">
class="confirm" data-toggle="tooltip"
title="@lang('admin/contents.makeProtected')">
<i class="fa fa-lock"></i>
{{-- @lang('admin/contents.makeProtected')--}}
</a>
</li>
@else
<li>
<a href="{{route('page.content', ['url' => $page->url])}}" target="_blank"
class="button tiny secondary"><i class="fa fa-desktop"></i>
{{--@lang('admin/contents.viewPage')--}}
data-toggle="tooltip" title="@lang('admin/contents.viewPage')"
class="button tiny secondary"><i class="fa fa-globe"></i>
</a>
</li>
<li>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_DRAFT])}}"
class="button tiny warning confirm"><i
class="fa fa-eye-slash"></i>
{{--@lang('admin/contents.makeDraft')--}}
class="button tiny warning confirm" data-toggle="tooltip"
title="@lang('admin/contents.makeDraft')">
<i class="fa fa-eye-slash"></i>
</a>
</li>
@endif
<li>
<a class="remove" data-toggle="modal" data-target="#confirm-modal"
href="{{route('content.delete', ['id' => $page->id])}}"
class="button tiny alert confirm"><i
<a href="{{route('content.delete', ['id' => $page->id])}}"
class="button tiny alert remove confirm" data-toggle="tooltip" title="@lang('admin/contents.deletePage')"><i
class="fa fa-trash-o"></i>
{{--@lang('admin/contents.deletePage')--}}
</a>
</li>
@@ -139,16 +126,17 @@
{{--class="fa fa-trash-o "></i> </a>--}}
{{--</li>--}}
{{--<li>--}}
{{--<a class="edit" href="item-editor.html"> <i class="fa fa-pencil"></i> </a>--}}
{{--<a class="edit" href="{{route('content.edit', ['id' => $page->id])}}"> <i--}}
{{--class="fa fa-pencil"></i> </a>--}}
{{--</li>--}}
</ul>
</div>
</div>
</td>
</tr>
</div>
</div>
@endforeach
</table>
</div>
<div class="row">
{!! $pages->render() !!}
resources/views/admin/layout.blade.php
+13 -11
View File
@@ -53,27 +53,29 @@
<div class="modal fade" id="confirm-modal">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title"><i class="fa fa-warning"></i> Alert</h4> </div>
<h4 class="modal-title">
<i class="fa fa-warning"></i>
<span id="confirmation-title">@lang('admin/common.confirmationTitle')</span>
</h4>
</div>
<div class="modal-body">
<p>Are you sure want to do this?</p>
<p id="confirmation-message">@lang('admin/common.confirmation')</p>
</div>
<div class="modal-footer">
<a id="confirm-button" class="btn btn-primary">@lang('admin/common.yes')</a>
<button id="cancel-modal-button" type="button" class="btn btn-secondary" data-dismiss="modal">@lang('admin/common.no')</button>
</div>
<div class="modal-footer"> <button type="button" class="btn btn-primary" data-dismiss="modal">Yes</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">No</button> </div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
<div class="ref" id="ref">
<div class="color-primary"></div>
<div class="chart">
<div class="color-primary"></div>
<div class="color-secondary"></div>
</div>
</div>
<script src="{{asset('resources/assets/admin/js')}}/vendor.js"></script>
<script src="{{asset('resources/assets/admin/js')}}/app.js"></script>
@yield('javascripts')
resources/views/admin/layoutWithNavigation.blade.php
+1 -1
View File
@@ -156,7 +156,7 @@
<div class="footer-block author">
<ul>
<li>
&copy; {{date('Y')}} <a href="https://binarity.cz">binarity s.r.o.</a>
&copy; {{date('Y')}} <a href="https://www.binarity.cz">binarity s.r.o.</a>
</li>
<li>
<a href="https://github.com/modularcode">ModularCode</a>
resources/views/admin/userManagement/overview.blade.php
+6 -7
View File
@@ -12,15 +12,15 @@
@section('content')
<div class="row users-list">
@forelse($users as $user)
<div class="col-lg-4">
<div class="card card-default">
<div class="row card-block">
<div class="col-lg-4 text-center">
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 ">
<div class="card card-default ">
<div class="card-block truncate">
<div class="cl-xs-12 text-center">
<a href="{{route('users.edit', ['id' => $user->id])}}">
<img src="{{$user->gravatar(350)}}" alt="" />
<img src="{{$user->gravatar(100)}}" alt="" />
</a>
</div>
<div class="col-lg-8">
<div class="col-xs-12">
<ul>
<li><a href="{{route('users.edit', ['id' => $user->id])}}">{{$user->name}}</a></li>
<li>{{$user->email}}</li>
@@ -31,7 +31,6 @@
<div class="card-footer text-right">
<a href="{{route('users.edit', ['id' => $user->id])}}" class="btn btn-primary"><i
class="fa fa-pencil edit"></i></a>
<a href="#" class="btn btn-danger"><i class="fa fa-trash edit"></i></a>
</div>
</div>