Merge branch 'customize-backend' into develop

This commit is contained in:
Sam Georges 2014-10-15 19:59:33 +11:00
commit cb8cad3a75
93 changed files with 2747 additions and 500 deletions

View File

@ -1,5 +1,6 @@
* **Build 15x** (2014-10-x)
- Added twig filters `|trans` for `Lang::get(...)` and `|transchoice` for `Lang::choice(...)`.
- `SettingsModel` behavior now uses a cached database query.
* **Build 153** (2014-10-09)
- Plugins are now updated in order of their dependency definitions.

View File

@ -37,15 +37,18 @@ class ServiceProvider extends ModuleServiceProvider
'label' => 'File uploader',
'alias' => 'fileupload'
]);
$manager->registerFormWidget('Backend\FormWidgets\Relation', [
'label' => 'Relationship',
'alias' => 'relation'
]);
$manager->registerFormWidget('Backend\FormWidgets\Datepicker', [
$manager->registerFormWidget('Backend\FormWidgets\DatePicker', [
'label' => 'Date picker',
'alias' => 'datepicker'
]);
$manager->registerFormWidget('Backend\FormWidgets\ColorPicker', [
'label' => 'Color picker',
'alias' => 'colorpicker'
]);
$manager->registerFormWidget('Backend\FormWidgets\DataGrid', [
'label' => 'Data Grid',
'alias' => 'datagrid'
@ -76,6 +79,14 @@ class ServiceProvider extends ModuleServiceProvider
*/
SettingsManager::instance()->registerCallback(function($manager){
$manager->registerSettingItems('October.Backend', [
'branding' => [
'label' => 'backend::lang.branding.menu_label',
'description' => 'backend::lang.branding.menu_description',
'category' => SettingsManager::CATEGORY_SYSTEM,
'icon' => 'icon-paint-brush',
'class' => 'Backend\Models\BrandSettings',
'order' => 500,
],
'editor' => [
'label' => 'backend::lang.editor.menu_label',
'description' => 'backend::lang.editor.menu_description',

View File

@ -8257,7 +8257,7 @@ body.mainmenu-open .mainmenu-collapsed ul {
padding: 13px;
display: block;
font-size: 12px;
color: #808b93;
color: rgba(255, 255, 255, 0.35);
font-weight: normal;
}
#layout-sidenav ul li a:hover {
@ -8268,7 +8268,7 @@ body.mainmenu-open .mainmenu-collapsed ul {
background: transparent;
}
#layout-sidenav ul li a i {
color: #808b93;
color: rgba(255, 255, 255, 0.35);
display: block;
margin-bottom: 5px;
font-size: 28px;
@ -8331,7 +8331,7 @@ body.mainmenu-open .mainmenu-collapsed ul {
top: 0;
height: 9px;
font-size: 10px;
color: #808b93;
color: rgba(255, 255, 255, 0.35);
}
#layout-sidenav .scroll-marker.before {
top: 0;
@ -8350,11 +8350,11 @@ body.mainmenu-open .mainmenu-collapsed ul {
}
#layout-sidenav.layout-sidenav ul.drag li:not(.active) a:hover,
.touch #layout-sidenav.layout-sidenav li:not(.active) a:hover {
color: #808b93 !important;
color: rgba(255, 255, 255, 0.35) !important;
}
#layout-sidenav.layout-sidenav ul.drag li:not(.active) a:hover i,
.touch #layout-sidenav.layout-sidenav li:not(.active) a:hover i {
color: #808b93 !important;
color: rgba(255, 255, 255, 0.35) !important;
}
#layout-sidenav.layout-sidenav ul.drag li:not(.active) a:hover:after,
.touch #layout-sidenav.layout-sidenav li:not(.active) a:hover:after {
@ -8418,7 +8418,7 @@ body.side-panel-fix-shadow #layout-side-panel {
border-top: 1px solid #dfdfdf;
}
#layout-footer .brand,
#layout-footer .motto {
#layout-footer .tagline {
margin: 10px;
height: 40px;
line-height: 40px;
@ -8430,10 +8430,10 @@ body.side-panel-fix-shadow #layout-side-panel {
#layout-footer .brand .logo {
margin: 0 10px;
}
#layout-footer .motto {
#layout-footer .tagline {
float: right;
}
#layout-footer .motto p {
#layout-footer .tagline p {
color: #999999;
}
body.outer {
@ -8451,16 +8451,16 @@ body.outer .layout > .layout-row.layout-head > .layout-cell {
box-sizing: border-box;
vertical-align: middle;
}
body.outer .layout > .layout-row.layout-head > .layout-cell h1 {
body.outer .layout > .layout-row.layout-head > .layout-cell h1.oc-logo-white {
font: 0/0 a;
color: transparent;
text-shadow: none;
background-color: transparent;
border: 0;
display: inline-block;
background: transparent url(../images/october-logo-text.png) no-repeat left top;
width: 404px;
height: 65px;
width: 100%;
max-width: 410px;
height: 72px;
}
body.outer .layout > .layout-row > .layout-cell {
vertical-align: middle;
@ -8513,10 +8513,10 @@ body.outer .layout > .layout-row > .layout-cell .outer-form-container .forgot-pa
top: 8px;
}
body.outer .layout > .layout-row > .layout-cell .outer-form-container .forgot-password a {
color: #8d969d;
color: rgba(255, 255, 255, 0.44);
}
body.outer .layout > .layout-row > .layout-cell .outer-form-container .forgot-password:before {
color: #8d969d;
color: rgba(255, 255, 255, 0.44);
font-size: 14px;
position: relative;
margin-right: 5px;
@ -11138,6 +11138,12 @@ html.cssanimations .cursor-loading-indicator.hide {
opacity: 1;
filter: alpha(opacity=100);
}
.oc-logo-white {
background-image: url(../images/october-logo-white.svg);
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: contain;
}
.oc-bg-logo {
background-image: url(../images/october-logo-transparent.svg);
background-position: 50% 50%;
@ -12644,7 +12650,7 @@ div.popover-overlay {
.fancy-layout.control-tabs.master:after {
top: 7px;
font-size: 14px;
color: #e39664;
color: rgba(255, 255, 255, 0.35);
}
.fancy-layout .control-tabs.master:before,
.fancy-layout.control-tabs.master:before {
@ -12688,7 +12694,7 @@ div.popover-overlay {
top: 4px;
right: 1px;
color: rgba(255, 255, 255, 0.3) !important;
font: 14px bold "Helvetica Neue", Helvetica, Arial, sans-seri8;
font: 14px bold "Helvetica Neue", Helvetica, Arial, sans-serif;
}
.fancy-layout .control-tabs.master > div > div.tabs-container > ul.nav-tabs > li span.tab-close i:hover,
.fancy-layout.control-tabs.master > div > div.tabs-container > ul.nav-tabs > li span.tab-close i:hover {
@ -12699,7 +12705,7 @@ div.popover-overlay {
border-bottom: none;
background: transparent;
font-size: 14px;
color: #e39664;
color: rgba(255, 255, 255, 0.35);
padding: 6px 0 0 0;
overflow: visible;
}
@ -13001,7 +13007,7 @@ div.popover-overlay {
}
.fancy-layout .form-tabless-fields label {
text-transform: uppercase;
color: #f4c69e;
color: rgba(255, 255, 255, 0.5);
margin-bottom: 0;
}
.fancy-layout .form-tabless-fields input[type=text] {
@ -13087,7 +13093,7 @@ div.popover-overlay {
.fancy-layout .form-tabless-fields .loading-indicator-container .loading-indicator {
background-color: #e67e22;
padding: 0 0 0 30px;
color: #f4c69e;
color: rgba(255, 255, 255, 0.5);
margin-top: 1px;
height: 90%;
font-size: 12px;
@ -13124,7 +13130,7 @@ div.popover-overlay {
filter: alpha(opacity=100);
}
.fancy-layout .field-codeeditor {
border: none!important;
border: none !important;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
@ -14432,7 +14438,7 @@ div[data-control="balloon-selector"]:not(.control-disabled) ul li:hover {
padding: 15px 15px 15px 40px;
background: #3d5265;
margin-bottom: 1px;
color: #808c8d;
color: rgba(255, 255, 255, 0.26);
text-decoration: none!important;
}
.sidenav-tree ul.top-level > li > ul li a:hover {
@ -14449,24 +14455,24 @@ div[data-control="balloon-selector"]:not(.control-disabled) ul li:hover {
line-height: 150%;
}
.sidenav-tree ul.top-level > li > ul li a span.header {
color: #cad5d8;
color: rgba(255, 255, 255, 0.74);
font-size: 14px;
margin-bottom: 5px;
}
.sidenav-tree ul.top-level > li > ul li a span.description {
color: #bdc3c7;
color: rgba(255, 255, 255, 0.64);
font-size: 12px;
font-weight: 100;
}
.sidenav-tree ul.top-level > li > ul li.active a {
background: #34495e;
color: #ecf0f1;
color: rgba(255, 255, 255, 0.91);
}
.sidenav-tree ul.top-level > li > ul li.active a:before {
content: ' ';
position: absolute;
width: 4px;
background: #e6802b;
background: #e67e22;
left: 0;
top: 0;
height: 100%;
@ -14475,7 +14481,7 @@ div[data-control="balloon-selector"]:not(.control-disabled) ul li:hover {
color: #ffffff;
}
.sidenav-tree ul.top-level > li > ul li.active a span.description {
color: #ecf0f1;
color: rgba(255, 255, 255, 0.91);
}
.sidenav-tree ul.top-level > li > ul li:last-child a {
margin-bottom: 0;
@ -14489,34 +14495,34 @@ div[data-control="balloon-selector"]:not(.control-disabled) ul li:hover {
@media (max-width: 768px) {
.sidenav-tree {
width: 100%;
height: auto!important;
display: block!important;
height: auto !important;
display: block !important;
}
.sidenav-tree > .layout {
display: none;
}
.sidenav-tree-root .sidenav-tree {
width: 100%!important;
height: 100%!important;
width: 100% !important;
height: 100% !important;
display: table-cell !important;
}
.sidenav-tree-root .sidenav-tree .back-link {
display: none!important;
display: none !important;
}
.sidenav-tree-root .sidenav-tree > .layout {
display: table!important;
display: table !important;
}
.sidenav-tree-root #layout-body {
display: none;
}
body.has-sidenav-tree .sidenav-tree .back-link {
display: block;
background: #2b3e50;
padding: 13px 15px;
background: #2b3e50;
color: #bdc3c7;
font-size: 14px;
text-transform: uppercase;
line-height: 14px;
text-transform: uppercase;
}
body.has-sidenav-tree .sidenav-tree .back-link i {
display: inline-block;
@ -14526,6 +14532,6 @@ div[data-control="balloon-selector"]:not(.control-disabled) ul li:hover {
text-decoration: none;
}
body.has-sidenav-tree #layout-body {
display: block!important;
display: block !important;
}
}

View File

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.0"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" viewBox="-5.208 -4.384 408 71" enable-background="new -5.208 -4.384 408 71"
xml:space="preserve">
<defs>
</defs>
<path fill="#FFFFFF" d="M111.401,42.425c-1.112,0-2.896,0.109-4.007,1.986c-0.441,0.744-0.816,1.564-1.631,2.516
c-1.481,1.727-3.297,3.045-5.44,3.952c-2.146,0.908-4.589,1.36-7.325,1.36c-2.766,0-5.23-0.452-7.385-1.36
c-2.162-0.907-3.98-2.226-5.462-3.952c-1.485-1.73-2.618-3.84-3.411-6.334c-0.789-2.489-1.185-5.306-1.185-8.444
c0-3.114,0.396-5.913,1.185-8.406c0.793-2.489,1.926-4.603,3.411-6.33c1.482-1.729,3.3-3.052,5.462-3.976
c2.155-0.922,4.619-1.383,7.385-1.383c2.736,0,5.179,0.461,7.325,1.383c2.143,0.924,3.959,2.247,5.44,3.976
c0.716,0.834,1.352,1.757,1.903,2.772c1.064,1.96,3.735,1.726,3.735,1.726h12.112c-0.248-0.817-0.505-1.63-0.817-2.422
c-1.538-3.918-3.702-7.318-6.497-10.198c-2.794-2.88-6.16-5.148-10.097-6.807C102.163,0.827,97.799,0,92.998,0
C88.2,0,83.827,0.82,79.876,2.462c-3.951,1.642-7.331,3.902-10.14,6.783c-2.811,2.884-4.981,6.28-6.521,10.197
c-0.092,0.235-0.173,0.476-0.26,0.713c-0.083-0.222-0.159-0.447-0.247-0.667c-1.562-3.918-3.757-7.318-6.594-10.198
c-2.835-2.879-6.251-5.147-10.248-6.807c-3.997-1.656-8.428-2.483-13.299-2.483c-4.87,0-9.308,0.819-13.319,2.461
c-4.01,1.642-7.439,3.903-10.29,6.784c-2.854,2.883-5.056,6.279-6.619,10.196C0.78,23.363,0,27.598,0,32.148
c0,4.553,0.78,8.787,2.34,12.705c1.563,3.917,3.765,7.324,6.619,10.218c2.851,2.894,6.28,5.162,10.29,6.804
c4.011,1.643,8.449,2.465,13.319,2.465c4.871,0,9.302-0.822,13.299-2.465c3.997-1.642,7.413-3.91,10.248-6.804
c2.837-2.894,5.032-6.301,6.594-10.218c0.091-0.228,0.169-0.46,0.255-0.689c0.084,0.229,0.162,0.462,0.251,0.689
c1.54,3.917,3.71,7.324,6.521,10.218c2.809,2.894,6.189,5.162,10.14,6.804c3.951,1.643,8.324,2.465,13.122,2.465
c4.801,0,9.165-0.822,13.104-2.465c3.937-1.642,7.303-3.91,10.097-6.804c2.795-2.894,4.959-6.301,6.497-10.218
c0.312-0.793,0.57-1.609,0.818-2.428H111.401z M48.981,40.593c-0.8,2.494-1.954,4.604-3.458,6.334
c-1.503,1.727-3.346,3.045-5.521,3.951c-2.178,0.909-4.657,1.361-7.434,1.361c-2.807,0-5.308-0.452-7.496-1.361
c-2.193-0.906-4.038-2.225-5.543-3.951c-1.506-1.73-2.657-3.84-3.462-6.334c-0.8-2.489-1.202-5.306-1.202-8.445
c0-3.113,0.402-5.912,1.202-8.405c0.805-2.489,1.956-4.603,3.462-6.329c1.505-1.73,3.35-3.053,5.543-3.977
c2.188-0.921,4.689-1.382,7.496-1.382c2.777,0,5.256,0.461,7.434,1.382c2.175,0.924,4.018,2.247,5.521,3.977
c1.504,1.726,2.658,3.84,3.458,6.329c0.802,2.493,1.204,5.292,1.204,8.405C50.185,35.288,49.783,38.104,48.981,40.593z"/>
<path fill="#FFFFFF" d="M208.964,32.148c0,4.553-0.784,8.787-2.341,12.705c-1.564,3.917-3.761,7.324-6.594,10.218
c-2.838,2.894-6.252,5.162-10.251,6.804c-3.996,1.643-8.427,2.465-13.299,2.465c-4.87,0-9.307-0.822-13.317-2.465
c-4.012-1.642-7.442-3.91-10.29-6.804c-2.856-2.894-5.059-6.301-6.62-10.218c-1.56-3.918-2.34-8.152-2.34-12.705
c0-4.55,0.78-8.785,2.34-12.706c1.561-3.917,3.764-7.313,6.62-10.196c2.848-2.881,6.278-5.142,10.29-6.784
c4.01-1.642,8.447-2.461,13.317-2.461c4.872,0,9.303,0.827,13.299,2.483c3.999,1.66,7.413,3.928,10.251,6.807
c2.833,2.88,5.029,6.28,6.594,10.198C208.18,23.406,208.964,27.626,208.964,32.148 M194.097,32.148c0-3.113-0.401-5.912-1.202-8.405
c-0.8-2.489-1.954-4.603-3.458-6.329c-1.504-1.73-3.347-3.053-5.521-3.977c-2.179-0.921-4.658-1.382-7.436-1.382
c-2.806,0-5.306,0.461-7.494,1.382c-2.195,0.924-4.04,2.247-5.544,3.977c-1.506,1.726-2.658,3.84-3.462,6.329
c-0.8,2.493-1.203,5.292-1.203,8.405c0,3.14,0.403,5.956,1.203,8.445c0.804,2.494,1.956,4.604,3.462,6.334
c1.504,1.727,3.349,3.045,5.544,3.951c2.188,0.909,4.688,1.361,7.494,1.361c2.778,0,5.257-0.452,7.436-1.361
c2.174-0.906,4.017-2.225,5.521-3.951c1.504-1.73,2.658-3.84,3.458-6.334C193.696,38.104,194.097,35.288,194.097,32.148"/>
<path fill="#FFFFFF" d="M210.603,63.648V0.69h23.159c4.351,0,8.053,0.405,11.104,1.21
c3.053,0.808,5.546,1.944,7.475,3.415c1.931,1.468,3.334,3.255,4.214,5.358c0.878,2.103,1.319,4.452,1.319,7.044
c0,1.41-0.204,2.77-0.606,4.082c-0.404,1.312-1.036,2.542-1.902,3.696c-0.864,1.15-1.971,2.193-3.326,3.133
c-1.354,0.935-2.982,1.748-4.885,2.44c4.151,1.01,7.217,2.645,9.208,4.906c1.985,2.262,2.979,5.161,2.979,8.705
c0,2.676-0.519,5.17-1.556,7.473c-1.037,2.307-2.558,4.314-4.557,6.031c-2.004,1.713-4.474,3.053-7.412,4.016
c-2.938,0.967-6.294,1.449-10.069,1.449H210.603z M225.208,27.178h7.604c1.612,0,3.066-0.114,4.365-0.343
c1.294-0.232,2.397-0.633,3.306-1.21c0.907-0.577,1.596-1.369,2.074-2.378c0.476-1.009,0.71-2.275,0.71-3.804
c0-1.494-0.185-2.742-0.56-3.738c-0.375-0.991-0.952-1.79-1.73-2.398c-0.775-0.605-1.765-1.034-2.958-1.294
c-1.197-0.26-2.614-0.39-4.256-0.39h-8.555V27.178z M225.208,36.944V52.63h10.279c1.931,0,3.511-0.246,4.735-0.734
c1.224-0.492,2.183-1.126,2.872-1.902c0.692-0.777,1.166-1.656,1.426-2.639c0.259-0.977,0.389-1.971,0.389-2.978
c0-1.153-0.15-2.19-0.452-3.112c-0.302-0.921-0.82-1.698-1.554-2.334c-0.736-0.634-1.711-1.123-2.921-1.471
c-1.21-0.344-2.735-0.517-4.578-0.517H225.208z"/>
<polygon fill="#FFFFFF" points="301.985,0.689 301.985,11.924 276.144,11.924 276.144,26.616 295.934,26.616
295.934,37.419 276.144,37.419 276.144,52.412 301.985,52.412 301.985,63.647 261.454,63.647 261.454,0.689 "/>
<path fill="#FFFFFF" d="M319.388,40.358v23.29h-14.604V0.689h20.481c4.549,0,8.431,0.472,11.646,1.407
c3.211,0.936,5.835,2.24,7.862,3.91c2.032,1.672,3.506,3.643,4.433,5.919c0.919,2.275,1.38,4.753,1.38,7.434
c0,2.046-0.274,3.973-0.823,5.787c-0.543,1.815-1.36,3.496-2.438,5.036c-1.08,1.54-2.406,2.915-3.975,4.126
c-1.572,1.211-3.38,2.203-5.426,2.98c0.98,0.492,1.896,1.098,2.745,1.814c0.848,0.721,1.592,1.6,2.229,2.637l13.393,21.908h-13.221
c-2.451,0-4.207-0.922-5.272-2.764l-10.457-18.279c-0.461-0.809-1.003-1.382-1.622-1.73c-0.617-0.344-1.491-0.517-2.611-0.517
H319.388z M319.388,30.291h5.877c1.985,0,3.679-0.253,5.076-0.756c1.397-0.506,2.544-1.203,3.437-2.097
c0.894-0.892,1.54-1.937,1.944-3.131c0.4-1.197,0.606-2.487,0.606-3.869c0-2.764-0.902-4.927-2.702-6.48
c-1.8-1.558-4.588-2.335-8.361-2.335h-5.877V30.291z"/>
<path fill="#FFFFFF" d="M127.329,0.689v25.243h-16.043c-1.452,0-2.628,1.128-2.628,2.517v7.438
c0,1.392,1.176,2.519,2.628,2.519h16.043v25.241h14.604V0.689H127.329z"/>
<path fill="#DB6B26" d="M400.482,30.821c-1.021-16.438-19.171-30.662-26.648-30.819
c-7.479-0.159-21.459,17.25-22.024,34.938c-0.53,16.585,13.818,27.958,19.996,29.401c0.172-7.803,0.805-36.532,0.911-39.882
c0.223-6.846,0.563-17.498,1.723-17.852c0.665-0.203,1.571,5.785,1.46,9.324c-0.023,0.675-0.031,2.862-0.031,5.966
c1.251-1.255,2.558-2.558,3.352-3.328c2.177-2.11,3.14-1.859,2.096,0.023c-0.643,1.158-3.408,5.008-5.441,7.798
c0.012,5.627,0.037,12.709,0.064,19.309c2.871-3.315,6.386-7.289,8.232-9.057c3.872-3.702,4.284-3.235,2.455,0.651
c-1.123,2.382-6.614,8.736-10.668,13.747c0.025,5.855,0.045,10.778,0.05,13.129C386.88,61.81,401.481,46.96,400.482,30.821"/>
</svg>

After

Width:  |  Height:  |  Size: 7.1 KiB

View File

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.0"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="408px" height="71px" viewBox="-5.208 -4.384 408 71" enable-background="new -5.208 -4.384 408 71"
xml:space="preserve">
<defs>
</defs>
<path fill="#596667" d="M111.401,42.425c-1.112,0-2.896,0.109-4.007,1.986c-0.441,0.744-0.816,1.564-1.631,2.516
c-1.481,1.727-3.297,3.045-5.44,3.952c-2.146,0.908-4.589,1.36-7.325,1.36c-2.766,0-5.23-0.452-7.385-1.36
c-2.162-0.907-3.98-2.226-5.462-3.952c-1.485-1.73-2.618-3.84-3.411-6.334c-0.789-2.489-1.185-5.306-1.185-8.444
c0-3.114,0.396-5.913,1.185-8.406c0.793-2.489,1.926-4.603,3.411-6.33c1.482-1.729,3.3-3.052,5.462-3.976
c2.155-0.922,4.619-1.383,7.385-1.383c2.736,0,5.179,0.461,7.325,1.383c2.143,0.924,3.959,2.247,5.44,3.976
c0.716,0.834,1.352,1.757,1.903,2.772c1.064,1.96,3.735,1.726,3.735,1.726h12.112c-0.248-0.817-0.505-1.63-0.817-2.422
c-1.538-3.918-3.702-7.318-6.497-10.198c-2.794-2.88-6.16-5.148-10.097-6.807C102.163,0.827,97.799,0,92.998,0
C88.2,0,83.827,0.82,79.876,2.462c-3.951,1.642-7.331,3.902-10.14,6.783c-2.811,2.884-4.981,6.28-6.521,10.197
c-0.092,0.235-0.173,0.476-0.26,0.713c-0.083-0.222-0.159-0.447-0.247-0.667c-1.562-3.918-3.757-7.318-6.594-10.198
c-2.835-2.879-6.251-5.147-10.248-6.807c-3.997-1.656-8.428-2.483-13.299-2.483c-4.87,0-9.308,0.819-13.319,2.461
c-4.01,1.642-7.439,3.903-10.29,6.784c-2.854,2.883-5.056,6.279-6.619,10.196C0.78,23.363,0,27.598,0,32.148
c0,4.553,0.78,8.787,2.34,12.705c1.563,3.917,3.765,7.324,6.619,10.218c2.851,2.894,6.28,5.162,10.29,6.804
c4.011,1.643,8.449,2.465,13.319,2.465c4.871,0,9.302-0.822,13.299-2.465c3.997-1.642,7.413-3.91,10.248-6.804
c2.837-2.894,5.032-6.301,6.594-10.218c0.091-0.228,0.169-0.46,0.255-0.689c0.084,0.229,0.162,0.462,0.251,0.689
c1.54,3.917,3.71,7.324,6.521,10.218c2.809,2.894,6.189,5.162,10.14,6.804c3.951,1.643,8.324,2.465,13.122,2.465
c4.801,0,9.165-0.822,13.104-2.465c3.937-1.642,7.303-3.91,10.097-6.804c2.795-2.894,4.959-6.301,6.497-10.218
c0.312-0.793,0.57-1.609,0.818-2.428H111.401z M48.981,40.593c-0.8,2.494-1.954,4.604-3.458,6.334
c-1.503,1.727-3.346,3.045-5.521,3.951c-2.178,0.909-4.657,1.361-7.434,1.361c-2.807,0-5.308-0.452-7.496-1.361
c-2.193-0.906-4.038-2.225-5.543-3.951c-1.506-1.73-2.657-3.84-3.462-6.334c-0.8-2.489-1.202-5.306-1.202-8.445
c0-3.113,0.402-5.912,1.202-8.405c0.805-2.489,1.956-4.603,3.462-6.329c1.505-1.73,3.35-3.053,5.543-3.977
c2.188-0.921,4.689-1.382,7.496-1.382c2.777,0,5.256,0.461,7.434,1.382c2.175,0.924,4.018,2.247,5.521,3.977
c1.504,1.726,2.658,3.84,3.458,6.329c0.802,2.493,1.204,5.292,1.204,8.405C50.185,35.288,49.783,38.104,48.981,40.593z"/>
<path fill="#596667" d="M208.964,32.148c0,4.553-0.784,8.787-2.341,12.705c-1.564,3.917-3.761,7.324-6.594,10.218
c-2.838,2.894-6.252,5.162-10.251,6.804c-3.996,1.643-8.427,2.465-13.299,2.465c-4.87,0-9.307-0.822-13.317-2.465
c-4.012-1.642-7.442-3.91-10.29-6.804c-2.856-2.894-5.059-6.301-6.62-10.218c-1.56-3.918-2.34-8.152-2.34-12.705
c0-4.55,0.78-8.785,2.34-12.706c1.561-3.917,3.764-7.313,6.62-10.196c2.848-2.881,6.278-5.142,10.29-6.784
c4.01-1.642,8.447-2.461,13.317-2.461c4.872,0,9.303,0.827,13.299,2.483c3.999,1.66,7.413,3.928,10.251,6.807
c2.833,2.88,5.029,6.28,6.594,10.198C208.18,23.406,208.964,27.626,208.964,32.148 M194.097,32.148c0-3.113-0.401-5.912-1.202-8.405
c-0.8-2.489-1.954-4.603-3.458-6.329c-1.504-1.73-3.347-3.053-5.521-3.977c-2.179-0.921-4.658-1.382-7.436-1.382
c-2.806,0-5.306,0.461-7.494,1.382c-2.195,0.924-4.04,2.247-5.544,3.977c-1.506,1.726-2.658,3.84-3.462,6.329
c-0.8,2.493-1.203,5.292-1.203,8.405c0,3.14,0.403,5.956,1.203,8.445c0.804,2.494,1.956,4.604,3.462,6.334
c1.504,1.727,3.349,3.045,5.544,3.951c2.188,0.909,4.688,1.361,7.494,1.361c2.778,0,5.257-0.452,7.436-1.361
c2.174-0.906,4.017-2.225,5.521-3.951c1.504-1.73,2.658-3.84,3.458-6.334C193.696,38.104,194.097,35.288,194.097,32.148"/>
<path fill="#596667" d="M210.603,63.648V0.69h23.159c4.351,0,8.053,0.405,11.104,1.21
c3.053,0.808,5.546,1.944,7.475,3.415c1.931,1.468,3.334,3.255,4.214,5.358c0.878,2.103,1.319,4.452,1.319,7.044
c0,1.41-0.204,2.77-0.606,4.082c-0.404,1.312-1.036,2.542-1.902,3.696c-0.864,1.15-1.971,2.193-3.326,3.133
c-1.354,0.935-2.982,1.748-4.885,2.44c4.151,1.01,7.217,2.645,9.208,4.906c1.985,2.262,2.979,5.161,2.979,8.705
c0,2.676-0.519,5.17-1.556,7.473c-1.037,2.307-2.558,4.314-4.557,6.031c-2.004,1.713-4.474,3.053-7.412,4.016
c-2.938,0.967-6.294,1.449-10.069,1.449H210.603z M225.208,27.178h7.604c1.612,0,3.066-0.114,4.365-0.343
c1.294-0.232,2.397-0.633,3.306-1.21c0.907-0.577,1.596-1.369,2.074-2.378c0.476-1.009,0.71-2.275,0.71-3.804
c0-1.494-0.185-2.742-0.56-3.738c-0.375-0.991-0.952-1.79-1.73-2.398c-0.775-0.605-1.765-1.034-2.958-1.294
c-1.197-0.26-2.614-0.39-4.256-0.39h-8.555V27.178z M225.208,36.944V52.63h10.279c1.931,0,3.511-0.246,4.735-0.734
c1.224-0.492,2.183-1.126,2.872-1.902c0.692-0.777,1.166-1.656,1.426-2.639c0.259-0.977,0.389-1.971,0.389-2.978
c0-1.153-0.15-2.19-0.452-3.112c-0.302-0.921-0.82-1.698-1.554-2.334c-0.736-0.634-1.711-1.123-2.921-1.471
c-1.21-0.344-2.735-0.517-4.578-0.517H225.208z"/>
<polygon fill="#596667" points="301.985,0.689 301.985,11.924 276.144,11.924 276.144,26.616 295.934,26.616
295.934,37.419 276.144,37.419 276.144,52.412 301.985,52.412 301.985,63.647 261.454,63.647 261.454,0.689 "/>
<path fill="#596667" d="M319.388,40.358v23.29h-14.604V0.689h20.481c4.549,0,8.431,0.472,11.646,1.407
c3.211,0.936,5.835,2.24,7.862,3.91c2.032,1.672,3.506,3.643,4.433,5.919c0.919,2.275,1.38,4.753,1.38,7.434
c0,2.046-0.274,3.973-0.823,5.787c-0.543,1.815-1.36,3.496-2.438,5.036c-1.08,1.54-2.406,2.915-3.975,4.126
c-1.572,1.211-3.38,2.203-5.426,2.98c0.98,0.492,1.896,1.098,2.745,1.814c0.848,0.721,1.592,1.6,2.229,2.637l13.393,21.908h-13.221
c-2.451,0-4.207-0.922-5.272-2.764l-10.457-18.279c-0.461-0.809-1.003-1.382-1.622-1.73c-0.617-0.344-1.491-0.517-2.611-0.517
H319.388z M319.388,30.291h5.877c1.985,0,3.679-0.253,5.076-0.756c1.397-0.506,2.544-1.203,3.437-2.097
c0.894-0.892,1.54-1.937,1.944-3.131c0.4-1.197,0.606-2.487,0.606-3.869c0-2.764-0.902-4.927-2.702-6.48
c-1.8-1.558-4.588-2.335-8.361-2.335h-5.877V30.291z"/>
<path fill="#596667" d="M127.329,0.689v25.243h-16.043c-1.452,0-2.628,1.128-2.628,2.517v7.438
c0,1.392,1.176,2.519,2.628,2.519h16.043v25.241h14.604V0.689H127.329z"/>
<path fill="#DB6B26" d="M400.482,30.821c-1.021-16.438-19.171-30.662-26.648-30.819
c-7.479-0.159-21.459,17.25-22.024,34.938c-0.53,16.585,13.818,27.958,19.996,29.401c0.172-7.803,0.805-36.532,0.911-39.882
c0.223-6.846,0.563-17.498,1.723-17.852c0.665-0.203,1.571,5.785,1.46,9.324c-0.023,0.675-0.031,2.862-0.031,5.966
c1.251-1.255,2.558-2.558,3.352-3.328c2.177-2.11,3.14-1.859,2.096,0.023c-0.643,1.158-3.408,5.008-5.441,7.798
c0.012,5.627,0.037,12.709,0.064,19.309c2.871-3.315,6.386-7.289,8.232-9.057c3.872-3.702,4.284-3.235,2.455,0.651
c-1.123,2.382-6.614,8.736-10.668,13.747c0.025,5.855,0.045,10.778,0.05,13.129C386.88,61.81,401.481,46.96,400.482,30.821"/>
</svg>

After

Width:  |  Height:  |  Size: 7.1 KiB

View File

@ -26,6 +26,17 @@
}
}
//
// Logos
//
.oc-logo-white {
background-image: url(../images/october-logo-white.svg);
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: contain;
}
.oc-bg-logo {
background-image: url(../images/october-logo-transparent.svg);
background-position: 50% 50%;

View File

@ -41,10 +41,10 @@
font-size: 14px;
color: @color-fancy-master-tabs-inactive-text;
}
&:before {left: 8px;}
&:after {right: 8px;}
&.scroll-before:before {color: @color-fancy-master-tabs-active-text;}
&.scroll-after:after {color: @color-fancy-master-tabs-active-text;}
&:before { left: 8px; }
&:after { right: 8px; }
&.scroll-before:before { color: @color-fancy-master-tabs-active-text; }
&.scroll-after:after { color: @color-fancy-master-tabs-active-text; }
> div > div.tabs-container {
background: @color-fancy-master-tabs-bg;
@ -65,12 +65,12 @@
i {
top: 4px;
right: 1px;
color: rgba(255, 255, 255, 0.3)!important;
font: 14px bold "Helvetica Neue", Helvetica, Arial, sans-seri8;
&:hover {color: @color-fancy-master-tabs-active-text!important;}
color: rgba(255, 255, 255, 0.3) !important;
font: 14px bold "Helvetica Neue", Helvetica, Arial, sans-serif;
&:hover { color: @color-fancy-master-tabs-active-text !important; }
}
}
a {
@ -126,7 +126,7 @@
z-index: 107;
color: @color-fancy-master-tabs-active-text;
}
span.tab-close i {color: @color-fancy-master-tabs-active-text;}
span.tab-close i { color: @color-fancy-master-tabs-active-text; }
a > span.title {
background-color: @color-fancy-form-tabless-fields-bg;
@ -142,17 +142,17 @@
}
}
&[data-modified] {
span.tab-close i {
top: 4px;
.hide-text();
&[data-modified] {
span.tab-close i {
top: 4px;
.hide-text();
&:before {
.icon(@circle);
font-size: 9px;
}
&:before {
.icon(@circle);
font-size: 9px;
}
}
}
&:first-child {
margin-left: 0;
@ -437,8 +437,8 @@
// Code editor
//
.field-codeeditor {
border: none!important;
.field-codeeditor {
border: none !important;
.border-radius(0);
.editor-code {

View File

@ -42,6 +42,7 @@
a:hover {
background: @color-list-hover;
}
&.active a {
background: @color-list-active;
position: relative;
@ -100,7 +101,7 @@
position: relative;
outline: none;
&:hover {background: transparent;}
&:hover { background: transparent; }
&:before, &:after {
width: 10px;
@ -134,14 +135,16 @@
padding-left: 52px;
}
> li.group {padding-left: 20px;}
> li.group {
padding-left: 20px;
}
.listPaddings(10);
}
&[data-status=collapsed] {
> h4 a:before, > div.group > h4 a:before {
.transform( ~'rotate(0deg) translate(3px, 0)' );
.transform(~'rotate(0deg) translate(3px, 0)');
}
& > ul, & > div.subitems {
@ -214,11 +217,10 @@
background-color: @color-list-active;
}
&:before {top: -1px;}
&:after {bottom: -1px;}
&:before { top: -1px; }
&:after { bottom: -1px; }
}
}
}
}

View File

@ -20,10 +20,10 @@
background: #2b3e50!important;
}
ul.top-level > li {
ul.top-level > li {
&[data-status=collapsed] {
> div.group h3:before {
.transform( ~'rotate(0deg) translate(3px, 0)' );
.transform(~'rotate(0deg) translate(3px, 0)');
}
ul {
@ -55,7 +55,7 @@
top: 15px;
color: @color-list-arrow;
.icon(@caret-right);
.transform( ~'rotate(90deg) translate(5px, 0)' );
.transform(~'rotate(90deg) translate(5px, 0)');
.transition(all 0.1s ease);
}
}
@ -137,16 +137,14 @@
.back-link {
display: none;
}
}
@media (max-width: @screen-sm) {
.sidenav-tree {
width: 100%;
height: auto!important;
display: block!important;
height: auto !important;
display: block !important;
> .layout {
display: none;
@ -155,16 +153,16 @@
.sidenav-tree-root {
.sidenav-tree {
width: 100%!important;
height: 100%!important;
display: table-cell!important;
width: 100% !important;
height: 100% !important;
display: table-cell !important;
.back-link {
display: none!important;
display: none !important;
}
> .layout {
display: table!important;
display: table !important;
}
}
@ -177,12 +175,12 @@
.sidenav-tree {
.back-link {
display: block;
background: @color-sidebarnav-back-link-bg;
padding: 13px 15px;
background: @color-sidebarnav-back-link-bg;
color: @color-sidebarnav-back-link-text;
font-size: 14px;
text-transform: uppercase;
line-height: 14px;
text-transform: uppercase;
i {
display: inline-block;
margin-right: 10px;
@ -194,7 +192,7 @@
}
#layout-body {
display: block!important;
display: block !important;
}
}
}

View File

@ -15,7 +15,7 @@
@btn-default-bg: #e3e3e3;
@btn-default-border: #e3e3e3;
@tooltip-bg: #34495E;
@tooltip-bg: #34495e;
@link-color: darken(@brand-primary, 15%);
@link-hover-color: darken(@link-color, 30%);
@ -68,24 +68,24 @@
@color-footer-border: #dfdfdf;
@color-footer-text: #666666;
@color-sidebarnav-bg: #34495E;
@color-sidebarnav-inactive-text: #808b93;
@color-sidebarnav-inactive-icon: #808b93;
@color-sidebarnav-bg: #34495e;
@color-sidebarnav-active-text: #ffffff;
@color-sidebarnav-active-icon: #ffffff;
@color-sidebarnav-inactive-text: rgba(255,255,255,.35);
@color-sidebarnav-inactive-icon: rgba(255,255,255,.35);
@color-sidebarnav-counter-bg: #d9350f;
@color-sidebarnav-counter-text: #ffffff;
@color-sidebarnav-tree-group: #ecf0f1;
@color-sidebarnav-tree-group-bg: #2b3e50;
@color-sidebarnav-tree-inactive-header: #CAD5D8;
@color-sidebarnav-tree-inactive-desc: #bdc3c7;
@color-sidebarnav-tree-inactive-text: #808c8d;
@color-sidebarnav-tree-inactive-header: rgba(255,255,255,.74);
@color-sidebarnav-tree-inactive-desc: rgba(255,255,255,.64);
@color-sidebarnav-tree-inactive-text: rgba(255,255,255,.26);
@color-sidebarnav-tree-active-header: #ffffff;
@color-sidebarnav-tree-inactive-bg: #3d5265;
@color-sidebarnav-tree-active-bg: #34495e;
@color-sidebarnav-tree-active-text: #ecf0f1;
@color-sidebarnav-tree-active-marker: #e6802b;
@color-sidebarnav-tree-active-text: rgba(255,255,255,.91);
@color-sidebarnav-tree-active-marker: #e67e22;
@color-sidebarnav-back-link-bg: #2b3e50;
@color-sidebarnav-back-link-text: #bdc3c7;
@ -95,7 +95,7 @@
@color-list-arrow: #cfcfcf;
@color-list-icon: #a1aab1;
@color-list-parent-bg: #ffffff;
@color-list-nav-arrow: #34495E;
@color-list-nav-arrow: #34495e;
@color-list-header-bg: transparent;
@color-list-head-bg: #ffffff;
@color-list-progress-bg: #0181b9;
@ -156,7 +156,7 @@
@color-ui-border: #d7d7d7;
@color-outer-muted-text: #8d969d;
@color-outer-muted-text: rgba(255,255,255,.44);
@color-outer-heading: #feffff;
@color-outer-description: #999999;
@color-outer-bg: #2b3e50;
@ -229,7 +229,7 @@
@color-fancy-master-tabs-bg: #d35400;
@color-fancy-master-tabs-active-text: #ffffff;
@color-fancy-master-tabs-inactive-text: #e39664;
@color-fancy-master-tabs-inactive-text: rgba(255, 255, 255, .35);
@color-fancy-master-panel-bg: #d35400;
@color-fancy-secondary-tabs-bg: #475354;
@ -243,7 +243,7 @@
@color-fancy-primary-tabs-inactive-bg: #d5d9d8;
@color-fancy-form-tabless-fields-bg: #e67e22;
@color-fancy-form-label: #f4c69e;
@color-fancy-form-label: rgba(255, 255, 255, .5);
@color-fancy-form-text: #ffffff;
@color-fancy-form-text-selection: #d35400;
@color-fancy-form-placeholder: #f4c69e;

View File

@ -11,7 +11,7 @@
background-color: @color-footer;
border-top: 1px solid @color-footer-border;
.brand, .motto {
.brand, .tagline {
margin: 10px;
height: (@footer-height - 20) + 0px;
line-height: (@footer-height - 20) + 0px;
@ -24,7 +24,7 @@
.name { }
}
.motto {
.tagline {
float: right;
p { color: lighten(@color-footer-text, 20%); }
}

View File

@ -17,17 +17,16 @@ body.outer {
.box-sizing(border-box);
vertical-align: middle;
h1 {
h1.oc-logo-white {
.hide-text();
display: inline-block;
background: transparent url(../images/october-logo-text.png) no-repeat left top;
width: 404px;
height: 65px;
width: 100%;
max-width: 410px;
height: 72px;
}
}
}
> .layout-cell {
vertical-align: middle;

View File

@ -56,7 +56,7 @@
&.active a, a:hover {
color: @color-sidebarnav-active-text;
i {color: @color-sidebarnav-active-icon;}
i { color: @color-sidebarnav-active-icon; }
}
span.counter {

View File

@ -38,10 +38,7 @@ class UserPreferencesModel extends SettingsModel
if (isset(self::$instances[$this->recordCode]))
return self::$instances[$this->recordCode];
$item = UserPreferences::forUser();
$item = $item->scopeFindRecord($this->model, $this->recordCode, $item->userContext)->first();
if (!$item) {
if (!$item = $this->getSettingsRecord()) {
$this->model->initSettingsData();
if (method_exists($this->model, 'forceSave'))
@ -61,7 +58,21 @@ class UserPreferencesModel extends SettingsModel
*/
public function isConfigured()
{
return UserPreferences::forUser()->findRecord($this->recordCode, $item->userContext)->count() > 0;
return $this->getSettingsRecord() !== null;
}
/**
* Returns the raw Model record that stores the settings.
* @return Model
*/
public function getSettingsRecord()
{
$item = UserPreferences::forUser();
$record = $item->scopeFindRecord($this->model, $this->recordCode, $item->userContext)
->remember(1440, $this->getCacheKey())
->first();
return $record ?: null;
}
/**
@ -95,4 +106,12 @@ class UserPreferencesModel extends SettingsModel
return parent::isKeyAllowed($key);
}
}
/**
* Returns a cache key for this record.
*/
protected function getCacheKey()
{
return 'backend::userpreferences.'.$this->recordCode;
}
}

View File

@ -276,10 +276,9 @@ class Controller extends Extendable
if ($result instanceof RedirectResponse)
return $result;
// Translate the page title
$this->pageTitle = $this->pageTitle
? Lang::get($this->pageTitle)
: Lang::get('backend::lang.page.untitled');
// No page title
if (!$this->pageTitle)
$this->pageTitle = 'backend::lang.page.untitled';
// Load the view
if (!$this->suppressView && is_null($result))

View File

@ -1,6 +1,5 @@
<?php namespace Backend\Controllers;
use Lang;
use BackendMenu;
use Backend\Classes\Controller;
use System\Classes\SettingsManager;
@ -56,7 +55,7 @@ class EditorPreferences extends Controller
$this->vars['margin'] = 0;
$this->asExtension('FormController')->update();
$this->pageTitle = Lang::get('backend::lang.editor.menu_label');
$this->pageTitle = 'backend::lang.editor.menu_label';
}
public function index_onSave()

View File

@ -37,7 +37,7 @@ class Index extends Controller
public function index()
{
$this->pageTitle = trans('backend::lang.dashboard.menu_label');
$this->pageTitle = 'backend::lang.dashboard.menu_label';
BackendMenu::setContextMainMenu('dashboard');
}
}

View File

@ -1,6 +1,5 @@
<?php namespace Backend\Controllers;
use Lang;
use Backend;
use Redirect;
use BackendMenu;
@ -59,7 +58,7 @@ class Users extends Controller
{
SettingsManager::setContext('October.Backend', 'myaccount');
$this->pageTitle = Lang::get('backend::lang.myaccount.menu_label');
$this->pageTitle = 'backend::lang.myaccount.menu_label';
return $this->update($this->user->id, 'myaccount');
}

View File

@ -1,4 +1,4 @@
<h2><?= e(trans('system::lang.app.motto')) ?></h2>
<h2><?= e(Backend\Models\BrandSettings::get('app_tagline')) ?></h2>
<?= Form::open() ?>
<input type="hidden" name="postback" value="1" />

View File

@ -52,6 +52,6 @@
<?= Form::close() ?>
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('system/settings') ?>" class="btn btn-default"><?= e(trans('system::lang.settings.return')) ?></a></p>
<?php endif ?>

View File

@ -2,7 +2,7 @@
<ul>
<li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
<li><a href="<?= Backend::url('backend/groups') ?>"><?= e(trans('backend::lang.user.group.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
<li><?= e(trans($this->pageTitle)) ?></li>
</ul>
<?php Block::endPut() ?>
@ -37,6 +37,6 @@
<?= Form::close() ?>
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.group.return')) ?></a></p>
<?php endif ?>

View File

@ -1,7 +1,7 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
<li><?= e(trans($this->pageTitle)) ?></li>
</ul>
<?php Block::endPut() ?>

View File

@ -2,7 +2,7 @@
<ul>
<li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
<li><a href="<?= Backend::url('backend/groups') ?>"><?= e(trans('backend::lang.user.group.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
<li><?= e(trans($this->pageTitle)) ?></li>
</ul>
<?php Block::endPut() ?>
@ -46,6 +46,6 @@
<?= Form::close() ?>
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.group.return')) ?></a></p>
<?php endif ?>

View File

@ -1,7 +1,7 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
<li><?= e(trans($this->pageTitle)) ?></li>
</ul>
<?php Block::endPut() ?>
@ -54,7 +54,7 @@
<?= Block::placeholder('breadcrumb') ?>
</div>
<div class="padded-container">
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.return')) ?></a></p>
</div>
<?php endif ?>

View File

@ -44,7 +44,7 @@
<?= Block::placeholder('breadcrumb') ?>
</div>
<div class="padded-container">
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.return')) ?></a></p>
</div>
<?php endif ?>

View File

@ -1,7 +1,7 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
<li><?= e(trans($this->pageTitle)) ?></li>
</ul>
<?php Block::endPut() ?>
@ -62,7 +62,7 @@
<?= Block::placeholder('breadcrumb') ?>
</div>
<div class="padded-container">
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.return')) ?></a></p>
</div>
<?php endif ?>

View File

@ -0,0 +1,81 @@
<?php namespace Backend\FormWidgets;
use Backend\Classes\FormWidgetBase;
/**
* Color picker
* Renders a color picker field.
*
* @package october\backend
* @author Alexey Bobkov, Samuel Georges
*/
class ColorPicker extends FormWidgetBase
{
/**
* {@inheritDoc}
*/
public $defaultAlias = 'colorpicker';
/**
* @var array Default available colors
*/
public $availableColors = [
'#1abc9c', '#16a085',
'#2ecc71', '#27ae60',
'#3498db', '#2980b9',
'#9b59b6', '#8e44ad',
'#34495e', '#2b3e50',
'#f1c40f', '#f39c12',
'#e67e22', '#d35400',
'#e74c3c', '#c0392b',
'#ecf0f1', '#bdc3c7',
'#95a5a6', '#7f8c8d',
];
/**
* {@inheritDoc}
*/
public function init()
{
$this->availableColors = $this->getConfig('availableColors', $this->availableColors);
}
/**
* {@inheritDoc}
*/
public function render()
{
$this->prepareVars();
return $this->makePartial('colorpicker');
}
/**
* Prepares the list data
*/
public function prepareVars()
{
$this->vars['name'] = $this->formField->getName();
$this->vars['value'] = $value = $this->getLoadData();
$this->vars['availableColors'] = $this->availableColors;
$this->vars['isCustomColor'] = !in_array($value, $this->availableColors);
}
/**
* {@inheritDoc}
*/
public function loadAssets()
{
$this->addCss('vendor/colpick/css/colpick.css', 'core');
$this->addJs('vendor/colpick/js/colpick.js', 'core');
$this->addCss('css/colorpicker.css', 'core');
$this->addJs('js/colorpicker.js', 'core');
}
/**
* {@inheritDoc}
*/
public function getSaveData($value)
{
return strlen($value) ? $value : null;
}
}

View File

@ -9,7 +9,7 @@ use Backend\Classes\FormWidgetBase;
* @package october\backend
* @author Alexey Bobkov, Samuel Georges
*/
class Datepicker extends FormWidgetBase
class DatePicker extends FormWidgetBase
{
/**
* {@inheritDoc}

View File

@ -0,0 +1,59 @@
.field-colorpicker > ul {
list-style-type: none;
padding: 0;
margin: 0;
margin-top: -8px;
}
.field-colorpicker > ul li {
float: left;
text-indent: -9999px;
padding: 3px;
margin: 14px 14px 0 0;
cursor: pointer;
border-radius: 2px;
}
.field-colorpicker > ul li span {
display: block;
width: 25px;
height: 25px;
border: 1px solid #cecece;
}
.field-colorpicker > ul li:hover,
.field-colorpicker > ul li.active {
background-color: #cecece;
}
.field-colorpicker > ul li:hover span,
.field-colorpicker > ul li.active span {
border: 1px solid #ffffff;
}
.field-colorpicker > ul li.custom-color {
position: relative;
}
.field-colorpicker > ul li.custom-color span {
border-style: dashed;
}
.field-colorpicker > ul li.custom-color:hover span,
.field-colorpicker > ul li.custom-color.active span {
border-style: solid;
}
.field-colorpicker > ul li.custom-color:before {
text-indent: 0;
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
*margin-right: .3em;
content: "\f0d8";
display: block;
text-align: center;
color: #000;
background: #e0e0e0;
font-size: 9px;
height: 9px;
line-height: 9px;
width: 9px;
position: absolute;
bottom: 3px;
right: 3px;
}

View File

@ -0,0 +1,114 @@
/*
* ColorPicker plugin
*
* Data attributes:
* - data-control="colorpicker" - enables the plugin on an element
* - data-data-locker="input#locker" - Input element to store and restore the chosen color
*
* JavaScript API:
* $('div#someElement').colorPicker({ dataLocker: 'input#locker' })
*
* Dependences:
* - Some other plugin (filename.js)
*/
+function ($) { "use strict";
// COLORPICKER CLASS DEFINITION
// ============================
var ColorPicker = function(element, options) {
this.options = options
this.$el = $(element)
// Init
this.init()
}
ColorPicker.DEFAULTS = {
dataLocker: null
}
ColorPicker.prototype.init = function() {
var self = this
this.$dataLocker = $(this.options.dataLocker, this.$el)
this.$colorList = $('>ul', this.$el)
this.$customColor = $('[data-custom-color]', this.$el)
this.$colorList.on('click', '>li', function(){
self.selectColor(this)
})
/*
* Custom color
*/
if (this.$customColor.length) {
this.$customColor.colpick({
layout: 'hex',
submit: 0,
color: this.$customColor.data('hexColor'),
onShow: function(cal) {
var el = $(cal).data('colpick').el
self.selectColor(el)
},
onChange: function(hsb, hex, rgb, el, bySetColor) {
$('>span', el).css('background', '#'+hex)
$(el).data('hexColor', '#'+hex)
self.setColor('#'+hex)
}
})
}
}
ColorPicker.prototype.setColor = function(hexColor) {
this.$dataLocker.val(hexColor)
}
ColorPicker.prototype.selectColor = function(el) {
var $item = $(el)
$item
.addClass('active')
.siblings().removeClass('active')
this.setColor($item.data('hexColor'))
}
// COLORPICKER PLUGIN DEFINITION
// ============================
var old = $.fn.colorPicker
$.fn.colorPicker = function (option) {
var args = Array.prototype.slice.call(arguments, 1), result
this.each(function () {
var $this = $(this)
var data = $this.data('oc.colorpicker')
var options = $.extend({}, ColorPicker.DEFAULTS, $this.data(), typeof option == 'object' && option)
if (!data) $this.data('oc.colorpicker', (data = new ColorPicker(this, options)))
if (typeof option == 'string') result = data[option].apply(data, args)
if (typeof result != 'undefined') return false
})
return result ? result : this
}
$.fn.colorPicker.Constructor = ColorPicker
// COLORPICKER NO CONFLICT
// =================
$.fn.colorPicker.noConflict = function () {
$.fn.colorPicker = old
return this
}
// COLORPICKER DATA-API
// ===============
$(document).render(function() {
$('[data-control="colorpicker"]').colorPicker()
})
}(window.jQuery);

View File

@ -0,0 +1,72 @@
@import "../../../../assets/less/core/boot.less";
@color-colorpicker-border: #cecece;
@color-colorpicker-active-border: #fff;
@color-colorpicker-active: #5fb6f5;
.field-colorpicker {
> ul {
list-style-type: none;
padding: 0;
margin: 0;
margin-top: -8px;
li {
float: left;
text-indent: -9999px;
padding: 3px;
margin: 14px 14px 0 0;
cursor: pointer;
border-radius: @border-radius-base;
span {
display: block;
width: 25px;
height: 25px;
border: 1px solid @color-colorpicker-border;
}
&:hover,
&.active {
background-color: @color-colorpicker-border;
span {
border: 1px solid @color-colorpicker-active-border;
}
}
&.custom-color {
position: relative;
span {
border-style: dashed;
}
&:hover,
&.active {
span {
border-style: solid;
}
}
&:before {
text-indent: 0;
.icon-FontAutumn();
content: @caret-up;
display: block;
text-align: center;
color: #000;
background: #e0e0e0;
font-size: 9px;
height: 9px;
line-height: 9px;
width: 9px;
position: absolute;
bottom: 3px;
right: 3px;
}
}
}
}
}

View File

@ -0,0 +1,339 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
jQuery Color Picker with RGB, HSB and HEX fields, several skins and layouts
Copyright (C) 2013 Jose Vargas
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
{signature of Ty Coon}, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

View File

@ -0,0 +1,36 @@
colpick Color Picker
====================
colpick is a simple Photoshop-style color picker jQuery plugin. Its interface is familiar for most users and it's also very lightweight loading less than 30 KB to the browser.
For instructions and examples see: http://colpick.com/plugin
<ul>
<li><span class="bold">No images!</span> Just a JS and a CSS file</li>
<li>Very intuitive Photoshop-like interface</li>
<li>Light and dark easy-to-customize CSS3 skins</li>
<li><span class="bold">28 KB total</span> loaded by the browser</li>
<li>Works and looks nice <span class="bold">even on IE7</span></li>
<li>Extremely easy to implement</li>
</ul>
<h2>Layouts</h2>
<table>
<tr>
<td>full:</td>
<td><img src="http://colpick.com/images/colpick_full.jpg" alt="colpick full layout"/></td>
</tr>
<tr>
<td>rgbhex:</td>
<td><img src="http://colpick.com/images/colpick_rgbhex.jpg" alt="colpick rgbhex layout"/></td>
</tr>
<tr>
<td>hex:</td>
<td><img src="http://colpick.com/images/colpick_hex.jpg" alt="colpick hex layout"/></td>
</tr>
</table>
Dual licensed under the MIT and GPL licenses.
Based on Stefan Petre's color picker

View File

@ -0,0 +1,420 @@
/*
colpick Color Picker / colpick.com
*/
/*Main container*/
.colpick {
position: absolute;
width: 346px;
height: 170px;
overflow: hidden;
display: none;
font-family: Arial, Helvetica, sans-serif;
background:#ebebeb;
border: 1px solid #bbb;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
/*Prevents selecting text when dragging the selectors*/
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
-o-user-select: none;
user-select: none;
}
/*Color selection box with gradients*/
.colpick_color {
position: absolute;
left: 7px;
top: 7px;
width: 156px;
height: 156px;
overflow: hidden;
outline: 1px solid #aaa;
cursor: crosshair;
}
.colpick_color_overlay1 {
position: absolute;
left:0;
top:0;
width: 156px;
height: 156px;
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ffffff', endColorstr='#00ffffff')"; /* IE8 */
background: -moz-linear-gradient(left, rgba(255,255,255,1) 0%, rgba(255,255,255,0) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, right top, color-stop(0%,rgba(255,255,255,1)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(left, rgba(255,255,255,1) 0%,rgba(255,255,255,0) 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(left, rgba(255,255,255,1) 0%,rgba(255,255,255,0) 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(left, rgba(255,255,255,1) 0%,rgba(255,255,255,0) 100%); /* IE10+ */
background: linear-gradient(to right, rgba(255,255,255,1) 0%, rgba(255,255,255,0) 100%);
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ffffff', endColorstr='#00ffffff'); /* IE6 & IE7 */
}
.colpick_color_overlay2 {
position: absolute;
left:0;
top:0;
width: 156px;
height: 156px;
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00000000', endColorstr='#000000')"; /* IE8 */
background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,0)), color-stop(100%,rgba(0,0,0,1))); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,1) 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,1) 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,1) 100%); /* IE10+ */
background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,1) 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00000000', endColorstr='#000000',GradientType=0 ); /* IE6-9 */
}
/*Circular color selector*/
.colpick_selector_outer {
background:none;
position: absolute;
width: 11px;
height: 11px;
margin: -6px 0 0 -6px;
border: 1px solid black;
border-radius: 50%;
}
.colpick_selector_inner{
position: absolute;
width: 9px;
height: 9px;
border: 1px solid white;
border-radius: 50%;
}
/*Vertical hue bar*/
.colpick_hue {
position: absolute;
top: 6px;
left: 175px;
width: 19px;
height: 156px;
border: 1px solid #aaa;
cursor: n-resize;
}
/*Hue bar sliding indicator*/
.colpick_hue_arrs {
position: absolute;
left: -8px;
width: 35px;
height: 7px;
margin: -7px 0 0 0;
}
.colpick_hue_larr {
position:absolute;
width: 0;
height: 0;
border-top: 6px solid transparent;
border-bottom: 6px solid transparent;
border-left: 7px solid #858585;
}
.colpick_hue_rarr {
position:absolute;
right:0;
width: 0;
height: 0;
border-top: 6px solid transparent;
border-bottom: 6px solid transparent;
border-right: 7px solid #858585;
}
/*New color box*/
.colpick_new_color {
position: absolute;
left: 207px;
top: 6px;
width: 60px;
height: 27px;
background: #f00;
border: 1px solid #8f8f8f;
}
/*Current color box*/
.colpick_current_color {
position: absolute;
left: 277px;
top: 6px;
width: 60px;
height: 27px;
background: #f00;
border: 1px solid #8f8f8f;
}
/*Input field containers*/
.colpick_field, .colpick_hex_field {
position: absolute;
height: 20px;
width: 60px;
overflow:hidden;
background:#f3f3f3;
color:#b8b8b8;
font-size:12px;
border:1px solid #bdbdbd;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.colpick_rgb_r {
top: 40px;
left: 207px;
}
.colpick_rgb_g {
top: 67px;
left: 207px;
}
.colpick_rgb_b {
top: 94px;
left: 207px;
}
.colpick_hsb_h {
top: 40px;
left: 277px;
}
.colpick_hsb_s {
top: 67px;
left: 277px;
}
.colpick_hsb_b {
top: 94px;
left: 277px;
}
.colpick_hex_field {
width: 68px;
left: 207px;
top: 121px;
}
/*Text field container on focus*/
.colpick_focus {
border-color: #999;
}
/*Field label container*/
.colpick_field_letter {
position: absolute;
width: 12px;
height: 20px;
line-height: 20px;
padding-left: 4px;
background: #efefef;
border-right: 1px solid #bdbdbd;
font-weight: bold;
color:#777;
}
/*Text inputs*/
.colpick_field input, .colpick_hex_field input {
position: absolute;
right: 11px;
margin: 0;
padding: 0;
height: 20px;
line-height: 20px;
background: transparent;
border: none;
font-size: 12px;
font-family: Arial, Helvetica, sans-serif;
color: #555;
text-align: right;
outline: none;
}
.colpick_hex_field input {
right: 4px;
}
/*Field up/down arrows*/
.colpick_field_arrs {
position: absolute;
top: 0;
right: 0;
width: 9px;
height: 21px;
cursor: n-resize;
}
.colpick_field_uarr {
position: absolute;
top: 5px;
width: 0;
height: 0;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-bottom: 4px solid #959595;
}
.colpick_field_darr {
position: absolute;
bottom:5px;
width: 0;
height: 0;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid #959595;
}
/*Submit/Select button*/
.colpick_submit {
position: absolute;
left: 207px;
top: 149px;
width: 130px;
height: 22px;
line-height:22px;
background: #efefef;
text-align: center;
color: #555;
font-size: 12px;
font-weight:bold;
border: 1px solid #bdbdbd;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.colpick_submit:hover {
background:#f3f3f3;
border-color:#999;
cursor: pointer;
}
/*full layout with no submit button*/
.colpick_full_ns .colpick_submit, .colpick_full_ns .colpick_current_color{
display:none;
}
.colpick_full_ns .colpick_new_color {
width: 130px;
height: 25px;
}
.colpick_full_ns .colpick_rgb_r, .colpick_full_ns .colpick_hsb_h {
top: 42px;
}
.colpick_full_ns .colpick_rgb_g, .colpick_full_ns .colpick_hsb_s {
top: 73px;
}
.colpick_full_ns .colpick_rgb_b, .colpick_full_ns .colpick_hsb_b {
top: 104px;
}
.colpick_full_ns .colpick_hex_field {
top: 135px;
}
/*rgbhex layout*/
.colpick_rgbhex .colpick_hsb_h, .colpick_rgbhex .colpick_hsb_s, .colpick_rgbhex .colpick_hsb_b {
display:none;
}
.colpick_rgbhex {
width:282px;
}
.colpick_rgbhex .colpick_field, .colpick_rgbhex .colpick_submit {
width:68px;
}
.colpick_rgbhex .colpick_new_color {
width:34px;
border-right:none;
}
.colpick_rgbhex .colpick_current_color {
width:34px;
left:240px;
border-left:none;
}
/*rgbhex layout, no submit button*/
.colpick_rgbhex_ns .colpick_submit, .colpick_rgbhex_ns .colpick_current_color{
display:none;
}
.colpick_rgbhex_ns .colpick_new_color{
width:68px;
border: 1px solid #8f8f8f;
}
.colpick_rgbhex_ns .colpick_rgb_r {
top: 42px;
}
.colpick_rgbhex_ns .colpick_rgb_g {
top: 73px;
}
.colpick_rgbhex_ns .colpick_rgb_b {
top: 104px;
}
.colpick_rgbhex_ns .colpick_hex_field {
top: 135px;
}
/*hex layout*/
.colpick_hex .colpick_hsb_h, .colpick_hex .colpick_hsb_s, .colpick_hex .colpick_hsb_b, .colpick_hex .colpick_rgb_r, .colpick_hex .colpick_rgb_g, .colpick_hex .colpick_rgb_b {
display:none;
}
.colpick_hex {
width:206px;
height:201px;
}
.colpick_hex .colpick_hex_field {
width:72px;
height:25px;
top:168px;
left:80px;
}
.colpick_hex .colpick_hex_field div, .colpick_hex .colpick_hex_field input {
height: 25px;
line-height: 25px;
}
.colpick_hex .colpick_new_color {
left:9px;
top:168px;
width:30px;
border-right:none;
}
.colpick_hex .colpick_current_color {
left:39px;
top:168px;
width:30px;
border-left:none;
}
.colpick_hex .colpick_submit {
left:164px;
top: 168px;
width:30px;
height:25px;
line-height: 25px;
}
/*hex layout, no submit button*/
.colpick_hex_ns .colpick_submit, .colpick_hex_ns .colpick_current_color {
display:none;
}
.colpick_hex_ns .colpick_hex_field {
width:80px;
}
.colpick_hex_ns .colpick_new_color{
width:60px;
border: 1px solid #8f8f8f;
}
/*Dark color scheme*/
.colpick_dark {
background: #161616;
border-color: #2a2a2a;
}
.colpick_dark .colpick_color {
outline-color: #333;
}
.colpick_dark .colpick_hue {
border-color: #555;
}
.colpick_dark .colpick_field, .colpick_dark .colpick_hex_field {
background: #101010;
border-color: #2d2d2d;
}
.colpick_dark .colpick_field_letter {
background: #131313;
border-color: #2d2d2d;
color: #696969;
}
.colpick_dark .colpick_field input, .colpick_dark .colpick_hex_field input {
color: #7a7a7a;
}
.colpick_dark .colpick_field_uarr {
border-bottom-color:#696969;
}
.colpick_dark .colpick_field_darr {
border-top-color:#696969;
}
.colpick_dark .colpick_focus {
border-color:#444;
}
.colpick_dark .colpick_submit {
background: #131313;
border-color:#2d2d2d;
color:#7a7a7a;
}
.colpick_dark .colpick_submit:hover {
background-color:#101010;
border-color:#444;
}

View File

@ -0,0 +1,520 @@
/*
colpick Color Picker
Copyright 2013 Jose Vargas. Licensed under GPL license. Based on Stefan Petre's Color Picker www.eyecon.ro, dual licensed under the MIT and GPL licenses
For usage and examples: colpick.com/plugin
*/
(function ($) {
var colpick = function () {
var
tpl = '<div class="colpick"><div class="colpick_color"><div class="colpick_color_overlay1"><div class="colpick_color_overlay2"><div class="colpick_selector_outer"><div class="colpick_selector_inner"></div></div></div></div></div><div class="colpick_hue"><div class="colpick_hue_arrs"><div class="colpick_hue_larr"></div><div class="colpick_hue_rarr"></div></div></div><div class="colpick_new_color"></div><div class="colpick_current_color"></div><div class="colpick_hex_field"><div class="colpick_field_letter">#</div><input type="text" maxlength="6" size="6" /></div><div class="colpick_rgb_r colpick_field"><div class="colpick_field_letter">R</div><input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div><div class="colpick_rgb_g colpick_field"><div class="colpick_field_letter">G</div><input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div><div class="colpick_rgb_b colpick_field"><div class="colpick_field_letter">B</div><input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div><div class="colpick_hsb_h colpick_field"><div class="colpick_field_letter">H</div><input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div><div class="colpick_hsb_s colpick_field"><div class="colpick_field_letter">S</div><input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div><div class="colpick_hsb_b colpick_field"><div class="colpick_field_letter">B</div><input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div><div class="colpick_submit"></div></div>',
defaults = {
showEvent: 'click',
onShow: function () {},
onBeforeShow: function(){},
onHide: function () {},
onChange: function () {},
onSubmit: function () {},
colorScheme: 'light',
color: '3289c7',
livePreview: true,
flat: false,
layout: 'full',
submit: 1,
submitText: 'OK',
height: 156
},
//Fill the inputs of the plugin
fillRGBFields = function (hsb, cal) {
var rgb = hsbToRgb(hsb);
$(cal).data('colpick').fields
.eq(1).val(rgb.r).end()
.eq(2).val(rgb.g).end()
.eq(3).val(rgb.b).end();
},
fillHSBFields = function (hsb, cal) {
$(cal).data('colpick').fields
.eq(4).val(Math.round(hsb.h)).end()
.eq(5).val(Math.round(hsb.s)).end()
.eq(6).val(Math.round(hsb.b)).end();
},
fillHexFields = function (hsb, cal) {
$(cal).data('colpick').fields.eq(0).val(hsbToHex(hsb));
},
//Set the round selector position
setSelector = function (hsb, cal) {
$(cal).data('colpick').selector.css('backgroundColor', '#' + hsbToHex({h: hsb.h, s: 100, b: 100}));
$(cal).data('colpick').selectorIndic.css({
left: parseInt($(cal).data('colpick').height * hsb.s/100, 10),
top: parseInt($(cal).data('colpick').height * (100-hsb.b)/100, 10)
});
},
//Set the hue selector position
setHue = function (hsb, cal) {
$(cal).data('colpick').hue.css('top', parseInt($(cal).data('colpick').height - $(cal).data('colpick').height * hsb.h/360, 10));
},
//Set current and new colors
setCurrentColor = function (hsb, cal) {
$(cal).data('colpick').currentColor.css('backgroundColor', '#' + hsbToHex(hsb));
},
setNewColor = function (hsb, cal) {
$(cal).data('colpick').newColor.css('backgroundColor', '#' + hsbToHex(hsb));
},
//Called when the new color is changed
change = function (ev) {
var cal = $(this).parent().parent(), col;
if (this.parentNode.className.indexOf('_hex') > 0) {
cal.data('colpick').color = col = hexToHsb(fixHex(this.value));
fillRGBFields(col, cal.get(0));
fillHSBFields(col, cal.get(0));
} else if (this.parentNode.className.indexOf('_hsb') > 0) {
cal.data('colpick').color = col = fixHSB({
h: parseInt(cal.data('colpick').fields.eq(4).val(), 10),
s: parseInt(cal.data('colpick').fields.eq(5).val(), 10),
b: parseInt(cal.data('colpick').fields.eq(6).val(), 10)
});
fillRGBFields(col, cal.get(0));
fillHexFields(col, cal.get(0));
} else {
cal.data('colpick').color = col = rgbToHsb(fixRGB({
r: parseInt(cal.data('colpick').fields.eq(1).val(), 10),
g: parseInt(cal.data('colpick').fields.eq(2).val(), 10),
b: parseInt(cal.data('colpick').fields.eq(3).val(), 10)
}));
fillHexFields(col, cal.get(0));
fillHSBFields(col, cal.get(0));
}
setSelector(col, cal.get(0));
setHue(col, cal.get(0));
setNewColor(col, cal.get(0));
cal.data('colpick').onChange.apply(cal.parent(), [col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el, 0]);
},
//Change style on blur and on focus of inputs
blur = function (ev) {
$(this).parent().removeClass('colpick_focus');
},
focus = function () {
$(this).parent().parent().data('colpick').fields.parent().removeClass('colpick_focus');
$(this).parent().addClass('colpick_focus');
},
//Increment/decrement arrows functions
downIncrement = function (ev) {
ev.preventDefault ? ev.preventDefault() : ev.returnValue = false;
var field = $(this).parent().find('input').focus();
var current = {
el: $(this).parent().addClass('colpick_slider'),
max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255),
y: ev.pageY,
field: field,
val: parseInt(field.val(), 10),
preview: $(this).parent().parent().data('colpick').livePreview
};
$(document).mouseup(current, upIncrement);
$(document).mousemove(current, moveIncrement);
},
moveIncrement = function (ev) {
ev.data.field.val(Math.max(0, Math.min(ev.data.max, parseInt(ev.data.val - ev.pageY + ev.data.y, 10))));
if (ev.data.preview) {
change.apply(ev.data.field.get(0), [true]);
}
return false;
},
upIncrement = function (ev) {
change.apply(ev.data.field.get(0), [true]);
ev.data.el.removeClass('colpick_slider').find('input').focus();
$(document).off('mouseup', upIncrement);
$(document).off('mousemove', moveIncrement);
return false;
},
//Hue slider functions
downHue = function (ev) {
ev.preventDefault ? ev.preventDefault() : ev.returnValue = false;
var current = {
cal: $(this).parent(),
y: $(this).offset().top
};
$(document).on('mouseup touchend',current,upHue);
$(document).on('mousemove touchmove',current,moveHue);
var pageY = ((ev.type == 'touchstart') ? ev.originalEvent.changedTouches[0].pageY : ev.pageY );
change.apply(
current.cal.data('colpick')
.fields.eq(4).val(parseInt(360*(current.cal.data('colpick').height - (pageY - current.y))/current.cal.data('colpick').height, 10))
.get(0),
[current.cal.data('colpick').livePreview]
);
return false;
},
moveHue = function (ev) {
var pageY = ((ev.type == 'touchmove') ? ev.originalEvent.changedTouches[0].pageY : ev.pageY );
change.apply(
ev.data.cal.data('colpick')
.fields.eq(4).val(parseInt(360*(ev.data.cal.data('colpick').height - Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageY - ev.data.y))))/ev.data.cal.data('colpick').height, 10))
.get(0),
[ev.data.preview]
);
return false;
},
upHue = function (ev) {
fillRGBFields(ev.data.cal.data('colpick').color, ev.data.cal.get(0));
fillHexFields(ev.data.cal.data('colpick').color, ev.data.cal.get(0));
$(document).off('mouseup touchend',upHue);
$(document).off('mousemove touchmove',moveHue);
return false;
},
//Color selector functions
downSelector = function (ev) {
ev.preventDefault ? ev.preventDefault() : ev.returnValue = false;
var current = {
cal: $(this).parent(),
pos: $(this).offset()
};
current.preview = current.cal.data('colpick').livePreview;
$(document).on('mouseup touchend',current,upSelector);
$(document).on('mousemove touchmove',current,moveSelector);
var payeX,pageY;
if(ev.type == 'touchstart') {
pageX = ev.originalEvent.changedTouches[0].pageX,
pageY = ev.originalEvent.changedTouches[0].pageY;
} else {
pageX = ev.pageX;
pageY = ev.pageY;
}
change.apply(
current.cal.data('colpick').fields
.eq(6).val(parseInt(100*(current.cal.data('colpick').height - (pageY - current.pos.top))/current.cal.data('colpick').height, 10)).end()
.eq(5).val(parseInt(100*(pageX - current.pos.left)/current.cal.data('colpick').height, 10))
.get(0),
[current.preview]
);
return false;
},
moveSelector = function (ev) {
var payeX,pageY;
if(ev.type == 'touchmove') {
pageX = ev.originalEvent.changedTouches[0].pageX,
pageY = ev.originalEvent.changedTouches[0].pageY;
} else {
pageX = ev.pageX;
pageY = ev.pageY;
}
change.apply(
ev.data.cal.data('colpick').fields
.eq(6).val(parseInt(100*(ev.data.cal.data('colpick').height - Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageY - ev.data.pos.top))))/ev.data.cal.data('colpick').height, 10)).end()
.eq(5).val(parseInt(100*(Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageX - ev.data.pos.left))))/ev.data.cal.data('colpick').height, 10))
.get(0),
[ev.data.preview]
);
return false;
},
upSelector = function (ev) {
fillRGBFields(ev.data.cal.data('colpick').color, ev.data.cal.get(0));
fillHexFields(ev.data.cal.data('colpick').color, ev.data.cal.get(0));
$(document).off('mouseup touchend',upSelector);
$(document).off('mousemove touchmove',moveSelector);
return false;
},
//Submit button
clickSubmit = function (ev) {
var cal = $(this).parent();
var col = cal.data('colpick').color;
cal.data('colpick').origColor = col;
setCurrentColor(col, cal.get(0));
cal.data('colpick').onSubmit(col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el);
},
//Show/hide the color picker
show = function (ev) {
// Prevent the trigger of any direct parent
ev.stopPropagation();
var cal = $('#' + $(this).data('colpickId'));
cal.data('colpick').onBeforeShow.apply(this, [cal.get(0)]);
var pos = $(this).offset();
var top = pos.top + this.offsetHeight;
var left = pos.left;
var viewPort = getViewport();
var calW = cal.width();
if (left + calW > viewPort.l + viewPort.w) {
left -= calW;
}
cal.css({left: left + 'px', top: top + 'px'});
if (cal.data('colpick').onShow.apply(this, [cal.get(0)]) != false) {
cal.show();
}
//Hide when user clicks outside
$('html').mousedown({cal:cal}, hide);
cal.mousedown(function(ev){ev.stopPropagation();})
},
hide = function (ev) {
if (ev.data.cal.data('colpick').onHide.apply(this, [ev.data.cal.get(0)]) != false) {
ev.data.cal.hide();
}
$('html').off('mousedown', hide);
},
getViewport = function () {
var m = document.compatMode == 'CSS1Compat';
return {
l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft),
w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth)
};
},
//Fix the values if the user enters a negative or high value
fixHSB = function (hsb) {
return {
h: Math.min(360, Math.max(0, hsb.h)),
s: Math.min(100, Math.max(0, hsb.s)),
b: Math.min(100, Math.max(0, hsb.b))
};
},
fixRGB = function (rgb) {
return {
r: Math.min(255, Math.max(0, rgb.r)),
g: Math.min(255, Math.max(0, rgb.g)),
b: Math.min(255, Math.max(0, rgb.b))
};
},
fixHex = function (hex) {
var len = 6 - hex.length;
if (len > 0) {
var o = [];
for (var i=0; i<len; i++) {
o.push('0');
}
o.push(hex);
hex = o.join('');
}
return hex;
},
restoreOriginal = function () {
var cal = $(this).parent();
var col = cal.data('colpick').origColor;
cal.data('colpick').color = col;
fillRGBFields(col, cal.get(0));
fillHexFields(col, cal.get(0));
fillHSBFields(col, cal.get(0));
setSelector(col, cal.get(0));
setHue(col, cal.get(0));
setNewColor(col, cal.get(0));
};
return {
init: function (opt) {
opt = $.extend({}, defaults, opt||{});
//Set color
if (typeof opt.color == 'string') {
opt.color = hexToHsb(opt.color);
} else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) {
opt.color = rgbToHsb(opt.color);
} else if (opt.color.h != undefined && opt.color.s != undefined && opt.color.b != undefined) {
opt.color = fixHSB(opt.color);
} else {
return this;
}
//For each selected DOM element
return this.each(function () {
//If the element does not have an ID
if (!$(this).data('colpickId')) {
var options = $.extend({}, opt);
options.origColor = opt.color;
//Generate and assign a random ID
var id = 'collorpicker_' + parseInt(Math.random() * 1000);
$(this).data('colpickId', id);
//Set the tpl's ID and get the HTML
var cal = $(tpl).attr('id', id);
//Add class according to layout
cal.addClass('colpick_'+options.layout+(options.submit?'':' colpick_'+options.layout+'_ns'));
//Add class if the color scheme is not default
if(options.colorScheme != 'light') {
cal.addClass('colpick_'+options.colorScheme);
}
//Setup submit button
cal.find('div.colpick_submit').html(options.submitText).click(clickSubmit);
//Setup input fields
options.fields = cal.find('input').change(change).blur(blur).focus(focus);
cal.find('div.colpick_field_arrs').mousedown(downIncrement).end().find('div.colpick_current_color').click(restoreOriginal);
//Setup hue selector
options.selector = cal.find('div.colpick_color').on('mousedown touchstart',downSelector);
options.selectorIndic = options.selector.find('div.colpick_selector_outer');
//Store parts of the plugin
options.el = this;
options.hue = cal.find('div.colpick_hue_arrs');
huebar = options.hue.parent();
//Paint the hue bar
var UA = navigator.userAgent.toLowerCase();
var isIE = navigator.appName === 'Microsoft Internet Explorer';
var IEver = isIE ? parseFloat( UA.match( /msie ([0-9]{1,}[\.0-9]{0,})/ )[1] ) : 0;
var ngIE = ( isIE && IEver < 10 );
var stops = ['#ff0000','#ff0080','#ff00ff','#8000ff','#0000ff','#0080ff','#00ffff','#00ff80','#00ff00','#80ff00','#ffff00','#ff8000','#ff0000'];
if(ngIE) {
var i, div;
for(i=0; i<=11; i++) {
div = $('<div></div>').attr('style','height:8.333333%; filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='+stops[i]+', endColorstr='+stops[i+1]+'); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='+stops[i]+', endColorstr='+stops[i+1]+')";');
huebar.append(div);
}
} else {
stopList = stops.join(',');
huebar.attr('style','background:-webkit-linear-gradient(top,'+stopList+'); background: -o-linear-gradient(top,'+stopList+'); background: -ms-linear-gradient(top,'+stopList+'); background:-moz-linear-gradient(top,'+stopList+'); -webkit-linear-gradient(top,'+stopList+'); background:linear-gradient(to bottom,'+stopList+'); ');
}
cal.find('div.colpick_hue').on('mousedown touchstart',downHue);
options.newColor = cal.find('div.colpick_new_color');
options.currentColor = cal.find('div.colpick_current_color');
//Store options and fill with default color
cal.data('colpick', options);
fillRGBFields(options.color, cal.get(0));
fillHSBFields(options.color, cal.get(0));
fillHexFields(options.color, cal.get(0));
setHue(options.color, cal.get(0));
setSelector(options.color, cal.get(0));
setCurrentColor(options.color, cal.get(0));
setNewColor(options.color, cal.get(0));
//Append to body if flat=false, else show in place
if (options.flat) {
cal.appendTo(this).show();
cal.css({
position: 'relative',
display: 'block'
});
} else {
cal.appendTo(document.body);
$(this).on(options.showEvent, show);
cal.css({
position:'absolute'
});
}
}
});
},
//Shows the picker
showPicker: function() {
return this.each( function () {
if ($(this).data('colpickId')) {
show.apply(this);
}
});
},
//Hides the picker
hidePicker: function() {
return this.each( function () {
if ($(this).data('colpickId')) {
$('#' + $(this).data('colpickId')).hide();
}
});
},
//Sets a color as new and current (default)
setColor: function(col, setCurrent) {
setCurrent = (typeof setCurrent === "undefined") ? 1 : setCurrent;
if (typeof col == 'string') {
col = hexToHsb(col);
} else if (col.r != undefined && col.g != undefined && col.b != undefined) {
col = rgbToHsb(col);
} else if (col.h != undefined && col.s != undefined && col.b != undefined) {
col = fixHSB(col);
} else {
return this;
}
return this.each(function(){
if ($(this).data('colpickId')) {
var cal = $('#' + $(this).data('colpickId'));
cal.data('colpick').color = col;
cal.data('colpick').origColor = col;
fillRGBFields(col, cal.get(0));
fillHSBFields(col, cal.get(0));
fillHexFields(col, cal.get(0));
setHue(col, cal.get(0));
setSelector(col, cal.get(0));
setNewColor(col, cal.get(0));
cal.data('colpick').onChange.apply(cal.parent(), [col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el, 1]);
if(setCurrent) {
setCurrentColor(col, cal.get(0));
}
}
});
}
};
}();
//Color space convertions
var hexToRgb = function (hex) {
var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)};
};
var hexToHsb = function (hex) {
return rgbToHsb(hexToRgb(hex));
};
var rgbToHsb = function (rgb) {
var hsb = {h: 0, s: 0, b: 0};
var min = Math.min(rgb.r, rgb.g, rgb.b);
var max = Math.max(rgb.r, rgb.g, rgb.b);
var delta = max - min;
hsb.b = max;
hsb.s = max != 0 ? 255 * delta / max : 0;
if (hsb.s != 0) {
if (rgb.r == max) hsb.h = (rgb.g - rgb.b) / delta;
else if (rgb.g == max) hsb.h = 2 + (rgb.b - rgb.r) / delta;
else hsb.h = 4 + (rgb.r - rgb.g) / delta;
} else hsb.h = -1;
hsb.h *= 60;
if (hsb.h < 0) hsb.h += 360;
hsb.s *= 100/255;
hsb.b *= 100/255;
return hsb;
};
var hsbToRgb = function (hsb) {
var rgb = {};
var h = hsb.h;
var s = hsb.s*255/100;
var v = hsb.b*255/100;
if(s == 0) {
rgb.r = rgb.g = rgb.b = v;
} else {
var t1 = v;
var t2 = (255-s)*v/255;
var t3 = (t1-t2)*(h%60)/60;
if(h==360) h = 0;
if(h<60) {rgb.r=t1; rgb.b=t2; rgb.g=t2+t3}
else if(h<120) {rgb.g=t1; rgb.b=t2; rgb.r=t1-t3}
else if(h<180) {rgb.g=t1; rgb.r=t2; rgb.b=t2+t3}
else if(h<240) {rgb.b=t1; rgb.r=t2; rgb.g=t1-t3}
else if(h<300) {rgb.b=t1; rgb.g=t2; rgb.r=t2+t3}
else if(h<360) {rgb.r=t1; rgb.g=t2; rgb.b=t1-t3}
else {rgb.r=0; rgb.g=0; rgb.b=0}
}
return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)};
};
var rgbToHex = function (rgb) {
var hex = [
rgb.r.toString(16),
rgb.g.toString(16),
rgb.b.toString(16)
];
$.each(hex, function (nr, val) {
if (val.length == 1) {
hex[nr] = '0' + val;
}
});
return hex.join('');
};
var hsbToHex = function (hsb) {
return rgbToHex(hsbToRgb(hsb));
};
$.fn.extend({
colpick: colpick.init,
colpickHide: colpick.hidePicker,
colpickShow: colpick.showPicker,
colpickSetColor: colpick.setColor
});
$.extend({
colpick:{
rgbToHex: rgbToHex,
rgbToHsb: rgbToHsb,
hsbToHex: hsbToHex,
hsbToRgb: hsbToRgb,
hexToHsb: hexToHsb,
hexToRgb: hexToRgb
}
});
})(jQuery);

View File

@ -0,0 +1,34 @@
<?php if ($this->previewMode): ?>
<div class="form-control"><?= $value ?></div>
<?php else: ?>
<div
id="<?= $this->getId() ?>"
class="field-colorpicker"
data-control="colorpicker"
data-data-locker="#<?= $this->getId('input') ?>">
<ul>
<?php foreach ($availableColors as $index => $color): ?>
<li
class="<?= $color == $value ? 'active' : null ?>"
data-hex-color="<?= $color ?>">
<span style="background: <?= $color ?>"><?= $color ?></span>
</li>
<?php endforeach ?>
<li
class="custom-color <?= $isCustomColor == $value ? 'active' : null ?>"
data-hex-color="<?= $isCustomColor ? $value : '#ffffff' ?>"
data-custom-color>
<span style="background: <?= $isCustomColor ? $value : '#ffffff' ?>"></span>
</li>
</ul>
<input
type="hidden"
id="<?= $this->getId('input') ?>"
name="<?= $name ?>"
value="<?= $value ?>" />
</div>
<?php endif ?>

View File

@ -1,6 +1,9 @@
<?php
return [
'auth' => [
'title' => 'Administration Area',
],
'field' => [
'invalid_type' => 'Invalid field type used :type.',
'options_method_not_exists' => 'The model class :model must define a method :method() returning options for the ":field" form field.',
@ -14,7 +17,7 @@ return [
'access_denied' => [
'label' => "Access denied",
'help' => "You don't have the required permissions to view this page.",
'cms_link' => "Return to the backend",
'cms_link' => "Return to the back-end",
],
],
'partial' => [
@ -211,8 +214,8 @@ return [
'extension' => 'The PHP extension :name is not installed. Please install this library and activate the extension.'
],
'editor' => [
'menu_label' => 'Code Editor Preferences',
'menu_description' => 'Customize the code editor preferences, such as font size and color scheme.',
'menu_label' => 'Code editor preferences',
'menu_description' => 'Customize your code editor preferences, such as font size and color scheme.',
'font_size' => 'Font size',
'tab_size' => 'Tab size',
'use_hard_tabs' => 'Indent using tabs',
@ -231,19 +234,23 @@ return [
'menu_description' => 'Settings relate to your administration account',
],
'myaccount' => [
'menu_label' => 'My Account',
'menu_label' => 'My account',
'menu_description' => 'Update your account details such as name, email address and password.',
'menu_keywords' => 'security login'
],
'branding' => [
'menu_label' => 'Customize back-end',
'menu_description' => 'Customize the administration area such as name, colors and logo.',
],
'backend_preferences' => [
'menu_label' => 'Backend Preferences',
'menu_description' => 'Manage language preference and the appearance of the backend.',
'menu_label' => 'Back-end preferences',
'menu_description' => 'Manage your account preferences such as desired language.',
'locale' => 'Language',
'locale_comment' => 'Select your desired locale for language use.',
],
'access_log' => [
'hint' => 'This log displays a list of successful sign in attempts by administrators. Records are kept for a total of :days days.',
'menu_label' => 'Access Log',
'menu_label' => 'Access log',
'menu_description' => 'View a list of successful back-end user sign ins.',
'created_at' => 'Date & Time',
'login' => 'Login',

View File

@ -0,0 +1,8 @@
<?php
use Backend\Models\BrandSettings;
?>
<?php if (BrandSettings::isConfigured()): ?>
<style>
<?= BrandSettings::renderCss() ?>
</style>
<?php endif ?>

View File

@ -3,7 +3,7 @@
<span class="logo"><i class="icon-leaf"></i></span>
<span class="name"><?= e(trans('system::lang.app.name')) ?></span>
</div>
<div class="motto">
<p><?= e(trans('system::lang.app.motto')) ?></p>
<div class="tagline">
<p><?= e(trans('system::lang.app.tagline')) ?></p>
</div>
</footer>

View File

@ -2,8 +2,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=0, minimal-ui">
<meta name="apple-mobile-web-app-capable" content="yes">
<link rel="icon" type="image/png" href="<?= Backend::skinAsset('assets/images/favicon.png') ?>">
<title data-title-template="<?= empty($this->pageTitleTemplate) ? '%s | October CMS' : e($this->pageTitleTemplate) ?>">
<?= $this->pageTitle ?> | October CMS
<title data-title-template="<?= empty($this->pageTitleTemplate) ? '%s' : e($this->pageTitleTemplate) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>">
<?= e(trans($this->pageTitle)) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>
</title>
<link href="<?= Backend::skinAsset('assets/vendor/select2/select2.css') ?>" rel="stylesheet">
@ -80,4 +80,5 @@
// -->
</script>
<?= $this->makeAssets() ?>
<?= Block::placeholder('head') ?>
<?= Block::placeholder('head') ?>
<?= $this->makeLayoutPartial('custom_styles') ?>

View File

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=0">
<title>Administration Area</title>
<title><?= e(trans('backend::lang.auth.title')) ?></title>
<link href="<?= URL::to('modules/backend/assets/css/october.css') ?>" rel="stylesheet">
<script src="<?= URL::to('modules/backend/assets/js/vendor/jquery-2.0.3.min.js') ?>"></script>
@ -12,7 +12,7 @@
<script src="<?= URL::to('modules/backend/assets/js/vendor/modernizr.min.js') ?>"></script>
<script src="<?= URL::to('modules/backend/assets/js/october.flashmessage.js') ?>"></script>
<script src="<?= URL::to('modules/backend/assets/js/auth/auth.js') ?>"></script>
<script>
<!--
backendBasePath = '<?= Backend::baseUrl() ?>';
@ -20,13 +20,15 @@
</script>
<?= $this->makeAssets() ?>
<?= Block::placeholder('head') ?>
<?= $this->makeLayoutPartial('custom_styles') ?>
</head>
<body class="outer <?= $this->bodyClass ?>">
<div id="layout-canvas">
<div class="layout">
<div class="layout-row min-size layout-head">
<div class="layout-cell">
<h1><?= e(trans('system::lang.app.name')) ?></h1>
<h1 class="oc-logo-white"><?= e(Backend\Models\BrandSettings::get('app_name')) ?></h1>
</div>
</div>
<div class="layout-row">

View File

@ -0,0 +1,87 @@
<?php namespace Backend\Models;
use File;
use Lang;
use Model;
use Less_Parser;
/**
* Backend settings that affect all users
*
* @package october\backend
* @author Alexey Bobkov, Samuel Georges
*/
class BrandSettings extends Model
{
use \System\Traits\ViewMaker;
use \October\Rain\Database\Traits\Validation;
public $implement = ['System.Behaviors.SettingsModel'];
public $settingsCode = 'backend_brand_settings';
public $settingsFields = 'fields.yaml';
public $attachOne = [
'logo' => ['System\Models\File']
];
// Pumpkin
const PRIMARY_LIGHT = '#e67e22';
// Carrot
const PRIMARY_DARK = '#d35400';
// Wet Asphalt
const SECONDARY_LIGHT = '#34495e';
// Midnight Blue
const SECONDARY_DARK = '#2b3e50';
/**
* Validation rules
*/
public $rules = [
'app_name' => 'required',
'app_tagline' => 'required',
];
public function initSettingsData()
{
$this->app_name = Lang::get('system::lang.app.name');
$this->app_tagline = Lang::get('system::lang.app.tagline');
$this->primary_color_light = self::PRIMARY_LIGHT;
$this->primary_color_dark = self::PRIMARY_DARK;
$this->secondary_color_light = self::SECONDARY_LIGHT;
$this->secondary_color_dark = self::SECONDARY_DARK;
}
public static function getLogo()
{
$settings = self::instance();
if (!$settings->logo)
return null;
return $settings->logo->getPath();
}
public static function renderCss()
{
$parser = new Less_Parser(['compress' => true]);
$parser->ModifyVars([
'logo-image' => "'".self::getLogo()."'",
'primary-color-light' => self::get('primary_color_light', self::PRIMARY_LIGHT),
'primary-color-dark' => self::get('primary_color_dark', self::PRIMARY_DARK),
'secondary-color-light' => self::get('secondary_color_light', self::SECONDARY_LIGHT),
'secondary-color-dark' => self::get('secondary_color_dark', self::SECONDARY_DARK),
]);
$parser->parse(File::get(__DIR__.'/brandsettings/custom.less'));
$css = $parser->getCss();
return $css;
}
}

View File

@ -0,0 +1,156 @@
//
// Coded variables
//
// @logo-image
// @primary-color-light - #e67e22
// @primary-color-dark - #d35400
// @secondary-color-light - #34495e
// @secondary-color-dark - #2b3e50
//
//
// Logos
//
.oc-bg-logo {
background-image: linear-gradient(to bottom, rgba(249,249,249,0.7) 0%,rgba(249,249,249,0.7) 100%), url('@{logo-image}');
}
.oc-logo-white {
background-image: url('@{logo-image}');
height: 170px !important;
}
//
// Outside Layout
//
@color-outer-bg: @secondary-color-dark;
@color-outer-header: mix(black, saturate(@secondary-color-dark, 5%), 27%);
body.outer {
background: @color-outer-bg;
}
body.outer .layout > .layout-row.layout-head {
background: @color-outer-header;
}
//
// Side navigation bar
//
@color-sidebarnav-bg: @secondary-color-light;
#layout-sidenav {
background-color: @color-sidebarnav-bg;
}
//
// Fancy layout
//
@color-fancy-form-tabless-fields-bg: @primary-color-light;
@color-fancy-master-tabs-bg: @primary-color-dark;
@color-fancy-form-inactive-tab: mix(black, desaturate(@primary-color-dark, 14.5%), 5%);
@tab-svg: escape('<svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" width="100px" height="110px" viewBox="0 0 100 110" enable-background="new 0 0 100 110" xml:space="preserve"><path d="M0,30C5,30,10,0,20,0c5,0,60,0,65,0c10,0,10,30,15,30"/><path fill="@{color-fancy-form-tabless-fields-bg}" d="M0,70c5,0,10-30,20-30c0,10,0,15,0,15v15"/><path fill="@{color-fancy-form-tabless-fields-bg}" d="M100,70c-5,0-10-30-20-30c0,10,0,15,0,15v15"/><path fill="@{color-fancy-form-inactive-tab}" d="M0,110c5,0,10-30,20-30c0,10,0,15,0,15v15"/><path fill="@{color-fancy-form-inactive-tab}" d="M100,110c-5,0-10-30-20-30c0,10,0,15,0,15v15"/></svg>');
.fancy-layout {
.control-tabs, &.control-tabs {
&.master {
> div > div.tabs-container {
background: @color-fancy-master-tabs-bg;
}
}
&.primary {
> div > ul.nav-tabs {
&.master-area {
background: @color-fancy-form-tabless-fields-bg;
}
}
}
&.master {
> div > div.tabs-container > ul.nav-tabs > li {
a > span.title {
background-color: @color-fancy-form-inactive-tab;
&:before, &:after {
background-image: url(~'data:image/svg+xml;charset=UTF-8,@{tab-svg}');
}
}
&.active {
a > span.title {
background-color: @color-fancy-form-tabless-fields-bg;
}
}
}
}
}
.form-tabless-fields {
background: @color-fancy-form-tabless-fields-bg;
}
}
//
// Component List
//
@color-component-list-bg: @secondary-color-dark;
div.control-componentlist {
background-color: @color-component-list-bg;
&.droppable {
background-color: lighten(@color-component-list-bg, 20%);
}
}
//
// File List
//
@color-list-active-border: @primary-color-light;
.control-filelist {
ul li.active a:after {
background: @color-list-active-border;
}
}
//
// Sidenav Tree
//
@color-sidebarnav-bg: @secondary-color-light;
@color-sidebarnav-tree-group-bg: @secondary-color-dark;
@color-sidebarnav-tree-inactive-bg: mix(white, @secondary-color-light, 7%);
@color-sidebarnav-tree-active-bg: @secondary-color-light;
@color-sidebarnav-tree-active-marker: @primary-color-light;
.sidenav-tree {
background: @color-sidebarnav-bg;
ul.top-level > li {
> div.group h3 {
background: @color-sidebarnav-tree-group-bg;
}
> ul li {
a {
background: @color-sidebarnav-tree-inactive-bg;
}
&.active a {
background: @color-sidebarnav-tree-active-bg;
&:before {
background: @color-sidebarnav-tree-active-marker;
}
}
&:hover a {
background: @color-sidebarnav-tree-active-bg;
}
}
}
}

View File

@ -0,0 +1,58 @@
# ===================================
# Field Definitions
# ===================================
tabs:
fields:
logo:
label: Logo
type: fileupload
commentAbove: Upload a custom logo to use in the back-end.
mode: image
imageHeight: 170
imageWidth: 170
tab: Brand
app_name:
label: App Name
commentAbove: This name is shown in the title area of the back-end.
tab: Brand
app_tagline:
label: App Tagline
commentAbove: This name is shown on the sign in screen for the back-end.
tab: Brand
primary_color_light:
label: Primary (Light)
type: colorpicker
tab: Colors
availableColors: [#1abc9c, #2ecc71, #3498db, #9b59b6, #34495e, #f1c40f, #e67e22, #e74c3c, #ecf0f1, #95a5a6]
primary_color_dark:
label: Primary (Dark)
type: colorpicker
tab: Colors
availableColors: [#16a085, #27ae60, #2980b9, #8e44ad, #2b3e50, #f39c12, #d35400, #c0392b, #bdc3c7, #7f8c8d]
secondary_color_light:
label: Secondary (Light)
type: colorpicker
tab: Colors
availableColors: [#1abc9c, #2ecc71, #3498db, #9b59b6, #34495e, #f1c40f, #e67e22, #e74c3c, #ecf0f1, #95a5a6]
secondary_color_dark:
label: Secondary (Dark)
type: colorpicker
tab: Colors
availableColors: [#16a085, #27ae60, #2980b9, #8e44ad, #2b3e50, #f39c12, #d35400, #c0392b, #bdc3c7, #7f8c8d]
custom_css:
label: Custom stylesheet
type: codeeditor
tab: Styles
size: giant

View File

@ -20,6 +20,7 @@ use Cms\Twig\Extension as CmsTwigExtension;
use Cms\Classes\FileHelper as CmsFileHelper;
use System\Models\RequestLog;
use System\Classes\ErrorHandler;
use System\Classes\CombineAssets;
use System\Classes\ApplicationException;
use System\Twig\Extension as SystemTwigExtension;
use October\Rain\Support\ValidationException;
@ -887,28 +888,6 @@ class Controller extends BaseController
return $this->router->getParameter($name, $default);
}
/**
* Combines JavaScript and StyleSheet assets.
* @param string $name Combined file code
* @return string Combined content.
*/
public function combine($name)
{
try {
if (!strpos($name, '-'))
throw new CmsException(Lang::get('cms::lang.combiner.not_found', ['name'=>$name]));
$parts = explode('-', $name);
$cacheId = $parts[0];
$combiner = new CombineAssets;
return $combiner->getContents($cacheId);
}
catch (Exception $ex) {
return '/* '.$ex->getMessage().' */';
}
}
/**
* Searches the layout and page components by an alias
* @return ComponentBase The component object, if found

View File

@ -101,8 +101,8 @@ class Index extends Controller
$this->addJs('/modules/backend/formwidgets/codeeditor/assets/vendor/ace/mode-'.$mode.'.js', 'core');
$this->bodyClass = 'compact-container side-panel-not-fixed';
$this->pageTitle = Lang::get('cms::lang.cms.menu_label');
$this->pageTitleTemplate = '%s CMS | October';
$this->pageTitle = 'cms::lang.cms.menu_label';
$this->pageTitleTemplate = '%s CMS';
}
public function index_onOpenTemplate()

View File

@ -1,6 +1,5 @@
<?php namespace Cms\Controllers;
use Lang;
use Config;
use BackendMenu;
use Input;
@ -30,7 +29,7 @@ class Themes extends Controller
$this->addCss('/modules/cms/assets/css/october.theme-selector.css', 'core');
$this->pageTitle = Lang::get('cms::lang.theme.settings_menu');
$this->pageTitle = 'cms::lang.theme.settings_menu';
BackendMenu::setContext('October.System', 'system', 'settings');
SettingsManager::setContext('October.Cms', 'theme');
}

View File

@ -28,6 +28,6 @@
</div>
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<?php endif ?>
<?= Block::endPut() ?>

View File

@ -68,9 +68,6 @@ return [
'invalid_name' => "Ungültiger Name für AJAX Handler: :name.",
'not_found' => "AJAX Handler ':name' wurde nicht gefunden.",
],
'combiner' => [
'not_found' => "Die combiner Datei ':name' wurde nicht gefunden.",
],
'cms' => [
'menu_label' => "CMS"
],

View File

@ -74,9 +74,6 @@ return [
'invalid_name' => "Invalid AJAX handler name: :name.",
'not_found' => "AJAX handler ':name' was not found.",
],
'combiner' => [
'not_found' => "The combiner file ':name' is not found.",
],
'cms' => [
'menu_label' => "CMS"
],

View File

@ -74,9 +74,6 @@ return [
'invalid_name' => "Manejador de AJAX inválido: :name.",
'not_found' => "El manejador de AJAX ':name' no se encuentra.",
],
'combiner' => [
'not_found' => "El archivo combinado ':name' no se encuentra.",
],
'cms' => [
'menu_label' => "Gestión"
],

View File

@ -74,9 +74,6 @@ return [
'invalid_name' => "نام کنترل کننده آژاکس نا معتبر است: :name.",
'not_found' => "کنترل کننده آژاکس ':name' یافت نشد.",
],
'combiner' => [
'not_found' => "فایل ترکیب کننده ':name' یافت نشد.",
],
'cms' => [
'menu_label' => "مدیریت محتوی"
],

View File

@ -74,9 +74,6 @@ return [
'invalid_name' => "Nom de gestionnaire AJAX invalide: :name.",
'not_found' => "Le gestionnaire AJAX ':name' est introuvable.",
],
'combiner' => [
'not_found' => "Le fichier combiner ':name' est introuvable.",
],
'cms' => [
'menu_label' => "CMS"
],

View File

@ -74,9 +74,6 @@ return [
'invalid_name' => "Nome del gestore AJAX non valido: :name.",
'not_found' => "Il gestore AJAX ':name' non è stato trovato.",
],
'combiner' => [
'not_found' => "Il file combinatore ':name' non è stato trovato.",
],
'cms' => [
'menu_label' => "CMS"
],

View File

@ -68,9 +68,6 @@ return [
'invalid_name' => "正しくないAJAXハンドラー名:name。",
'not_found' => "':name' AJAXハンドラーが見つかりません。",
],
'combiner' => [
'not_found' => "':name'コンバイナーファイルが見つかりません。",
],
'cms' => [
'menu_label' => ""
],

View File

@ -74,9 +74,6 @@ return [
'invalid_name' => "Ongeldige AJAX handlernaam: :name.",
'not_found' => "AJAX handler ':name' is niet gevonden.",
],
'combiner' => [
'not_found' => "Het samenvoegbestand ':name' is niet gevonden.",
],
'cms' => [
'menu_label' => "CMS"
],

View File

@ -74,9 +74,6 @@ return [
'invalid_name' => "O nome do Manipulador AJAX é inválido: :name.",
'not_found' => "Manipulador AJAX ':name' não foi encontrado.",
],
'combiner' => [
'not_found' => "O arquivo combinador ':name' não foi encontrado.",
],
'cms' => [
'menu_label' => "Design"
],

View File

@ -74,9 +74,6 @@ return [
'invalid_name' => "Nume Functie AJAX invalid: :name.",
'not_found' => "Functia AJAX ':name' nu a fost gasita.",
],
'combiner' => [
'not_found' => "Fisierul compus ':name' nu a fost gasit.",
],
'cms' => [
'menu_label' => "CMS"
],

View File

@ -74,9 +74,6 @@ return [
'invalid_name' => "Ошибка в имени обработчика AJAX: :name.",
'not_found' => "Обработчик AJAX не найден: ':name'.",
],
'combiner' => [
'not_found' => "Сборщик ресурсов не может найти файл ':name'.",
],
'cms' => [
'menu_label' => "CMS"
],

View File

@ -68,9 +68,6 @@ return [
'invalid_name' => "Felaktig AJAX-hanterare: :name",
'not_found' => "AJAX-hanterare ':name' kunde ej hittas",
],
'combiner' => [
'not_found' => "Kombinationsfilen ':name' kunde ej hittas",
],
'cms' => [
'menu_label' => "CMS"
],

View File

@ -68,9 +68,6 @@ return [
'invalid_name' => "Hatalı AJAX işleyici adı: :name.",
'not_found' => "':name' isimli AJAX işleyici bulunamadı.",
],
'combiner' => [
'not_found' => "The combiner file ':name' is not found.",
],
'cms' => [
'menu_label' => "CMS"
],

View File

@ -5,11 +5,6 @@
*/
App::before(function($request) {
/*
* Combine JavaScript and StyleSheet assets
*/
Route::any('combine/{file}', 'Cms\Classes\Controller@combine');
/*
* The CMS module intercepts all URLs that were not
* handled by the back-end modules.

View File

@ -1,5 +1,6 @@
<?php namespace System\Behaviors;
use Cache;
use System\Classes\ModelBehavior;
use System\Classes\ApplicationException;
@ -54,6 +55,7 @@ class SettingsModel extends ModelBehavior
*/
$this->model->bindEvent('model.afterFetch', [$this, 'afterModelFetch']);
$this->model->bindEvent('model.beforeSave', [$this, 'beforeModelSave']);
$this->model->bindEvent('model.afterSave', [$this, 'afterModelSave']);
$this->model->bindEvent('model.setAttribute', [$this, 'setModelAttribute']);
$this->model->bindEvent('model.saveInternal', [$this, 'saveModelInternal']);
@ -72,9 +74,7 @@ class SettingsModel extends ModelBehavior
if (isset(self::$instances[$this->recordCode]))
return self::$instances[$this->recordCode];
$item = $this->model->where('item', $this->recordCode)->first();
if (!$item) {
if (!$item = $this->getSettingsRecord()) {
$this->model->initSettingsData();
if (method_exists($this->model, 'forceSave'))
@ -94,7 +94,21 @@ class SettingsModel extends ModelBehavior
*/
public function isConfigured()
{
return $this->model->where('item', $this->recordCode)->count() > 0;
return $this->getSettingsRecord() !== null;
}
/**
* Returns the raw Model record that stores the settings.
* @return Model
*/
public function getSettingsRecord()
{
$record = $this->model
->where('item', $this->recordCode)
->remember(1440, $this->getCacheKey())
->first();
return $record ?: null;
}
/**
@ -108,17 +122,17 @@ class SettingsModel extends ModelBehavior
}
/**
* Helper for getValue, intended as a static method
* Helper for getSettingsValue, intended as a static method
*/
public function get($key, $default = null)
{
return $this->instance()->getValue($key, $default);
return $this->instance()->getSettingsValue($key, $default);
}
/**
* Get a single setting value, or return a default value
*/
public function getValue($key, $default = null)
public function getSettingsValue($key, $default = null)
{
if (array_key_exists($key, $this->fieldValues))
return $this->fieldValues[$key];
@ -161,6 +175,15 @@ class SettingsModel extends ModelBehavior
$this->model->value = $this->fieldValues;
}
/**
* After the model is saved, clear the cached query entry.
* @return void
*/
public function afterModelSave()
{
Cache::forget($this->getCacheKey());
}
/**
* Adulterate the model setter to use our field values instead.
*/
@ -200,4 +223,12 @@ class SettingsModel extends ModelBehavior
{
return $this->fieldConfig;
}
/**
* Returns a cache key for this record.
*/
protected function getCacheKey()
{
return 'system::settings.'.$this->recordCode;
}
}

View File

@ -1,4 +1,4 @@
<?php namespace Cms\Classes;
<?php namespace System\Classes;
use URL;
use File;
@ -13,9 +13,10 @@ use Assetic\Asset\FileAsset;
use Assetic\Asset\GlobAsset;
use Assetic\Asset\AssetCache;
use Assetic\Cache\FilesystemCache;
use System\Classes\ApplicationException;
/**
* Class used for combining JavaScript and StyleSheet
* Class used for combining JavaScript and StyleSheet
* files.
*
* @package october\system
@ -32,7 +33,7 @@ class CombineAssets
* @var array A list of known JavaScript extensions.
*/
protected static $jsExtensions = ['js'];
/**
* @var array A list of known StyleSheet extensions.
*/
@ -129,7 +130,7 @@ class CombineAssets
{
$cacheInfo = $this->getCache($cacheId);
if (!$cacheInfo)
throw new CmsException(Lang::get('cms::lang.combiner.not_found', ['name'=>$cacheId]));
throw new ApplicationException(Lang::get('cms::lang.combiner.not_found', ['name'=>$cacheId]));
$this->path = $cacheInfo['path'];
$this->storagePath = storage_path().'/combiner/cms';
@ -355,7 +356,7 @@ class CombineAssets
*/
protected function getCombinedUrl($outputFilename = 'undefined.css')
{
$combineAction = 'Cms\Classes\Controller@combine';
$combineAction = 'System\Classes\Controller@combine';
$actionExists = Route::getRoutes()->getByAction($combineAction) !== null;
if ($actionExists)

View File

@ -0,0 +1,39 @@
<?php namespace System\Classes;
use Controller as BaseController;
use System\Classes\ApplicationException;
use System\Classes\CombineAssets;
use Exception;
/**
* The System controller class.
*
* @package october\system
* @author Alexey Bobkov, Samuel Georges
*/
class Controller extends BaseController
{
/**
* Combines JavaScript and StyleSheet assets.
* @param string $name Combined file code
* @return string Combined content.
*/
public function combine($name)
{
try {
if (!strpos($name, '-'))
throw new ApplicationException(Lang::get('system::lang.combiner.not_found', ['name'=>$name]));
$parts = explode('-', $name);
$cacheId = $parts[0];
$combiner = new CombineAssets;
return $combiner->getContents($cacheId);
}
catch (Exception $ex) {
return '/* '.$ex->getMessage().' */';
}
}
}

View File

@ -37,7 +37,7 @@ class Settings extends Controller
public function index()
{
$this->pageTitle = Lang::get('system::lang.settings.menu_label');
$this->pageTitle = 'system::lang.settings.menu_label';
$this->vars['items'] = SettingsManager::instance()->listItems('system');
$this->bodyClass = 'compact-container sidenav-tree-root';
}
@ -45,7 +45,7 @@ class Settings extends Controller
public function mysettings()
{
BackendMenu::setContextSideMenu('mysettings');
$this->pageTitle = Lang::get('backend::lang.mysettings.menu_label');
$this->pageTitle = 'backend::lang.mysettings.menu_label';
$this->vars['items'] = SettingsManager::instance()->listItems('mysettings');
$this->bodyClass = 'compact-container';
}
@ -58,18 +58,19 @@ class Settings extends Controller
{
SettingsManager::setContext($author.'.'.$plugin, $code);
$this->vars['parentLink'] = Backend::url('system/settings');
$this->vars['parentLabel'] = Lang::get('system::lang.settings.menu_label');
try {
$item = $this->findSettingItem($author, $plugin, $code);
if (!$item = $this->findSettingItem($author, $plugin, $code))
throw new ApplicationException(Lang::get('system::lang.settings.not_found'));
$this->pageTitle = $item->label;
if ($item->context == 'mysettings') {
$this->vars['parentLink'] = Backend::url('system/settings/mysettings');
$this->vars['parentLabel'] = Lang::get('backend::lang.mysettings.menu_label');
}
else {
$this->vars['parentLink'] = Backend::url('system/settings');
$this->vars['parentLabel'] = Lang::get('system::lang.settings.menu_label');
}
$model = $this->createModel($item);
$this->initWidgets($model);

View File

@ -67,7 +67,7 @@ class Updates extends Controller
*/
public function manage()
{
$this->pageTitle = Lang::get('system::lang.plugins.manage');
$this->pageTitle = 'system::lang.plugins.manage';
PluginManager::instance()->clearDisabledCache();
return $this->asExtension('ListController')->index();
}

View File

@ -1,7 +1,7 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('system/eventlogs') ?>"><?= e(trans('system::lang.event_log.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
<li><?= e(trans($this->pageTitle)) ?></li>
</ul>
<?php Block::endPut() ?>
@ -30,7 +30,7 @@
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<?php endif ?>

View File

@ -1,7 +1,7 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('system::lang.mail_templates.menu_layouts_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
<li><?= e(trans($this->pageTitle)) ?></li>
</ul>
<?php Block::endPut() ?>
@ -40,7 +40,7 @@
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('system/mailtemplates') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
<?php endif ?>

View File

@ -1,7 +1,7 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('system::lang.mail_templates.menu_layouts_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
<li><?= e(trans($this->pageTitle)) ?></li>
</ul>
<?php Block::endPut() ?>
@ -59,7 +59,7 @@
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('system/mailtemplates') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
<?php endif ?>

View File

@ -1,7 +1,7 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('system::lang.mail_templates.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
<li><?= e(trans($this->pageTitle)) ?></li>
</ul>
<?php Block::endPut() ?>
@ -40,7 +40,7 @@
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('system/mailtemplates') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
<?php endif ?>

View File

@ -1,7 +1,7 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('system::lang.mail_templates.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
<li><?= e(trans($this->pageTitle)) ?></li>
</ul>
<?php Block::endPut() ?>
@ -65,7 +65,7 @@
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('system/mailtemplates') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
<?php endif ?>

View File

@ -1,7 +1,7 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('system/requestlogs') ?>"><?= e(trans('system::lang.request_log.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
<li><?= e(trans($this->pageTitle)) ?></li>
</ul>
<?php Block::endPut() ?>
@ -34,7 +34,7 @@
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<?php endif ?>

View File

@ -32,6 +32,6 @@
<?= Form::close() ?>
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= $parentLink ?>" class="btn btn-default"><?= e(trans('system::lang.settings.return')) ?></a></p>
<?php endif ?>

View File

@ -136,7 +136,7 @@
<?php else: ?>
<div class="modal-body">
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
</div>
<div class="modal-footer">
<button

View File

@ -113,7 +113,7 @@
<?php else: ?>
<div class="modal-body">
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
</div>
<div class="modal-footer">
<button

View File

@ -1,7 +1,7 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('system/updates') ?>">Updates</a></li>
<li><?= e($this->pageTitle) ?></li>
<li><?= e(trans($this->pageTitle)) ?></li>
</ul>
<?php Block::endPut() ?>

View File

@ -3,7 +3,7 @@
return [
'app' => [
'name' => 'October CMS',
'motto' => 'Zurück zum Wesentlichen',
'tagline' => 'Zurück zum Wesentlichen',
],
'locale' => [
'en' => 'English',
@ -25,6 +25,9 @@ return [
'file' => [
'create_fail' => "Konnte Datei :name nicht erstellen",
],
'combiner' => [
'not_found' => "Die combiner Datei ':name' wurde nicht gefunden.",
],
'system' => [
'name' => 'System',
'menu_label' => 'System',

View File

@ -3,7 +3,7 @@
return [
'app' => [
'name' => 'October CMS',
'motto' => 'Getting back to basics',
'tagline' => 'Getting back to basics',
],
'locale' => [
'en' => 'English',
@ -25,6 +25,9 @@ return [
'file' => [
'create_fail' => "Cannot create file: :name",
],
'combiner' => [
'not_found' => "The combiner file ':name' is not found.",
],
'system' => [
'name' => 'System',
'menu_label' => 'System',
@ -84,13 +87,14 @@ return [
],
'settings' => [
'menu_label' => 'Settings',
'not_found' => 'Unable to find the specified settings.',
'missing_model' => 'The settings page is missing a Model definition.',
'update_success' => 'Settings for :name have been updated successfully.',
'return' => 'Return to system settings',
'search' => 'Search'
],
'mail' => [
'menu_label' => 'Mail Configuration',
'menu_label' => 'Mail configuration',
'menu_description' => 'Manage email configuration.',
'general' => 'General',
'method' => 'Mail Method',
@ -109,7 +113,7 @@ return [
'sendmail_path_comment' => 'Please specify the path of the sendmail program.',
],
'mail_templates' => [
'menu_label' => 'Mail Templates',
'menu_label' => 'Mail templates',
'menu_description' => 'Modify the mail templates that are sent to users and administrators, manage email layouts.',
'new_template' => 'New Template',
'new_layout' => 'New Layout',
@ -200,7 +204,7 @@ return [
],
'event_log' => [
'hint' => 'This log displays a list of potential errors that occur in the application, such as exceptions and debugging information.',
'menu_label' => 'Event Log',
'menu_label' => 'Event log',
'menu_description' => 'View system log messages with their recorded time and details.',
'empty_link' => 'Empty event log',
'empty_loading' => 'Emptying event log...',
@ -214,7 +218,7 @@ return [
],
'request_log' => [
'hint' => 'This log displays a list of browser requests that may require attention. For example, if a visitor opens a CMS page that cannot be found, a record is created with the status code 404.',
'menu_label' => 'Request Log',
'menu_label' => 'Request log',
'menu_description' => 'View bad or redirected requests, such as Page not found (404).',
'empty_link' => 'Empty request log',
'empty_loading' => 'Emptying request log...',

View File

@ -3,7 +3,7 @@
return [
'app' => [
'name' => 'October CMS',
'motto' => 'Getting back to basics',
'tagline' => 'Getting back to basics',
],
'locale' => [
'en' => 'Inglés',
@ -25,6 +25,9 @@ return [
'file' => [
'create_fail' => "No se puede crear el archivo: :name",
],
'combiner' => [
'not_found' => "El archivo combinado ':name' no se encuentra.",
],
'system' => [
'name' => 'Sistema',
'menu_label' => 'Sistema',

View File

@ -1,237 +1,240 @@
<?php
return [
'app' => [
'name' => 'مدیریت محتوی اکتبر',
'motto' => 'بازگشت به گذشته',
],
'locale' => [
'en' => 'انگلیسی',
'nl' => 'هلندی',
'ja' => 'ژاپنی',
'se' => 'سوئدی',
'tr' => 'ترکی',
'de' => 'آلمانی',
'ru' => 'روسی',
'fr' => 'فرانسوی',
'it' => 'ایتالیایی',
'ro' => 'رومانیایی',
'pt-br' => 'پرتغالی برزیل',
'fa' => 'فارسی',
],
'directory' => [
'create_fail' => "مشکلی در ایجاد پوشه ی :name به وجود آمده است",
],
'file' => [
'create_fail' => "مشکلی در ایجاد فایل :name به وجود آمده است",
],
'system' => [
'name' => 'سیستم',
'menu_label' => 'سیستم',
'categories' => [
'cms' => 'مدیریت محتوی',
'misc' => 'متفرقه',
'logs' => 'وقایع',
'mail' => 'پست الکترونیکی',
'shop' => 'فروشگاه',
'team' => 'تیم',
'users' => 'کاربران',
'system' => 'سیستم',
'social' => 'شبکه اجتماعی',
'events' => 'رویداد ها',
'customers' => 'مشتریان',
'my_settings' => 'تنظیمات من',
],
],
'plugin' => [
'unnamed' => 'افزونه بدون نام',
'name' => [
'label' => 'نام افزونه',
'help' => 'افزونه را با نام یکتایی نام گذاری کنید. برای مثال: RainLab.Blog',
],
],
'plugins' => [
'manage' => 'مدیریت افزونه ها',
'enable_or_disable' => 'فعال یا غیر فعال کردن',
'enable_or_disable_title' => 'فعال یا غیر فعال کردن افزونه ها',
'remove' => 'خذف',
'refresh' => 'تازه کردن',
'disabled_label' => 'غیر فعال',
'disabled_help' => 'افزونه های غیر فعال توسط برنامه نادیده گرفته می شوند.',
'selected_amount' => 'افزونه های انتخاب شده: :amount',
'remove_confirm' => 'آیا اطمینان دارید؟',
'remove_success' => "افزونه های با موفقیت از سیستم حذف شدند.",
'refresh_confirm' => 'آیا اطمینان دارید؟',
'refresh_success' => "افزونه ها با موفقیت بارگذاری مجدد شدند.",
'disable_confirm' => 'آیا اطمینان دارید؟',
'disable_success' => "افزونه ها با موفقیت غیر فعال شدند.",
'enable_success' => "افرونه ها با موفقیت فعال شدند.",
'unknown_plugin' => "افرونه ها با موفقیت پاک شدند.",
],
'project' => [
'name' => 'پروژه',
'owner_label' => 'صاحب امتیاز',
'attach' => 'افرودن به پروژه',
'detach' => 'حذف از پروژه',
'none' => 'هیچ',
'id' => [
'label' => 'مشخصه ی پروژه',
'help' => 'مشخصه ی پروژه ی خود را چگونه بیابید',
'missing' => 'لطفا مشخصه ی پروژهی خود را وارد نمایید.',
],
'detach_confirm' => 'آیا از حذف این پروژه اطمینان دارید؟',
'unbind_success' => 'پروژه با موفقیت پاک شد.',
],
'settings' => [
'menu_label' => 'تنظیمات',
'missing_model' => 'صفحه تنظیمات شامل یک مدل تعریف نشده می باشد.',
'update_success' => 'تنظیمات برای :name با موفقیت تغییر یافتند.',
'return' => 'بازگشت به تنظیمات سیستم',
'search' => 'جستجو'
],
'mail' => [
'menu_label' => 'تنظیمات پست الکترونیکی',
'menu_description' => 'مدیریت تنظیمات پست الکترونیکی.',
'general' => 'عمومی',
'method' => 'روش ارسال',
'sender_name' => 'نام ارسال کننده',
'sender_email' => 'پست الکترونیکی ارسال کننده',
'smtp' => 'SMTP',
'smtp_address' => 'آدرس SMTP',
'smtp_authorization' => 'مجوز اتصال به SMTP مورد نیاز است',
'smtp_authorization_comment' => 'این گزیتع را جهت اتصال به سرور SMTP در صورت نیاز فعال نمایید.',
'smtp_username' => 'نام کاربری',
'smtp_password' => 'کلمه عبور',
'smtp_port' => 'درگاه SMTP',
'smtp_ssl' => 'اتصال امن SSL مورد نیاز است',
'sendmail' => 'Sendmail',
'sendmail_path' => 'محل Sendmail',
'sendmail_path_comment' => 'لطفا محل ذخیره نرم افزار sendmail را مشخص نمایید.',
],
'mail_templates' => [
'menu_label' => 'قالب های نامه الکترونیکی',
'menu_description' => 'مدیریت و تغییر قالب های نامه الکترونیکی که برای کاربران و مدیران ارسال می شود، مدیریت طرح بندی نامه الکترونیکی.',
'new_template' => 'قالب جدید',
'new_layout' => 'طرح بندی ی جدید',
'template' => 'قالب',
'templates' => 'قالب ها',
'menu_layouts_label' => 'طرح بندی نامه الکترونیکی',
'layout' => 'طرح بندی',
'layouts' => 'طرح بندی ها',
'name' => 'نام',
'name_comment' => 'نام یکتای مشخص کننده ی این قالی',
'code' => 'کد',
'code_comment' => 'کد یکتای مشخص کننده ی این قالب',
'subject' => 'موضوع',
'subject_comment' => 'موجوع نامه الکترونیکی',
'description' => 'توضیحات',
'content_html' => 'اچ تی ام ال',
'content_css' => 'شیوه نامه',
'content_text' => 'متن معمولی',
'test_send' => 'ارسال پیغام آزمایشی',
'test_success' => 'پیغان آزمایشی ارسال شد.',
'return' => 'بازگشت به لیست قالب ها'
],
'install' => [
'project_label' => 'ضمیمه کردن به نرم افزار',
'plugin_label' => 'نصب افزونه',
'missing_plugin_name' => 'لطفان نام افزونه را جهت نصب وارد نمایید.',
'install_completing' => 'مرحله ی پایانی عملیات نصب',
'install_success' => 'افزونه با موفقیت نصب شد.',
],
'updates' => [
'title' => 'مدیریت بروز رسانی',
'name' => 'بروز رسانی نرم افزار',
'menu_label' => 'بروز رسانی ها',
'menu_description' => 'به روز رسانی ی سیستم، مدیریت افزونه ها و قالب های نصب شده.',
'check_label' => 'بررسی بروز رسانی',
'retry_label' => 'تلاش مجدد',
'plugin_name' => 'نام',
'plugin_description' => 'توضیحات',
'plugin_version' => 'نسخه',
'plugin_author' => 'تولید کننده',
'core_build' => 'نسخه ی کنونی',
'core_build_old' => 'نسخه ی کنونی :build',
'core_build_new' => 'نسخه ی :build',
'core_build_new_help' => 'آخرین نسخه موجود است.',
'core_downloading' => 'دریافت فایل های نرم افزار',
'core_extracting' => 'گشودن فایل های نرم افزار',
'plugin_downloading' => 'دریافت افزونه: :name',
'plugin_extracting' => 'گشودن افزونه: :name',
'plugin_version_none' => 'افزونه ی جدید',
'plugin_version_old' => 'نسخه کنونی:version',
'plugin_version_new' => 'مسخه:version',
'theme_label' => 'قالب',
'theme_new_install' => 'قالب جدید نصب شد.',
'theme_downloading' => 'دریافت قالب: :name',
'theme_extracting' => 'گشودن قالب: :name',
'update_label' => 'بروز رسانی نرم افزار',
'update_completing' => 'اعمال بروز رسانی',
'update_loading' => 'بارگزاری بروز رسانی های موجود...',
'update_success' => 'بروز رسانی با موفقیت انجام شد..',
'update_failed_label' => 'بروز رسانی موفق نبود',
'force_label' => 'اصرار در بروز رسانی',
'found' => [
'label' => 'بروز رسانی جدیدی یافت شده است!',
'help' => 'بر روی بروز رسانی نرم افزار جهت شروع عملیات بروز رسانی کلیک کنید.',
],
'none' => [
'label' => '0 به روز رسانی',
'help' => 'هیچ به روز رسانی یافت نشد.',
],
],
'server' => [
'connect_error' => 'خطا در برقراری ارتباط با سرور.',
'response_not_found' => 'سرور به روز رسانی یافت نشد.',
'response_invalid' => 'پاسخ نا معتبر از سوی سرور.',
'response_empty' => 'پاسخ خالی از سوی سرور.',
'file_error' => 'خطا در ارسال یا دریافت بسته به سرور.',
'file_corrupt' => 'فایل دریافت شده از سرور ناقص است.',
],
'behavior' => [
'missing_property' => 'کلاس :class باید شامل خصوصیت $:property که در :behavior استفاده شده است باشد.',
],
'config' => [
'not_found' => 'فایل پیکربندی :file تعریف شده در :location یافت نشد.',
'required' => "پیکربندی استفاده شده در :location باید مقدار ':property' را ارائه نماید.",
],
'zip' => [
'extract_failed' => "عدم توانایی در گسودن فایل هسته ':file'.",
],
'event_log' => [
'hint' => 'این گزارش نمایش دهنده خطاهای عملکردی در سیستم می باشد، مانند خطاهای در حال اجرا و اطلاغات خطایابی.',
'menu_label' => 'گزارش رویدادها',
'menu_description' => 'نمایش گزارش های سیستمی همراه با زمان و توضیح آنها.',
'empty_link' => 'پاک سازی گزارش رویداد ها',
'empty_loading' => 'درحال پاکسازی گزارشها...',
'empty_success' => 'گزارشها با موفقیت پاک شدند.',
'return_link' => 'بازگشت به گزارش رویداد ها',
'id' => 'مشخصه',
'id_label' => 'مشخصه ی رویداد',
'created_at' => 'ساعت و تاریخ',
'message' => 'پیغام',
'level' => 'مرحله',
],
'request_log' => [
'hint' => 'این گزارش درخواستهایی از طرف مرورگر را که نیاز به بررسی دارند را نمایش می دهد. به عنوان مثال اکر بازدید کنند صفحه ای را که موجود نیست درخواست کند، یک گزینه با کد وضعیت 404 ایجاد می شود.',
'menu_label' => 'گزارش درخواست ها',
'menu_description' => 'نمایش درخواستهای مشکل ساز و انتقال داده شده مانند خطای : صفحه مورد نظر یافت نشد 404.',
'empty_link' => 'پاک کردن گزارش دخواستها',
'empty_loading' => 'در حال پاکسازی...',
'empty_success' => 'گزارش درخواستها با موفقیت پاکسازی شد.',
'return_link' => 'بازگشت به گزارش درخواستها',
'id' => 'مشخصه',
'id_label' => 'مشخصه ی گزارش',
'count' => 'شمارشگر',
'referer' => 'معرف ها',
'url' => 'آردس',
'status_code' => 'وضعیت',
],
'permissions' => [
'manage_system_settings' => 'مدیریت تنظیمات سیستم',
'manage_software_updates' => 'مدیریت به روز رسانی نرم افزار',
'manage_mail_templates' => 'مدیریت قالب پست الکترونیکی',
'manage_other_administrators' => 'مدیریت سایر مدیران',
'view_the_dashboard' => 'نمایش صفحه مدیریت'
]
'app' => [
'name' => 'مدیریت محتوی اکتبر',
'tagline' => 'بازگشت به گذشته',
],
'locale' => [
'en' => 'انگلیسی',
'nl' => 'هلندی',
'ja' => 'ژاپنی',
'se' => 'سوئدی',
'tr' => 'ترکی',
'de' => 'آلمانی',
'ru' => 'روسی',
'fr' => 'فرانسوی',
'it' => 'ایتالیایی',
'ro' => 'رومانیایی',
'pt-br' => 'پرتغالی برزیل',
'fa' => 'فارسی',
],
'directory' => [
'create_fail' => "مشکلی در ایجاد پوشه ی :name به وجود آمده است",
],
'file' => [
'create_fail' => "مشکلی در ایجاد فایل :name به وجود آمده است",
],
'combiner' => [
'not_found' => "فایل ترکیب کننده ':name' یافت نشد.",
],
'system' => [
'name' => 'سیستم',
'menu_label' => 'سیستم',
'categories' => [
'cms' => 'مدیریت محتوی',
'misc' => 'متفرقه',
'logs' => 'وقایع',
'mail' => 'پست الکترونیکی',
'shop' => 'فروشگاه',
'team' => 'تیم',
'users' => 'کاربران',
'system' => 'سیستم',
'social' => 'شبکه اجتماعی',
'events' => 'رویداد ها',
'customers' => 'مشتریان',
'my_settings' => 'تنظیمات من',
],
],
'plugin' => [
'unnamed' => 'افزونه بدون نام',
'name' => [
'label' => 'نام افزونه',
'help' => 'افزونه را با نام یکتایی نام گذاری کنید. برای مثال: RainLab.Blog',
],
],
'plugins' => [
'manage' => 'مدیریت افزونه ها',
'enable_or_disable' => 'فعال یا غیر فعال کردن',
'enable_or_disable_title' => 'فعال یا غیر فعال کردن افزونه ها',
'remove' => 'خذف',
'refresh' => 'تازه کردن',
'disabled_label' => 'غیر فعال',
'disabled_help' => 'افزونه های غیر فعال توسط برنامه نادیده گرفته می شوند.',
'selected_amount' => 'افزونه های انتخاب شده: :amount',
'remove_confirm' => 'آیا اطمینان دارید؟',
'remove_success' => "افزونه های با موفقیت از سیستم حذف شدند.",
'refresh_confirm' => 'آیا اطمینان دارید؟',
'refresh_success' => "افزونه ها با موفقیت بارگذاری مجدد شدند.",
'disable_confirm' => 'آیا اطمینان دارید؟',
'disable_success' => "افزونه ها با موفقیت غیر فعال شدند.",
'enable_success' => "افرونه ها با موفقیت فعال شدند.",
'unknown_plugin' => "افرونه ها با موفقیت پاک شدند.",
],
'project' => [
'name' => 'پروژه',
'owner_label' => 'صاحب امتیاز',
'attach' => 'افرودن به پروژه',
'detach' => 'حذف از پروژه',
'none' => 'هیچ',
'id' => [
'label' => 'مشخصه ی پروژه',
'help' => 'مشخصه ی پروژه ی خود را چگونه بیابید',
'missing' => 'لطفا مشخصه ی پروژهی خود را وارد نمایید.',
],
'detach_confirm' => 'آیا از حذف این پروژه اطمینان دارید؟',
'unbind_success' => 'پروژه با موفقیت پاک شد.',
],
'settings' => [
'menu_label' => 'تنظیمات',
'missing_model' => 'صفحه تنظیمات شامل یک مدل تعریف نشده می باشد.',
'update_success' => 'تنظیمات برای :name با موفقیت تغییر یافتند.',
'return' => 'بازگشت به تنظیمات سیستم',
'search' => 'جستجو'
],
'mail' => [
'menu_label' => 'تنظیمات پست الکترونیکی',
'menu_description' => 'مدیریت تنظیمات پست الکترونیکی.',
'general' => 'عمومی',
'method' => 'روش ارسال',
'sender_name' => 'نام ارسال کننده',
'sender_email' => 'پست الکترونیکی ارسال کننده',
'smtp' => 'SMTP',
'smtp_address' => 'آدرس SMTP',
'smtp_authorization' => 'مجوز اتصال به SMTP مورد نیاز است',
'smtp_authorization_comment' => 'این گزیتع را جهت اتصال به سرور SMTP در صورت نیاز فعال نمایید.',
'smtp_username' => 'نام کاربری',
'smtp_password' => 'کلمه عبور',
'smtp_port' => 'درگاه SMTP',
'smtp_ssl' => 'اتصال امن SSL مورد نیاز است',
'sendmail' => 'Sendmail',
'sendmail_path' => 'محل Sendmail',
'sendmail_path_comment' => 'لطفا محل ذخیره نرم افزار sendmail را مشخص نمایید.',
],
'mail_templates' => [
'menu_label' => 'قالب های نامه الکترونیکی',
'menu_description' => 'مدیریت و تغییر قالب های نامه الکترونیکی که برای کاربران و مدیران ارسال می شود، مدیریت طرح بندی نامه الکترونیکی.',
'new_template' => 'قالب جدید',
'new_layout' => 'طرح بندی ی جدید',
'template' => 'قالب',
'templates' => 'قالب ها',
'menu_layouts_label' => 'طرح بندی نامه الکترونیکی',
'layout' => 'طرح بندی',
'layouts' => 'طرح بندی ها',
'name' => 'نام',
'name_comment' => 'نام یکتای مشخص کننده ی این قالی',
'code' => 'کد',
'code_comment' => 'کد یکتای مشخص کننده ی این قالب',
'subject' => 'موضوع',
'subject_comment' => 'موجوع نامه الکترونیکی',
'description' => 'توضیحات',
'content_html' => 'اچ تی ام ال',
'content_css' => 'شیوه نامه',
'content_text' => 'متن معمولی',
'test_send' => 'ارسال پیغام آزمایشی',
'test_success' => 'پیغان آزمایشی ارسال شد.',
'return' => 'بازگشت به لیست قالب ها'
],
'install' => [
'project_label' => 'ضمیمه کردن به نرم افزار',
'plugin_label' => 'نصب افزونه',
'missing_plugin_name' => 'لطفان نام افزونه را جهت نصب وارد نمایید.',
'install_completing' => 'مرحله ی پایانی عملیات نصب',
'install_success' => 'افزونه با موفقیت نصب شد.',
],
'updates' => [
'title' => 'مدیریت بروز رسانی',
'name' => 'بروز رسانی نرم افزار',
'menu_label' => 'بروز رسانی ها',
'menu_description' => 'به روز رسانی ی سیستم، مدیریت افزونه ها و قالب های نصب شده.',
'check_label' => 'بررسی بروز رسانی',
'retry_label' => 'تلاش مجدد',
'plugin_name' => 'نام',
'plugin_description' => 'توضیحات',
'plugin_version' => 'نسخه',
'plugin_author' => 'تولید کننده',
'core_build' => 'نسخه ی کنونی',
'core_build_old' => 'نسخه ی کنونی :build',
'core_build_new' => 'نسخه ی :build',
'core_build_new_help' => 'آخرین نسخه موجود است.',
'core_downloading' => 'دریافت فایل های نرم افزار',
'core_extracting' => 'گشودن فایل های نرم افزار',
'plugin_downloading' => 'دریافت افزونه: :name',
'plugin_extracting' => 'گشودن افزونه: :name',
'plugin_version_none' => 'افزونه ی جدید',
'plugin_version_old' => 'نسخه کنونی:version',
'plugin_version_new' => 'مسخه:version',
'theme_label' => 'قالب',
'theme_new_install' => 'قالب جدید نصب شد.',
'theme_downloading' => 'دریافت قالب: :name',
'theme_extracting' => 'گشودن قالب: :name',
'update_label' => 'بروز رسانی نرم افزار',
'update_completing' => 'اعمال بروز رسانی',
'update_loading' => 'بارگزاری بروز رسانی های موجود...',
'update_success' => 'بروز رسانی با موفقیت انجام شد..',
'update_failed_label' => 'بروز رسانی موفق نبود',
'force_label' => 'اصرار در بروز رسانی',
'found' => [
'label' => 'بروز رسانی جدیدی یافت شده است!',
'help' => 'بر روی بروز رسانی نرم افزار جهت شروع عملیات بروز رسانی کلیک کنید.',
],
'none' => [
'label' => '0 به روز رسانی',
'help' => 'هیچ به روز رسانی یافت نشد.',
],
],
'server' => [
'connect_error' => 'خطا در برقراری ارتباط با سرور.',
'response_not_found' => 'سرور به روز رسانی یافت نشد.',
'response_invalid' => 'پاسخ نا معتبر از سوی سرور.',
'response_empty' => 'پاسخ خالی از سوی سرور.',
'file_error' => 'خطا در ارسال یا دریافت بسته به سرور.',
'file_corrupt' => 'فایل دریافت شده از سرور ناقص است.',
],
'behavior' => [
'missing_property' => 'کلاس :class باید شامل خصوصیت $:property که در :behavior استفاده شده است باشد.',
],
'config' => [
'not_found' => 'فایل پیکربندی :file تعریف شده در :location یافت نشد.',
'required' => "پیکربندی استفاده شده در :location باید مقدار ':property' را ارائه نماید.",
],
'zip' => [
'extract_failed' => "عدم توانایی در گسودن فایل هسته ':file'.",
],
'event_log' => [
'hint' => 'این گزارش نمایش دهنده خطاهای عملکردی در سیستم می باشد، مانند خطاهای در حال اجرا و اطلاغات خطایابی.',
'menu_label' => 'گزارش رویدادها',
'menu_description' => 'نمایش گزارش های سیستمی همراه با زمان و توضیح آنها.',
'empty_link' => 'پاک سازی گزارش رویداد ها',
'empty_loading' => 'درحال پاکسازی گزارشها...',
'empty_success' => 'گزارشها با موفقیت پاک شدند.',
'return_link' => 'بازگشت به گزارش رویداد ها',
'id' => 'مشخصه',
'id_label' => 'مشخصه ی رویداد',
'created_at' => 'ساعت و تاریخ',
'message' => 'پیغام',
'level' => 'مرحله',
],
'request_log' => [
'hint' => 'این گزارش درخواستهایی از طرف مرورگر را که نیاز به بررسی دارند را نمایش می دهد. به عنوان مثال اکر بازدید کنند صفحه ای را که موجود نیست درخواست کند، یک گزینه با کد وضعیت 404 ایجاد می شود.',
'menu_label' => 'گزارش درخواست ها',
'menu_description' => 'نمایش درخواستهای مشکل ساز و انتقال داده شده مانند خطای : صفحه مورد نظر یافت نشد 404.',
'empty_link' => 'پاک کردن گزارش دخواستها',
'empty_loading' => 'در حال پاکسازی...',
'empty_success' => 'گزارش درخواستها با موفقیت پاکسازی شد.',
'return_link' => 'بازگشت به گزارش درخواستها',
'id' => 'مشخصه',
'id_label' => 'مشخصه ی گزارش',
'count' => 'شمارشگر',
'referer' => 'معرف ها',
'url' => 'آردس',
'status_code' => 'وضعیت',
],
'permissions' => [
'manage_system_settings' => 'مدیریت تنظیمات سیستم',
'manage_software_updates' => 'مدیریت به روز رسانی نرم افزار',
'manage_mail_templates' => 'مدیریت قالب پست الکترونیکی',
'manage_other_administrators' => 'مدیریت سایر مدیران',
'view_the_dashboard' => 'نمایش صفحه مدیریت'
]
];

View File

@ -3,7 +3,7 @@
return [
'app' => [
'name' => 'October CMS',
'motto' => 'Getting back to basics',
'tagline' => 'Getting back to basics',
],
'locale' => [
'en' => 'Anglais',
@ -23,6 +23,9 @@ return [
'file' => [
'create_fail' => "Impossible de créer le fichier : :name",
],
'combiner' => [
'not_found' => "Le fichier combiner ':name' est introuvable.",
],
'system' => [
'name' => 'Système',
'menu_label' => 'Système',

View File

@ -3,7 +3,7 @@
return [
'app' => [
'name' => 'October CMS',
'motto' => 'Getting back to basics',
'tagline' => 'Getting back to basics',
],
'locale' => [
'en' => 'Inglese',
@ -24,6 +24,9 @@ return [
'file' => [
'create_fail' => "Impossibile creare il file: :name",
],
'combiner' => [
'not_found' => "Il file combinatore ':name' non è stato trovato.",
],
'system' => [
'name' => 'Sistema',
'menu_label' => 'Sistema',

View File

@ -3,7 +3,7 @@
return [
'app' => [
'name' => 'October CMS',
'motto' => '基本に戻ろう!',
'tagline' => '基本に戻ろう!',
],
'locale' => [
'en' => 'English',
@ -25,6 +25,9 @@ return [
'file' => [
'create_fail' => "ファイルが作成できません: :name",
],
'combiner' => [
'not_found' => "':name'コンバイナーファイルが見つかりません。",
],
'system' => [
'name' => 'システム',
'menu_label' => 'システム',

View File

@ -3,7 +3,7 @@
return [
'app' => [
'name' => 'October CMS',
'motto' => 'Terug naar de basis',
'tagline' => 'Terug naar de basis',
],
'locale' => [
'en' => 'Engels',
@ -25,6 +25,9 @@ return [
'file' => [
'create_fail' => "Bestand aanmaken mislukt: :name",
],
'combiner' => [
'not_found' => "Het samenvoegbestand ':name' is niet gevonden.",
],
'system' => [
'name' => 'Systeem',
'menu_label' => 'Systeem',

View File

@ -3,7 +3,7 @@
return [
'app' => [
'name' => 'October CMS',
'motto' => 'Voltando ao básico',
'tagline' => 'Voltando ao básico',
],
'locale' => [
'en' => 'Inglês',
@ -25,6 +25,9 @@ return [
'file' => [
'create_fail' => "Não é possível criar o arquivo: :name",
],
'combiner' => [
'not_found' => "O arquivo combinador ':name' não foi encontrado.",
],
'system' => [
'name' => 'Sistema',
'menu_label' => 'Sistema',

View File

@ -3,7 +3,7 @@
return [
'app' => [
'name' => 'October CMS',
'motto' => 'Intoarcerea la elementele de baza',
'tagline' => 'Intoarcerea la elementele de baza',
],
'locale' => [
'en' => 'Engleza',
@ -24,6 +24,9 @@ return [
'file' => [
'create_fail' => "Nu se poate crea fisierul: :name",
],
'combiner' => [
'not_found' => "Fisierul compus ':name' nu a fost gasit.",
],
'system' => [
'name' => 'Sistem',
'menu_label' => 'Sistem',

View File

@ -3,7 +3,7 @@
return [
'app' => [
'name' => 'October CMS',
'motto' => 'Возвращение к истокам',
'tagline' => 'Возвращение к истокам',
],
'locale' => [
'en' => 'English',
@ -25,6 +25,9 @@ return [
'file' => [
'create_fail' => "Невозможно создать файл: :name",
],
'combiner' => [
'not_found' => "Сборщик ресурсов не может найти файл ':name'.",
],
'system' => [
'name' => 'Система',
'menu_label' => 'Система',

View File

@ -3,7 +3,7 @@
return [
'app' => [
'name' => 'October CMS',
'motto' => 'Getting back to basics',
'tagline' => 'Getting back to basics',
],
'locale' => [
'en' => 'English',
@ -25,6 +25,9 @@ return [
'file' => [
'create_fail' => "Kunde inte skapa fil: :name",
],
'combiner' => [
'not_found' => "Kombinationsfilen ':name' kunde ej hittas",
],
'system' => [
'name' => 'System',
'menu_label' => 'System',

View File

@ -3,7 +3,7 @@
return [
'app' => [
'name' => 'October CMS',
'motto' => 'Basitliğe dönüş...',
'tagline' => 'Basitliğe dönüş...',
],
'locale' => [
'en' => 'English',
@ -25,6 +25,9 @@ return [
'file' => [
'create_fail' => "Dosya oluşturulamıyor: :name",
],
'combiner' => [
'not_found' => "The combiner file ':name' is not found.",
],
'system' => [
'name' => 'Sistem',
'menu_label' => 'Sistem',

13
modules/system/routes.php Normal file
View File

@ -0,0 +1,13 @@
<?php
/*
* Register System routes before all user routes.
*/
App::before(function($request) {
/*
* Combine JavaScript and StyleSheet assets
*/
Route::any('combine/{file}', 'System\Classes\Controller@combine');
});

View File

@ -31,7 +31,7 @@ class WidgetManagerTest extends TestCase
$this->assertArrayHasKey('Backend\FormWidgets\RichEditor', $widgets);
$this->assertArrayHasKey('Backend\FormWidgets\FileUpload', $widgets);
$this->assertArrayHasKey('Backend\FormWidgets\Relation', $widgets);
$this->assertArrayHasKey('Backend\FormWidgets\Datepicker', $widgets);
$this->assertArrayHasKey('Backend\FormWidgets\DatePicker', $widgets);
$this->assertArrayHasKey('Cms\FormWidgets\Components', $widgets);
}

View File

@ -1,7 +1,7 @@
<?php
use Cms\Classes\Theme;
use Cms\Classes\CombineAssets;
use System\Classes\CombineAssets;
class CombineAssetsTest extends TestCase
{