Skip to content

Commit

Permalink
## [2.2.2] - 2018-02-18
Browse files Browse the repository at this point in the history
### Added
- Menu validation [537](#537)
- Translation of notifications

### Changed
- Jquery load replace turbolink
  • Loading branch information
tabuna committed Feb 18, 2018
1 parent 2ebe10a commit 402f4ee
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 14 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [2.2.2] - 2018-02-18
### Added
- Menu validation [537](https://github.com/orchidsoftware/platform/issues/537)
- Translation of notifications

### Changed
- Jquery load replace turbolink

## [2.2.1] - 2018-02-16

Expand Down
3 changes: 3 additions & 0 deletions resources/lang/en/common.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
'title' => 'Dashboard Panel',
'description' => 'Welcome to ORCHID',

'notifications' => 'Notifications',
'no_notifications' => 'No notifications',

'Create' => 'Create',
'Delete' => 'Delete',
'Find' => 'Find',
Expand Down
5 changes: 5 additions & 0 deletions resources/lang/ru/common.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
'title' => 'Панель управления',
'description' => 'Добро пожаловать в ORCHID',

'notifications' => 'Уведомления',
'no_notifications' => 'Нет уведомлений',

'Create' => 'Создать',
'Delete' => 'Удалить',
'Find' => 'Найти',
Expand Down Expand Up @@ -48,4 +51,6 @@
'required' => 'Пожалуйста заполните поле.'
]



];
2 changes: 1 addition & 1 deletion resources/views/container/posts/filters/created.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class="form-control datetimepicker"
</div>

<script type="text/javascript">
$(function () {
document.addEventListener('turbolinks:load', function() {
$("#start_created_at").on("dp.change", function (e) {
$('#end_created_at').data("DateTimePicker").minDate(e.date);
});
Expand Down
2 changes: 1 addition & 1 deletion resources/views/container/posts/modules/base.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class="select2 form-control">


<script>
$(function () {
document.addEventListener('turbolinks:load', function() {
$('.select2-tags').select2({
templateResult: function formatState(state) {
if (!state.id || !state.count) {
Expand Down
2 changes: 1 addition & 1 deletion resources/views/fields/code.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@include('dashboard::partials.fields.hr', ['show' => $hr ?? true])
@push('scripts')
<script>
$(function () {
document.addEventListener('turbolinks:load', function() {
var editor{{$lang}}{{$slug}} = ace.edit('ace-code-block-{{$id}}');
editor{{$lang}}{{$slug}}.getSession().setMode('ace/mode/javascript');
editor{{$lang}}{{$slug}}.setTheme('ace/theme/monokai');
Expand Down
2 changes: 1 addition & 1 deletion resources/views/fields/list.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function removeitem{{$slug}}(item) {
})
}

$(function () {
document.addEventListener('turbolinks:load', function() {
$("#sortable-{{$slug}}").sortable({
placeholder: "ui-sortable-placeholder",
axis: "y",
Expand Down
2 changes: 1 addition & 1 deletion resources/views/fields/picture.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

@push('scripts')
<script>
$(function () {
document.addEventListener('turbolinks:load', function() {

var $cropPanel = $('#picture-crop-modal-{{$lang}}-{{$slug}} .upload-panel');
var $formGroup;
Expand Down
2 changes: 1 addition & 1 deletion resources/views/fields/place.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class="icon-location-pin"></i></button>
"status": false
};

$(function () {
document.addEventListener('turbolinks:load', function() {
if(!window.loadGoogleMaps.status) {
window.loadGoogleMaps.load();
}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/fields/relationship.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

@push('scripts')
<script>
$(function () {
document.addEventListener('turbolinks:load', function() {
$('#{{$id}}').select2({
theme: "bootstrap",
ajax: {
Expand Down
4 changes: 2 additions & 2 deletions resources/views/fields/simplemde.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
@include('dashboard::partials.fields.hr', ['show' => $hr ?? true])

@push('scripts')
<script>
$(function () {
<script>
document.addEventListener('turbolinks:load', function() {
dashboard.fields.simplemde.init("{{$id}}","{{$placeholder or ''}}");
});
</script>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/fields/tinymce.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

@push('scripts')
<script>
$(function () {
document.addEventListener('turbolinks:load', function() {
dashboard.fields.tinymce.init("{{$id}}","{{$theme or 'inlite'}}");
});
</script>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/partials/notifications.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
$notifications = Auth::user()->unreadNotifications->where('type',\Orchid\Platform\Notifications\DashboardNotification::class);
@endphp

<div class="tab-pane fade in nav show"
<div class="w-full tab-pane fade in nav show"
role="tabpanel"
id="menu-notifications"
aria-labelledby="notise-tab">

@if(count($notifications) > 0)
<li class="hidden-folded padder m-t m-b-sm text-muted text-xs">Notications
<li class="hidden-folded padder m-t m-b-sm text-muted text-xs">{{trans('dashboard::common.notifications')}}
<form action="{{route('dashboard.notification.read')}}"
method="post"
id="clear-notications-form"
Expand Down Expand Up @@ -40,7 +40,7 @@ class="pull-right">
@empty

<div class="v-center" style="height: 80vh;">
<h5 class="text-center w-full text-muted font-thin">No notifications</h5>
<h5 class="text-center w-full text-muted font-thin">{{trans('dashboard::common.no_notifications')}}</h5>
</div>

@endforelse
Expand Down
2 changes: 1 addition & 1 deletion src/Platform/Kernel/Dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Dashboard
/**
* ORCHID Version.
*/
const VERSION = '2.2.1';
const VERSION = '2.2.2';

/**
* @var
Expand Down

0 comments on commit 402f4ee

Please sign in to comment.