tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3'

Browse Source 
# Conflicts:
#	admin/css/ie8.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/scss/_style.scss
#	css/AssetUploadField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md
#	lang/fi.yml
This commit is contained in:
Damian Mooyman 2016-01-25 16:15:41 +13:00
commit 69c9ad1428
63 changed files with 657 additions and 363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/code/LeftAndMain.php
View File

@ -1409,7 +1409,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
*/
public function BatchActionsForm() {
$actions = $this->batchactions()->batchActionList();
$actionsMap = array();
$actionsMap = array('-1' => _t('LeftAndMain.DropdownBatchActionsDefault', 'Choose an action...')); // Placeholder action
foreach($actions as $action) {
$actionsMap[$action->Link] = $action->Title;
}
@ -1425,7 +1425,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
$actionsMap
)
->setAttribute('autocomplete', 'off')
->setAttribute('data-placeholder', _t('LeftAndMain.DropdownBatchActionsDefault', 'Actions'))
->setAttribute('data-placeholder', _t('LeftAndMain.DropdownBatchActionsDefault', 'Choose an action...'))
),
new FieldList(
// TODO i18n

2
admin/css/ie8.css
View File

@ -71,7 +71,7 @@ fieldset.switch-states .switch input.state-name { margin-left: -20px; }
.cms-content-actions .ss-ui-buttonset button { margin-right: 0; }
.tree-holder.filtered-list li > a, .tree-holder.filtered-list li > a:link, .cms-tree.filtered-list li > a, .cms-tree.filtered-list li > a:link { color: #aaa; }
.tree-holder.filtered-list li.filtered-item > a, .tree-holder.filtered-list li.filtered-item > a:link, .cms-tree.filtered-list li.filtered-item > a, .cms-tree.filtered-list li.filtered-item > a:link { color: #0073C1; }
.tree-holder.filtered-list li.filtered-item > a, .tree-holder.filtered-list li.filtered-item > a:link, .cms-tree.filtered-list li.filtered-item > a, .cms-tree.filtered-list li.filtered-item > a:link { color: #0071c4; }
.tree-holder.filtered-list li.disabled > a, .tree-holder.filtered-list li.disabled > a:link, .tree-holder.filtered-list li.edit-disabled > a, .tree-holder.filtered-list li.edit-disabled > a:link, .cms-tree.filtered-list li.disabled > a, .cms-tree.filtered-list li.disabled > a:link, .cms-tree.filtered-list li.edit-disabled > a, .cms-tree.filtered-list li.edit-disabled > a:link { color: #aaa; background: transparent none; cursor: default; }
/*# sourceMappingURL=ie8.css.map */

5
admin/css/ie8.css.map
View File

@ -1,7 +1,12 @@
{
"version": 3,
<<<<<<< HEAD
"mappings": "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",
"sources": ["../scss/themes/_default.scss","../scss/_ieShared.scss","../scss/ie8.scss"],
=======
"mappings": "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",
"sources": ["../scss/_ieShared.scss","../scss/themes/_default.scss","../scss/ie8.scss"],
>>>>>>> origin/3
"names": [],
"file": "ie8.css"
}

66
admin/css/screen.css
View File

@ -268,7 +268,7 @@ form.nostyle input.text, form.nostyle textarea, form.nostyle select, form.nostyl
.field.nolabel .middleColumn { margin-left: 0; }
.field.nolabel .description { margin-left: 0; }
.field.checkbox label.right { margin: 4px 0 0 0; display: inline; font-style: normal; color: #66727d; clear: none; }
.field label.left { float: left; display: block; width: 176px; padding: 8px 8px 8px 0; line-height: 16px; font-weight: bold; }
.field label.left { float: left; display: block; width: 176px; padding: 8px 8px 8px 0; line-height: 16px; }
.field label.right { cursor: pointer; clear: both; color: #9ba5ae; display: block; font-style: italic; margin: 4px 0 0 184px; }
.field .middleColumn { margin-left: 184px; }
.field span.readonly { padding-top: 8px; line-height: 16px; display: block; }
@ -327,7 +327,7 @@ form.small .field input.text, form.small .field textarea, form.small .field sele
.field.remove-splitter { border-bottom: none; box-shadow: none; }
/** ---------------------------------------------------- Buttons ---------------------------------------------------- */
.cms .button-no-style button, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; background: none; border: none; color: #0073C1; display: block; font-weight: normal; margin: 0; outline: none; padding-left: 10px; padding-right: 10px; text-align: left; text-shadow: none; white-space: normal; }
.cms .button-no-style button, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; background: none; border: none; color: #0071c4; display: block; font-weight: normal; margin: 0; outline: none; padding-left: 10px; padding-right: 10px; text-align: left; text-shadow: none; white-space: normal; }
.cms .button-no-style button.ss-ui-action-destructive, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.ss-ui-action-destructive { color: #c22730; }
.cms .button-no-style button span, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button span { padding-left: 0; padding-right: 0; }
.cms .button-no-style button:hover, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button:hover, .cms .button-no-style button:focus, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button:focus, .cms .button-no-style button:active, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button:active { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; outline: none; background: none; border: none; }
@ -519,7 +519,7 @@ html, body { width: 100%; height: 100%; /* Removes RHS whitespace on iPad */ ove
body.cms { overflow: hidden; }
.cms a { color: #0073C1; text-decoration: none; }
.cms a { color: #0071c4; text-decoration: none; }
.cms a:hover, .cms a:focus { text-decoration: underline; }
.cms body .ui-widget { font-family: Arial, sans-serif; font-size: 12px; }
.cms strong { font-weight: bold; }
@ -528,12 +528,12 @@ body.cms { overflow: hidden; }
.hide, .cms-helper-hide-actions .Actions { display: none; }
/** -------------------------------------------- Panels Styles -------------------------------------------- */
.cms-container { height: 100%; background: #ECEFF1; }
.cms-container { height: 100%; background: #f6f7f8; }
.cms-preview, .cms-menu, .cms-content, .cms-content-header, .cms-content-tools, .cms-content-fields, .cms-edit-form, .cms-preview, .cms-preview iframe, .cms-preview-controls { display: inline-block; vertical-align: middle; *vertical-align: auto; *zoom: 1; *display: inline; }
.cms-content-header { padding-left: 16px; z-index: 60; min-height: 52px; background-image: url(../images/textures/cms_content_header.png); background-repeat: repeat; background-position: left bottom; background-color: #E6EAED; }
.cms-content-header a { color: #0073C1; }
.cms-content-header { padding-left: 16px; z-index: 60; min-height: 52px; background-image: url(../images/textures/cms_content_header.png); background-repeat: repeat; background-position: left bottom; background-color: #f0f2f4; }
.cms-content-header a { color: #0071c4; }
.cms-content-header .backlink span.btn-icon-back { height: 16px; }
.cms-content-header h2 { font-size: 14px; font-weight: bold; margin: 0; margin-bottom: 8px; }
.cms-content-header h2 * { vertical-align: middle; }
@ -582,8 +582,9 @@ body.cms { overflow: hidden; }
.cms a.icon-button, .cms .ui-tabs .ui-tabs-nav li a.icon-button, .ui-tabs .ui-tabs-nav li .cms a.icon-button, .cms button.ss-ui-button.icon-button { vertical-align: middle; margin: 0 2px 0 0; padding: 5px 8px; font-size: 14px; text-indent: 0; text-shadow: none; line-height: 1em; color: #66727d; background-color: transparent; background-image: none; border: 0; }
.cms a.icon-button:hover, .cms .ui-tabs .ui-tabs-nav li a.icon-button:hover, .ui-tabs .ui-tabs-nav li .cms a.icon-button:hover, .cms a.icon-button:active, .cms .ui-tabs .ui-tabs-nav li a.icon-button:active, .ui-tabs .ui-tabs-nav li .cms a.icon-button:active, .cms a.icon-button:focus, .cms .ui-tabs .ui-tabs-nav li a.icon-button:focus, .ui-tabs .ui-tabs-nav li .cms a.icon-button:focus, .cms button.ss-ui-button.icon-button:hover, .cms button.ss-ui-button.icon-button:active, .cms button.ss-ui-button.icon-button:focus { border: 0; box-shadow: none; background-image: none; text-decoration: none; }
.cms a.icon-button:hover, .cms .ui-tabs .ui-tabs-nav li a.icon-button:hover, .ui-tabs .ui-tabs-nav li .cms a.icon-button:hover, .cms button.ss-ui-button.icon-button:hover { background-color: #d4dbe1; }
.cms a.icon-button.active, .cms .ui-tabs .ui-tabs-nav li a.active.icon-button, .ui-tabs .ui-tabs-nav li .cms a.active.icon-button, .cms a.icon-button:active, .cms .ui-tabs .ui-tabs-nav li a.icon-button:active, .ui-tabs .ui-tabs-nav li .cms a.icon-button:active, .cms button.ss-ui-button.icon-button.active, .cms button.ss-ui-button.icon-button:active { background-color: #d4dbe1; box-shadow: inset 0 0 3px rgba(191, 194, 196, 0.9); }
.cms a.icon-button.font-icon-search, .cms .ui-tabs .ui-tabs-nav li a.font-icon-search.icon-button, .ui-tabs .ui-tabs-nav li .cms a.font-icon-search.icon-button, .cms button.ss-ui-button.icon-button.font-icon-search { padding: 5px 6px; }
.cms a.icon-button.active, .cms .ui-tabs .ui-tabs-nav li a.active.icon-button, .ui-tabs .ui-tabs-nav li .cms a.active.icon-button, .cms a.icon-button:active, .cms .ui-tabs .ui-tabs-nav li a.icon-button:active, .ui-tabs .ui-tabs-nav li .cms a.icon-button:active, .cms button.ss-ui-button.icon-button.active, .cms button.ss-ui-button.icon-button:active { background-color: #d4dbe1; }
.cms a.icon-button.font-icon-search, .cms .ui-tabs .ui-tabs-nav li a.font-icon-search.icon-button, .ui-tabs .ui-tabs-nav li .cms a.font-icon-search.icon-button, .cms button.ss-ui-button.icon-button.font-icon-search { padding: 5px 6px; color: #7f8c97; }
.cms a.icon-button.font-icon-search.active, .cms a.icon-button.font-icon-search:active, .cms a.icon-button.font-icon-search:focus, .cms a.icon-button.font-icon-search:hover, .cms button.ss-ui-button.icon-button.font-icon-search.active, .cms button.ss-ui-button.icon-button.font-icon-search:active, .cms button.ss-ui-button.icon-button.font-icon-search:focus, .cms button.ss-ui-button.icon-button.font-icon-search:hover { background: none; box-shadow: none; color: #4f5861; }
.cms a.icon-button.font-icon-search:before, .cms button.ss-ui-button.icon-button.font-icon-search:before { font-size: 18px; margin-left: 1px; margin-right: 0; }
.cms a.icon-button .ui-button-text, .cms .ui-tabs .ui-tabs-nav li a.icon-button .ui-button-text, .ui-tabs .ui-tabs-nav li .cms a.icon-button .ui-button-text, .cms button.ss-ui-button.icon-button .ui-button-text { display: none; }
.ModelAdmin .cms a.icon-button, .ModelAdmin .cms .ui-tabs .ui-tabs-nav li a.icon-button, .ui-tabs .ui-tabs-nav li .ModelAdmin .cms a.icon-button, .ModelAdmin .cms button.ss-ui-button.icon-button { margin-top: -11px; }
@ -595,14 +596,14 @@ body.cms { overflow: hidden; }
.icon-button-group a.icon-button, .icon-button-group .ui-tabs .ui-tabs-nav li a.icon-button, .ui-tabs .ui-tabs-nav li .icon-button-group a.icon-button, .icon-button-group button.ss-ui-button.icon-button { margin-right: 0; line-height: 13px; border-radius: 0; }
.icon-button-group a.icon-button:first-child, .icon-button-group .ui-tabs .ui-tabs-nav li a.icon-button:first-child, .ui-tabs .ui-tabs-nav li .icon-button-group a.icon-button:first-child, .icon-button-group button.ss-ui-button.icon-button:first-child { border-radius: 3px 0 0 3px; }
.icon-button-group a.icon-button:last-child, .icon-button-group .ui-tabs .ui-tabs-nav li a.icon-button:last-child, .ui-tabs .ui-tabs-nav li .icon-button-group a.icon-button:last-child, .icon-button-group button.ss-ui-button.icon-button:last-child { border-radius: 0 3px 3px 0; }
.icon-button-group a.icon-button:hover, .icon-button-group .ui-tabs .ui-tabs-nav li a.icon-button:hover, .ui-tabs .ui-tabs-nav li .icon-button-group a.icon-button:hover, .icon-button-group button.ss-ui-button.icon-button:hover { background: #ECEFF1; }
.icon-button-group a.icon-button:hover, .icon-button-group .ui-tabs .ui-tabs-nav li a.icon-button:hover, .ui-tabs .ui-tabs-nav li .icon-button-group a.icon-button:hover, .icon-button-group button.ss-ui-button.icon-button:hover { background: #f6f7f8; }
.icon-button-group a.icon-button.active:hover, .icon-button-group button.ss-ui-button.icon-button.active:hover { background: #d4dbe1; }
.icon-button-group a.icon-button + a.icon-button, .icon-button-group .ui-tabs .ui-tabs-nav li a.icon-button + a.icon-button, .icon-button-group a.icon-button + button.ss-ui-button.icon-button, .icon-button-group .ui-tabs .ui-tabs-nav li a.icon-button + button.ss-ui-button.icon-button, .icon-button-group button.ss-ui-button.icon-button + a.icon-button, .icon-button-group .ui-tabs .ui-tabs-nav li button.ss-ui-button.icon-button + a.icon-button, .icon-button-group button.ss-ui-button.icon-button + button.ss-ui-button.icon-button { border-left: 1px solid #CDCCD0; }
.icon-button-group a.icon-button.font-icon-thumbnails::before, .icon-button-group button.ss-ui-button.icon-button.font-icon-thumbnails::before { margin-left: -2px; }
.icon-button-group .ui-tabs.ui-tabs-nav { border-left: 0 !important; padding-right: 0 !important; margin-bottom: 0; overflow: hidden; }
.icon-button-group .ui-tabs.ui-tabs-nav .cms-tabset-icon.ui-state-default { background-color: transparent; background-image: none; margin: 0; padding: 0; border-left: 0; border-right: 0; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
.icon-button-group .ui-tabs.ui-tabs-nav .cms-tabset-icon.ui-state-default + .cms-tabset-icon.ui-state-default { border-left: 1px solid #CDCCD0; }
.icon-button-group .ui-tabs.ui-tabs-nav .cms-tabset-icon.ui-state-default:hover { background: #ECEFF1; }
.icon-button-group .ui-tabs.ui-tabs-nav .cms-tabset-icon.ui-state-default:hover { background: #f6f7f8; }
.icon-button-group .ui-tabs.ui-tabs-nav .cms-tabset-icon.ui-state-default.ui-state-active:hover { background: #d4dbe1; }
.icon-button-group .ui-tabs.ui-tabs-nav .cms-tabset-icon.ui-state-active { background-color: #d4dbe1; }
.cms-content-header-tabs .icon-button-group { overflow: hidden; }
@ -623,7 +624,7 @@ body.cms { overflow: hidden; }
.ui-tabs .ui-tabs-nav .ui-state-default a { line-height: 28px; padding-top: 12px; padding-bottom: 8px; color: #7f8c97; }
.ui-tabs .ui-tabs-nav .ui-state-default a:hover { color: #66727d; }
.ui-tabs .ui-tabs-nav .ui-state-active { padding-bottom: 1px; background-color: transparent; cursor: text; }
.ui-tabs .ui-tabs-nav .ui-state-active a { border-bottom: 4px solid #66727d; padding-left: 0; padding-right: 0; margin: 0 12px 0; color: #66727d; }
.ui-tabs .ui-tabs-nav .ui-state-active a { border-bottom: 3px solid #66727d; padding-left: 0; padding-right: 0; margin: 0 12px 0; color: #66727d; }
.ui-tabs .ui-tabs-nav.ui-state-active { border-color: #808080; }
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.ui-corner-top { text-indent: -9999em; }
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.ui-corner-top a { display: block; padding-left: 40px; padding-right: 0; margin: 0; }
@ -672,7 +673,7 @@ body.cms { overflow: hidden; }
.ss-loading-screen .loading-animation { display: none; position: absolute; left: 50%; margin-left: -21.5px; top: 80%; }
/** -------------------------------------------- Actions -------------------------------------------- */
.cms-content-actions, .cms-preview-controls { margin: 0; padding: 12px 16px; z-index: 999; border-top: 1px solid #D2D5D8; -moz-box-shadow: 1px 0 0 #ECEFF1, rgba(248, 248, 248, 0.9) 0 1px 0px inset, rgba(201, 205, 206, 0.8) 0 0 1px; -webkit-box-shadow: 1px 0 0 #ECEFF1, rgba(248, 248, 248, 0.9) 0 1px 0px inset, rgba(201, 205, 206, 0.8) 0 0 1px; box-shadow: 1px 0 0 #ECEFF1, rgba(248, 248, 248, 0.9) 0 1px 0px inset, rgba(201, 205, 206, 0.8) 0 0 1px; height: 28px; background-color: #ECEFF1; }
.cms-content-actions, .cms-preview-controls { margin: 0; padding: 12px 16px; z-index: 999; border-top: 1px solid #D2D5D8; height: 28px; background-color: #f6f7f8; }
/** -------------------------------------------- Messages -------------------------------------------- */
.message { display: block; clear: both; margin: 0 0 8px; padding: 10px 12px; font-weight: normal; border: 1px #ccc solid; background: #fff; background: rgba(255, 255, 255, 0.5); text-shadow: none; -moz-border-radius: 3px 3px 3px 3px; -webkit-border-radius: 3px; border-radius: 3px 3px 3px 3px; }
@ -732,14 +733,14 @@ body.cms { overflow: hidden; }
.cms-content-toolbar:after { content: "\0020"; display: block; height: 0; clear: both; overflow: hidden; visibility: hidden; }
.cms-content-toolbar .cms-tree-view-modes { float: right; padding-top: 5px; }
.cms-content-toolbar .cms-tree-view-modes * { display: inline-block; }
.cms-content-toolbar .cms-tree-view-modes * label { color: #0073C1; }
.cms-content-toolbar .cms-tree-view-modes * label { color: #0071c4; }
.cms-content-toolbar .cms-actions-tools-row { clear: both; }
.cms-content-toolbar .tool-action { display: none; }
/** DEPRECATED: .cms-content-tools will be removed in 4.0 Use .cms-content-filters instead. Content Tools is the sidebar on the left of the main content panel */
.cms-content-tools { background: #ECEFF1; width: 288px; overflow-y: auto; overflow-x: hidden; z-index: 70; border-right: 1px solid #C1C7CC; -moz-box-shadow: rgba(248, 248, 248, 0.9) -1px 0 0 inset, 0 0 1px rgba(201, 205, 206, 0.8); -webkit-box-shadow: rgba(248, 248, 248, 0.9) -1px 0 0 inset, 0 0 1px rgba(201, 205, 206, 0.8); box-shadow: rgba(248, 248, 248, 0.9) -1px 0 0 inset, 0 0 1px rgba(201, 205, 206, 0.8); float: left; position: relative; }
.cms-content-tools { background: #f6f7f8; width: 288px; overflow-y: auto; overflow-x: hidden; z-index: 70; border-right: 1px solid #C1C7CC; float: left; position: relative; }
.cms-content-tools.filter { padding: 0 !important; }
.cms-content-tools .cms-panel-header { clear: both; margin: 10px 0 7px; padding-bottom: 2px; line-height: 24px; border-bottom: 1px solid #D2D5D8; -webkit-box-shadow: 0 1px 0 rgba(248, 248, 248, 0.9); -moz-box-shadow: 0 1px 0 rgba(248, 248, 248, 0.9); -o-box-shadow: 0 1px 0 rgba(248, 248, 248, 0.9); box-shadow: 0 1px 0 rgba(248, 248, 248, 0.9); }
.cms-content-tools .cms-panel-header { clear: both; margin: 10px 0 7px; padding-bottom: 2px; line-height: 24px; border-bottom: 1px solid #D2D5D8; }
.cms-content-tools .cms-panel-content { width: 272px; padding: 0 12px 0 16px; overflow: auto; height: 100%; }
.cms-content-tools .cms-panel-content .Actions .ss-ui-action-constructive { margin-right: 5px; }
.cms-content-tools .cms-content-header { background-color: #748d9d; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzc0OGQ5ZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #748d9d)); background-image: -moz-linear-gradient(#b0bec7, #748d9d); background-image: -webkit-linear-gradient(#b0bec7, #748d9d); background-image: linear-gradient(#b0bec7, #748d9d); }
@ -817,8 +818,8 @@ form.member-profile-form #Permissions .optionset li { float: none; width: auto;
.memberdatetimeoptionset .description { font-style: normal; }
.memberdatetimeoptionset .toggle { font-size: 11px; }
.cms .cms-content { border-right: 1px solid #BBB; -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; background: #ECEFF1; width: 800px; z-index: 40; }
.cms .cms-content-fields { overflow-y: auto; overflow-x: auto; background: #ECEFF1; width: 100%; }
.cms .cms-content { border-right: 1px solid #BBB; -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; background: #f6f7f8; width: 800px; z-index: 40; }
.cms .cms-content-fields { overflow-y: auto; overflow-x: auto; background: #f6f7f8; width: 100%; }
.cms .cms-content-fields #Root_Main .confirmedpassword { border-bottom: none; box-shadow: none; }
.cms .cms-content-fields #Root_Main .customFormat { max-width: 80px; }
.cms .cms-content-fields #Root_Main .cms-help-toggle { text-indent: -9999em; display: inline-block; width: 20px; background: url(../images/question.png) no-repeat 0px 0px; }
@ -833,12 +834,11 @@ form.member-profile-form #Permissions .optionset li { float: none; width: auto;
/** -------------------------------------------- Panels -------------------------------------------- */
.cms-panel { overflow: hidden; /** DEPRECATED: .cms-content-tools will be removed in 4.0 Use .cms-content-filters instead. */ }
.cms-panel .cms-panel-toggle { -moz-box-shadow: 0 0 1px rgba(248, 248, 248, 0.9); -webkit-box-shadow: 0 0 1px rgba(248, 248, 248, 0.9); box-shadow: 0 0 1px rgba(248, 248, 248, 0.9); }
.cms-panel .cms-panel-toggle.south { border-top: 1px solid #a9afb4; -moz-box-shadow: #bcc8cf 0 1px 0px inset; -webkit-box-shadow: #bcc8cf 0 1px 0px inset; box-shadow: #bcc8cf 0 1px 0px inset; position: absolute; bottom: 0; width: 100%; }
.cms-panel .cms-panel-toggle.south { border-top: 1px solid #a9afb4; position: absolute; bottom: 0; width: 100%; }
.cms-panel .cms-panel-toggle a { display: block; text-align: right; padding: 4px 0; width: 100%; text-decoration: none; }
.cms-panel .cms-panel-toggle a span { display: inline-block; margin: 0 5px; color: #555d60; font-size: 16px; }
.cms-panel .cms-panel-toggle a.toggle-expand { width: 40px; display: none; }
.cms-panel.cms-content-tools .cms-panel-toggle.south { border-top: 1px solid #D2D5D8; -moz-box-shadow: rgba(248, 248, 248, 0.9) 0 1px 0px inset; -webkit-box-shadow: rgba(248, 248, 248, 0.9) 0 1px 0px inset; box-shadow: rgba(248, 248, 248, 0.9) 0 1px 0px inset; }
.cms-panel.cms-content-tools .cms-panel-toggle.south { border-top: 1px solid #D2D5D8; }
.cms-panel.collapsed { cursor: pointer; }
.cms-panel.collapsed .cms-panel-header *, .cms-panel.collapsed .cms-panel-content, .cms-panel.collapsed .cms-panel-toggle a.toggle-collapse { display: none; }
.cms-panel.collapsed .cms-panel-toggle a.toggle-expand { display: block; }
@ -870,21 +870,21 @@ form.member-profile-form #Permissions .optionset li { float: none; width: auto;
.cms .ui-dialog .ss-ui-dialog.ui-dialog-content { padding-top: 0px; }
.ui-dialog { background: #ECEFF1; background-clip: content-box; border: 1px solid #666 !important; -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; overflow: visible; padding: 0; -moz-box-shadow: 0px 0px 30px 10px rgba(0, 0, 0, 0.3); -webkit-box-shadow: 0px 0px 30px 10px rgba(0, 0, 0, 0.3); box-shadow: 0px 0px 30px 10px rgba(0, 0, 0, 0.3); }
.ui-dialog { background: #f6f7f8; background-clip: content-box; border: 1px solid #666 !important; -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; overflow: visible; padding: 0; -moz-box-shadow: 0px 0px 30px 10px rgba(0, 0, 0, 0.3); -webkit-box-shadow: 0px 0px 30px 10px rgba(0, 0, 0, 0.3); box-shadow: 0px 0px 30px 10px rgba(0, 0, 0, 0.3); }
.ui-dialog .ui-dialog-titlebar.ui-widget-header { font-size: 14px; padding: 0; border: none; background-color: transparent; background-image: url(../images/textures/cms_content_header.png); background-repeat: repeat; -moz-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; -webkit-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; }
.ui-dialog .ui-dialog-titlebar.ui-widget-header .ui-dialog-title { position: absolute; }
.ui-dialog .ui-dialog-content { -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; overflow: auto; }
.ui-dialog .ui-dialog-content.loading { background-image: url(../images/spinner.gif); background-position: 50% 50%; background-repeat: no-repeat; }
.ui-dialog .cms-dialog-content { background: #ECEFF1; padding-bottom: 8px; padding-top: 0px; }
.ui-dialog .cms-dialog-content { background: #f6f7f8; padding-bottom: 8px; padding-top: 0px; }
.ui-dialog .cms-dialog-content .Actions { overflow: auto; margin: 8px 0; padding-bottom: 8px; float: right; }
.ui-dialog .cms-dialog-content .ui-tabs { position: static; }
.ui-dialog .cms-dialog-content .ui-tabs .ui-tabs-nav { position: absolute; top: 9px; right: 40px; }
.ui-dialog .cms-dialog-content .ui-tabs .ui-tabs-panel { border: 0; }
.ui-dialog .cms-dialog-content .clear { clear: both; }
.ui-dialog.loading { background-image: url(../images/spinner.gif); background-position: 50% 50%; background-repeat: no-repeat; }
.ui-dialog .ui-dialog-buttonpane { margin: 0; background: #E6EAED; border-top: 1px solid #D2D5D8; border-bottom-left-radius: 8px; border-bottom-right-radius: 8px; }
.ui-dialog .ui-dialog-buttonpane { margin: 0; background: #f0f2f4; border-top: 1px solid #D2D5D8; border-bottom-left-radius: 8px; border-bottom-right-radius: 8px; }
body.cms-dialog { overflow: auto; background: #ECEFF1; position: relative; }
body.cms-dialog { overflow: auto; background: #f6f7f8; position: relative; }
/** -------------------------------------------- "Insert X" forms -------------------------------------------- */
.htmleditorfield-dialog.ui-dialog-content { padding: 0; position: relative; }
@ -1067,7 +1067,7 @@ form.import-form label.left { width: 250px; }
.tree-holder.jstree li.readonly, .cms-tree.jstree li.readonly { color: #aaa; padding-left: 18px; }
.tree-holder.jstree li.readonly a, .tree-holder.jstree li.readonly a:link, .cms-tree.jstree li.readonly a, .cms-tree.jstree li.readonly a:link { margin: 0; padding: 0; }
.tree-holder.jstree li.readonly .jstree-icon, .cms-tree.jstree li.readonly .jstree-icon { display: none; }
.tree-holder.jstree a, .tree-holder.jstree a:link, .cms-tree.jstree a, .cms-tree.jstree a:link { color: #0073C1; padding: 3px 6px 3px 6px; border: none; display: inline-block; margin-right: 5px; }
.tree-holder.jstree a, .tree-holder.jstree a:link, .cms-tree.jstree a, .cms-tree.jstree a:link { color: #0071c4; padding: 3px 6px 3px 6px; border: none; display: inline-block; margin-right: 5px; }
.tree-holder.jstree ins, .cms-tree.jstree ins { background-color: transparent; background-image: url(../images/sitetree_ss_default_icons.png); }
.tree-holder.jstree span.badge, .cms-tree.jstree span.badge { clear: both; text-transform: uppercase; text-shadow: none; display: inline-block; position: relative; padding: 3px 3px 1px; font-size: 0.75em; line-height: 1em; margin-left: 3px; margin-top: -1px; -moz-border-radius: 2px / 2px; -webkit-border-radius: 2px 2px; border-radius: 2px / 2px; }
.tree-holder.jstree span.comment-count, .cms-tree.jstree span.comment-count { clear: both; position: relative; text-transform: uppercase; display: inline-block; overflow: visible; padding: 0px 3px; font-size: 0.75em; line-height: 1em; margin-left: 3px; margin-right: 6px; -moz-border-radius: 2px / 2px; -webkit-border-radius: 2px 2px; border-radius: 2px / 2px; color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
@ -1249,11 +1249,11 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop { padding: 0; border-bottom: 1px solid #aaa; margin-top: -5px; width: auto !important; }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop .chzn-search { display: none; }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul { padding: 0; margin: 0; overflow: visible; }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li { font-size: 12px; line-height: 16px; padding: 7px 16px 7px 6px; color: #0073C1; border-bottom: 1px solid #DDD; background-color: #FFF; /* Description styling */ }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li { font-size: 12px; line-height: 16px; padding: 7px 16px 7px 6px; color: #0071c4; border-bottom: 1px solid #DDD; background-color: #FFF; /* Description styling */ }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li:before { margin-right: 2px; font-size: 16px; }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li.description { padding-top: 5px; padding-bottom: 5px; }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li.description:before { margin-top: 5px; }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li.highlighted, .cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li:hover, .cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li:focus { color: #0073C1; filter: none; background: #f2f4f6; text-decoration: none; }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li.highlighted, .cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li:hover, .cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li:focus { color: #0071c4; filter: none; background: #f2f4f6; text-decoration: none; }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li.first { -moz-border-radius: 3px 3px 0 0; -webkit-border-radius: 3px; border-radius: 3px 3px 0 0; }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li.last { border-bottom: none; -moz-border-radius: 0 0 0 3px; -webkit-border-radius: 0; border-radius: 0 0 0 3px; }
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li.restricted { /* disable option (eg.split mode for smaller screen sizes) */ color: #CCC; background-color: #EEE; pointer-events: none; /*text-decoration: line-through;*/ }
@ -1276,7 +1276,7 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
.cms-content-controls .cms-preview-states.dropdown .chzn-container { max-width: 150px; }
/* Styling for the preview screen sizes */
.cms-preview { background-color: #ECEFF1; height: 100%; width: 100%; }
.cms-preview { background-color: #f6f7f8; height: 100%; width: 100%; }
.cms-preview .cms-preview-overlay { width: 100%; height: 100%; }
.cms-preview .preview-note { color: #CDD7DC; display: block; font-size: 22px; font-weight: bold; height: 82px; margin-top: -50px; margin-left: -150px; /* half of width */ position: absolute; text-align: center; text-shadow: 0 1px 0 #fff; top: 50%; left: 50%; width: 300px; }
.cms-preview .preview-note span { background: url('../images/sprites-64x64-s45180e3c4f.png') 0 0 no-repeat; display: block; height: 41px; margin: 0 auto 20px; width: 50px; }
@ -1284,7 +1284,7 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
.cms-preview .preview-scroll .preview-device-outer { height: 100%; width: 100%; }
.cms-preview .preview-scroll .preview-device-outer .preview-device-inner { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; width: 100%; height: 100%; background-color: #FFF; }
.cms-preview .preview-scroll .preview-device-outer .preview-device-inner iframe { height: 100%; overflow-y: auto; width: 100%; }
.cms-preview.mobile .preview-scroll, .cms-preview.mobileLandscape .preview-scroll, .cms-preview.tablet .preview-scroll, .cms-preview.tabletLandscape .preview-scroll, .cms-preview.desktop .preview-scroll { background-color: #ECEFF1; /* cover website preview icon */ }
.cms-preview.mobile .preview-scroll, .cms-preview.mobileLandscape .preview-scroll, .cms-preview.tablet .preview-scroll, .cms-preview.tabletLandscape .preview-scroll, .cms-preview.desktop .preview-scroll { background-color: #f6f7f8; /* cover website preview icon */ }
.cms-preview.mobile .preview-scroll .preview-device-outer, .cms-preview.mobileLandscape .preview-scroll .preview-device-outer, .cms-preview.tablet .preview-scroll .preview-device-outer, .cms-preview.tabletLandscape .preview-scroll .preview-device-outer, .cms-preview.desktop .preview-scroll .preview-device-outer { -moz-border-radius: 7px; -webkit-border-radius: 7px; border-radius: 7px; background: #d5dde2; border: 1px solid transparent; border-left: 1px solid #cfd9de; padding: 0 16px 16px; }
.cms-preview.mobile .preview-scroll .preview-device-outer .preview-device-inner, .cms-preview.mobileLandscape .preview-scroll .preview-device-outer .preview-device-inner, .cms-preview.tablet .preview-scroll .preview-device-outer .preview-device-inner, .cms-preview.tabletLandscape .preview-scroll .preview-device-outer .preview-device-inner, .cms-preview.desktop .preview-scroll .preview-device-outer .preview-device-inner { border-top: 2px solid #e1e7ea; border-right: 1px solid transparent; border-bottom: 1px solid #e1e7ea; border-left: 1px solid #c3cfd6; }
.cms-preview.mobile .preview-scroll .preview-device-outer { -moz-transform: rotate(0deg); -ms-transform: rotate(0deg); -webkit-transform: rotate(0deg); transform: rotate(0deg); -moz-transition: all 0.3s ease-in 1s; -o-transition: all 0.3s ease-in 1s; -webkit-transition: all 0.3s ease-in; -webkit-transition-delay: 1s; transition: all 0.3s ease-in 1s; margin: 20px auto 20px; overflow: hidden; padding-top: 16px; }
@ -1384,14 +1384,14 @@ visible. Added and removed with js in TabSet.js */ /***************************
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav { margin: 0; float: left; /* needed for ie but doesnt effect other browsers */ }
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li { background: none; border: none; border-bottom: none !important; display: inline; padding: 0; /* Make arrow point in up when nav open */ }
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li:hover, .cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li:active { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; outline: none; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a { text-shadow: #fff 0 1px 1px; color: #0073C1; font-size: 13px; font-weight: normal; line-height: 24px; padding: 0 25px 0 10px; border-bottom: 0; margin: 0; /* Arrow */ }
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a { text-shadow: #fff 0 1px 1px; color: #0071c4; font-size: 13px; font-weight: normal; line-height: 24px; padding: 0 25px 0 10px; border-bottom: 0; margin: 0; /* Arrow */ }
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a:hover, .cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a:active { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; outline: none; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a:hover { text-shadow: #fff 0 10px 10px; color: #005b98; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a:hover { text-shadow: #fff 0 10px 10px; color: #00599b; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a:after { background: url('../images/sprites-32x32-s47450c5f5b.png') 0 -26px no-repeat; border-bottom: 0; content: ""; display: inline-block; height: 16px; margin-left: 6px; width: 16px; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a:hover:after { background: url('../images/sprites-32x32-s47450c5f5b.png') 0 0 no-repeat; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li.ui-state-active a:after { background: url('../images/sprites-32x32-s47450c5f5b.png') 0 -78px no-repeat; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li.ui-state-active a:hover:after { background: url('../images/sprites-32x32-s47450c5f5b.png') 0 -52px no-repeat; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel { overflow: hidden; *zoom: 1; -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px; -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; border-top-right-radius: 3px; -moz-border-radius-bottomleft: 0; -webkit-border-bottom-left-radius: 0; border-bottom-left-radius: 0; -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; /* Restyle for smaller area*/ clear: both; display: block; background-color: #ECEFF1; border: 1px solid #ccc; border-bottom: 1px solid #ECEFF1; margin: 0; margin-top: 2px; max-width: 250px; padding: 8px 0 2px; position: absolute; z-index: 1; min-width: 190px; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel { overflow: hidden; *zoom: 1; -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px; -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; border-top-right-radius: 3px; -moz-border-radius-bottomleft: 0; -webkit-border-bottom-left-radius: 0; border-bottom-left-radius: 0; -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; /* Restyle for smaller area*/ clear: both; display: block; background-color: #f6f7f8; border: 1px solid #ccc; border-bottom: 1px solid #f6f7f8; margin: 0; margin-top: 2px; max-width: 250px; padding: 8px 0 2px; position: absolute; z-index: 1; min-width: 190px; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel h3, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel h4, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel h5 { font-weight: bold; line-height: 16px; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel h3 { font-size: 13px; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel h4 { font-size: 12px; margin: 5px 0; }
@ -1422,7 +1422,7 @@ visible. Added and removed with js in TabSet.js */ /***************************
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .cms-sitetree-information { border-bottom: 1px solid #e8e9eb; margin-bottom: 8px; padding: 0 20px 0 0; margin-right: 10px; margin-left: 10px; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .cms-sitetree-information p.meta-info { color: #999; font-size: 11px; line-height: 16px; margin-bottom: 8px; white-space: nowrap; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.ss-ui-button { width: 100%; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.ss-ui-button:hover, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.ss-ui-button:focus, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.ss-ui-button:active { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; background-color: #e0e5e8; outline: none; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.ss-ui-button:hover, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.ss-ui-button:focus, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.ss-ui-button:active { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; background-color: #ebedef; outline: none; }
.cms .ss-ui-action-tabset.action-menus.ss-tabset .last .ui-tabs-panel.ss-ui-action-tab { left: auto; right: -1px; }
.cms .cms-content-actions .Actions { overflow: visible; }

4
admin/css/screen.css.map
View File

File diff suppressed because one or more lines are too long

3
admin/javascript/LeftAndMain.Preview.js
View File

@ -453,6 +453,9 @@
this.setCurrentStateName(null);
}
// Mark url as a preview url so it can get special treatment
url += ((url.indexOf('?') === -1) ? '?' : '&') + 'CMSPreview=1';
// If this preview panel isn't visible at the moment, delay loading the URL until it (maybe) is later
if (this.is('.column-hidden')) {
this.setPendingURL(url);

2
admin/scss/_forms.scss
View File

@ -58,7 +58,6 @@ form.nostyle {
width: $grid-x * 22;
padding: $grid-y $grid-x $grid-y 0;
line-height: $grid-y * 2;
font-weight: bold;
}
&.right {
cursor: pointer;
@ -1146,4 +1145,3 @@ fieldset.switch-states{
}
}
}

33
admin/scss/_style.scss
View File

@ -348,11 +348,21 @@ body.cms {
&.active,
&:active {
background-color: #d4dbe1;
box-shadow: inset 0 0 3px rgba(191, 194, 196, .9);
}
&.font-icon-search {
padding: 5px 6px;
color:lighten($color-text, 10%);
&.active,
&:active,
&:focus,
&:hover {
background: none;
box-shadow: none;
color: darken($color-text, 10%);
}
&:before {
font-size: 18px;
@ -553,7 +563,7 @@ body.cms {
cursor: text;
a {
border-bottom: 4px solid #66727d;
border-bottom: 3px solid #66727d;
padding-left: 0;
padding-right: 0;
margin: 0 12px 0;
@ -770,10 +780,6 @@ body.cms {
padding: $grid-y*1.5 $grid-x*2;
z-index: 999;
border-top: 1px solid $color-light-separator;
@include box-shadow(
1px 0 0 $tab-panel-texture-color,
$box-shadow-shine 0 1px 0px inset,
$color-shadow-light 0 0 1px);
height: 28px;
background-color: $tab-panel-texture-color;
}
@ -1069,7 +1075,6 @@ body.cms {
overflow-x: hidden;
z-index: 70;
border-right: 1px solid $color-separator;
@include box-shadow($box-shadow-shine -1px 0 0 inset, 0 0 1px $color-shadow-light);
float: left;
position: relative;
@ -1082,8 +1087,7 @@ body.cms {
margin: 10px 0 $grid-y - 1;
padding-bottom: 2px;
line-height: $grid-y * 3;
@include doubleborder(bottom, $color-light-separator, $box-shadow-shine);
border-bottom: 1px solid $color-light-separator;
}
.cms-panel-content {
@ -1526,10 +1530,8 @@ form.member-profile-form {
.cms-panel {
overflow: hidden;
.cms-panel-toggle {
@include box-shadow(0 0 1px $box-shadow-shine);
&.south {
border-top: 1px solid darken($color-light-separator, 15%);
@include box-shadow(lighten($color-base, 4%) 0 1px 0px inset);
position: absolute;
bottom: 0;
width:100%;
@ -1562,7 +1564,6 @@ form.member-profile-form {
&.cms-content-tools .cms-panel-toggle {
&.south {
border-top: 1px solid $color-light-separator;
@include box-shadow($box-shadow-shine 0 1px 0px inset);
}
}
&.collapsed {
@ -1777,7 +1778,7 @@ form.member-profile-form {
border-top: 1px solid $color-light-separator;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
}
}
}
body.cms-dialog {
@ -1870,7 +1871,7 @@ body.cms-dialog {
width:100%;
height: 53px;
h3 {
h3{
padding: $grid-y*1.5 0 $grid-y*1.5 $grid-x*2;
margin: 0;
line-height: 28px;
@ -2253,7 +2254,3 @@ form.import-form {
.cms .cms-navigator > .cms-preview-toggle-link{
display:none;
}

6
admin/scss/themes/_default.scss
View File

@ -15,7 +15,7 @@ $color-brand-bg: #005a93 !default;
$color-brand: #43c7f4 !default;
/* Keep as solid colours transparent borders wont work in ie */
$color-darker-bg: #E6EAED !default;
$color-darker-bg: #f0f2f4 !default;
$color-dark-bg: #142136 !default;
$color-dark-separator: #19435c !default;
$color-medium-separator: #808080 !default;
@ -47,7 +47,7 @@ $color-text-light-link: white !default;
$color-text-disabled: #aaa !default;
$color-text-dark: #1f1f1f !default;
$color-text-dark-link: #3EBAE0 !default;
$color-text-blue-link:#0073C1 !default;
$color-text-blue-link: #0071c4 !default;
$color-text-shadow: white !default;
@ -76,7 +76,7 @@ $color-cms-batchactions-menu-selected-background: #fffcdc !default;
/** -----------------------------------------------
* Textures
* ----------------------------------------------- */
$tab-panel-texture-color: #ECEFF1 !default;
$tab-panel-texture-color: #f6f7f8 !default;
$tab-panel-texture-background: $tab-panel-texture-color url(../images/textures/bg_cms_main_content.png) repeat top left !default;
/** -----------------------------------------------

4
core/Object.php
View File

@ -923,7 +923,7 @@ abstract class Object {
if(!empty($this->beforeExtendCallbacks[$method])) {
foreach(array_reverse($this->beforeExtendCallbacks[$method]) as $callback) {
$value = call_user_func($callback, $a1, $a2, $a3, $a4, $a5, $a6, $a7);
$value = call_user_func_array($callback, array(&$a1, &$a2, &$a3, &$a4, &$a5, &$a6, &$a7));
if($value !== null) $values[] = $value;
}
$this->beforeExtendCallbacks[$method] = array();
@ -940,7 +940,7 @@ abstract class Object {
if(!empty($this->afterExtendCallbacks[$method])) {
foreach(array_reverse($this->afterExtendCallbacks[$method]) as $callback) {
$value = call_user_func($callback, $a1, $a2, $a3, $a4, $a5, $a6, $a7);
$value = call_user_func_array($callback, array(&$a1, &$a2, &$a3, &$a4, &$a5, &$a6, &$a7));
if($value !== null) $values[] = $value;
}
$this->afterExtendCallbacks[$method] = array();

4
css/AssetUploadField.css
View File

@ -20,7 +20,7 @@ Used in side panels and action tabs
.backlink { padding-left: 12px; }
body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fieldset { overflow: auto; background: #E2E2E2; }
body.cms.ss-uploadfield-edit-iframe span.readonly, .composite.ss-assetuploadfield .details fieldset span.readonly { font-style: italic; color: #9ba5ae; text-shadow: 0px 1px 0px #fff; }
body.cms.ss-uploadfield-edit-iframe span.readonly, .composite.ss-assetuploadfield .details fieldset span.readonly { font-style: italic; color: #7f8b97; text-shadow: 0px 1px 0px #fff; }
body.cms.ss-uploadfield-edit-iframe .fieldholder-small label, .composite.ss-assetuploadfield .details fieldset .fieldholder-small label { margin-left: 0; }
.composite.ss-assetuploadfield .details fieldset { padding: 16px; }
@ -45,7 +45,7 @@ body.cms.ss-uploadfield-edit-iframe .fieldholder-small label, .composite.ss-asse
.ss-assetuploadfield .ss-uploadfield-files .ui-state-error .ss-uploadfield-item-info .ss-uploadfield-item-name { width: 100%; cursor: default; background: #bcb9b9; background: rgba(201, 198, 198, 0.9); }
.ss-assetuploadfield .ss-uploadfield-files .ui-state-error .ss-uploadfield-item-info .ss-uploadfield-item-name .name { text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.7); }
.ss-assetuploadfield .ss-uploadfield-files .ui-state-warning .ss-uploadfield-item-info { background-color: #E9D104; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U1ZDMzYiIvPjxzdG9wIG9mZnNldD0iOCUiIHN0b3AtY29sb3I9IiNlMmNlMjQiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iI2QxYmUxYyIvPjxzdG9wIG9mZnNldD0iNTQlIiBzdG9wLWNvbG9yPSIjZDFiZDFjIi8+PHN0b3Agb2Zmc2V0PSI5NiUiIHN0b3AtY29sb3I9IiNkMDlhMWEiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNjZjg3MWEiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e5d33b), color-stop(8%, #e2ce24), color-stop(50%, #d1be1c), color-stop(54%, #d1bd1c), color-stop(96%, #d09a1a), color-stop(100%, #cf871a)); background-image: -moz-linear-gradient(top, #e5d33b 0%, #e2ce24 8%, #d1be1c 50%, #d1bd1c 54%, #d09a1a 96%, #cf871a 100%); background-image: -webkit-linear-gradient(top, #e5d33b 0%, #e2ce24 8%, #d1be1c 50%, #d1bd1c 54%, #d09a1a 96%, #cf871a 100%); background-image: linear-gradient(to bottom, #e5d33b 0%, #e2ce24 8%, #d1be1c 50%, #d1bd1c 54%, #d09a1a 96%, #cf871a 100%); }
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name { position: relative; z-index: 1; margin: 3px 0 3px 50px; width: 50%; color: #7f8c97; background: #eeeded; background: rgba(255, 255, 255, 0.8); -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; line-height: 24px; height: 22px; padding: 0 5px; text-align: left; cursor: pointer; display: table; table-layout: fixed; }
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name { position: relative; z-index: 1; margin: 3px 0 3px 50px; width: 50%; color: #66727d; background: #eeeded; background: rgba(255, 255, 255, 0.8); -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; line-height: 24px; height: 22px; padding: 0 5px; text-align: left; cursor: pointer; display: table; table-layout: fixed; }
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .name { text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.5); display: inline; float: left; max-width: 50%; font-weight: normal; padding: 0 5px 0 0; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .ss-uploadfield-item-status { position: relative; float: right; padding: 0 0 0 5px; max-width: 30%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.5); }
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-error-text { text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.6); color: #cc0000; }

2
css/GridField.css
View File

@ -43,7 +43,7 @@ Used in side panels and action tabs
.cms table.ss-gridfield-table tbody td.col-buttons { width: 1px; padding: 0 8px; text-align: right; white-space: nowrap; }
.cms table.ss-gridfield-table tbody td.col-listChildrenLink { width: 16px; border-right: none; text-indent: -9999em; padding: 0; }
.cms table.ss-gridfield-table tbody td.col-listChildrenLink .list-children-link { background: transparent url(../images/sitetree_ss_default_icons.png) no-repeat 3px -4px; display: block; }
.cms table.ss-gridfield-table tbody td.col-getTreeTitle span.item { color: #0073C1; }
.cms table.ss-gridfield-table tbody td.col-getTreeTitle span.item { color: #0071c4; }
.cms table.ss-gridfield-table tbody td.col-getTreeTitle span.badge { clear: both; text-transform: uppercase; display: inline-block; padding: 0px 3px; font-size: 0.75em; line-height: 1em; margin-left: 10px; margin-right: 6px; margin-top: -1px; -moz-border-radius: 2px / 2px; -webkit-border-radius: 2px 2px; border-radius: 2px / 2px; }
.cms table.ss-gridfield-table tbody td.col-getTreeTitle span.badge.status-modified { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
.cms table.ss-gridfield-table tbody td.col-getTreeTitle span.badge.status-addedtodraft { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }

4
css/GridField.css.map
View File

@ -1,7 +1,7 @@
{
"version": 3,
"mappings": "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",
"sources": ["../scss/GridField.scss","../admin/scss/themes/_default.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_text-shadow.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_inline-block.scss","../admin/scss/_mixins.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_border-radius.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../scss/_elementMixins.scss"],
"mappings": "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",
"sources": ["../scss/GridField.scss","../admin/scss/themes/_default.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_text-shadow.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_inline-block.scss","../admin/scss/_mixins.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_border-radius.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../scss/_elementMixins.scss"],
"names": [],
"file": "GridField.css"
}

2
css/TreeDropdownField.css.map
View File

@ -1,7 +1,7 @@
{
"version": 3,
"mappings": "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",
"sources": ["../scss/TreeDropdownField.scss","../admin/scss/_mixins.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_box-sizing.scss"],
"sources": ["../scss/TreeDropdownField.scss","../admin/scss/_mixins.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_box-sizing.scss"],
"names": [],
"file": "TreeDropdownField.css"
}

4
css/UploadField.css
View File

@ -20,7 +20,7 @@ Used in side panels and action tabs
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info { margin-left: 95px; }
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name { display: block; line-height: 13px; height: 26px; margin: 0; text-align: left; }
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .name { max-width: 240px; font-weight: bold; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; display: inline; float: left; }
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .size { color: #a9b2b9; padding: 0 0 0 5px; display: inline; float: left; }
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .size { color: #8d98a2; padding: 0 0 0 5px; display: inline; float: left; }
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status { float: right; padding: 0 0 0 5px; text-align: right; max-width: 75%; }
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-error-text { color: #f00; font-weight: bold; width: 150px; }
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-warning-text { color: #b7a403; }
@ -35,7 +35,7 @@ Used in side panels and action tabs
.ss-uploadfield .ss-ui-button { display: block; float: left; margin: 0 10px 6px 0; }
.ss-uploadfield .ss-ui-button.ss-uploadfield-fromcomputer { position: relative; overflow: hidden; }
.ss-uploadfield .ss-uploadfield-files { margin: 0; padding: 0; overflow: auto; position: relative; }
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item, .ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item.ui-state-error { border: 0; border-bottom: 1px solid #b3b3b3; background: none; color: #66727d; }
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item, .ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item.ui-state-error { border: 0; border-bottom: 1px solid #b3b3b3; background: none; color: #4f5861; }
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item:last-child, .ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item.ui-state-error:last-child { border-bottom: 0; }
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-actions { min-height: 28px; overflow: hidden; margin: 6px 0 -6px 0; position: relative; }
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-progress { position: absolute; left: 0; right: 42px; width: auto; margin: 11px 0 0; height: 15px; }

2
css/debug.css.map
View File

@ -1,7 +1,7 @@
{
"version": 3,
"mappings": "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",
"sources": ["../scss/debug.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_border-radius.scss","../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_box-shadow.scss"],
"sources": ["../scss/debug.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_images.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/_support.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_border-radius.scss","../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/css3/_box-shadow.scss"],
"names": [],
"file": "debug.css"
}

42
docs/en/02_Developer_Guides/00_Model/02_Relations.md
View File

@ -59,6 +59,48 @@ The relationship can also be navigated in [templates](../templates).
<% end_if %>
<% end_with %>
## Polymorphic has_one
A has_one can also be polymorphic, which allows any type of object to be associated.
This is useful where there could be many use cases for a particular data structure.
An additional column is created called "`<relationship-name>`Class", which along
with the ID column identifies the object.
To specify that a has_one relation is polymorphic set the type to 'DataObject'.
Ideally, the associated has_many (or belongs_to) should be specified with dot notation.
::php
class Player extends DataObject {
private static $has_many = array(
"Fans" => "Fan.FanOf"
);
}
class Team extends DataObject {
private static $has_many = array(
"Fans" => "Fan.FanOf"
);
}
// Type of object returned by $fan->FanOf() will vary
class Fan extends DataObject {
// Generates columns FanOfID and FanOfClass
private static $has_one = array(
"FanOf" => "DataObject"
);
}
<div class="warning" markdown='1'>
Note: The use of polymorphic relationships can affect query performance, especially
on joins, and also increases the complexity of the database and necessary user code.
They should be used sparingly, and only where additional complexity would otherwise
be necessary. E.g. Additional parent classes for each respective relationship, or
duplication of code.
</div>
## has_many
Defines 1-to-many joins. As you can see from the previous example, `$has_many` goes hand in hand with `$has_one`.

232
docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md
View File

@ -1,13 +1,22 @@
title: SQLSelect
summary: Write and modify direct database queries through SQLSelect.
title: SQL Queries
summary: Write and modify direct database queries through SQLExpression subclasses.
# SQLSelect
A [api:SQLSelect] object represents a SQL query, which can be serialized into a SQL statement. Dealing with low-level
SQL such as `mysql_query()` is not encouraged, since the ORM provides powerful abstraction API's.
## Introduction
For example, if you want to run a simple `COUNT` SQL statement, the following three statements are functionally
equivalent:
An object representing a SQL select query, which can be serialized into a SQL statement.
It is easier to deal with object-wrappers than string-parsing a raw SQL-query.
This object is used by the SilverStripe ORM internally.
Dealing with low-level SQL is not encouraged, since the ORM provides
powerful abstraction APIs (see [datamodel](/developer_guides/data_model_and_orm).
Starting with SilverStripe 3, records in collections are lazy loaded,
and these collections have the ability to run efficient SQL
such as counts or returning a single column.
For example, if you want to run a simple `COUNT` SQL statement,
the following three statements are functionally equivalent:
:::php
// Through raw SQL.
@ -20,32 +29,50 @@ equivalent:
// Through the ORM.
$count = Member::get()->count();
If you do use raw SQL, you'll run the risk of breaking
various assumptions the ORM and code based on it have:
<div class="info">
The SQLSelect object is used by the SilverStripe ORM internally. By understanding SQLSelect, you can modify the SQL that
the ORM creates.
* Custom getters/setters (object property can differ from database column)
* DataObject hooks like onBeforeWrite() and onBeforeDelete()
* Automatic casting
* Default values set through objects
* Database abstraction
We'll explain some ways to use *SELECT* with the full power of SQL,
but still maintain a connection to the ORM where possible.
<div class="warning" markdown="1">
Please read our [security topic](/developer_guides/security) to find out
how to properly prepare user input and variables for use in queries
</div>
## Usage
### Select
### SELECT
Selection can be done by creating an instance of `SQLSelect`, which allows
management of all elements of a SQL SELECT query, including columns, joined tables,
conditional filters, grouping, limiting, and sorting.
E.g.
:::php
<?php
$sqlQuery = new SQLSelect();
$sqlQuery->setFrom('Player');
$sqlQuery->selectField('FieldName', 'Name');
$sqlQuery->selectField('YEAR("Birthday")', 'Birthyear');
$sqlQuery->addLeftJoin('Team','"Player"."TeamID" = "Team"."ID"');
$sqlQuery->addWhere(array('YEAR("Birthday") = ?' => 1982));
// $sqlQuery->setOrderBy(...);
// $sqlQuery->setGroupBy(...);
// $sqlQuery->setHaving(...);
// $sqlQuery->setLimit(...);
// $sqlQuery->setDistinct(true);
// Get the raw SQL (optional)
$rawSQL = $sqlQuery->sql();
// Get the raw SQL (optional) and parameters
$rawSQL = $sqlQuery->sql($parameters);
// Execute and return a Query object
$result = $sqlQuery->execute();
@ -55,53 +82,194 @@ the ORM creates.
echo $row['BirthYear'];
}
The `$result` is an array lightly wrapped in a database-specific subclass of `[api:Query]`. This class implements the
*Iterator*-interface, and provides convenience-methods for accessing the data.
The result of `SQLSelect::execute()` is an array lightly wrapped in a database-specific subclass of `[api:SS_Query]`.
This class implements the *Iterator*-interface, and provides convenience-methods for accessing the data.
### Delete
### DELETE
Deletion can be done either by calling `DB::query`/`DB::prepared_query` directly,
by creating a `SQLDelete` object, or by transforming a `SQLQuery` into a `SQLDelete`
object instead.
For example, creating a `SQLDelete` object
:::php
$sqlQuery->setDelete(true);
<?php
### Insert / Update
$query = SQLDelete::create()
->setFrom('"SiteTree"')
->setWhere(array('"SiteTree"."ShowInMenus"' => 0));
$query->execute();
<div class="alert" markdown="1">
Currently not supported through the `SQLSelect` class, please use raw `DB::query()` calls instead.
</div>
Alternatively, turning an existing `SQLQuery` into a delete
:::php
DB::query('UPDATE "Player" SET "Status"=\'Active\'');
<?php
### Joins
$query = SQLQuery::create()
->setFrom('"SiteTree"')
->setWhere(array('"SiteTree"."ShowInMenus"' => 0))
->toDelete();
$query->execute();
Directly querying the database
:::php
<?php
DB::prepared_query('DELETE FROM "SiteTree" WHERE "SiteTree"."ShowInMenus" = ?', array(0));
### INSERT/UPDATE
INSERT and UPDATE can be performed using the `SQLInsert` and `SQLUpdate` classes.
These both have similar aspects in that they can modify content in
the database, but each are different in the way in which they behave.
Previously, similar operations could be performed by using the `DB::manipulate`
function which would build the INSERT and UPDATE queries on the fly. This method
still exists, but internally uses `SQLUpdate` / `SQLInsert`, although the actual
query construction is now done by the `DBQueryBuilder` object.
Each of these classes implements the interface `SQLWriteExpression`, noting that each
accepts write key/value pairs in a number of similar ways. These include the following
api methods:
* `addAssignments` - Takes a list of assignments as an associative array of key -> value pairs,
but also supports SQL expressions as values if necessary.
* `setAssignments` - Replaces all existing assignments with the specified list
* `getAssignments` - Returns all currently given assignments, as an associative array
in the format `array('Column' => array('SQL' => array('parameters)))`
* `assign` - Singular form of addAssignments, but only assigns a single column value.
* `assignSQL` - Assigns a column the value of a specified SQL expression without parameters
`assignSQL('Column', 'SQL)` is shorthand for `assign('Column', array('SQL' => array()))`
SQLUpdate also includes the following api methods:
* `clear` - Clears all assignments
* `getTable` - Gets the table to update
* `setTable` - Sets the table to update. This should be ANSI quoted.
E.g. `$query->setTable('"SiteTree"');`
SQLInsert also includes the following api methods:
* `clear` - Clears all rows
* `clearRow` - Clears all assignments on the current row
* `addRow` - Adds another row of assignments, and sets the current row to the new row
* `addRows` - Adds a number of arrays, each representing a list of assignment rows,
and sets the current row to the last one.
* `getColumns` - Gets the names of all distinct columns assigned
* `getInto` - Gets the table to insert into
* `setInto` - Sets the table to insert into. This should be ANSI quoted.
E.g. `$query->setInto('"SiteTree"');`
E.g.
:::php
<?php
$update = SQLUpdate::create('"SiteTree"')->where(array('ID' => 3));
// assigning a list of items
$update->addAssignments(array(
'"Title"' => 'Our Products',
'"MenuTitle"' => 'Products'
));
// Assigning a single value
$update->assign('"MenuTitle"', 'Products');
// Assigning a value using parameterised expression
$title = 'Products';
$update->assign('"MenuTitle"', array(
'CASE WHEN LENGTH("MenuTitle") > LENGTH(?) THEN "MenuTitle" ELSE ? END' =>
array($title, $title)
));
// Assigning a value using a pure SQL expression
$update->assignSQL('"Date"', 'NOW()');
// Perform the update
$update->execute();
In addition to assigning values, the SQLInsert object also supports multi-row
inserts. For database connectors and API that don't have multi-row insert support
these are translated internally as multiple single row inserts.
For example,
:::php
<?php
$insert = SQLInsert::create('"SiteTree"');
// Add multiple rows in a single call. Note that column names do not need
// to be symmetric
$insert->addRows(array(
array('"Title"' => 'Home', '"Content"' => '<p>This is our home page</p>'),
array('"Title"' => 'About Us', '"ClassName"' => 'AboutPage')
));
// Adjust an assignment on the last row
$insert->assign('"Content"', '<p>This is about us</p>');
// Add another row
$insert->addRow(array('"Title"' => 'Contact Us'));
$columns = $insert->getColumns();
// $columns will be array('"Title"', '"Content"', '"ClassName"');
$insert->execute();
### Value Checks
Raw SQL is handy for performance-optimized calls,
e.g. when you want a single column rather than a full-blown object representation.
Example: Get the count from a relationship.
:::php
$sqlQuery = new SQLSelect();
$sqlQuery->setFrom('Player');
$sqlQuery->addSelect('COUNT("Player"."ID")');
$sqlQuery->addWhere(array('"Team"."ID" => 99));
$sqlQuery->addWhere(array('"Team"."ID"' => 99));
$sqlQuery->addLeftJoin('Team', '"Team"."ID" = "Player"."TeamID"');
$count = $sqlQuery->execute()->value();
Note that in the ORM, this call would be executed in an efficient manner as well:
:::php
$count = $myTeam->Players()->count();
### Mapping
Creates a map based on the first two columns of the query result.
This can be useful for creating dropdowns.
Example: Show player names with their birth year, but set their birth dates as values.
:::php
$sqlQuery = new SQLSelect();
$sqlQuery->setFrom('Player');
$sqlQuery->setSelect('ID');
$sqlQuery->setSelect('Birthdate');
$sqlQuery->selectField('CONCAT("Name", ' - ', YEAR("Birthdate")', 'NameWithBirthyear');
$map = $sqlQuery->execute()->map();
$field = new DropdownField('Birthdates', 'Birthdates', $map);
echo $map;
Note that going through SQLSelect is just necessary here
because of the custom SQL value transformation (`YEAR()`).
An alternative approach would be a custom getter in the object definition.
// returns array(
// 1 => "Foo - 1920",
// 2 => "Bar - 1936"
// );
:::php
class Player extends DataObject {
private static $db = array(
'Name' => 'Varchar',
'Birthdate' => 'Date'
);
function getNameWithBirthyear() {
return date('y', $this->Birthdate);
}
}
$players = Player::get();
$map = $players->map('Name', 'NameWithBirthyear');
## Related Documentation
## Related
* [Introduction to the Data Model and ORM](data_model_and_orm)

5
docs/en/02_Developer_Guides/00_Model/10_Versioning.md
View File

@ -27,6 +27,11 @@ The extension is automatically applied to `SiteTree` class. For more information
[Extending](../extending) and the [Configuration](../configuration) documentation.
</div>
<div class="warning" markdown="1">
Versioning only works if you are adding the extension to the base class. That is, the first subclass
of `DataObject`. Adding this extension to children of the base class will have unpredictable behaviour.
</div>
## Database Structure
Depending on how many stages you configured, two or more new tables will be created for your records. In the above, this

43
docs/en/04_Changelogs/rc/3.3.0-rc1.md Normal file
View File

@ -0,0 +1,43 @@
# 3.3.0-rc1
## Upgrading notes
### New permission model for Versioned DataObjects
When adding the `Versioned` extension to dataobjects, typically it's necessary to explicitly declare
permissions on these objects in order to prevent un-published content surfacing to unauthenticated users.
In order to better support this, versioned by default will now deny canView permissions on objects
that are not published.
For more information on how to customise the permission model for versioned dataobjects then please
refer to the [versioned extension documentation](../../developer_guides/model/versioning).
### Block ?stage=Stage for unauthenticated users
By default users must now be logged in with CMS access permissions in order to change the viewing
mode of the site frontend using the `?stage` querystring parameter.
This permission can be customised by altering the `Versioned.non_live_permissions`
config by assigning a different set of permissions.
<!--- Changes below this line will be automatically regenerated -->
## Change Log
### Bugfixes
* 2016-01-22 [f80467a](https://github.com/silverstripe/silverstripe-cms/commit/f80467a74859fba58be835a878ceddbbb4601b42) Don't keep stale treeview data when refreshing Content area (Damian Mooyman)
* 2016-01-22 [bf8bf5e](https://github.com/silverstripe/silverstripe-framework/commit/bf8bf5e4d558126bb99ea63881f1885faafddd3d) Prevent Versioned::doRollbackTo from creating incorrect versions on subclasses of Versioned DataObjects (Damian Mooyman)
* 2016-01-21 [cca7129](https://github.com/silverstripe/silverstripe-framework/commit/cca7129385dbb3be1001a8861423c2cf490f02d4) Revert lost documentation (Damian Mooyman)
* 2016-01-21 [e364fdb](https://github.com/silverstripe/silverstripe-cms/commit/e364fdb794896b5c6b4810d84c0dfac75d80b53b) Fix incorrect "Add Page" button selector (Damian Mooyman)
* 2016-01-20 [abc5556](https://github.com/silverstripe/silverstripe-cms/commit/abc5556520f891d0e3f5cf3d2c3838a194ac5335) Fix legacy breadcrumbs appearing on page save (Damian Mooyman)
* 2016-01-20 [df76d78](https://github.com/silverstripe/silverstripe-framework/commit/df76d783fe1f7baaeed67a7c6d63235facd364cd) Fix VersionedTest sometimes failing given certain querystring arguments (Damian Mooyman)
* 2016-01-20 [7c4e6f4](https://github.com/silverstripe/silverstripe-cms/commit/7c4e6f4b60567268ed879081823598438c90e729) prevent "Home page" being selected when no selection was made (Damian Mooyman)
* 2016-01-11 [85ba918](https://github.com/silverstripe/silverstripe-framework/commit/85ba918a54f51dd524d45f2c93172a18421ae3bf) Update field IDs for file link (fixes silverstripe/silverstripe-cms#1307) (Loz Calver)
* 2016-01-11 [d637141](https://github.com/silverstripe/silverstripe-cms/commit/d6371414876e32e7369ec0219a57d2186cfe3f0f) preg_quote() anchors in SiteTreeLinkTracking (fixes #1359) (Loz Calver)
* 2016-01-05 [00544ff](https://github.com/silverstripe/silverstripe-framework/commit/00544ff100048afdb7ccb1905304dddf8ab3205a) session_regenerate_id uses config system (Daniel Hensby)
* 2016-01-05 [4335d8e](https://github.com/silverstripe/silverstripe-framework/commit/4335d8ed221a2b402299b32e31f97fc2956ec161) Members with no ID inherit logged in user permission (Daniel Hensby)
* 2016-01-02 [b30d335](https://github.com/silverstripe/silverstripe-cms/commit/b30d33585f4640950dc573b9fa283c0db7b5f14c) Adding context parameter to canCreate-check in getClassDropdown of SiteTree (fixes #1334) (Stephan Bauer)
* 2016-01-02 [95e96fa](https://github.com/silverstripe/silverstripe-framework/commit/95e96fa2b2d0db9e26f8c716ee3d5e1a26ee09df) jquery.jstree patched to improve drag-and-drop handling (fixes #4881) (Stephan Bauer)
* 2015-11-18 [e9b833f](https://github.com/silverstripe/silverstripe-framework/commit/e9b833f5f0f989af8d611f8cfe71f0b0e2cb0159) ConfirmedPassword field correctly reports mismatching passwords (Christopher Darling)

4
docs/en/05_Contributing/01_Code.md
View File

@ -125,8 +125,8 @@ If you're familiar with it, here's the short version of what you need to know. O
* **Squash your commits, so that each commit addresses a single issue.** After you rebase your work on top of the upstream master, you can squash multiple commits into one. Say, for instance, you've got three commits in related to Issue #100. Squash all three into one with the message "Description of the issue here (fixes #100)" We won't accept pull requests for multiple commits related to a single issue; it's up to you to squash and clean your commit tree. (Remember, if you squash commits you've already pushed to GitHub, you won't be able to push that same branch again. Create a new local branch, squash, and push the new squashed branch.)
* **Choose the correct branch**: Assume the current release is 3.0.3, and 3.1.0 is in beta state.
Most pull requests should go against the `3.1.x-dev` *pre-release branch*, only critical bugfixes
against the `3.0.x-dev` *release branch*. If you're changing an API or introducing a major feature,
Most pull requests should go against the `3.1` *pre-release branch*, only critical bugfixes
against the `3.0` *release branch*. If you're changing an API or introducing a major feature,
the pull request should go against `master` (read more about our [release process](release_process)). Branches are periodically merged "upwards" (3.0 into 3.1, 3.1 into master).
### Editing files directly on GitHub.com

3
lang/af.yml
View File

@ -22,7 +22,6 @@ af:
FROMCOMPUTER: 'Kies lêers van jou rekenaar af'
FROMCOMPUTERINFO: 'Laai op van jou rekenaar af'
TOTAL: Totaal
TOUPLOAD: 'Kies lêers om op te laai...'
UPLOADINPROGRESS: 'Wag asseblief... ons is besig om op te laai'
UPLOADOR: OF
BBCodeParser:
@ -207,7 +206,6 @@ af:
IMAGETITLETEXT: 'Titel teks (leidraad)'
IMAGETITLETEXTDESC: 'Vir meer inligting oor die prentjie'
IMAGEWIDTHPX: Wydte
INSERTMEDIA: 'Voeg Media In'
LINK: 'Sit skakel in'
LINKANCHOR: 'Anker op hierdie bladsy'
LINKDESCR: 'Skakel beskrywing'
@ -218,7 +216,6 @@ af:
LINKOPENNEWWIN: 'Wil jy die skakel in ''n nuwe venster oop maak?'
LINKTO: 'Koppel aan'
PAGE: Bladsy
UpdateMEDIA: 'Verander Media'
Image:
PLURALNAME: Lêers
SINGULARNAME: Lêer

4
lang/ar.yml
View File

@ -24,7 +24,6 @@ ar:
FROMCOMPUTER: 'اختر ملفات من جهاز الكمبيوتر الخاص بك'
FROMCOMPUTERINFO: 'حمل من جهاز الكمبيوتر الخاص بك'
TOTAL: الكلي
TOUPLOAD: 'قم باختيار ملفات لتحميلها'
UPLOADINPROGRESS: 'يرجى الانتظار ...جار التحميل'
UPLOADOR: أو
BBCodeParser:
@ -121,7 +120,6 @@ ar:
INVALID_REQUEST: 'طلب غير صحيح'
DropdownField:
CHOOSE: (اختر)
CHOOSESEARCH: '(اختار أو ابحث)'
EmailField:
VALIDATION: 'يرجى إدخال عنوان بريد إلكتروني'
Enum:
@ -269,7 +267,6 @@ ar:
IMAGETITLETEXT: 'عنوان النص (أداة التلميح)'
IMAGETITLETEXTDESC: 'للمزيد من المعلومات حول الصورة'
IMAGEWIDTHPX: العرض
INSERTMEDIA: 'قم بإدراج وسائط'
LINK: 'رابط'
LINKANCHOR: 'ربط على هذه الصفحة'
LINKDESCR: 'وصف الرابط'
@ -282,7 +279,6 @@ ar:
PAGE: صفحة
URL: رابط
URLNOTANOEMBEDRESOURCE: 'عنوان الموقع لا يمكن أن يتحول إلى مصدر وسائط. ''{URL}'''
UpdateMEDIA: 'تحديث الوسائط'
Image:
PLURALNAME: الملفات
SINGULARNAME: الملف

2
lang/bg.yml
View File

@ -196,7 +196,6 @@ bg:
IMAGETITLETEXT: 'Описание (tooltip)'
IMAGETITLETEXTDESC: 'Допълнителна информация към изображението'
IMAGEWIDTHPX: Широчина
INSERTMEDIA: 'Вмъкване на медиа'
LINK: 'Връзка'
LINKANCHOR: 'Котва на тази страница'
LINKDESCR: 'Описание на препратка'
@ -208,7 +207,6 @@ bg:
LINKTO: 'Препратка към'
PAGE: Страница
URLNOTANOEMBEDRESOURCE: 'URL адресът ''{url}'' не може да бъде превърнат в медиен ресурс.'
UpdateMEDIA: 'Актуализация на медиа'
Image_iframe_ss:
TITLE: 'Iframe за качване на изображение'
LeftAndMain:

13
lang/cs.yml
View File

@ -1,5 +1,7 @@
cs:
AssetAdmin:
ALLOWEDEXTS: 'Povolené extenze nahraní souboru'
HIDEALLOWEDEXTS: 'Skrýt povolené extenze'
NEWFOLDER: Nová složka
SHOWALLOWEDEXTS: 'Ukázat povolené extenze'
AssetTableField:
@ -7,12 +9,14 @@ cs:
DIM: Rozměry
FILENAME: Název souboru
FOLDER: Složka
HEIGHT: Výška
LASTEDIT: 'Naposledy změněno'
OWNER: Vlastník
SIZE: 'Velikost'
TITLE: Titulek
TYPE: 'Typ'
URL: URL
WIDTH: Šířka
AssetUploadField:
ChooseFiles: 'Vyberte soubory'
DRAGFILESHERE: 'Táhni soubory sem'
@ -23,8 +27,10 @@ cs:
FILES: Soubory
FROMCOMPUTER: 'Vyberte soubory z vašeho počítače'
FROMCOMPUTERINFO: 'Nahrát z vašeho počítače'
INSERTURL: 'Vložit z URL'
REMOVEINFO: 'Odstranit tento soubor z tohoto pole'
TOTAL: Celkem
TOUPLOAD: 'Vyberte soubory k nahrání...'
TOUPLOAD: 'Nahrát soubory'
UPLOADINPROGRESS: 'Prosím čekejte... probíhá nahrávání'
UPLOADOR: NEBO
BBCodeParser:
@ -147,7 +153,7 @@ cs:
INVALID_REQUEST: 'Neplatný požadavek'
DropdownField:
CHOOSE: (Vyberte)
CHOOSESEARCH: '(Vybrat nebo vyhledat)'
CHOOSESEARCH: '(vyberte složku)'
SOURCE_VALIDATION: 'Prosím vyberte hodnotu v seznamu. {value} není platná volba'
EmailField:
VALIDATION: 'Prosím zadejte e-mailovou adresu'
@ -303,7 +309,7 @@ cs:
IMAGETITLETEXT: 'Titulek textu (tooltip)'
IMAGETITLETEXTDESC: 'Pro další informace o obrázku'
IMAGEWIDTHPX: Šířka
INSERTMEDIA: 'Vložit média'
INSERTMEDIA: 'Vložit média z'
LINK: 'Vložit nebo upravit odkaz'
LINKANCHOR: 'Záložka (kotva) na stránce'
LINKDESCR: 'Popis odkazu'
@ -316,6 +322,7 @@ cs:
PAGE: Stránku
SUBJECT: 'Předmět emailu'
URL: URL
URLDESCRIPTION: 'Vložit videa a obrázky z webu do Vaší stránky, prostým zadáním URL souboru. Ujistěte se, že máte patřičná práva před zdílením médií z webu.<br /><br />Prosím, uvědomte si, že soubory nejsou přidány do úložiště CMS, ale soubor je vestavěn z jeho původního umístění, když z nějakých důvodú soubor není dostupný v jeho původním umístění, nebude zobrazitelný na této stránce.'
URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' nemůže být vloženo do zdroje médií.'
UpdateMEDIA: 'Aktualizovat média'
Image:

4
lang/de.yml
View File

@ -24,7 +24,6 @@ de:
FROMCOMPUTER: 'Dateien auf Ihrem Computer auswählen'
FROMCOMPUTERINFO: 'Von Ihrem Computer hochladen'
TOTAL: Insgesamt
TOUPLOAD: 'Dateien für den Upload wählen...'
UPLOADINPROGRESS: 'Bitte warten sie... Upload im Gang'
UPLOADOR: oder
BBCodeParser:
@ -147,7 +146,6 @@ de:
INVALID_REQUEST: 'Ungültige Anfrage'
DropdownField:
CHOOSE: (Auswahl)
CHOOSESEARCH: '(Auswählen oder Suchen)'
SOURCE_VALIDATION: 'Bitte wählen Sie aus der Liste. {value} ist kein gültiger Wert'
EmailField:
VALIDATION: 'Bitte geben Sie eine E-Mail-Adresse ein'
@ -303,7 +301,6 @@ de:
IMAGETITLETEXT: 'Titeltext (Tooltip)'
IMAGETITLETEXTDESC: 'Weiterführende Informationen über das Bild'
IMAGEWIDTHPX: Breite (px)
INSERTMEDIA: 'Medienobjekt einfügen'
LINK: 'Verweis einfügen'
LINKANCHOR: 'Anker auf dieser Seite'
LINKDESCR: 'Beschreibung des Verweises'
@ -317,7 +314,6 @@ de:
SUBJECT: 'E-Mail-Betreff'
URL: URL
URLNOTANOEMBEDRESOURCE: 'Die URL ''{url}'' konnte nicht in eine Medienquelle umgewandelt werden'
UpdateMEDIA: 'Medienobjekt aktualisieren'
Image:
PLURALNAME: Dateien
SINGULARNAME: Datei

2
lang/en.yml
View File

@ -336,7 +336,7 @@ en:
LeftAndMain:
CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
DELETED: Deleted.
DropdownBatchActionsDefault: Actions
DropdownBatchActionsDefault: 'Choose an action...'
HELP: Help
PAGETYPE: 'Page type'
PERMAGAIN: 'You have been logged out of the CMS. If you would like to log in again, enter a username and password below.'

4
lang/eo.yml
View File

@ -24,7 +24,6 @@ eo:
FROMCOMPUTER: 'Elekti dosierojn el via komputilo'
FROMCOMPUTERINFO: 'Alŝuti el via komputilo'
TOTAL: Totalo
TOUPLOAD: 'Elekti dosierojn alŝutotajn...'
UPLOADINPROGRESS: 'Bonvolu atendi...alŝuto daŭras'
UPLOADOR: AŬ
BBCodeParser:
@ -147,7 +146,6 @@ eo:
INVALID_REQUEST: 'Malvalida peto'
DropdownField:
CHOOSE: (Elekti)
CHOOSESEARCH: '(Elekti aŭ serĉi)'
SOURCE_VALIDATION: 'Bonvolu elekti valoron el la listo donita. {value} ne estas valida agordo'
EmailField:
VALIDATION: 'Bonvolu enigi readreson'
@ -303,7 +301,6 @@ eo:
IMAGETITLETEXT: 'Teksto de titolo (ŝpruchelpilo)'
IMAGETITLETEXTDESC: 'Por plua informo pri la bildo'
IMAGEWIDTHPX: Larĝo
INSERTMEDIA: 'Enmeti memorilon'
LINK: 'Ligilo'
LINKANCHOR: 'Ankri al ĉi tiu paĝo'
LINKDESCR: 'Ligila priskribo'
@ -317,7 +314,6 @@ eo:
SUBJECT: 'Temo de retpoŝto'
URL: URL
URLNOTANOEMBEDRESOURCE: 'La URL ''{url}'' ne estas konvertebla al memorilo.'
UpdateMEDIA: 'Ĝisdatigi memorilon'
Image:
PLURALNAME: Dosieroj
SINGULARNAME: Dosiero

4
lang/es.yml
View File

@ -24,7 +24,6 @@ es:
FROMCOMPUTER: 'Seleccione los archivos desde su ordenador'
FROMCOMPUTERINFO: 'Subir archivos desde tu ordenador'
TOTAL: Total
TOUPLOAD: 'Seleccione los archivos a subir...'
UPLOADINPROGRESS: 'Por favor espere .... carga en curso'
UPLOADOR: O
BBCodeParser:
@ -144,7 +143,6 @@ es:
INVALID_REQUEST: 'Solicitud no válida'
DropdownField:
CHOOSE: (Elegir)
CHOOSESEARCH: '(Seleccionar o Buscar)'
SOURCE_VALIDATION: 'Por favor, seleccionar un valor dentro de la lista provista. {value} no es una opcion válida'
EmailField:
VALIDATION: 'Introduzca una dirección de correo electrónico'
@ -298,7 +296,6 @@ es:
IMAGETITLETEXT: 'Texto del título (tooltip)'
IMAGETITLETEXTDESC: 'Para obtener información adicional acerca de la imagen'
IMAGEWIDTHPX: Ancho
INSERTMEDIA: 'Insertar Media'
LINK: 'Insertar/editar enlace para el texto resaltado'
LINKANCHOR: 'Ancla en esta página'
LINKDESCR: 'Descripción del Enlace'
@ -312,7 +309,6 @@ es:
SUBJECT: 'Asunto del Email'
URL: URL
URLNOTANOEMBEDRESOURCE: 'La URL ''{url}'' ''no se puede convertir en un recurso multimedia.'
UpdateMEDIA: 'Actualizar Media'
Image:
PLURALNAME: Archivos
SINGULARNAME: Archivo

3
lang/et_EE.yml
View File

@ -24,7 +24,6 @@ et_EE:
FROMCOMPUTER: 'Valige fail arvutist'
FROMCOMPUTERINFO: 'Laadige üles arvutist'
TOTAL: Kokku
TOUPLOAD: 'Valige üleslaadimiseks failid...'
UPLOADINPROGRESS: 'Oodake... Üleslaadimine on pooleli'
UPLOADOR: VÕI
BBCodeParser:
@ -255,7 +254,6 @@ et_EE:
IMAGETITLETEXT: 'Pealkirja tekst (kohtspikker)'
IMAGETITLETEXTDESC: 'Lisateabe saamiseks kujutise kohta'
IMAGEWIDTHPX: Kõrgus
INSERTMEDIA: 'Sisesta meedium'
LINK: 'Link'
LINKANCHOR: 'Link sellele lehele'
LINKDESCR: 'Lingi kirjeldus'
@ -268,7 +266,6 @@ et_EE:
PAGE: Leht
URL: URL
URLNOTANOEMBEDRESOURCE: 'URL-i ''{url}'' ei saanud muuta meediumiressursiks.'
UpdateMEDIA: 'Uuenda meediumi'
Image:
PLURALNAME: Failid
SINGULARNAME: Fail

2
lang/fa_IR.yml
View File

@ -24,7 +24,6 @@ fa_IR:
FROMCOMPUTER: 'انتخاب فایل‌ها از کامپیوتر شما'
FROMCOMPUTERINFO: 'بارگذاری از کامپیوتر شما'
TOTAL: مجموع
TOUPLOAD: 'انتخاب فایل‌ها جهت بارگذاری'
UPLOADINPROGRESS: 'لطفاً صبر کنید... بارگذاری در جریان است'
UPLOADOR: یا
BBCodeParser:
@ -124,7 +123,6 @@ fa_IR:
INVALID_REQUEST: 'درخواست نامعتبر'
DropdownField:
CHOOSE: (گزینش)
CHOOSESEARCH: '(گزینش یا جستجو)'
EmailField:
VALIDATION: 'لطفاً یک نشانی ایمیل وارد نمایید'
Enum:

20
lang/fi.yml
View File

@ -1,5 +1,7 @@
fi:
AssetAdmin:
ALLOWEDEXTS: 'Sallitut siirron tiedostopäätteet'
HIDEALLOWEDEXTS: 'Piilota sallitut päätteet'
NEWFOLDER: Uusi kansio
SHOWALLOWEDEXTS: 'Näytä sallitut laajennukset'
AssetTableField:
@ -7,12 +9,14 @@ fi:
DIM: Mitat
FILENAME: Tiedoston nimi
FOLDER: Kansio
HEIGHT: Korkeus
LASTEDIT: 'Viimeksi muokattu'
OWNER: Omistaja
SIZE: 'Koko'
TITLE: Otsikko
TYPE: 'Tyyppi'
URL: URL
WIDTH: Leveys
AssetUploadField:
ChooseFiles: 'Valitse tiedostot'
DRAGFILESHERE: 'Raahaa tiedotot tähän'
@ -23,8 +27,10 @@ fi:
FILES: Tiedostot
FROMCOMPUTER: 'Valitse tiedostot omalta tietokoneeltasi'
FROMCOMPUTERINFO: 'Siirrä omalta tietokoneeltasi'
INSERTURL: 'Lisää URL-osoitteesta'
REMOVEINFO: 'Poista tämä tiedosto tästä kentästä'
TOTAL: Yhteensä
TOUPLOAD: 'Valitse ladattavia tiedostoja...'
TOUPLOAD: 'Siirrä tiedostoja'
UPLOADINPROGRESS: 'Ole hyvä ja odota... siirto käynnissä'
UPLOADOR: TAI
BBCodeParser:
@ -107,6 +113,7 @@ fi:
MAXIMUM: 'Salasana voi olla enintään {max} merkkiä pitkä.'
SHOWONCLICKTITLE: 'Vaihda salasana'
ContentController:
DRAFT_SITE_ACCESS_RESTRICTION: 'Nähdäksesi vedoksen tai arkistoidun sisällön, sinun tulee kirjautua sisällönhallintajärjestelmän salasanallasi . <a href="%s">Klikkaa tästä palataksesi julkaistulle sivustolle.</a>'
NOTLOGGEDIN: 'Ei kirjautuneena'
CreditCardField:
FIRST: ensimmäinen
@ -146,7 +153,7 @@ fi:
INVALID_REQUEST: 'Pyyntö on virheellinen'
DropdownField:
CHOOSE: (Valitse)
CHOOSESEARCH: '(Valitse tai Hae)'
CHOOSESEARCH: '(valitse kansio)'
SOURCE_VALIDATION: 'Valitse arvo pudotusvalikosta. {value} ei kelpaa'
EmailField:
VALIDATION: 'Anna sähköpostiosoite, ole hyvä.'
@ -174,7 +181,7 @@ fi:
NOVALIDUPLOAD: 'Tiedosto ei ole kelvollinen ladattavaksi'
Name: Nimi
PLURALNAME: Tiedostot
PdfType: 'Adobe Acrobat PDF-tiedosto'
PdfType: 'Adobe Acrobat PDF -tiedosto'
PngType: 'PNG-kuva - hyvä yleinen muoto'
SINGULARNAME: Tiedosto
TOOLARGE: 'Tiedostokoko on liian suuri: maks. sallittu koko on {size}'
@ -250,7 +257,7 @@ fi:
DefaultGroupTitleContentAuthors: 'Sisällöntuottajat'
Description: Kuvaus
GroupReminder: 'Valitessasi isäntäryhmän roolit periytyvät tähän ryhmään'
HierarchyPermsError: 'Isäntäryhmään ei voitu asettaa "%s" annettuja oikeuksia (vaaditaan JÄRJESTELMÄNVALVOJAN oikeudet)'
HierarchyPermsError: 'Isäntä ryhmään ei voitu asettaa "%s" annettuja oikeuksia (vaaditaan JÄRJESTELMÄNVALVOJAN oikeudet)'
Locked: 'Lukittu?'
NoRoles: 'Rooleja ei löytynyt'
PLURALNAME: Ryhmät
@ -302,7 +309,7 @@ fi:
IMAGETITLETEXT: 'Otsikkoteksti (tooltip)'
IMAGETITLETEXTDESC: 'Kuvan lisätiedot'
IMAGEWIDTHPX: Leveys
INSERTMEDIA: 'Liitä media'
INSERTMEDIA: 'Liitä media kohteesta'
LINK: 'Lisää/muokkaa linkki(ä) valittuun tekstiin'
LINKANCHOR: 'Ankkuroi tähän sivuun'
LINKDESCR: 'Linkin kuvaus'
@ -315,8 +322,9 @@ fi:
PAGE: Sivu
SUBJECT: 'Sähköpostin aihe'
URL: URL-osoite
URLDESCRIPTION: 'Liittääksesi videoita tai kuvia verkosta, lisää tiedoston täydellinen verkko-osoite.<br /><br />Huomioithan, että mikäli alkuperäinen tiedosto häviää alkuperäisestä osoitteesta, tiedosto ei näy enää tällä sivulla.'
URLNOTANOEMBEDRESOURCE: 'URL-osoitteesta ''{url}'' ei voitu liittää mediaa'
UpdateMEDIA: 'Päivitä media'
UpdateMEDIA: 'Päivitä mediatiedosto'
Image:
PLURALNAME: Tiedostot
SINGULARNAME: Tiedosto

3
lang/fr.yml
View File

@ -24,7 +24,6 @@ fr:
FROMCOMPUTER: 'Choisissez des fichiers de votre ordinateur'
FROMCOMPUTERINFO: 'Télécharger depuis votre ordinateur'
TOTAL: Total
TOUPLOAD: 'Choisissez les fichiers à télécharger…'
UPLOADINPROGRESS: 'Patientez s''il vous plaît… téléchargement en cours '
UPLOADOR: OU
BBCodeParser:
@ -269,7 +268,6 @@ fr:
IMAGETITLETEXT: 'Texte du titre (info-bulle)'
IMAGETITLETEXTDESC: 'Autres informations à propos de l’image'
IMAGEWIDTHPX: Largeur
INSERTMEDIA: 'Insérer un support audiovisuel'
LINK: 'Lien'
LINKANCHOR: 'Ancre sur cette page'
LINKDESCR: 'Description du lien'
@ -282,7 +280,6 @@ fr:
PAGE: Page
URL: URL
URLNOTANOEMBEDRESOURCE: 'L’URL {url} n’a pas pu être utilisée comme ressource média.'
UpdateMEDIA: 'Mettre à jour le support audiovisuel'
Image:
PLURALNAME: Fichiers
SINGULARNAME: Fichier

1
lang/hr.yml
View File

@ -23,7 +23,6 @@ hr:
FROMCOMPUTER: 'Odaberite datoteke sa svog računala'
FROMCOMPUTERINFO: 'Uploadajte sa svog računala'
TOTAL: Ukupno
TOUPLOAD: 'Odaberite datoteke za upload...'
UPLOADINPROGRESS: 'Molim pričekajte... upload u tijeku'
UPLOADOR: ILI
BBCodeParser:

4
lang/id.yml
View File

@ -24,7 +24,6 @@ id:
FROMCOMPUTER: 'Pilih berkas dari komputer Anda'
FROMCOMPUTERINFO: 'Unggah dari komputer Anda'
TOTAL: Total
TOUPLOAD: 'Pilih berkas untuk diunggah...'
UPLOADINPROGRESS: 'Mohon tunggu... sedang mengunggah'
UPLOADOR: ATAU
BBCodeParser:
@ -144,7 +143,6 @@ id:
INVALID_REQUEST: 'Permintaan tidak valid'
DropdownField:
CHOOSE: (Pilih)
CHOOSESEARCH: '(Pilih atau Cari)'
SOURCE_VALIDATION: 'Mohon pilih nilai dari daftar yang ada. ''{value}'' bukan pilihan valid'
EmailField:
VALIDATION: 'Mohon isikan alamat email'
@ -297,7 +295,6 @@ id:
IMAGETITLETEXT: 'Teks gambar (tooltip)'
IMAGETITLETEXTDESC: 'Untuk informasi tambahan tentang gambar'
IMAGEWIDTHPX: Lebar
INSERTMEDIA: 'Sisipkan Media'
LINK: 'Sisipkan Tautan'
LINKANCHOR: 'Jangkar pada laman ini'
LINKDESCR: 'Deskripsi tautan'
@ -311,7 +308,6 @@ id:
SUBJECT: 'Subyek email'
URL: URL
URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' tidak dapat dijadikan sumber daya media.'
UpdateMEDIA: 'Perbarui Media'
Image:
PLURALNAME: Berkas
SINGULARNAME: Berkas

4
lang/id_ID.yml
View File

@ -24,7 +24,6 @@ id_ID:
FROMCOMPUTER: 'Pilih berkas dari komputer Anda'
FROMCOMPUTERINFO: 'Unggah dari komputer Anda'
TOTAL: Total
TOUPLOAD: 'Pilih berkas untuk diunggah...'
UPLOADINPROGRESS: 'Mohon tunggu... sedang mengunggah'
UPLOADOR: ATAU
BBCodeParser:
@ -144,7 +143,6 @@ id_ID:
INVALID_REQUEST: 'Permintaan tidak valid'
DropdownField:
CHOOSE: (Pilih)
CHOOSESEARCH: '(Pilih atau Cari)'
SOURCE_VALIDATION: 'Mohon pilih nilai dari daftar yang ada. ''{value}'' bukan pilihan valid'
EmailField:
VALIDATION: 'Mohon isikan alamat email'
@ -297,7 +295,6 @@ id_ID:
IMAGETITLETEXT: 'Teks gambar (tooltip)'
IMAGETITLETEXTDESC: 'Untuk informasi tambahan tentang gambar'
IMAGEWIDTHPX: Lebar
INSERTMEDIA: 'Sisipkan Media'
LINK: 'Sisipkan Tautan'
LINKANCHOR: 'Jangkar pada laman ini'
LINKDESCR: 'Deskripsi tautan'
@ -311,7 +308,6 @@ id_ID:
SUBJECT: 'Subyek email'
URL: URL
URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' tidak dapat dijadikan sumber daya media.'
UpdateMEDIA: 'Perbarui Media'
Image:
PLURALNAME: Berkas
SINGULARNAME: Berkas

4
lang/it.yml
View File

@ -24,7 +24,6 @@ it:
FROMCOMPUTER: 'Scegli file dal tuo computer'
FROMCOMPUTERINFO: 'Carica dal tuo conputer'
TOTAL: Totale
TOUPLOAD: 'Scegli i file da caricare...'
UPLOADINPROGRESS: 'Attendere prego... caricamento in corso'
UPLOADOR: O
BBCodeParser:
@ -144,7 +143,6 @@ it:
INVALID_REQUEST: 'Richiesta non valida'
DropdownField:
CHOOSE: (Scegli)
CHOOSESEARCH: '(Scegliere o Cercare)'
SOURCE_VALIDATION: 'Per favore selezionare un valore tra quelli forniti. {value} non è un''opzione valida'
EmailField:
VALIDATION: 'Inserisci un indirizzo e-mail'
@ -297,7 +295,6 @@ it:
IMAGETITLETEXT: 'Titolo (tooltip)'
IMAGETITLETEXTDESC: 'Per informazioni addizionali sull''immagine'
IMAGEWIDTHPX: Larghezza
INSERTMEDIA: 'Inserisci Media'
LINK: 'Inserisci Link'
LINKANCHOR: 'Ancora su questa pagina'
LINKDESCR: 'Descrizione del link'
@ -311,7 +308,6 @@ it:
SUBJECT: 'Oggetto email'
URL: URL
URLNOTANOEMBEDRESOURCE: 'L''URL ''{url}'' non può essere convertito in una risorsa media.'
UpdateMEDIA: 'Aggiorna Media'
Image:
PLURALNAME: Files
SINGULARNAME: File

3
lang/ja.yml
View File

@ -24,7 +24,6 @@ ja:
FROMCOMPUTER: 'お使いのコンピュータからファイルを選択してください'
FROMCOMPUTERINFO: 'コンピュータからアップロード'
TOTAL: 合計
TOUPLOAD: 'アップロードするファイルを選択する'
UPLOADINPROGRESS: 'しばらくお待ちください...アップロードは進行中です'
UPLOADOR: もしくは
BBCodeParser:
@ -267,7 +266,6 @@ ja:
IMAGETITLETEXT: 'タイトルテキスト(ツールチップ)'
IMAGETITLETEXTDESC: '画像に関する追加情報'
IMAGEWIDTHPX: 幅
INSERTMEDIA: 'メディアを追加'
LINK: 'ハイライトテキストへのリンクの挿入/削除'
LINKANCHOR: 'このページにアンカーを置く'
LINKDESCR: 'リンクの説明'
@ -280,7 +278,6 @@ ja:
PAGE: ページ
URL: URL
URLNOTANOEMBEDRESOURCE: 'URL''{url}''はメディアリソースとして扱うことができませんでした。'
UpdateMEDIA: 'メディアを更新'
Image:
PLURALNAME: ファイル
SINGULARNAME: ファイル

11
lang/lt.yml
View File

@ -1,5 +1,7 @@
lt:
AssetAdmin:
ALLOWEDEXTS: 'Leidžiamų įkelti bylų plėtiniai'
HIDEALLOWEDEXTS: 'Slėpti leidžiamus bylų plėtinius'
NEWFOLDER: Naujas kalalogas
SHOWALLOWEDEXTS: 'Rodyti leidžiamus bylų plėtinius'
AssetTableField:
@ -7,12 +9,14 @@ lt:
DIM: Išmatavimai
FILENAME: Bylos pavadinimas
FOLDER: Katalogas
HEIGHT: Aukštis
LASTEDIT: 'Redaguota'
OWNER: Vartotojas
SIZE: 'Bylos dydis'
TITLE: Pavadinimas
TYPE: 'Bylos tipas'
URL: URL adresas
WIDTH: Plotis
AssetUploadField:
ChooseFiles: 'Pasirinkite bylas'
DRAGFILESHERE: 'Vilkite bylas čia'
@ -23,6 +27,8 @@ lt:
FILES: Bylos
FROMCOMPUTER: 'Pasirinkite bylas iš jūsų kompiuterio'
FROMCOMPUTERINFO: 'Įkelti iš jūsų kompiuterio'
INSERTURL: 'Įkelti iš nuorodos'
REMOVEINFO: 'Pašalinti šią bylą iš šio lauko'
TOTAL: Viso
TOUPLOAD: 'Pasirinkite bylas įkėlimui...'
UPLOADINPROGRESS: 'Prašome palaukti... vyksta įkėlimas'
@ -147,7 +153,7 @@ lt:
INVALID_REQUEST: 'Klaidinga užklausa'
DropdownField:
CHOOSE: (Pasirinkti)
CHOOSESEARCH: '(Pasirinkti arba Ieškoti)'
CHOOSESEARCH: '(pasirinkti katalogą)'
SOURCE_VALIDATION: 'Prašome pasirinkti reikšmę iš pateikto sąrašo. ''{value}'' yra negalima reikšmė.'
EmailField:
VALIDATION: 'Prašome suvesti el. pašto adresą'
@ -303,7 +309,7 @@ lt:
IMAGETITLETEXT: 'Pavadinimo tekstas (tooltip)'
IMAGETITLETEXTDESC: 'Papildomai informacijai apie paveikslėlį'
IMAGEWIDTHPX: Plotis
INSERTMEDIA: 'Įterpti Media'
INSERTMEDIA: 'Įterpti media iš'
LINK: 'Nuoroda'
LINKANCHOR: 'Nuoroda šiame puslapyje'
LINKDESCR: 'Nuorodos aprašymas'
@ -316,6 +322,7 @@ lt:
PAGE: Puslapis
SUBJECT: 'El. laiško tema'
URL: URL adresas
URLDESCRIPTION: 'Įkelkite video ir paveikslėlius iš interneto į jūsų puslapį tiesiog įvesdami bylos nuorodą. Būtinai pasitikrinkite ar turite leidimą panaudoti norimas bylas.<br /><br />Atminkite, kad pridėtos bylos nesaugomos TVS, bet rodomos tiesiai iš išorinio šaltinio. Jeigu šios bylos bus pašalintos iš ten, jūsų svetainėje jie nebebus rodomi.'
URLNOTANOEMBEDRESOURCE: 'Nepavyko URL nuorodos ''{url}'' panaudoti media turiniui.'
UpdateMEDIA: 'Atnaujinti media'
Image:

3
lang/mi.yml
View File

@ -24,7 +24,6 @@ mi:
FROMCOMPUTER: 'Kōwhiri kōnae mai i tō rorohiko'
FROMCOMPUTERINFO: 'Tukuatu i tō rorohiko'
TOTAL: Tapeke
TOUPLOAD: 'Kōwhiria ngā kōnae hei tukuatu...'
UPLOADINPROGRESS: 'Taihoa...he tukuatu kei te haere'
UPLOADOR: TĒNEI RĀNEI
BBCodeParser:
@ -269,7 +268,6 @@ mi:
IMAGETITLETEXT: 'Tuhinga taitara (ākiutauta) '
IMAGETITLETEXTDESC: 'Mō ētahi atu mōhiohio mō te atahanga'
IMAGEWIDTHPX: Whānui
INSERTMEDIA: 'Kōkuhu Pāpāho'
LINK: 'Kōkuhu hono'
LINKANCHOR: 'He punga kei tēnei whārangi'
LINKDESCR: 'Whakaahuatanga hono'
@ -282,7 +280,6 @@ mi:
PAGE: Whārangi
URL: PRO
URLNOTANOEMBEDRESOURCE: 'Kāore e taea te huri i te PRO ''{url}'' hei rawa pāpāho.'
UpdateMEDIA: 'Whakahōu Pāpāho'
Image:
PLURALNAME: Ngā Kōnae
SINGULARNAME: Kōnae

4
lang/nb.yml
View File

@ -24,7 +24,6 @@ nb:
FROMCOMPUTER: 'Velg filer fra din pc'
FROMCOMPUTERINFO: 'Last opp fra din pc'
TOTAL: Total
TOUPLOAD: 'Velg filer til opplasting ...'
UPLOADINPROGRESS: 'Vennligst vent... opplasting pågår'
UPLOADOR: ELLER
BBCodeParser:
@ -123,7 +122,6 @@ nb:
INVALID_REQUEST: 'Ugyldig forespørsel'
DropdownField:
CHOOSE: (Velg)
CHOOSESEARCH: '(Velg eller søk)'
EmailField:
VALIDATION: 'Vennligst skriv inn en epostadresse'
Enum:
@ -271,7 +269,6 @@ nb:
IMAGETITLETEXT: 'Titteltekst (tooltip)'
IMAGETITLETEXTDESC: 'For tilleggsinformasjon om bilde'
IMAGEWIDTHPX: Bredde
INSERTMEDIA: 'Sett inn media'
LINK: 'Sett inn/rediger lenke i fremhevet tekst'
LINKANCHOR: 'Lenke på denne siden'
LINKDESCR: 'Lenkebeskrivelse'
@ -284,7 +281,6 @@ nb:
PAGE: Side
URL: Nettadresse
URLNOTANOEMBEDRESOURCE: 'Nettadressen ''{url}'' kunne ikke bli omgjort til en medieressurs.'
UpdateMEDIA: 'Oppdater media'
Image:
PLURALNAME: Filer
SINGULARNAME: Fil

4
lang/nl.yml
View File

@ -24,7 +24,6 @@ nl:
FROMCOMPUTER: 'Selecteer bestanden op uw computer'
FROMCOMPUTERINFO: 'Uploaden vanaf uw computer'
TOTAL: Totaal
TOUPLOAD: 'Selecteer bestanden...'
UPLOADINPROGRESS: 'Een ogenblik geduld... upload wordt uitgevoerd'
UPLOADOR: OF
BBCodeParser:
@ -123,7 +122,6 @@ nl:
INVALID_REQUEST: 'Fout bij verwerken'
DropdownField:
CHOOSE: (Kies)
CHOOSESEARCH: '(Kies of zoek)'
EmailField:
VALIDATION: 'Gelieve een e-mailadres in te voeren.'
Enum:
@ -272,7 +270,6 @@ nl:
IMAGETITLETEXT: 'Tooltip (title)'
IMAGETITLETEXTDESC: 'Toon extra informatie over de afbeelding'
IMAGEWIDTHPX: Breedte
INSERTMEDIA: 'Media invoegen'
LINK: 'Link invoegen'
LINKANCHOR: 'Anker op deze pagina'
LINKDESCR: 'Linkomschrijving'
@ -285,7 +282,6 @@ nl:
PAGE: Pagina
URL: URL
URLNOTANOEMBEDRESOURCE: '{url} kon niet worden omgezet in een media-bron.'
UpdateMEDIA: 'Media bijwerken'
Image:
PLURALNAME: Bestanden
SINGULARNAME: Bestand

4
lang/pl.yml
View File

@ -24,7 +24,6 @@ pl:
FROMCOMPUTER: 'Wybierz pliki z komputera'
FROMCOMPUTERINFO: 'Załaduj z twojego komputera'
TOTAL: Razem
TOUPLOAD: 'Wybierz pliki do załadowania...'
UPLOADINPROGRESS: 'Pliki są przesyłane... proszę czekać'
UPLOADOR: LUB
BBCodeParser:
@ -123,7 +122,6 @@ pl:
INVALID_REQUEST: 'Nieprawidłowe żądanie'
DropdownField:
CHOOSE: (wybierz)
CHOOSESEARCH: '(Wybierz lub szukaj)'
EmailField:
VALIDATION: 'Proszę podaj adres e-mail'
Enum:
@ -271,7 +269,6 @@ pl:
IMAGETITLETEXT: 'Tytuł (wyskakujący dymek)'
IMAGETITLETEXTDESC: 'Po dodatkowe informacje o obrazku'
IMAGEWIDTHPX: Szerokość (px)
INSERTMEDIA: 'Wstaw Media'
LINK: 'Wstaw/edytuj link z podświetlonego tekstu '
LINKANCHOR: 'Odnośnik na tej stronie'
LINKDESCR: 'Opis linku'
@ -284,7 +281,6 @@ pl:
PAGE: Strona
URL: Adres URL
URLNOTANOEMBEDRESOURCE: 'Adres URL ''{url}'' nie mógł zostać przekształcony w zasób medialny'
UpdateMEDIA: 'Zaktualizuj Media'
Image:
PLURALNAME: Pliki
SINGULARNAME: Plik

1
lang/ro.yml
View File

@ -10,7 +10,6 @@ ro:
FROMCOMPUTER: 'Alegeți fișierele din calculator'
FROMCOMPUTERINFO: 'Încărcați din calculator'
TOTAL: Total
TOUPLOAD: 'Alegeți fișierele de încărcat...'
UPLOADINPROGRESS: 'Vă rugăm să așteptați ... transfer în curs'
UPLOADOR: SAU
BBCodeParser:

4
lang/ru.yml
View File

@ -24,7 +24,6 @@ ru:
FROMCOMPUTER: 'Выберите файлы с диска вашего компьютера'
FROMCOMPUTERINFO: 'Загрузить с диска вашего компьютера'
TOTAL: Всего
TOUPLOAD: 'Выберите файлы для загрузки...'
UPLOADINPROGRESS: 'Идет загрузка... Пожалуйста, подождите'
UPLOADOR: ИЛИ
BBCodeParser:
@ -123,7 +122,6 @@ ru:
INVALID_REQUEST: 'Неверный запрос'
DropdownField:
CHOOSE: (Выберите)
CHOOSESEARCH: '(Выбрать или найти)'
EmailField:
VALIDATION: 'Пожалуйста, задайте адрес email.'
Enum:
@ -271,7 +269,6 @@ ru:
IMAGETITLETEXT: 'Текст (всплывающая подсказка)'
IMAGETITLETEXTDESC: 'Для дополнительных сведений об изображении'
IMAGEWIDTHPX: Ширина
INSERTMEDIA: 'Вставить медиафайл'
LINK: 'Ссылка'
LINKANCHOR: 'Якорь на этой странице'
LINKDESCR: 'Описание ссылки'
@ -284,7 +281,6 @@ ru:
PAGE: Страница
URL: URL
URLNOTANOEMBEDRESOURCE: 'Не удалось преобразовать ссылку ''{url}'' в медиа-ресурс.'
UpdateMEDIA: 'Обновить медиафайл'
Image:
PLURALNAME: Файлы
SINGULARNAME: Файл

13
lang/sk.yml
View File

@ -1,5 +1,7 @@
sk:
AssetAdmin:
ALLOWEDEXTS: 'Povolené extenzie nahatia súboru'
HIDEALLOWEDEXTS: 'Skryť povolené extenzie'
NEWFOLDER: Nový priečinok
SHOWALLOWEDEXTS: 'Ukázať povolené extenzie'
AssetTableField:
@ -7,12 +9,14 @@ sk:
DIM: Rozmery
FILENAME: Názov
FOLDER: Adresár
HEIGHT: Výška
LASTEDIT: 'Posledne zmenené'
OWNER: Vlastník
SIZE: 'Veľkosť'
TITLE: Titulok
TYPE: 'Typ'
URL: URL
WIDTH: Šírka
AssetUploadField:
ChooseFiles: 'Vyberte súbory'
DRAGFILESHERE: 'Tiahni súbory tu'
@ -23,8 +27,10 @@ sk:
FILES: Súbory
FROMCOMPUTER: 'Vyberte súbory z vášho počítača'
FROMCOMPUTERINFO: 'Nahrat z vášho počítača'
INSERTURL: 'Vložiť z URL'
REMOVEINFO: 'Odstrániť tento soubor z tohto poľa'
TOTAL: Súhrn
TOUPLOAD: 'Vyberte súbory pre nahratie...'
TOUPLOAD: 'Nahrať súbory'
UPLOADINPROGRESS: 'Čakajte prosím… prebieha nahrávanie'
UPLOADOR: ALEBO
BBCodeParser:
@ -147,7 +153,7 @@ sk:
INVALID_REQUEST: 'Neplatná požiadavka'
DropdownField:
CHOOSE: (Vyberte si)
CHOOSESEARCH: '(Vybrať alebo vyhľadať)'
CHOOSESEARCH: '(vyberte priečinok)'
SOURCE_VALIDATION: 'Prosím vyberte hodnotu v zozname. {value} nie je platná voľba'
EmailField:
VALIDATION: 'Prosím zadajte email adresu'
@ -303,7 +309,7 @@ sk:
IMAGETITLETEXT: 'Text titulky (tooltip)'
IMAGETITLETEXTDESC: 'Pre doplňujúce informácie o obrázku'
IMAGEWIDTHPX: Šírka
INSERTMEDIA: 'Vložiť média'
INSERTMEDIA: 'Vložiť média zo'
LINK: 'Vložiť/upraviť odkaz na zvýraznený text'
LINKANCHOR: 'Odkaz na tejto stranke'
LINKDESCR: 'Popis odkazu'
@ -316,6 +322,7 @@ sk:
PAGE: Stránku
SUBJECT: 'Predmet emailu'
URL: URL
URLDESCRIPTION: 'Vložiť videá a obrázky z webu do Vašej stránky, jednoduchým zadaním URL súboru. Uistite sa, že máte príslušné práva pred zdielaním médií z webu.<br /><br />Prosím, uvedomte si, že súbory nie sú pridané do úložiska CMS, ale súbor je vstavaný z jeho pôvodného umiestenia, ak z nejakých dôvodov súbor nie je dostupný v jeho pôvodnom umiestení, nebude zobraziteľný na tejo stránke.'
URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' nemôže byť vložené do zdroja médií.'
UpdateMEDIA: 'Aktualizovať média'
Image:

4
lang/sl.yml
View File

@ -23,7 +23,6 @@ sl:
FROMCOMPUTER: 'Izberite datoteke z vašega računalnika'
FROMCOMPUTERINFO: 'Prenesite z vašega računalnika'
TOTAL: Vse
TOUPLOAD: 'Izberite datoteke za prenos'
UPLOADINPROGRESS: 'Prosimo, počakajte ... prenos poteka.'
UPLOADOR: ALI
BBCodeParser:
@ -120,7 +119,6 @@ sl:
INVALID_REQUEST: 'Napačna zahteva'
DropdownField:
CHOOSE: (Izberi)
CHOOSESEARCH: '(Izberi ali išči)'
EmailField:
VALIDATION: 'Prosim, vpišite e-naslov.'
Enum:
@ -260,7 +258,6 @@ sl:
IMAGETITLETEXT: 'Naslov (tooltip)'
IMAGETITLETEXTDESC: 'Za dodatne informacije o sliki'
IMAGEWIDTHPX: Širina
INSERTMEDIA: 'Vstavi multimedijsko datoteko'
LINK: 'Povezava'
LINKANCHOR: 'Sidro na tej strani'
LINKDESCR: 'Opis povezave'
@ -272,7 +269,6 @@ sl:
LINKTO: 'Poveži na'
PAGE: Stran
URL: URL
UpdateMEDIA: 'Posodobi multimedijsko datoteko'
Image:
PLURALNAME: Datoteke
SINGULARNAME: Datoteka

4
lang/sr.yml
View File

@ -24,7 +24,6 @@ sr:
FROMCOMPUTER: 'Изаберите датотеке са Вашег рачунара'
FROMCOMPUTERINFO: 'Постави са Вашег рачунара'
TOTAL: Укупно
TOUPLOAD: 'Изаберите датотеке за постављање...'
UPLOADINPROGRESS: 'Молимо Вас да сачекате... Постављање је у току'
UPLOADOR: ИЛИ
BBCodeParser:
@ -123,7 +122,6 @@ sr:
INVALID_REQUEST: 'Погрешан захтев'
DropdownField:
CHOOSE: (изаберите)
CHOOSESEARCH: '(Изабери или Пронађи)'
EmailField:
VALIDATION: 'Унесите адресу е-поште'
Enum:
@ -271,7 +269,6 @@ sr:
IMAGETITLETEXT: 'Текст наслова (tooltip)'
IMAGETITLETEXTDESC: 'За додатне информације о слици'
IMAGEWIDTHPX: Ширина
INSERTMEDIA: 'Уметни медијски ресурс'
LINK: 'Линк'
LINKANCHOR: 'Сидро на овој страни'
LINKDESCR: 'Опис линка'
@ -284,7 +281,6 @@ sr:
PAGE: Страница
URL: URL
URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' не може бити претворен у медијски ресурс.'
UpdateMEDIA: 'Ажурирај медијски ресурс'
Image:
PLURALNAME: Датотеке
SINGULARNAME: Датотека

4
lang/sr@latin.yml
View File

@ -24,7 +24,6 @@ sr@latin:
FROMCOMPUTER: 'Izaberite datoteke sa Vašeg računara'
FROMCOMPUTERINFO: 'Postavi sa Vašeg računara'
TOTAL: Ukupno
TOUPLOAD: 'Izaberite datoteke za postavljanje...'
UPLOADINPROGRESS: 'Molimo Vas da sačekate... Postavljanje je u toku'
UPLOADOR: ILI
BBCodeParser:
@ -123,7 +122,6 @@ sr@latin:
INVALID_REQUEST: 'Pogrešan zahtev'
DropdownField:
CHOOSE: (izaberite)
CHOOSESEARCH: '(Izaberi ili Pronađi)'
EmailField:
VALIDATION: 'Unesite adresu e-pošte'
Enum:
@ -271,7 +269,6 @@ sr@latin:
IMAGETITLETEXT: 'Tekst naslova (tooltip)'
IMAGETITLETEXTDESC: 'Za dodatne informacije o slici'
IMAGEWIDTHPX: Širina
INSERTMEDIA: 'Umetni medijski resurs'
LINK: 'Link'
LINKANCHOR: 'Sidro na ovoj strani'
LINKDESCR: 'Opis linka'
@ -284,7 +281,6 @@ sr@latin:
PAGE: Stranica
URL: URL
URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' ne može biti pretvoren u medijski resurs.'
UpdateMEDIA: 'Ažuriraj medijski resurs'
Image:
PLURALNAME: Datoteke
SINGULARNAME: Datoteka

4
lang/sr_RS.yml
View File

@ -24,7 +24,6 @@ sr_RS:
FROMCOMPUTER: 'Изаберите датотеке са Вашег рачунара'
FROMCOMPUTERINFO: 'Постави са Вашег рачунара'
TOTAL: Укупно
TOUPLOAD: 'Изаберите датотеке за постављање...'
UPLOADINPROGRESS: 'Молимо Вас да сачекате... Постављање је у току'
UPLOADOR: ИЛИ
BBCodeParser:
@ -123,7 +122,6 @@ sr_RS:
INVALID_REQUEST: 'Погрешан захтев'
DropdownField:
CHOOSE: (изаберите)
CHOOSESEARCH: '(Изабери или Пронађи)'
EmailField:
VALIDATION: 'Унесите адресу е-поште'
Enum:
@ -271,7 +269,6 @@ sr_RS:
IMAGETITLETEXT: 'Текст наслова (tooltip)'
IMAGETITLETEXTDESC: 'За додатне информације о слици'
IMAGEWIDTHPX: Ширина
INSERTMEDIA: 'Уметни медијски ресурс'
LINK: 'Линк'
LINKANCHOR: 'Сидро на овој страни'
LINKDESCR: 'Опис линка'
@ -284,7 +281,6 @@ sr_RS:
PAGE: Страница
URL: URL
URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' не може бити претворен у медијски ресурс.'
UpdateMEDIA: 'Ажурирај медијски ресурс'
Image:
PLURALNAME: Датотеке
SINGULARNAME: Датотека

4
lang/sr_RS@latin.yml
View File

@ -24,7 +24,6 @@ sr_RS@latin:
FROMCOMPUTER: 'Izaberite datoteke sa Vašeg računara'
FROMCOMPUTERINFO: 'Postavi sa Vašeg računara'
TOTAL: Ukupno
TOUPLOAD: 'Izaberite datoteke za postavljanje...'
UPLOADINPROGRESS: 'Molimo Vas da sačekate... Postavljanje je u toku'
UPLOADOR: ILI
BBCodeParser:
@ -123,7 +122,6 @@ sr_RS@latin:
INVALID_REQUEST: 'Pogrešan zahtev'
DropdownField:
CHOOSE: (izaberite)
CHOOSESEARCH: '(Izaberi ili Pronađi)'
EmailField:
VALIDATION: 'Unesite adresu e-pošte'
Enum:
@ -271,7 +269,6 @@ sr_RS@latin:
IMAGETITLETEXT: 'Tekst naslova (tooltip)'
IMAGETITLETEXTDESC: 'Za dodatne informacije o slici'
IMAGEWIDTHPX: Širina
INSERTMEDIA: 'Umetni medijski resurs'
LINK: 'Link'
LINKANCHOR: 'Sidro na ovoj strani'
LINKDESCR: 'Opis linka'
@ -284,7 +281,6 @@ sr_RS@latin:
PAGE: Stranica
URL: URL
URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' ne može biti pretvoren u medijski resurs.'
UpdateMEDIA: 'Ažuriraj medijski resurs'
Image:
PLURALNAME: Datoteke
SINGULARNAME: Datoteka

4
lang/sv.yml
View File

@ -24,7 +24,6 @@ sv:
FROMCOMPUTER: 'Välj filer från din dator'
FROMCOMPUTERINFO: 'Ladda upp från din dator'
TOTAL: Totalt
TOUPLOAD: 'Välj fil att ladda upp...'
UPLOADINPROGRESS: 'Var god dröj... uppladdning pågår'
UPLOADOR: ELLER
BBCodeParser:
@ -147,7 +146,6 @@ sv:
INVALID_REQUEST: 'Ogiltig förfrågan'
DropdownField:
CHOOSE: (Välj)
CHOOSESEARCH: '(Välj eller sök)'
SOURCE_VALIDATION: 'Vänligen välj att värde i listan. {value} är inget giltigt val'
EmailField:
VALIDATION: 'Var snäll och ange en epostadress'
@ -317,7 +315,6 @@ sv:
IMAGETITLETEXT: 'Titel text (tooltip)'
IMAGETITLETEXTDESC: 'För ytterligare information om bilden'
IMAGEWIDTHPX: Bredd
INSERTMEDIA: 'Infoga media'
LINK: 'Infoga länk'
LINKANCHOR: 'Ankare på den här sidan'
LINKDESCR: 'Länk-beskrivning'
@ -331,7 +328,6 @@ sv:
SUBJECT: 'Ämne'
URL: URL
URLNOTANOEMBEDRESOURCE: 'URLen ''{url}'' gick inte att omvandla till ett media.'
UpdateMEDIA: 'Uppdatera media'
Image:
PLURALNAME: Filer
SINGULARNAME: Fil

3
lang/th.yml
View File

@ -22,7 +22,6 @@ th:
FROMCOMPUTER: 'เลือกไฟล์จากคอมพิวเตอร์ของคุณ'
FROMCOMPUTERINFO: 'อัพโหลดจากเครื่องคอมพิวเตอร์ของคุณ'
TOTAL: รวมทั้งหมด
TOUPLOAD: 'เลือกไฟล์ที่ต้องการอัพโหลด...'
UPLOADOR: หรือ
BBCodeParser:
BOLD: 'ข้อความตัวหนา'
@ -183,7 +182,6 @@ th:
IMAGEHEIGHTPX: ส่วนสูง
IMAGETITLETEXT: 'ข้อความหัวเรื่อง (tooltip)'
IMAGEWIDTHPX: ความกว้าง
INSERTMEDIA: 'แทรกมีเดีย'
LINK: 'ลิงก์'
LINKDESCR: 'คำอธิบายลิงค์'
LINKEMAIL: 'ที่อยู่อีเมล'
@ -193,7 +191,6 @@ th:
LINKOPENNEWWIN: 'เปิดลิงค์ในหน้าต่างใหม่'
LINKTO: 'ลิงค์ไปที่'
PAGE: หน้าเว็บ
UpdateMEDIA: 'อัพเดทมีเดีย'
Image:
PLURALNAME: ไฟล์
SINGULARNAME: ไฟล์

1
lang/uk.yml
View File

@ -21,7 +21,6 @@ uk:
FROMCOMPUTER: 'Виберіть файли з вашого комп’ютера'
FROMCOMPUTERINFO: 'Завантажте з вашого комп’ютера'
TOTAL: Підсумок
TOUPLOAD: 'Виберіть файли для завантаження...'
UPLOADINPROGRESS: 'Зачекайте, будь ласка, виконується завантаження'
UPLOADOR: АБО
BBCodeParser:

4
lang/zh.yml
View File

@ -24,7 +24,6 @@ zh:
FROMCOMPUTER: '从您的电脑选择文件'
FROMCOMPUTERINFO: '从您的电脑上传'
TOTAL: 合计
TOUPLOAD: '选择要上传的文件……'
UPLOADINPROGRESS: '请稍候……上传正在进行中'
UPLOADOR: 或
BBCodeParser:
@ -144,7 +143,6 @@ zh:
INVALID_REQUEST: '无效请求'
DropdownField:
CHOOSE: （选择）
CHOOSESEARCH: '（选择或搜索）'
SOURCE_VALIDATION: '请选择列表内提供的选项。{value}不是一个有效的选项'
EmailField:
VALIDATION: '请输入一个电子邮件地址'
@ -296,7 +294,6 @@ zh:
IMAGETITLETEXT: '标题文字（工具提示）'
IMAGETITLETEXTDESC: '要获取关于该图像的更多信息'
IMAGEWIDTHPX: 宽度
INSERTMEDIA: '插入媒体'
LINK: '插入链接'
LINKANCHOR: '固定于此页面'
LINKDESCR: '链接描述'
@ -310,7 +307,6 @@ zh:
SUBJECT: '电子邮件标题'
URL: 网址
URLNOTANOEMBEDRESOURCE: '''{url}'' 该网址无法转换成媒体来源。'
UpdateMEDIA: '更新媒体'
Image:
PLURALNAME: 文件
SINGULARNAME: 文件

2
model/URLSegmentFilter.php
View File

@ -32,7 +32,7 @@ class URLSegmentFilter extends Object {
'/\s|\+/u' => '-', // remove whitespace/plus
'/[_.]+/u' => '-', // underscores and dots to dashes
'/[^A-Za-z0-9\-]+/u' => '', // remove non-ASCII chars, only allow alphanumeric and dashes
'/\/+/u' => '-', // remove forward slashes in case multibyte is allowed (and ASCII chars aren't removed)
'/[\/\?=#]+/u' => '-', // remove forward slashes, question marks, equal signs and hashes in case multibyte is allowed (and non-ASCII chars aren't removed)
'/[\-]{2,}/u' => '-', // remove duplicate dashes
'/^[\-]+/u' => '', // Remove all leading dashes
'/[\-]+$/u' => '' // Remove all trailing dashes

19
model/Versioned.php
View File

@ -665,26 +665,31 @@ class Versioned extends DataExtension implements TemplateGlobalProvider {
// Get ID field
$id = $manipulation[$table]['id'] ? $manipulation[$table]['id'] : $manipulation[$table]['fields']['ID'];
if(!$id) user_error("Couldn't find ID in " . var_export($manipulation[$table], true), E_USER_ERROR);
if(!$id) {
user_error("Couldn't find ID in " . var_export($manipulation[$table], true), E_USER_ERROR);
}
if($this->migratingVersion) {
$manipulation[$table]['fields']['Version'] = $this->migratingVersion;
}
$version = isset($manipulation[$table]['fields']['Version'])
? $manipulation[$table]['fields']['Version']
: null;
if($version < 0 || $this->_nextWriteWithoutVersion) {
// Putting a Version of -1 is a signal to leave the version table alone, despite their being no version
unset($manipulation[$table]['fields']['Version']);
} elseif(empty($version)) {
// If we haven't got a version #, then we're creating a new version.
// Otherwise, we're just copying a version to another table
if(empty($manipulation[$table]['fields']['Version'])) {
$this->augmentWriteVersioned($manipulation, $table, $id);
}
// Putting a Version of -1 is a signal to leave the version table alone, despite their being no version
if($manipulation[$table]['fields']['Version'] < 0 || $this->_nextWriteWithoutVersion) {
// For base classes of versioned data objects
if(!$this->hasVersionField($table)) {
unset($manipulation[$table]['fields']['Version']);
}
// For base classes of versioned data objects
if(!$this->hasVersionField($table)) unset($manipulation[$table]['fields']['Version']);
// Grab a version number - it should be the same across all tables.
if(isset($manipulation[$table]['fields']['Version'])) {
$thisVersion = $manipulation[$table]['fields']['Version'];

6
sake
View File

@ -60,9 +60,9 @@ fi
## Installation to /usr/bin
if [ "$1" = "installsake" ]; then
echo "Installing sake to /usr/bin..."
rm -rf /usr/bin/sake
cp $0 /usr/bin
echo "Installing sake to /usr/local/bin..."
rm -rf /usr/local/bin/sake
cp $0 /usr/local/bin
exit 0
fi

61
tests/core/ObjectTest.php
View File

@ -383,6 +383,19 @@ class ObjectTest extends SapphireTest {
$object->invokeWithExtensions('extendableMethod', 'test'),
array('ExtendTest(test)', 'ExtendTest2(modified)')
);
$object2 = new ObjectTest_Extending();
$first = 1;
$second = 2;
$third = 3;
$result = $object2->getResults($first, $second, $third);
$this->assertEquals(
array(array('before', 'extension', 'after')),
$result
);
$this->assertEquals(31, $first);
$this->assertEquals(32, $second);
$this->assertEquals(33, $third);
}
public function testParseClassSpec() {
@ -600,4 +613,52 @@ class ObjectTest_ExtendTest4 extends ObjectTest_ExtendTest3 {
public function extendableMethod($argument = null) { return "ExtendTest4($argument)"; }
}
class ObjectTest_Extending extends Object implements TestOnly {
private static $extensions = array(
'ObjectTest_Extending_Extension'
);
public function getResults(&$first, &$second, &$third) {
// Before extending should be invoked second
$this->beforeExtending('updateResult', function(&$first, &$second, &$third) {
if($first === 1 && $second === 2 && $third === 3) {
$first = 11;
$second = 12;
$third = 13;
return 'before';
}
return 'before-error';
});
// After extending should be invoked fourth
$this->afterExtending('updateResult', function(&$first, &$second, &$third) {
if($first === 21 && $second === 22 && $third = 23) {
$first = 31;
$second = 32;
$third = 33;
return 'after';
}
return 'after-error';
});
// Function body invoked first
$result = $this->extend('updateResult', $first, $second, $third);
return array($result);
}
}
class ObjectTest_Extending_Extension extends Extension implements TestOnly {
public function updateResult(&$first, &$second, &$third) {
// Extension should be invoked third
if($first === 11 && $second === 12 && $third == 13) {
$first = 21;
$second = 22;
$third = 23;
return 'extension';
}
return 'extension-error';
}
}
/**#@-*/

10
tests/model/DataObjectLazyLoadingTest.php
View File

@ -13,6 +13,7 @@ class DataObjectLazyLoadingTest extends SapphireTest {
// These are all defined in DataObjectTest.php and VersionedTest.php
protected $extraDataObjects = array(
// From DataObjectTest
'DataObjectTest_Team',
'DataObjectTest_Fixture',
'DataObjectTest_SubTeam',
@ -31,8 +32,10 @@ class DataObjectLazyLoadingTest extends SapphireTest {
'DataObjectTest_Staff',
'DataObjectTest_CEO',
'DataObjectTest_Fan',
'VersionedLazy_DataObject',
'VersionedLazySub_DataObject',
'DataObjectTest_Play',
'DataObjectTest_Ploy',
'DataObjectTest_Bogey',
// From VersionedTest
'VersionedTest_DataObject',
'VersionedTest_Subclass',
'VersionedTest_AnotherSubclass',
@ -41,6 +44,9 @@ class DataObjectLazyLoadingTest extends SapphireTest {
'VersionedTest_WithIndexes',
'VersionedTest_PublicStage',
'VersionedTest_PublicViaExtension',
// From DataObjectLazyLoadingTest
'VersionedLazy_DataObject',
'VersionedLazySub_DataObject',
);
public function testQueriedColumnsID() {

6
tests/model/URLSegmentFilterTest.php
View File

@ -96,4 +96,10 @@ class URLSegmentFilterTest extends SapphireTest {
$this->assertEquals('url-has-trailing-dashes', $filter->filter('url-has-trailing-dashes--'));
}
public function testRemovesBadCharactersWithMultibyteAllowed() {
$filter = new URLSegmentFilter();
$filter->setAllowMultibyte(true);
$this->assertEquals('url-with-bad-characters', $filter->filter('url?-with/-bad#-characters='));
}
}

40
tests/model/VersionedTest.php
View File

@ -156,13 +156,13 @@ class VersionedTest extends SapphireTest {
"\"VersionedTest_DataObject\".\"ID\" ASC");
// Check that page 3 has gone
$this->assertNotNull($remainingPages);
$this->assertEquals(array("Page 1", "Page 2"), $remainingPages->column('Title'));
$this->assertEquals(array("Page 1", "Page 2", "Subclass Page 1"), $remainingPages->column('Title'));
// Get all including deleted
$allPages = Versioned::get_including_deleted("VersionedTest_DataObject", "\"ParentID\" = 0",
"\"VersionedTest_DataObject\".\"ID\" ASC");
// Check that page 3 is still there
$this->assertEquals(array("Page 1", "Page 2", "Page 3"), $allPages->column('Title'));
$this->assertEquals(array("Page 1", "Page 2", "Page 3", "Subclass Page 1"), $allPages->column('Title'));
// Check that the returned pages have the correct IDs
$this->assertEquals($allPageIDs, $allPages->column('ID'));
@ -171,7 +171,7 @@ class VersionedTest extends SapphireTest {
Versioned::reading_stage("Live");
$allPages = Versioned::get_including_deleted("VersionedTest_DataObject", "\"ParentID\" = 0",
"\"VersionedTest_DataObject\".\"ID\" ASC");
$this->assertEquals(array("Page 1", "Page 2", "Page 3"), $allPages->column('Title'));
$this->assertEquals(array("Page 1", "Page 2", "Page 3", "Subclass Page 1"), $allPages->column('Title'));
// Check that the returned pages still have the correct IDs
$this->assertEquals($allPageIDs, $allPages->column('ID'));
@ -210,7 +210,7 @@ class VersionedTest extends SapphireTest {
}
public function testRollbackTo() {
$page1 = $this->objFromFixture('VersionedTest_DataObject', 'page1');
$page1 = $this->objFromFixture('VersionedTest_AnotherSubclass', 'subclass1');
$page1->Content = 'orig';
$page1->write();
$page1->publish('Stage', 'Live');
@ -227,6 +227,17 @@ class VersionedTest extends SapphireTest {
$this->assertTrue($page1->Version > $changedVersion, 'Create a new higher version number');
$this->assertEquals('orig', $page1->Content, 'Copies the content from the old version');
// check db entries
$version = DB::prepared_query("SELECT MAX(\"Version\") FROM \"VersionedTest_DataObject_versions\" WHERE \"RecordID\" = ?",
array($page1->ID)
)->value();
$this->assertEquals($page1->Version, $version, 'Correct entry in VersionedTest_DataObject_versions');
$version = DB::prepared_query("SELECT MAX(\"Version\") FROM \"VersionedTest_AnotherSubclass_versions\" WHERE \"RecordID\" = ?",
array($page1->ID)
)->value();
$this->assertEquals($page1->Version, $version, 'Correct entry in VersionedTest_AnotherSubclass_versions');
}
public function testDeleteFromStage() {
@ -320,6 +331,7 @@ class VersionedTest extends SapphireTest {
$noversion = new DataObject();
$versioned = new VersionedTest_DataObject();
$versionedSub = new VersionedTest_Subclass();
$versionedAno = new VersionedTest_AnotherSubclass();
$versionField = new VersionedTest_UnversionedWithField();
$this->assertFalse(
@ -331,8 +343,14 @@ class VersionedTest extends SapphireTest {
'The versioned ext adds an Int version field.'
);
$this->assertEquals(
'Int', $versionedSub->hasOwnTableDatabaseField('Version'),
'Sub-classes of a versioned model have a Version field.'
null,
$versionedSub->hasOwnTableDatabaseField('Version'),
'Sub-classes of a versioned model don\'t have a Version field.'
);
$this->assertEquals(
null,
$versionedAno->hasOwnTableDatabaseField('Version'),
'Sub-classes of a versioned model don\'t have a Version field.'
);
$this->assertEquals(
'Varchar', $versionField->hasOwnTableDatabaseField('Version'),
@ -639,6 +657,8 @@ class VersionedTest extends SapphireTest {
$this->assertArrayNotHasKey('readingMode', $session2->inst_changedData());
// Test choose_site_stage
unset($_GET['stage']);
unset($_GET['archiveDate']);
Session::set('readingMode', 'Stage.Stage');
Versioned::choose_site_stage();
$this->assertEquals('Stage.Stage', Versioned::get_reading_mode());
@ -662,8 +682,8 @@ class VersionedTest extends SapphireTest {
/**
* Ensures that the latest version of a record is the expected value
*
* @param type $record
* @param type $version
* @param DataObject $record
* @param int $version
*/
protected function assertRecordHasLatestVersion($record, $version) {
foreach(ClassInfo::ancestry(get_class($record), true) as $table) {
@ -922,10 +942,6 @@ class VersionedTest_Subclass extends VersionedTest_DataObject implements TestOnl
private static $db = array(
"ExtraField" => "Varchar",
);
private static $extensions = array(
"Versioned('Stage', 'Live')"
);
}
/**

7
tests/model/VersionedTest.yml
View File

@ -17,9 +17,16 @@ VersionedTest_DataObject:
page3b:
Parent: =>VersionedTest_DataObject.page3
Title: Page 3b
VersionedTest_PublicStage:
public1:
Title: 'Some page'
VersionedTest_PublicViaExtension:
public2:
Title: 'Another page'
VersionedTest_AnotherSubclass:
subclass1:
Title: 'Subclass Page 1'
AnotherField: 'Bob'