TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes, improvements to full screen rich editor

This commit is contained in:
Samuel Georges 2015-03-06 18:54:45 +11:00
parent 62796e08b6
commit 2cf8ad8c27
7 changed files with 298 additions and 1463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/backend/ServiceProvider.php
View File

@ -175,8 +175,9 @@ class ServiceProvider extends ModuleServiceProvider
$combiner->registerBundle('~/modules/backend/assets/js/october.js');
$combiner->registerBundle('~/modules/backend/assets/js/vendor/vendor.js');
$combiner->registerBundle('~/modules/backend/widgets/table/assets/js/build.js');
$combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/js/build.js');
$combiner->registerBundle('~/modules/backend/formwidgets/datepicker/assets/js/build.js');
$combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/less/richeditor.less');
$combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/js/build.js');
});
}

4
modules/backend/assets/js/october.popup.js
View File

@ -297,6 +297,10 @@
$.fn.popup.Constructor = Popup
$.popup = function (option) {
return $('<a />').popup(option)
}
// POPUP NO CONFLICT
// =================

2
modules/backend/assets/less/controls/common.less
View File

@ -41,5 +41,5 @@
background-image: url(../images/october-logo-transparent.svg);
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: 50% contain;
background-size: 50% auto;
}

2
modules/backend/formwidgets/Repeater.php
View File

@ -116,7 +116,7 @@ class Repeater extends FormWidgetBase
$config = $this->makeConfig($this->form);
$config->model = $this->model;
$config->data = array_get($loadValue, $index);
$config->data = array_get($loadValue, $index, []);
$config->alias = $this->alias . 'Form'.$index;
$config->arrayName = $this->formField->getName().'['.$index.']';

1709
modules/backend/formwidgets/richeditor/assets/css/richeditor.css
View File

File diff suppressed because one or more lines are too long

1
modules/backend/formwidgets/richeditor/assets/less/_figures.less
View File

@ -292,6 +292,7 @@
padding: 0 15px !important;
color: @dropdown-link-color !important;
text-decoration: none !important;
line-height: 25px;
&:hover,
&:focus {
color: @color-dropdown-hover-text !important;

40
modules/backend/formwidgets/richeditor/assets/less/richeditor.less
View File

@ -91,18 +91,9 @@
.redactor-editor {
border: none;
}
body .redactor-box-fullscreen {
background: @color-body-bg;
overflow-y: scroll !important;
width: 100%!important;
.redactor-editor {
background: #fff;
max-width: 960px;
margin: @richeditor-gutter auto !important;
padding: @richeditor-gutter;
}
font-size: 13px;
color: @input-color;
padding: 15px;
}
//
@ -115,17 +106,17 @@ body .redactor-box-fullscreen {
position: relative;
height: 100% !important;
width: 100% !important;
.border-radius(0)!important;
.border-radius(0) !important;
overflow: hidden;
.redactor-toolbar {
.border-radius(0)!important;
.border-radius(0) !important;
display: block;
border-bottom: none;
position: absolute;
top: 0;
width: 100%;
top: 0;
}
.redactor-editor, textarea {
@ -135,6 +126,7 @@ body .redactor-box-fullscreen {
bottom: 0;
position: absolute;
height: auto !important;
padding: 20px;
}
.redactor-editor {
@ -146,3 +138,21 @@ body .redactor-box-fullscreen {
}
}
}
//
// Full screen
//
body .redactor-box-fullscreen {
background: @color-body-bg;
overflow-y: scroll !important;
width: 100% !important;
.redactor-editor {
background: #fff;
max-width: 960px;
padding: 50px 30px !important;
margin: @richeditor-gutter auto !important;
padding: @richeditor-gutter;
top: 0 !important;
}
}