mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge remote-tracking branch 'origin/3.1'
Conflicts: .travis.yml README.md admin/code/LeftAndMain.php admin/css/screen.css admin/scss/screen.scss api/RestfulService.php conf/ConfigureFromEnv.php control/injector/ServiceConfigurationLocator.php control/injector/SilverStripeServiceConfigurationLocator.php core/ClassInfo.php core/Object.php css/AssetUploadField.css css/ComplexTableField_popup.css dev/CSSContentParser.php dev/DevelopmentAdmin.php docs/en/changelogs/index.md docs/en/misc/contributing/code.md docs/en/reference/execution-pipeline.md filesystem/GD.php filesystem/ImagickBackend.php filesystem/Upload.php forms/Form.php forms/FormField.php forms/HtmlEditorConfig.php forms/gridfield/GridFieldDetailForm.php forms/gridfield/GridFieldSortableHeader.php lang/en.yml model/Aggregate.php model/DataList.php model/DataObject.php model/DataQuery.php model/Image.php model/MySQLDatabase.php model/SQLQuery.php model/fieldtypes/HTMLText.php model/fieldtypes/Text.php scss/AssetUploadField.scss search/filters/SearchFilter.php security/Authenticator.php security/LoginForm.php security/Member.php security/MemberAuthenticator.php security/MemberLoginForm.php security/Security.php tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php tests/control/HTTPTest.php tests/control/RequestHandlingTest.php tests/filesystem/UploadTest.php tests/forms/FormTest.php tests/forms/NumericFieldTest.php tests/model/DataListTest.php tests/model/DataObjectTest.php tests/model/TextTest.php tests/security/MemberAuthenticatorTest.php tests/security/SecurityDefaultAdminTest.php tests/view/SSViewerCacheBlockTest.php tests/view/SSViewerTest.php
This commit is contained in:
Damian Mooyman
commit
0b1f297873
30
.travis.yml
30
.travis.yml
@ -1,33 +1,39 @@
|
|||||||
language: php
|
language: php
|
||||||
|
|
||||||
php:
|
php:
|
||||||
- 5.3
|
- 5.4
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
|
- CORE_RELEASE=master
|
||||||
- "ARTIFACTS_AWS_REGION=us-east-1"
|
- "ARTIFACTS_AWS_REGION=us-east-1"
|
||||||
- "ARTIFACTS_S3_BUCKET=silverstripe-travis-artifacts"
|
- "ARTIFACTS_S3_BUCKET=silverstripe-travis-artifacts"
|
||||||
- secure: "DjwZKhY/c0wXppGmd8oEMiTV0ayfOXiCmi9Lg1aXoSXNnj+sjLmhYwhUWjehjR6IX0MRtzJG6v7V5Y+4nSGe+i+XIrBQnhPQ95Jrkm1gKofX2mznWTl9npQElNS1DXi58NLPbiB3qxHWGFBRAWmRQrsAouyZabkPnChnSa9ldOg="
|
- secure: "DjwZKhY/c0wXppGmd8oEMiTV0ayfOXiCmi9Lg1aXoSXNnj+sjLmhYwhUWjehjR6IX0MRtzJG6v7V5Y+4nSGe+i+XIrBQnhPQ95Jrkm1gKofX2mznWTl9npQElNS1DXi58NLPbiB3qxHWGFBRAWmRQrsAouyZabkPnChnSa9ldOg="
|
||||||
- secure: "UmbXCNLK0f2Dk+7qX8bOVcgIt4QhRvccoWvMUxaPtIU+95HCbG10eeCxvfOeBax+tHcRXmeCG4vM4tcuT/WoANkAma/VX74DylFjbWhks2tsKOcr2kjTrOwe6Q9CXOBjVAlcx0lnV/a+w83KARjXGnCrIbE7p7r4EDw31rkVufg="
|
- secure: "UmbXCNLK0f2Dk+7qX8bOVcgIt4QhRvccoWvMUxaPtIU+95HCbG10eeCxvfOeBax+tHcRXmeCG4vM4tcuT/WoANkAma/VX74DylFjbWhks2tsKOcr2kjTrOwe6Q9CXOBjVAlcx0lnV/a+w83KARjXGnCrIbE7p7r4EDw31rkVufg="
|
||||||
matrix:
|
matrix:
|
||||||
- DB=MYSQL CORE_RELEASE=master
|
- DB=MYSQL
|
||||||
|
- DB=SQLITE
|
||||||
|
- DB=PGSQL
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
|
allow_failures:
|
||||||
|
- php: hhvm-nightly
|
||||||
include:
|
include:
|
||||||
- php: 5.4
|
- php: 5.4
|
||||||
env: DB=SQLITE CORE_RELEASE=master
|
env: DB=MYSQL PDO=1
|
||||||
- php: 5.4
|
|
||||||
env: DB=PGSQL CORE_RELEASE=master
|
|
||||||
- php: 5.4
|
|
||||||
env: DB=MYSQL CORE_RELEASE=master
|
|
||||||
- php: 5.4
|
|
||||||
env: DB=MYSQL CORE_RELEASE=master PDO=1
|
|
||||||
- php: 5.5
|
- php: 5.5
|
||||||
env: DB=MYSQL CORE_RELEASE=master
|
env: DB=MYSQL
|
||||||
- php: 5.6
|
- php: 5.6
|
||||||
env: DB=MYSQL CORE_RELEASE=master
|
env: DB=MYSQL
|
||||||
- php: 5.4
|
- php: 5.4
|
||||||
env: DB=MYSQL CORE_RELEASE=master BEHAT_TEST=1
|
env: DB=MYSQL BEHAT_TEST=1
|
||||||
|
- php: 5.3
|
||||||
|
env: DB=MYSQL
|
||||||
|
- php: hhvm-nightly
|
||||||
|
env: DB=MYSQL
|
||||||
|
before_install:
|
||||||
|
- sudo apt-get update -qq
|
||||||
|
- sudo apt-get install -y tidy
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- composer self-update
|
- composer self-update
|
||||||
|
|||||||
20
Makefile
20
Makefile
@ -1,20 +0,0 @@
|
|||||||
#
|
|
||||||
# This makefile is a secondary way of installing SilverStripe.
|
|
||||||
# It is used for things like continuous integration
|
|
||||||
#
|
|
||||||
# Most users should simply visit the site root in your web browser.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
URL=`php ./cli-script.php SapphireInfo/baseurl`
|
|
||||||
|
|
||||||
test: phpunit
|
|
||||||
|
|
||||||
phpunit:
|
|
||||||
php ./cli-script.php dev/build "flush=1&$(QUERYSTRING)"
|
|
||||||
php ./cli-script.php dev/tests/all "flush=1&$(QUERYSTRING)"
|
|
||||||
|
|
||||||
windmill:
|
|
||||||
functest ../cms/tests/test_windmill url=${URL}dev/tests/startsession browser=firefox
|
|
||||||
|
|
||||||
jasmine:
|
|
||||||
./tests/javascript/server.sh
|
|
||||||
@ -1,6 +1,10 @@
|
|||||||
## SilverStripe Framework
|
## SilverStripe Framework
|
||||||
|
|
||||||
[](https://travis-ci.org/silverstripe/silverstripe-framework)
|
[](https://travis-ci.org/silverstripe/silverstripe-framework)
|
||||||
|
[](http://www.silverstripe.org/stable-download/)
|
||||||
|
[](https://packagist.org/packages/silverstripe/framework)
|
||||||
|
[](https://packagist.org/packages/silverstripe/framework)
|
||||||
|
[](https://github.com/silverstripe/silverstripe-framework#license)
|
||||||
|
|
||||||
PHP5 framework forming the base for the SilverStripe CMS ([http://silverstripe.org](http://silverstripe.org)).
|
PHP5 framework forming the base for the SilverStripe CMS ([http://silverstripe.org](http://silverstripe.org)).
|
||||||
Requires a [`silverstripe-installer`](http://github.com/silverstripe/silverstripe-installer) base project. Typically used alongside the [`cms`](http://github.com/silverstripe/silverstripe-cms) module.
|
Requires a [`silverstripe-installer`](http://github.com/silverstripe/silverstripe-installer) base project. Typically used alongside the [`cms`](http://github.com/silverstripe/silverstripe-cms) module.
|
||||||
@ -31,7 +35,7 @@ If you would like to make changes to the SilverStripe core codebase, we have an
|
|||||||
|
|
||||||
## License ##
|
## License ##
|
||||||
|
|
||||||
Copyright (c) 2007-2013, SilverStripe Limited - www.silverstripe.com
|
Copyright (c) 2006-2014, SilverStripe Limited - www.silverstripe.com
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
||||||
|
|||||||
23
_config/dev.yml
Normal file
23
_config/dev.yml
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
---
|
||||||
|
Name: DevelopmentAdmin
|
||||||
|
---
|
||||||
|
DevelopmentAdmin:
|
||||||
|
registered_controllers:
|
||||||
|
build:
|
||||||
|
controller: 'DevBuildController'
|
||||||
|
links:
|
||||||
|
build: 'Build/rebuild this environment. Call this whenever you have updated your project sources'
|
||||||
|
tests:
|
||||||
|
controller: 'TestRunner'
|
||||||
|
links:
|
||||||
|
tests: 'See a list of unit tests to run'
|
||||||
|
'tests/all': 'Run all tests'
|
||||||
|
jstests:
|
||||||
|
controller: 'JSTestRunner'
|
||||||
|
links:
|
||||||
|
jstests: 'See a list of JavaScript tests to run'
|
||||||
|
'jstests/all': 'Run all JavaScript tests'
|
||||||
|
tasks:
|
||||||
|
controller: 'TaskRunner'
|
||||||
|
links:
|
||||||
|
tasks: 'See a list of build tasks to run'
|
||||||
@ -5,4 +5,5 @@ Injector:
|
|||||||
RequestProcessor:
|
RequestProcessor:
|
||||||
properties:
|
properties:
|
||||||
filters:
|
filters:
|
||||||
|
- '%$FlushRequestFilter'
|
||||||
- '%$VersionedRequestFilter'
|
- '%$VersionedRequestFilter'
|
||||||
|
|||||||
@ -457,6 +457,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
|
|||||||
|
|
||||||
// Prevent clickjacking, see https://developer.mozilla.org/en-US/docs/HTTP/X-Frame-Options
|
// Prevent clickjacking, see https://developer.mozilla.org/en-US/docs/HTTP/X-Frame-Options
|
||||||
$this->response->addHeader('X-Frame-Options', 'SAMEORIGIN');
|
$this->response->addHeader('X-Frame-Options', 'SAMEORIGIN');
|
||||||
|
$this->response->addHeader('Vary', 'X-Requested-With');
|
||||||
|
|
||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
/** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */
|
/** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */
|
||||||
.cms .ss-ui-button { background-color: #e6e6e6; }
|
.cms .ss-ui-button { background-color: #e6e6e6; }
|
||||||
.cms .ss-ui-button.ui-state-hover { background-color: #f3f3f3; }
|
.cms .ss-ui-button.ui-state-hover { background-color: #f3f3f3; }
|
||||||
.cms .ss-ui-button.ss-ui-action-constructive { background-color: #1f9433; }
|
.cms .ss-ui-button.ss-ui-action-constructive { background-color: #1F9433; }
|
||||||
.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover { background-color: #23a93a; }
|
.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover { background-color: #23a93a; }
|
||||||
.cms .ss-ui-button.ss-gridfield-button-filter { background: #55a4d2 url(../../images/icons/filter-icons.png) no-repeat -14px 4px; }
|
.cms .ss-ui-button.ss-gridfield-button-filter { background: #55a4d2 url(../../images/icons/filter-icons.png) no-repeat -14px 4px; }
|
||||||
|
|
||||||
@ -20,7 +20,7 @@
|
|||||||
.ss-gridfield-button-filter.ss-ui-button.hover-alike { background-color: #338DC1; background-position: -16px 6px; filter: none; }
|
.ss-gridfield-button-filter.ss-ui-button.hover-alike { background-color: #338DC1; background-position: -16px 6px; filter: none; }
|
||||||
|
|
||||||
.ss-gridfield-button-reset.ss-ui-button { background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter: none; }
|
.ss-gridfield-button-reset.ss-ui-button { background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter: none; }
|
||||||
.ss-gridfield-button-reset.ss-ui-button.filtered:hover { background: red url(../images/filter-icons.png) no-repeat 8px -17px; filter: none; }
|
.ss-gridfield-button-reset.ss-ui-button.filtered:hover { background: #f00 url(../images/filter-icons.png) no-repeat 8px -17px; filter: none; }
|
||||||
.ss-gridfield-button-reset.ss-ui-button.filtered:active { background: #e60000 url(../images/filter-icons.png) no-repeat 9px -16px; filter: none; }
|
.ss-gridfield-button-reset.ss-ui-button.filtered:active { background: #e60000 url(../images/filter-icons.png) no-repeat 9px -16px; filter: none; }
|
||||||
|
|
||||||
.cms table.ss-gridfield-table tr td { border-right: 1px solid #9a9a9a; }
|
.cms table.ss-gridfield-table tr td { border-right: 1px solid #9a9a9a; }
|
||||||
@ -54,77 +54,77 @@ fieldset.switch-states .switch input.state-name { margin-left: -20px; }
|
|||||||
.cms-content-controls .preview-size-selector { display: none; }
|
.cms-content-controls .preview-size-selector { display: none; }
|
||||||
|
|
||||||
/** Helper SCSS file for generating sprites for the interface. */
|
/** Helper SCSS file for generating sprites for the interface. */
|
||||||
.btn-icon-sprite, .ui-state-default .btn-icon-accept, .ui-widget-content .btn-icon-accept, .ui-state-default .btn-icon-accept_disabled, .ui-widget-content .btn-icon-accept_disabled, .ui-state-default .btn-icon-add, .ui-widget-content .btn-icon-add, .ui-state-default .btn-icon-addMedia, .ui-widget-content .btn-icon-addMedia, .ui-state-default .btn-icon-add_disabled, .ui-widget-content .btn-icon-add_disabled, .ui-state-default .btn-icon-addpage, .ui-widget-content .btn-icon-addpage, .ui-state-default .btn-icon-addpage_disabled, .ui-widget-content .btn-icon-addpage_disabled, .ui-state-default .btn-icon-arrow-circle-135-left, .ui-widget-content .btn-icon-arrow-circle-135-left, .ui-state-default .btn-icon-arrow-circle-double, .ui-widget-content .btn-icon-arrow-circle-double, .ui-state-default .btn-icon-back, .ui-widget-content .btn-icon-back, .ui-state-default .btn-icon-back_disabled, .ui-widget-content .btn-icon-back_disabled, .ui-state-default .btn-icon-chain--arrow, .ui-widget-content .btn-icon-chain--arrow, .ui-state-default .btn-icon-chain--exclamation, .ui-widget-content .btn-icon-chain--exclamation, .ui-state-default .btn-icon-chain--minus, .ui-widget-content .btn-icon-chain--minus, .ui-state-default .btn-icon-chain--pencil, .ui-widget-content .btn-icon-chain--pencil, .ui-state-default .btn-icon-chain--plus, .ui-widget-content .btn-icon-chain--plus, .ui-state-default .btn-icon-chain-small, .ui-widget-content .btn-icon-chain-small, .ui-state-default .btn-icon-chain-unchain, .ui-widget-content .btn-icon-chain-unchain, .ui-state-default .btn-icon-chain, .ui-widget-content .btn-icon-chain, .ui-state-default .btn-icon-cross-circle, .ui-widget-content .btn-icon-cross-circle, .ui-state-default .btn-icon-cross-circle_disabled, .ui-widget-content .btn-icon-cross-circle_disabled, .ui-state-default .btn-icon-cross, .ui-widget-content .btn-icon-cross, .ui-state-default .btn-icon-decline, .ui-widget-content .btn-icon-decline, .ui-state-default .btn-icon-decline_disabled, .ui-widget-content .btn-icon-decline_disabled, .ui-state-default .btn-icon-delete, .ui-widget-content .btn-icon-delete, .ui-state-default .btn-icon-deleteLight, .ui-widget-content .btn-icon-deleteLight, .ui-state-default .btn-icon-disk, .ui-widget-content .btn-icon-disk, .ui-state-default .btn-icon-document--pencil, .ui-widget-content .btn-icon-document--pencil, .ui-state-default .btn-icon-download-csv, .ui-widget-content .btn-icon-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-widget-content .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .ui-widget-content .btn-icon-drive-upload_disabled, .ui-state-default .btn-icon-grid_print, .ui-widget-content .btn-icon-grid_print, .ui-state-default .btn-icon-magnifier, .ui-widget-content .btn-icon-magnifier, .ui-state-default .btn-icon-minus-circle, .ui-widget-content .btn-icon-minus-circle, .ui-state-default .btn-icon-minus-circle_disabled, .ui-widget-content .btn-icon-minus-circle_disabled, .ui-state-default .btn-icon-navigation, .ui-widget-content .btn-icon-navigation, .ui-state-default .btn-icon-navigation_disabled, .ui-widget-content .btn-icon-navigation_disabled, .ui-state-default .btn-icon-network-cloud, .ui-widget-content .btn-icon-network-cloud, .ui-state-default .btn-icon-network-cloud_disabled, .ui-widget-content .btn-icon-network-cloud_disabled, .ui-state-default .btn-icon-pencil, .ui-widget-content .btn-icon-pencil, .ui-state-default .btn-icon-pencil_disabled, .ui-widget-content .btn-icon-pencil_disabled, .ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-widget-content .btn-icon-plug-disconnect-prohibition, .ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-widget-content .btn-icon-plug-disconnect-prohibition_disabled, .ui-state-default .btn-icon-preview, .ui-widget-content .btn-icon-preview, .ui-state-default .btn-icon-preview_disabled, .ui-widget-content .btn-icon-preview_disabled, .ui-state-default .btn-icon-settings, .ui-widget-content .btn-icon-settings, .ui-state-default .btn-icon-settings_disabled, .ui-widget-content .btn-icon-settings_disabled, .ui-state-default .btn-icon-unpublish, .ui-widget-content .btn-icon-unpublish, .ui-state-default .btn-icon-unpublish_disabled, .ui-widget-content .btn-icon-unpublish_disabled { background: url('../images/btn-icon-s5a3074ba2a.png') no-repeat; }
|
.btn-icon-sprite, .ui-state-default .btn-icon-accept, .ui-widget-content .btn-icon-accept, .ui-state-default .btn-icon-accept_disabled, .ui-widget-content .btn-icon-accept_disabled, .ui-state-default .btn-icon-add, .ui-widget-content .btn-icon-add, .ui-state-default .btn-icon-addMedia, .ui-widget-content .btn-icon-addMedia, .ui-state-default .btn-icon-add_disabled, .ui-widget-content .btn-icon-add_disabled, .ui-state-default .btn-icon-addpage, .ui-widget-content .btn-icon-addpage, .ui-state-default .btn-icon-addpage_disabled, .ui-widget-content .btn-icon-addpage_disabled, .ui-state-default .btn-icon-arrow-circle-135-left, .ui-widget-content .btn-icon-arrow-circle-135-left, .ui-state-default .btn-icon-arrow-circle-double, .ui-widget-content .btn-icon-arrow-circle-double, .ui-state-default .btn-icon-back, .ui-widget-content .btn-icon-back, .ui-state-default .btn-icon-back_disabled, .ui-widget-content .btn-icon-back_disabled, .ui-state-default .btn-icon-chain--arrow, .ui-widget-content .btn-icon-chain--arrow, .ui-state-default .btn-icon-chain--exclamation, .ui-widget-content .btn-icon-chain--exclamation, .ui-state-default .btn-icon-chain--minus, .ui-widget-content .btn-icon-chain--minus, .ui-state-default .btn-icon-chain--pencil, .ui-widget-content .btn-icon-chain--pencil, .ui-state-default .btn-icon-chain--plus, .ui-widget-content .btn-icon-chain--plus, .ui-state-default .btn-icon-chain-small, .ui-widget-content .btn-icon-chain-small, .ui-state-default .btn-icon-chain-unchain, .ui-widget-content .btn-icon-chain-unchain, .ui-state-default .btn-icon-chain, .ui-widget-content .btn-icon-chain, .ui-state-default .btn-icon-cross-circle, .ui-widget-content .btn-icon-cross-circle, .ui-state-default .btn-icon-cross-circle_disabled, .ui-widget-content .btn-icon-cross-circle_disabled, .ui-state-default .btn-icon-cross, .ui-widget-content .btn-icon-cross, .ui-state-default .btn-icon-decline, .ui-widget-content .btn-icon-decline, .ui-state-default .btn-icon-decline_disabled, .ui-widget-content .btn-icon-decline_disabled, .ui-state-default .btn-icon-delete, .ui-widget-content .btn-icon-delete, .ui-state-default .btn-icon-deleteLight, .ui-widget-content .btn-icon-deleteLight, .ui-state-default .btn-icon-disk, .ui-widget-content .btn-icon-disk, .ui-state-default .btn-icon-document--pencil, .ui-widget-content .btn-icon-document--pencil, .ui-state-default .btn-icon-download-csv, .ui-widget-content .btn-icon-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-widget-content .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .ui-widget-content .btn-icon-drive-upload_disabled, .ui-state-default .btn-icon-grid_print, .ui-widget-content .btn-icon-grid_print, .ui-state-default .btn-icon-magnifier, .ui-widget-content .btn-icon-magnifier, .ui-state-default .btn-icon-minus-circle, .ui-widget-content .btn-icon-minus-circle, .ui-state-default .btn-icon-minus-circle_disabled, .ui-widget-content .btn-icon-minus-circle_disabled, .ui-state-default .btn-icon-navigation, .ui-widget-content .btn-icon-navigation, .ui-state-default .btn-icon-navigation_disabled, .ui-widget-content .btn-icon-navigation_disabled, .ui-state-default .btn-icon-network-cloud, .ui-widget-content .btn-icon-network-cloud, .ui-state-default .btn-icon-network-cloud_disabled, .ui-widget-content .btn-icon-network-cloud_disabled, .ui-state-default .btn-icon-pencil, .ui-widget-content .btn-icon-pencil, .ui-state-default .btn-icon-pencil_disabled, .ui-widget-content .btn-icon-pencil_disabled, .ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-widget-content .btn-icon-plug-disconnect-prohibition, .ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-widget-content .btn-icon-plug-disconnect-prohibition_disabled, .ui-state-default .btn-icon-preview, .ui-widget-content .btn-icon-preview, .ui-state-default .btn-icon-preview_disabled, .ui-widget-content .btn-icon-preview_disabled, .ui-state-default .btn-icon-settings, .ui-widget-content .btn-icon-settings, .ui-state-default .btn-icon-settings_disabled, .ui-widget-content .btn-icon-settings_disabled, .ui-state-default .btn-icon-unpublish, .ui-widget-content .btn-icon-unpublish, .ui-state-default .btn-icon-unpublish_disabled, .ui-widget-content .btn-icon-unpublish_disabled { background-image: url('../images/btn-icon-sf963a8adf3.png'); background-repeat: no-repeat; }
|
||||||
|
|
||||||
.ui-state-default .btn-icon-accept, .ui-widget-content .btn-icon-accept { background-position: 0 -96px; }
|
.ui-state-default .btn-icon-accept, .ui-widget-content .btn-icon-accept { background-position: 0 0; }
|
||||||
.ui-state-default .btn-icon-accept_disabled, .ui-widget-content .btn-icon-accept_disabled { background-position: 0 -80px; }
|
.ui-state-default .btn-icon-accept_disabled, .ui-widget-content .btn-icon-accept_disabled { background-position: 0 -16px; }
|
||||||
.ui-state-default .btn-icon-add, .ui-widget-content .btn-icon-add { background-position: 0 0; }
|
.ui-state-default .btn-icon-add, .ui-widget-content .btn-icon-add { background-position: 0 -32px; }
|
||||||
.ui-state-default .btn-icon-addMedia, .ui-widget-content .btn-icon-addMedia { background-position: 0 -208px; }
|
.ui-state-default .btn-icon-addMedia, .ui-widget-content .btn-icon-addMedia { background-position: 0 -48px; }
|
||||||
.ui-state-default .btn-icon-add_disabled, .ui-widget-content .btn-icon-add_disabled { background-position: 0 -32px; }
|
.ui-state-default .btn-icon-add_disabled, .ui-widget-content .btn-icon-add_disabled { background-position: 0 -68px; }
|
||||||
.ui-state-default .btn-icon-addpage, .ui-widget-content .btn-icon-addpage { background-position: 0 -144px; }
|
.ui-state-default .btn-icon-addpage, .ui-widget-content .btn-icon-addpage { background-position: 0 -84px; }
|
||||||
.ui-state-default .btn-icon-addpage_disabled, .ui-widget-content .btn-icon-addpage_disabled { background-position: 0 -500px; }
|
.ui-state-default .btn-icon-addpage_disabled, .ui-widget-content .btn-icon-addpage_disabled { background-position: 0 -100px; }
|
||||||
.ui-state-default .btn-icon-arrow-circle-135-left, .ui-widget-content .btn-icon-arrow-circle-135-left { background-position: 0 -356px; }
|
.ui-state-default .btn-icon-arrow-circle-135-left, .ui-widget-content .btn-icon-arrow-circle-135-left { background-position: 0 -116px; }
|
||||||
.ui-state-default .btn-icon-arrow-circle-double, .ui-widget-content .btn-icon-arrow-circle-double { background-position: 0 -340px; }
|
.ui-state-default .btn-icon-arrow-circle-double, .ui-widget-content .btn-icon-arrow-circle-double { background-position: 0 -132px; }
|
||||||
.ui-state-default .btn-icon-back, .ui-widget-content .btn-icon-back { background-position: 0 -372px; }
|
.ui-state-default .btn-icon-back, .ui-widget-content .btn-icon-back { background-position: 0 -148px; }
|
||||||
.ui-state-default .btn-icon-back_disabled, .ui-widget-content .btn-icon-back_disabled { background-position: 0 -16px; }
|
.ui-state-default .btn-icon-back_disabled, .ui-widget-content .btn-icon-back_disabled { background-position: 0 -164px; }
|
||||||
.ui-state-default .btn-icon-chain--arrow, .ui-widget-content .btn-icon-chain--arrow { background-position: 0 -724px; }
|
.ui-state-default .btn-icon-chain--arrow, .ui-widget-content .btn-icon-chain--arrow { background-position: 0 -180px; }
|
||||||
.ui-state-default .btn-icon-chain--exclamation, .ui-widget-content .btn-icon-chain--exclamation { background-position: 0 -516px; }
|
.ui-state-default .btn-icon-chain--exclamation, .ui-widget-content .btn-icon-chain--exclamation { background-position: 0 -196px; }
|
||||||
.ui-state-default .btn-icon-chain--minus, .ui-widget-content .btn-icon-chain--minus { background-position: 0 -740px; }
|
.ui-state-default .btn-icon-chain--minus, .ui-widget-content .btn-icon-chain--minus { background-position: 0 -212px; }
|
||||||
.ui-state-default .btn-icon-chain--pencil, .ui-widget-content .btn-icon-chain--pencil { background-position: 0 -676px; }
|
.ui-state-default .btn-icon-chain--pencil, .ui-widget-content .btn-icon-chain--pencil { background-position: 0 -228px; }
|
||||||
.ui-state-default .btn-icon-chain--plus, .ui-widget-content .btn-icon-chain--plus { background-position: 0 -708px; }
|
.ui-state-default .btn-icon-chain--plus, .ui-widget-content .btn-icon-chain--plus { background-position: 0 -244px; }
|
||||||
.ui-state-default .btn-icon-chain-small, .ui-widget-content .btn-icon-chain-small { background-position: 0 -772px; }
|
.ui-state-default .btn-icon-chain-small, .ui-widget-content .btn-icon-chain-small { background-position: 0 -260px; }
|
||||||
.ui-state-default .btn-icon-chain-unchain, .ui-widget-content .btn-icon-chain-unchain { background-position: 0 -484px; }
|
.ui-state-default .btn-icon-chain-unchain, .ui-widget-content .btn-icon-chain-unchain { background-position: 0 -276px; }
|
||||||
.ui-state-default .btn-icon-chain, .ui-widget-content .btn-icon-chain { background-position: 0 -756px; }
|
.ui-state-default .btn-icon-chain, .ui-widget-content .btn-icon-chain { background-position: 0 -292px; }
|
||||||
.ui-state-default .btn-icon-cross-circle, .ui-widget-content .btn-icon-cross-circle { background-position: 0 -452px; }
|
.ui-state-default .btn-icon-cross-circle, .ui-widget-content .btn-icon-cross-circle { background-position: 0 -308px; }
|
||||||
.ui-state-default .btn-icon-cross-circle_disabled, .ui-widget-content .btn-icon-cross-circle_disabled { background-position: 0 -564px; }
|
.ui-state-default .btn-icon-cross-circle_disabled, .ui-widget-content .btn-icon-cross-circle_disabled { background-position: 0 -324px; }
|
||||||
.ui-state-default .btn-icon-cross, .ui-widget-content .btn-icon-cross { background-position: 0 -276px; }
|
.ui-state-default .btn-icon-cross, .ui-widget-content .btn-icon-cross { background-position: 0 -340px; }
|
||||||
.ui-state-default .btn-icon-decline, .ui-widget-content .btn-icon-decline { background-position: 0 -128px; }
|
.ui-state-default .btn-icon-decline, .ui-widget-content .btn-icon-decline { background-position: 0 -355px; }
|
||||||
.ui-state-default .btn-icon-decline_disabled, .ui-widget-content .btn-icon-decline_disabled { background-position: 0 -192px; }
|
.ui-state-default .btn-icon-decline_disabled, .ui-widget-content .btn-icon-decline_disabled { background-position: 0 -371px; }
|
||||||
.ui-state-default .btn-icon-delete, .ui-widget-content .btn-icon-delete { background-position: 0 -468px; }
|
.ui-state-default .btn-icon-delete, .ui-widget-content .btn-icon-delete { background-position: 0 -387px; }
|
||||||
.ui-state-default .btn-icon-deleteLight, .ui-widget-content .btn-icon-deleteLight { background-position: 0 -307px; }
|
.ui-state-default .btn-icon-deleteLight, .ui-widget-content .btn-icon-deleteLight { background-position: 0 -403px; }
|
||||||
.ui-state-default .btn-icon-disk, .ui-widget-content .btn-icon-disk { background-position: 0 -291px; }
|
.ui-state-default .btn-icon-disk, .ui-widget-content .btn-icon-disk { background-position: 0 -420px; }
|
||||||
.ui-state-default .btn-icon-document--pencil, .ui-widget-content .btn-icon-document--pencil { background-position: 0 -548px; }
|
.ui-state-default .btn-icon-document--pencil, .ui-widget-content .btn-icon-document--pencil { background-position: 0 -436px; }
|
||||||
.ui-state-default .btn-icon-download-csv, .ui-widget-content .btn-icon-download-csv { background-position: 0 -48px; }
|
.ui-state-default .btn-icon-download-csv, .ui-widget-content .btn-icon-download-csv { background-position: 0 -452px; }
|
||||||
.ui-state-default .btn-icon-drive-upload, .ui-widget-content .btn-icon-drive-upload { background-position: 0 -420px; }
|
.ui-state-default .btn-icon-drive-upload, .ui-widget-content .btn-icon-drive-upload { background-position: 0 -468px; }
|
||||||
.ui-state-default .btn-icon-drive-upload_disabled, .ui-widget-content .btn-icon-drive-upload_disabled { background-position: 0 -580px; }
|
.ui-state-default .btn-icon-drive-upload_disabled, .ui-widget-content .btn-icon-drive-upload_disabled { background-position: 0 -484px; }
|
||||||
.ui-state-default .btn-icon-grid_print, .ui-widget-content .btn-icon-grid_print { background-position: 0 -260px; }
|
.ui-state-default .btn-icon-grid_print, .ui-widget-content .btn-icon-grid_print { background-position: 0 -500px; }
|
||||||
.ui-state-default .btn-icon-magnifier, .ui-widget-content .btn-icon-magnifier { background-position: 0 -532px; }
|
.ui-state-default .btn-icon-magnifier, .ui-widget-content .btn-icon-magnifier { background-position: 0 -516px; }
|
||||||
.ui-state-default .btn-icon-minus-circle, .ui-widget-content .btn-icon-minus-circle { background-position: 0 -628px; }
|
.ui-state-default .btn-icon-minus-circle, .ui-widget-content .btn-icon-minus-circle { background-position: 0 -532px; }
|
||||||
.ui-state-default .btn-icon-minus-circle_disabled, .ui-widget-content .btn-icon-minus-circle_disabled { background-position: 0 -644px; }
|
.ui-state-default .btn-icon-minus-circle_disabled, .ui-widget-content .btn-icon-minus-circle_disabled { background-position: 0 -548px; }
|
||||||
.ui-state-default .btn-icon-navigation, .ui-widget-content .btn-icon-navigation { background-position: 0 -388px; }
|
.ui-state-default .btn-icon-navigation, .ui-widget-content .btn-icon-navigation { background-position: 0 -564px; }
|
||||||
.ui-state-default .btn-icon-navigation_disabled, .ui-widget-content .btn-icon-navigation_disabled { background-position: 0 -436px; }
|
.ui-state-default .btn-icon-navigation_disabled, .ui-widget-content .btn-icon-navigation_disabled { background-position: 0 -580px; }
|
||||||
.ui-state-default .btn-icon-network-cloud, .ui-widget-content .btn-icon-network-cloud { background-position: 0 -612px; }
|
.ui-state-default .btn-icon-network-cloud, .ui-widget-content .btn-icon-network-cloud { background-position: 0 -596px; }
|
||||||
.ui-state-default .btn-icon-network-cloud_disabled, .ui-widget-content .btn-icon-network-cloud_disabled { background-position: 0 -692px; }
|
.ui-state-default .btn-icon-network-cloud_disabled, .ui-widget-content .btn-icon-network-cloud_disabled { background-position: 0 -612px; }
|
||||||
.ui-state-default .btn-icon-pencil, .ui-widget-content .btn-icon-pencil { background-position: 0 -228px; }
|
.ui-state-default .btn-icon-pencil, .ui-widget-content .btn-icon-pencil { background-position: 0 -628px; }
|
||||||
.ui-state-default .btn-icon-pencil_disabled, .ui-widget-content .btn-icon-pencil_disabled { background-position: 0 -596px; }
|
.ui-state-default .btn-icon-pencil_disabled, .ui-widget-content .btn-icon-pencil_disabled { background-position: 0 -644px; }
|
||||||
.ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-widget-content .btn-icon-plug-disconnect-prohibition { background-position: 0 -244px; }
|
.ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-widget-content .btn-icon-plug-disconnect-prohibition { background-position: 0 -660px; }
|
||||||
.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-widget-content .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -660px; }
|
.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-widget-content .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -676px; }
|
||||||
.ui-state-default .btn-icon-preview, .ui-widget-content .btn-icon-preview { background-position: 0 -64px; }
|
.ui-state-default .btn-icon-preview, .ui-widget-content .btn-icon-preview { background-position: 0 -692px; }
|
||||||
.ui-state-default .btn-icon-preview_disabled, .ui-widget-content .btn-icon-preview_disabled { background-position: 0 -160px; }
|
.ui-state-default .btn-icon-preview_disabled, .ui-widget-content .btn-icon-preview_disabled { background-position: 0 -708px; }
|
||||||
.ui-state-default .btn-icon-settings, .ui-widget-content .btn-icon-settings { background-position: 0 -324px; }
|
.ui-state-default .btn-icon-settings, .ui-widget-content .btn-icon-settings { background-position: 0 -724px; }
|
||||||
.ui-state-default .btn-icon-settings_disabled, .ui-widget-content .btn-icon-settings_disabled { background-position: 0 -404px; }
|
.ui-state-default .btn-icon-settings_disabled, .ui-widget-content .btn-icon-settings_disabled { background-position: 0 -740px; }
|
||||||
.ui-state-default .btn-icon-unpublish, .ui-widget-content .btn-icon-unpublish { background-position: 0 -112px; }
|
.ui-state-default .btn-icon-unpublish, .ui-widget-content .btn-icon-unpublish { background-position: 0 -756px; }
|
||||||
.ui-state-default .btn-icon-unpublish_disabled, .ui-widget-content .btn-icon-unpublish_disabled { background-position: 0 -176px; }
|
.ui-state-default .btn-icon-unpublish_disabled, .ui-widget-content .btn-icon-unpublish_disabled { background-position: 0 -772px; }
|
||||||
|
|
||||||
.icon { text-indent: -9999px; border: none; outline: none; }
|
.icon { text-indent: -9999px; border: none; outline: none; }
|
||||||
.icon.icon-24 { width: 24px; height: 24px; background: url('../images/menu-icons/24x24-s391afdd013.png'); }
|
.icon.icon-24 { width: 24px; height: 24px; background: url('../images/menu-icons/24x24-s0dc15c36f9.png'); }
|
||||||
.icon.icon-24.icon-assetadmin { background-position: 0 -120px; }
|
.icon.icon-24.icon-assetadmin { background-position: 0 -216px; }
|
||||||
.icon.icon-24.icon-cmsmain { background-position: 0 -48px; }
|
.icon.icon-24.icon-cmsmain { background-position: 0 -192px; }
|
||||||
.icon.icon-24.icon-cmspagescontroller { background-position: 0 -216px; }
|
.icon.icon-24.icon-cmspagescontroller { background-position: 0 -168px; }
|
||||||
.icon.icon-24.icon-cmssettingscontroller { background-position: 0 0; }
|
.icon.icon-24.icon-cmssettingscontroller { background-position: 0 -96px; }
|
||||||
.icon.icon-24.icon-securityadmin { background-position: 0 -24px; }
|
.icon.icon-24.icon-securityadmin { background-position: 0 -24px; }
|
||||||
.icon.icon-24.icon-reportadmin { background-position: 0 -72px; }
|
.icon.icon-24.icon-reportadmin { background-position: 0 -240px; }
|
||||||
.icon.icon-24.icon-commentadmin { background-position: 0 -192px; }
|
.icon.icon-24.icon-commentadmin { background-position: 0 0; }
|
||||||
.icon.icon-24.icon-help { background-position: 0 -96px; }
|
.icon.icon-24.icon-help { background-position: 0 -144px; }
|
||||||
.icon.icon-16 { width: 16px; height: 16px; background: url('../images/menu-icons/16x16-sf5b94bb49b.png'); }
|
.icon.icon-16 { width: 16px; height: 16px; background: url('../images/menu-icons/16x16-s3f4c846209.png'); }
|
||||||
.icon.icon-16.icon-assetadmin { background-position: 0 -80px; }
|
.icon.icon-16.icon-assetadmin { background-position: 0 -144px; }
|
||||||
.icon.icon-16.icon-cmsmain { background-position: 0 -16px; }
|
.icon.icon-16.icon-cmsmain { background-position: 0 -128px; }
|
||||||
.icon.icon-16.icon-cmspagescontroller { background-position: 0 -112px; }
|
.icon.icon-16.icon-cmspagescontroller { background-position: 0 -112px; }
|
||||||
.icon.icon-16.icon-cmssettingscontroller { background-position: 0 0; }
|
.icon.icon-16.icon-cmssettingscontroller { background-position: 0 -64px; }
|
||||||
.icon.icon-16.icon-securityadmin { background-position: 0 -48px; }
|
.icon.icon-16.icon-securityadmin { background-position: 0 -16px; }
|
||||||
.icon.icon-16.icon-reportadmin { background-position: 0 -32px; }
|
.icon.icon-16.icon-reportadmin { background-position: 0 -160px; }
|
||||||
.icon.icon-16.icon-commentadmin { background-position: 0 -144px; }
|
.icon.icon-16.icon-commentadmin { background-position: 0 0; }
|
||||||
.icon.icon-16.icon-help { background-position: 0 -64px; }
|
.icon.icon-16.icon-help { background-position: 0 -96px; }
|
||||||
|
|
||||||
html { overflow: hidden; }
|
html { overflow: hidden; }
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
/** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */
|
/** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */
|
||||||
.cms .ss-ui-button { background-color: #e6e6e6; }
|
.cms .ss-ui-button { background-color: #e6e6e6; }
|
||||||
.cms .ss-ui-button.ui-state-hover { background-color: #f3f3f3; }
|
.cms .ss-ui-button.ui-state-hover { background-color: #f3f3f3; }
|
||||||
.cms .ss-ui-button.ss-ui-action-constructive { background-color: #1f9433; }
|
.cms .ss-ui-button.ss-ui-action-constructive { background-color: #1F9433; }
|
||||||
.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover { background-color: #23a93a; }
|
.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover { background-color: #23a93a; }
|
||||||
.cms .ss-ui-button.ss-gridfield-button-filter { background: #55a4d2 url(../../images/icons/filter-icons.png) no-repeat -14px 4px; }
|
.cms .ss-ui-button.ss-gridfield-button-filter { background: #55a4d2 url(../../images/icons/filter-icons.png) no-repeat -14px 4px; }
|
||||||
|
|
||||||
@ -20,7 +20,7 @@
|
|||||||
.ss-gridfield-button-filter.ss-ui-button.hover-alike { background-color: #338DC1; background-position: -16px 6px; filter: none; }
|
.ss-gridfield-button-filter.ss-ui-button.hover-alike { background-color: #338DC1; background-position: -16px 6px; filter: none; }
|
||||||
|
|
||||||
.ss-gridfield-button-reset.ss-ui-button { background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter: none; }
|
.ss-gridfield-button-reset.ss-ui-button { background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter: none; }
|
||||||
.ss-gridfield-button-reset.ss-ui-button.filtered:hover { background: red url(../images/filter-icons.png) no-repeat 8px -17px; filter: none; }
|
.ss-gridfield-button-reset.ss-ui-button.filtered:hover { background: #f00 url(../images/filter-icons.png) no-repeat 8px -17px; filter: none; }
|
||||||
.ss-gridfield-button-reset.ss-ui-button.filtered:active { background: #e60000 url(../images/filter-icons.png) no-repeat 9px -16px; filter: none; }
|
.ss-gridfield-button-reset.ss-ui-button.filtered:active { background: #e60000 url(../images/filter-icons.png) no-repeat 9px -16px; filter: none; }
|
||||||
|
|
||||||
.cms table.ss-gridfield-table tr td { border-right: 1px solid #9a9a9a; }
|
.cms table.ss-gridfield-table tr td { border-right: 1px solid #9a9a9a; }
|
||||||
|
|||||||
@ -15,7 +15,7 @@ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: n
|
|||||||
|
|
||||||
a img { border: none; }
|
a img { border: none; }
|
||||||
|
|
||||||
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { display: block; }
|
article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
|
||||||
|
|
||||||
/*$experimental-support-for-svg variable comes from
|
/*$experimental-support-for-svg variable comes from
|
||||||
imported compass/support file and enables svg gradients in IE9.
|
imported compass/support file and enables svg gradients in IE9.
|
||||||
@ -37,81 +37,81 @@ Used in side panels and action tabs
|
|||||||
*/
|
*/
|
||||||
/** ----------------------------- Sprite images ----------------------------- */
|
/** ----------------------------- Sprite images ----------------------------- */
|
||||||
/** Helper SCSS file for generating sprites for the interface. */
|
/** Helper SCSS file for generating sprites for the interface. */
|
||||||
.btn-icon-sprite, .ui-state-default .btn-icon-accept, .ui-widget-content .btn-icon-accept, .ui-state-default .btn-icon-accept_disabled, .ui-widget-content .btn-icon-accept_disabled, .ui-state-default .btn-icon-add, .ui-widget-content .btn-icon-add, .ui-state-default .btn-icon-addMedia, .ui-widget-content .btn-icon-addMedia, .ui-state-default .btn-icon-add_disabled, .ui-widget-content .btn-icon-add_disabled, .ui-state-default .btn-icon-addpage, .ui-widget-content .btn-icon-addpage, .ui-state-default .btn-icon-addpage_disabled, .ui-widget-content .btn-icon-addpage_disabled, .ui-state-default .btn-icon-arrow-circle-135-left, .ui-widget-content .btn-icon-arrow-circle-135-left, .ui-state-default .btn-icon-arrow-circle-double, .ui-widget-content .btn-icon-arrow-circle-double, .ui-state-default .btn-icon-back, .ui-widget-content .btn-icon-back, .ui-state-default .btn-icon-back_disabled, .ui-widget-content .btn-icon-back_disabled, .ui-state-default .btn-icon-chain--arrow, .ui-widget-content .btn-icon-chain--arrow, .ui-state-default .btn-icon-chain--exclamation, .ui-widget-content .btn-icon-chain--exclamation, .ui-state-default .btn-icon-chain--minus, .ui-widget-content .btn-icon-chain--minus, .ui-state-default .btn-icon-chain--pencil, .ui-widget-content .btn-icon-chain--pencil, .ui-state-default .btn-icon-chain--plus, .ui-widget-content .btn-icon-chain--plus, .ui-state-default .btn-icon-chain-small, .ui-widget-content .btn-icon-chain-small, .ui-state-default .btn-icon-chain-unchain, .ui-widget-content .btn-icon-chain-unchain, .ui-state-default .btn-icon-chain, .ui-widget-content .btn-icon-chain, .ui-state-default .btn-icon-cross-circle, .ui-widget-content .btn-icon-cross-circle, .ui-state-default .btn-icon-cross-circle_disabled, .ui-widget-content .btn-icon-cross-circle_disabled, .ui-state-default .btn-icon-cross, .ui-widget-content .btn-icon-cross, .ui-state-default .btn-icon-decline, .ui-widget-content .btn-icon-decline, .ui-state-default .btn-icon-decline_disabled, .ui-widget-content .btn-icon-decline_disabled, .ui-state-default .btn-icon-delete, .ui-widget-content .btn-icon-delete, .ui-state-default .btn-icon-deleteLight, .ui-widget-content .btn-icon-deleteLight, .ui-state-default .btn-icon-disk, .ui-widget-content .btn-icon-disk, .ui-state-default .btn-icon-document--pencil, .ui-widget-content .btn-icon-document--pencil, .ui-state-default .btn-icon-download-csv, .ui-widget-content .btn-icon-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-widget-content .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .ui-widget-content .btn-icon-drive-upload_disabled, .ui-state-default .btn-icon-grid_print, .ui-widget-content .btn-icon-grid_print, .ui-state-default .btn-icon-magnifier, .ui-widget-content .btn-icon-magnifier, .ui-state-default .btn-icon-minus-circle, .ui-widget-content .btn-icon-minus-circle, .ui-state-default .btn-icon-minus-circle_disabled, .ui-widget-content .btn-icon-minus-circle_disabled, .ui-state-default .btn-icon-navigation, .ui-widget-content .btn-icon-navigation, .ui-state-default .btn-icon-navigation_disabled, .ui-widget-content .btn-icon-navigation_disabled, .ui-state-default .btn-icon-network-cloud, .ui-widget-content .btn-icon-network-cloud, .ui-state-default .btn-icon-network-cloud_disabled, .ui-widget-content .btn-icon-network-cloud_disabled, .ui-state-default .btn-icon-pencil, .ui-widget-content .btn-icon-pencil, .ui-state-default .btn-icon-pencil_disabled, .ui-widget-content .btn-icon-pencil_disabled, .ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-widget-content .btn-icon-plug-disconnect-prohibition, .ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-widget-content .btn-icon-plug-disconnect-prohibition_disabled, .ui-state-default .btn-icon-preview, .ui-widget-content .btn-icon-preview, .ui-state-default .btn-icon-preview_disabled, .ui-widget-content .btn-icon-preview_disabled, .ui-state-default .btn-icon-settings, .ui-widget-content .btn-icon-settings, .ui-state-default .btn-icon-settings_disabled, .ui-widget-content .btn-icon-settings_disabled, .ui-state-default .btn-icon-unpublish, .ui-widget-content .btn-icon-unpublish, .ui-state-default .btn-icon-unpublish_disabled, .ui-widget-content .btn-icon-unpublish_disabled { background: url('../images/btn-icon-s5a3074ba2a.png') no-repeat; }
|
.btn-icon-sprite, .ui-state-default .btn-icon-accept, .ui-widget-content .btn-icon-accept, .ui-state-default .btn-icon-accept_disabled, .ui-widget-content .btn-icon-accept_disabled, .ui-state-default .btn-icon-add, .ui-widget-content .btn-icon-add, .ui-state-default .btn-icon-addMedia, .ui-widget-content .btn-icon-addMedia, .ui-state-default .btn-icon-add_disabled, .ui-widget-content .btn-icon-add_disabled, .ui-state-default .btn-icon-addpage, .ui-widget-content .btn-icon-addpage, .ui-state-default .btn-icon-addpage_disabled, .ui-widget-content .btn-icon-addpage_disabled, .ui-state-default .btn-icon-arrow-circle-135-left, .ui-widget-content .btn-icon-arrow-circle-135-left, .ui-state-default .btn-icon-arrow-circle-double, .ui-widget-content .btn-icon-arrow-circle-double, .ui-state-default .btn-icon-back, .ui-widget-content .btn-icon-back, .ui-state-default .btn-icon-back_disabled, .ui-widget-content .btn-icon-back_disabled, .ui-state-default .btn-icon-chain--arrow, .ui-widget-content .btn-icon-chain--arrow, .ui-state-default .btn-icon-chain--exclamation, .ui-widget-content .btn-icon-chain--exclamation, .ui-state-default .btn-icon-chain--minus, .ui-widget-content .btn-icon-chain--minus, .ui-state-default .btn-icon-chain--pencil, .ui-widget-content .btn-icon-chain--pencil, .ui-state-default .btn-icon-chain--plus, .ui-widget-content .btn-icon-chain--plus, .ui-state-default .btn-icon-chain-small, .ui-widget-content .btn-icon-chain-small, .ui-state-default .btn-icon-chain-unchain, .ui-widget-content .btn-icon-chain-unchain, .ui-state-default .btn-icon-chain, .ui-widget-content .btn-icon-chain, .ui-state-default .btn-icon-cross-circle, .ui-widget-content .btn-icon-cross-circle, .ui-state-default .btn-icon-cross-circle_disabled, .ui-widget-content .btn-icon-cross-circle_disabled, .ui-state-default .btn-icon-cross, .ui-widget-content .btn-icon-cross, .ui-state-default .btn-icon-decline, .ui-widget-content .btn-icon-decline, .ui-state-default .btn-icon-decline_disabled, .ui-widget-content .btn-icon-decline_disabled, .ui-state-default .btn-icon-delete, .ui-widget-content .btn-icon-delete, .ui-state-default .btn-icon-deleteLight, .ui-widget-content .btn-icon-deleteLight, .ui-state-default .btn-icon-disk, .ui-widget-content .btn-icon-disk, .ui-state-default .btn-icon-document--pencil, .ui-widget-content .btn-icon-document--pencil, .ui-state-default .btn-icon-download-csv, .ui-widget-content .btn-icon-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-widget-content .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .ui-widget-content .btn-icon-drive-upload_disabled, .ui-state-default .btn-icon-grid_print, .ui-widget-content .btn-icon-grid_print, .ui-state-default .btn-icon-magnifier, .ui-widget-content .btn-icon-magnifier, .ui-state-default .btn-icon-minus-circle, .ui-widget-content .btn-icon-minus-circle, .ui-state-default .btn-icon-minus-circle_disabled, .ui-widget-content .btn-icon-minus-circle_disabled, .ui-state-default .btn-icon-navigation, .ui-widget-content .btn-icon-navigation, .ui-state-default .btn-icon-navigation_disabled, .ui-widget-content .btn-icon-navigation_disabled, .ui-state-default .btn-icon-network-cloud, .ui-widget-content .btn-icon-network-cloud, .ui-state-default .btn-icon-network-cloud_disabled, .ui-widget-content .btn-icon-network-cloud_disabled, .ui-state-default .btn-icon-pencil, .ui-widget-content .btn-icon-pencil, .ui-state-default .btn-icon-pencil_disabled, .ui-widget-content .btn-icon-pencil_disabled, .ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-widget-content .btn-icon-plug-disconnect-prohibition, .ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-widget-content .btn-icon-plug-disconnect-prohibition_disabled, .ui-state-default .btn-icon-preview, .ui-widget-content .btn-icon-preview, .ui-state-default .btn-icon-preview_disabled, .ui-widget-content .btn-icon-preview_disabled, .ui-state-default .btn-icon-settings, .ui-widget-content .btn-icon-settings, .ui-state-default .btn-icon-settings_disabled, .ui-widget-content .btn-icon-settings_disabled, .ui-state-default .btn-icon-unpublish, .ui-widget-content .btn-icon-unpublish, .ui-state-default .btn-icon-unpublish_disabled, .ui-widget-content .btn-icon-unpublish_disabled { background-image: url('../images/btn-icon-sf963a8adf3.png'); background-repeat: no-repeat; }
|
||||||
|
|
||||||
.ui-state-default .btn-icon-accept, .ui-widget-content .btn-icon-accept { background-position: 0 -96px; }
|
.ui-state-default .btn-icon-accept, .ui-widget-content .btn-icon-accept { background-position: 0 0; }
|
||||||
.ui-state-default .btn-icon-accept_disabled, .ui-widget-content .btn-icon-accept_disabled { background-position: 0 -80px; }
|
.ui-state-default .btn-icon-accept_disabled, .ui-widget-content .btn-icon-accept_disabled { background-position: 0 -16px; }
|
||||||
.ui-state-default .btn-icon-add, .ui-widget-content .btn-icon-add { background-position: 0 0; }
|
.ui-state-default .btn-icon-add, .ui-widget-content .btn-icon-add { background-position: 0 -32px; }
|
||||||
.ui-state-default .btn-icon-addMedia, .ui-widget-content .btn-icon-addMedia { background-position: 0 -208px; }
|
.ui-state-default .btn-icon-addMedia, .ui-widget-content .btn-icon-addMedia { background-position: 0 -48px; }
|
||||||
.ui-state-default .btn-icon-add_disabled, .ui-widget-content .btn-icon-add_disabled { background-position: 0 -32px; }
|
.ui-state-default .btn-icon-add_disabled, .ui-widget-content .btn-icon-add_disabled { background-position: 0 -68px; }
|
||||||
.ui-state-default .btn-icon-addpage, .ui-widget-content .btn-icon-addpage { background-position: 0 -144px; }
|
.ui-state-default .btn-icon-addpage, .ui-widget-content .btn-icon-addpage { background-position: 0 -84px; }
|
||||||
.ui-state-default .btn-icon-addpage_disabled, .ui-widget-content .btn-icon-addpage_disabled { background-position: 0 -500px; }
|
.ui-state-default .btn-icon-addpage_disabled, .ui-widget-content .btn-icon-addpage_disabled { background-position: 0 -100px; }
|
||||||
.ui-state-default .btn-icon-arrow-circle-135-left, .ui-widget-content .btn-icon-arrow-circle-135-left { background-position: 0 -356px; }
|
.ui-state-default .btn-icon-arrow-circle-135-left, .ui-widget-content .btn-icon-arrow-circle-135-left { background-position: 0 -116px; }
|
||||||
.ui-state-default .btn-icon-arrow-circle-double, .ui-widget-content .btn-icon-arrow-circle-double { background-position: 0 -340px; }
|
.ui-state-default .btn-icon-arrow-circle-double, .ui-widget-content .btn-icon-arrow-circle-double { background-position: 0 -132px; }
|
||||||
.ui-state-default .btn-icon-back, .ui-widget-content .btn-icon-back { background-position: 0 -372px; }
|
.ui-state-default .btn-icon-back, .ui-widget-content .btn-icon-back { background-position: 0 -148px; }
|
||||||
.ui-state-default .btn-icon-back_disabled, .ui-widget-content .btn-icon-back_disabled { background-position: 0 -16px; }
|
.ui-state-default .btn-icon-back_disabled, .ui-widget-content .btn-icon-back_disabled { background-position: 0 -164px; }
|
||||||
.ui-state-default .btn-icon-chain--arrow, .ui-widget-content .btn-icon-chain--arrow { background-position: 0 -724px; }
|
.ui-state-default .btn-icon-chain--arrow, .ui-widget-content .btn-icon-chain--arrow { background-position: 0 -180px; }
|
||||||
.ui-state-default .btn-icon-chain--exclamation, .ui-widget-content .btn-icon-chain--exclamation { background-position: 0 -516px; }
|
.ui-state-default .btn-icon-chain--exclamation, .ui-widget-content .btn-icon-chain--exclamation { background-position: 0 -196px; }
|
||||||
.ui-state-default .btn-icon-chain--minus, .ui-widget-content .btn-icon-chain--minus { background-position: 0 -740px; }
|
.ui-state-default .btn-icon-chain--minus, .ui-widget-content .btn-icon-chain--minus { background-position: 0 -212px; }
|
||||||
.ui-state-default .btn-icon-chain--pencil, .ui-widget-content .btn-icon-chain--pencil { background-position: 0 -676px; }
|
.ui-state-default .btn-icon-chain--pencil, .ui-widget-content .btn-icon-chain--pencil { background-position: 0 -228px; }
|
||||||
.ui-state-default .btn-icon-chain--plus, .ui-widget-content .btn-icon-chain--plus { background-position: 0 -708px; }
|
.ui-state-default .btn-icon-chain--plus, .ui-widget-content .btn-icon-chain--plus { background-position: 0 -244px; }
|
||||||
.ui-state-default .btn-icon-chain-small, .ui-widget-content .btn-icon-chain-small { background-position: 0 -772px; }
|
.ui-state-default .btn-icon-chain-small, .ui-widget-content .btn-icon-chain-small { background-position: 0 -260px; }
|
||||||
.ui-state-default .btn-icon-chain-unchain, .ui-widget-content .btn-icon-chain-unchain { background-position: 0 -484px; }
|
.ui-state-default .btn-icon-chain-unchain, .ui-widget-content .btn-icon-chain-unchain { background-position: 0 -276px; }
|
||||||
.ui-state-default .btn-icon-chain, .ui-widget-content .btn-icon-chain { background-position: 0 -756px; }
|
.ui-state-default .btn-icon-chain, .ui-widget-content .btn-icon-chain { background-position: 0 -292px; }
|
||||||
.ui-state-default .btn-icon-cross-circle, .ui-widget-content .btn-icon-cross-circle { background-position: 0 -452px; }
|
.ui-state-default .btn-icon-cross-circle, .ui-widget-content .btn-icon-cross-circle { background-position: 0 -308px; }
|
||||||
.ui-state-default .btn-icon-cross-circle_disabled, .ui-widget-content .btn-icon-cross-circle_disabled { background-position: 0 -564px; }
|
.ui-state-default .btn-icon-cross-circle_disabled, .ui-widget-content .btn-icon-cross-circle_disabled { background-position: 0 -324px; }
|
||||||
.ui-state-default .btn-icon-cross, .ui-widget-content .btn-icon-cross { background-position: 0 -276px; }
|
.ui-state-default .btn-icon-cross, .ui-widget-content .btn-icon-cross { background-position: 0 -340px; }
|
||||||
.ui-state-default .btn-icon-decline, .ui-widget-content .btn-icon-decline { background-position: 0 -128px; }
|
.ui-state-default .btn-icon-decline, .ui-widget-content .btn-icon-decline { background-position: 0 -355px; }
|
||||||
.ui-state-default .btn-icon-decline_disabled, .ui-widget-content .btn-icon-decline_disabled { background-position: 0 -192px; }
|
.ui-state-default .btn-icon-decline_disabled, .ui-widget-content .btn-icon-decline_disabled { background-position: 0 -371px; }
|
||||||
.ui-state-default .btn-icon-delete, .ui-widget-content .btn-icon-delete { background-position: 0 -468px; }
|
.ui-state-default .btn-icon-delete, .ui-widget-content .btn-icon-delete { background-position: 0 -387px; }
|
||||||
.ui-state-default .btn-icon-deleteLight, .ui-widget-content .btn-icon-deleteLight { background-position: 0 -307px; }
|
.ui-state-default .btn-icon-deleteLight, .ui-widget-content .btn-icon-deleteLight { background-position: 0 -403px; }
|
||||||
.ui-state-default .btn-icon-disk, .ui-widget-content .btn-icon-disk { background-position: 0 -291px; }
|
.ui-state-default .btn-icon-disk, .ui-widget-content .btn-icon-disk { background-position: 0 -420px; }
|
||||||
.ui-state-default .btn-icon-document--pencil, .ui-widget-content .btn-icon-document--pencil { background-position: 0 -548px; }
|
.ui-state-default .btn-icon-document--pencil, .ui-widget-content .btn-icon-document--pencil { background-position: 0 -436px; }
|
||||||
.ui-state-default .btn-icon-download-csv, .ui-widget-content .btn-icon-download-csv { background-position: 0 -48px; }
|
.ui-state-default .btn-icon-download-csv, .ui-widget-content .btn-icon-download-csv { background-position: 0 -452px; }
|
||||||
.ui-state-default .btn-icon-drive-upload, .ui-widget-content .btn-icon-drive-upload { background-position: 0 -420px; }
|
.ui-state-default .btn-icon-drive-upload, .ui-widget-content .btn-icon-drive-upload { background-position: 0 -468px; }
|
||||||
.ui-state-default .btn-icon-drive-upload_disabled, .ui-widget-content .btn-icon-drive-upload_disabled { background-position: 0 -580px; }
|
.ui-state-default .btn-icon-drive-upload_disabled, .ui-widget-content .btn-icon-drive-upload_disabled { background-position: 0 -484px; }
|
||||||
.ui-state-default .btn-icon-grid_print, .ui-widget-content .btn-icon-grid_print { background-position: 0 -260px; }
|
.ui-state-default .btn-icon-grid_print, .ui-widget-content .btn-icon-grid_print { background-position: 0 -500px; }
|
||||||
.ui-state-default .btn-icon-magnifier, .ui-widget-content .btn-icon-magnifier { background-position: 0 -532px; }
|
.ui-state-default .btn-icon-magnifier, .ui-widget-content .btn-icon-magnifier { background-position: 0 -516px; }
|
||||||
.ui-state-default .btn-icon-minus-circle, .ui-widget-content .btn-icon-minus-circle { background-position: 0 -628px; }
|
.ui-state-default .btn-icon-minus-circle, .ui-widget-content .btn-icon-minus-circle { background-position: 0 -532px; }
|
||||||
.ui-state-default .btn-icon-minus-circle_disabled, .ui-widget-content .btn-icon-minus-circle_disabled { background-position: 0 -644px; }
|
.ui-state-default .btn-icon-minus-circle_disabled, .ui-widget-content .btn-icon-minus-circle_disabled { background-position: 0 -548px; }
|
||||||
.ui-state-default .btn-icon-navigation, .ui-widget-content .btn-icon-navigation { background-position: 0 -388px; }
|
.ui-state-default .btn-icon-navigation, .ui-widget-content .btn-icon-navigation { background-position: 0 -564px; }
|
||||||
.ui-state-default .btn-icon-navigation_disabled, .ui-widget-content .btn-icon-navigation_disabled { background-position: 0 -436px; }
|
.ui-state-default .btn-icon-navigation_disabled, .ui-widget-content .btn-icon-navigation_disabled { background-position: 0 -580px; }
|
||||||
.ui-state-default .btn-icon-network-cloud, .ui-widget-content .btn-icon-network-cloud { background-position: 0 -612px; }
|
.ui-state-default .btn-icon-network-cloud, .ui-widget-content .btn-icon-network-cloud { background-position: 0 -596px; }
|
||||||
.ui-state-default .btn-icon-network-cloud_disabled, .ui-widget-content .btn-icon-network-cloud_disabled { background-position: 0 -692px; }
|
.ui-state-default .btn-icon-network-cloud_disabled, .ui-widget-content .btn-icon-network-cloud_disabled { background-position: 0 -612px; }
|
||||||
.ui-state-default .btn-icon-pencil, .ui-widget-content .btn-icon-pencil { background-position: 0 -228px; }
|
.ui-state-default .btn-icon-pencil, .ui-widget-content .btn-icon-pencil { background-position: 0 -628px; }
|
||||||
.ui-state-default .btn-icon-pencil_disabled, .ui-widget-content .btn-icon-pencil_disabled { background-position: 0 -596px; }
|
.ui-state-default .btn-icon-pencil_disabled, .ui-widget-content .btn-icon-pencil_disabled { background-position: 0 -644px; }
|
||||||
.ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-widget-content .btn-icon-plug-disconnect-prohibition { background-position: 0 -244px; }
|
.ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-widget-content .btn-icon-plug-disconnect-prohibition { background-position: 0 -660px; }
|
||||||
.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-widget-content .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -660px; }
|
.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-widget-content .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -676px; }
|
||||||
.ui-state-default .btn-icon-preview, .ui-widget-content .btn-icon-preview { background-position: 0 -64px; }
|
.ui-state-default .btn-icon-preview, .ui-widget-content .btn-icon-preview { background-position: 0 -692px; }
|
||||||
.ui-state-default .btn-icon-preview_disabled, .ui-widget-content .btn-icon-preview_disabled { background-position: 0 -160px; }
|
.ui-state-default .btn-icon-preview_disabled, .ui-widget-content .btn-icon-preview_disabled { background-position: 0 -708px; }
|
||||||
.ui-state-default .btn-icon-settings, .ui-widget-content .btn-icon-settings { background-position: 0 -324px; }
|
.ui-state-default .btn-icon-settings, .ui-widget-content .btn-icon-settings { background-position: 0 -724px; }
|
||||||
.ui-state-default .btn-icon-settings_disabled, .ui-widget-content .btn-icon-settings_disabled { background-position: 0 -404px; }
|
.ui-state-default .btn-icon-settings_disabled, .ui-widget-content .btn-icon-settings_disabled { background-position: 0 -740px; }
|
||||||
.ui-state-default .btn-icon-unpublish, .ui-widget-content .btn-icon-unpublish { background-position: 0 -112px; }
|
.ui-state-default .btn-icon-unpublish, .ui-widget-content .btn-icon-unpublish { background-position: 0 -756px; }
|
||||||
.ui-state-default .btn-icon-unpublish_disabled, .ui-widget-content .btn-icon-unpublish_disabled { background-position: 0 -176px; }
|
.ui-state-default .btn-icon-unpublish_disabled, .ui-widget-content .btn-icon-unpublish_disabled { background-position: 0 -772px; }
|
||||||
|
|
||||||
.icon { text-indent: -9999px; border: none; outline: none; }
|
.icon { text-indent: -9999px; border: none; outline: none; }
|
||||||
.icon.icon-24 { width: 24px; height: 24px; background: url('../images/menu-icons/24x24-s391afdd013.png'); }
|
.icon.icon-24 { width: 24px; height: 24px; background: url('../images/menu-icons/24x24-s0dc15c36f9.png'); }
|
||||||
.icon.icon-24.icon-assetadmin { background-position: 0 -120px; }
|
.icon.icon-24.icon-assetadmin { background-position: 0 -216px; }
|
||||||
.icon.icon-24.icon-cmsmain { background-position: 0 -48px; }
|
.icon.icon-24.icon-cmsmain { background-position: 0 -192px; }
|
||||||
.icon.icon-24.icon-cmspagescontroller { background-position: 0 -216px; }
|
.icon.icon-24.icon-cmspagescontroller { background-position: 0 -168px; }
|
||||||
.icon.icon-24.icon-cmssettingscontroller { background-position: 0 0; }
|
.icon.icon-24.icon-cmssettingscontroller { background-position: 0 -96px; }
|
||||||
.icon.icon-24.icon-securityadmin { background-position: 0 -24px; }
|
.icon.icon-24.icon-securityadmin { background-position: 0 -24px; }
|
||||||
.icon.icon-24.icon-reportadmin { background-position: 0 -72px; }
|
.icon.icon-24.icon-reportadmin { background-position: 0 -240px; }
|
||||||
.icon.icon-24.icon-commentadmin { background-position: 0 -192px; }
|
.icon.icon-24.icon-commentadmin { background-position: 0 0; }
|
||||||
.icon.icon-24.icon-help { background-position: 0 -96px; }
|
.icon.icon-24.icon-help { background-position: 0 -144px; }
|
||||||
.icon.icon-16 { width: 16px; height: 16px; background: url('../images/menu-icons/16x16-sf5b94bb49b.png'); }
|
.icon.icon-16 { width: 16px; height: 16px; background: url('../images/menu-icons/16x16-s3f4c846209.png'); }
|
||||||
.icon.icon-16.icon-assetadmin { background-position: 0 -80px; }
|
.icon.icon-16.icon-assetadmin { background-position: 0 -144px; }
|
||||||
.icon.icon-16.icon-cmsmain { background-position: 0 -16px; }
|
.icon.icon-16.icon-cmsmain { background-position: 0 -128px; }
|
||||||
.icon.icon-16.icon-cmspagescontroller { background-position: 0 -112px; }
|
.icon.icon-16.icon-cmspagescontroller { background-position: 0 -112px; }
|
||||||
.icon.icon-16.icon-cmssettingscontroller { background-position: 0 0; }
|
.icon.icon-16.icon-cmssettingscontroller { background-position: 0 -64px; }
|
||||||
.icon.icon-16.icon-securityadmin { background-position: 0 -48px; }
|
.icon.icon-16.icon-securityadmin { background-position: 0 -16px; }
|
||||||
.icon.icon-16.icon-reportadmin { background-position: 0 -32px; }
|
.icon.icon-16.icon-reportadmin { background-position: 0 -160px; }
|
||||||
.icon.icon-16.icon-commentadmin { background-position: 0 -144px; }
|
.icon.icon-16.icon-commentadmin { background-position: 0 0; }
|
||||||
.icon.icon-16.icon-help { background-position: 0 -64px; }
|
.icon.icon-16.icon-help { background-position: 0 -96px; }
|
||||||
|
|
||||||
/** ----------------------------- CMS Components ------------------------------ */
|
/** ----------------------------- CMS Components ------------------------------ */
|
||||||
/** File: typography.scss Contains the basic typography related styles for the admin interface. */
|
/** File: typography.scss Contains the basic typography related styles for the admin interface. */
|
||||||
body, html { font-size: 12px; line-height: 16px; font-family: Arial, sans-serif; color: #444444; }
|
body, html { font-size: 12px; line-height: 16px; font-family: Arial, sans-serif; color: #444; }
|
||||||
|
|
||||||
.cms h2, .cms h3, .cms h4, .cms h5 { font-weight: bold; margin: 16px 0 16px 0; line-height: 16px; }
|
.cms h2, .cms h3, .cms h4, .cms h5 { font-weight: bold; margin: 16px 0 16px 0; line-height: 16px; }
|
||||||
.cms h2 { font-size: 18px; line-height: 24px; }
|
.cms h2 { font-size: 18px; line-height: 24px; }
|
||||||
@ -123,18 +123,18 @@ body, html { font-size: 12px; line-height: 16px; font-family: Arial, sans-serif;
|
|||||||
.cms code { font-family: 'Bitstream Vera Sans Mono','Courier', monospace; }
|
.cms code { font-family: 'Bitstream Vera Sans Mono','Courier', monospace; }
|
||||||
|
|
||||||
/** This file defines CMS-specific customizations to the jQuery UI theme. Every rule should contain ONLY overwritten jQuery UI rules (with 'ui-' prefix). This file should be fairly short, as we're using our own custom jQuery UI theme already. TODO Add theme reference Use _style.scss to add more generic style information, and read the jQuery UI theming API: http://jqueryui.com/docs/Theming/API */
|
/** This file defines CMS-specific customizations to the jQuery UI theme. Every rule should contain ONLY overwritten jQuery UI rules (with 'ui-' prefix). This file should be fairly short, as we're using our own custom jQuery UI theme already. TODO Add theme reference Use _style.scss to add more generic style information, and read the jQuery UI theming API: http://jqueryui.com/docs/Theming/API */
|
||||||
.ui-widget-content, .ui-widget { color: #444444; font-size: 12px; font-family: Arial, sans-serif; border: 0; }
|
.ui-widget-content, .ui-widget { color: #444; font-size: 12px; font-family: Arial, sans-serif; border: 0; }
|
||||||
|
|
||||||
.ui-widget-header { background-color: #b0bec7; padding: 8px 8px 6px 8px; border-bottom: 2px solid #8399a7; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2RkZTNlNyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzkyYTViMiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #dde3e7), color-stop(100%, #92a5b2)); background-image: -webkit-linear-gradient(#dde3e7, #92a5b2); background-image: -moz-linear-gradient(#dde3e7, #92a5b2); background-image: -o-linear-gradient(#dde3e7, #92a5b2); background-image: linear-gradient(#dde3e7, #92a5b2); border-bottom: 3px solid #5c7382; padding: 8px; -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; }
|
.ui-widget-header { background-color: #b0bec7; padding: 8px 8px 6px 8px; border-bottom: 2px solid #8399a7; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2RkZTNlNyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzkyYTViMiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #dde3e7), color-stop(100%, #92a5b2)); background-image: -moz-linear-gradient(#dde3e7, #92a5b2); background-image: -webkit-linear-gradient(#dde3e7, #92a5b2); background-image: linear-gradient(#dde3e7, #92a5b2); border-bottom: 3px solid #5c7382; padding: 8px; -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; }
|
||||||
.ui-widget-header .ui-dialog-title { padding: 6px 10px; text-shadow: #ced7dc 1px 1px 0; }
|
.ui-widget-header .ui-dialog-title { padding: 6px 10px; text-shadow: #ced7dc 1px 1px 0; }
|
||||||
.ui-widget-header a.ui-dialog-titlebar-close { position: absolute; top: -8px; right: -15px; width: 30px; height: 30px; z-index: 100000; }
|
.ui-widget-header a.ui-dialog-titlebar-close { position: absolute; top: -8px; right: -15px; width: 30px; height: 30px; z-index: 100000; }
|
||||||
.ui-widget-header a.ui-state-hover { border-color: transparent; background: transparent; }
|
.ui-widget-header a.ui-state-hover { border-color: transparent; background: transparent; }
|
||||||
.ui-widget-header a.ui-state-hover .ui-icon-closethick { background: url('../images/sprites-32x32-s10286f549b.png') 0 -256px no-repeat; }
|
.ui-widget-header a.ui-state-hover .ui-icon-closethick { background: url('../images/sprites-32x32-s871d283813.png') 0 -356px no-repeat; }
|
||||||
.ui-widget-header .ui-icon-closethick { background: url('../images/sprites-32x32-s10286f549b.png') 0 0 no-repeat; width: 30px; height: 30px; }
|
.ui-widget-header .ui-icon-closethick { background: url('../images/sprites-32x32-s871d283813.png') 0 -396px no-repeat; width: 30px; height: 30px; }
|
||||||
|
|
||||||
.ui-state-hover { cursor: pointer; }
|
.ui-state-hover { cursor: pointer; }
|
||||||
|
|
||||||
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { color: #444444; font-size: 12px; font-family: Arial, sans-serif; }
|
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { color: #444; font-size: 12px; font-family: Arial, sans-serif; }
|
||||||
|
|
||||||
.ui-accordion .ui-accordion-header { border-color: #c0c0c2; margin-bottom: 0; }
|
.ui-accordion .ui-accordion-header { border-color: #c0c0c2; margin-bottom: 0; }
|
||||||
.ui-accordion .ui-accordion-content { border: 1px solid #c0c0c2; border-top: none; }
|
.ui-accordion .ui-accordion-content { border: 1px solid #c0c0c2; border-top: none; }
|
||||||
@ -150,11 +150,11 @@ form.nostyle .middleColumn { margin-left: 0; }
|
|||||||
form.nostyle input.text, form.nostyle textarea, form.nostyle select, form.nostyle .TreeDropdownField { width: auto; max-width: auto; }
|
form.nostyle input.text, form.nostyle textarea, form.nostyle select, form.nostyle .TreeDropdownField { width: auto; max-width: auto; }
|
||||||
|
|
||||||
.field { display: block; border-bottom: 1px solid #d0d3d5; -webkit-box-shadow: 0 1px 0 rgba(245, 245, 245, 0.8); -moz-box-shadow: 0 1px 0 rgba(245, 245, 245, 0.8); -o-box-shadow: 0 1px 0 rgba(245, 245, 245, 0.8); box-shadow: 0 1px 0 rgba(245, 245, 245, 0.8); padding: 0 0 7px 0; margin: 8px 0; *zoom: 1; }
|
.field { display: block; border-bottom: 1px solid #d0d3d5; -webkit-box-shadow: 0 1px 0 rgba(245, 245, 245, 0.8); -moz-box-shadow: 0 1px 0 rgba(245, 245, 245, 0.8); -o-box-shadow: 0 1px 0 rgba(245, 245, 245, 0.8); box-shadow: 0 1px 0 rgba(245, 245, 245, 0.8); padding: 0 0 7px 0; margin: 8px 0; *zoom: 1; }
|
||||||
.field.noborder, .field:last-child { padding-bottom: 0; border-bottom: none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
|
.field.noborder, .field:last-child { padding-bottom: 0; border-bottom: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
||||||
.field:after { content: "\0020"; display: block; height: 0; clear: both; overflow: hidden; visibility: hidden; }
|
.field:after { content: "\0020"; display: block; height: 0; clear: both; overflow: hidden; visibility: hidden; }
|
||||||
.field.nolabel .middleColumn { margin-left: 0; }
|
.field.nolabel .middleColumn { margin-left: 0; }
|
||||||
.field.nolabel .description { margin-left: 0; }
|
.field.nolabel .description { margin-left: 0; }
|
||||||
.field.checkbox label.right { margin: 4px 0 0 0; display: inline; font-style: normal; color: #444444; clear: none; }
|
.field.checkbox label.right { margin: 4px 0 0 0; display: inline; font-style: normal; color: #444; clear: none; }
|
||||||
.field label.left { float: left; display: block; width: 176px; padding: 8px 8px 8px 0; line-height: 16px; font-weight: bold; text-shadow: 1px 1px 0 white; }
|
.field label.left { float: left; display: block; width: 176px; padding: 8px 8px 8px 0; line-height: 16px; font-weight: bold; text-shadow: 1px 1px 0 white; }
|
||||||
.field label.right { cursor: pointer; clear: both; color: #777777; display: block; font-style: italic; margin: 4px 0 0 184px; }
|
.field label.right { cursor: pointer; clear: both; color: #777777; display: block; font-style: italic; margin: 4px 0 0 184px; }
|
||||||
.field .middleColumn { margin-left: 184px; }
|
.field .middleColumn { margin-left: 184px; }
|
||||||
@ -162,12 +162,12 @@ form.nostyle input.text, form.nostyle textarea, form.nostyle select, form.nostyl
|
|||||||
.field .fieldgroup .fieldgroup-field.last { /* This is used on page/settings/visibility */ padding-bottom: 8px; /* replicates li item spacing */ }
|
.field .fieldgroup .fieldgroup-field.last { /* This is used on page/settings/visibility */ padding-bottom: 8px; /* replicates li item spacing */ }
|
||||||
.field .description { clear: both; color: #777777; display: block; font-style: italic; line-height: 16px; margin: 4px 0 0 184px; }
|
.field .description { clear: both; color: #777777; display: block; font-style: italic; line-height: 16px; margin: 4px 0 0 184px; }
|
||||||
.field.checkbox .description, .field.ss-gridfield .description { margin-left: 0; }
|
.field.checkbox .description, .field.ss-gridfield .description { margin-left: 0; }
|
||||||
.field input.text, .field textarea, .field select, .field .TreeDropdownField { margin-left: 10px; width: 100%; max-width: 512px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; }
|
.field input.text, .field textarea, .field select, .field .TreeDropdownField { margin-left: 10px; width: 100%; max-width: 512px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; }
|
||||||
.field input.text.description, .field textarea.description, .field select.description, .field .TreeDropdownField.description { margin: 0; }
|
.field input.text.description, .field textarea.description, .field select.description, .field .TreeDropdownField.description { margin: 0; }
|
||||||
.field input.text .description, .field textarea .description, .field select .description, .field .TreeDropdownField .description { max-width: 512px; }
|
.field input.text .description, .field textarea .description, .field select .description, .field .TreeDropdownField .description { max-width: 512px; }
|
||||||
.field input.text, .field textarea, .field .TreeDropdownField { background: #fff; border: 1px solid #b3b3b3; padding: 7px 7px; line-height: 16px; margin: 0; outline: none; -moz-transition: 0.2s box-shadow ease-in; -webkit-transition: 0.2s box-shadow ease-in; -o-transition: 0.2s box-shadow ease-in; transition: 0.2s box-shadow ease-in; -moz-transition: 0.2s border ease-in; -webkit-transition: 0.2s border ease-in; -o-transition: 0.2s border ease-in; transition: 0.2s border ease-in; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VhZWFlYSIvPjxzdG9wIG9mZnNldD0iMTAlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #eaeaea), color-stop(10%, #ffffff)); background-image: -webkit-linear-gradient(#eaeaea, #ffffff 10%); background-image: -moz-linear-gradient(#eaeaea, #ffffff 10%); background-image: -o-linear-gradient(#eaeaea, #ffffff 10%); background-image: linear-gradient(#eaeaea, #ffffff 10%); }
|
.field input.text, .field textarea, .field .TreeDropdownField { background: #fff; border: 1px solid #b3b3b3; padding: 7px 7px; line-height: 16px; margin: 0; outline: none; -moz-transition: 0.2s box-shadow ease-in; -webkit-transition: 0.2s box-shadow ease-in; -o-transition: 0.2s box-shadow ease-in; transition: 0.2s box-shadow ease-in; -moz-transition: 0.2s border ease-in; -webkit-transition: 0.2s border ease-in; -o-transition: 0.2s border ease-in; transition: 0.2s border ease-in; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VhZWFlYSIvPjxzdG9wIG9mZnNldD0iMTAlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #eaeaea), color-stop(10%, #ffffff)); background-image: -moz-linear-gradient(#eaeaea, #ffffff 10%); background-image: -webkit-linear-gradient(#eaeaea, #ffffff 10%); background-image: linear-gradient(#eaeaea, #ffffff 10%); }
|
||||||
.field input.text:focus, .field textarea:focus, .field .TreeDropdownField:focus { border: 1px solid #9a9a9a; border-top-color: gray; -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2) inset; -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2) inset; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2) inset; }
|
.field input.text:focus, .field textarea:focus, .field .TreeDropdownField:focus { border: 1px solid #9a9a9a; border-top-color: #808080; -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2) inset; -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2) inset; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2) inset; }
|
||||||
.field input[disabled], .field input.disabled, .field textarea[disabled], .field textarea.disabled, .field select[disabled], .field select.disabled { color: #777777; background: #efefef; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2JjYmNiYyIvPjxzdG9wIG9mZnNldD0iMTAlIiBzdG9wLWNvbG9yPSIjZWZlZmVmIi8+PHN0b3Agb2Zmc2V0PSI5MCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNiY2JjYmMiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bcbcbc), color-stop(10%, #efefef), color-stop(90%, #ffffff), color-stop(100%, #bcbcbc)); background-image: -webkit-linear-gradient(#bcbcbc, #efefef 10%, #ffffff 90%, #bcbcbc); background-image: -moz-linear-gradient(#bcbcbc, #efefef 10%, #ffffff 90%, #bcbcbc); background-image: -o-linear-gradient(#bcbcbc, #efefef 10%, #ffffff 90%, #bcbcbc); background-image: linear-gradient(#bcbcbc, #efefef 10%, #ffffff 90%, #bcbcbc); border: 1px solid #b3b3b3; }
|
.field input[disabled], .field input.disabled, .field textarea[disabled], .field textarea.disabled, .field select[disabled], .field select.disabled { color: #777777; background: #efefef; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2JjYmNiYyIvPjxzdG9wIG9mZnNldD0iMTAlIiBzdG9wLWNvbG9yPSIjZWZlZmVmIi8+PHN0b3Agb2Zmc2V0PSI5MCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNiY2JjYmMiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bcbcbc), color-stop(10%, #efefef), color-stop(90%, #ffffff), color-stop(100%, #bcbcbc)); background-image: -moz-linear-gradient(#bcbcbc, #efefef 10%, #ffffff 90%, #bcbcbc); background-image: -webkit-linear-gradient(#bcbcbc, #efefef 10%, #ffffff 90%, #bcbcbc); background-image: linear-gradient(#bcbcbc, #efefef 10%, #ffffff 90%, #bcbcbc); border: 1px solid #b3b3b3; }
|
||||||
.field#Action { box-shadow: none; }
|
.field#Action { box-shadow: none; }
|
||||||
|
|
||||||
form.stacked .field label, .field.stacked label { display: block; float: none; padding-bottom: 10px; }
|
form.stacked .field label, .field.stacked label { display: block; float: none; padding-bottom: 10px; }
|
||||||
@ -189,20 +189,20 @@ form.small .field input.text, form.small .field textarea, form.small .field sele
|
|||||||
.field .chzn-container { max-width: 416px; }
|
.field .chzn-container { max-width: 416px; }
|
||||||
.field .chzn-container .chzn-results li { font-size: 11px; line-height: 16px; padding: 4px 4px; }
|
.field .chzn-container .chzn-results li { font-size: 11px; line-height: 16px; padding: 4px 4px; }
|
||||||
.field .chzn-container-active .chzn-single { border: 1px solid #9a9a9a; }
|
.field .chzn-container-active .chzn-single { border: 1px solid #9a9a9a; }
|
||||||
.field .chzn-container-single .chzn-single { height: 26px; line-height: 26px; /* not relative, as then we'd had to redo most of chzn */ font-size: 12px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VmZWZlZiIvPjxzdG9wIG9mZnNldD0iMTAlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIi8+PHN0b3Agb2Zmc2V0PSI5MCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlZmVmZWYiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #efefef), color-stop(10%, #ffffff), color-stop(90%, #ffffff), color-stop(100%, #efefef)); background-image: -webkit-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -moz-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -o-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); }
|
.field .chzn-container-single .chzn-single { height: 26px; line-height: 26px; /* not relative, as then we'd had to redo most of chzn */ font-size: 12px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VmZWZlZiIvPjxzdG9wIG9mZnNldD0iMTAlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIi8+PHN0b3Agb2Zmc2V0PSI5MCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlZmVmZWYiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #efefef), color-stop(10%, #ffffff), color-stop(90%, #ffffff), color-stop(100%, #efefef)); background-image: -moz-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -webkit-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); }
|
||||||
.field .chzn-container-single .chzn-single:hover, .field .chzn-container-single .chzn-single:focus, .field .chzn-container-single .chzn-single:active { text-decoration: none; }
|
.field .chzn-container-single .chzn-single:hover, .field .chzn-container-single .chzn-single:focus, .field .chzn-container-single .chzn-single:active { text-decoration: none; }
|
||||||
.field .chzn-container-single .chzn-single div { width: 24px; }
|
.field .chzn-container-single .chzn-single div { width: 24px; }
|
||||||
.field .chzn-container-single .chzn-single div b { background-position: 4px 0px; }
|
.field .chzn-container-single .chzn-single div b { background-position: 4px 0px; }
|
||||||
.field .chzn-choices { -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; }
|
.field .chzn-choices { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; }
|
||||||
.field input.month, .field input.day, .field input.year { width: 56px; }
|
.field input.month, .field input.day, .field input.year { width: 56px; }
|
||||||
.field input.time { width: 88px; }
|
.field input.time { width: 88px; }
|
||||||
.field.remove-splitter { border-bottom: none; box-shadow: none; }
|
.field.remove-splitter { border-bottom: none; box-shadow: none; }
|
||||||
|
|
||||||
/** ---------------------------------------------------- Buttons ---------------------------------------------------- */
|
/** ---------------------------------------------------- Buttons ---------------------------------------------------- */
|
||||||
.cms .button-no-style button, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-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: #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.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.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 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 { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; outline: none; background: none; border: none; }
|
.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; }
|
||||||
.cms .button-no-style button.loading, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.loading { background: transparent url(../../images/network-save.gif) no-repeat 8px center; }
|
.cms .button-no-style button.loading, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.loading { background: transparent url(../../images/network-save.gif) no-repeat 8px center; }
|
||||||
.cms .button-no-style button.loading .ui-button-text, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.loading .ui-button-text { padding-left: 20px; }
|
.cms .button-no-style button.loading .ui-button-text, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.loading .ui-button-text { padding-left: 20px; }
|
||||||
.cms .Actions > *, .cms .cms-actions-row > * { display: block; float: left; margin-right: 8px; }
|
.cms .Actions > *, .cms .cms-actions-row > * { display: block; float: left; margin-right: 8px; }
|
||||||
@ -212,17 +212,17 @@ form.small .field input.text, form.small .field textarea, form.small .field sele
|
|||||||
.cms input.loading, .cms button.loading, .cms input.ui-state-default.loading, .cms .ui-widget-content input.ui-state-default.loading, .cms .ui-widget-header input.ui-state-default.loading { color: #525252; border-color: #d5d3d3; cursor: default; }
|
.cms input.loading, .cms button.loading, .cms input.ui-state-default.loading, .cms .ui-widget-content input.ui-state-default.loading, .cms .ui-widget-header input.ui-state-default.loading { color: #525252; border-color: #d5d3d3; cursor: default; }
|
||||||
.cms input.loading .ui-icon, .cms button.loading .ui-icon, .cms input.ui-state-default.loading .ui-icon, .cms .ui-widget-content input.ui-state-default.loading .ui-icon, .cms .ui-widget-header input.ui-state-default.loading .ui-icon { background: transparent url(../../images/network-save.gif) no-repeat 0 0; }
|
.cms input.loading .ui-icon, .cms button.loading .ui-icon, .cms input.ui-state-default.loading .ui-icon, .cms .ui-widget-content input.ui-state-default.loading .ui-icon, .cms .ui-widget-header input.ui-state-default.loading .ui-icon { background: transparent url(../../images/network-save.gif) no-repeat 0 0; }
|
||||||
.cms input.loading.ss-ui-action-constructive .ui-icon, .cms button.loading.ss-ui-action-constructive .ui-icon { background: transparent url(../../images/network-save-constructive.gif) no-repeat 0 0; }
|
.cms input.loading.ss-ui-action-constructive .ui-icon, .cms button.loading.ss-ui-action-constructive .ui-icon { background: transparent url(../../images/network-save-constructive.gif) no-repeat 0 0; }
|
||||||
.cms .ss-ui-button { margin-top: 0px; font-weight: bold; text-decoration: none; line-height: 16px; color: #393939; border: 1px solid #c0c0c2; border-bottom: 1px solid #a6a6a9; cursor: pointer; background-color: #e6e6e6; white-space: nowrap; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: -webkit-linear-gradient(#ffffff, #d9d9d9); background: -moz-linear-gradient(#ffffff, #d9d9d9); background: -o-linear-gradient(#ffffff, #d9d9d9); background: linear-gradient(#ffffff, #d9d9d9); text-shadow: white 0 1px 1px; /* constructive */ /* destructive */ }
|
.cms .ss-ui-button { margin-top: 0px; font-weight: bold; text-decoration: none; line-height: 16px; color: #393939; border: 1px solid #c0c0c2; border-bottom: 1px solid #a6a6a9; cursor: pointer; background-color: #e6e6e6; white-space: nowrap; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: -moz-linear-gradient(#ffffff, #d9d9d9); background: -webkit-linear-gradient(#ffffff, #d9d9d9); background: linear-gradient(#ffffff, #d9d9d9); text-shadow: white 0 1px 1px; /* constructive */ /* destructive */ }
|
||||||
.cms .ss-ui-button.ui-state-hover, .cms .ss-ui-button:hover { text-decoration: none; background-color: white; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: -webkit-linear-gradient(#ffffff, #e6e6e6); background: -moz-linear-gradient(#ffffff, #e6e6e6); background: -o-linear-gradient(#ffffff, #e6e6e6); background: linear-gradient(#ffffff, #e6e6e6); -webkit-box-shadow: 0 0 5px #b3b3b3; -moz-box-shadow: 0 0 5px #b3b3b3; box-shadow: 0 0 5px #b3b3b3; }
|
.cms .ss-ui-button.ui-state-hover, .cms .ss-ui-button:hover { text-decoration: none; background-color: white; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: -moz-linear-gradient(#ffffff, #e6e6e6); background: -webkit-linear-gradient(#ffffff, #e6e6e6); background: linear-gradient(#ffffff, #e6e6e6); -moz-box-shadow: 0 0 5px #b3b3b3; -webkit-box-shadow: 0 0 5px #b3b3b3; box-shadow: 0 0 5px #b3b3b3; }
|
||||||
.cms .ss-ui-button:active, .cms .ss-ui-button:focus, .cms .ss-ui-button.ui-state-active, .cms .ss-ui-button.ui-state-focus { border: 1px solid #b3b3b3; background-color: white; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: -webkit-linear-gradient(#ffffff, #e6e6e6); background: -moz-linear-gradient(#ffffff, #e6e6e6); background: -o-linear-gradient(#ffffff, #e6e6e6); background: linear-gradient(#ffffff, #e6e6e6); -webkit-box-shadow: 0 0 5px #b3b3b3 inset; -moz-box-shadow: 0 0 5px #b3b3b3 inset; box-shadow: 0 0 5px #b3b3b3 inset; }
|
.cms .ss-ui-button:active, .cms .ss-ui-button:focus, .cms .ss-ui-button.ui-state-active, .cms .ss-ui-button.ui-state-focus { border: 1px solid #b3b3b3; background-color: white; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: -moz-linear-gradient(#ffffff, #e6e6e6); background: -webkit-linear-gradient(#ffffff, #e6e6e6); background: linear-gradient(#ffffff, #e6e6e6); -moz-box-shadow: 0 0 5px #b3b3b3 inset; -webkit-box-shadow: 0 0 5px #b3b3b3 inset; box-shadow: 0 0 5px #b3b3b3 inset; }
|
||||||
.cms .ss-ui-button.ss-ui-action-minor span { padding-left: 0; padding-right: 0; }
|
.cms .ss-ui-button.ss-ui-action-minor span { padding-left: 0; padding-right: 0; }
|
||||||
.cms .ss-ui-button.ss-ui-action-constructive { text-shadow: none; font-weight: bold; color: white; border-color: #1f9433; border-bottom-color: #166a24; background-color: #1f9433; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzkzYmU0MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzFmOTQzMyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #93be42), color-stop(100%, #1f9433)); background: -webkit-linear-gradient(#93be42, #1f9433); background: -moz-linear-gradient(#93be42, #1f9433); background: -o-linear-gradient(#93be42, #1f9433); background: linear-gradient(#93be42, #1f9433); text-shadow: #1c872f 0 -1px -1px; }
|
.cms .ss-ui-button.ss-ui-action-constructive { text-shadow: none; font-weight: bold; color: white; border-color: #1F9433; border-bottom-color: #166a24; background-color: #1F9433; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzkzYmU0MiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzFmOTQzMyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #93be42), color-stop(100%, #1f9433)); background: -moz-linear-gradient(#93be42, #1f9433); background: -webkit-linear-gradient(#93be42, #1f9433); background: linear-gradient(#93be42, #1f9433); text-shadow: #1c872f 0 -1px -1px; }
|
||||||
.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover, .cms .ss-ui-button.ss-ui-action-constructive:hover { border-color: #166a24; background-color: #1f9433; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2E0Y2EzYSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzIzYTkzYSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #a4ca3a), color-stop(100%, #23a93a)); background: -webkit-linear-gradient(#a4ca3a, #23a93a); background: -moz-linear-gradient(#a4ca3a, #23a93a); background: -o-linear-gradient(#a4ca3a, #23a93a); background: linear-gradient(#a4ca3a, #23a93a); }
|
.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover, .cms .ss-ui-button.ss-ui-action-constructive:hover { border-color: #166a24; background-color: #1F9433; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2E0Y2EzYSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzIzYTkzYSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #a4ca3a), color-stop(100%, #23a93a)); background: -moz-linear-gradient(#a4ca3a, #23a93a); background: -webkit-linear-gradient(#a4ca3a, #23a93a); background: linear-gradient(#a4ca3a, #23a93a); }
|
||||||
.cms .ss-ui-button.ss-ui-action-constructive:active, .cms .ss-ui-button.ss-ui-action-constructive:focus, .cms .ss-ui-button.ss-ui-action-constructive.ui-state-active, .cms .ss-ui-button.ss-ui-action-constructive.ui-state-focus { background-color: #1d8c30; -webkit-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); -moz-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); }
|
.cms .ss-ui-button.ss-ui-action-constructive:active, .cms .ss-ui-button.ss-ui-action-constructive:focus, .cms .ss-ui-button.ss-ui-action-constructive.ui-state-active, .cms .ss-ui-button.ss-ui-action-constructive.ui-state-focus { background-color: #1d8c30; -moz-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); -webkit-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); }
|
||||||
.cms .ss-ui-button.ss-ui-action-destructive { color: red; background-color: #e6e6e6; }
|
.cms .ss-ui-button.ss-ui-action-destructive { color: #f00; background-color: #e6e6e6; }
|
||||||
.cms .ss-ui-button.ss-ui-button-small .ui-button-text { font-size: 10px; }
|
.cms .ss-ui-button.ss-ui-button-small .ui-button-text { font-size: 10px; }
|
||||||
.cms .ss-ui-button.ui-state-highlight { background-color: #e6e6e6; border: 1px solid #708284; }
|
.cms .ss-ui-button.ui-state-highlight { background-color: #e6e6e6; border: 1px solid #708284; }
|
||||||
.cms .ss-ui-button.ss-ui-action-minor { background: none; border: 0; color: #393939; text-decoration: underline; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
|
.cms .ss-ui-button.ss-ui-action-minor { background: none; border: 0; color: #393939; text-decoration: underline; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
||||||
.cms .ss-ui-button.ss-ui-action-minor:hover { text-decoration: none; color: #1f1f1f; }
|
.cms .ss-ui-button.ss-ui-action-minor:hover { text-decoration: none; color: #1f1f1f; }
|
||||||
.cms .ss-ui-button.ss-ui-action-minor:focus, .cms .ss-ui-button.ss-ui-action-minor:active { text-decoration: none; color: #525252; }
|
.cms .ss-ui-button.ss-ui-action-minor:focus, .cms .ss-ui-button.ss-ui-action-minor:active { text-decoration: none; color: #525252; }
|
||||||
.cms .ss-ui-button.ss-ui-button-loading { opacity: 0.8; }
|
.cms .ss-ui-button.ss-ui-button-loading { opacity: 0.8; }
|
||||||
@ -241,10 +241,10 @@ form.small .field input.text, form.small .field textarea, form.small .field sele
|
|||||||
|
|
||||||
.ss-toggle { margin: 8px 0; }
|
.ss-toggle { margin: 8px 0; }
|
||||||
.ss-toggle .ui-accordion-header { font-weight: bold; font-size: 12px; }
|
.ss-toggle .ui-accordion-header { font-weight: bold; font-size: 12px; }
|
||||||
.ss-toggle .ui-accordion-header.ui-state-default { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0icmdiYSgyNDEsIDI0MiwgMjQyLCAwLjgpIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSJyZ2JhKDIwMSwgMjA1LCAyMDYsIDAuOCkiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(241, 242, 242, 0.8)), color-stop(100%, rgba(201, 205, 206, 0.8))); background-image: -webkit-linear-gradient(rgba(241, 242, 242, 0.8), rgba(201, 205, 206, 0.8)); background-image: -moz-linear-gradient(rgba(241, 242, 242, 0.8), rgba(201, 205, 206, 0.8)); background-image: -o-linear-gradient(rgba(241, 242, 242, 0.8), rgba(201, 205, 206, 0.8)); background-image: linear-gradient(rgba(241, 242, 242, 0.8), rgba(201, 205, 206, 0.8)); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); }
|
.ss-toggle .ui-accordion-header.ui-state-default { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2YxZjJmMiIgc3RvcC1vcGFjaXR5PSIwLjgiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNjOWNkY2UiIHN0b3Atb3BhY2l0eT0iMC44Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(241, 242, 242, 0.8)), color-stop(100%, rgba(201, 205, 206, 0.8))); background-image: -moz-linear-gradient(rgba(241, 242, 242, 0.8), rgba(201, 205, 206, 0.8)); background-image: -webkit-linear-gradient(rgba(241, 242, 242, 0.8), rgba(201, 205, 206, 0.8)); background-image: linear-gradient(rgba(241, 242, 242, 0.8), rgba(201, 205, 206, 0.8)); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); }
|
||||||
.ss-toggle .ui-accordion-header .ui-accordion-header-icon { margin-top: -9px; }
|
.ss-toggle .ui-accordion-header .ui-accordion-header-icon { margin-top: -9px; }
|
||||||
.ss-toggle .ui-accordion-content { padding: 8px 0 12px; }
|
.ss-toggle .ui-accordion-content { padding: 8px 0 12px; }
|
||||||
.ss-toggle .ui-accordion-content .field { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; padding-left: 12px; padding-right: 12px; }
|
.ss-toggle .ui-accordion-content .field { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; padding-left: 12px; padding-right: 12px; }
|
||||||
.ss-toggle .ui-accordion-content .field:last-child { margin-bottom: 0; }
|
.ss-toggle .ui-accordion-content .field:last-child { margin-bottom: 0; }
|
||||||
.ss-toggle .ui-accordion-content .field .middleColumn { margin-left: 0; }
|
.ss-toggle .ui-accordion-content .field .middleColumn { margin-left: 0; }
|
||||||
.ss-toggle .ui-accordion-content .field label { float: none; margin-left: 0; }
|
.ss-toggle .ui-accordion-content .field label { float: none; margin-left: 0; }
|
||||||
@ -299,13 +299,13 @@ fieldset.switch-states { padding: 0 20px 0 0; margin-right: 5px; /*
|
|||||||
Note: with a little adjustment the switch can take more than 5 items,
|
Note: with a little adjustment the switch can take more than 5 items,
|
||||||
but a dropdown would probably be more appropriate
|
but a dropdown would probably be more appropriate
|
||||||
*/ }
|
*/ }
|
||||||
fieldset.switch-states .switch { -webkit-box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.1); -moz-box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.1); box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.1); -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; -webkit-animation: bugfix infinite 1s; background: #dee0e3; display: block; height: 25px; margin-top: 3px; padding: 0 10px; position: relative; width: 100%; z-index: 5; }
|
fieldset.switch-states .switch { -moz-box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.1); -webkit-box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.1); box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.1); -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; -webkit-animation: bugfix infinite 1s; background: #dee0e3; display: block; height: 25px; margin-top: 3px; padding: 0 10px; position: relative; width: 100%; z-index: 5; }
|
||||||
fieldset.switch-states .switch label { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); color: #858585; color: rgba(31, 31, 31, 0.5); cursor: pointer; float: left; font-weight: bold; height: 100%; line-height: 25px; position: relative; z-index: 2; /* Make text unselectable in browsers that support that */ -webkit-touch-callout: none; -webkit-user-select: none; -khtml-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; }
|
fieldset.switch-states .switch label { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); color: #858585; color: rgba(31, 31, 31, 0.5); cursor: pointer; float: left; font-weight: bold; height: 100%; line-height: 25px; position: relative; z-index: 2; /* Make text unselectable in browsers that support that */ -webkit-touch-callout: none; -webkit-user-select: none; -khtml-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; }
|
||||||
fieldset.switch-states .switch label:hover { color: #6c6c6c; color: rgba(31, 31, 31, 0.7); }
|
fieldset.switch-states .switch label:hover { color: #6c6c6c; color: rgba(31, 31, 31, 0.7); }
|
||||||
fieldset.switch-states .switch label span { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; display: inline-block; padding: 0 10px; }
|
fieldset.switch-states .switch label span { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; display: inline-block; padding: 0 10px; }
|
||||||
fieldset.switch-states .switch input { opacity: 0; filter: alpha(opacity=0); visibility: none; position: absolute; }
|
fieldset.switch-states .switch input { opacity: 0; filter: alpha(opacity=0); visibility: none; position: absolute; }
|
||||||
fieldset.switch-states .switch input:checked + label { -moz-transition: all 0.3s ease-out 0s; -webkit-transition: all 0.3s ease-out 0s; -o-transition: all 0.3s ease-out 0s; transition: all 0.3s ease-out 0s; color: #fff; text-shadow: 0 -1px 0 #287099; }
|
fieldset.switch-states .switch input:checked + label { -moz-transition: all 0.3s ease-out 0s; -webkit-transition: all 0.3s ease-out 0s; -o-transition: all 0.3s ease-out 0s; transition: all 0.3s ease-out 0s; color: #fff; text-shadow: 0 -1px 0 #287099; }
|
||||||
fieldset.switch-states .switch .slide-button { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzJiOWMzMiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzY0YWIzNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2b9c32), color-stop(100%, #64ab36)); background-image: -webkit-linear-gradient(#2b9c32, #64ab36); background-image: -moz-linear-gradient(#2b9c32, #64ab36); background-image: -o-linear-gradient(#2b9c32, #64ab36); background-image: linear-gradient(#2b9c32, #64ab36); -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.3), 0 1px 0px rgba(255, 255, 255, 0.2); -moz-box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.3), 0 1px 0px rgba(255, 255, 255, 0.2); box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.3), 0 1px 0px rgba(255, 255, 255, 0.2); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -moz-transition: all 0.3s ease-out 0s; -webkit-transition: all 0.3s ease-out 0s; -o-transition: all 0.3s ease-out 0s; transition: all 0.3s ease-out 0s; background-color: #2b9c32; display: block; height: 100%; left: 0; padding: 0; position: absolute; top: 0; z-index: 1; }
|
fieldset.switch-states .switch .slide-button { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzJiOWMzMiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzY0YWIzNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2b9c32), color-stop(100%, #64ab36)); background-image: -moz-linear-gradient(#2b9c32, #64ab36); background-image: -webkit-linear-gradient(#2b9c32, #64ab36); background-image: linear-gradient(#2b9c32, #64ab36); -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; -moz-box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.3), 0 1px 0px rgba(255, 255, 255, 0.2); -webkit-box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.3), 0 1px 0px rgba(255, 255, 255, 0.2); box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.3), 0 1px 0px rgba(255, 255, 255, 0.2); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -moz-transition: all 0.3s ease-out 0s; -webkit-transition: all 0.3s ease-out 0s; -o-transition: all 0.3s ease-out 0s; transition: all 0.3s ease-out 0s; background-color: #2b9c32; display: block; height: 100%; left: 0; padding: 0; position: absolute; top: 0; z-index: 1; }
|
||||||
fieldset.switch-states.size_1 label, fieldset.switch-states.size_1 .slide-button { width: 100%; }
|
fieldset.switch-states.size_1 label, fieldset.switch-states.size_1 .slide-button { width: 100%; }
|
||||||
fieldset.switch-states.size_1 label span { padding-right: 0; }
|
fieldset.switch-states.size_1 label span { padding-right: 0; }
|
||||||
fieldset.switch-states.size_1 input:checked:nth-of-type(2) ~ .slide-button { left: 100%; }
|
fieldset.switch-states.size_1 input:checked:nth-of-type(2) ~ .slide-button { left: 100%; }
|
||||||
@ -335,7 +335,6 @@ fieldset.switch-states.size_5 input:checked:nth-of-type(5) ~ .slide-button { lef
|
|||||||
|
|
||||||
@-webkit-keyframes bugfix { from { position: relative; }
|
@-webkit-keyframes bugfix { from { position: relative; }
|
||||||
to { position: relative; } }
|
to { position: relative; } }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This file defines most styles of the CMS: Colors, fonts, backgrounds,
|
* This file defines most styles of the CMS: Colors, fonts, backgrounds,
|
||||||
* alignments, dimensions.
|
* alignments, dimensions.
|
||||||
@ -353,7 +352,7 @@ html, body { width: 100%; height: 100%; /* Removes RHS whitespace on iPad */ ove
|
|||||||
|
|
||||||
body.cms { overflow: hidden; }
|
body.cms { overflow: hidden; }
|
||||||
|
|
||||||
.cms a { color: #0073c1; text-decoration: none; }
|
.cms a { color: #0073C1; text-decoration: none; }
|
||||||
.cms a:hover, .cms a:focus { text-decoration: underline; }
|
.cms a:hover, .cms a:focus { text-decoration: underline; }
|
||||||
.cms body .ui-widget { font-family: Arial, sans-serif; font-size: 12px; }
|
.cms body .ui-widget { font-family: Arial, sans-serif; font-size: 12px; }
|
||||||
.cms strong { font-weight: bold; }
|
.cms strong { font-weight: bold; }
|
||||||
@ -362,12 +361,12 @@ body.cms { overflow: hidden; }
|
|||||||
.hide, .cms-helper-hide-actions .Actions { display: none; }
|
.hide, .cms-helper-hide-actions .Actions { display: none; }
|
||||||
|
|
||||||
/** -------------------------------------------- Panels Styles -------------------------------------------- */
|
/** -------------------------------------------- Panels Styles -------------------------------------------- */
|
||||||
.cms-container { height: 100%; /*background: $tab-panel-texture-background;*/ background: #eceff1; }
|
.cms-container { height: 100%; /*background: $tab-panel-texture-background;*/ background: #ECEFF1; }
|
||||||
|
|
||||||
.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: -moz-inline-stack; display: inline-block; vertical-align: middle; *vertical-align: auto; zoom: 1; *display: inline; }
|
.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: 40px; background-image: url(../images/textures/cms_content_header.png); background-repeat: repeat; background-position: left bottom; background-color: #d4d6d8; }
|
.cms-content-header { padding-left: 16px; z-index: 60; min-height: 40px; background-image: url(../images/textures/cms_content_header.png); background-repeat: repeat; background-position: left bottom; background-color: #D4D6D8; }
|
||||||
.cms-content-header a { color: #0073c1; }
|
.cms-content-header a { color: #0073C1; }
|
||||||
.cms-content-header .backlink span.btn-icon-back { height: 16px; }
|
.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 { font-size: 14px; font-weight: bold; margin: 0; margin-bottom: 8px; }
|
||||||
.cms-content-header h2 * { vertical-align: middle; }
|
.cms-content-header h2 * { vertical-align: middle; }
|
||||||
@ -391,26 +390,26 @@ body.cms { overflow: hidden; }
|
|||||||
.ui-tabs .ui-tabs-nav { float: right; margin: 16px 0 -1px 0; padding: 0 12px 0 0; border-bottom: none; }
|
.ui-tabs .ui-tabs-nav { float: right; margin: 16px 0 -1px 0; padding: 0 12px 0 0; border-bottom: none; }
|
||||||
.ui-tabs .ui-tabs-nav ~ .ui-tabs-panel { border-top: 1px solid #c0c0c2; clear: both; }
|
.ui-tabs .ui-tabs-nav ~ .ui-tabs-panel { border-top: 1px solid #c0c0c2; clear: both; }
|
||||||
.ui-tabs .ui-tabs-nav li { top: 0; float: left; border-bottom: 0 !important; }
|
.ui-tabs .ui-tabs-nav li { top: 0; float: left; border-bottom: 0 !important; }
|
||||||
.ui-tabs .ui-tabs-nav li a { display: -moz-inline-stack; display: inline-block; vertical-align: middle; *vertical-align: auto; zoom: 1; *display: inline; float: none; font-weight: bold; color: #444444; line-height: 32px; padding: 0 16px 0; }
|
.ui-tabs .ui-tabs-nav li a { display: inline-block; vertical-align: middle; *vertical-align: auto; *zoom: 1; *display: inline; float: none; font-weight: bold; color: #444; line-height: 32px; padding: 0 16px 0; }
|
||||||
.ui-tabs .ui-tabs-nav li:last-child { margin-right: 0; }
|
.ui-tabs .ui-tabs-nav li:last-child { margin-right: 0; }
|
||||||
.ui-tabs .ui-tabs-nav li.ui-tabs-active { margin-bottom: 0; }
|
.ui-tabs .ui-tabs-nav li.ui-tabs-active { margin-bottom: 0; }
|
||||||
.ui-tabs .ui-tabs-nav .ui-state-default { border: 1px solid #c0c0c2; background: #ced7dc; }
|
.ui-tabs .ui-tabs-nav .ui-state-default { border: 1px solid #c0c0c2; background: #ced7dc; }
|
||||||
.ui-tabs .ui-tabs-nav .ui-state-default a { color: #5e5e5e; text-shadow: #e6e6e6 0 1px 0; }
|
.ui-tabs .ui-tabs-nav .ui-state-default a { color: #5e5e5e; text-shadow: #e6e6e6 0 1px 0; }
|
||||||
.ui-tabs .ui-tabs-nav .ui-state-active { padding-bottom: 1px; border: 1px solid #c0c0c2; background-color: #e6eaed; }
|
.ui-tabs .ui-tabs-nav .ui-state-active { padding-bottom: 1px; border: 1px solid #c0c0c2; background-color: #e6eaed; }
|
||||||
.ui-tabs .ui-tabs-nav .ui-state-active a { color: #444444; }
|
.ui-tabs .ui-tabs-nav .ui-state-active a { color: #444; }
|
||||||
.ui-tabs .ui-tabs-nav.ui-state-active { border-color: gray; }
|
.ui-tabs .ui-tabs-nav.ui-state-active { border-color: #808080; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon { text-indent: -9999em; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon { text-indent: -9999em; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon a { display: block; padding-left: 40px; padding-right: 0; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon a { display: block; padding-left: 40px; padding-right: 0; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.list a { background: url('../images/sprites-64x64-s88957ee578.png') 0 -504px no-repeat; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.list a { background: url('../images/sprites-64x64-s45180e3c4f.png') 0 -304px no-repeat; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.tree a { background: url('../images/sprites-64x64-s88957ee578.png') 0 -354px no-repeat; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.tree a { background: url('../images/sprites-64x64-s45180e3c4f.png') 0 -504px no-repeat; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery a { background: url('../images/sprites-64x64-s88957ee578.png') 0 -454px no-repeat; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery a { background: url('../images/sprites-64x64-s45180e3c4f.png') 0 -204px no-repeat; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit a { background: url('../images/sprites-64x64-s88957ee578.png') 0 -304px no-repeat; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit a { background: url('../images/sprites-64x64-s45180e3c4f.png') 0 -104px no-repeat; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.search a { background: url('../images/sprites-64x64-s88957ee578.png') 0 -154px no-repeat; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.search a { background: url('../images/sprites-64x64-s45180e3c4f.png') 0 -404px no-repeat; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.list.ui-state-active a { background: url('../images/sprites-64x64-s88957ee578.png') 0 -204px no-repeat; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.list.ui-state-active a { background: url('../images/sprites-64x64-s45180e3c4f.png') 0 -254px no-repeat; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.tree.ui-state-active a { background: url('../images/sprites-64x64-s88957ee578.png') 0 -254px no-repeat; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.tree.ui-state-active a { background: url('../images/sprites-64x64-s45180e3c4f.png') 0 -454px no-repeat; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active a { background: url('../images/sprites-64x64-s88957ee578.png') 0 -54px no-repeat; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active a { background: url('../images/sprites-64x64-s45180e3c4f.png') 0 -154px no-repeat; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active a { background: url('../images/sprites-64x64-s88957ee578.png') 0 -404px no-repeat; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active a { background: url('../images/sprites-64x64-s45180e3c4f.png') 0 -54px no-repeat; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active a { background: url('../images/sprites-64x64-s88957ee578.png') 0 -104px no-repeat; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active a { background: url('../images/sprites-64x64-s45180e3c4f.png') 0 -354px no-repeat; }
|
||||||
.ui-tabs .cms-panel-padded .ui-tabs-panel { padding: 0; }
|
.ui-tabs .cms-panel-padded .ui-tabs-panel { padding: 0; }
|
||||||
.ui-tabs .cms-panel-padded .ui-tabs-panel .ui-tabs-panel { padding: 8px 0 0 0; }
|
.ui-tabs .cms-panel-padded .ui-tabs-panel .ui-tabs-panel { padding: 8px 0 0 0; }
|
||||||
.ui-tabs .cms-panel-padded .Actions { padding: 0; }
|
.ui-tabs .cms-panel-padded .Actions { padding: 0; }
|
||||||
@ -421,8 +420,8 @@ body.cms { overflow: hidden; }
|
|||||||
.ui-tabs.cms-tabset-primary .ui-tabs-nav li, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary li, .ui-tabs .cms-content-header-tabs .ui-tabs-nav li { margin-right: 0; margin-top: 0; }
|
.ui-tabs.cms-tabset-primary .ui-tabs-nav li, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary li, .ui-tabs .cms-content-header-tabs .ui-tabs-nav li { margin-right: 0; margin-top: 0; }
|
||||||
.ui-tabs.cms-tabset-primary .ui-tabs-nav li a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary li a, .ui-tabs .cms-content-header-tabs .ui-tabs-nav li a { margin: 0; line-height: 39px; }
|
.ui-tabs.cms-tabset-primary .ui-tabs-nav li a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary li a, .ui-tabs .cms-content-header-tabs .ui-tabs-nav li a { margin: 0; line-height: 39px; }
|
||||||
.ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-corner-all, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-corner-top, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-corner-right, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-corner-tr, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-corner-tl, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-corner-all, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-corner-top, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-corner-right, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-corner-tr, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-corner-tl, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-corner-all, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-corner-top, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-corner-right, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-corner-tr, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-corner-tl { border-radius: 0; }
|
.ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-corner-all, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-corner-top, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-corner-right, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-corner-tr, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-corner-tl, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-corner-all, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-corner-top, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-corner-right, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-corner-tr, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-corner-tl, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-corner-all, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-corner-top, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-corner-right, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-corner-tr, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-corner-tl { border-radius: 0; }
|
||||||
.ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-default, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-default, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-state-default { -webkit-box-shadow: rgba(201, 205, 206, 0.8) 0 0 2px; -moz-box-shadow: rgba(201, 205, 206, 0.8) 0 0 2px; box-shadow: rgba(201, 205, 206, 0.8) 0 0 2px; background-color: #b0bec7; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Q0ZGJlMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d4dbe0), color-stop(100%, #b0bec7)); background-image: -webkit-linear-gradient(#d4dbe0, #b0bec7); background-image: -moz-linear-gradient(#d4dbe0, #b0bec7); background-image: -o-linear-gradient(#d4dbe0, #b0bec7); background-image: linear-gradient(#d4dbe0, #b0bec7); border-top: none; border-right-color: #8399a7; border-left-color: #ced7dc; }
|
.ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-default, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-default, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-state-default { -moz-box-shadow: rgba(201, 205, 206, 0.8) 0 0 2px; -webkit-box-shadow: rgba(201, 205, 206, 0.8) 0 0 2px; box-shadow: rgba(201, 205, 206, 0.8) 0 0 2px; background-color: #b0bec7; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Q0ZGJlMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d4dbe0), color-stop(100%, #b0bec7)); background-image: -moz-linear-gradient(#d4dbe0, #b0bec7); background-image: -webkit-linear-gradient(#d4dbe0, #b0bec7); background-image: linear-gradient(#d4dbe0, #b0bec7); border-top: none; border-right-color: #8399a7; border-left-color: #ced7dc; }
|
||||||
.ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-state-active { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; background: #e6eaed; border-top: none; border-right-color: #b3b3b3; border-left-color: #eceff1; z-index: 2; }
|
.ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-state-active { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; background: #e6eaed; border-top: none; border-right-color: #b3b3b3; border-left-color: #ECEFF1; z-index: 2; }
|
||||||
.ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active a, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-state-active a { border-bottom: none; }
|
.ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active a, .ui-tabs .cms-content-header-tabs .ui-tabs-nav .ui-state-active a { border-bottom: none; }
|
||||||
|
|
||||||
.cms-content-header-tabs { float: right; }
|
.cms-content-header-tabs { float: right; }
|
||||||
@ -433,19 +432,19 @@ body.cms { overflow: hidden; }
|
|||||||
.cms-content-loading-spinner { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 9999; background: url(../images/spinner.gif) no-repeat 50% 50%; }
|
.cms-content-loading-spinner { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 9999; background: url(../images/spinner.gif) no-repeat 50% 50%; }
|
||||||
|
|
||||||
/** ----------------------------------------------- Loading Screen ------------------------------------------------ */
|
/** ----------------------------------------------- Loading Screen ------------------------------------------------ */
|
||||||
.ss-loading-screen { width: 100%; height: 100%; overflow: hidden; position: absolute; z-index: 100000; background: #fff; background: -moz-radial-gradient(50% 50% 180deg, circle cover, white, #efefef, #c7c7c7 100%); background: -webkit-gradient(radial, 50% 50%, 350, 50% 50%, 0, from(#e3e3e3), to(white)); }
|
.ss-loading-screen { width: 100%; height: 100%; overflow: hidden; position: absolute; z-index: 100000; background: #fff; background: -moz-radial-gradient(50% 50% 180deg, circle cover, #FFFFFF, #EFEFEF, #C7C7C7 100%); background: -webkit-gradient(radial, 50% 50%, 350, 50% 50%, 0, from(#E3E3E3), to(white)); }
|
||||||
.ss-loading-screen .loading-logo { width: 100%; height: 100%; overflow: hidden; position: absolute; background: transparent url(../images/silverstripe_logo.png) no-repeat 50% 50%; }
|
.ss-loading-screen .loading-logo { width: 100%; height: 100%; overflow: hidden; position: absolute; background: transparent url(../images/silverstripe_logo.png) no-repeat 50% 50%; }
|
||||||
.ss-loading-screen p { width: 100%; text-align: center; position: absolute; bottom: 80px; z-index: 100001; }
|
.ss-loading-screen p { width: 100%; text-align: center; position: absolute; bottom: 80px; z-index: 100001; }
|
||||||
.ss-loading-screen p span.notice { width: 300px; font-size: 14px; padding: 10px 20px; color: #dc7f00; border: none; background: none; -webkit-border-radius: 5px; -moz-border-radius: 5px; -ms-border-radius: 5px; -o-border-radius: 5px; border-radius: 5px; display: inline-block; zoom: 1; *display: inline; }
|
.ss-loading-screen p span.notice { width: 300px; font-size: 14px; padding: 10px 20px; color: #dc7f00; border: none; background: none; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; display: inline-block; zoom: 1; *display: inline; }
|
||||||
.ss-loading-screen .loading-animation { display: none; position: absolute; left: 49%; top: 75%; }
|
.ss-loading-screen .loading-animation { display: none; position: absolute; left: 49%; top: 75%; }
|
||||||
|
|
||||||
/** -------------------------------------------- Actions -------------------------------------------- */
|
/** -------------------------------------------- Actions -------------------------------------------- */
|
||||||
.cms-content-actions, .cms-preview-controls { margin: 0; padding: 12px 12px; z-index: 0; border-top: 1px solid #cacacc; -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; -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; 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 12px; z-index: 0; border-top: 1px solid #cacacc; -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; }
|
||||||
|
|
||||||
/** -------------------------------------------- Messages -------------------------------------------- */
|
/** -------------------------------------------- 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; -webkit-border-radius: 3px 3px 3px 3px; -moz-border-radius: 3px 3px 3px 3px; -ms-border-radius: 3px 3px 3px 3px; -o-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; }
|
.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; }
|
||||||
.message.notice { background-color: #f0f8fc; border-color: #93cde8; }
|
.message.notice { background-color: #f0f8fc; border-color: #93CDE8; }
|
||||||
.message.warning { background-color: #fefbde; border-color: #e9d104; }
|
.message.warning { background-color: #fefbde; border-color: #E9D104; }
|
||||||
.message.error, .message.bad, .message.required, .message.validation { background-color: #fae8e9; border-color: #e68288; }
|
.message.error, .message.bad, .message.required, .message.validation { background-color: #fae8e9; border-color: #e68288; }
|
||||||
.message.good { background-color: #eaf6e4; border-color: #72c34b; }
|
.message.good { background-color: #eaf6e4; border-color: #72c34b; }
|
||||||
.message p { margin: 0; }
|
.message p { margin: 0; }
|
||||||
@ -453,7 +452,7 @@ body.cms { overflow: hidden; }
|
|||||||
.cms-edit-form .message { margin: 16px; }
|
.cms-edit-form .message { margin: 16px; }
|
||||||
.cms-edit-form .ui-tabs-panel .message { margin: 16px 0; }
|
.cms-edit-form .ui-tabs-panel .message { margin: 16px 0; }
|
||||||
|
|
||||||
.notice-item { border: 0; -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; font-family: inherit; font-size: inherit; padding: 8px 10px 8px 10px; }
|
.notice-item { border: 0; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; font-family: inherit; font-size: inherit; padding: 8px 10px 8px 10px; }
|
||||||
|
|
||||||
.notice-item-close { color: #333333; background: url(../images/filter-icons.png) no-repeat 0 -20px; width: 1px; height: 1px; overflow: hidden; padding: 0px 0 20px 15px; }
|
.notice-item-close { color: #333333; background: url(../images/filter-icons.png) no-repeat 0 -20px; width: 1px; height: 1px; overflow: hidden; padding: 0px 0 20px 15px; }
|
||||||
|
|
||||||
@ -479,7 +478,7 @@ body.cms { overflow: hidden; }
|
|||||||
#PageType ul li { float: none; width: 100%; padding: 9px 0 9px 15px; overflow: hidden; border-bottom-width: 2px; border-bottom: 2px groove rgba(255, 255, 255, 0.8); -webkit-border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; }
|
#PageType ul li { float: none; width: 100%; padding: 9px 0 9px 15px; overflow: hidden; border-bottom-width: 2px; border-bottom: 2px groove rgba(255, 255, 255, 0.8); -webkit-border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; }
|
||||||
#PageType ul li:last-child { border-bottom: none; }
|
#PageType ul li:last-child { border-bottom: none; }
|
||||||
#PageType ul li:hover, #PageType ul li.selected { background-color: rgba(255, 255, 102, 0.3); }
|
#PageType ul li:hover, #PageType ul li.selected { background-color: rgba(255, 255, 102, 0.3); }
|
||||||
#PageType ul li.disabled { color: #aaaaaa; filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50); opacity: 0.5; }
|
#PageType ul li.disabled { color: #aaa; filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50); opacity: 0.5; }
|
||||||
#PageType ul li.disabled:hover { background: none; }
|
#PageType ul li.disabled:hover { background: none; }
|
||||||
#PageType ul li input { margin: inherit; }
|
#PageType ul li input { margin: inherit; }
|
||||||
#PageType ul li label { padding-left: 0; padding-bottom: 0; }
|
#PageType ul li label { padding-left: 0; padding-bottom: 0; }
|
||||||
@ -493,22 +492,22 @@ body.cms { overflow: hidden; }
|
|||||||
.cms-content-toolbar:after { content: "\0020"; display: block; height: 0; clear: both; overflow: hidden; visibility: 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 { float: right; padding-top: 5px; }
|
||||||
.cms-content-toolbar .cms-tree-view-modes * { display: inline-block; }
|
.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: #0073C1; }
|
||||||
.cms-content-toolbar .chzn-container-single .chzn-single { height: 26px; line-height: 26px; padding-left: 25px; color: #576468; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2NkY2RjZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(100%, #cdcdcd)); background-image: -webkit-linear-gradient(#e6e6e6, #cdcdcd); background-image: -moz-linear-gradient(#e6e6e6, #cdcdcd); background-image: -o-linear-gradient(#e6e6e6, #cdcdcd); background-image: linear-gradient(#e6e6e6, #cdcdcd); font-size: 13px; font-weight: bold; text-shadow: #e6e6e6 0 -1px 1px; box-shadow: none; }
|
.cms-content-toolbar .chzn-container-single .chzn-single { height: 26px; line-height: 26px; padding-left: 25px; color: #576468; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2NkY2RjZCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(100%, #cdcdcd)); background-image: -moz-linear-gradient(#e6e6e6, #cdcdcd); background-image: -webkit-linear-gradient(#e6e6e6, #cdcdcd); background-image: linear-gradient(#e6e6e6, #cdcdcd); font-size: 13px; font-weight: bold; text-shadow: #e6e6e6 0 -1px 1px; box-shadow: none; }
|
||||||
.cms-content-toolbar .chzn-container-single .chzn-single:hover { -webkit-box-shadow: 0 0 5px #b3b3b3; -moz-box-shadow: 0 0 5px #b3b3b3; box-shadow: 0 0 5px #b3b3b3; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ViZWJlYiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2QyZDJkMiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ebebeb), color-stop(100%, #d2d2d2)); background-image: -webkit-linear-gradient(#ebebeb, #d2d2d2); background-image: -moz-linear-gradient(#ebebeb, #d2d2d2); background-image: -o-linear-gradient(#ebebeb, #d2d2d2); background-image: linear-gradient(#ebebeb, #d2d2d2); }
|
.cms-content-toolbar .chzn-container-single .chzn-single:hover { -moz-box-shadow: 0 0 5px #b3b3b3; -webkit-box-shadow: 0 0 5px #b3b3b3; box-shadow: 0 0 5px #b3b3b3; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ViZWJlYiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2QyZDJkMiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ebebeb), color-stop(100%, #d2d2d2)); background-image: -moz-linear-gradient(#ebebeb, #d2d2d2); background-image: -webkit-linear-gradient(#ebebeb, #d2d2d2); background-image: linear-gradient(#ebebeb, #d2d2d2); }
|
||||||
.cms-content-toolbar .chzn-container-single .chzn-single:active { -webkit-box-shadow: inset 0 1px 3px #4d4d4d; -moz-box-shadow: inset 0 1px 3px #4d4d4d; box-shadow: inset 0 1px 3px #4d4d4d; }
|
.cms-content-toolbar .chzn-container-single .chzn-single:active { -moz-box-shadow: inset 0 1px 3px #4d4d4d; -webkit-box-shadow: inset 0 1px 3px #4d4d4d; box-shadow: inset 0 1px 3px #4d4d4d; }
|
||||||
.cms-content-toolbar .chzn-container-single .chzn-single span { padding-top: 1px; }
|
.cms-content-toolbar .chzn-container-single .chzn-single span { padding-top: 1px; }
|
||||||
.cms-content-toolbar .chzn-container-single .chzn-single div { border-left: none; width: 100%; }
|
.cms-content-toolbar .chzn-container-single .chzn-single div { border-left: none; width: 100%; }
|
||||||
.cms-content-toolbar .chzn-container-single .chzn-single div b { background: url(../images/sprites-32x32/menu-arrow-deselected-down.png) no-repeat 9px 11px; float: right; width: 24px; }
|
.cms-content-toolbar .chzn-container-single .chzn-single div b { background: url(../images/sprites-32x32/menu-arrow-deselected-down.png) no-repeat 9px 11px; float: right; width: 24px; }
|
||||||
.cms-content-toolbar .ss-ui-button { margin-bottom: 8px; }
|
.cms-content-toolbar .ss-ui-button { margin-bottom: 8px; }
|
||||||
|
|
||||||
/* -------------------------------------------------------- Content Tools is the sidebar on the left of the main content panel */
|
/* -------------------------------------------------------- Content Tools is the sidebar on the left of the main content panel */
|
||||||
.cms-content-tools { background: #eceff1; width: 200px; overflow-y: auto; overflow-x: hidden; z-index: 70; border-right: 1px solid #c0c0c2; -webkit-box-shadow: rgba(248, 248, 248, 0.9) -1px 0 0 inset, 0 0 1px rgba(201, 205, 206, 0.8); -moz-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: #ECEFF1; width: 200px; overflow-y: auto; overflow-x: hidden; z-index: 70; border-right: 1px solid #C0C0C2; -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.filter { padding: 0 !important; }
|
.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 #d0d3d5; -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 #d0d3d5; -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-content { width: 184px; padding: 8.8px 8px 0; overflow: auto; height: 100%; }
|
.cms-content-tools .cms-panel-content { width: 184px; padding: 8.8px 8px 0; overflow: auto; height: 100%; }
|
||||||
.cms-content-tools .cms-panel-content .Actions .ss-ui-action-constructive { margin-right: 5px; }
|
.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+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+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: -webkit-linear-gradient(#b0bec7, #748d9d); background-image: -moz-linear-gradient(#b0bec7, #748d9d); background-image: -o-linear-gradient(#b0bec7, #748d9d); background-image: linear-gradient(#b0bec7, #748d9d); }
|
.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); }
|
||||||
.cms-content-tools .cms-content-header h2 { text-shadow: #5c7382 -1px -1px 0; width: 176px; color: white; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
|
.cms-content-tools .cms-content-header h2 { text-shadow: #5c7382 -1px -1px 0; width: 176px; color: white; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
|
||||||
.cms-content-tools h3, .cms-content-tools h4, .cms-content-tools h5 { font-weight: bold; line-height: 16px; }
|
.cms-content-tools h3, .cms-content-tools h4, .cms-content-tools h5 { font-weight: bold; line-height: 16px; }
|
||||||
.cms-content-tools h3 { font-size: 13px; }
|
.cms-content-tools h3 { font-size: 13px; }
|
||||||
@ -525,20 +524,20 @@ body.cms { overflow: hidden; }
|
|||||||
.cms-content-tools .fieldgroup .fieldgroup-field .field { margin: 0; padding: 0; }
|
.cms-content-tools .fieldgroup .fieldgroup-field .field { margin: 0; padding: 0; }
|
||||||
.cms-content-tools table { margin: 8px -4px; }
|
.cms-content-tools table { margin: 8px -4px; }
|
||||||
.cms-content-tools table thead th { color: #1f1f1f; font-weight: bold; line-height: 16px; font-size: 11px; padding: 4px; }
|
.cms-content-tools table thead th { color: #1f1f1f; font-weight: bold; line-height: 16px; font-size: 11px; padding: 4px; }
|
||||||
.cms-content-tools table tr.active { background-color: #338dc1; color: white; }
|
.cms-content-tools table tr.active { background-color: #338DC1; color: white; }
|
||||||
.cms-content-tools table tr.active td.first-column { -webkit-border-radius: 6px 0 0 6px; -moz-border-radius: 6px 0 0 6px; -ms-border-radius: 6px 0 0 6px; -o-border-radius: 6px 0 0 6px; border-radius: 6px 0 0 6px; }
|
.cms-content-tools table tr.active td.first-column { -moz-border-radius: 6px 0 0 6px; -webkit-border-radius: 6px; border-radius: 6px 0 0 6px; }
|
||||||
.cms-content-tools table tr.active td.last-column { -webkit-border-radius: 0 6px 6px 0; -moz-border-radius: 0 6px 6px 0; -ms-border-radius: 0 6px 6px 0; -o-border-radius: 0 6px 6px 0; border-radius: 0 6px 6px 0; }
|
.cms-content-tools table tr.active td.last-column { -moz-border-radius: 0 6px 6px 0; -webkit-border-radius: 0; border-radius: 0 6px 6px 0; }
|
||||||
.cms-content-tools table td { padding: 4px; line-height: 16px; vertical-align: top; }
|
.cms-content-tools table td { padding: 4px; line-height: 16px; vertical-align: top; }
|
||||||
.cms-content-tools td { border-bottom: 1px solid #ced7dc; padding: 7px 2px; font-size: 11px; }
|
.cms-content-tools td { border-bottom: 1px solid #ced7dc; padding: 7px 2px; font-size: 11px; }
|
||||||
|
|
||||||
/** ------------------------------------------------------------------
|
/** ------------------------------------------------------------------
|
||||||
* CMS notice, used for filter messages, but generic enough to use elsewhere
|
* CMS notice, used for filter messages, but generic enough to use elsewhere
|
||||||
* ----------------------------------------------------------------- */
|
* ----------------------------------------------------------------- */
|
||||||
.cms-notice { display: block; margin: 0 0 8px; padding: 10px 12px; font-weight: normal; border: 1px #d0d3d5 solid; background: #fff; background: rgba(255, 255, 255, 0.5); text-shadow: none; -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; }
|
.cms-notice { display: block; margin: 0 0 8px; padding: 10px 12px; font-weight: normal; border: 1px #d0d3d5 solid; background: #fff; background: rgba(255, 255, 255, 0.5); text-shadow: none; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; }
|
||||||
|
|
||||||
/** CMS Batch actions */
|
/** CMS Batch actions */
|
||||||
.cms-content-batchactions { float: left; position: relative; display: block; }
|
.cms-content-batchactions { float: left; position: relative; display: block; }
|
||||||
.cms-content-batchactions .view-mode-batchactions-wrapper { height: 18px; float: left; padding: 4px 6px; border: 1px solid #aaa; margin-bottom: 8px; margin-right: -1px; background-color: #D9D9D9; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background-image: -webkit-linear-gradient(top, #ffffff, #d9d9d9); background-image: -moz-linear-gradient(top, #ffffff, #d9d9d9); background-image: -o-linear-gradient(top, #ffffff, #d9d9d9); background-image: linear-gradient(top, #ffffff, #d9d9d9); border-top-left-radius: 4px; border-bottom-left-radius: 4px; }
|
.cms-content-batchactions .view-mode-batchactions-wrapper { height: 18px; float: left; padding: 4px 6px; border: 1px solid #aaa; margin-bottom: 8px; margin-right: -1px; background-color: #D9D9D9; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background-image: -moz-linear-gradient(top, #ffffff, #d9d9d9); background-image: -webkit-linear-gradient(top, #ffffff, #d9d9d9); background-image: linear-gradient(to bottom, #ffffff, #d9d9d9); border-top-left-radius: 4px; border-bottom-left-radius: 4px; }
|
||||||
.cms-content-batchactions .view-mode-batchactions-wrapper input { vertical-align: middle; }
|
.cms-content-batchactions .view-mode-batchactions-wrapper input { vertical-align: middle; }
|
||||||
.cms-content-batchactions .view-mode-batchactions-wrapper label { vertical-align: middle; display: none; }
|
.cms-content-batchactions .view-mode-batchactions-wrapper label { vertical-align: middle; display: none; }
|
||||||
.cms-content-batchactions .view-mode-batchactions-wrapper fieldset, .cms-content-batchactions .view-mode-batchactions-wrapper .Actions { display: inline-block; }
|
.cms-content-batchactions .view-mode-batchactions-wrapper fieldset, .cms-content-batchactions .view-mode-batchactions-wrapper .Actions { display: inline-block; }
|
||||||
@ -549,7 +548,7 @@ body.cms { overflow: hidden; }
|
|||||||
.cms-content-batchactions form.cms-batch-actions { float: left; }
|
.cms-content-batchactions form.cms-batch-actions { float: left; }
|
||||||
.cms-content-batchactions.inactive form { display: none; }
|
.cms-content-batchactions.inactive form { display: none; }
|
||||||
.cms-content-batchactions .chzn-container-single { display: block; }
|
.cms-content-batchactions .chzn-container-single { display: block; }
|
||||||
.cms-content-batchactions .chzn-container-single .chzn-single { border-radius: 0; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background-image: -webkit-linear-gradient(top, #ffffff, #d9d9d9); background-image: -moz-linear-gradient(top, #ffffff, #d9d9d9); background-image: -o-linear-gradient(top, #ffffff, #d9d9d9); background-image: linear-gradient(top, #ffffff, #d9d9d9); }
|
.cms-content-batchactions .chzn-container-single .chzn-single { border-radius: 0; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background-image: -moz-linear-gradient(top, #ffffff, #d9d9d9); background-image: -webkit-linear-gradient(top, #ffffff, #d9d9d9); background-image: linear-gradient(to bottom, #ffffff, #d9d9d9); }
|
||||||
.cms-content-batchactions .chzn-container-single .chzn-single span { padding-top: 0; }
|
.cms-content-batchactions .chzn-container-single .chzn-single span { padding-top: 0; }
|
||||||
.cms-content-batchactions .cms-batch-actions .dropdown { margin: 0; }
|
.cms-content-batchactions .cms-batch-actions .dropdown { margin: 0; }
|
||||||
.cms-content-batchactions .cms-batch-actions .dropdown .chzn-single { padding-left: 8px; /* use default size without icon */ }
|
.cms-content-batchactions .cms-batch-actions .dropdown .chzn-single { padding-left: 8px; /* use default size without icon */ }
|
||||||
@ -582,7 +581,7 @@ form.member-profile-form #Permissions .optionset li { float: none; width: auto;
|
|||||||
.memberdatetimeoptionset .description { font-style: normal; }
|
.memberdatetimeoptionset .description { font-style: normal; }
|
||||||
.memberdatetimeoptionset .toggle { font-size: 11px; }
|
.memberdatetimeoptionset .toggle { font-size: 11px; }
|
||||||
|
|
||||||
.cms .cms-content { border-right: 1px solid #BBB; -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; background: #eceff1; width: 800px; z-index: 40; }
|
.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: #e6eaed; width: 100%; }
|
.cms .cms-content-fields { overflow-y: auto; overflow-x: auto; background: #e6eaed; width: 100%; }
|
||||||
.cms .cms-content-fields #Root_Main .confirmedpassword { border-bottom: none; box-shadow: none; }
|
.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 .customFormat { max-width: 80px; }
|
||||||
@ -598,21 +597,21 @@ form.member-profile-form #Permissions .optionset li { float: none; width: auto;
|
|||||||
|
|
||||||
/** -------------------------------------------- Panels -------------------------------------------- */
|
/** -------------------------------------------- Panels -------------------------------------------- */
|
||||||
.cms-panel { overflow: hidden; }
|
.cms-panel { overflow: hidden; }
|
||||||
.cms-panel .cms-panel-toggle { -webkit-box-shadow: 0 0 1px rgba(248, 248, 248, 0.9); -moz-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 { -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 #9eafba; -webkit-box-shadow: #bcc8cf 0 1px 0px inset; -moz-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 #9eafba; -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 a { display: block; text-align: right; padding: 4px 0; width: 100%; text-decoration: none; }
|
.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: #1f1f1f; font-size: 16px; }
|
.cms-panel .cms-panel-toggle a span { display: inline-block; margin: 0 5px; color: #1f1f1f; font-size: 16px; }
|
||||||
.cms-panel .cms-panel-toggle a.toggle-expand { width: 40px; display: none; }
|
.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 #cfd6db; -webkit-box-shadow: rgba(248, 248, 248, 0.9) 0 1px 0px inset; -moz-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 #cfd6db; -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.collapsed { cursor: pointer; }
|
.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-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; }
|
.cms-panel.collapsed .cms-panel-toggle a.toggle-expand { display: block; }
|
||||||
.cms-panel .cms-panel-header { width: 100%; }
|
.cms-panel .cms-panel-header { width: 100%; }
|
||||||
.cms-panel#cms-content-tools-CMSPageEditController .cms-panel-content-collapsed { width: 40px; display: none; }
|
.cms-panel#cms-content-tools-CMSPageEditController .cms-panel-content-collapsed { width: 40px; display: none; }
|
||||||
.cms-panel#cms-content-tools-CMSPageEditController .cms-panel-content-collapsed h2, .cms-panel#cms-content-tools-CMSPageEditController .cms-panel-content-collapsed h3 { border-bottom: 0; margin-left: 8px; -webkit-transform-origin: bottom right; -moz-transform-origin: bottom right; -ms-transform-origin: bottom right; -o-transform-origin: bottom right; transform-origin: bottom right; -webkit-transform: rotate(270deg); -moz-transform: rotate(270deg); -ms-transform: rotate(270deg); -o-transform: rotate(270deg); transform: rotate(270deg); }
|
.cms-panel#cms-content-tools-CMSPageEditController .cms-panel-content-collapsed h2, .cms-panel#cms-content-tools-CMSPageEditController .cms-panel-content-collapsed h3 { border-bottom: 0; margin-left: 8px; -moz-transform-origin: bottom right; -ms-transform-origin: bottom right; -webkit-transform-origin: bottom right; transform-origin: bottom right; -moz-transform: rotate(270deg); -ms-transform: rotate(270deg); -webkit-transform: rotate(270deg); transform: rotate(270deg); }
|
||||||
.cms-panel#cms-content-tools-CMSPageEditController .cms-panel-content-collapsed .cms-panel-header { width: 600px; position: relative; top: 24px; right: 577px; text-align: right; }
|
.cms-panel#cms-content-tools-CMSPageEditController .cms-panel-content-collapsed .cms-panel-header { width: 600px; position: relative; top: 24px; right: 577px; text-align: right; }
|
||||||
.cms-panel .cms-panel-content-collapsed { width: 40px; display: none; }
|
.cms-panel .cms-panel-content-collapsed { width: 40px; display: none; }
|
||||||
.cms-panel .cms-panel-content-collapsed h2, .cms-panel .cms-panel-content-collapsed h3 { border-bottom: 0; margin-left: 8px; -webkit-transform-origin: bottom right; -moz-transform-origin: bottom right; -ms-transform-origin: bottom right; -o-transform-origin: bottom right; transform-origin: bottom right; -webkit-transform: rotate(270deg); -moz-transform: rotate(270deg); -ms-transform: rotate(270deg); -o-transform: rotate(270deg); transform: rotate(270deg); }
|
.cms-panel .cms-panel-content-collapsed h2, .cms-panel .cms-panel-content-collapsed h3 { border-bottom: 0; margin-left: 8px; -moz-transform-origin: bottom right; -ms-transform-origin: bottom right; -webkit-transform-origin: bottom right; transform-origin: bottom right; -moz-transform: rotate(270deg); -ms-transform: rotate(270deg); -webkit-transform: rotate(270deg); transform: rotate(270deg); }
|
||||||
.cms-panel .cms-panel-content-collapsed .cms-panel-header { width: 600px; position: relative; right: 577px; text-align: right; border-bottom: none; box-shadow: none; }
|
.cms-panel .cms-panel-content-collapsed .cms-panel-header { width: 600px; position: relative; right: 577px; text-align: right; border-bottom: none; box-shadow: none; }
|
||||||
.cms-panel .child-flyout-indicator { width: 0; height: 0; border-right: 3px dashed #1f1f1f; border-top: 3px solid transparent; border-left: 3px solid transparent; border-bottom: 3px dashed #1f1f1f; position: absolute; right: 1px; margin-top: -8px; display: none; /* To be shown by javascript, see LeftAndMain.Panel.js */ }
|
.cms-panel .child-flyout-indicator { width: 0; height: 0; border-right: 3px dashed #1f1f1f; border-top: 3px solid transparent; border-left: 3px solid transparent; border-bottom: 3px dashed #1f1f1f; position: absolute; right: 1px; margin-top: -8px; display: none; /* To be shown by javascript, see LeftAndMain.Panel.js */ }
|
||||||
.cms-panel .collapsed-flyout { display: block !important; left: 41px; margin-top: -40px; position: fixed; width: 191px; }
|
.cms-panel .collapsed-flyout { display: block !important; left: 41px; margin-top: -40px; position: fixed; width: 191px; }
|
||||||
@ -632,12 +631,12 @@ form.member-profile-form #Permissions .optionset li { float: none; width: auto;
|
|||||||
|
|
||||||
.cms .ui-dialog .ss-ui-dialog.ui-dialog-content { padding-top: 0px; }
|
.cms .ui-dialog .ss-ui-dialog.ui-dialog-content { padding-top: 0px; }
|
||||||
|
|
||||||
.ui-dialog { background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; border: 3px solid #000 !important; border-radius: 8px; overflow: visible; padding: 0; }
|
.ui-dialog { background: url("../images/textures/bg_cms_main_content.png") repeat left top #F0F3F4; border: 3px solid #000 !important; border-radius: 8px; overflow: visible; padding: 0; }
|
||||||
.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; -webkit-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; -moz-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 { 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-titlebar.ui-widget-header .ui-dialog-title { position: absolute; }
|
||||||
.ui-dialog .ui-dialog-content { overflow: auto; }
|
.ui-dialog .ui-dialog-content { overflow: auto; }
|
||||||
.ui-dialog .ui-dialog-content.loading { background-image: url(../images/spinner.gif); background-position: 50% 50%; background-repeat: no-repeat; }
|
.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: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; padding-bottom: 8px; padding-top: 0px; }
|
.ui-dialog .cms-dialog-content { background: url("../images/textures/bg_cms_main_content.png") repeat left top #F0F3F4; 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 .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 { position: static; }
|
||||||
.ui-dialog .cms-dialog-content .ui-tabs .ui-tabs-nav { position: absolute; top: 0; right: 40px; }
|
.ui-dialog .cms-dialog-content .ui-tabs .ui-tabs-nav { position: absolute; top: 0; right: 40px; }
|
||||||
@ -645,7 +644,7 @@ form.member-profile-form #Permissions .optionset li { float: none; width: auto;
|
|||||||
.ui-dialog .cms-dialog-content .clear { clear: both; }
|
.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.loading { background-image: url(../images/spinner.gif); background-position: 50% 50%; background-repeat: no-repeat; }
|
||||||
|
|
||||||
body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; position: relative; }
|
body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_main_content.png") repeat left top #F0F3F4; position: relative; }
|
||||||
|
|
||||||
/** -------------------------------------------- "Insert X" forms -------------------------------------------- */
|
/** -------------------------------------------- "Insert X" forms -------------------------------------------- */
|
||||||
.htmleditorfield-dialog.ui-dialog-content { padding: 0; position: relative; }
|
.htmleditorfield-dialog.ui-dialog-content { padding: 0; position: relative; }
|
||||||
@ -653,10 +652,10 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
|
|||||||
.htmleditorfield-dialog .htmleditorfield-from-web #RemoteURL { border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; width: 55%; max-width: 512px; float: left; position: relative; }
|
.htmleditorfield-dialog .htmleditorfield-from-web #RemoteURL { border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; width: 55%; max-width: 512px; float: left; position: relative; }
|
||||||
.htmleditorfield-dialog .htmleditorfield-from-web #RemoteURL label { position: absolute; left: 8px; top: 13px; font-weight: normal; color: #888; }
|
.htmleditorfield-dialog .htmleditorfield-from-web #RemoteURL label { position: absolute; left: 8px; top: 13px; font-weight: normal; color: #888; }
|
||||||
.htmleditorfield-dialog .htmleditorfield-from-web #RemoteURL .middleColumn { margin-left: 0; }
|
.htmleditorfield-dialog .htmleditorfield-from-web #RemoteURL .middleColumn { margin-left: 0; }
|
||||||
.htmleditorfield-dialog .htmleditorfield-from-web #RemoteURL input.remoteurl { padding-left: 40px; }
|
.htmleditorfield-dialog .htmleditorfield-from-web #RemoteURL input.remoteurl { padding-left: 40px; max-width: 350px; }
|
||||||
.htmleditorfield-dialog .htmleditorfield-from-web button.add-url { margin-top: 5px; padding-top: 15px; overflow: hidden; *zoom: 1; border: none; background: none; opacity: 0.8; cursor: hand; }
|
.htmleditorfield-dialog .htmleditorfield-from-web button.add-url { margin-top: 20px; overflow: hidden; *zoom: 1; border: none; background: none; opacity: 0.8; cursor: hand; }
|
||||||
.htmleditorfield-dialog .htmleditorfield-from-web button.add-url .btn-icon-addMedia { width: 20px; height: 20px; }
|
.htmleditorfield-dialog .htmleditorfield-from-web button.add-url .btn-icon-addMedia { width: 20px; height: 20px; }
|
||||||
.htmleditorfield-dialog .htmleditorfield-from-web button.add-url .ui-button-text { margin-left: 10px; margin-top: -5px; line-height: 20px; float: left; }
|
.htmleditorfield-dialog .htmleditorfield-from-web button.add-url .ui-button-text { margin-left: 10px; padding-top: 10px; }
|
||||||
.htmleditorfield-dialog .htmleditorfield-from-web button.add-url:hover, .htmleditorfield-dialog .htmleditorfield-from-web button.add-url:active { border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; opacity: 1; }
|
.htmleditorfield-dialog .htmleditorfield-from-web button.add-url:hover, .htmleditorfield-dialog .htmleditorfield-from-web button.add-url:active { border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; opacity: 1; }
|
||||||
.htmleditorfield-dialog .htmleditorfield-from-web button.add-url.ui-state-disabled, .htmleditorfield-dialog .htmleditorfield-from-web button.add-url.ui-state-disabled:hover, .htmleditorfield-dialog .htmleditorfield-from-web button.add-url.ui-state-disabled:active { opacity: 0.35; filter: Alpha(Opacity=35); }
|
.htmleditorfield-dialog .htmleditorfield-from-web button.add-url.ui-state-disabled, .htmleditorfield-dialog .htmleditorfield-from-web button.add-url.ui-state-disabled:hover, .htmleditorfield-dialog .htmleditorfield-from-web button.add-url.ui-state-disabled:active { opacity: 0.35; filter: Alpha(Opacity=35); }
|
||||||
.htmleditorfield-dialog .htmleditorfield-from-web .loading button.add-url .ui-icon { background-image: url(../images/throbber.gif); background-position: 50% 50%; background-repeat: no-repeat; }
|
.htmleditorfield-dialog .htmleditorfield-from-web .loading button.add-url .ui-icon { background-image: url(../images/throbber.gif); background-position: 50% 50%; background-repeat: no-repeat; }
|
||||||
@ -665,9 +664,9 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
|
|||||||
.htmleditorfield-dialog .ss-insert-media, .htmleditorfield-dialog .Actions, .htmleditorfield-dialog .ss-insert-link { padding: 8px 16px; }
|
.htmleditorfield-dialog .ss-insert-media, .htmleditorfield-dialog .Actions, .htmleditorfield-dialog .ss-insert-link { padding: 8px 16px; }
|
||||||
.htmleditorfield-dialog .ss-insert-media .ui-tabs-panel, .htmleditorfield-dialog .Actions .ui-tabs-panel, .htmleditorfield-dialog .ss-insert-link .ui-tabs-panel { padding: 0; }
|
.htmleditorfield-dialog .ss-insert-media .ui-tabs-panel, .htmleditorfield-dialog .Actions .ui-tabs-panel, .htmleditorfield-dialog .ss-insert-link .ui-tabs-panel { padding: 0; }
|
||||||
.htmleditorfield-dialog .details .file-url { display: block; width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
|
.htmleditorfield-dialog .details .file-url { display: block; width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
|
||||||
.htmleditorfield-dialog .details .cms-file-info .field { border: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); }
|
.htmleditorfield-dialog .details .cms-file-info .field { border: none; -moz-box-shadow: 0 0 0 transparent; -webkit-box-shadow: 0 0 0 transparent; box-shadow: 0 0 0 transparent; }
|
||||||
.htmleditorfield-dialog .details .field { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
|
.htmleditorfield-dialog .details .field { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
|
||||||
.htmleditorfield-dialog .details .field.last { border-bottom: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); margin-bottom: 0; }
|
.htmleditorfield-dialog .details .field.last { border-bottom: none; -moz-box-shadow: 0 0 0 transparent; -webkit-box-shadow: 0 0 0 transparent; box-shadow: 0 0 0 transparent; margin-bottom: 0; }
|
||||||
.htmleditorfield-dialog .CompositeField .text select { margin: 5px 0 0 0; }
|
.htmleditorfield-dialog .CompositeField .text select { margin: 5px 0 0 0; }
|
||||||
|
|
||||||
.htmleditorfield-linkform .step2 { margin-bottom: 16px; }
|
.htmleditorfield-linkform .step2 { margin-bottom: 16px; }
|
||||||
@ -680,7 +679,7 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
|
|||||||
.htmleditorfield-mediaform .htmleditorfield-from-cms .ss-uploadfield h4 { float: left; margin-top: 4px; margin-bottom: 0; }
|
.htmleditorfield-mediaform .htmleditorfield-from-cms .ss-uploadfield h4 { float: left; margin-top: 4px; margin-bottom: 0; }
|
||||||
.htmleditorfield-mediaform .htmleditorfield-from-cms .ss-uploadfield .middleColumn { margin-top: 16px; margin-left: 184px; }
|
.htmleditorfield-mediaform .htmleditorfield-from-cms .ss-uploadfield .middleColumn { margin-top: 16px; margin-left: 184px; }
|
||||||
.htmleditorfield-mediaform .htmleditorfield-from-cms .ss-uploadfield .field.treedropdown { border-bottom: 0; padding: 0; }
|
.htmleditorfield-mediaform .htmleditorfield-from-cms .ss-uploadfield .field.treedropdown { border-bottom: 0; padding: 0; }
|
||||||
.htmleditorfield-mediaform .ss-assetuploadfield .ss-uploadfield-editandorganize .ss-uploadfield-files .ss-uploadfield-item-info { background-color: #9e9e9e; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllOWU5ZSIvPjxzdG9wIG9mZnNldD0iOCUiIHN0b3AtY29sb3I9IiM5ZDlkOWQiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzg3ODc4NyIvPjxzdG9wIG9mZnNldD0iNTQlIiBzdG9wLWNvbG9yPSIjODY4Njg2Ii8+PHN0b3Agb2Zmc2V0PSI5NiUiIHN0b3AtY29sb3I9IiM2YjZiNmIiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2YzZjNmMiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #9e9e9e), color-stop(8%, #9d9d9d), color-stop(50%, #878787), color-stop(54%, #868686), color-stop(96%, #6b6b6b), color-stop(100%, #6c6c6c)); background-image: -webkit-linear-gradient(top, #9e9e9e 0%, #9d9d9d 8%, #878787 50%, #868686 54%, #6b6b6b 96%, #6c6c6c 100%); background-image: -moz-linear-gradient(top, #9e9e9e 0%, #9d9d9d 8%, #878787 50%, #868686 54%, #6b6b6b 96%, #6c6c6c 100%); background-image: -o-linear-gradient(top, #9e9e9e 0%, #9d9d9d 8%, #878787 50%, #868686 54%, #6b6b6b 96%, #6c6c6c 100%); background-image: linear-gradient(top, #9e9e9e 0%, #9d9d9d 8%, #878787 50%, #868686 54%, #6b6b6b 96%, #6c6c6c 100%); }
|
.htmleditorfield-mediaform .ss-assetuploadfield .ss-uploadfield-editandorganize .ss-uploadfield-files .ss-uploadfield-item-info { background-color: #9e9e9e; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzllOWU5ZSIvPjxzdG9wIG9mZnNldD0iOCUiIHN0b3AtY29sb3I9IiM5ZDlkOWQiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzg3ODc4NyIvPjxzdG9wIG9mZnNldD0iNTQlIiBzdG9wLWNvbG9yPSIjODY4Njg2Ii8+PHN0b3Agb2Zmc2V0PSI5NiUiIHN0b3AtY29sb3I9IiM2YjZiNmIiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM2YzZjNmMiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #9e9e9e), color-stop(8%, #9d9d9d), color-stop(50%, #878787), color-stop(54%, #868686), color-stop(96%, #6b6b6b), color-stop(100%, #6c6c6c)); background-image: -moz-linear-gradient(top, #9e9e9e 0%, #9d9d9d 8%, #878787 50%, #868686 54%, #6b6b6b 96%, #6c6c6c 100%); background-image: -webkit-linear-gradient(top, #9e9e9e 0%, #9d9d9d 8%, #878787 50%, #868686 54%, #6b6b6b 96%, #6c6c6c 100%); background-image: linear-gradient(to bottom, #9e9e9e 0%, #9d9d9d 8%, #878787 50%, #868686 54%, #6b6b6b 96%, #6c6c6c 100%); }
|
||||||
|
|
||||||
/** -------------------------------------------- Search forms (used in AssetAdmin, ModelAdmin, etc) -------------------------------------------- */
|
/** -------------------------------------------- Search forms (used in AssetAdmin, ModelAdmin, etc) -------------------------------------------- */
|
||||||
.cms-search-form { margin-bottom: 16px; }
|
.cms-search-form { margin-bottom: 16px; }
|
||||||
@ -690,11 +689,11 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
|
|||||||
/** -------------------------------------------- Step labels -------------------------------------------- */
|
/** -------------------------------------------- Step labels -------------------------------------------- */
|
||||||
.step-label > * { display: inline-block; vertical-align: top; }
|
.step-label > * { display: inline-block; vertical-align: top; }
|
||||||
.step-label .flyout { height: 18px; font-size: 14px; font-weight: bold; -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px; -moz-border-radius-bottomleft: 3px; -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; background-color: #667980; padding: 4px 3px 4px 6px; text-align: center; text-shadow: none; color: #fff; }
|
.step-label .flyout { height: 18px; font-size: 14px; font-weight: bold; -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px; -moz-border-radius-bottomleft: 3px; -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; background-color: #667980; padding: 4px 3px 4px 6px; text-align: center; text-shadow: none; color: #fff; }
|
||||||
.step-label .arrow { height: 26px; width: 10px; background: url('../images/sprites-32x32-s10286f549b.png') 0 -296px no-repeat; margin-right: 4px; }
|
.step-label .arrow { height: 26px; width: 10px; background: url('../images/sprites-32x32-s871d283813.png') 0 -862px no-repeat; margin-right: 4px; }
|
||||||
.step-label .title { height: 18px; padding: 4px; }
|
.step-label .title { height: 18px; padding: 4px; }
|
||||||
|
|
||||||
/** -------------------------------------------- Item Edit Form -------------------------------------------- */
|
/** -------------------------------------------- Item Edit Form -------------------------------------------- */
|
||||||
.cms-file-info { overflow: auto; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin-bottom: 8px; }
|
.cms-file-info { overflow: auto; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin-bottom: 8px; }
|
||||||
.cms-file-info .cms-file-info-preview { float: left; width: 176px; margin-right: 8px; }
|
.cms-file-info .cms-file-info-preview { float: left; width: 176px; margin-right: 8px; }
|
||||||
.cms-file-info .cms-file-info-preview img { max-width: 176px; max-height: 128px; }
|
.cms-file-info .cms-file-info-preview img { max-width: 176px; max-height: 128px; }
|
||||||
.cms-file-info .cms-file-info-data { float: left; }
|
.cms-file-info .cms-file-info-data { float: left; }
|
||||||
@ -737,10 +736,10 @@ form.import-form label.left { width: 250px; }
|
|||||||
/** -------------------------------------------- Buttons for FileUpload -------------------------------------------- */
|
/** -------------------------------------------- Buttons for FileUpload -------------------------------------------- */
|
||||||
.ss-uploadfield-item-edit-all .ui-button-text { padding-right: 0; }
|
.ss-uploadfield-item-edit-all .ui-button-text { padding-right: 0; }
|
||||||
|
|
||||||
.toggle-details-icon { background: url('../images/sprites-32x32-s10286f549b.png') 0 -406px no-repeat; }
|
.toggle-details-icon { background: url('../images/sprites-32x32-s871d283813.png') 0 -830px no-repeat; }
|
||||||
.ss-uploadfield-item-edit-all .toggle-details-icon { background: url('../images/sprites-32x32-s10286f549b.png') 0 -348px no-repeat; display: inline-block; width: 8px; height: 8px; padding-left: 5px; }
|
.ss-uploadfield-item-edit-all .toggle-details-icon { background: url('../images/sprites-32x32-s871d283813.png') 0 -798px no-repeat; display: inline-block; width: 8px; height: 8px; padding-left: 5px; }
|
||||||
.toggle-details-icon.opened { background: url('../images/sprites-32x32-s10286f549b.png') 0 -1120px no-repeat; }
|
.toggle-details-icon.opened { background: url('../images/sprites-32x32-s871d283813.png') 0 -846px no-repeat; }
|
||||||
.ss-uploadfield-item-edit-all .toggle-details-icon.opened { background: url('../images/sprites-32x32-s10286f549b.png') 0 -332px no-repeat; }
|
.ss-uploadfield-item-edit-all .toggle-details-icon.opened { background: url('../images/sprites-32x32-s871d283813.png') 0 -814px no-repeat; }
|
||||||
|
|
||||||
/** -------------------------------------------- Hide preview toggle link by default. May be shown in IE7 stylesheet and forced to show with js if needed -------------------------------------------- */
|
/** -------------------------------------------- Hide preview toggle link by default. May be shown in IE7 stylesheet and forced to show with js if needed -------------------------------------------- */
|
||||||
.cms .Actions > .cms-preview-toggle-link, .cms .cms-navigator > .cms-preview-toggle-link { display: none; }
|
.cms .Actions > .cms-preview-toggle-link, .cms .cms-navigator > .cms-preview-toggle-link { display: none; }
|
||||||
@ -785,7 +784,7 @@ form.import-form label.left { width: 250px; }
|
|||||||
.cms .jstree-themeroller .jstree-no-icon, .TreeDropdownField .treedropdownfield-panel .jstree-themeroller .jstree-no-icon { display: none; }
|
.cms .jstree-themeroller .jstree-no-icon, .TreeDropdownField .treedropdownfield-panel .jstree-themeroller .jstree-no-icon { display: none; }
|
||||||
.cms #jstree-marker, .TreeDropdownField .treedropdownfield-panel #jstree-marker { padding: 0; margin: 0; overflow: hidden; position: absolute; top: -30px; background-repeat: no-repeat; display: none; line-height: 10px; font-size: 12px; height: 12px; width: 8px; z-index: 10001; background-color: transparent; text-shadow: 1px 1px 1px white; color: black; }
|
.cms #jstree-marker, .TreeDropdownField .treedropdownfield-panel #jstree-marker { padding: 0; margin: 0; overflow: hidden; position: absolute; top: -30px; background-repeat: no-repeat; display: none; line-height: 10px; font-size: 12px; height: 12px; width: 8px; z-index: 10001; background-color: transparent; text-shadow: 1px 1px 1px white; color: black; }
|
||||||
.cms #jstree-marker-line, .TreeDropdownField .treedropdownfield-panel #jstree-marker-line { padding: 0; margin: 0; overflow: hidden; position: absolute; top: -30px; background-repeat: no-repeat; display: none; line-height: 0%; font-size: 1px; height: 1px; width: 100px; z-index: 10000; background-color: #456c43; cursor: pointer; border: 1px solid #eeeeee; border-left: 0; -moz-box-shadow: 0px 0px 2px #666; -webkit-box-shadow: 0px 0px 2px #666; box-shadow: 0px 0px 2px #666; -moz-border-radius: 1px; border-radius: 1px; -webkit-border-radius: 1px; }
|
.cms #jstree-marker-line, .TreeDropdownField .treedropdownfield-panel #jstree-marker-line { padding: 0; margin: 0; overflow: hidden; position: absolute; top: -30px; background-repeat: no-repeat; display: none; line-height: 0%; font-size: 1px; height: 1px; width: 100px; z-index: 10000; background-color: #456c43; cursor: pointer; border: 1px solid #eeeeee; border-left: 0; -moz-box-shadow: 0px 0px 2px #666; -webkit-box-shadow: 0px 0px 2px #666; box-shadow: 0px 0px 2px #666; -moz-border-radius: 1px; border-radius: 1px; -webkit-border-radius: 1px; }
|
||||||
.cms #vakata-contextmenu, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu { display: block; visibility: hidden; left: 0; top: -200px; position: absolute; margin: 0; padding: 0; min-width: 180px; background: #FFF; border: 1px solid silver; z-index: 10000; *width: 180px; -webkit-box-shadow: 0 0 10px #cccccc; -moz-box-shadow: 0 0 10px #cccccc; box-shadow: 0 0 10px #cccccc; }
|
.cms #vakata-contextmenu, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu { display: block; visibility: hidden; left: 0; top: -200px; position: absolute; margin: 0; padding: 0; min-width: 180px; background: #FFF; border: 1px solid silver; z-index: 10000; *width: 180px; -moz-box-shadow: 0 0 10px #CCC; -webkit-box-shadow: 0 0 10px #CCC; box-shadow: 0 0 10px #CCC; }
|
||||||
.cms #vakata-contextmenu::before, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu::before { content: ""; display: block; /* reduce the damage in FF3.0 */ position: absolute; top: -10px; left: 24px; width: 0; border-width: 0 6px 10px 6px; border-color: #FFF transparent; border-style: solid; z-index: 10000; }
|
.cms #vakata-contextmenu::before, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu::before { content: ""; display: block; /* reduce the damage in FF3.0 */ position: absolute; top: -10px; left: 24px; width: 0; border-width: 0 6px 10px 6px; border-color: #FFF transparent; border-style: solid; z-index: 10000; }
|
||||||
.cms #vakata-contextmenu::after, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu::after { content: ""; display: block; /* reduce the damage in FF3.0 */ position: absolute; top: -11px; left: 23px; width: 0; border-width: 0 7px 11px 7px; border-color: #CCC transparent; border-style: solid; }
|
.cms #vakata-contextmenu::after, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu::after { content: ""; display: block; /* reduce the damage in FF3.0 */ position: absolute; top: -11px; left: 23px; width: 0; border-width: 0 7px 11px 7px; border-color: #CCC transparent; border-style: solid; }
|
||||||
.cms #vakata-contextmenu ul, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu ul { min-width: 180px; *width: 180px; }
|
.cms #vakata-contextmenu ul, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu ul { min-width: 180px; *width: 180px; }
|
||||||
@ -793,13 +792,13 @@ form.import-form label.left { width: 250px; }
|
|||||||
.cms #vakata-contextmenu li, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li { line-height: 20px; min-height: 23px; position: relative; padding: 0px; }
|
.cms #vakata-contextmenu li, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li { line-height: 20px; min-height: 23px; position: relative; padding: 0px; }
|
||||||
.cms #vakata-contextmenu li:last-child, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li:last-child { margin-bottom: 1px; }
|
.cms #vakata-contextmenu li:last-child, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li:last-child { margin-bottom: 1px; }
|
||||||
.cms #vakata-contextmenu li a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li a { padding: 1px 10px; line-height: 23px; display: block; text-decoration: none; margin: 1px 1px 0 1px; border: 0; }
|
.cms #vakata-contextmenu li a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li a { padding: 1px 10px; line-height: 23px; display: block; text-decoration: none; margin: 1px 1px 0 1px; border: 0; }
|
||||||
.cms #vakata-contextmenu li a:hover, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li a:hover { padding: 1px 10px; background: #3875d7; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIyMCUiIHN0b3AtY29sb3I9IiMzODc1ZDciLz48c3RvcCBvZmZzZXQ9IjkwJSIgc3RvcC1jb2xvcj0iIzJhNjJiYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc)); background-image: -webkit-linear-gradient(top, #3875d7 20%, #2a62bc 90%); background-image: -moz-linear-gradient(top, #3875d7 20%, #2a62bc 90%); background-image: -o-linear-gradient(top, #3875d7 20%, #2a62bc 90%); background-image: linear-gradient(top, #3875d7 20%, #2a62bc 90%); color: #FFF; border: none; }
|
.cms #vakata-contextmenu li a:hover, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li a:hover { padding: 1px 10px; background: #3875d7; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIyMCUiIHN0b3AtY29sb3I9IiMzODc1ZDciLz48c3RvcCBvZmZzZXQ9IjkwJSIgc3RvcC1jb2xvcj0iIzJhNjJiYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc)); background-image: -moz-linear-gradient(top, #3875d7 20%, #2a62bc 90%); background-image: -webkit-linear-gradient(top, #3875d7 20%, #2a62bc 90%); background-image: linear-gradient(to bottom, #3875d7 20%, #2a62bc 90%); color: #FFF; border: none; }
|
||||||
.cms #vakata-contextmenu li ins, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ins { float: left; width: 0; height: 0; text-decoration: none; margin-right: 2px; }
|
.cms #vakata-contextmenu li ins, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ins { float: left; width: 0; height: 0; text-decoration: none; margin-right: 2px; }
|
||||||
.cms #vakata-contextmenu li .jstree-pageicon, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li .jstree-pageicon { margin-top: 3px; margin-right: 5px; }
|
.cms #vakata-contextmenu li .jstree-pageicon, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li .jstree-pageicon { margin-top: 3px; margin-right: 5px; }
|
||||||
.cms #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-hover > a { padding: 1px 10px; background: #3875d7; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIyMCUiIHN0b3AtY29sb3I9IiMzODc1ZDciLz48c3RvcCBvZmZzZXQ9IjkwJSIgc3RvcC1jb2xvcj0iIzJhNjJiYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc)); background-image: -webkit-linear-gradient(top, #3875d7 20%, #2a62bc 90%); background-image: -moz-linear-gradient(top, #3875d7 20%, #2a62bc 90%); background-image: -o-linear-gradient(top, #3875d7 20%, #2a62bc 90%); background-image: linear-gradient(top, #3875d7 20%, #2a62bc 90%); color: #FFF; border: none; }
|
.cms #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-hover > a { padding: 1px 10px; background: #3875d7; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIyMCUiIHN0b3AtY29sb3I9IiMzODc1ZDciLz48c3RvcCBvZmZzZXQ9IjkwJSIgc3RvcC1jb2xvcj0iIzJhNjJiYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc)); background-image: -moz-linear-gradient(top, #3875d7 20%, #2a62bc 90%); background-image: -webkit-linear-gradient(top, #3875d7 20%, #2a62bc 90%); background-image: linear-gradient(to bottom, #3875d7 20%, #2a62bc 90%); color: #FFF; border: none; }
|
||||||
.cms #vakata-contextmenu .right, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .right { right: 100%; left: auto; }
|
.cms #vakata-contextmenu .right, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .right { right: 100%; left: auto; }
|
||||||
.cms #vakata-contextmenu .bottom, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .bottom { bottom: -1px; top: auto; }
|
.cms #vakata-contextmenu .bottom, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .bottom { bottom: -1px; top: auto; }
|
||||||
.cms #vakata-contextmenu li ul, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul { display: none; position: absolute; top: -2px; left: 100%; background: #FFF; border: 1px solid silver; -webkit-box-shadow: 0 0 10px #cccccc; -moz-box-shadow: 0 0 10px #cccccc; box-shadow: 0 0 10px #cccccc; }
|
.cms #vakata-contextmenu li ul, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul { display: none; position: absolute; top: -2px; left: 100%; background: #FFF; border: 1px solid silver; -moz-box-shadow: 0 0 10px #CCC; -webkit-box-shadow: 0 0 10px #CCC; box-shadow: 0 0 10px #CCC; }
|
||||||
.cms #vakata-contextmenu li ul.col-2, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul.col-2 { width: 360px; }
|
.cms #vakata-contextmenu li ul.col-2, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul.col-2 { width: 360px; }
|
||||||
.cms #vakata-contextmenu li ul.col-2 li, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul.col-2 li { width: 50%; }
|
.cms #vakata-contextmenu li ul.col-2 li, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul.col-2 li { width: 50%; }
|
||||||
.cms #vakata-contextmenu li ul.col-3, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul.col-3 { width: 540px; }
|
.cms #vakata-contextmenu li ul.col-3, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul.col-3 { width: 540px; }
|
||||||
@ -822,16 +821,16 @@ form.import-form label.left { width: 250px; }
|
|||||||
.tree-holder.jstree-apple li.status-deletedonlive .text, .cms-tree.jstree-apple li.status-deletedonlive .text { text-decoration: line-through; }
|
.tree-holder.jstree-apple li.status-deletedonlive .text, .cms-tree.jstree-apple li.status-deletedonlive .text { text-decoration: line-through; }
|
||||||
.tree-holder.jstree-apple li.jstree-checked > a, .tree-holder.jstree-apple li.jstree-checked > a:link, .cms-tree.jstree-apple li.jstree-checked > a, .cms-tree.jstree-apple li.jstree-checked > a:link { background-color: #efe999; }
|
.tree-holder.jstree-apple li.jstree-checked > a, .tree-holder.jstree-apple li.jstree-checked > a:link, .cms-tree.jstree-apple li.jstree-checked > a, .cms-tree.jstree-apple li.jstree-checked > a:link { background-color: #efe999; }
|
||||||
.tree-holder.jstree-apple li.disabled > a > .jstree-checkbox, .cms-tree.jstree-apple li.disabled > a > .jstree-checkbox { background-position: -57px -54px; }
|
.tree-holder.jstree-apple li.disabled > a > .jstree-checkbox, .cms-tree.jstree-apple li.disabled > a > .jstree-checkbox { background-position: -57px -54px; }
|
||||||
.tree-holder.jstree-apple li.readonly, .cms-tree.jstree-apple li.readonly { color: #aaaaaa; padding-left: 18px; }
|
.tree-holder.jstree-apple li.readonly, .cms-tree.jstree-apple li.readonly { color: #aaa; padding-left: 18px; }
|
||||||
.tree-holder.jstree-apple li.readonly a, .tree-holder.jstree-apple li.readonly a:link, .cms-tree.jstree-apple li.readonly a, .cms-tree.jstree-apple li.readonly a:link { margin: 0; padding: 0; }
|
.tree-holder.jstree-apple li.readonly a, .tree-holder.jstree-apple li.readonly a:link, .cms-tree.jstree-apple li.readonly a, .cms-tree.jstree-apple li.readonly a:link { margin: 0; padding: 0; }
|
||||||
.tree-holder.jstree-apple li.readonly .jstree-icon, .cms-tree.jstree-apple li.readonly .jstree-icon { display: none; }
|
.tree-holder.jstree-apple li.readonly .jstree-icon, .cms-tree.jstree-apple li.readonly .jstree-icon { display: none; }
|
||||||
.tree-holder.jstree-apple a, .tree-holder.jstree-apple a:link, .cms-tree.jstree-apple a, .cms-tree.jstree-apple a:link { color: #0073c1; padding: 3px 6px 3px 3px; border: none; display: inline-block; margin-right: 5px; }
|
.tree-holder.jstree-apple a, .tree-holder.jstree-apple a:link, .cms-tree.jstree-apple a, .cms-tree.jstree-apple a:link { color: #0073C1; padding: 3px 6px 3px 3px; border: none; display: inline-block; margin-right: 5px; }
|
||||||
.tree-holder.jstree-apple ins, .cms-tree.jstree-apple ins { background-color: transparent; background-image: url(../images/sitetree_ss_default_icons.png); }
|
.tree-holder.jstree-apple ins, .cms-tree.jstree-apple ins { background-color: transparent; background-image: url(../images/sitetree_ss_default_icons.png); }
|
||||||
.tree-holder.jstree-apple span.badge, .cms-tree.jstree-apple span.badge { clear: both; text-transform: uppercase; display: inline-block; padding: 0px 3px; font-size: 0.75em; line-height: 1em; margin-left: 3px; margin-right: 6px; margin-top: -1px; -webkit-border-radius: 2px 2px; -moz-border-radius: 2px / 2px; border-radius: 2px / 2px; }
|
.tree-holder.jstree-apple span.badge, .cms-tree.jstree-apple span.badge { clear: both; text-transform: uppercase; display: inline-block; padding: 0px 3px; font-size: 0.75em; line-height: 1em; margin-left: 3px; margin-right: 6px; margin-top: -1px; -moz-border-radius: 2px / 2px; -webkit-border-radius: 2px 2px; border-radius: 2px / 2px; }
|
||||||
.tree-holder.jstree-apple span.badge.status-modified, .tree-holder.jstree-apple span.badge.status-addedtodraft, .cms-tree.jstree-apple span.badge.status-modified, .cms-tree.jstree-apple span.badge.status-addedtodraft { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
|
.tree-holder.jstree-apple span.badge.status-modified, .tree-holder.jstree-apple span.badge.status-addedtodraft, .cms-tree.jstree-apple span.badge.status-modified, .cms-tree.jstree-apple span.badge.status-addedtodraft { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
|
||||||
.tree-holder.jstree-apple span.badge.status-deletedonlive, .tree-holder.jstree-apple span.badge.status-removedfromdraft, .cms-tree.jstree-apple span.badge.status-deletedonlive, .cms-tree.jstree-apple span.badge.status-removedfromdraft { color: #636363; border: 1px solid #E49393; background-color: #F2DADB; }
|
.tree-holder.jstree-apple span.badge.status-deletedonlive, .tree-holder.jstree-apple span.badge.status-removedfromdraft, .cms-tree.jstree-apple span.badge.status-deletedonlive, .cms-tree.jstree-apple span.badge.status-removedfromdraft { color: #636363; border: 1px solid #E49393; background-color: #F2DADB; }
|
||||||
.tree-holder.jstree-apple span.badge.status-workflow-approval, .cms-tree.jstree-apple span.badge.status-workflow-approval { color: #56660C; border: 1px solid #7C8816; background-color: #DAE79A; }
|
.tree-holder.jstree-apple span.badge.status-workflow-approval, .cms-tree.jstree-apple span.badge.status-workflow-approval { color: #56660C; border: 1px solid #7C8816; background-color: #DAE79A; }
|
||||||
.tree-holder.jstree-apple span.comment-count, .cms-tree.jstree-apple 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; -webkit-border-radius: 2px 2px; -moz-border-radius: 2px / 2px; border-radius: 2px / 2px; color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
|
.tree-holder.jstree-apple span.comment-count, .cms-tree.jstree-apple 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; }
|
||||||
.tree-holder.jstree-apple span.comment-count:before, .cms-tree.jstree-apple span.comment-count:before { content: ""; position: absolute; border-style: solid; display: block; width: 0; bottom: -4px; /* value = - border-top-width - border-bottom-width */ left: 3px; /* controls horizontal position */ border-width: 4px 4px 0; border-color: #C9B800 transparent; }
|
.tree-holder.jstree-apple span.comment-count:before, .cms-tree.jstree-apple span.comment-count:before { content: ""; position: absolute; border-style: solid; display: block; width: 0; bottom: -4px; /* value = - border-top-width - border-bottom-width */ left: 3px; /* controls horizontal position */ border-width: 4px 4px 0; border-color: #C9B800 transparent; }
|
||||||
.tree-holder.jstree-apple span.comment-count:after, .cms-tree.jstree-apple span.comment-count:after { content: ""; position: absolute; border-style: solid; /* reduce the damage in FF3.0 */ display: block; width: 0; bottom: -3px; /* value = - border-top-width - border-bottom-width */ left: 4px; /* value = (:before left) + (:before border-left) - (:after border-left) */ border-width: 3px 3px 0; border-color: #FFF0BC transparent; }
|
.tree-holder.jstree-apple span.comment-count:after, .cms-tree.jstree-apple span.comment-count:after { content: ""; position: absolute; border-style: solid; /* reduce the damage in FF3.0 */ display: block; width: 0; bottom: -3px; /* value = - border-top-width - border-bottom-width */ left: 4px; /* value = (:before left) + (:before border-left) - (:after border-left) */ border-width: 3px 3px 0; border-color: #FFF0BC transparent; }
|
||||||
.tree-holder.jstree-apple .jstree-hovered, .cms-tree.jstree-apple .jstree-hovered { text-shadow: none; text-decoration: none; }
|
.tree-holder.jstree-apple .jstree-hovered, .cms-tree.jstree-apple .jstree-hovered { text-shadow: none; text-decoration: none; }
|
||||||
@ -853,9 +852,9 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
|
|||||||
.cms-tree a.jstree-loading .jstree-pageicon { background: url(../images/throbber.gif) top left no-repeat; }
|
.cms-tree a.jstree-loading .jstree-pageicon { background: url(../images/throbber.gif) top left no-repeat; }
|
||||||
|
|
||||||
/** Styles for the left hand side menu and header for the admin panels. Take into consideration CSS selector performance. @package framework @subpackage admin */
|
/** Styles for the left hand side menu and header for the admin panels. Take into consideration CSS selector performance. @package framework @subpackage admin */
|
||||||
.cms-logo-header { position: relative !important; top: auto !important; height: auto !important; padding: 0 8px; line-height: 24px; background-color: #22385b; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzMwNGU4MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzE0MjEzNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #304e80), color-stop(100%, #142136)); background-image: -webkit-linear-gradient(#304e80, #142136); background-image: -moz-linear-gradient(#304e80, #142136); background-image: -o-linear-gradient(#304e80, #142136); background-image: linear-gradient(#304e80, #142136); }
|
.cms-logo-header { position: relative !important; top: auto !important; height: auto !important; padding: 0 8px; line-height: 24px; background-color: #22385b; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzMwNGU4MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzE0MjEzNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #304e80), color-stop(100%, #142136)); background-image: -moz-linear-gradient(#304e80, #142136); background-image: -webkit-linear-gradient(#304e80, #142136); background-image: linear-gradient(#304e80, #142136); }
|
||||||
.cms-logo-header span { color: white; display: block; padding-left: 26px; }
|
.cms-logo-header span { color: white; display: block; padding-left: 26px; }
|
||||||
.cms-logo-header span a { color: #3ebae0; display: inline; }
|
.cms-logo-header span a { color: #3EBAE0; display: inline; }
|
||||||
|
|
||||||
.cms-logo { border-bottom: 1px solid #1a2a45; overflow: hidden; padding: 10px 0 9px; /* should come to 40px with border bottom and line-height */ position: relative; vertical-align: middle; font-size: 12px; min-height: 20px; }
|
.cms-logo { border-bottom: 1px solid #1a2a45; overflow: hidden; padding: 10px 0 9px; /* should come to 40px with border bottom and line-height */ position: relative; vertical-align: middle; font-size: 12px; min-height: 20px; }
|
||||||
.collapsed .cms-logo { padding: 0; }
|
.collapsed .cms-logo { padding: 0; }
|
||||||
@ -864,10 +863,10 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
|
|||||||
.cms-logo span { font-weight: bold; font-size: 12px; line-height: 16px; padding: 2px 0; margin-left: 30px; }
|
.cms-logo span { font-weight: bold; font-size: 12px; line-height: 16px; padding: 2px 0; margin-left: 30px; }
|
||||||
|
|
||||||
.cms-login-status { border-top: 1px solid #19435c; padding: 8px 0 9.6px; line-height: 16px; font-size: 11px; }
|
.cms-login-status { border-top: 1px solid #19435c; padding: 8px 0 9.6px; line-height: 16px; font-size: 11px; }
|
||||||
.cms-login-status .logout-link { display: inline-block; height: 16px; width: 16px; float: left; margin: 0 8px 0 5px; background: url('../images/sprites-32x32-s10286f549b.png') 0 -1094px no-repeat; text-indent: -9999em; opacity: 0.9; }
|
.cms-login-status .logout-link { display: inline-block; height: 16px; width: 16px; float: left; margin: 0 8px 0 5px; background: url('../images/sprites-32x32-s871d283813.png') 0 -772px no-repeat; text-indent: -9999em; opacity: 0.9; }
|
||||||
.cms-login-status .logout-link:hover, .cms-login-status .logout-link:focus { opacity: 1; }
|
.cms-login-status .logout-link:hover, .cms-login-status .logout-link:focus { opacity: 1; }
|
||||||
|
|
||||||
.cms-menu { z-index: 80; background: #b0bec7; width: 160px; -webkit-box-shadow: rgba(0, 0, 0, 0.9) 0 0 3px; -moz-box-shadow: rgba(0, 0, 0, 0.9) 0 0 3px; box-shadow: rgba(0, 0, 0, 0.9) 0 0 3px; }
|
.cms-menu { z-index: 80; background: #b0bec7; width: 160px; -moz-box-shadow: rgba(0, 0, 0, 0.9) 0 0 3px; -webkit-box-shadow: rgba(0, 0, 0, 0.9) 0 0 3px; box-shadow: rgba(0, 0, 0, 0.9) 0 0 3px; }
|
||||||
.cms-menu a { text-decoration: none; }
|
.cms-menu a { text-decoration: none; }
|
||||||
.cms-menu .cms-panel-content { width: 160px; overflow-x: hidden; overflow-y: auto; position: relative !important; top: auto !important; left: auto !important; }
|
.cms-menu .cms-panel-content { width: 160px; overflow-x: hidden; overflow-y: auto; position: relative !important; top: auto !important; left: auto !important; }
|
||||||
.cms-menu.collapsed { width: 40px; cursor: auto; z-index: 1000; }
|
.cms-menu.collapsed { width: 40px; cursor: auto; z-index: 1000; }
|
||||||
@ -883,18 +882,18 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
|
|||||||
.cms-menu.collapsed.cms-panel .cms-panel-content { display: block; }
|
.cms-menu.collapsed.cms-panel .cms-panel-content { display: block; }
|
||||||
|
|
||||||
.cms-menu-list li { /* Style applied to the menu flyout only when the collapsed setting */ }
|
.cms-menu-list li { /* Style applied to the menu flyout only when the collapsed setting */ }
|
||||||
.cms-menu-list li a { display: block; line-height: 16px; min-height: 16px; font-size: 12px; text-shadow: #bfcad2 1px 1px 0; color: #1f1f1f; padding: 11px 5px 11px 8px; background-color: #b0bec7; cursor: pointer; position: relative; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzkyYTViMiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #92a5b2)); background-image: -webkit-linear-gradient(#b0bec7, #92a5b2); background-image: -moz-linear-gradient(#b0bec7, #92a5b2); background-image: -o-linear-gradient(#b0bec7, #92a5b2); background-image: linear-gradient(#b0bec7, #92a5b2); border-top: 1px solid #c2cdd4; border-bottom: 1px solid #748d9d; }
|
.cms-menu-list li a { display: block; line-height: 16px; min-height: 16px; font-size: 12px; text-shadow: #bfcad2 1px 1px 0; color: #1f1f1f; padding: 11px 5px 11px 8px; background-color: #b0bec7; cursor: pointer; position: relative; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzkyYTViMiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #92a5b2)); background-image: -moz-linear-gradient(#b0bec7, #92a5b2); background-image: -webkit-linear-gradient(#b0bec7, #92a5b2); background-image: linear-gradient(#b0bec7, #92a5b2); border-top: 1px solid #c2cdd4; border-bottom: 1px solid #748d9d; }
|
||||||
.cms-menu-list li a:hover { text-decoration: none; background-color: #b6c3cb; border-bottom: 1px solid #8399a7; color: #2c2c2c; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2JmY2FkMiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bfcad2), color-stop(100%, #b0bec7)); background-image: -webkit-linear-gradient(#bfcad2, #b0bec7); background-image: -moz-linear-gradient(#bfcad2, #b0bec7); background-image: -o-linear-gradient(#bfcad2, #b0bec7); background-image: linear-gradient(#bfcad2, #b0bec7); }
|
.cms-menu-list li a:hover { text-decoration: none; background-color: #b6c3cb; border-bottom: 1px solid #8399a7; color: #2c2c2c; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2JmY2FkMiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bfcad2), color-stop(100%, #b0bec7)); background-image: -moz-linear-gradient(#bfcad2, #b0bec7); background-image: -webkit-linear-gradient(#bfcad2, #b0bec7); background-image: linear-gradient(#bfcad2, #b0bec7); }
|
||||||
.cms-menu-list li a:focus, .cms-menu-list li a:active { border-top: 1px solid #a1b2bc; text-decoration: none; background-color: #a1b2bc; color: #393939; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzkyYTViMiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ExYjJiYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #92a5b2), color-stop(100%, #a1b2bc)); background-image: -webkit-linear-gradient(#92a5b2, #a1b2bc); background-image: -moz-linear-gradient(#92a5b2, #a1b2bc); background-image: -o-linear-gradient(#92a5b2, #a1b2bc); background-image: linear-gradient(#92a5b2, #a1b2bc); }
|
.cms-menu-list li a:focus, .cms-menu-list li a:active { border-top: 1px solid #a1b2bc; text-decoration: none; background-color: #a1b2bc; color: #393939; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzkyYTViMiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ExYjJiYyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #92a5b2), color-stop(100%, #a1b2bc)); background-image: -moz-linear-gradient(#92a5b2, #a1b2bc); background-image: -webkit-linear-gradient(#92a5b2, #a1b2bc); background-image: linear-gradient(#92a5b2, #a1b2bc); }
|
||||||
.cms-menu-list li a .icon { display: block; position: absolute; top: 50%; margin-left: 4px; margin-top: -8px; filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70); opacity: 0.7; }
|
.cms-menu-list li a .icon { display: block; position: absolute; top: 50%; margin-left: 4px; margin-top: -8px; filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70); opacity: 0.7; }
|
||||||
.cms-menu-list li a .text { display: block; margin-left: 30px; }
|
.cms-menu-list li a .text { display: block; margin-left: 30px; }
|
||||||
.cms-menu-list li a .toggle-children { display: inline-block; float: right; width: 20px; height: 100%; cursor: pointer; }
|
.cms-menu-list li a .toggle-children { display: inline-block; float: right; width: 20px; height: 100%; cursor: pointer; }
|
||||||
.cms-menu-list li a .toggle-children .toggle-children-icon { display: inline-block; width: 8px; height: 8px; background: url('../images/sprites-32x32-s10286f549b.png') 0 -348px no-repeat; vertical-align: middle; }
|
.cms-menu-list li a .toggle-children .toggle-children-icon { display: inline-block; width: 8px; height: 8px; background: url('../images/sprites-32x32-s871d283813.png') 0 -798px no-repeat; vertical-align: middle; }
|
||||||
.cms-menu-list li a .toggle-children.opened .toggle-children-icon { background: url('../images/sprites-32x32-s10286f549b.png') 0 -332px no-repeat; }
|
.cms-menu-list li a .toggle-children.opened .toggle-children-icon { background: url('../images/sprites-32x32-s871d283813.png') 0 -814px no-repeat; }
|
||||||
.cms-menu-list li ul li a { border-top: 1px solid #b6c3cb; }
|
.cms-menu-list li ul li a { border-top: 1px solid #b6c3cb; }
|
||||||
.cms-menu-list li.current a { color: white; text-shadow: #1e5270 0 -1px 0; border-top: 1px solid #55a4d2; border-bottom: 1px solid #236184; background-color: #338dc1; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzMzOGRjMSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzI4NzA5OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #338dc1), color-stop(100%, #287099)); background-image: -webkit-linear-gradient(#338dc1, #287099); background-image: -moz-linear-gradient(#338dc1, #287099); background-image: -o-linear-gradient(#338dc1, #287099); background-image: linear-gradient(#338dc1, #287099); }
|
.cms-menu-list li.current a { color: white; text-shadow: #1e5270 0 -1px 0; border-top: 1px solid #55a4d2; border-bottom: 1px solid #236184; background-color: #338DC1; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzMzOGRjMSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzI4NzA5OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #338dc1), color-stop(100%, #287099)); background-image: -moz-linear-gradient(#338dc1, #287099); background-image: -webkit-linear-gradient(#338dc1, #287099); background-image: linear-gradient(#338dc1, #287099); }
|
||||||
.cms-menu-list li.current a .toggle-children .toggle-children-icon { background: url('../images/sprites-32x32-s10286f549b.png') 0 -406px no-repeat; }
|
.cms-menu-list li.current a .toggle-children .toggle-children-icon { background: url('../images/sprites-32x32-s871d283813.png') 0 -830px no-repeat; }
|
||||||
.cms-menu-list li.current a .toggle-children.opened .toggle-children-icon { background: url('../images/sprites-32x32-s10286f549b.png') 0 -1120px no-repeat; }
|
.cms-menu-list li.current a .toggle-children.opened .toggle-children-icon { background: url('../images/sprites-32x32-s871d283813.png') 0 -846px no-repeat; }
|
||||||
.cms-menu-list li.current ul { border-top: none; display: block; }
|
.cms-menu-list li.current ul { border-top: none; display: block; }
|
||||||
.cms-menu-list li.current li { background-color: #287099; }
|
.cms-menu-list li.current li { background-color: #287099; }
|
||||||
.cms-menu-list li.current li a { font-size: 11px; padding: 0 10px 0 40px; height: 32px; line-height: 32px; color: #e2f0f7; background: none; border-top: 1px solid #2f81b1; border-bottom: 1px solid #1e5270; }
|
.cms-menu-list li.current li a { font-size: 11px; padding: 0 10px 0 40px; height: 32px; line-height: 32px; color: #e2f0f7; background: none; border-top: 1px solid #2f81b1; border-bottom: 1px solid #1e5270; }
|
||||||
@ -917,42 +916,42 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
|
|||||||
.cms-content-controls.cms-preview-controls { z-index: 1; background: #eceff1; height: 30px; /* should be set in js Layout to match page actions */ padding: 12px 12px; }
|
.cms-content-controls.cms-preview-controls { z-index: 1; background: #eceff1; height: 30px; /* should be set in js Layout to match page actions */ padding: 12px 12px; }
|
||||||
.cms-content-controls .icon-view, .cms-content-controls .preview-selector.dropdown a.chzn-single { white-space: nowrap; }
|
.cms-content-controls .icon-view, .cms-content-controls .preview-selector.dropdown a.chzn-single { white-space: nowrap; }
|
||||||
.cms-content-controls .icon-view:before, .cms-content-controls .preview-selector.dropdown a.chzn-single:before { display: inline-block; float: left; content: ''; width: 23px; height: 17px; overflow: hidden; }
|
.cms-content-controls .icon-view:before, .cms-content-controls .preview-selector.dropdown a.chzn-single:before { display: inline-block; float: left; content: ''; width: 23px; height: 17px; overflow: hidden; }
|
||||||
.cms-content-controls .icon-auto:before { background: url('../images/sprites-32x32-s10286f549b.png') 0 -148px no-repeat; }
|
.cms-content-controls .icon-auto:before { background: url('../images/sprites-32x32-s871d283813.png') 0 -898px no-repeat; }
|
||||||
.cms-content-controls .icon-desktop:before { background: url('../images/sprites-32x32-s10286f549b.png') 0 -121px no-repeat; }
|
.cms-content-controls .icon-desktop:before { background: url('../images/sprites-32x32-s871d283813.png') 0 -925px no-repeat; }
|
||||||
.cms-content-controls .icon-tablet:before { background: url('../images/sprites-32x32-s10286f549b.png') 0 -202px no-repeat; }
|
.cms-content-controls .icon-tablet:before { background: url('../images/sprites-32x32-s871d283813.png') 0 -1087px no-repeat; }
|
||||||
.cms-content-controls .icon-mobile:before { background: url('../images/sprites-32x32-s10286f549b.png') 0 -229px no-repeat; }
|
.cms-content-controls .icon-mobile:before { background: url('../images/sprites-32x32-s871d283813.png') 0 -1006px no-repeat; }
|
||||||
.cms-content-controls .icon-split:before { background: url('../images/sprites-32x32-s10286f549b.png') 0 -175px no-repeat; }
|
.cms-content-controls .icon-split:before { background: url('../images/sprites-32x32-s871d283813.png') 0 -1060px no-repeat; }
|
||||||
.cms-content-controls .icon-edit:before { background: url('../images/sprites-32x32-s10286f549b.png') 0 -67px no-repeat; }
|
.cms-content-controls .icon-edit:before { background: url('../images/sprites-32x32-s871d283813.png') 0 -979px no-repeat; }
|
||||||
.cms-content-controls .icon-preview:before { background: url('../images/sprites-32x32-s10286f549b.png') 0 -40px no-repeat; }
|
.cms-content-controls .icon-preview:before { background: url('../images/sprites-32x32-s871d283813.png') 0 -1033px no-repeat; }
|
||||||
.cms-content-controls .icon-window:before { background: url('../images/sprites-32x32-s10286f549b.png') 0 -94px no-repeat; }
|
.cms-content-controls .icon-window:before { background: url('../images/sprites-32x32-s871d283813.png') 0 -952px no-repeat; }
|
||||||
.cms-content-controls .cms-navigator { width: 100%; }
|
.cms-content-controls .cms-navigator { width: 100%; }
|
||||||
.cms-content-controls .preview-selector.dropdown a.chzn-single { text-indent: -200px; }
|
.cms-content-controls .preview-selector.dropdown a.chzn-single { text-indent: -200px; }
|
||||||
.cms-content-controls .preview-selector { float: right; border-bottom: none; position: relative; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; margin: 3px 0 0 4px; padding: 0; height: 28px; }
|
.cms-content-controls .preview-selector { float: right; border-bottom: none; position: relative; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; margin: 3px 0 0 4px; padding: 0; height: 28px; }
|
||||||
.cms-content-controls .preview-selector a.chzn-single { width: 20px; padding: 6px 5px 5px; height: 18px; margin: -3px 0 0; filter: none; /* remove ie background */ background: none; border: none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; }
|
.cms-content-controls .preview-selector a.chzn-single { width: 20px; padding: 6px 5px 5px; height: 18px; margin: -3px 0 0; filter: none; /* remove ie background */ background: none; border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; }
|
||||||
.cms-content-controls .preview-selector a.chzn-single:hover, .cms-content-controls .preview-selector a.chzn-single.chzn-single-with-drop { background-color: #dae0e5; -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.05) inset, 0 1px 0 rgba(248, 248, 248, 0.9); -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.05) inset, 0 1px 0 rgba(248, 248, 248, 0.9); box-shadow: 0 0 3px rgba(0, 0, 0, 0.05) inset, 0 1px 0 rgba(248, 248, 248, 0.9); }
|
.cms-content-controls .preview-selector a.chzn-single:hover, .cms-content-controls .preview-selector a.chzn-single.chzn-single-with-drop { background-color: #dae0e5; -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.05) inset, 0 1px 0 rgba(248, 248, 248, 0.9); -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.05) inset, 0 1px 0 rgba(248, 248, 248, 0.9); box-shadow: 0 0 3px rgba(0, 0, 0, 0.05) inset, 0 1px 0 rgba(248, 248, 248, 0.9); }
|
||||||
.cms-content-controls .preview-selector a.chzn-single.chzn-single-with-drop { -webkit-border-radius: 0 0 3px 3px; -moz-border-radius: 0 0 3px 3px; -ms-border-radius: 0 0 3px 3px; -o-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; }
|
.cms-content-controls .preview-selector a.chzn-single.chzn-single-with-drop { -moz-border-radius: 0 0 3px 3px; -webkit-border-radius: 0; border-radius: 0 0 3px 3px; }
|
||||||
.cms-content-controls .preview-selector a.chzn-single div { display: none; }
|
.cms-content-controls .preview-selector a.chzn-single div { display: none; }
|
||||||
.cms-content-controls .preview-selector.open .chzn-drop { position: absolute; left: auto !important; right: 0; }
|
.cms-content-controls .preview-selector.open .chzn-drop { position: absolute; left: auto !important; right: 0; }
|
||||||
.cms-content-controls .preview-selector .chzn-drop { -webkit-border-radius: 3px 3px 0 3px; -moz-border-radius: 3px 3px 0 3px; -ms-border-radius: 3px 3px 0 3px; -o-border-radius: 3px 3px 0 3px; border-radius: 3px 3px 0 3px; -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.1); box-shadow: 0 0 3px rgba(0, 0, 0, 0.1); }
|
.cms-content-controls .preview-selector .chzn-drop { -moz-border-radius: 3px 3px 0 3px; -webkit-border-radius: 3px; border-radius: 3px 3px 0 3px; -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.1); box-shadow: 0 0 3px rgba(0, 0, 0, 0.1); }
|
||||||
.cms-content-controls .preview-selector .chzn-drop .chzn-results { width: 135px; }
|
.cms-content-controls .preview-selector .chzn-drop .chzn-results { width: 135px; }
|
||||||
.cms-content-controls .preview-selector .chzn-drop .chzn-results .result-selected { background: #eceff1; }
|
.cms-content-controls .preview-selector .chzn-drop .chzn-results .result-selected { background: #eceff1; }
|
||||||
.cms-content-controls .preview-selector .chzn-container { width: auto !important; }
|
.cms-content-controls .preview-selector .chzn-container { width: auto !important; }
|
||||||
.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 { 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 .chzn-search { display: none; }
|
||||||
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul { padding: 0; margin: 0; }
|
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul { padding: 0; margin: 0; }
|
||||||
.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: #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:before { margin-right: 2px; }
|
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li:before { margin-right: 2px; }
|
||||||
.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 { 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.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: #0073C1; filter: none; background: #f2f4f6; text-decoration: none; }
|
||||||
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li.first { -webkit-border-radius: 3px 3px 0 0; -moz-border-radius: 3px 3px 0 0; -ms-border-radius: 3px 3px 0 0; -o-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; }
|
.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; -webkit-border-radius: 0 0 0 3px; -moz-border-radius: 0 0 0 3px; -ms-border-radius: 0 0 0 3px; -o-border-radius: 0 0 0 3px; border-radius: 0 0 0 3px; }
|
.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;*/ }
|
.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;*/ }
|
||||||
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li.restricted:before { opacity: 0.2; }
|
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li.restricted:before { opacity: 0.2; }
|
||||||
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li span { display: block; color: #6c6c6c; font-size: 0.85em; line-height: 1.1em; padding-left: 23px; }
|
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li span { display: block; color: #6c6c6c; font-size: 0.85em; line-height: 1.1em; padding-left: 23px; }
|
||||||
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li .icon-view { margin-right: 4px; }
|
.cms-content-controls .preview-selector .chzn-container.chzn-with-rise .chzn-drop ul li .icon-view { margin-right: 4px; }
|
||||||
.cms-content-controls .preview-selector .chzn-drop ul.chzn-results li.result-selected { background: #e6eaed; color: #444444; }
|
.cms-content-controls .preview-selector .chzn-drop ul.chzn-results li.result-selected { background: #e6eaed; color: #444; }
|
||||||
.cms-content-controls .preview-selector .chzn-drop ul.chzn-results li.result-selected.highlighted, .cms-content-controls .preview-selector .chzn-drop ul.chzn-results li.result-selected:hover, .cms-content-controls .preview-selector .chzn-drop ul.chzn-results li.result-selected:focus { background: #e6eaed; color: #444444; }
|
.cms-content-controls .preview-selector .chzn-drop ul.chzn-results li.result-selected.highlighted, .cms-content-controls .preview-selector .chzn-drop ul.chzn-results li.result-selected:hover, .cms-content-controls .preview-selector .chzn-drop ul.chzn-results li.result-selected:focus { background: #e6eaed; color: #444; }
|
||||||
.cms-content-controls .cms-preview-states { float: right; }
|
.cms-content-controls .cms-preview-states { float: right; }
|
||||||
.cms-content-controls .cms-preview-states select { max-width: 150px; }
|
.cms-content-controls .cms-preview-states select { max-width: 150px; }
|
||||||
.cms-content-controls .cms-preview-states.dropdown { max-width: 150px; }
|
.cms-content-controls .cms-preview-states.dropdown { max-width: 150px; }
|
||||||
@ -960,28 +959,28 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
|
|||||||
.cms-content-controls .cms-preview-states.dropdown .chzn-container { max-width: 150px; }
|
.cms-content-controls .cms-preview-states.dropdown .chzn-container { max-width: 150px; }
|
||||||
|
|
||||||
/* Styling for the preview screen sizes */
|
/* Styling for the preview screen sizes */
|
||||||
.cms-preview { background-color: #eceff1; height: 100%; width: 100%; }
|
.cms-preview { background-color: #ECEFF1; height: 100%; width: 100%; }
|
||||||
.cms-preview .cms-preview-overlay { width: 100%; height: 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 { 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-s88957ee578.png') 0 0 no-repeat; display: block; height: 41px; margin: 0 auto 20px; width: 50px; }
|
.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; }
|
||||||
.cms-preview .preview-scroll { height: 100%; overflow: auto; position: relative; width: 100%; }
|
.cms-preview .preview-scroll { height: 100%; overflow: auto; position: relative; width: 100%; }
|
||||||
.cms-preview .preview-scroll .preview-device-outer { height: 100%; width: 100%; }
|
.cms-preview .preview-scroll .preview-device-outer { height: 100%; width: 100%; }
|
||||||
.cms-preview .preview-scroll .preview-device-outer .preview-device-inner { -webkit-box-sizing: border-box; -moz-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 { -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 .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: #ECEFF1; /* 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 { -webkit-border-radius: 7px; -moz-border-radius: 7px; -ms-border-radius: 7px; -o-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, .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 .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 { -webkit-transform: rotate(0deg); -moz-transform: rotate(0deg); -ms-transform: rotate(0deg); -o-transform: rotate(0deg); transform: rotate(0deg); -webkit-transition: all 0.3s ease-in; -webkit-transition-delay: 1s; -moz-transition: all 0.3s ease-in 1s; -o-transition: all 0.3s ease-in 1s; transition: all 0.3s ease-in 1s; margin: 20px auto 20px; overflow: hidden; padding-top: 16px; }
|
.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; }
|
||||||
.cms-preview.mobile .preview-scroll .preview-device-outer .preview-device-inner { -webkit-transform: rotate(0deg); -moz-transform: rotate(0deg); -ms-transform: rotate(0deg); -o-transform: rotate(0deg); transform: rotate(0deg); -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; transition: all 0.3s ease-out 1s; }
|
.cms-preview.mobile .preview-scroll .preview-device-outer .preview-device-inner { -moz-transform: rotate(0deg); -ms-transform: rotate(0deg); -webkit-transform: rotate(0deg); transform: rotate(0deg); -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; transition: all 0.3s ease-out 1s; }
|
||||||
.cms-preview.mobile .preview-scroll .preview-device-outer.rotate { -webkit-transform: rotate(-90deg); -moz-transform: rotate(-90deg); -ms-transform: rotate(-90deg); -o-transform: rotate(-90deg); transform: rotate(-90deg); -webkit-transition: all 0.3s ease-in; -webkit-transition-delay: 1s; -moz-transition: all 0.3s ease-in 1s; -o-transition: all 0.3s ease-in 1s; transition: all 0.3s ease-in 1s; height: 583px; margin: 0px auto 0px; width: 320px; }
|
.cms-preview.mobile .preview-scroll .preview-device-outer.rotate { -moz-transform: rotate(-90deg); -ms-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); transform: rotate(-90deg); -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; height: 583px; margin: 0px auto 0px; width: 320px; }
|
||||||
.cms-preview.mobile .preview-scroll .preview-device-outer.rotate .preview-device-inner { -webkit-transform-origin: 160px 160px; -moz-transform-origin: 160px 160px; -ms-transform-origin: 160px 160px; -o-transform-origin: 160px 160px; transform-origin: 160px 160px; -webkit-transform: rotate(90deg); -moz-transform: rotate(90deg); -ms-transform: rotate(90deg); -o-transform: rotate(90deg); transform: rotate(90deg); -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; transition: all 0.3s ease-out 1s; height: 320px; width: 583px; }
|
.cms-preview.mobile .preview-scroll .preview-device-outer.rotate .preview-device-inner { -moz-transform-origin: 160px 160px; -ms-transform-origin: 160px 160px; -webkit-transform-origin: 160px 160px; transform-origin: 160px 160px; -moz-transform: rotate(90deg); -ms-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg); -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; transition: all 0.3s ease-out 1s; height: 320px; width: 583px; }
|
||||||
.cms-preview.mobileLandscape .preview-scroll .preview-device-outer { -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; transition: all 0.3s ease-out 1s; margin: 12% auto; padding-top: 16px; }
|
.cms-preview.mobileLandscape .preview-scroll .preview-device-outer { -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; transition: all 0.3s ease-out 1s; margin: 12% auto; padding-top: 16px; }
|
||||||
.cms-preview.mobileLandscape .preview-scroll .preview-device-outer .preview-device-inner { -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; transition: all 0.3s ease-out 1s; }
|
.cms-preview.mobileLandscape .preview-scroll .preview-device-outer .preview-device-inner { -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; transition: all 0.3s ease-out 1s; }
|
||||||
.cms-preview.tablet .preview-scroll .preview-device-outer { -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; transition: all 0.3s ease-out 1s; margin: 0 auto; }
|
.cms-preview.tablet .preview-scroll .preview-device-outer { -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; transition: all 0.3s ease-out 1s; margin: 0 auto; }
|
||||||
.cms-preview.tablet .preview-scroll .preview-device-outer .preview-device-inner { -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; transition: all 0.3s ease-out 1s; }
|
.cms-preview.tablet .preview-scroll .preview-device-outer .preview-device-inner { -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; transition: all 0.3s ease-out 1s; }
|
||||||
.cms-preview.tabletLandscape .preview-scroll .preview-device-outer { -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; transition: all 0.3s ease-out 1s; margin: 0 auto; }
|
.cms-preview.tabletLandscape .preview-scroll .preview-device-outer { -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; transition: all 0.3s ease-out 1s; margin: 0 auto; }
|
||||||
.cms-preview.tabletLandscape .preview-scroll .preview-device-outer .preview-device-inner { -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; transition: all 0.3s ease-out 1s; }
|
.cms-preview.tabletLandscape .preview-scroll .preview-device-outer .preview-device-inner { -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; transition: all 0.3s ease-out 1s; }
|
||||||
.cms-preview.desktop .preview-scroll .preview-device-outer { -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; transition: all 0.3s ease-out 1s; margin: 0 auto; }
|
.cms-preview.desktop .preview-scroll .preview-device-outer { -moz-transition: all 0.3s ease-out 1s; -o-transition: all 0.3s ease-out 1s; -webkit-transition: all 0.3s ease-out; -webkit-transition-delay: 1s; transition: all 0.3s ease-out 1s; margin: 0 auto; }
|
||||||
|
|
||||||
/********************************************
|
/********************************************
|
||||||
* Defines the styles for .ss-ui-action-tabset:
|
* Defines the styles for .ss-ui-action-tabset:
|
||||||
@ -1005,16 +1004,16 @@ visible. Added and removed with js in TabSet.js */ /***************************
|
|||||||
of ss-ui-action-tabset
|
of ss-ui-action-tabset
|
||||||
****************************************************************/ }
|
****************************************************************/ }
|
||||||
.cms .ss-ui-action-tabset.multi { /* Style the tab panels */ }
|
.cms .ss-ui-action-tabset.multi { /* Style the tab panels */ }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav { -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; overflow: hidden; *zoom: 1; border: 1px solid #b3b3b3; float: left; overflow: visible; padding: 0; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; overflow: hidden; *zoom: 1; border: 1px solid #b3b3b3; float: left; overflow: visible; padding: 0; }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav:active { outline: none; box-shadow: none; -webkit-box-shadow: none; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav:active { outline: none; box-shadow: none; -webkit-box-shadow: none; }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y4ZjhmOCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f8f8f8), color-stop(100%, #d9d9d9)); background-image: -webkit-linear-gradient(top, #f8f8f8, #d9d9d9); background-image: -moz-linear-gradient(top, #f8f8f8, #d9d9d9); background-image: -o-linear-gradient(top, #f8f8f8, #d9d9d9); background-image: linear-gradient(top, #f8f8f8, #d9d9d9); -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; background: #eaeaea; border: none; border-right: 1px solid #eee; border-left: 1px solid #b3b3b3; margin: 0; overflow: visible; min-width: 110px; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li { background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y4ZjhmOCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f8f8f8), color-stop(100%, #d9d9d9)); background-image: -moz-linear-gradient(top, #f8f8f8, #d9d9d9); background-image: -webkit-linear-gradient(top, #f8f8f8, #d9d9d9); background-image: linear-gradient(to bottom, #f8f8f8, #d9d9d9); -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; background: #eaeaea; border: none; border-right: 1px solid #eee; border-left: 1px solid #b3b3b3; margin: 0; overflow: visible; min-width: 110px; }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li:active { outline: none; box-shadow: none; -webkit-box-shadow: none; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li:active { outline: none; box-shadow: none; -webkit-box-shadow: none; }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li.ui-state-active { -moz-border-radius-bottomleft: 0px; -webkit-border-bottom-left-radius: 0px; border-bottom-left-radius: 0px; -moz-border-radius-bottomright: 0px; -webkit-border-bottom-right-radius: 0px; border-bottom-right-radius: 0px; background: #f8f8f8; border-bottom: none !important; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li.ui-state-active { -moz-border-radius-bottomleft: 0px; -webkit-border-bottom-left-radius: 0px; border-bottom-left-radius: 0px; -moz-border-radius-bottomright: 0px; -webkit-border-bottom-right-radius: 0px; border-bottom-right-radius: 0px; background: #f8f8f8; border-bottom: none !important; }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li.ui-state-active a { -moz-border-radius-bottomleft: 0px; -webkit-border-bottom-left-radius: 0px; border-bottom-left-radius: 0px; -moz-border-radius-bottomright: 0px; -webkit-border-bottom-right-radius: 0px; border-bottom-right-radius: 0px; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li.ui-state-active a { -moz-border-radius-bottomleft: 0px; -webkit-border-bottom-left-radius: 0px; border-bottom-left-radius: 0px; -moz-border-radius-bottomright: 0px; -webkit-border-bottom-right-radius: 0px; border-bottom-right-radius: 0px; }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li.ui-state-active a:active, .cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li.ui-state-active a span:active { outline: none; box-shadow: none; -webkit-box-shadow: none; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li.ui-state-active a:active, .cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li.ui-state-active a span:active { outline: none; box-shadow: none; -webkit-box-shadow: none; }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li.first { -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px; -moz-border-radius-bottomleft: 3px; -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; border-left: none; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li.first { -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px; -moz-border-radius-bottomleft: 3px; -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; border-left: none; }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li.last { -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; border-top-right-radius: 3px; -moz-border-radius-bottomright: 3px; -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; border-right: none; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li.last { -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; border-top-right-radius: 3px; -moz-border-radius-bottomright: 3px; -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; border-right: none; }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li a.tab-nav-link { color: #444444; display: inline-block; font-weight: bold; line-height: 16px; padding: 5px 10px; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li a.tab-nav-link { color: #444; display: inline-block; font-weight: bold; line-height: 16px; padding: 5px 10px; }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li a.tab-nav-link .ui-no-icon { display: inline-block; float: left; height: 16px; padding: 0 2px; width: 16px; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li a.tab-nav-link .ui-no-icon { display: inline-block; float: left; height: 16px; padding: 0 2px; width: 16px; }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li a.tab-nav-link .title { display: inline-block; line-height: 18px; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li a.tab-nav-link .title { display: inline-block; line-height: 18px; }
|
||||||
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li a.tab-nav-link.view-mode-batchactions-wrapper .title { margin-left: 22px; }
|
.cms .ss-ui-action-tabset.multi ul.ui-tabs-nav li a.tab-nav-link.view-mode-batchactions-wrapper .title { margin-left: 22px; }
|
||||||
@ -1023,10 +1022,10 @@ visible. Added and removed with js in TabSet.js */ /***************************
|
|||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel h3 { font-size: 13px; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel h3 { font-size: 13px; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel h4 { font-size: 12px; margin: 5px 0; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel h4 { font-size: 12px; margin: 5px 0; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .ui-widget-content { background: none; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .ui-widget-content { background: none; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field { /* Fields are more compressed in some areas compared to the main content editing window so the below alters the internal spacing of the fields so we can move that spacing to between the form fields rather than padding */ border-bottom: none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field { /* Fields are more compressed in some areas compared to the main content editing window so the below alters the internal spacing of the fields so we can move that spacing to between the form fields rather than padding */ border-bottom: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field label { float: none; width: auto; font-size: 12px; padding: 0 8px 4px 0; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field label { float: none; width: auto; font-size: 12px; padding: 0 8px 4px 0; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field label.extra-details { overflow: hidden; margin-top: 10px; display: block; color: #9d9d9d; font-style: italic; font-weight: normal; font-size: 1em; float: left; text-shadow: none; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field label.extra-details { overflow: hidden; margin-top: 10px; display: block; color: #9d9d9d; font-style: italic; font-weight: normal; font-size: 1em; float: left; text-shadow: none; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field label.extra-details.fill:before { color: #fff; content: '?'; font-size: 12px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; padding-left: 3px; padding-right: 3px; display: block; float: left; text-shadow: none; -webkit-border-radius: 50px; -moz-border-radius: 50px; -ms-border-radius: 50px; -o-border-radius: 50px; border-radius: 50px; background-color: #b7b7b7; width: 15px; height: 15px; margin-right: 5px; margin-bottom: 5px; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field label.extra-details.fill:before { color: #fff; content: '?'; font-size: 12px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; padding-left: 3px; padding-right: 3px; display: block; float: left; text-shadow: none; -moz-border-radius: 50px; -webkit-border-radius: 50px; border-radius: 50px; background-color: #b7b7b7; width: 15px; height: 15px; margin-right: 5px; margin-bottom: 5px; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field .middleColumn { margin: 0; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field .middleColumn { margin: 0; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field input.text, .cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field select, .cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field textarea { padding: 5px; font-size: 11px; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field input.text, .cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field select, .cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field textarea { padding: 5px; font-size: 11px; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field.checkbox { padding: 0 8px 0; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .field.checkbox { padding: 0 8px 0; }
|
||||||
@ -1036,7 +1035,7 @@ visible. Added and removed with js in TabSet.js */ /***************************
|
|||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .cms-content-fields { overflow: visible; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .cms-content-fields { overflow: visible; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .chzn-container-single { width: 100% !important; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .chzn-container-single { width: 100% !important; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .chzn-container-single .chzn-single { padding: 0 0 0 5px; float: none; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .chzn-container-single .chzn-single { padding: 0 0 0 5px; float: none; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .cms-content-actions, .cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .cms-preview-controls { padding: 0; height: auto; border: none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .cms-content-actions, .cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .cms-preview-controls { padding: 0; height: auto; border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .cms-edit-form { width: 100%; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .cms-edit-form { width: 100%; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .CompositeField { margin: 0; padding: 0; float: none; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .CompositeField { margin: 0; padding: 0; float: none; }
|
||||||
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .parent-mode { padding-top: 0; }
|
.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .parent-mode { padding-top: 0; }
|
||||||
@ -1057,7 +1056,7 @@ visible. Added and removed with js in TabSet.js */ /***************************
|
|||||||
.cms .ss-ui-action-tabset .batch-check { margin: 6px 0px 5px 9px; position: absolute; }
|
.cms .ss-ui-action-tabset .batch-check { margin: 6px 0px 5px 9px; position: absolute; }
|
||||||
.cms .ss-ui-action-tabset .cms-tree-view-sidebar { min-width: 176px; /* for when the scrollbar is present & find dropdown open */ }
|
.cms .ss-ui-action-tabset .cms-tree-view-sidebar { min-width: 176px; /* for when the scrollbar is present & find dropdown open */ }
|
||||||
.cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset ul.ui-tabs-nav > li { width: auto; }
|
.cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset ul.ui-tabs-nav > li { width: auto; }
|
||||||
.cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset ul.ui-tabs-nav > li a.tab-nav-link { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; overflow: hidden; padding-right: 0; width: 30px; }
|
.cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset ul.ui-tabs-nav > li a.tab-nav-link { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; overflow: hidden; padding-right: 0; width: 30px; }
|
||||||
.cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset ul.ui-tabs-nav > li a.tab-nav-link.active { -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; width: 110px; }
|
.cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset ul.ui-tabs-nav > li a.tab-nav-link.active { -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; width: 110px; }
|
||||||
.cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset.tabset-open ul.ui-tabs-nav, .cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset.tabset-open ul.ui-tabs-nav li.first, .cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset.tabset-open ul.ui-tabs-nav li.last, .cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset.tabset-open-last ul.ui-tabs-nav, .cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset.tabset-open-last ul.ui-tabs-nav li.first, .cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset.tabset-open-last ul.ui-tabs-nav li.last { -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; -moz-border-radius-bottomleft: 0; -webkit-border-bottom-left-radius: 0; border-bottom-left-radius: 0; }
|
.cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset.tabset-open ul.ui-tabs-nav, .cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset.tabset-open ul.ui-tabs-nav li.first, .cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset.tabset-open ul.ui-tabs-nav li.last, .cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset.tabset-open-last ul.ui-tabs-nav, .cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset.tabset-open-last ul.ui-tabs-nav li.first, .cms .ss-ui-action-tabset .cms-tree-view-sidebar .ss-ui-action-tabset.tabset-open-last ul.ui-tabs-nav li.last { -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; -moz-border-radius-bottomleft: 0; -webkit-border-bottom-left-radius: 0; border-bottom-left-radius: 0; }
|
||||||
.cms .ss-ui-action-tabset .cms-tree-view-sidebar .ui-tabs .ui-tabs-panel.ss-ui-action-tab { padding: 10px 6px; width: 162px; }
|
.cms .ss-ui-action-tabset .cms-tree-view-sidebar .ui-tabs .ui-tabs-panel.ss-ui-action-tab { padding: 10px 6px; width: 162px; }
|
||||||
@ -1067,23 +1066,23 @@ visible. Added and removed with js in TabSet.js */ /***************************
|
|||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset { margin-top: 2px; /* Style the panel for actions-menu */ /* Re-align last tab */ }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset { margin-top: 2px; /* Style the panel for actions-menu */ /* Re-align last tab */ }
|
||||||
.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 { 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 { 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 { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; outline: none; }
|
.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: white 0 1px 1px; color: #0073c1; font-size: 13px; font-weight: normal; line-height: 24px; padding: 0 25px 0 10px; /* Arrow */ }
|
.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; /* 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 { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; outline: none; }
|
.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: white 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: #005b98; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a:after { background: url('../images/sprites-32x32-s10286f549b.png') 0 -1188px 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:after { background: url('../images/sprites-32x32-s871d283813.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-s10286f549b.png') 0 -1162px no-repeat; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a:hover:after { background: url('../images/sprites-32x32-s871d283813.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-s10286f549b.png') 0 -1214px 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-s871d283813.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-s10286f549b.png') 0 -1136px 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-s871d283813.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: #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 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, .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 h3 { font-size: 13px; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel h4 { font-size: 12px; margin: 5px 0; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel h4 { font-size: 12px; margin: 5px 0; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .ui-widget-content { background: none; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .ui-widget-content { background: none; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field { /* Fields are more compressed in some areas compared to the main content editing window so the below alters the internal spacing of the fields so we can move that spacing to between the form fields rather than padding */ border-bottom: none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field { /* Fields are more compressed in some areas compared to the main content editing window so the below alters the internal spacing of the fields so we can move that spacing to between the form fields rather than padding */ border-bottom: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field label { float: none; width: auto; font-size: 12px; padding: 0 8px 4px 0; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field label { float: none; width: auto; font-size: 12px; padding: 0 8px 4px 0; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field label.extra-details { overflow: hidden; margin-top: 10px; display: block; color: #9d9d9d; font-style: italic; font-weight: normal; font-size: 1em; float: left; text-shadow: none; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field label.extra-details { overflow: hidden; margin-top: 10px; display: block; color: #9d9d9d; font-style: italic; font-weight: normal; font-size: 1em; float: left; text-shadow: none; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field label.extra-details.fill:before { color: #fff; content: '?'; font-size: 12px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; padding-left: 3px; padding-right: 3px; display: block; float: left; text-shadow: none; -webkit-border-radius: 50px; -moz-border-radius: 50px; -ms-border-radius: 50px; -o-border-radius: 50px; border-radius: 50px; background-color: #b7b7b7; width: 15px; height: 15px; margin-right: 5px; margin-bottom: 5px; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field label.extra-details.fill:before { color: #fff; content: '?'; font-size: 12px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; padding-left: 3px; padding-right: 3px; display: block; float: left; text-shadow: none; -moz-border-radius: 50px; -webkit-border-radius: 50px; border-radius: 50px; background-color: #b7b7b7; width: 15px; height: 15px; margin-right: 5px; margin-bottom: 5px; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field .middleColumn { margin: 0; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field .middleColumn { margin: 0; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field input.text, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field select, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field textarea { padding: 5px; font-size: 11px; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field input.text, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field select, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field textarea { padding: 5px; font-size: 11px; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field.checkbox { padding: 0 8px 0; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .field.checkbox { padding: 0 8px 0; }
|
||||||
@ -1093,7 +1092,7 @@ visible. Added and removed with js in TabSet.js */ /***************************
|
|||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .cms-content-fields { overflow: visible; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .cms-content-fields { overflow: visible; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .chzn-container-single { width: 100% !important; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .chzn-container-single { width: 100% !important; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .chzn-container-single .chzn-single { padding: 0 0 0 5px; float: none; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .chzn-container-single .chzn-single { padding: 0 0 0 5px; float: none; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .cms-content-actions, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .cms-preview-controls { padding: 0; height: auto; border: none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .cms-content-actions, .cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .cms-preview-controls { padding: 0; height: auto; border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .cms-edit-form { width: 100%; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .cms-edit-form { width: 100%; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .CompositeField { margin: 0; padding: 0; float: none; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .CompositeField { margin: 0; padding: 0; float: none; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .parent-mode { padding-top: 0; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .parent-mode { padding-top: 0; }
|
||||||
@ -1106,7 +1105,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 #e6e7e8; 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 { border-bottom: 1px solid #e6e7e8; 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 .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 { 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 { -webkit-box-shadow: none; -moz-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: #e0e5e8; outline: none; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset .last .ui-tabs-panel.ss-ui-action-tab { left: auto; right: -1px; }
|
.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; }
|
.cms .cms-content-actions .Actions { overflow: visible; }
|
||||||
|
|
||||||
@ -1130,6 +1129,22 @@ green tick icon as a background this is created using compass generated classes
|
|||||||
.cms .cms-content .SecurityAdmin .cms-content-fields { overflow-y: auto; }
|
.cms .cms-content .SecurityAdmin .cms-content-fields { overflow-y: auto; }
|
||||||
.cms .cms-content .SecurityAdmin .cms-content-fields .aligned-right-label { margin-left: 184px; padding: 8px 0; }
|
.cms .cms-content .SecurityAdmin .cms-content-fields .aligned-right-label { margin-left: 184px; padding: 8px 0; }
|
||||||
|
|
||||||
|
.cms-security h1 { margin: 45px 40px 5px 25px; font-size: 1.9em; line-height: 1.2; font-weight: bold; }
|
||||||
|
.cms-security .Content { margin: 0 50px 0 25px; }
|
||||||
|
.cms-security .Form { margin: 0 25px; }
|
||||||
|
.cms-security .Form .field { border: 0 none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; margin: 0; padding: 0; }
|
||||||
|
.cms-security .Form .field label.left { float: none; width: auto; }
|
||||||
|
.cms-security .Form .field .middleColumn { margin: 0; }
|
||||||
|
.cms-security .Form #Password { width: 300px; float: left; }
|
||||||
|
.cms-security .Form #ForgotPassword { float: left; padding: 40px 0 0 10px; }
|
||||||
|
.cms-security .Form #Remember { clear: both; }
|
||||||
|
.cms-security .Form .Actions { padding: 20px 0 0 0; }
|
||||||
|
.cms-security .Form .Actions #doLogout { line-height: 28px; margin: 0 0 0 10px; }
|
||||||
|
|
||||||
|
.leftandmain-logindialog-dialog .ui-dialog-titlebar-close { display: none; }
|
||||||
|
|
||||||
|
.leftandmain-logindialog-overlay { opacity: 0.8; }
|
||||||
|
|
||||||
/** ----------------------------- Retina graphics ----------------------------- */
|
/** ----------------------------- Retina graphics ----------------------------- */
|
||||||
/** This file defines graphics to use on high-DPI screens in the CMS @package framework @subpackage admin */
|
/** This file defines graphics to use on high-DPI screens in the CMS @package framework @subpackage admin */
|
||||||
/** ---------------------------------------------------- "@2x" media query ---------------------------------------------------- */
|
/** ---------------------------------------------------- "@2x" media query ---------------------------------------------------- */
|
||||||
@ -1140,51 +1155,51 @@ green tick icon as a background this is created using compass generated classes
|
|||||||
/* Default CMS logo */
|
/* Default CMS logo */
|
||||||
.cms-logo a { background-image: url("../images/logo_small@2x.png"); background-size: 22px 22px; }
|
.cms-logo a { background-image: url("../images/logo_small@2x.png"); background-size: 22px 22px; }
|
||||||
/* Logout button */
|
/* Logout button */
|
||||||
.cms-login-status .logout-link { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -161px; background-size: 30px auto; }
|
.cms-login-status .logout-link { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -184px; background-size: 30px auto; }
|
||||||
.cms-content-controls .icon-auto:before { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -134px; background-size: 30px auto; }
|
.cms-content-controls .icon-auto:before { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -274px; background-size: 30px auto; }
|
||||||
.cms-content-controls .icon-desktop:before { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -241px; background-size: 30px auto; }
|
.cms-content-controls .icon-desktop:before { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -301px; background-size: 30px auto; }
|
||||||
.cms-content-controls .icon-tablet:before { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -268px; background-size: 30px auto; }
|
.cms-content-controls .icon-tablet:before { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -436px; background-size: 30px auto; }
|
||||||
.cms-content-controls .icon-mobile:before { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -214px; background-size: 30px auto; }
|
.cms-content-controls .icon-mobile:before { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -355px; background-size: 30px auto; }
|
||||||
.cms-content-controls .icon-split:before { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -187px; background-size: 30px auto; }
|
.cms-content-controls .icon-split:before { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -409px; background-size: 30px auto; }
|
||||||
.cms-content-controls .icon-edit:before { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -107px; background-size: 30px auto; }
|
.cms-content-controls .icon-edit:before { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -328px; background-size: 30px auto; }
|
||||||
.cms-content-controls .icon-preview:before { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -80px; background-size: 30px auto; }
|
.cms-content-controls .icon-preview:before { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -382px; background-size: 30px auto; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a:after { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -327px; background-size: 30px auto; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a:after { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -26px; background-size: 30px auto; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a:hover:after { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -353px; background-size: 30px auto; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li a:hover:after { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 0; background-size: 30px auto; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li.ui-state-active a:after { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -411px; background-size: 30px auto; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li.ui-state-active a:after { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -78px; background-size: 30px auto; }
|
||||||
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li.ui-state-active a:hover:after { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -437px; background-size: 30px auto; }
|
.cms .ss-ui-action-tabset.action-menus.ss-tabset ul.ui-tabs-nav li.ui-state-active a:hover:after { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -52px; background-size: 30px auto; }
|
||||||
/* CMS menu */
|
/* CMS menu */
|
||||||
.cms-menu-list li a .toggle-children .toggle-children-icon { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -395px; background-size: 30px auto; }
|
.cms-menu-list li a .toggle-children .toggle-children-icon { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -210px; background-size: 30px auto; }
|
||||||
.cms-menu-list li a .toggle-children.opened .toggle-children-icon { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -379px; background-size: 30px auto; }
|
.cms-menu-list li a .toggle-children.opened .toggle-children-icon { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -226px; background-size: 30px auto; }
|
||||||
.cms-menu-list li.current a .toggle-children .toggle-children-icon { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -295px; background-size: 30px auto; }
|
.cms-menu-list li.current a .toggle-children .toggle-children-icon { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -242px; background-size: 30px auto; }
|
||||||
.cms-menu-list li.current a .toggle-children.opened .toggle-children-icon { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -311px; background-size: 30px auto; }
|
.cms-menu-list li.current a .toggle-children.opened .toggle-children-icon { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -258px; background-size: 30px auto; }
|
||||||
/* Sitetree */
|
/* Sitetree */
|
||||||
.tree-holder.jstree-apple ins, .cms-tree.jstree-apple ins { background-image: url(../images/sitetree_ss_default_icons@2x.png); background-size: 108px 72px; }
|
.tree-holder.jstree-apple ins, .cms-tree.jstree-apple ins { background-image: url(../images/sitetree_ss_default_icons@2x.png); background-size: 108px 72px; }
|
||||||
/* UI widget "close" button */
|
/* UI widget "close" button */
|
||||||
.ui-widget-header a.ui-state-hover .ui-icon-closethick { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 0; background-size: 30px auto; }
|
.ui-widget-header a.ui-state-hover .ui-icon-closethick { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -104px; background-size: 30px auto; }
|
||||||
.ui-widget-header .ui-icon-closethick { background-image: url('../images/sprites-32x32-2x-sd9f6129848.png'); background-position: 0 -40px; background-size: 30px auto; }
|
.ui-widget-header .ui-icon-closethick { background-image: url('../images/sprites-32x32-2x-sa271d435b9.png'); background-position: 0 -144px; background-size: 30px auto; }
|
||||||
/* Tab icons */
|
/* Tab icons */
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.list a { background-image: url('../images/sprites-64x64-2x-s0fe1d92f9d.png'); background-position: 0 -250px; background-size: 40px auto; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.list a { background-image: url('../images/sprites-64x64-2x-se3e3f47b94.png'); background-position: 0 -150px; background-size: 40px auto; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.tree a { background-image: url('../images/sprites-64x64-2x-s0fe1d92f9d.png'); background-position: 0 -100px; background-size: 40px auto; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.tree a { background-image: url('../images/sprites-64x64-2x-se3e3f47b94.png'); background-position: 0 -250px; background-size: 40px auto; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit a { background-image: url('../images/sprites-64x64-2x-s0fe1d92f9d.png'); background-position: 0 0; background-size: 40px auto; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit a { background-image: url('../images/sprites-64x64-2x-se3e3f47b94.png'); background-position: 0 -50px; background-size: 40px auto; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.list.ui-state-active a { background-image: url('../images/sprites-64x64-2x-s0fe1d92f9d.png'); background-position: 0 -200px; background-size: 40px auto; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.list.ui-state-active a { background-image: url('../images/sprites-64x64-2x-se3e3f47b94.png'); background-position: 0 -100px; background-size: 40px auto; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.tree.ui-state-active a { background-image: url('../images/sprites-64x64-2x-s0fe1d92f9d.png'); background-position: 0 -150px; background-size: 40px auto; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.tree.ui-state-active a { background-image: url('../images/sprites-64x64-2x-se3e3f47b94.png'); background-position: 0 -200px; background-size: 40px auto; }
|
||||||
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active a { background-image: url('../images/sprites-64x64-2x-s0fe1d92f9d.png'); background-position: 0 -50px; background-size: 40px auto; }
|
.ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active a { background-image: url('../images/sprites-64x64-2x-se3e3f47b94.png'); background-position: 0 0; background-size: 40px auto; }
|
||||||
/* Menu icon classes */
|
/* Menu icon classes */
|
||||||
.icon.icon-24 { background-image: url('../images/menu-icons/24x24-2x-s7169efa003.png'); background-size: 24px auto; }
|
.icon.icon-24 { background-image: url('../images/menu-icons/24x24-2x-sccfd928e17.png'); background-size: 24px auto; }
|
||||||
.icon.icon-24.icon-assetadmin { background-position: 0 -144px; }
|
.icon.icon-24.icon-assetadmin { background-position: 0 -216px; }
|
||||||
.icon.icon-24.icon-cmsmain { background-position: 0 -120px; }
|
.icon.icon-24.icon-cmsmain { background-position: 0 -192px; }
|
||||||
.icon.icon-24.icon-cmspagescontroller { background-position: 0 -168px; }
|
.icon.icon-24.icon-cmspagescontroller { background-position: 0 -168px; }
|
||||||
.icon.icon-24.icon-cmssettingscontroller { background-position: 0 0; }
|
.icon.icon-24.icon-cmssettingscontroller { background-position: 0 -96px; }
|
||||||
.icon.icon-24.icon-securityadmin { background-position: 0 -24px; }
|
.icon.icon-24.icon-securityadmin { background-position: 0 -24px; }
|
||||||
.icon.icon-24.icon-reportadmin { background-position: 0 -96px; }
|
.icon.icon-24.icon-reportadmin { background-position: 0 -240px; }
|
||||||
.icon.icon-24.icon-commentadmin { background-position: 0 -240px; }
|
.icon.icon-24.icon-commentadmin { background-position: 0 0; }
|
||||||
.icon.icon-24.icon-help { background-position: 0 -72px; }
|
.icon.icon-24.icon-help { background-position: 0 -144px; }
|
||||||
.icon.icon-16 { background-image: url('../images/menu-icons/16x16-2x-s9b8c49312e.png'); background-size: 16px auto; }
|
.icon.icon-16 { background-image: url('../images/menu-icons/16x16-2x-sbe70081ef8.png'); background-size: 16px auto; }
|
||||||
.icon.icon-16.icon-assetadmin { background-position: 0 -80px; }
|
.icon.icon-16.icon-assetadmin { background-position: 0 -144px; }
|
||||||
.icon.icon-16.icon-cmsmain { background-position: 0 -112px; }
|
.icon.icon-16.icon-cmsmain { background-position: 0 -128px; }
|
||||||
.icon.icon-16.icon-cmspagescontroller { background-position: 0 -96px; }
|
.icon.icon-16.icon-cmspagescontroller { background-position: 0 -112px; }
|
||||||
.icon.icon-16.icon-cmssettingscontroller { background-position: 0 0; }
|
.icon.icon-16.icon-cmssettingscontroller { background-position: 0 -64px; }
|
||||||
.icon.icon-16.icon-securityadmin { background-position: 0 -16px; }
|
.icon.icon-16.icon-securityadmin { background-position: 0 -16px; }
|
||||||
.icon.icon-16.icon-reportadmin { background-position: 0 -48px; }
|
.icon.icon-16.icon-reportadmin { background-position: 0 -160px; }
|
||||||
.icon.icon-16.icon-commentadmin { background-position: 0 -160px; }
|
.icon.icon-16.icon-commentadmin { background-position: 0 0; }
|
||||||
.icon.icon-16.icon-help { background-position: 0 -64px; } }
|
.icon.icon-16.icon-help { background-position: 0 -96px; } }
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB |
BIN
admin/images/btn-icon-sf963a8adf3.png
Normal file
BIN
admin/images/btn-icon-sf963a8adf3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.0 KiB |
BIN
admin/images/menu-icons/16x16-2x-sbe70081ef8.png
Normal file
BIN
admin/images/menu-icons/16x16-2x-sbe70081ef8.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.0 KiB |
BIN
admin/images/menu-icons/16x16-s3f4c846209.png
Normal file
BIN
admin/images/menu-icons/16x16-s3f4c846209.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.9 KiB |
BIN
admin/images/menu-icons/24x24-2x-sccfd928e17.png
Normal file
BIN
admin/images/menu-icons/24x24-2x-sccfd928e17.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.8 KiB |
BIN
admin/images/menu-icons/24x24-s0dc15c36f9.png
Normal file
BIN
admin/images/menu-icons/24x24-s0dc15c36f9.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB |
BIN
admin/images/sprites-32x32-2x-sa271d435b9.png
Normal file
BIN
admin/images/sprites-32x32-2x-sa271d435b9.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB |
BIN
admin/images/sprites-32x32-s871d283813.png
Normal file
BIN
admin/images/sprites-32x32-s871d283813.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
BIN
admin/images/sprites-64x64-2x-se3e3f47b94.png
Normal file
BIN
admin/images/sprites-64x64-2x-se3e3f47b94.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
BIN
admin/images/sprites-64x64-s45180e3c4f.png
Normal file
BIN
admin/images/sprites-64x64-s45180e3c4f.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB |
23
admin/javascript/CMSSecurity.js
Normal file
23
admin/javascript/CMSSecurity.js
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
jQuery.noConflict();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* File: LeftAndMain.js
|
||||||
|
*/
|
||||||
|
(function($) {
|
||||||
|
// setup jquery.entwine
|
||||||
|
$.entwine.warningLevel = $.entwine.WARN_LEVEL_BESTPRACTISE;
|
||||||
|
$.entwine('ss', function($) {
|
||||||
|
// Make all buttons "hoverable" with jQuery theming.
|
||||||
|
$('.cms input[type="submit"], .cms button, .cms input[type="reset"], .cms .ss-ui-button').entwine({
|
||||||
|
onadd: function() {
|
||||||
|
this.addClass('ss-ui-button');
|
||||||
|
if(!this.data('button')) this.button();
|
||||||
|
this._super();
|
||||||
|
},
|
||||||
|
onremove: function() {
|
||||||
|
if(this.data('button')) this.button('destroy');
|
||||||
|
this._super();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}(jQuery));
|
||||||
@ -26,6 +26,40 @@ jQuery.noConflict();
|
|||||||
// setup jquery.entwine
|
// setup jquery.entwine
|
||||||
$.entwine.warningLevel = $.entwine.WARN_LEVEL_BESTPRACTISE;
|
$.entwine.warningLevel = $.entwine.WARN_LEVEL_BESTPRACTISE;
|
||||||
$.entwine('ss', function($) {
|
$.entwine('ss', function($) {
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handle messages sent via nested iframes
|
||||||
|
* Messages should be raised via postMessage with an object with the 'type' parameter given.
|
||||||
|
* An optional 'target' and 'data' parameter can also be specified. If no target is specified
|
||||||
|
* events will be sent to the window instead.
|
||||||
|
* type should be one of:
|
||||||
|
* - 'event' - Will trigger the given event (specified by 'event') on the target
|
||||||
|
* - 'callback' - Will call the given method (specified by 'callback') on the target
|
||||||
|
*/
|
||||||
|
$(window).on("message", function(e) {
|
||||||
|
var target,
|
||||||
|
event = e.originalEvent,
|
||||||
|
data = JSON.parse(event.data);
|
||||||
|
|
||||||
|
// Reject messages outside of the same origin
|
||||||
|
if($.path.parseUrl(window.location.href).domain !== $.path.parseUrl(event.origin).domain) return;
|
||||||
|
|
||||||
|
// Get target of this action
|
||||||
|
target = typeof(data.target) === 'undefined'
|
||||||
|
? $(window)
|
||||||
|
: $(data.target);
|
||||||
|
|
||||||
|
// Determine action
|
||||||
|
switch(data.type) {
|
||||||
|
case 'event':
|
||||||
|
target.trigger(data.event, data.data);
|
||||||
|
break;
|
||||||
|
case 'callback':
|
||||||
|
target[data.callback].call(target, data.data);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Position the loading spinner animation below the ss logo
|
* Position the loading spinner animation below the ss logo
|
||||||
*/
|
*/
|
||||||
@ -85,19 +119,36 @@ jQuery.noConflict();
|
|||||||
var url = xhr.getResponseHeader('X-ControllerURL'),
|
var url = xhr.getResponseHeader('X-ControllerURL'),
|
||||||
// TODO Replaces trailing slashes added by History after locale (e.g. admin/?locale=en/)
|
// TODO Replaces trailing slashes added by History after locale (e.g. admin/?locale=en/)
|
||||||
origUrl = History.getPageUrl().replace(/\/$/, ''),
|
origUrl = History.getPageUrl().replace(/\/$/, ''),
|
||||||
opts, requestHeaders = settings.headers;
|
destUrl = settings.url,
|
||||||
|
opts;
|
||||||
|
|
||||||
if(url !== null && !isSameUrl(origUrl, url)) {
|
// Only redirect if controller url differs to the requested or current one
|
||||||
opts = {pjax: xhr.getResponseHeader('X-Pjax') ? xhr.getResponseHeader('X-Pjax') : settings.headers['X-Pjax']};
|
if(url !== null &&
|
||||||
|
(!isSameUrl(origUrl, url) || !isSameUrl(destUrl, url))
|
||||||
|
) {
|
||||||
|
opts = {
|
||||||
|
// Ensure that redirections are followed through by history API by handing it a unique ID
|
||||||
|
id: (new Date()).getTime() + String(Math.random()).replace(/\D/g,''),
|
||||||
|
pjax: xhr.getResponseHeader('X-Pjax')
|
||||||
|
? xhr.getResponseHeader('X-Pjax')
|
||||||
|
: settings.headers['X-Pjax']
|
||||||
|
};
|
||||||
window.History.pushState(opts, '', url);
|
window.History.pushState(opts, '', url);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle custom status message headers
|
// Handle custom status message headers
|
||||||
var msg = (xhr.getResponseHeader('X-Status')) ? xhr.getResponseHeader('X-Status') : xhr.statusText,
|
var msg = (xhr.getResponseHeader('X-Status')) ? xhr.getResponseHeader('X-Status') : xhr.statusText,
|
||||||
|
reathenticate = xhr.getResponseHeader('X-Reauthenticate'),
|
||||||
msgType = (xhr.status < 200 || xhr.status > 399) ? 'bad' : 'good',
|
msgType = (xhr.status < 200 || xhr.status > 399) ? 'bad' : 'good',
|
||||||
ignoredMessages = ['OK'];
|
ignoredMessages = ['OK'];
|
||||||
|
|
||||||
|
// Enable reauthenticate dialog if requested
|
||||||
|
if(reathenticate) {
|
||||||
|
$('.cms-container').showLoginDialog();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Show message (but ignore aborted requests)
|
// Show message (but ignore aborted requests)
|
||||||
if(xhr.status !== 0 && msg && $.inArray(msg, ignoredMessages)) {
|
if(xhr.status !== 0 && msg && $.inArray(msg, ignoredMessages)) {
|
||||||
// Decode into UTF-8, HTTP headers don't allow multibyte
|
// Decode into UTF-8, HTTP headers don't allow multibyte
|
||||||
@ -374,7 +425,8 @@ jQuery.noConflict();
|
|||||||
// Artificial HTTP referer, IE doesn't submit them via ajax.
|
// Artificial HTTP referer, IE doesn't submit them via ajax.
|
||||||
// Also rewrites anchors to their page counterparts, which is important
|
// Also rewrites anchors to their page counterparts, which is important
|
||||||
// as automatic browser ajax response redirects seem to discard the hash/fragment.
|
// as automatic browser ajax response redirects seem to discard the hash/fragment.
|
||||||
formData.push({name: 'BackURL', value:History.getPageUrl()});
|
// TODO Replaces trailing slashes added by History after locale (e.g. admin/?locale=en/)
|
||||||
|
formData.push({name: 'BackURL', value:History.getPageUrl().replace(/\/$/, '')});
|
||||||
|
|
||||||
// Save tab selections so we can restore them later
|
// Save tab selections so we can restore them later
|
||||||
this.saveTabState();
|
this.saveTabState();
|
||||||
@ -804,6 +856,80 @@ jQuery.noConflict();
|
|||||||
.replace(/\?.*/, '')
|
.replace(/\?.*/, '')
|
||||||
.replace(/#.*/, '')
|
.replace(/#.*/, '')
|
||||||
.replace($('base').attr('href'), '');
|
.replace($('base').attr('href'), '');
|
||||||
|
},
|
||||||
|
|
||||||
|
showLoginDialog: function() {
|
||||||
|
var tempid = $('body').data('member-tempid'),
|
||||||
|
dialog = $('.leftandmain-logindialog'),
|
||||||
|
url = 'CMSSecurity/login';
|
||||||
|
|
||||||
|
// Force regeneration of any existing dialog
|
||||||
|
if(dialog.length) dialog.remove();
|
||||||
|
|
||||||
|
// Join url params
|
||||||
|
url = $.path.addSearchParams(url, {
|
||||||
|
'tempid': tempid,
|
||||||
|
'BackURL': window.location.href
|
||||||
|
});
|
||||||
|
|
||||||
|
// Show a placeholder for instant feedback. Will be replaced with actual
|
||||||
|
// form dialog once its loaded.
|
||||||
|
dialog = $('<div class="leftandmain-logindialog"></div>');
|
||||||
|
dialog.attr('id', new Date().getTime());
|
||||||
|
dialog.data('url', url);
|
||||||
|
$('body').append(dialog);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Login dialog page
|
||||||
|
$('.leftandmain-logindialog').entwine({
|
||||||
|
onmatch: function() {
|
||||||
|
this._super();
|
||||||
|
|
||||||
|
// Create jQuery dialog
|
||||||
|
this.ssdialog({
|
||||||
|
iframeUrl: this.data('url'),
|
||||||
|
dialogClass: "leftandmain-logindialog-dialog",
|
||||||
|
autoOpen: true,
|
||||||
|
minWidth: 500,
|
||||||
|
maxWidth: 500,
|
||||||
|
minHeight: 370,
|
||||||
|
maxHeight: 400,
|
||||||
|
closeOnEscape: false,
|
||||||
|
open: function() {
|
||||||
|
$('.ui-widget-overlay').addClass('leftandmain-logindialog-overlay');
|
||||||
|
},
|
||||||
|
close: function() {
|
||||||
|
$('.ui-widget-overlay').removeClass('leftandmain-logindialog-overlay');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onunmatch: function() {
|
||||||
|
this._super();
|
||||||
|
},
|
||||||
|
open: function() {
|
||||||
|
this.ssdialog('open');
|
||||||
|
},
|
||||||
|
close: function() {
|
||||||
|
this.ssdialog('close');
|
||||||
|
},
|
||||||
|
toggle: function(bool) {
|
||||||
|
if(this.is(':visible')) this.close();
|
||||||
|
else this.open();
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* Callback activated by CMSSecurity_success.ss
|
||||||
|
*/
|
||||||
|
reauthenticate: function(data) {
|
||||||
|
// Replace all SecurityID fields with the given value
|
||||||
|
if(typeof(data.SecurityID) !== 'undefined') {
|
||||||
|
$(':input[name=SecurityID]').val(data.SecurityID);
|
||||||
|
}
|
||||||
|
// Update TempID for current user
|
||||||
|
if(typeof(data.TempID) !== 'undefined') {
|
||||||
|
$('body').data('member-tempid', data.TempID);
|
||||||
|
}
|
||||||
|
this.close();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
63
admin/scss/_CMSSecurity.scss
Normal file
63
admin/scss/_CMSSecurity.scss
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
.cms-security {
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
margin: 45px 40px 5px 25px;
|
||||||
|
font-size: 1.9em;
|
||||||
|
line-height: 1.2;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.Content {
|
||||||
|
margin: 0 50px 0 25px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.Form {
|
||||||
|
margin: 0 25px;
|
||||||
|
|
||||||
|
.field {
|
||||||
|
border: 0 none;
|
||||||
|
@include box-shadow(none);
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
|
||||||
|
label.left {
|
||||||
|
float: none;
|
||||||
|
width: auto;
|
||||||
|
}
|
||||||
|
.middleColumn {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#Password {
|
||||||
|
width: 300px;
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ForgotPassword {
|
||||||
|
float: left;
|
||||||
|
padding: 40px 0 0 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#Remember {
|
||||||
|
clear: both;
|
||||||
|
}
|
||||||
|
|
||||||
|
.Actions {
|
||||||
|
padding: 20px 0 0 0;
|
||||||
|
|
||||||
|
#doLogout {
|
||||||
|
line-height: 28px;
|
||||||
|
margin: 0 0 0 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.leftandmain-logindialog-dialog .ui-dialog-titlebar-close {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.leftandmain-logindialog-overlay {
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
@ -1427,11 +1427,11 @@ body.cms-dialog {
|
|||||||
|
|
||||||
input.remoteurl {
|
input.remoteurl {
|
||||||
padding-left: 40px;
|
padding-left: 40px;
|
||||||
|
max-width: 350px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
button.add-url{
|
button.add-url{
|
||||||
margin-top:5px;
|
margin-top:20px;
|
||||||
padding-top:15px;
|
|
||||||
@include clearfix;
|
@include clearfix;
|
||||||
border:none;
|
border:none;
|
||||||
background:none;
|
background:none;
|
||||||
@ -1443,9 +1443,7 @@ body.cms-dialog {
|
|||||||
}
|
}
|
||||||
.ui-button-text{
|
.ui-button-text{
|
||||||
margin-left:10px;
|
margin-left:10px;
|
||||||
margin-top:-5px;
|
padding-top:10px;
|
||||||
line-height:20px;
|
|
||||||
float:left;
|
|
||||||
}
|
}
|
||||||
&:hover, &:active{
|
&:hover, &:active{
|
||||||
border:none;
|
border:none;
|
||||||
|
|||||||
@ -58,8 +58,10 @@ $experimental-support-for-svg: true;
|
|||||||
@import "actionTabs.scss";
|
@import "actionTabs.scss";
|
||||||
@import "ModelAdmin.scss";
|
@import "ModelAdmin.scss";
|
||||||
@import "SecurityAdmin.scss";
|
@import "SecurityAdmin.scss";
|
||||||
|
@import "CMSSecurity.scss";
|
||||||
|
|
||||||
/** -----------------------------
|
/** -----------------------------
|
||||||
* Retina graphics
|
* Retina graphics
|
||||||
* ----------------------------- */
|
* ----------------------------- */
|
||||||
@import "retina.scss";
|
@import "retina.scss";
|
||||||
|
|
||||||
|
|||||||
17
admin/templates/CMSSecurity_login.ss
Normal file
17
admin/templates/CMSSecurity_login.ss
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<% base_tag %>
|
||||||
|
<title>$Title</title>
|
||||||
|
</head>
|
||||||
|
<body class="cms cms-security">
|
||||||
|
<h1>$Title</h1>
|
||||||
|
<% if $Content %>
|
||||||
|
<div class="Content">$Content</div>
|
||||||
|
<% end_if %>
|
||||||
|
<div class="Form">
|
||||||
|
$Form
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
37
admin/templates/CMSSecurity_success.ss
Normal file
37
admin/templates/CMSSecurity_success.ss
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<% base_tag %>
|
||||||
|
<title>$Title</title>
|
||||||
|
</head>
|
||||||
|
<body class="cms cms-security">
|
||||||
|
<h1>$Title</h1>
|
||||||
|
<% if $Content %>
|
||||||
|
<div class="Content">$Content</div>
|
||||||
|
<% end_if %>
|
||||||
|
<script type="text/javascript">
|
||||||
|
// Ensure top level section is updated
|
||||||
|
(function($) {
|
||||||
|
$(function() {
|
||||||
|
var securityID = '{$SecurityID.JS}',
|
||||||
|
memberToken = '{$CurrentMember.TempIDHash.JS}',
|
||||||
|
domain = $.path.parseUrl(window.location.href).domain;
|
||||||
|
|
||||||
|
window.top.postMessage(
|
||||||
|
JSON.stringify({
|
||||||
|
type: 'callback',
|
||||||
|
callback: 'reauthenticate',
|
||||||
|
target: '.leftandmain-logindialog',
|
||||||
|
data: {
|
||||||
|
'SecurityID': securityID,
|
||||||
|
'TempID': memberToken
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
domain
|
||||||
|
);
|
||||||
|
});
|
||||||
|
})(jQuery);
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
@ -6,7 +6,9 @@
|
|||||||
<meta name="viewport" content="width=720, maximum-scale=1.0" />
|
<meta name="viewport" content="width=720, maximum-scale=1.0" />
|
||||||
<title>$Title</title>
|
<title>$Title</title>
|
||||||
</head>
|
</head>
|
||||||
<body class="loading cms" lang="$Locale.RFC1766" data-frameworkpath="$ModulePath(framework)">
|
<body class="loading cms" lang="$Locale.RFC1766" data-frameworkpath="$ModulePath(framework)"
|
||||||
|
data-member-tempid="$CurrentMember.TempIDHash.ATT"
|
||||||
|
>
|
||||||
<% include CMSLoadingScreen %>
|
<% include CMSLoadingScreen %>
|
||||||
|
|
||||||
<div class="cms-container center" data-layout-type="custom">
|
<div class="cms-container center" data-layout-type="custom">
|
||||||
|
|||||||
@ -201,7 +201,7 @@ class RSSFeed extends ViewableData {
|
|||||||
|
|
||||||
if(!headers_sent()) {
|
if(!headers_sent()) {
|
||||||
HTTP::add_cache_headers();
|
HTTP::add_cache_headers();
|
||||||
$response->addHeader("Content-Type", "application/rss+xml");
|
$response->addHeader("Content-Type", "application/rss+xml; charset=utf-8");
|
||||||
}
|
}
|
||||||
|
|
||||||
Config::inst()->update('SSViewer', 'source_file_comments', $prevState);
|
Config::inst()->update('SSViewer', 'source_file_comments', $prevState);
|
||||||
|
|||||||
@ -7,7 +7,8 @@
|
|||||||
* @package framework
|
* @package framework
|
||||||
* @subpackage integration
|
* @subpackage integration
|
||||||
*/
|
*/
|
||||||
class RestfulService extends ViewableData {
|
class RestfulService extends ViewableData implements Flushable {
|
||||||
|
|
||||||
protected $baseURL;
|
protected $baseURL;
|
||||||
protected $queryString;
|
protected $queryString;
|
||||||
protected $errorTag;
|
protected $errorTag;
|
||||||
@ -29,6 +30,19 @@ class RestfulService extends ViewableData {
|
|||||||
*/
|
*/
|
||||||
private static $default_curl_options = array();
|
private static $default_curl_options = array();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @config
|
||||||
|
* @var bool Flushes caches if set to true. This is set by {@link flush()}
|
||||||
|
*/
|
||||||
|
private static $flush = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Triggered early in the request when someone requests a flush.
|
||||||
|
*/
|
||||||
|
public static function flush() {
|
||||||
|
self::$flush = true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* set a curl option that will be applied to all requests as default
|
* set a curl option that will be applied to all requests as default
|
||||||
* {@see http://php.net/manual/en/function.curl-setopt.php#refsect1-function.curl-setopt-parameters}
|
* {@see http://php.net/manual/en/function.curl-setopt.php#refsect1-function.curl-setopt-parameters}
|
||||||
@ -168,7 +182,7 @@ class RestfulService extends ViewableData {
|
|||||||
// Check for unexpired cached feed (unless flush is set)
|
// Check for unexpired cached feed (unless flush is set)
|
||||||
//assume any cache_expire that is 0 or less means that we dont want to
|
//assume any cache_expire that is 0 or less means that we dont want to
|
||||||
// cache
|
// cache
|
||||||
if($this->cache_expire > 0 && !isset($_GET['flush'])
|
if($this->cache_expire > 0 && self::$flush
|
||||||
&& @file_exists($cache_path)
|
&& @file_exists($cache_path)
|
||||||
&& @filemtime($cache_path) + $this->cache_expire > time()) {
|
&& @filemtime($cache_path) + $this->cache_expire > time()) {
|
||||||
|
|
||||||
|
|||||||
@ -54,7 +54,7 @@
|
|||||||
* _ss_environment.php handler
|
* _ss_environment.php handler
|
||||||
*/
|
*/
|
||||||
if(defined('SS_ENVIRONMENT_FILE')) {
|
if(defined('SS_ENVIRONMENT_FILE')) {
|
||||||
// Only perform valdiation if SS_ENVIRONMENT_FILE is actually set, which is to say, there is an
|
// Only perform validation if SS_ENVIRONMENT_FILE is actually set, which is to say, there is an
|
||||||
// _ss_environment.php file
|
// _ss_environment.php file
|
||||||
foreach(array(
|
foreach(array(
|
||||||
'SS_DATABASE_PASSWORD',
|
'SS_DATABASE_PASSWORD',
|
||||||
@ -62,7 +62,7 @@ if(defined('SS_ENVIRONMENT_FILE')) {
|
|||||||
'SS_ENVIRONMENT_TYPE',) as $reqDefine) {
|
'SS_ENVIRONMENT_TYPE',) as $reqDefine) {
|
||||||
if(!defined($reqDefine)) {
|
if(!defined($reqDefine)) {
|
||||||
user_error("$reqDefine must be defined in your _ss_environment.php."
|
user_error("$reqDefine must be defined in your _ss_environment.php."
|
||||||
. "See http://doc.silverstripe.org/framework/en/topics/environment-management for more infomration",
|
. "See http://doc.silverstripe.org/framework/en/topics/environment-management for more information",
|
||||||
E_USER_ERROR);
|
E_USER_ERROR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -129,7 +129,7 @@ if(defined('SS_DEFAULT_ADMIN_USERNAME')) {
|
|||||||
if(!defined('SS_DEFAULT_ADMIN_PASSWORD')) {
|
if(!defined('SS_DEFAULT_ADMIN_PASSWORD')) {
|
||||||
user_error("SS_DEFAULT_ADMIN_PASSWORD must be defined in your _ss_environment.php,"
|
user_error("SS_DEFAULT_ADMIN_PASSWORD must be defined in your _ss_environment.php,"
|
||||||
. "if SS_DEFAULT_ADMIN_USERNAME is defined. See "
|
. "if SS_DEFAULT_ADMIN_USERNAME is defined. See "
|
||||||
. "http://doc.silverstripe.org/framework/en/topics/environment-management for more infomration",
|
. "http://doc.silverstripe.org/framework/en/topics/environment-management for more information",
|
||||||
E_USER_ERROR);
|
E_USER_ERROR);
|
||||||
}
|
}
|
||||||
Security::setDefaultAdmin(SS_DEFAULT_ADMIN_USERNAME, SS_DEFAULT_ADMIN_PASSWORD);
|
Security::setDefaultAdmin(SS_DEFAULT_ADMIN_USERNAME, SS_DEFAULT_ADMIN_PASSWORD);
|
||||||
|
|||||||
@ -282,9 +282,12 @@ class Director implements TemplateGlobalProvider {
|
|||||||
} else {
|
} else {
|
||||||
$_SERVER['HTTP_HOST'] = $bits['host'];
|
$_SERVER['HTTP_HOST'] = $bits['host'];
|
||||||
}
|
}
|
||||||
$url = Director::makeRelative($url);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Ensure URL is properly made relative.
|
||||||
|
// Example: url passed is "/ss31/my-page" (prefixed with BASE_URL), this should be changed to "my-page"
|
||||||
|
$url = self::makeRelative($url);
|
||||||
|
|
||||||
$urlWithQuerystring = $url;
|
$urlWithQuerystring = $url;
|
||||||
if(strpos($url, '?') !== false) {
|
if(strpos($url, '?') !== false) {
|
||||||
list($url, $getVarsEncoded) = explode('?', $url, 2);
|
list($url, $getVarsEncoded) = explode('?', $url, 2);
|
||||||
|
|||||||
24
control/FlushRequestFilter.php
Normal file
24
control/FlushRequestFilter.php
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Triggers a call to flush() on all implementors of Flushable.
|
||||||
|
*
|
||||||
|
* @package framework
|
||||||
|
* @subpackage control
|
||||||
|
*/
|
||||||
|
class FlushRequestFilter implements RequestFilter {
|
||||||
|
|
||||||
|
public function preRequest(SS_HTTPRequest $request, Session $session, DataModel $model) {
|
||||||
|
if(array_key_exists('flush', $request->getVars())) {
|
||||||
|
foreach(ClassInfo::implementorsOf('Flushable') as $class) {
|
||||||
|
$class::flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -397,7 +397,7 @@ class SS_HTTPRequest implements ArrayAccess {
|
|||||||
$response = new SS_HTTPResponse($fileData);
|
$response = new SS_HTTPResponse($fileData);
|
||||||
$response->addHeader("Content-Type", "$mimeType; name=\"" . addslashes($fileName) . "\"");
|
$response->addHeader("Content-Type", "$mimeType; name=\"" . addslashes($fileName) . "\"");
|
||||||
// Note a IE-only fix that inspects this header in HTTP::add_cache_headers().
|
// Note a IE-only fix that inspects this header in HTTP::add_cache_headers().
|
||||||
$response->addHeader("Content-disposition", "attachment; filename=" . addslashes($fileName));
|
$response->addHeader("Content-Disposition", "attachment; filename=" . addslashes($fileName));
|
||||||
$response->addHeader("Content-Length", strlen($fileData));
|
$response->addHeader("Content-Length", strlen($fileData));
|
||||||
|
|
||||||
return $response;
|
return $response;
|
||||||
|
|||||||
@ -66,7 +66,7 @@
|
|||||||
* to specifically remove it. To clear a value you can either delete 1 session value by the name that you saved it
|
* to specifically remove it. To clear a value you can either delete 1 session value by the name that you saved it
|
||||||
*
|
*
|
||||||
* <code>
|
* <code>
|
||||||
* Session::clear('MyValue'); // myvalue is no longer 6.
|
* Session::clear('MyValue'); // MyValue is no longer 6.
|
||||||
* </code>
|
* </code>
|
||||||
*
|
*
|
||||||
* Or you can clear every single value in the session at once. Note SilverStripe stores some of its own session data
|
* Or you can clear every single value in the session at once. Note SilverStripe stores some of its own session data
|
||||||
@ -376,10 +376,8 @@ class Session {
|
|||||||
// seperate (less secure) session for non-HTTPS requests
|
// seperate (less secure) session for non-HTTPS requests
|
||||||
if($secure) session_name('SECSESSID');
|
if($secure) session_name('SECSESSID');
|
||||||
|
|
||||||
// @ is to supress win32 warnings/notices when session wasn't cleaned up properly
|
|
||||||
// There's nothing we can do about this, because it's an operating system function!
|
|
||||||
if($sid) session_id($sid);
|
if($sid) session_id($sid);
|
||||||
@session_start();
|
session_start();
|
||||||
|
|
||||||
$this->data = isset($_SESSION) ? $_SESSION : array();
|
$this->data = isset($_SESSION) ? $_SESSION : array();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -181,6 +181,13 @@ class Injector {
|
|||||||
*/
|
*/
|
||||||
protected $objectCreator;
|
protected $objectCreator;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Locator for determining Config properties for services
|
||||||
|
*
|
||||||
|
* @var ServiceConfigurationLocator
|
||||||
|
*/
|
||||||
|
protected $configLocator;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new injector.
|
* Create a new injector.
|
||||||
*
|
*
|
||||||
|
|||||||
@ -9,7 +9,13 @@
|
|||||||
* @subpackage injector
|
* @subpackage injector
|
||||||
*/
|
*/
|
||||||
class ServiceConfigurationLocator {
|
class ServiceConfigurationLocator {
|
||||||
public function locateConfigFor($name) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
/**
|
||||||
|
* Finds the Injector config for a named service.
|
||||||
|
*
|
||||||
|
* @param string $name
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function locateConfigFor($name) {}
|
||||||
}
|
}
|
||||||
@ -7,37 +7,35 @@
|
|||||||
* @package framework
|
* @package framework
|
||||||
* @subpackage injector
|
* @subpackage injector
|
||||||
*/
|
*/
|
||||||
class SilverStripeServiceConfigurationLocator {
|
class SilverStripeServiceConfigurationLocator extends ServiceConfigurationLocator {
|
||||||
|
|
||||||
private $configs = array();
|
/**
|
||||||
|
* List of Injector configurations cached from Config in class => config format.
|
||||||
|
* If any config is false, this denotes that this class and all its parents
|
||||||
|
* have no configuration specified.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
protected $configs = array();
|
||||||
|
|
||||||
public function locateConfigFor($name) {
|
public function locateConfigFor($name) {
|
||||||
|
// Check direct or cached result
|
||||||
if (isset($this->configs[$name])) {
|
$config = $this->configFor($name);
|
||||||
return $this->configs[$name];
|
if($config !== null) return $config;
|
||||||
}
|
|
||||||
|
|
||||||
$config = Config::inst()->get('Injector', $name);
|
|
||||||
if ($config) {
|
|
||||||
$this->configs[$name] = $config;
|
|
||||||
return $config;
|
|
||||||
}
|
|
||||||
|
|
||||||
// do parent lookup if it's a class
|
// do parent lookup if it's a class
|
||||||
if (class_exists($name)) {
|
if (class_exists($name)) {
|
||||||
$parents = array_reverse(array_keys(ClassInfo::ancestry($name)));
|
$parents = array_reverse(array_keys(ClassInfo::ancestry($name)));
|
||||||
array_shift($parents);
|
array_shift($parents);
|
||||||
|
|
||||||
foreach ($parents as $parent) {
|
foreach ($parents as $parent) {
|
||||||
// have we already got for this?
|
// have we already got for this?
|
||||||
if (isset($this->configs[$parent])) {
|
$config = $this->configFor($parent);
|
||||||
return $this->configs[$parent];
|
if($config !== null) {
|
||||||
}
|
// Cache this result
|
||||||
$config = Config::inst()->get('Injector', $parent);
|
|
||||||
if ($config) {
|
|
||||||
$this->configs[$name] = $config;
|
$this->configs[$name] = $config;
|
||||||
return $config;
|
return $config;
|
||||||
} else {
|
}
|
||||||
$this->configs[$parent] = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -45,5 +43,28 @@ class SilverStripeServiceConfigurationLocator {
|
|||||||
// lookup through parents again
|
// lookup through parents again
|
||||||
$this->configs[$name] = false;
|
$this->configs[$name] = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves the config for a named service without performing a hierarchy walk
|
||||||
|
*
|
||||||
|
* @param string $name Name of service
|
||||||
|
* @return mixed Returns either the configuration data, if there is any. A missing config is denoted
|
||||||
|
* by a value of either null (there is no direct config assigned and a hierarchy walk is necessary)
|
||||||
|
* or false (there is no config for this class, nor within the hierarchy for this class).
|
||||||
|
*/
|
||||||
|
protected function configFor($name) {
|
||||||
|
|
||||||
|
// Return cached result
|
||||||
|
if (isset($this->configs[$name])) {
|
||||||
|
return $this->configs[$name]; // Potentially false
|
||||||
|
}
|
||||||
|
|
||||||
|
$config = Config::inst()->get('Injector', $name);
|
||||||
|
if ($config) {
|
||||||
|
$this->configs[$name] = $config;
|
||||||
|
return $config;
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,13 +1,17 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides introspection information about the class tree.
|
* Provides introspection information about the class tree.
|
||||||
* It's a cached wrapper around the built-in class functions. SilverStripe uses class introspection heavily
|
*
|
||||||
* and without the caching it creates an unfortunate performance hit.
|
* It's a cached wrapper around the built-in class functions. SilverStripe uses
|
||||||
|
* class introspection heavily and without the caching it creates an unfortunate
|
||||||
|
* performance hit.
|
||||||
*
|
*
|
||||||
* @package framework
|
* @package framework
|
||||||
* @subpackage core
|
* @subpackage core
|
||||||
*/
|
*/
|
||||||
class ClassInfo {
|
class ClassInfo {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wrapper for classes getter.
|
* Wrapper for classes getter.
|
||||||
*/
|
*/
|
||||||
@ -244,5 +248,41 @@ class ClassInfo {
|
|||||||
return self::$method_from_cache[$class][$method] == $compclass;
|
return self::$method_from_cache[$class][$method] == $compclass;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the table name in the class hierarchy which contains a given
|
||||||
|
* field column for a {@link DataObject}. If the field does not exist, this
|
||||||
|
* will return null.
|
||||||
|
*
|
||||||
|
* @param string $candidateClass
|
||||||
|
* @param string $fieldName
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public static function table_for_object_field($candidateClass, $fieldName) {
|
||||||
|
if(!$candidateClass || !$fieldName) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$exists = class_exists($candidateClass);
|
||||||
|
|
||||||
|
while($candidateClass && $candidateClass != 'DataObject' && $exists) {
|
||||||
|
if(DataObject::has_own_table($candidateClass)) {
|
||||||
|
$inst = singleton($candidateClass);
|
||||||
|
|
||||||
|
if($inst->hasOwnTableDatabaseField($fieldName)) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$candidateClass = get_parent_class($candidateClass);
|
||||||
|
$exists = class_exists($candidateClass);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!$candidateClass || !$exists) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $candidateClass;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
20
core/Flushable.php
Normal file
20
core/Flushable.php
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Provides an interface for classes to implement their own flushing functionality
|
||||||
|
* whenever flush=1 is requested.
|
||||||
|
*
|
||||||
|
* @package framework
|
||||||
|
* @subpackage core
|
||||||
|
*/
|
||||||
|
interface Flushable {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This function is triggered early in the request if the "flush" query
|
||||||
|
* parameter has been set. Each class that implements Flushable implements
|
||||||
|
* this function which looks after it's own specific flushing functionality.
|
||||||
|
*
|
||||||
|
* @see FlushRequestFilter
|
||||||
|
*/
|
||||||
|
public static function flush();
|
||||||
|
|
||||||
|
}
|
||||||
@ -401,8 +401,9 @@ abstract class Object {
|
|||||||
* @param string $classOrExtension if 1 argument supplied, the class name of the extension to
|
* @param string $classOrExtension if 1 argument supplied, the class name of the extension to
|
||||||
* check for; if 2 supplied, the class name to test
|
* check for; if 2 supplied, the class name to test
|
||||||
* @param string $requiredExtension used only if 2 arguments supplied
|
* @param string $requiredExtension used only if 2 arguments supplied
|
||||||
|
* @param boolean $strict if the extension has to match the required extension and not be a subclass
|
||||||
*/
|
*/
|
||||||
public static function has_extension($classOrExtension, $requiredExtension = null) {
|
public static function has_extension($classOrExtension, $requiredExtension = null, $strict = false) {
|
||||||
//BC support
|
//BC support
|
||||||
if(func_num_args() > 1){
|
if(func_num_args() > 1){
|
||||||
$class = $classOrExtension;
|
$class = $classOrExtension;
|
||||||
@ -420,6 +421,7 @@ abstract class Object {
|
|||||||
$left = strtolower(Extension::get_classname_without_arguments($extension));
|
$left = strtolower(Extension::get_classname_without_arguments($extension));
|
||||||
$right = strtolower(Extension::get_classname_without_arguments($requiredExtension));
|
$right = strtolower(Extension::get_classname_without_arguments($requiredExtension));
|
||||||
if($left == $right) return true;
|
if($left == $right) return true;
|
||||||
|
if (!$strict && is_subclass_of($left, $right)) return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@ -15,12 +15,14 @@ Used in side panels and action tabs
|
|||||||
|
|
||||||
.backlink { padding-left: 12px; }
|
.backlink { padding-left: 12px; }
|
||||||
|
|
||||||
body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fieldset { padding: 16px; overflow: auto; background: #E2E2E2; }
|
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: #777777; 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: #777777; 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; }
|
body.cms.ss-uploadfield-edit-iframe .fieldholder-small label, .composite.ss-assetuploadfield .details fieldset .fieldholder-small label { margin-left: 0; }
|
||||||
|
|
||||||
.ss-assetuploadfield { border-bottom: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
|
.composite.ss-assetuploadfield .details fieldset { padding: 16px; }
|
||||||
.ss-assetuploadfield h3 { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin: 0 0 8px; padding: 0 0 7px; clear: both; position: relative; }
|
|
||||||
|
.ss-assetuploadfield { border-bottom: 0; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
||||||
|
.ss-assetuploadfield h3 { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin: 0 0 8px; padding: 0 0 7px; clear: both; position: relative; }
|
||||||
.ss-assetuploadfield .field { border-bottom: 0; box-shadow: none; }
|
.ss-assetuploadfield .field { border-bottom: 0; box-shadow: none; }
|
||||||
.ss-assetuploadfield .fileOverview { clear: both; margin-top: 10px; position: relative; }
|
.ss-assetuploadfield .fileOverview { clear: both; margin-top: 10px; position: relative; }
|
||||||
.ss-assetuploadfield .fileOverview .uploadStatus:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
|
.ss-assetuploadfield .fileOverview .uploadStatus:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
|
||||||
@ -28,31 +30,31 @@ body.cms.ss-uploadfield-edit-iframe .fieldholder-small label, .composite.ss-asse
|
|||||||
.ss-assetuploadfield .fileOverview .uploadStatus .state { float: left; font-size: 16px; font-weight: bold; line-height: 1.1em; }
|
.ss-assetuploadfield .fileOverview .uploadStatus .state { float: left; font-size: 16px; font-weight: bold; line-height: 1.1em; }
|
||||||
.ss-assetuploadfield .fileOverview .uploadStatus .details { opacity: 0.9; float: right; }
|
.ss-assetuploadfield .fileOverview .uploadStatus .details { opacity: 0.9; float: right; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-item-actions.edit-all { clear: both; position: relative; z-index: 9; }
|
.ss-assetuploadfield .ss-uploadfield-item-actions.edit-all { clear: both; position: relative; z-index: 9; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-item-actions.edit-all .ss-uploadfield-item-edit-all { z-index: 8; position: absolute; top: -33px; padding: 0; background: none; border: 0; right: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; color: #444444; }
|
.ss-assetuploadfield .ss-uploadfield-item-actions.edit-all .ss-uploadfield-item-edit-all { z-index: 8; position: absolute; top: -33px; padding: 0; background: none; border: 0; right: 0; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; color: #444; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-item-actions.edit-all .ss-uploadfield-item-edit-all:hover { color: #1e7cba; }
|
.ss-assetuploadfield .ss-uploadfield-item-actions.edit-all .ss-uploadfield-item-edit-all:hover { color: #1e7cba; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files { margin: 0; padding: 0; clear: both; }
|
.ss-assetuploadfield .ss-uploadfield-files { margin: 0; padding: 0; clear: both; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item { border: 1px solid #b3b3b3; -webkit-border-radius: 5px; -moz-border-radius: 5px; -ms-border-radius: 5px; -o-border-radius: 5px; border-radius: 5px; -webkit-background-clip: padding; -moz-background-clip: padding; background-clip: padding-box; margin: 0 0 5px; padding: 0; overflow: hidden; position: relative; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item { border: 1px solid #b3b3b3; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; -moz-background-clip: padding; -o-background-clip: padding-box; -webkit-background-clip: padding; background-clip: padding-box; margin: 0 0 5px; padding: 0; overflow: hidden; position: relative; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item .info { position: relative; padding: 7px; overflow: hidden; background-color: #FFBE66; border: 1px solid #FF9300; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item .info { position: relative; padding: 7px; overflow: hidden; background-color: #FFBE66; border: 1px solid #FF9300; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-preview { position: absolute; height: 30px; width: 40px; overflow: hidden; z-index: 1; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-preview { position: absolute; height: 30px; width: 40px; overflow: hidden; z-index: 1; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-preview .no-preview { display: block; height: 100%; width: 100%; background: url("../images/icons/document.png") 2px 0px no-repeat; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-preview .no-preview { display: block; height: 100%; width: 100%; background: url("../images/icons/document.png") 2px 0px no-repeat; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-info { position: relative; line-height: 30px; overflow: hidden; background-color: #5db4df; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5db4df), color-stop(8%, #5db1dd), color-stop(50%, #439bcb), color-stop(54%, #3f99cd), color-stop(96%, #207db6), color-stop(100%, #1e7cba)); background-image: -webkit-linear-gradient(top, #5db4df 0%, #5db1dd 8%, #439bcb 50%, #3f99cd 54%, #207db6 96%, #1e7cba 100%); background-image: -moz-linear-gradient(top, #5db4df 0%, #5db1dd 8%, #439bcb 50%, #3f99cd 54%, #207db6 96%, #1e7cba 100%); background-image: -o-linear-gradient(top, #5db4df 0%, #5db1dd 8%, #439bcb 50%, #3f99cd 54%, #207db6 96%, #1e7cba 100%); background-image: linear-gradient(top, #5db4df 0%, #5db1dd 8%, #439bcb 50%, #3f99cd 54%, #207db6 96%, #1e7cba 100%); }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-info { position: relative; line-height: 30px; overflow: hidden; background-color: #5db4df; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzVkYjRkZiIvPjxzdG9wIG9mZnNldD0iOCUiIHN0b3AtY29sb3I9IiM1ZGIxZGQiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzQzOWJjYiIvPjxzdG9wIG9mZnNldD0iNTQlIiBzdG9wLWNvbG9yPSIjM2Y5OWNkIi8+PHN0b3Agb2Zmc2V0PSI5NiUiIHN0b3AtY29sb3I9IiMyMDdkYjYiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMxZTdjYmEiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5db4df), color-stop(8%, #5db1dd), color-stop(50%, #439bcb), color-stop(54%, #3f99cd), color-stop(96%, #207db6), color-stop(100%, #1e7cba)); background-image: -moz-linear-gradient(top, #5db4df 0%, #5db1dd 8%, #439bcb 50%, #3f99cd 54%, #207db6 96%, #1e7cba 100%); background-image: -webkit-linear-gradient(top, #5db4df 0%, #5db1dd 8%, #439bcb 50%, #3f99cd 54%, #207db6 96%, #1e7cba 100%); background-image: linear-gradient(to bottom, #5db4df 0%, #5db1dd 8%, #439bcb 50%, #3f99cd 54%, #207db6 96%, #1e7cba 100%); }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ui-state-error .ss-uploadfield-item-info { background-color: #c11f1d; padding-right: 130px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c11f1d), color-stop(4%, #bf1d1b), color-stop(8%, #b71b1c), color-stop(15%, #b61e1d), color-stop(27%, #b11d1d), color-stop(31%, #ab1d1c), color-stop(42%, #a51b1b), color-stop(46%, #9f1b19), color-stop(50%, #9f1b19), color-stop(54%, #991c1a), color-stop(58%, #971a18), color-stop(62%, #911b1b), color-stop(65%, #911b1b), color-stop(88%, #7e1816), color-stop(92%, #771919), color-stop(100%, #731817)); background-image: -webkit-linear-gradient(top, #c11f1d 0%, #bf1d1b 4%, #b71b1c 8%, #b61e1d 15%, #b11d1d 27%, #ab1d1c 31%, #a51b1b 42%, #9f1b19 46%, #9f1b19 50%, #991c1a 54%, #971a18 58%, #911b1b 62%, #911b1b 65%, #7e1816 88%, #771919 92%, #731817 100%); background-image: -moz-linear-gradient(top, #c11f1d 0%, #bf1d1b 4%, #b71b1c 8%, #b61e1d 15%, #b11d1d 27%, #ab1d1c 31%, #a51b1b 42%, #9f1b19 46%, #9f1b19 50%, #991c1a 54%, #971a18 58%, #911b1b 62%, #911b1b 65%, #7e1816 88%, #771919 92%, #731817 100%); background-image: -o-linear-gradient(top, #c11f1d 0%, #bf1d1b 4%, #b71b1c 8%, #b61e1d 15%, #b11d1d 27%, #ab1d1c 31%, #a51b1b 42%, #9f1b19 46%, #9f1b19 50%, #991c1a 54%, #971a18 58%, #911b1b 62%, #911b1b 65%, #7e1816 88%, #771919 92%, #731817 100%); background-image: linear-gradient(top, #c11f1d 0%, #bf1d1b 4%, #b71b1c 8%, #b61e1d 15%, #b11d1d 27%, #ab1d1c 31%, #a51b1b 42%, #9f1b19 46%, #9f1b19 50%, #991c1a 54%, #971a18 58%, #911b1b 62%, #911b1b 65%, #7e1816 88%, #771919 92%, #731817 100%); }
|
.ss-assetuploadfield .ss-uploadfield-files .ui-state-error .ss-uploadfield-item-info { background-color: #c11f1d; padding-right: 130px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2MxMWYxZCIvPjxzdG9wIG9mZnNldD0iNCUiIHN0b3AtY29sb3I9IiNiZjFkMWIiLz48c3RvcCBvZmZzZXQ9IjglIiBzdG9wLWNvbG9yPSIjYjcxYjFjIi8+PHN0b3Agb2Zmc2V0PSIxNSUiIHN0b3AtY29sb3I9IiNiNjFlMWQiLz48c3RvcCBvZmZzZXQ9IjI3JSIgc3RvcC1jb2xvcj0iI2IxMWQxZCIvPjxzdG9wIG9mZnNldD0iMzElIiBzdG9wLWNvbG9yPSIjYWIxZDFjIi8+PHN0b3Agb2Zmc2V0PSI0MiUiIHN0b3AtY29sb3I9IiNhNTFiMWIiLz48c3RvcCBvZmZzZXQ9IjQ2JSIgc3RvcC1jb2xvcj0iIzlmMWIxOSIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjOWYxYjE5Ii8+PHN0b3Agb2Zmc2V0PSI1NCUiIHN0b3AtY29sb3I9IiM5OTFjMWEiLz48c3RvcCBvZmZzZXQ9IjU4JSIgc3RvcC1jb2xvcj0iIzk3MWExOCIvPjxzdG9wIG9mZnNldD0iNjIlIiBzdG9wLWNvbG9yPSIjOTExYjFiIi8+PHN0b3Agb2Zmc2V0PSI2NSUiIHN0b3AtY29sb3I9IiM5MTFiMWIiLz48c3RvcCBvZmZzZXQ9Ijg4JSIgc3RvcC1jb2xvcj0iIzdlMTgxNiIvPjxzdG9wIG9mZnNldD0iOTIlIiBzdG9wLWNvbG9yPSIjNzcxOTE5Ii8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjNzMxODE3Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c11f1d), color-stop(4%, #bf1d1b), color-stop(8%, #b71b1c), color-stop(15%, #b61e1d), color-stop(27%, #b11d1d), color-stop(31%, #ab1d1c), color-stop(42%, #a51b1b), color-stop(46%, #9f1b19), color-stop(50%, #9f1b19), color-stop(54%, #991c1a), color-stop(58%, #971a18), color-stop(62%, #911b1b), color-stop(65%, #911b1b), color-stop(88%, #7e1816), color-stop(92%, #771919), color-stop(100%, #731817)); background-image: -moz-linear-gradient(top, #c11f1d 0%, #bf1d1b 4%, #b71b1c 8%, #b61e1d 15%, #b11d1d 27%, #ab1d1c 31%, #a51b1b 42%, #9f1b19 46%, #9f1b19 50%, #991c1a 54%, #971a18 58%, #911b1b 62%, #911b1b 65%, #7e1816 88%, #771919 92%, #731817 100%); background-image: -webkit-linear-gradient(top, #c11f1d 0%, #bf1d1b 4%, #b71b1c 8%, #b61e1d 15%, #b11d1d 27%, #ab1d1c 31%, #a51b1b 42%, #9f1b19 46%, #9f1b19 50%, #991c1a 54%, #971a18 58%, #911b1b 62%, #911b1b 65%, #7e1816 88%, #771919 92%, #731817 100%); background-image: linear-gradient(to bottom, #c11f1d 0%, #bf1d1b 4%, #b71b1c 8%, #b61e1d 15%, #b11d1d 27%, #ab1d1c 31%, #a51b1b 42%, #9f1b19 46%, #9f1b19 50%, #991c1a 54%, #971a18 58%, #911b1b 62%, #911b1b 65%, #7e1816 88%, #771919 92%, #731817 100%); }
|
||||||
.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 { 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-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: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e5d33b), color-stop(8%, #e2ce24), color-stop(50%, #d1be1c), color-stop(54%, #d1bc1b), color-stop(96%, #d09a1a), color-stop(100%, #ce8719)); background-image: -webkit-linear-gradient(top, #e5d33b 0%, #e2ce24 8%, #d1be1c 50%, #d1bc1b 54%, #d09a1a 96%, #ce8719 100%); background-image: -moz-linear-gradient(top, #e5d33b 0%, #e2ce24 8%, #d1be1c 50%, #d1bc1b 54%, #d09a1a 96%, #ce8719 100%); background-image: -o-linear-gradient(top, #e5d33b 0%, #e2ce24 8%, #d1be1c 50%, #d1bc1b 54%, #d09a1a 96%, #ce8719 100%); background-image: linear-gradient(top, #e5d33b 0%, #e2ce24 8%, #d1be1c 50%, #d1bc1b 54%, #d09a1a 96%, #ce8719 100%); }
|
.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+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U1ZDMzYiIvPjxzdG9wIG9mZnNldD0iOCUiIHN0b3AtY29sb3I9IiNlMmNlMjQiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iI2QxYmUxYyIvPjxzdG9wIG9mZnNldD0iNTQlIiBzdG9wLWNvbG9yPSIjZDFiYzFiIi8+PHN0b3Agb2Zmc2V0PSI5NiUiIHN0b3AtY29sb3I9IiNkMDlhMWEiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNjZTg3MTkiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); 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%, #d1bc1b), color-stop(96%, #d09a1a), color-stop(100%, #ce8719)); background-image: -moz-linear-gradient(top, #e5d33b 0%, #e2ce24 8%, #d1be1c 50%, #d1bc1b 54%, #d09a1a 96%, #ce8719 100%); background-image: -webkit-linear-gradient(top, #e5d33b 0%, #e2ce24 8%, #d1be1c 50%, #d1bc1b 54%, #d09a1a 96%, #ce8719 100%); background-image: linear-gradient(to bottom, #e5d33b 0%, #e2ce24 8%, #d1be1c 50%, #d1bc1b 54%, #d09a1a 96%, #ce8719 100%); }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name { position: relative; z-index: 1; margin: 3px 0 3px 50px; width: 50%; color: #5e5e5e; background: #eeeded; background: rgba(255, 255, 255, 0.8); -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; -o-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: #5e5e5e; 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 .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 { 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; }
|
.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; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-warning-text { color: #b7a403; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-warning-text { color: #b7a403; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-success-text { color: #1f9433; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-success-text { color: #1F9433; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions { position: absolute; top: 0; right: 0; left: 0; z-index: 0; color: #f00; font-size: 14px; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions { position: absolute; top: 0; right: 0; left: 0; z-index: 0; color: #f00; font-size: 14px; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button { background: none; border: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; text-shadow: none; color: white; float: right; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button { background: none; border: 0; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; text-shadow: none; color: white; float: right; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-delete { display: none; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-delete { display: none; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-cancel, .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-overwrite-warning { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; border-left: 1px solid rgba(255, 255, 255, 0.2); margin-top: 0px; cursor: pointer; opacity: 0.9; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-cancel, .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-overwrite-warning { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; border-left: 1px solid rgba(255, 255, 255, 0.2); margin-top: 0px; cursor: pointer; opacity: 0.9; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-cancel:hover, .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-overwrite-warning:hover { opacity: 1; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-cancel:hover, .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-overwrite-warning:hover { opacity: 1; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-cancel .ui-icon, .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-overwrite-warning .ui-icon { display: block; margin: 0; position: realtive; top: 8px; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-cancel .ui-icon, .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-overwrite-warning .ui-icon { display: block; margin: 0; position: realtive; top: 8px; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-edit { opacity: 0.9; padding-top: 1px; padding-bottom: 0; height: 100%; -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-edit { opacity: 0.9; padding-top: 1px; padding-bottom: 0; height: 100%; -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-edit.ui-state-hover { background: none; opacity: 1; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-edit.ui-state-hover { background: none; opacity: 1; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-edit.ui-state-hover span.toggle-details { opacity: 1; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-edit.ui-state-hover span.toggle-details { opacity: 1; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-edit span.toggle-details { opacity: 0.9; margin-left: 3px; display: inline-block; width: 5px; height: 100%; cursor: pointer; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-edit span.toggle-details { opacity: 0.9; margin-left: 3px; display: inline-block; width: 5px; height: 100%; cursor: pointer; }
|
||||||
@ -60,13 +62,13 @@ body.cms.ss-uploadfield-edit-iframe .fieldholder-small label, .composite.ss-asse
|
|||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-edit span.toggle-details .toggle-details-icon.opened { margin-top: 0; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button.ss-uploadfield-item-edit span.toggle-details .toggle-details-icon.opened { margin-top: 0; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button .ui-icon { display: none; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-actions .ss-ui-button .ui-icon { display: none; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-progress { width: 100%; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-progress { width: 100%; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-progress div { -webkit-border-radius: 5px; -moz-border-radius: 5px; -ms-border-radius: 5px; -o-border-radius: 5px; border-radius: 5px; height: 30px; padding: 0; margin: 0; overflow: hidden; width: 100%; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-progress div { -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; height: 30px; padding: 0; margin: 0; overflow: hidden; width: 100%; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-progress .ss-uploadfield-item-progressbar { background-color: #92a6b3; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #92a6b3), color-stop(11%, #90aab8), color-stop(22%, #96b1bf), color-stop(33%, #9eb4c1), color-stop(44%, #a7bac7), color-stop(100%, #c1d5dc)); background-image: -webkit-linear-gradient(top, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); background-image: -moz-linear-gradient(top, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); background-image: -o-linear-gradient(top, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); background-image: linear-gradient(top, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-progress .ss-uploadfield-item-progressbar { background-color: #92a6b3; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzkyYTZiMyIvPjxzdG9wIG9mZnNldD0iMTElIiBzdG9wLWNvbG9yPSIjOTBhYWI4Ii8+PHN0b3Agb2Zmc2V0PSIyMiUiIHN0b3AtY29sb3I9IiM5NmIxYmYiLz48c3RvcCBvZmZzZXQ9IjMzJSIgc3RvcC1jb2xvcj0iIzllYjRjMSIvPjxzdG9wIG9mZnNldD0iNDQlIiBzdG9wLWNvbG9yPSIjYTdiYWM3Ii8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjYzFkNWRjIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #92a6b3), color-stop(11%, #90aab8), color-stop(22%, #96b1bf), color-stop(33%, #9eb4c1), color-stop(44%, #a7bac7), color-stop(100%, #c1d5dc)); background-image: -moz-linear-gradient(top, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); background-image: -webkit-linear-gradient(top, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); background-image: linear-gradient(to bottom, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-progress .ss-uploadfield-item-progressbarvalue { width: 0; background: #60b3dd url(../images/progressbar_blue.gif) repeat left center; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-progress .ss-uploadfield-item-progressbarvalue { width: 0; background: #60b3dd url(../images/progressbar_blue.gif) repeat left center; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform { /* don't use display none, for it will break jQuery('iframe').contents().height() */ height: 0; overflow: hidden; clear: both; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform { /* don't use display none, for it will break jQuery('iframe').contents().height() */ height: 0; overflow: hidden; clear: both; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform.loading { width: 100%; height: 22px; padding: 15px 0; background: url(../admin/images/spinner.gif) no-repeat 50% 50%; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform.loading { width: 100%; height: 22px; padding: 15px 0; background: url(../admin/images/spinner.gif) no-repeat 50% 50%; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform.loading iframe { /* Old IE needs this or it'll give the iframe a white background, covering the spinner */ padding-top: 0; margin-top: 37px; border: none; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform.loading iframe { /* Old IE needs this or it'll give the iframe a white background, covering the spinner */ padding-top: 0; margin-top: 37px; border: none; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform iframe { width: 100%; }
|
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform iframe { width: 100%; padding: 16px; background: #E2E2E2; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info { float: left; margin: 25px 0 0; }
|
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info { float: left; margin: 25px 0 0; }
|
||||||
.ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info { margin: 10px 0px 0 20px; }
|
.ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info { margin: 10px 0px 0 20px; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info label { font-size: 18px; line-height: 30px; padding: 0px 16px; margin-right: 0px; }
|
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info label { font-size: 18px; line-height: 30px; padding: 0px 16px; margin-right: 0px; }
|
||||||
@ -74,8 +76,8 @@ body.cms.ss-uploadfield-edit-iframe .fieldholder-small label, .composite.ss-asse
|
|||||||
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-fromcomputer .btn-icon-drive-upload-large { background: url(../images/drive-upload-white.png) no-repeat 0px 0px; width: 32px; height: 32px; margin-top: -12px; }
|
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-fromcomputer .btn-icon-drive-upload-large { background: url(../images/drive-upload-white.png) no-repeat 0px 0px; width: 32px; height: 32px; margin-top: -12px; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-uploador { float: left; font-weight: bold; font-size: 22px; padding: 0 20px; line-height: 70px; margin-top: 10px; display: none; }
|
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-uploador { float: left; font-weight: bold; font-size: 22px; padding: 0 20px; line-height: 70px; margin-top: 10px; display: none; }
|
||||||
.ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-uploador { font-size: 18px; margin-top: -5px; }
|
.ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-uploador { font-size: 18px; margin-top: -5px; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone { margin-top: 9px; padding: 8px 0; -webkit-border-radius: 13px; -moz-border-radius: 13px; -ms-border-radius: 13px; -o-border-radius: 13px; border-radius: 13px; -webkit-box-shadow: rgba(128, 128, 128, 0.4) 0 0 4px 0 inset, 0 1px 0 #fafafa; -moz-box-shadow: rgba(128, 128, 128, 0.4) 0 0 4px 0 inset, 0 1px 0 #fafafa; box-shadow: rgba(128, 128, 128, 0.4) 0 0 4px 0 inset, 0 1px 0 #fafafa; border: 2px dashed gray; background: #d4dbe0; display: none; height: 54px; min-width: 280px; float: left; text-align: center; }
|
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone { margin-top: 9px; padding: 8px 0; -moz-border-radius: 13px; -webkit-border-radius: 13px; border-radius: 13px; -moz-box-shadow: rgba(128, 128, 128, 0.4) 0 0 4px 0 inset, 0 1px 0 #FAFAFA; -webkit-box-shadow: rgba(128, 128, 128, 0.4) 0 0 4px 0 inset, 0 1px 0 #FAFAFA; box-shadow: rgba(128, 128, 128, 0.4) 0 0 4px 0 inset, 0 1px 0 #FAFAFA; border: 2px dashed #808080; background: #d4dbe0; display: none; height: 54px; min-width: 280px; float: left; text-align: center; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone.active.hover { -webkit-box-shadow: rgba(255, 255, 255, 0.6) 0 0 3px 2px inset; -moz-box-shadow: rgba(255, 255, 255, 0.6) 0 0 3px 2px inset; box-shadow: rgba(255, 255, 255, 0.6) 0 0 3px 2px inset; }
|
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone.active.hover { -moz-box-shadow: rgba(255, 255, 255, 0.6) 0 0 3px 2px inset; -webkit-box-shadow: rgba(255, 255, 255, 0.6) 0 0 3px 2px inset; box-shadow: rgba(255, 255, 255, 0.6) 0 0 3px 2px inset; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div { color: #5e5e5e; text-shadow: 0px 1px 0px #fff; background: url("../images/upload.png") 0 10px no-repeat; z-index: 1; padding: 6px 48px 0; line-height: 25px; font-size: 20px; font-weight: bold; display: inline-block; }
|
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div { color: #5e5e5e; text-shadow: 0px 1px 0px #fff; background: url("../images/upload.png") 0 10px no-repeat; z-index: 1; padding: 6px 48px 0; line-height: 25px; font-size: 20px; font-weight: bold; display: inline-block; }
|
||||||
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div span { display: block; font-size: 12px; z-index: -1; margin-top: -3px; }
|
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div span { display: block; font-size: 12px; z-index: -1; margin-top: -3px; }
|
||||||
.ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone { height: 54px; min-width: 250px; overflow: hidden; padding: 0; margin-top: 2px; }
|
.ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone { height: 54px; min-width: 250px; overflow: hidden; padding: 0; margin-top: 2px; }
|
||||||
|
|||||||
@ -1,2 +1,3 @@
|
|||||||
.datetime .middleColumn .middleColumn { margin: 0; padding: 0; clear: none; float: left; }
|
.datetime .middleColumn .middleColumn { margin: 0; padding: 0; clear: none; float: left; }
|
||||||
|
|
||||||
.datetime .middleColumn .field { margin: 0; border-bottom: none; box-shadow: none; }
|
.datetime .middleColumn .field { margin: 0; border-bottom: none; box-shadow: none; }
|
||||||
|
|||||||
@ -30,10 +30,10 @@ Used in side panels and action tabs
|
|||||||
.cms .ss-gridfield .ss-gridfield-buttonrow { font-size: 14.4px; }
|
.cms .ss-gridfield .ss-gridfield-buttonrow { font-size: 14.4px; }
|
||||||
.cms .ss-gridfield .grid-levelup { text-indent: -9999em; margin-bottom: 6px; }
|
.cms .ss-gridfield .grid-levelup { text-indent: -9999em; margin-bottom: 6px; }
|
||||||
.cms .ss-gridfield .grid-levelup a.list-parent-link { background: transparent url(../images/gridfield-level-up.png) no-repeat 0 0; display: block; }
|
.cms .ss-gridfield .grid-levelup a.list-parent-link { background: transparent url(../images/gridfield-level-up.png) no-repeat 0 0; display: block; }
|
||||||
.cms .ss-gridfield .add-existing-autocompleter span { float: left; display: -moz-inline-stack; display: inline-block; vertical-align: top; *vertical-align: auto; zoom: 1; *display: inline; }
|
.cms .ss-gridfield .add-existing-autocompleter span { float: left; display: inline-block; vertical-align: top; *vertical-align: auto; *zoom: 1; *display: inline; }
|
||||||
.cms .ss-gridfield .add-existing-autocompleter input.relation-search { width: 270px; height: 32px; margin-bottom: 12px; border-top-right-radius: 0; border-bottom-right-radius: 0; }
|
.cms .ss-gridfield .add-existing-autocompleter input.relation-search { width: 270px; height: 32px; margin-bottom: 12px; border-top-right-radius: 0; border-bottom-right-radius: 0; }
|
||||||
.cms .ss-gridfield .add-existing-autocompleter button#action_gridfield_relationadd { height: 32px; margin-left: 0; border-top-left-radius: 0; border-bottom-left-radius: 0; border-left: none; }
|
.cms .ss-gridfield .add-existing-autocompleter button#action_gridfield_relationadd { height: 32px; margin-left: 0; border-top-left-radius: 0; border-bottom-left-radius: 0; border-left: none; }
|
||||||
.cms .ss-gridfield .grid-csv-button, .cms .ss-gridfield .grid-print-button { margin-bottom: 0; font-size: 12px; display: -moz-inline-stack; display: inline-block; vertical-align: middle; *vertical-align: auto; zoom: 1; *display: inline; }
|
.cms .ss-gridfield .grid-csv-button, .cms .ss-gridfield .grid-print-button { margin-bottom: 0; font-size: 12px; display: inline-block; vertical-align: middle; *vertical-align: auto; *zoom: 1; *display: inline; }
|
||||||
.cms table.ss-gridfield-table { display: table; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; padding: 0; border-collapse: separate; border-bottom: 0 none; width: 100%; }
|
.cms table.ss-gridfield-table { display: table; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; padding: 0; border-collapse: separate; border-bottom: 0 none; width: 100%; }
|
||||||
.cms table.ss-gridfield-table thead { color: #323e46; background: transparent; }
|
.cms table.ss-gridfield-table thead { color: #323e46; background: transparent; }
|
||||||
.cms table.ss-gridfield-table thead tr.filter-header .fieldgroup { max-width: 512px; }
|
.cms table.ss-gridfield-table thead tr.filter-header .fieldgroup { max-width: 512px; }
|
||||||
@ -46,8 +46,8 @@ 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-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 { 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-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: #0073C1; }
|
||||||
.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; -webkit-border-radius: 2px 2px; -moz-border-radius: 2px / 2px; border-radius: 2px / 2px; }
|
.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-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; }
|
.cms table.ss-gridfield-table tbody td.col-getTreeTitle span.badge.status-addedtodraft { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
|
||||||
.cms table.ss-gridfield-table tbody td.col-getTreeTitle span.badge.status-deletedonlive { color: #636363; border: 1px solid #E49393; background-color: #F2DADB; }
|
.cms table.ss-gridfield-table tbody td.col-getTreeTitle span.badge.status-deletedonlive { color: #636363; border: 1px solid #E49393; background-color: #F2DADB; }
|
||||||
@ -63,16 +63,16 @@ Used in side panels and action tabs
|
|||||||
.cms table.ss-gridfield-table tbody td a.edit-link { background: url(../admin/images/btn-icon/document--pencil.png) no-repeat 2px 0px; }
|
.cms table.ss-gridfield-table tbody td a.edit-link { background: url(../admin/images/btn-icon/document--pencil.png) no-repeat 2px 0px; }
|
||||||
.cms table.ss-gridfield-table tfoot { color: #323e46; }
|
.cms table.ss-gridfield-table tfoot { color: #323e46; }
|
||||||
.cms table.ss-gridfield-table tfoot tr td { background: #b0bec7; padding: .7em; border-bottom: 1px solid rgba(0, 0, 0, 0.1); }
|
.cms table.ss-gridfield-table tfoot tr td { background: #b0bec7; padding: .7em; border-bottom: 1px solid rgba(0, 0, 0, 0.1); }
|
||||||
.cms table.ss-gridfield-table tr.title th { position: relative; background: #98aab6; border-bottom: 1px solid #899eab; padding: 5px; min-height: 40px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzk4YWFiNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #98aab6)); background-image: -webkit-linear-gradient(#b0bec7, #98aab6); background-image: -moz-linear-gradient(#b0bec7, #98aab6); background-image: -o-linear-gradient(#b0bec7, #98aab6); background-image: linear-gradient(#b0bec7, #98aab6); text-shadow: 0px -1px 0 rgba(0, 0, 0, 0.4); }
|
.cms table.ss-gridfield-table tr.title th { position: relative; background: #98aab6; border-bottom: 1px solid #899eab; padding: 5px; min-height: 40px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzk4YWFiNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #98aab6)); background-image: -moz-linear-gradient(#b0bec7, #98aab6); background-image: -webkit-linear-gradient(#b0bec7, #98aab6); background-image: linear-gradient(#b0bec7, #98aab6); text-shadow: 0px -1px 0 rgba(0, 0, 0, 0.4); }
|
||||||
.cms table.ss-gridfield-table tr.title th h2 { padding: 0px; font-size: 16.8px; color: #fff; margin: 1px 8px 0; display: inline-block; float: left; }
|
.cms table.ss-gridfield-table tr.title th h2 { padding: 0px; font-size: 16.8px; color: #fff; margin: 1px 8px 0; display: inline-block; float: left; }
|
||||||
.cms table.ss-gridfield-table tr.sortable-header { background: #dbe3e8; }
|
.cms table.ss-gridfield-table tr.sortable-header { background: #dbe3e8; }
|
||||||
.cms table.ss-gridfield-table tr.sortable-header th { padding: 0; font-weight: normal; }
|
.cms table.ss-gridfield-table tr.sortable-header th { padding: 0; font-weight: normal; }
|
||||||
.cms table.ss-gridfield-table tr.sortable-header th .ss-ui-button { font-weight: normal; }
|
.cms table.ss-gridfield-table tr.sortable-header th .ss-ui-button { font-weight: normal; }
|
||||||
.cms table.ss-gridfield-table tr:hover { background: #FFFAD6 !important; }
|
.cms table.ss-gridfield-table tr:hover { background: #FFFAD6 !important; }
|
||||||
.cms table.ss-gridfield-table tr:first-child { background: transparent; }
|
.cms table.ss-gridfield-table tr:first-child { background: transparent; }
|
||||||
.cms table.ss-gridfield-table tr.ss-gridfield-even { background: #f0f4f7; }
|
.cms table.ss-gridfield-table tr.ss-gridfield-even { background: #F0F4F7; }
|
||||||
.cms table.ss-gridfield-table tr.ss-gridfield-even.ss-gridfield-last { border-bottom: none; }
|
.cms table.ss-gridfield-table tr.ss-gridfield-even.ss-gridfield-last { border-bottom: none; }
|
||||||
.cms table.ss-gridfield-table tr.even { background: #f0f4f7; }
|
.cms table.ss-gridfield-table tr.even { background: #F0F4F7; }
|
||||||
.cms table.ss-gridfield-table tr th { font-weight: bold; font-size: 12px; color: #FFF; padding: 5px; border-right: 1px solid rgba(0, 0, 0, 0.1); }
|
.cms table.ss-gridfield-table tr th { font-weight: bold; font-size: 12px; color: #FFF; padding: 5px; border-right: 1px solid rgba(0, 0, 0, 0.1); }
|
||||||
.cms table.ss-gridfield-table tr th div.fieldgroup, .cms table.ss-gridfield-table tr th div.fieldgroup-field { width: 100%; position: relative; }
|
.cms table.ss-gridfield-table tr th div.fieldgroup, .cms table.ss-gridfield-table tr th div.fieldgroup-field { width: 100%; position: relative; }
|
||||||
.cms table.ss-gridfield-table tr th div.fieldgroup { min-width: 200px; padding-right: 0; }
|
.cms table.ss-gridfield-table tr th div.fieldgroup { min-width: 200px; padding-right: 0; }
|
||||||
@ -84,25 +84,25 @@ Used in side panels and action tabs
|
|||||||
.cms table.ss-gridfield-table tr th.extra, .cms table.ss-gridfield-table tr th.action { padding: 0; cursor: default; }
|
.cms table.ss-gridfield-table tr th.extra, .cms table.ss-gridfield-table tr th.action { padding: 0; cursor: default; }
|
||||||
.cms table.ss-gridfield-table tr th.extra { position: relative; background: #637276; background: rgba(0, 0, 0, 0.7); padding: 5px; border-top: rgba(0, 0, 0, 0.2); }
|
.cms table.ss-gridfield-table tr th.extra { position: relative; background: #637276; background: rgba(0, 0, 0, 0.7); padding: 5px; border-top: rgba(0, 0, 0, 0.2); }
|
||||||
.cms table.ss-gridfield-table tr th.extra input { height: 28px; }
|
.cms table.ss-gridfield-table tr th.extra input { height: 28px; }
|
||||||
.cms table.ss-gridfield-table tr th.extra button.ss-ui-button { padding: .3em; line-height: 1; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; position: relative; border-bottom-width: 0; -webkit-border-radius: 2px 2px; -moz-border-radius: 2px / 2px; border-radius: 2px / 2px; }
|
.cms table.ss-gridfield-table tr th.extra button.ss-ui-button { padding: .3em; line-height: 1; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; position: relative; border-bottom-width: 0; -moz-border-radius: 2px / 2px; -webkit-border-radius: 2px 2px; border-radius: 2px / 2px; }
|
||||||
.cms table.ss-gridfield-table tr th.extra select { margin: 0; }
|
.cms table.ss-gridfield-table tr th.extra select { margin: 0; }
|
||||||
.cms table.ss-gridfield-table tr th.first { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; }
|
.cms table.ss-gridfield-table tr th.first { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; }
|
||||||
.cms table.ss-gridfield-table tr th.last { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; }
|
.cms table.ss-gridfield-table tr th.last { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; }
|
||||||
.cms table.ss-gridfield-table tr th button#action_gridfield_relationadd:hover { color: #444 !important; /* Not sure why IE think it needs this */ }
|
.cms table.ss-gridfield-table tr th button#action_gridfield_relationadd:hover { color: #444 !important; /* Not sure why IE think it needs this */ }
|
||||||
.cms table.ss-gridfield-table tr th button:hover { color: #ccc !important; /* Not sure why IE think it needs this */ }
|
.cms table.ss-gridfield-table tr th button:hover { color: #ccc !important; /* Not sure why IE think it needs this */ }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-gridfield-sort:hover { color: #fff !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
.cms table.ss-gridfield-table tr th button.ss-gridfield-sort:hover { color: #fff !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-gridfield-sort { background: transparent url(../images/arrows.png) no-repeat right 6px; border: none; width: 100%; text-align: left; padding: 2px 8px 2px 0; text-shadow: 0px -1px 0 rgba(0, 0, 0, 0.2); color: #fff; -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; }
|
.cms table.ss-gridfield-table tr th button.ss-gridfield-sort { background: transparent url(../images/arrows.png) no-repeat right 6px; border: none; width: 100%; text-align: left; padding: 2px 8px 2px 0; text-shadow: 0px -1px 0 rgba(0, 0, 0, 0.2); color: #fff; -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-gridfield-sort:hover { background-position: right -34px; }
|
.cms table.ss-gridfield-table tr th button.ss-gridfield-sort:hover { background-position: right -34px; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-gridfield-sort.ss-gridfield-sorted-desc { background-position: right -72px; }
|
.cms table.ss-gridfield-table tr th button.ss-gridfield-sort.ss-gridfield-sorted-desc { background-position: right -72px; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-gridfield-sort.ss-gridfield-sorted-asc { background-position: right -116px; }
|
.cms table.ss-gridfield-table tr th button.ss-gridfield-sort.ss-gridfield-sorted-asc { background-position: right -116px; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter { background-color: #55a4d2; border: none; display: block; text-indent: -9999em; width: 30px; height: 25px; background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzMzOGRjMSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzI4NzA5OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #338dc1), color-stop(100%, #287099)); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -webkit-linear-gradient(#338dc1, #287099); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -moz-linear-gradient(#338dc1, #287099); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -o-linear-gradient(#338dc1, #287099); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, linear-gradient(#338dc1, #287099); width: 26px; border-top: 1px solid #4199cd; }
|
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter { background-color: #55a4d2; border: none; display: block; text-indent: -9999em; width: 30px; height: 25px; background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzMzOGRjMSIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzI4NzA5OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #338dc1), color-stop(100%, #287099)); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -moz-linear-gradient(#338dc1, #287099); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -webkit-linear-gradient(#338dc1, #287099); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, linear-gradient(#338dc1, #287099); width: 26px; border-top: 1px solid #4199cd; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter.hover-alike:active, .cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter:active, .cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter.hover-alike, .cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter:hover { background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU1YTRkMiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzMzOGRjMSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #55a4d2), color-stop(100%, #338dc1)); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -webkit-linear-gradient(#55a4d2, #338dc1); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -moz-linear-gradient(#55a4d2, #338dc1); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -o-linear-gradient(#55a4d2, #338dc1); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, linear-gradient(#55a4d2, #338dc1); }
|
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter.hover-alike:active, .cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter:active, .cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter.hover-alike, .cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter:hover { background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzU1YTRkMiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzMzOGRjMSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #55a4d2), color-stop(100%, #338dc1)); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -moz-linear-gradient(#55a4d2, #338dc1); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, -webkit-linear-gradient(#55a4d2, #338dc1); background: url(../images/icons/filter-icons.png) no-repeat -15px 4px, linear-gradient(#55a4d2, #338dc1); }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter.trigger { margin-left: 12px; border: none; background: url(../images/icons/filter-icons.png) no-repeat -17px 6px; padding-right: 46px; margin: 0 6px; }
|
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter.trigger { margin-left: 12px; border: none; background: url(../images/icons/filter-icons.png) no-repeat -17px 6px; padding-right: 46px; margin: 0 6px; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter.trigger span { opacity: 0.4; position: absolute; width: 10px; left: 30px; top: 40%; background: url(../admin/images/btn_arrow_down_grey.png) no-repeat 0px 0px; }
|
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter.trigger span { opacity: 0.4; position: absolute; width: 10px; left: 30px; top: 40%; background: url(../admin/images/btn_arrow_down_grey.png) no-repeat 0px 0px; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter.trigger:hover { background: url(../images/icons/filter-icons.png) no-repeat -17px -38px; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter.trigger:hover { background: url(../images/icons/filter-icons.png) no-repeat -17px -38px; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter.trigger:hover span { opacity: 0.9; }
|
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-filter.trigger:hover span { opacity: 0.9; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-close { background: url(../images/icons/filter-icons.png) no-repeat 8px -17px; border: none; display: block; text-indent: -9999em; width: 30px; height: 25px; width: 25px; opacity: 0.8; margin-right: -5px; }
|
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-close { background: url(../images/icons/filter-icons.png) no-repeat 8px -17px; border: none; display: block; text-indent: -9999em; width: 30px; height: 25px; width: 25px; opacity: 0.8; margin-right: -5px; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-close.hover-alike:active, .cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-close:active, .cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-close.hover-alike, .cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-close:hover { opacity: 1; background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0icmdiYSgyNTUsIDI1NSwgMjU1LCAwLjEpIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSJyZ2JhKDI1NSwgMjU1LCAyNTUsIDAuMSkiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(255, 255, 255, 0.1)), color-stop(100%, rgba(255, 255, 255, 0.1))); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, -webkit-linear-gradient(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.1)); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, -moz-linear-gradient(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.1)); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, -o-linear-gradient(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.1)); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, linear-gradient(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.1)); }
|
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-close.hover-alike:active, .cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-close:active, .cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-close.hover-alike, .cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-close:hover { opacity: 1; background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjEiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4xIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(255, 255, 255, 0.1)), color-stop(100%, rgba(255, 255, 255, 0.1))); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, -moz-linear-gradient(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.1)); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, -webkit-linear-gradient(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.1)); background: url(../images/icons/filter-icons.png) no-repeat 8px -17px, linear-gradient(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.1)); }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-reset { border: none; display: block; text-indent: -9999em; width: 30px; height: 25px; position: absolute; top: -21px; right: -1px; width: 20px; height: 20px; display: none; }
|
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-reset { border: none; display: block; text-indent: -9999em; width: 30px; height: 25px; position: absolute; top: -21px; right: -1px; width: 20px; height: 20px; display: none; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-reset.filtered { display: block; background: url(../admin/images/btn-icon/cross.png) no-repeat 0px 0px; opacity: 0.5; }
|
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-reset.filtered { display: block; background: url(../admin/images/btn-icon/cross.png) no-repeat 0px 0px; opacity: 0.5; }
|
||||||
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-reset.filtered:hover { opacity: 0.8; }
|
.cms table.ss-gridfield-table tr th button.ss-ui-button.ss-gridfield-button-reset.filtered:hover { opacity: 0.8; }
|
||||||
@ -114,8 +114,8 @@ Used in side panels and action tabs
|
|||||||
.cms table.ss-gridfield-table tr th input.ss-gridfield-sort:placeholder { font-style: italic; color: #ced5d7; }
|
.cms table.ss-gridfield-table tr th input.ss-gridfield-sort:placeholder { font-style: italic; color: #ced5d7; }
|
||||||
.cms table.ss-gridfield-table tr th input.ss-gridfield-sort:focus { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
.cms table.ss-gridfield-table tr th input.ss-gridfield-sort:focus { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
|
||||||
.cms table.ss-gridfield-table tr th span.non-sortable { display: block; }
|
.cms table.ss-gridfield-table tr th span.non-sortable { display: block; }
|
||||||
.cms table.ss-gridfield-table tr td { border-right: 1px solid rgba(0, 0, 0, 0.1); padding: 8px 8px; color: #666666; }
|
.cms table.ss-gridfield-table tr td { border-right: 1px solid rgba(0, 0, 0, 0.1); padding: 8px 8px; color: #666; }
|
||||||
.cms table.ss-gridfield-table tr td.bottom-all { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzk4YWFiNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #98aab6)); background-image: -webkit-linear-gradient(#b0bec7, #98aab6); background-image: -moz-linear-gradient(#b0bec7, #98aab6); background-image: -o-linear-gradient(#b0bec7, #98aab6); background-image: linear-gradient(#b0bec7, #98aab6); padding: 4px 12px; }
|
.cms table.ss-gridfield-table tr td.bottom-all { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzk4YWFiNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #98aab6)); background-image: -moz-linear-gradient(#b0bec7, #98aab6); background-image: -webkit-linear-gradient(#b0bec7, #98aab6); background-image: linear-gradient(#b0bec7, #98aab6); padding: 4px 12px; }
|
||||||
.cms table.ss-gridfield-table tr td.bottom-all .datagrid-footer-message { text-align: center; padding-top: 6px; color: white; }
|
.cms table.ss-gridfield-table tr td.bottom-all .datagrid-footer-message { text-align: center; padding-top: 6px; color: white; }
|
||||||
.cms table.ss-gridfield-table tr td.bottom-all .datagrid-pagination { padding-top: 1px; position: absolute; left: 50%; margin-left: -116px; z-index: 5; }
|
.cms table.ss-gridfield-table tr td.bottom-all .datagrid-pagination { padding-top: 1px; position: absolute; left: 50%; margin-left: -116px; z-index: 5; }
|
||||||
.cms table.ss-gridfield-table tr td.bottom-all .datagrid-pagination .pagination-page-number { color: white; text-align: center; text-shadow: 0px -1px 0 rgba(0, 0, 0, 0.2); }
|
.cms table.ss-gridfield-table tr td.bottom-all .datagrid-pagination .pagination-page-number { color: white; text-align: center; text-shadow: 0px -1px 0 rgba(0, 0, 0, 0.2); }
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
#Remember { margin: 0.5em 0 0.5em 11em; }
|
#Remember { margin: 0.5em 0 0.5em 11em !important; }
|
||||||
|
|
||||||
p#Remember label { display: inline-block; margin: 0; }
|
p#Remember label { display: inline-block; margin: 0; }
|
||||||
|
|
||||||
|
|||||||
@ -4,10 +4,10 @@ Used in side panels and action tabs
|
|||||||
div.TreeDropdownField { width: 400px; background: #fff; border: 1px solid #aaa; cursor: pointer; overflow: visible; position: relative; }
|
div.TreeDropdownField { width: 400px; background: #fff; border: 1px solid #aaa; cursor: pointer; overflow: visible; position: relative; }
|
||||||
div.TreeDropdownField input { border: none; background: none; padding: 0; margin: 0; }
|
div.TreeDropdownField input { border: none; background: none; padding: 0; margin: 0; }
|
||||||
div.TreeDropdownField .treedropdownfield-title, div.TreeDropdownField .treedropdownfield-search { float: left; padding: 7px; width: 90%; line-height: 16px; overflow: hidden; outline: none; z-index: 1; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
|
div.TreeDropdownField .treedropdownfield-title, div.TreeDropdownField .treedropdownfield-search { float: left; padding: 7px; width: 90%; line-height: 16px; overflow: hidden; outline: none; z-index: 1; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
|
||||||
div.TreeDropdownField .treedropdownfield-search { background: url("../admin/thirdparty/chosen/chosen/chosen-sprite.png") no-repeat 100% -22px; background: url("../admin/thirdparty/chosen/chosen/chosen-sprite.png") no-repeat 100% -22px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff)); background: url("../admin/thirdparty/chosen/chosen/chosen-sprite.png") no-repeat 100% -22px, -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%); background: url("../admin/thirdparty/chosen/chosen/chosen-sprite.png") no-repeat 100% -22px, -moz-linear-gradient(top, #eeeeee 1%, #ffffff 15%); background: url("../admin/thirdparty/chosen/chosen/chosen-sprite.png") no-repeat 100% -22px, -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%); background: url("../admin/thirdparty/chosen/chosen/chosen-sprite.png") no-repeat 100% -22px, linear-gradient(top, #eeeeee 1%, #ffffff 15%); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; position: relative; z-index: 1100; border: 1px solid #aaa; display: inline-block; font-family: sans-serif; font-size: 1em; margin: 1.5%; outline: 0; padding: 4px 20px 4px 5px; width: 97%; }
|
div.TreeDropdownField .treedropdownfield-search { background: url("../admin/thirdparty/chosen/chosen/chosen-sprite.png") no-repeat 100% -22px; background: url("../admin/thirdparty/chosen/chosen/chosen-sprite.png") no-repeat 100% -22px, url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIxJSIgc3RvcC1jb2xvcj0iI2VlZWVlZSIvPjxzdG9wIG9mZnNldD0iMTUlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background: url("../admin/thirdparty/chosen/chosen/chosen-sprite.png") no-repeat 100% -22px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff)); background: url("../admin/thirdparty/chosen/chosen/chosen-sprite.png") no-repeat 100% -22px, -moz-linear-gradient(top, #eeeeee 1%, #ffffff 15%); background: url("../admin/thirdparty/chosen/chosen/chosen-sprite.png") no-repeat 100% -22px, -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%); background: url("../admin/thirdparty/chosen/chosen/chosen-sprite.png") no-repeat 100% -22px, linear-gradient(to bottom, #eeeeee 1%, #ffffff 15%); -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; position: relative; z-index: 1100; border: 1px solid #aaa; display: inline-block; font-family: sans-serif; font-size: 1em; margin: 1.5%; outline: 0; padding: 4px 20px 4px 5px; width: 97%; }
|
||||||
div.TreeDropdownField.searchable .treedropdownfield-panel.loading { min-height: 64px; background-position: 98% 39px; }
|
div.TreeDropdownField.searchable .treedropdownfield-panel.loading { min-height: 64px; background-position: 98% 39px; }
|
||||||
div.TreeDropdownField .treedropdownfield-panel { clear: left; position: absolute; display: none; cursor: default; border: 1px solid #aaa; border-top: none; margin: 1px 0 0 -1px; /* account for border on container div */ background-color: #fff; z-index: 70; -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); -o-box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); }
|
div.TreeDropdownField .treedropdownfield-panel { clear: left; position: absolute; display: none; cursor: default; border: 1px solid #aaa; border-top: none; margin: 1px 0 0 -1px; /* account for border on container div */ background-color: #fff; z-index: 70; -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); -o-box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); }
|
||||||
div.TreeDropdownField .treedropdownfield-panel.loading { min-height: 30px; background: white url("../images/network-save.gif") 98% 7px no-repeat; }
|
div.TreeDropdownField .treedropdownfield-panel.loading { min-height: 30px; background: #fff url("../images/network-save.gif") 98% 7px no-repeat; }
|
||||||
div.TreeDropdownField .treedropdownfield-panel .tree-holder { position: relative; z-index: 1; }
|
div.TreeDropdownField .treedropdownfield-panel .tree-holder { position: relative; z-index: 1; }
|
||||||
div.TreeDropdownField .treedropdownfield-panel .tree-holder > ul { position: relative; max-height: 200px; overflow-y: auto; }
|
div.TreeDropdownField .treedropdownfield-panel .tree-holder > ul { position: relative; max-height: 200px; overflow-y: auto; }
|
||||||
div.TreeDropdownField .treedropdownfield-panel ul { overflow-x: hidden; float: left; width: 100%; }
|
div.TreeDropdownField .treedropdownfield-panel ul { overflow-x: hidden; float: left; width: 100%; }
|
||||||
@ -18,4 +18,4 @@ div.TreeDropdownField .treedropdownfield-panel ul.tree a { font-size: 12px; }
|
|||||||
div.TreeDropdownField .treedropdownfield-toggle-panel-link { border: none; margin: 0; z-index: 0; padding: 7px 3px; overflow: hidden; -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; }
|
div.TreeDropdownField .treedropdownfield-toggle-panel-link { border: none; margin: 0; z-index: 0; padding: 7px 3px; overflow: hidden; -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; }
|
||||||
div.TreeDropdownField .treedropdownfield-toggle-panel-link.treedropdownfield-open-tree { background: transparent; border: none; }
|
div.TreeDropdownField .treedropdownfield-toggle-panel-link.treedropdownfield-open-tree { background: transparent; border: none; }
|
||||||
div.TreeDropdownField .treedropdownfield-toggle-panel-link a { text-decoration: none; display: block; border: 0; margin: 0; opacity: 0.5; }
|
div.TreeDropdownField .treedropdownfield-toggle-panel-link a { text-decoration: none; display: block; border: 0; margin: 0; opacity: 0.5; }
|
||||||
div.TreeDropdownField a.jstree-loading .jstree-pageicon { background: white url("../images/network-save.gif") center center no-repeat; }
|
div.TreeDropdownField a.jstree-loading .jstree-pageicon { background: #fff url("../images/network-save.gif") center center no-repeat; }
|
||||||
|
|||||||
@ -11,18 +11,18 @@
|
|||||||
Used in side panels and action tabs
|
Used in side panels and action tabs
|
||||||
*/
|
*/
|
||||||
.ss-uploadfield .clear { clear: both; }
|
.ss-uploadfield .clear { clear: both; }
|
||||||
.ss-uploadfield .middleColumn { min-width: 510px; max-width: 600px; width: 100%; margin-left: 0; clear: both; padding: 0; background: #fff; border: 1px solid #b3b3b3; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #efefef), color-stop(10%, #ffffff), color-stop(90%, #ffffff), color-stop(100%, #efefef)); background-image: -webkit-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -moz-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -o-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); }
|
.ss-uploadfield .middleColumn { min-width: 510px; max-width: 600px; width: 100%; margin-left: 0; clear: both; padding: 0; background: #fff; border: 1px solid #b3b3b3; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VmZWZlZiIvPjxzdG9wIG9mZnNldD0iMTAlIiBzdG9wLWNvbG9yPSIjZmZmZmZmIi8+PHN0b3Agb2Zmc2V0PSI5MCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlZmVmZWYiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #efefef), color-stop(10%, #ffffff), color-stop(90%, #ffffff), color-stop(100%, #efefef)); background-image: -moz-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -webkit-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); }
|
||||||
.ss-uploadfield .ss-uploadfield-item { margin: 0; padding: 15px; overflow: auto; }
|
.ss-uploadfield .ss-uploadfield-item { margin: 0; padding: 15px; overflow: auto; }
|
||||||
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-preview { height: 60px; line-height: 60px; width: 80px; text-align: center; font-weight: bold; float: left; overflow: hidden; }
|
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-preview { height: 60px; line-height: 60px; width: 80px; text-align: center; font-weight: bold; float: left; overflow: hidden; }
|
||||||
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-preview.ss-uploadfield-dropzone { -webkit-box-shadow: gray 0 0 4px 0 inset; -moz-box-shadow: gray 0 0 4px 0 inset; box-shadow: gray 0 0 4px 0 inset; border: 2px dashed gray; background: #d0d3d5; display: none; margin-right: 15px; }
|
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-preview.ss-uploadfield-dropzone { -moz-box-shadow: #808080 0 0 4px 0 inset; -webkit-box-shadow: #808080 0 0 4px 0 inset; box-shadow: #808080 0 0 4px 0 inset; border: 2px dashed #808080; background: #d0d3d5; display: none; margin-right: 15px; }
|
||||||
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info { margin-left: 95px; }
|
.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 { 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 .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: #848484; padding: 0 0 0 5px; display: inline; float: left; }
|
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .size { color: #848484; 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 { 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: red; font-weight: bold; width: 150px; }
|
.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; }
|
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-warning-text { color: #b7a403; }
|
||||||
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-success-text { color: #1f9433; }
|
.ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .ss-uploadfield-item-status.ui-state-success-text { color: #1F9433; }
|
||||||
.ss-uploadfield .ss-uploadfield-item.ui-state-error .ss-uploadfield-item-preview { width: auto; height: auto; margin-right: 15px; }
|
.ss-uploadfield .ss-uploadfield-item.ui-state-error .ss-uploadfield-item-preview { width: auto; height: auto; margin-right: 15px; }
|
||||||
.ss-uploadfield .ss-uploadfield-item.ui-state-error .ss-uploadfield-item-info { margin-left: 0; }
|
.ss-uploadfield .ss-uploadfield-item.ui-state-error .ss-uploadfield-item-info { margin-left: 0; }
|
||||||
.ss-uploadfield .ss-uploadfield-item.ui-state-error .ss-uploadfield-item-info .ss-uploadfield-item-name { float: left; width: 70%; height: auto; }
|
.ss-uploadfield .ss-uploadfield-item.ui-state-error .ss-uploadfield-item-info .ss-uploadfield-item-name { float: left; width: 70%; height: auto; }
|
||||||
@ -33,15 +33,15 @@ 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 { display: block; float: left; margin: 0 10px 6px 0; }
|
||||||
.ss-uploadfield .ss-ui-button.ss-uploadfield-fromcomputer { position: relative; overflow: hidden; }
|
.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 { 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: #444444; }
|
.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: #444; }
|
||||||
.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: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-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; }
|
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-progress { position: absolute; left: 0; right: 42px; width: auto; margin: 11px 0 0; height: 15px; }
|
||||||
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-progress div { -webkit-border-radius: 25px; -moz-border-radius: 25px; -ms-border-radius: 25px; -o-border-radius: 25px; border-radius: 25px; height: 13px; padding: 0; margin: 0; overflow: hidden; }
|
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-progress div { -moz-border-radius: 25px; -webkit-border-radius: 25px; border-radius: 25px; height: 13px; padding: 0; margin: 0; overflow: hidden; }
|
||||||
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-progressbar { border: 1px solid gray; background-color: #92a6b3; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #92a6b3), color-stop(11%, #90aab8), color-stop(22%, #96b1bf), color-stop(33%, #9eb4c1), color-stop(44%, #a7bac7), color-stop(100%, #c1d5dc)); background-image: -webkit-linear-gradient(top, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); background-image: -moz-linear-gradient(top, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); background-image: -o-linear-gradient(top, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); background-image: linear-gradient(top, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); }
|
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-progressbar { border: 1px solid #808080; background-color: #92a6b3; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzkyYTZiMyIvPjxzdG9wIG9mZnNldD0iMTElIiBzdG9wLWNvbG9yPSIjOTBhYWI4Ii8+PHN0b3Agb2Zmc2V0PSIyMiUiIHN0b3AtY29sb3I9IiM5NmIxYmYiLz48c3RvcCBvZmZzZXQ9IjMzJSIgc3RvcC1jb2xvcj0iIzllYjRjMSIvPjxzdG9wIG9mZnNldD0iNDQlIiBzdG9wLWNvbG9yPSIjYTdiYWM3Ii8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjYzFkNWRjIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #92a6b3), color-stop(11%, #90aab8), color-stop(22%, #96b1bf), color-stop(33%, #9eb4c1), color-stop(44%, #a7bac7), color-stop(100%, #c1d5dc)); background-image: -moz-linear-gradient(top, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); background-image: -webkit-linear-gradient(top, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); background-image: linear-gradient(to bottom, #92a6b3 0%, #90aab8 11%, #96b1bf 22%, #9eb4c1 33%, #a7bac7 44%, #c1d5dc 100%); }
|
||||||
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-progressbarvalue { border: 0; width: 0%; background: #60b3dd url(../images/progressbar_blue.gif) repeat-x left center; }
|
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-progressbarvalue { border: 0; width: 0%; background: #60b3dd url(../images/progressbar_blue.gif) repeat-x left center; }
|
||||||
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel, .ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-start { position: absolute; top: 10px; right: 0; }
|
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel, .ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-start { position: absolute; top: 10px; right: 0; }
|
||||||
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel button, .ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-start button { display: block; overflow: hidden; text-indent: -9999px; padding: 0; margin: 0; border: 0; width: 16px; height: 16px; cursor: pointer; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; position: relative; }
|
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel button, .ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-start button { display: block; overflow: hidden; text-indent: -9999px; padding: 0; margin: 0; border: 0; width: 16px; height: 16px; cursor: pointer; -moz-box-shadow: 0px 5px #333333; -webkit-box-shadow: 0px 5px #333333; box-shadow: 0px 5px #333333; position: relative; }
|
||||||
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel button span, .ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-start button span { position: absolute; left: 0; top: 0; margin: 0; }
|
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel button span, .ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-start button span { position: absolute; left: 0; top: 0; margin: 0; }
|
||||||
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel button span.ui-button-text, .ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-start button span.ui-button-text { display: none; }
|
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel button span.ui-button-text, .ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-start button span.ui-button-text { display: none; }
|
||||||
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-start { right: 20px; }
|
.ss-uploadfield .ss-uploadfield-files .ss-uploadfield-item-start { right: 20px; }
|
||||||
|
|||||||
@ -1,24 +1,35 @@
|
|||||||
body { background: #eee !important; margin: 0; overflow-x: hidden; padding: 0; font-family: Helvetica,Arial,sans-serif; }
|
body { background: #eee !important; margin: 0; overflow-x: hidden; padding: 0; font-family: Helvetica,Arial,sans-serif; }
|
||||||
.info { margin: 0 0 6px 0; padding: 18px; background-color: #003050; position: relative; line-height: 24px; color: #fff; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #002137), color-stop(10%, #003050), color-stop(90%, #003050), color-stop(100%, #002137)); background-image: -webkit-linear-gradient(#002137, #003050 10%, #003050 90%, #002137); background-image: -moz-linear-gradient(#002137, #003050 10%, #003050 90%, #002137); background-image: -o-linear-gradient(#002137, #003050 10%, #003050 90%, #002137); background-image: linear-gradient(#002137, #003050 10%, #003050 90%, #002137); z-index: 9999; }
|
|
||||||
|
.info { margin: 0 0 6px 0; padding: 18px; background-color: #003050; position: relative; line-height: 24px; color: #fff; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMjEzNyIvPjxzdG9wIG9mZnNldD0iMTAlIiBzdG9wLWNvbG9yPSIjMDAzMDUwIi8+PHN0b3Agb2Zmc2V0PSI5MCUiIHN0b3AtY29sb3I9IiMwMDMwNTAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDIxMzciLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #002137), color-stop(10%, #003050), color-stop(90%, #003050), color-stop(100%, #002137)); background-image: -moz-linear-gradient(#002137, #003050 10%, #003050 90%, #002137); background-image: -webkit-linear-gradient(#002137, #003050 10%, #003050 90%, #002137); background-image: linear-gradient(#002137, #003050 10%, #003050 90%, #002137); z-index: 9999; }
|
||||||
.info h1 { margin: 0 0 6px 0; padding: 0 32px 0 0; color: #fff; font-size: 24px; text-shadow: 0 1px #002137; line-height: 30px; background: url(../admin/images/logo_small.png) no-repeat right 3px; }
|
.info h1 { margin: 0 0 6px 0; padding: 0 32px 0 0; color: #fff; font-size: 24px; text-shadow: 0 1px #002137; line-height: 30px; background: url(../admin/images/logo_small.png) no-repeat right 3px; }
|
||||||
.info h3 { color: #7da4be; font-size: 16px; line-height: 18px; font-weight: normal; }
|
.info h3 { color: #7da4be; font-size: 16px; line-height: 18px; font-weight: normal; }
|
||||||
.info p { margin: 0; font-size: 14px; color: #fff; }
|
.info p { margin: 0; font-size: 14px; color: #fff; }
|
||||||
.info a { color: #fff; font-weight: bold; text-decoration: none; }
|
.info a { color: #fff; font-weight: bold; text-decoration: none; }
|
||||||
.info a:hover, .info a:active { color: #fff; text-decoration: underline; }
|
.info a:hover, .info a:active { color: #fff; text-decoration: underline; }
|
||||||
|
|
||||||
.header { margin: 0; border-bottom: 6px solid #ccdef3; height: 23px; background-color: #666673; padding: 4px 0 2px 6px; }
|
.header { margin: 0; border-bottom: 6px solid #ccdef3; height: 23px; background-color: #666673; padding: 4px 0 2px 6px; }
|
||||||
.content {padding: 6px 12px;}
|
|
||||||
.trace, .build, .options { padding: 6px 12px; background: #eee !important; position: relative; z-index: 9999; }
|
.trace, .build, .options { padding: 6px 12px; background: #eee !important; position: relative; z-index: 9999; }
|
||||||
.trace li, .build li, .options li { font-size: 14px; margin: 6px 0; }
|
.trace li, .build li, .options li { font-size: 14px; margin: 6px 0; }
|
||||||
|
|
||||||
a { color: #666; }
|
a { color: #666; }
|
||||||
a:hover { color: #222; }
|
a:hover { color: #222; }
|
||||||
a:active { color: #111; }
|
a:active { color: #111; }
|
||||||
|
|
||||||
p { margin-bottom: 6px; }
|
p { margin-bottom: 6px; }
|
||||||
pre { margin-bottom: 20px; background-color: #f5f5f5; border: 1px solid #eee; border: 1px solid rgba(0, 0, 0, 0.08); color: #333; padding: 11px; overflow: auto; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); }
|
|
||||||
|
pre { margin-bottom: 20px; background-color: #f5f5f5; border: 1px solid #eee; border: 1px solid rgba(0, 0, 0, 0.08); color: #333; padding: 11px; overflow: auto; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); }
|
||||||
pre span { color: #999; }
|
pre span { color: #999; }
|
||||||
pre .error { color: #f00; }
|
pre .error { color: #f00; }
|
||||||
|
|
||||||
h2 { margin: 0 0 12px 0; }
|
h2 { margin: 0 0 12px 0; }
|
||||||
|
|
||||||
h3 { margin: 0 0 6px 0; color: #333; font-size: 18px; line-height: 24px; }
|
h3 { margin: 0 0 6px 0; color: #333; font-size: 18px; line-height: 24px; }
|
||||||
|
|
||||||
ul { margin: 0 0 18px 0; padding: 0 0 0 18px; }
|
ul { margin: 0 0 18px 0; padding: 0 0 0 18px; }
|
||||||
fieldset { border: 0; padding: 0;}
|
|
||||||
|
fieldset { border: 1px solid #b2b2b2; margin-bottom: 18px; padding: 17px; }
|
||||||
|
|
||||||
.pass { margin-top: 18px; padding: 2px 20px 2px 40px; color: #006600; background: #E2F9E3; border: 1px solid #8DD38D; border-radius: 4px; }
|
.pass { margin-top: 18px; padding: 2px 20px 2px 40px; color: #006600; background: #E2F9E3; border: 1px solid #8DD38D; border-radius: 4px; }
|
||||||
|
|
||||||
.fail { margin-top: 18px; padding: 2px 20px 2px 40px; color: #C80700; background: #FFE9E9; border: 1px solid #C80700; border-radius: 4px; }
|
.fail { margin-top: 18px; padding: 2px 20px 2px 40px; color: #C80700; background: #FFE9E9; border: 1px solid #C80700; border-radius: 4px; }
|
||||||
@ -8,7 +8,7 @@
|
|||||||
* It was built to facilitate testing using PHPUnit and contains a number of assert methods that will throw PHPUnit
|
* It was built to facilitate testing using PHPUnit and contains a number of assert methods that will throw PHPUnit
|
||||||
* assertion exception when applicable.
|
* assertion exception when applicable.
|
||||||
*
|
*
|
||||||
* Tries to use the PHP Tidy extension (http://php.net/tidy),
|
* Tries to use the PHP tidy extension (http://php.net/tidy),
|
||||||
* and falls back to the "tidy" CLI tool. If none of those exists,
|
* and falls back to the "tidy" CLI tool. If none of those exists,
|
||||||
* the string is parsed directly without sanitization.
|
* the string is parsed directly without sanitization.
|
||||||
*
|
*
|
||||||
@ -23,14 +23,14 @@ class CSSContentParser extends Object {
|
|||||||
|
|
||||||
public function __construct($content) {
|
public function __construct($content) {
|
||||||
if(extension_loaded('tidy')) {
|
if(extension_loaded('tidy')) {
|
||||||
// using the tiny php extension
|
// using the tidy php extension
|
||||||
$tidy = new Tidy();
|
$tidy = new tidy();
|
||||||
$tidy->parseString(
|
$tidy->parseString(
|
||||||
$content,
|
$content,
|
||||||
array(
|
array(
|
||||||
'output-xhtml' => true,
|
'output-xhtml' => true,
|
||||||
'numeric-entities' => true,
|
'numeric-entities' => true,
|
||||||
'wrap' => 99999, // We need this to be consistent for functional test string comparisons
|
'wrap' => 0, // We need this to be consistent for functional test string comparisons
|
||||||
),
|
),
|
||||||
'utf8'
|
'utf8'
|
||||||
);
|
);
|
||||||
@ -41,7 +41,7 @@ class CSSContentParser extends Object {
|
|||||||
} elseif(@shell_exec('which tidy')) {
|
} elseif(@shell_exec('which tidy')) {
|
||||||
// using tiny through cli
|
// using tiny through cli
|
||||||
$CLI_content = escapeshellarg($content);
|
$CLI_content = escapeshellarg($content);
|
||||||
$tidy = `echo $CLI_content | tidy -n -q -utf8 -asxhtml 2> /dev/null`;
|
$tidy = `echo $CLI_content | tidy --force-output 1 -n -q -utf8 -asxhtml -w 0 2> /dev/null`;
|
||||||
$tidy = str_replace('xmlns="http://www.w3.org/1999/xhtml"','',$tidy);
|
$tidy = str_replace('xmlns="http://www.w3.org/1999/xhtml"','',$tidy);
|
||||||
$tidy = str_replace(' ','',$tidy);
|
$tidy = str_replace(' ','',$tidy);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -346,7 +346,7 @@ class Debug {
|
|||||||
class_exists('Translatable') ? Translatable::get_current_locale() : null
|
class_exists('Translatable') ? Translatable::get_current_locale() : null
|
||||||
);
|
);
|
||||||
if(file_exists($errorFilePath)) {
|
if(file_exists($errorFilePath)) {
|
||||||
$content = file_get_contents(ASSETS_PATH . "/error-$statusCode.html");
|
$content = file_get_contents($errorFilePath);
|
||||||
if(!headers_sent()) header('Content-Type: text/html');
|
if(!headers_sent()) header('Content-Type: text/html');
|
||||||
// $BaseURL is left dynamic in error-###.html, so that multi-domain sites don't get broken
|
// $BaseURL is left dynamic in error-###.html, so that multi-domain sites don't get broken
|
||||||
echo str_replace('$BaseURL', Director::absoluteBaseURL(), $content);
|
echo str_replace('$BaseURL', Director::absoluteBaseURL(), $content);
|
||||||
|
|||||||
32
dev/DevBuildController.php
Normal file
32
dev/DevBuildController.php
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
class DevBuildController extends Controller {
|
||||||
|
|
||||||
|
private static $url_handlers = array(
|
||||||
|
'' => 'build'
|
||||||
|
);
|
||||||
|
|
||||||
|
private static $allowed_actions = array(
|
||||||
|
'build'
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
public function build($request) {
|
||||||
|
if(Director::is_cli()) {
|
||||||
|
$da = DatabaseAdmin::create();
|
||||||
|
return $da->handleRequest($request, $this->model);
|
||||||
|
} else {
|
||||||
|
$renderer = DebugView::create();
|
||||||
|
$renderer->writeHeader();
|
||||||
|
$renderer->writeInfo("Environment Builder", Director::absoluteBaseURL());
|
||||||
|
echo "<div class=\"build\">";
|
||||||
|
|
||||||
|
$da = DatabaseAdmin::create();
|
||||||
|
return $da->handleRequest($request, $this->model);
|
||||||
|
|
||||||
|
echo "</div>";
|
||||||
|
$renderer->writeFooter();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,10 +1,15 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Base class for URL access to development tools. Currently supports the
|
* Base class for development tools.
|
||||||
* ; and TaskRunner.
|
*
|
||||||
|
* Configured in framework/_config/dev.yml, with the config key registeredControllers being
|
||||||
|
* used to generate the list of links for /dev.
|
||||||
*
|
*
|
||||||
* @todo documentation for how to add new unit tests and tasks
|
* @todo documentation for how to add new unit tests and tasks
|
||||||
|
* @todo do we need buildDefaults and generatesecuretoken? if so, register in the list
|
||||||
|
* @todo cleanup errors() it's not even an allowed action, so can go
|
||||||
|
* @todo cleanup index() html building
|
||||||
* @package framework
|
* @package framework
|
||||||
* @subpackage dev
|
* @subpackage dev
|
||||||
*/
|
*/
|
||||||
@ -13,21 +18,15 @@ class DevelopmentAdmin extends Controller {
|
|||||||
private static $url_handlers = array(
|
private static $url_handlers = array(
|
||||||
'' => 'index',
|
'' => 'index',
|
||||||
'build/defaults' => 'buildDefaults',
|
'build/defaults' => 'buildDefaults',
|
||||||
'$Action' => '$Action',
|
'generatesecuretoken' => 'generatesecuretoken',
|
||||||
'$Action//$Action/$ID' => 'handleAction',
|
'$Action' => 'runRegisteredController',
|
||||||
);
|
);
|
||||||
|
|
||||||
private static $allowed_actions = array(
|
private static $allowed_actions = array(
|
||||||
'index',
|
'index',
|
||||||
'tests',
|
|
||||||
'jstests',
|
|
||||||
'tasks',
|
|
||||||
'viewmodel',
|
|
||||||
'build',
|
|
||||||
'reset',
|
|
||||||
'viewcode',
|
|
||||||
'generatesecuretoken',
|
|
||||||
'buildDefaults',
|
'buildDefaults',
|
||||||
|
'runRegisteredController',
|
||||||
|
'generatesecuretoken',
|
||||||
);
|
);
|
||||||
|
|
||||||
public function init() {
|
public function init() {
|
||||||
@ -80,20 +79,8 @@ class DevelopmentAdmin extends Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function index() {
|
public function index() {
|
||||||
$actions = array(
|
|
||||||
"build" => "Build/rebuild this environment. Call this whenever you have updated your project sources",
|
|
||||||
"tests" => "See a list of unit tests to run",
|
|
||||||
"tests/all" => "Run all tests",
|
|
||||||
"jstests" => "See a list of JavaScript tests to run",
|
|
||||||
"jstests/all" => "Run all JavaScript tests",
|
|
||||||
"tasks" => "See a list of build tasks to run"
|
|
||||||
);
|
|
||||||
|
|
||||||
// Web mode
|
// Web mode
|
||||||
if(!Director::is_cli()) {
|
if(!Director::is_cli()) {
|
||||||
// This action is sake-only right now.
|
|
||||||
unset($actions["modules/add"]);
|
|
||||||
|
|
||||||
$renderer = DebugView::create();
|
$renderer = DebugView::create();
|
||||||
$renderer->writeHeader();
|
$renderer->writeHeader();
|
||||||
$renderer->writeInfo("SilverStripe Development Tools", Director::absoluteBaseURL());
|
$renderer->writeInfo("SilverStripe Development Tools", Director::absoluteBaseURL());
|
||||||
@ -101,7 +88,7 @@ class DevelopmentAdmin extends Controller {
|
|||||||
|
|
||||||
echo '<div class="options"><ul>';
|
echo '<div class="options"><ul>';
|
||||||
$evenOdd = "odd";
|
$evenOdd = "odd";
|
||||||
foreach($actions as $action => $description) {
|
foreach(self::get_links() as $action => $description) {
|
||||||
echo "<li class=\"$evenOdd\"><a href=\"{$base}dev/$action\"><b>/dev/$action:</b>"
|
echo "<li class=\"$evenOdd\"><a href=\"{$base}dev/$action\"><b>/dev/$action:</b>"
|
||||||
. " $description</a></li>\n";
|
. " $description</a></li>\n";
|
||||||
$evenOdd = ($evenOdd == "odd") ? "even" : "odd";
|
$evenOdd = ($evenOdd == "odd") ? "even" : "odd";
|
||||||
@ -113,43 +100,75 @@ class DevelopmentAdmin extends Controller {
|
|||||||
} else {
|
} else {
|
||||||
echo "SILVERSTRIPE DEVELOPMENT TOOLS\n--------------------------\n\n";
|
echo "SILVERSTRIPE DEVELOPMENT TOOLS\n--------------------------\n\n";
|
||||||
echo "You can execute any of the following commands:\n\n";
|
echo "You can execute any of the following commands:\n\n";
|
||||||
foreach($actions as $action => $description) {
|
foreach(self::get_links() as $action => $description) {
|
||||||
echo " sake dev/$action: $description\n";
|
echo " sake dev/$action: $description\n";
|
||||||
}
|
}
|
||||||
echo "\n\n";
|
echo "\n\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tests($request) {
|
public function runRegisteredController(SS_HTTPRequest $request){
|
||||||
return TestRunner::create();
|
$controllerClass = null;
|
||||||
|
|
||||||
|
$baseUrlPart = $request->param('Action');
|
||||||
|
$reg = Config::inst()->get(__CLASS__, 'registered_controllers');
|
||||||
|
if(isset($reg[$baseUrlPart])){
|
||||||
|
$controllerClass = $reg[$baseUrlPart]['controller'];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function jstests($request) {
|
if($controllerClass && class_exists($controllerClass)){
|
||||||
return JSTestRunner::create();
|
return $controllerClass::create();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tasks() {
|
$msg = 'Error: no controller registered in '.__CLASS__.' for: '.$request->param('Action');
|
||||||
return TaskRunner::create();
|
if(Director::is_cli()){
|
||||||
}
|
// in CLI we cant use httpError because of a bug with stuff being in the output already, see DevAdminControllerTest
|
||||||
|
throw new Exception($msg);
|
||||||
public function build($request) {
|
}else{
|
||||||
if(Director::is_cli()) {
|
$this->httpError(500, $msg);
|
||||||
$da = DatabaseAdmin::create();
|
|
||||||
return $da->handleRequest($request, $this->model);
|
|
||||||
} else {
|
|
||||||
$renderer = DebugView::create();
|
|
||||||
$renderer->writeHeader();
|
|
||||||
$renderer->writeInfo("Environment Builder", Director::absoluteBaseURL());
|
|
||||||
echo "<div class=\"build\">";
|
|
||||||
|
|
||||||
$da = DatabaseAdmin::create();
|
|
||||||
return $da->handleRequest($request, $this->model);
|
|
||||||
|
|
||||||
echo "</div>";
|
|
||||||
$renderer->writeFooter();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Internal methods
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array of url => description
|
||||||
|
*/
|
||||||
|
protected static function get_links(){
|
||||||
|
$links = array();
|
||||||
|
|
||||||
|
$reg = Config::inst()->get(__CLASS__, 'registered_controllers');
|
||||||
|
foreach($reg as $registeredController){
|
||||||
|
foreach($registeredController['links'] as $url => $desc){
|
||||||
|
$links[$url] = $desc;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $links;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getRegisteredController($baseUrlPart){
|
||||||
|
$reg = Config::inst()->get(__CLASS__, 'registered_controllers');
|
||||||
|
|
||||||
|
if(isset($reg[$baseUrlPart])){
|
||||||
|
$controllerClass = $reg[$baseUrlPart]['controller'];
|
||||||
|
return $controllerClass;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Unregistered (hidden) actions
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Build the default data, calling requireDefaultRecords on all
|
* Build the default data, calling requireDefaultRecords on all
|
||||||
* DataObject classes
|
* DataObject classes
|
||||||
|
|||||||
@ -110,6 +110,30 @@ class FunctionalTest extends SapphireTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run a test while mocking the base url with the provided value
|
||||||
|
* @param string $url The base URL to use for this test
|
||||||
|
* @param callable $callback The test to run
|
||||||
|
*/
|
||||||
|
protected function withBaseURL($url, $callback) {
|
||||||
|
$oldBase = Config::inst()->get('Director', 'alternate_base_url');
|
||||||
|
Config::inst()->update('Director', 'alternate_base_url', $url);
|
||||||
|
$callback($this);
|
||||||
|
Config::inst()->update('Director', 'alternate_base_url', $oldBase);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run a test while mocking the base folder with the provided value
|
||||||
|
* @param string $folder The base folder to use for this test
|
||||||
|
* @param callable $callback The test to run
|
||||||
|
*/
|
||||||
|
protected function withBaseFolder($folder, $callback) {
|
||||||
|
$oldFolder = Config::inst()->get('Director', 'alternate_base_folder');
|
||||||
|
Config::inst()->update('Director', 'alternate_base_folder', $folder);
|
||||||
|
$callback($this);
|
||||||
|
Config::inst()->update('Director', 'alternate_base_folder', $oldFolder);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Submit a get request
|
* Submit a get request
|
||||||
* @uses Director::test()
|
* @uses Director::test()
|
||||||
|
|||||||
@ -86,7 +86,7 @@ class TaskRunner extends Controller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$message(sprintf('The build task "%s" could not be found', $name));
|
$message(sprintf('The build task "%s" could not be found', Convert::raw2xml($name)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -82,19 +82,24 @@ class TestRunner extends Controller {
|
|||||||
* top of the loader stacks.
|
* top of the loader stacks.
|
||||||
*/
|
*/
|
||||||
public static function use_test_manifest() {
|
public static function use_test_manifest() {
|
||||||
|
$flush = true;
|
||||||
|
if(isset($_GET['flush']) && $_GET['flush'] === '0') {
|
||||||
|
$flush = false;
|
||||||
|
}
|
||||||
|
|
||||||
$classManifest = new SS_ClassManifest(
|
$classManifest = new SS_ClassManifest(
|
||||||
BASE_PATH, true, isset($_GET['flush'])
|
BASE_PATH, true, $flush
|
||||||
);
|
);
|
||||||
|
|
||||||
SS_ClassLoader::instance()->pushManifest($classManifest, false);
|
SS_ClassLoader::instance()->pushManifest($classManifest, false);
|
||||||
SapphireTest::set_test_class_manifest($classManifest);
|
SapphireTest::set_test_class_manifest($classManifest);
|
||||||
|
|
||||||
SS_TemplateLoader::instance()->pushManifest(new SS_TemplateManifest(
|
SS_TemplateLoader::instance()->pushManifest(new SS_TemplateManifest(
|
||||||
BASE_PATH, project(), true, isset($_GET['flush'])
|
BASE_PATH, project(), true, $flush
|
||||||
));
|
));
|
||||||
|
|
||||||
Config::inst()->pushConfigStaticManifest(new SS_ConfigStaticManifest(
|
Config::inst()->pushConfigStaticManifest(new SS_ConfigStaticManifest(
|
||||||
BASE_PATH, true, isset($_GET['flush'])
|
BASE_PATH, true, $flush
|
||||||
));
|
));
|
||||||
|
|
||||||
// Invalidate classname spec since the test manifest will now pull out new subclasses for each internal class
|
// Invalidate classname spec since the test manifest will now pull out new subclasses for each internal class
|
||||||
@ -111,15 +116,7 @@ class TestRunner extends Controller {
|
|||||||
if (!self::$default_reporter) self::set_reporter(Director::is_cli() ? 'CliDebugView' : 'DebugView');
|
if (!self::$default_reporter) self::set_reporter(Director::is_cli() ? 'CliDebugView' : 'DebugView');
|
||||||
|
|
||||||
if(!PhpUnitWrapper::has_php_unit()) {
|
if(!PhpUnitWrapper::has_php_unit()) {
|
||||||
die("Please install PHPUnit using pear");
|
die("Please install PHPUnit using Composer");
|
||||||
}
|
|
||||||
|
|
||||||
if(!isset($_GET['flush']) || !$_GET['flush']) {
|
|
||||||
Debug::message(
|
|
||||||
"WARNING: Manifest not flushed. " .
|
|
||||||
"Add flush=1 as an argument to discover new classes or files.\n",
|
|
||||||
false
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -392,7 +389,7 @@ class TestRunner extends Controller {
|
|||||||
if (count($classList) > 1) {
|
if (count($classList) > 1) {
|
||||||
self::$default_reporter->writeInfo("All Tests", "Running test cases: ",implode(", ", $classList));
|
self::$default_reporter->writeInfo("All Tests", "Running test cases: ",implode(", ", $classList));
|
||||||
} elseif (count($classList) == 1) {
|
} elseif (count($classList) == 1) {
|
||||||
self::$default_reporter->writeInfo($classList[0], '');
|
self::$default_reporter->writeInfo(reset($classList), '');
|
||||||
} else {
|
} else {
|
||||||
// border case: no tests are available.
|
// border case: no tests are available.
|
||||||
self::$default_reporter->writeInfo('', '');
|
self::$default_reporter->writeInfo('', '');
|
||||||
|
|||||||
@ -1588,8 +1588,7 @@ ErrorDocument 500 /assets/error-500.html
|
|||||||
|
|
||||||
RewriteCond %{REQUEST_URI} ^(.*)$
|
RewriteCond %{REQUEST_URI} ^(.*)$
|
||||||
RewriteCond %{REQUEST_FILENAME} !-f
|
RewriteCond %{REQUEST_FILENAME} !-f
|
||||||
RewriteCond %{REQUEST_URI} !\.php$
|
RewriteRule .* $modulePath/main.php?url=%1 [QSA]
|
||||||
RewriteRule .* $modulePath/main.php?url=%1&%{QUERY_STRING} [L]
|
|
||||||
</IfModule>
|
</IfModule>
|
||||||
TEXT;
|
TEXT;
|
||||||
|
|
||||||
|
|||||||
@ -260,7 +260,7 @@ class PhpUnitWrapper_Exception extends Exception {}
|
|||||||
//
|
//
|
||||||
if(!PhpUnitWrapper::has_php_unit()) {
|
if(!PhpUnitWrapper::has_php_unit()) {
|
||||||
/**
|
/**
|
||||||
* PHPUnit is a testing framework that can be installed using PEAR.
|
* PHPUnit is a testing framework that can be installed using Composer.
|
||||||
* It's not bundled with SilverStripe, you will need to install it yourself.
|
* It's not bundled with SilverStripe, you will need to install it yourself.
|
||||||
*
|
*
|
||||||
* @package framework
|
* @package framework
|
||||||
|
|||||||
@ -7,3 +7,62 @@
|
|||||||
follows the same process as the use of the 'flush' query string parameter, and will redirect
|
follows the same process as the use of the 'flush' query string parameter, and will redirect
|
||||||
requests containing this argument with a token in the querystring.
|
requests containing this argument with a token in the querystring.
|
||||||
Director::isDev, Director::isTest, and Director::isLive no longer have any parameters.
|
Director::isDev, Director::isTest, and Director::isLive no longer have any parameters.
|
||||||
|
|
||||||
|
### API Changes
|
||||||
|
|
||||||
|
* 2014-07-28 [0e78e3f](https://github.com/silverstripe/sapphire/commit/0e78e3f) Let update interval of tinymce be changed or disabled (Damian Mooyman)
|
||||||
|
* 2014-07-21 [4453caf](https://github.com/silverstripe/sapphire/commit/4453caf) Let extensions control folder selector in HtmlEditorField_Toolbar (Damian Mooyman)
|
||||||
|
* 2014-07-05 [3c5e51a](https://github.com/silverstripe/sapphire/commit/3c5e51a) Debug::dump in CLI no longer generates HTML. Uses colours. API Column size is configurable in DebugView (Damian Mooyman)
|
||||||
|
* 2014-05-22 [ec325a3](https://github.com/silverstripe/sapphire/commit/ec325a3) Fix HTTPS proxy header detection (Ingo Schommer)
|
||||||
|
|
||||||
|
### Features and Enhancements
|
||||||
|
|
||||||
|
* 2014-08-13 [5704ae2](https://github.com/silverstripe/sapphire/commit/5704ae2) Sanitise task name in runTask (Kirk Mayo)
|
||||||
|
* 2014-07-28 [482c23f](https://github.com/silverstripe/silverstripe-cms/commit/482c23f) Adding CMS sitetree filter to see the current 'live' site (Stig Lindqvist)
|
||||||
|
* 2014-06-28 [1d86fe4](https://github.com/silverstripe/sapphire/commit/1d86fe4) allow force resampling on images (Stevie Mayhew)
|
||||||
|
* 2014-07-28 [ac95a87](https://github.com/silverstripe/sapphire/commit/ac95a87) Allow configuring Image backend via yaml. (Jeremy Shipman)
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
|
||||||
|
* 2014-08-15 [7e70b8d](https://github.com/silverstripe/sapphire/commit/7e70b8d) Reapply fix for cms crashing due to History.js blindly appending slashes to end of url (Damian Mooyman)
|
||||||
|
* 2014-05-15 [7277dc1](https://github.com/silverstripe/silverstripe-cms/commit/7277dc1) Fix sorting on main ReportAdmin grid ref: CWPBUG-133 (Damian Mooyman)
|
||||||
|
* 2014-06-01 [e535c35](https://github.com/silverstripe/sapphire/commit/e535c35) New JS sprintf and inject replacement functions (colymba)
|
||||||
|
* 2014-08-11 [98907fb](https://github.com/silverstripe/sapphire/commit/98907fb) Fix incorrect parsing of HTML content (Damian Mooyman)
|
||||||
|
* 2014-08-08 [a369094](https://github.com/silverstripe/sapphire/commit/a369094) Fix issue with generating tree data for missing pages (Damian Mooyman)
|
||||||
|
* 2014-08-06 [53dbbb7](https://github.com/silverstripe/silverstripe-cms/commit/53dbbb7) Fix CMSMain::getList to correctly respect filter result Fixes #1064 CMSSiteTreeFilter refactored to allow SS_List of filtered pages to be returned (Damian Mooyman)
|
||||||
|
* 2014-08-06 [1c48cb6](https://github.com/silverstripe/silverstripe-cms/commit/1c48cb6) Fix search range for asset filter (Damian Mooyman)
|
||||||
|
* 2014-06-27 [f19b1ee](https://github.com/silverstripe/sapphire/commit/f19b1ee) declarations matching PHPUnit_Framework_Assert (Michael Parkhill)
|
||||||
|
* 2014-08-04 [b2dac64](https://github.com/silverstripe/sapphire/commit/b2dac64) Fixed escaping of name/value in options of form fields (Sean Harvey)
|
||||||
|
* 2014-08-01 [9281089](https://github.com/silverstripe/sapphire/commit/9281089) Return the promise instead of the whole deferred object. (Mateusz Uzdowski)
|
||||||
|
* 2014-07-31 [d8302a0](https://github.com/silverstripe/sapphire/commit/d8302a0) Add a synthetic event to workaround IE8 issues. (Mateusz Uzdowski)
|
||||||
|
* 2014-07-30 [31c9fb5](https://github.com/silverstripe/sapphire/commit/31c9fb5) Fix the anchor selector to work for internal pages. (Mateusz Uzdowski)
|
||||||
|
* 2014-07-29 [baa2b69](https://github.com/silverstripe/sapphire/commit/baa2b69) Fixing incorrect error message on failed UploadField upload (Sean Harvey)
|
||||||
|
* 2014-07-29 [329dffd](https://github.com/silverstripe/sapphire/commit/329dffd) AssetUploadField hides "generic" file upload messages. (Sean Harvey)
|
||||||
|
* 2014-07-28 [62ed2d0](https://github.com/silverstripe/sapphire/commit/62ed2d0) Fix periodic tinymce layout refresh (Damian Mooyman)
|
||||||
|
* 2014-07-24 [3eefd65](https://github.com/silverstripe/silverstripe-cms/commit/3eefd65) Narrowing site tree search to one date shows no pages (Stig Lindqvist)
|
||||||
|
* 2014-07-20 [333a2aa](https://github.com/silverstripe/sapphire/commit/333a2aa) CMS tree filters doesn't count the correct number of children for deleted pages (Stig Lindqvist)
|
||||||
|
* 2014-07-17 [ac64d25](https://github.com/silverstripe/sapphire/commit/ac64d25) If user is logged out getHtmlEditorConfigForCMS() gets called on non object (Stig Lindqvist)
|
||||||
|
* 2014-07-17 [df6a8b6](https://github.com/silverstripe/sapphire/commit/df6a8b6) #3282: Added ability to subselect with in left or inner join (Senorgeno)
|
||||||
|
* 2014-07-14 [b34aaca](https://github.com/silverstripe/sapphire/commit/b34aaca) Fix several issues around onmatch/onunmatch entwines. (Mateusz Uzdowski)
|
||||||
|
* 2014-07-03 [c329f07](https://github.com/silverstripe/sapphire/commit/c329f07) Fix incorrect common_languages config (Damian Mooyman)
|
||||||
|
* 2014-07-01 [d3c7e41](https://github.com/silverstripe/sapphire/commit/d3c7e41) using isDev or isTest query string no longer triggers basic auth (Damian Mooyman)
|
||||||
|
* 2014-07-01 [a777266](https://github.com/silverstripe/silverstripe-cms/commit/a777266) ensure controller stack is updated when execution halted by an exception. (Will Rossiter)
|
||||||
|
* 2014-06-28 [2c741fe](https://github.com/silverstripe/sapphire/commit/2c741fe) Add support for compositedbfield within many_many_extraFields (Will Rossiter)
|
||||||
|
* 2014-06-16 [3d71a22](https://github.com/silverstripe/sapphire/commit/3d71a22) ClassManifest errors if files contain duplicate class names (fixes #3210) (Loz Calver)
|
||||||
|
* 2014-06-12 [d516063](https://github.com/silverstripe/sapphire/commit/d516063) fix dependency injection stumbling over ViewableData's __isset (Damian Mooyman)
|
||||||
|
* 2014-06-11 [18b6870](https://github.com/silverstripe/sapphire/commit/18b6870) Sanitise the PHP output. (Mateusz Uzdowski)
|
||||||
|
* 2014-06-10 [1e19485](https://github.com/silverstripe/silverstripe-cms/commit/1e19485) Ensure that all child pages are deleted (regardless of ShowInMenu status) under enforce_strict_hierarchy. (Rodney Way)
|
||||||
|
* 2014-05-30 [b8d19ba](https://github.com/silverstripe/silverstripe-cms/commit/b8d19ba) Fix deleted pages redirecting the CMS Update behat tests for Mink 1.6 compatibility (Damian Mooyman)
|
||||||
|
* 2014-05-22 [f9e7d47](https://github.com/silverstripe/sapphire/commit/f9e7d47) fix listview not working with IE9 (Igor)
|
||||||
|
* 2014-05-20 [4a34c36](https://github.com/silverstripe/sapphire/commit/4a34c36) Fix access to protected Session::current_session() Fixes #3144 (Damian Mooyman)
|
||||||
|
* 2014-05-15 [c24a2c2](https://github.com/silverstripe/sapphire/commit/c24a2c2) ArrayList failing to respect the SS_Sortable interface ref: CWPBUG-133 (Damian Mooyman)
|
||||||
|
* 2014-05-15 [ee6e496](https://github.com/silverstripe/sapphire/commit/ee6e496) Fix grid field showing search without search component added ref: CWPBUG-133 (Damian Mooyman)
|
||||||
|
* 2014-05-12 [51c3346](https://github.com/silverstripe/sapphire/commit/51c3346) Fix deprecated use of statics in test cases (Damian Mooyman)
|
||||||
|
* 2014-05-10 [d012b79](https://github.com/silverstripe/sapphire/commit/d012b79) Prevent i18n clearing all SS_Caches (fixes #3122) (Loz Calver)
|
||||||
|
* 2014-05-02 [807755f](https://github.com/silverstripe/sapphire/commit/807755f) TemplateManifest prevent cache collision (Will Morgan)
|
||||||
|
|
||||||
|
## Changelog
|
||||||
|
|
||||||
|
* [framework](https://github.com/silverstripe/silverstripe-framework/releases/tag/3.1.6)
|
||||||
|
* [cms](https://github.com/silverstripe/silverstripe-cms/releases/tag/3.1.6)
|
||||||
|
* [installer](https://github.com/silverstripe/silverstripe-installer/releases/tag/3.1.6)
|
||||||
|
|||||||
81
docs/en/changelogs/3.1.7.md
Normal file
81
docs/en/changelogs/3.1.7.md
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
# 3.1.7
|
||||||
|
|
||||||
|
## Upgrading
|
||||||
|
|
||||||
|
### Authentication
|
||||||
|
|
||||||
|
3.1.7 introduces a re-authentication feature, which allows user working in the CMS to quickly re-enter their password
|
||||||
|
and continue working should their session expire. This occurs through a popup dialog, which asks the user for their
|
||||||
|
current password to continue working.
|
||||||
|
|
||||||
|
If using a custom `[api:Authenticator]` class to replace the default MemberAuthenticator, then by default this feature
|
||||||
|
will be disabled. If multiple authenticators are used, only supported ones will be available within the CMS.
|
||||||
|
|
||||||
|
In order to create a CMS supported version the `Authenticator::supports_cms` and `Authenticator::get_cms_login_form`
|
||||||
|
methods should be overridden. See `[api:MemberAuthenticator]` for an example implementation.
|
||||||
|
|
||||||
|
Check the documentation at the [Authentication](/topics/authentication) topic.
|
||||||
|
|
||||||
|
### Default Admin
|
||||||
|
|
||||||
|
In this version the way that the default admin user is managed is slightly changed. Rather than defaulting to the first
|
||||||
|
administrator user in the CMS, a user logging in as a default admin will always be assigned to a "Default Admin"
|
||||||
|
user with admin privileges. In the past, this user would only be created if no other administrators existed.
|
||||||
|
|
||||||
|
## Security
|
||||||
|
|
||||||
|
This release includes only minor security related patches.
|
||||||
|
|
||||||
|
* 2014-07-05 [c247dd5](https://github.com/silverstripe/silverstripe-framework/commit/c247dd5) Add default $lock_out_after_incorrect_logins value [SS-2014-016](http://www.silverstripe.org/software/download/security-releases/ss-2014-016).
|
||||||
|
* 2014-10-24 [5d27ea4](https://github.com/silverstripe/sapphire/commit/5d27ea4) File attach handler is no longer accessible if attachment is disallowed or disabled [SS-2014-014](http://www.silverstripe.org/software/download/security-releases/ss-2014-014-front-end-uploadfield-exposes-lists-of-assets).
|
||||||
|
|
||||||
|
### API Changes
|
||||||
|
|
||||||
|
* 2014-10-06 [53c40a9](https://github.com/silverstripe/sapphire/commit/53c40a9) Enable re-authentication within the CMS if a user session is lost BUG Resolve issue with error redirection being ignored within CMS BUG Fix issue with invalid securityID being re-emitted on failure (Damian Mooyman)
|
||||||
|
* 2014-08-18 [920978d](https://github.com/silverstripe/sapphire/commit/920978d) Add ClassInfo::table_for_object_field (Will Rossiter)
|
||||||
|
* 2014-06-01 [8fb5e9c](https://github.com/silverstripe/sapphire/commit/8fb5e9c) New JS sprintf and inject replacement functions (colymba)
|
||||||
|
* 2013-12-05 [b273f3b](https://github.com/silverstripe/sapphire/commit/b273f3b) Updated aspect proxy service (Marcus Nyeholt)
|
||||||
|
* 2013-12-05 [b8f4576](https://github.com/silverstripe/sapphire/commit/b8f4576) Use injector to create database class (Marcus Nyeholt)
|
||||||
|
|
||||||
|
### Features and Enhancements
|
||||||
|
|
||||||
|
* 2014-08-16 [2b316e7](https://github.com/silverstripe/sapphire/commit/2b316e7) Provide a consistent way of triggering flush (Sean Harvey)
|
||||||
|
* 2014-08-13 [62f4fdb](https://github.com/silverstripe/sapphire/commit/62f4fdb) Sanitise task name in runTask (Kirk Mayo)
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
|
||||||
|
* 2014-11-03 [56142b8](https://github.com/silverstripe/silverstripe-cms/commit/56142b8) sprintf missing on exception in SilverStripeNavigator (Sean Harvey)
|
||||||
|
* 2014-10-30 [392ddef](https://github.com/silverstripe/sapphire/commit/392ddef) Image resizing breaks when one of the resized image dimensions is between 0 and 1. Solution: Round up to 1 instead of down to 0. Converted php errors to exceptions in the process. (Jeremy Shipman)
|
||||||
|
* 2014-10-23 [d6e1c51](https://github.com/silverstripe/sapphire/commit/d6e1c51) Prevent JSON response showing when re-opening closed tab (fixes silverstripe/silverstripe-cms#1121) (Loz Calver)
|
||||||
|
* 2014-10-21 [478edfa](https://github.com/silverstripe/sapphire/commit/478edfa) Upload: File versioning with existing files reinsert oldFilePath = relativeFilePath in while loop (Devlin)
|
||||||
|
* 2014-10-20 [49cb38d](https://github.com/silverstripe/sapphire/commit/49cb38d) Fix static call to protected instance method (Damian Mooyman)
|
||||||
|
* 2014-10-20 [8310135](https://github.com/silverstripe/silverstripe-cms/commit/8310135) Broken links on dependent pages tab (micmania1)
|
||||||
|
* 2014-10-17 [20af30e](https://github.com/silverstripe/sapphire/commit/20af30e) GridFieldExportButton exporting only Paginated list when using ArrayList as source (Stephen McMahon)
|
||||||
|
* 2014-10-15 [570f261](https://github.com/silverstripe/sapphire/commit/570f261) Tag-less cache backends error on flush (Loz Calver)
|
||||||
|
* 2014-10-14 [793784e](https://github.com/silverstripe/sapphire/commit/793784e) Fix flushing of SSViewer cache via testing (Damian Mooyman)
|
||||||
|
* 2014-10-09 [bad9aa1](https://github.com/silverstripe/sapphire/commit/bad9aa1) i18n support in LookupField (Milan Jelicanin)
|
||||||
|
* 2014-10-07 [48eb0e6](https://github.com/silverstripe/sapphire/commit/48eb0e6) Deliberately clear partial cache blocks on flush (fixes #1383) (Loz Calver)
|
||||||
|
* 2014-10-01 [776f697](https://github.com/silverstripe/sapphire/commit/776f697) Text::BigSummary() fails with undefined $data when $plain = false (Sean Harvey)
|
||||||
|
* 2014-09-03 [fe42abc](https://github.com/silverstripe/sapphire/commit/fe42abc) CSSContentParser fails if CLI tidy doesn't output anything. (Sean Harvey)
|
||||||
|
* 2014-09-03 [56d84d2](https://github.com/silverstripe/sapphire/commit/56d84d2) MySQLDatabase performs queries on wrong DB connection when using connection $name != 'default' (Damian Mooyman)
|
||||||
|
* 2014-08-26 [cf456d6](https://github.com/silverstripe/sapphire/commit/cf456d6) use @param $colName in column call (Gabrijel Gavranović)
|
||||||
|
* 2014-08-26 [7993875](https://github.com/silverstripe/sapphire/commit/7993875) Sorting a DataQuery over a relation. (Will Rossiter)
|
||||||
|
* 2014-08-22 [8063b34](https://github.com/silverstripe/sapphire/commit/8063b34) Fixing Director::test() failing on BASE_URL prefixed URLs (Sean Harvey)
|
||||||
|
* 2014-08-20 [61c6dee](https://github.com/silverstripe/sapphire/commit/61c6dee) Fixing plural_name messing up singular words ending in "e" (#3251) (Sean Harvey)
|
||||||
|
* 2014-08-15 [79c7276](https://github.com/silverstripe/sapphire/commit/79c7276) Reapply fix for cms crashing due to History.js blindly appending slashes to end of url (Damian Mooyman)
|
||||||
|
* 2014-08-14 [5f1552b](https://github.com/silverstripe/sapphire/commit/5f1552b) Custom label set in summary_fields config gets overridden (Sean Harvey)
|
||||||
|
* 2014-08-14 [7c2eee1](https://github.com/silverstripe/sapphire/commit/7c2eee1) Fix 'undefined index 0' (Damian Mooyman)
|
||||||
|
* 2014-08-11 [69de7e3](https://github.com/silverstripe/sapphire/commit/69de7e3) Fix incorrect parsing of HTML content (Damian Mooyman)
|
||||||
|
* 2014-08-08 [fbc7e7c](https://github.com/silverstripe/sapphire/commit/fbc7e7c) Fix issue with generating tree data for missing pages (Damian Mooyman)
|
||||||
|
* 2014-07-28 [02265dc](https://github.com/silverstripe/sapphire/commit/02265dc) Correctly paddedResize images in IMagickBackend. FIX: Compression quality setting now takes effect. (Jeremy Shipman)
|
||||||
|
* 2014-07-28 [47cc157](https://github.com/silverstripe/sapphire/commit/47cc157) Keep ImagickBackend API consistent with Image_Backend interface and fix color formatting. (Jeremy Shipman)
|
||||||
|
* 2014-07-28 [bf3ad56](https://github.com/silverstripe/sapphire/commit/bf3ad56) Image_Backend -> croppedResize function doesn't include a backgroundColor, therefore this shouldn't be assumed in ImageMagick->croppedResize (Jeremy Shipman)
|
||||||
|
* 2014-06-27 [19e0d5e](https://github.com/silverstripe/sapphire/commit/19e0d5e) declarations matching PHPUnit_Framework_Assert (Michael Parkhill)
|
||||||
|
* 2014-03-12 [96d0874](https://github.com/silverstripe/sapphire/commit/96d0874) Fix issue with inheritance of Injector service configuration (Damian Mooyman)
|
||||||
|
* 2014-01-31 [1661213](https://github.com/silverstripe/sapphire/commit/1661213) Opt-out pf form message escaping (fixes #2796) (Ingo Schommer)
|
||||||
|
|
||||||
|
## Changelog
|
||||||
|
|
||||||
|
* [framework](https://github.com/silverstripe/silverstripe-framework/releases/tag/3.1.7)
|
||||||
|
* [cms](https://github.com/silverstripe/silverstripe-cms/releases/tag/3.1.7)
|
||||||
|
* [installer](https://github.com/silverstripe/silverstripe-installer/releases/tag/3.1.7)
|
||||||
@ -11,6 +11,8 @@ For information on how to upgrade to newer versions consult the [upgrading](/ins
|
|||||||
|
|
||||||
* [3.2.0](3.2.0) - Unreleased
|
* [3.2.0](3.2.0) - Unreleased
|
||||||
|
|
||||||
|
* [3.1.7](3.1.7) - 14 November 2014
|
||||||
|
* [3.1.6](3.1.6) - 25 August 2014
|
||||||
* [3.1.5](3.1.5) - 13 May 2014
|
* [3.1.5](3.1.5) - 13 May 2014
|
||||||
* [3.1.4](3.1.4) - 8 April 2014
|
* [3.1.4](3.1.4) - 8 April 2014
|
||||||
* [3.1.0](3.1.0) - 1 October 2013
|
* [3.1.0](3.1.0) - 1 October 2013
|
||||||
@ -79,8 +81,10 @@ For information on how to upgrade to newer versions consult the [upgrading](/ins
|
|||||||
* [2.0.1](2.0.1) - 17 April 2007
|
* [2.0.1](2.0.1) - 17 April 2007
|
||||||
* 2.0.0 - 3 February 2007 (initial release)
|
* 2.0.0 - 3 February 2007 (initial release)
|
||||||
|
|
||||||
## Alpha/beta/release candidate ##
|
## Alpha/beta/release candidate
|
||||||
|
|
||||||
|
* [3.1.7-rc1](rc/3.1.7-rc1) - 8 November 2014
|
||||||
|
* [3.1.6-rc3](rc/3.1.6-rc3) - 18 August 2014
|
||||||
* [3.1.6-rc2](rc/3.1.6-rc2) - 12 August 2014
|
* [3.1.6-rc2](rc/3.1.6-rc2) - 12 August 2014
|
||||||
* [3.1.6-rc1](rc/3.1.6-rc1) - 5 August 2014
|
* [3.1.6-rc1](rc/3.1.6-rc1) - 5 August 2014
|
||||||
* [3.1.5-rc1](rc/3.1.5-rc1) - 7 May 2014
|
* [3.1.5-rc1](rc/3.1.5-rc1) - 7 May 2014
|
||||||
|
|||||||
16
docs/en/changelogs/rc/3.1.6-rc3.md
Normal file
16
docs/en/changelogs/rc/3.1.6-rc3.md
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
# 3.1.6-rc3
|
||||||
|
|
||||||
|
### Features and Enhancements
|
||||||
|
|
||||||
|
* 2014-08-13 [5704ae2](https://github.com/silverstripe/sapphire/commit/5704ae2) Sanitise task name in runTask (Kirk Mayo)
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
|
||||||
|
* 2014-08-15 [7e70b8d](https://github.com/silverstripe/sapphire/commit/7e70b8d) Reapply fix for cms crashing due to History.js blindly appending slashes to end of url (Damian Mooyman)
|
||||||
|
* 2014-05-15 [7277dc1](https://github.com/silverstripe/silverstripe-cms/commit/7277dc1) Fix sorting on main ReportAdmin grid ref: CWPBUG-133 (Damian Mooyman)
|
||||||
|
|
||||||
|
## Downloads
|
||||||
|
|
||||||
|
* [framework](https://github.com/silverstripe/silverstripe-framework/releases/tag/3.1.6-rc3)
|
||||||
|
* [cms](https://github.com/silverstripe/silverstripe-cms/releases/tag/3.1.6-rc3)
|
||||||
|
* [installer](https://github.com/silverstripe/silverstripe-installer/releases/tag/3.1.6-rc3)
|
||||||
81
docs/en/changelogs/rc/3.1.7-rc1.md
Normal file
81
docs/en/changelogs/rc/3.1.7-rc1.md
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
# 3.1.7-rc1
|
||||||
|
|
||||||
|
## Upgrading
|
||||||
|
|
||||||
|
### Authentication
|
||||||
|
|
||||||
|
3.1.7 introduces a re-authentication feature, which allows user working in the CMS to quickly re-enter their password
|
||||||
|
and continue working should their session expire. This occurs through a popup dialog, which asks the user for their
|
||||||
|
current password to continue working.
|
||||||
|
|
||||||
|
If using a custom `[api:Authenticator]` class to replace the default MemberAuthenticator, then by default this feature
|
||||||
|
will be disabled. If multiple authenticators are used, only supported ones will be available within the CMS.
|
||||||
|
|
||||||
|
In order to create a CMS supported version the `Authenticator::supports_cms` and `Authenticator::get_cms_login_form`
|
||||||
|
methods should be overridden. See `[api:MemberAuthenticator]` for an example implementation.
|
||||||
|
|
||||||
|
Check the documentation at the [Authentication](/topics/authentication) topic.
|
||||||
|
|
||||||
|
### Default Admin
|
||||||
|
|
||||||
|
In this version the way that the default admin user is managed is slightly changed. Rather than defaulting to the first
|
||||||
|
administrator user in the CMS, a user logging in as a default admin will always be assigned to a "Default Admin"
|
||||||
|
user with admin privileges. In the past, this user would only be created if no other administrators existed.
|
||||||
|
|
||||||
|
## Security
|
||||||
|
|
||||||
|
This release includes only minor security related patches.
|
||||||
|
|
||||||
|
* 2014-07-05 [c247dd5](https://github.com/silverstripe/silverstripe-framework/commit/c247dd5) Add default $lock_out_after_incorrect_logins value [SS-2014-016](http://www.silverstripe.org/software/download/security-releases/ss-2014-016).
|
||||||
|
* 2014-10-24 [5d27ea4](https://github.com/silverstripe/sapphire/commit/5d27ea4) File attach handler is no longer accessible if attachment is disallowed or disabled [SS-2014-014](http://www.silverstripe.org/software/download/security-releases/ss-2014-014-front-end-uploadfield-exposes-lists-of-assets).
|
||||||
|
|
||||||
|
### API Changes
|
||||||
|
|
||||||
|
* 2014-10-06 [53c40a9](https://github.com/silverstripe/sapphire/commit/53c40a9) Enable re-authentication within the CMS if a user session is lost BUG Resolve issue with error redirection being ignored within CMS BUG Fix issue with invalid securityID being re-emitted on failure (Damian Mooyman)
|
||||||
|
* 2014-08-18 [920978d](https://github.com/silverstripe/sapphire/commit/920978d) Add ClassInfo::table_for_object_field (Will Rossiter)
|
||||||
|
* 2014-06-01 [8fb5e9c](https://github.com/silverstripe/sapphire/commit/8fb5e9c) New JS sprintf and inject replacement functions (colymba)
|
||||||
|
* 2013-12-05 [b273f3b](https://github.com/silverstripe/sapphire/commit/b273f3b) Updated aspect proxy service (Marcus Nyeholt)
|
||||||
|
* 2013-12-05 [b8f4576](https://github.com/silverstripe/sapphire/commit/b8f4576) Use injector to create database class (Marcus Nyeholt)
|
||||||
|
|
||||||
|
### Features and Enhancements
|
||||||
|
|
||||||
|
* 2014-08-16 [2b316e7](https://github.com/silverstripe/sapphire/commit/2b316e7) Provide a consistent way of triggering flush (Sean Harvey)
|
||||||
|
* 2014-08-13 [62f4fdb](https://github.com/silverstripe/sapphire/commit/62f4fdb) Sanitise task name in runTask (Kirk Mayo)
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
|
||||||
|
* 2014-11-03 [56142b8](https://github.com/silverstripe/silverstripe-cms/commit/56142b8) sprintf missing on exception in SilverStripeNavigator (Sean Harvey)
|
||||||
|
* 2014-10-30 [392ddef](https://github.com/silverstripe/sapphire/commit/392ddef) Image resizing breaks when one of the resized image dimensions is between 0 and 1. Solution: Round up to 1 instead of down to 0. Converted php errors to exceptions in the process. (Jeremy Shipman)
|
||||||
|
* 2014-10-23 [d6e1c51](https://github.com/silverstripe/sapphire/commit/d6e1c51) Prevent JSON response showing when re-opening closed tab (fixes silverstripe/silverstripe-cms#1121) (Loz Calver)
|
||||||
|
* 2014-10-21 [478edfa](https://github.com/silverstripe/sapphire/commit/478edfa) Upload: File versioning with existing files reinsert oldFilePath = relativeFilePath in while loop (Devlin)
|
||||||
|
* 2014-10-20 [49cb38d](https://github.com/silverstripe/sapphire/commit/49cb38d) Fix static call to protected instance method (Damian Mooyman)
|
||||||
|
* 2014-10-20 [8310135](https://github.com/silverstripe/silverstripe-cms/commit/8310135) Broken links on dependent pages tab (micmania1)
|
||||||
|
* 2014-10-17 [20af30e](https://github.com/silverstripe/sapphire/commit/20af30e) GridFieldExportButton exporting only Paginated list when using ArrayList as source (Stephen McMahon)
|
||||||
|
* 2014-10-15 [570f261](https://github.com/silverstripe/sapphire/commit/570f261) Tag-less cache backends error on flush (Loz Calver)
|
||||||
|
* 2014-10-14 [793784e](https://github.com/silverstripe/sapphire/commit/793784e) Fix flushing of SSViewer cache via testing (Damian Mooyman)
|
||||||
|
* 2014-10-09 [bad9aa1](https://github.com/silverstripe/sapphire/commit/bad9aa1) i18n support in LookupField (Milan Jelicanin)
|
||||||
|
* 2014-10-07 [48eb0e6](https://github.com/silverstripe/sapphire/commit/48eb0e6) Deliberately clear partial cache blocks on flush (fixes #1383) (Loz Calver)
|
||||||
|
* 2014-10-01 [776f697](https://github.com/silverstripe/sapphire/commit/776f697) Text::BigSummary() fails with undefined $data when $plain = false (Sean Harvey)
|
||||||
|
* 2014-09-03 [fe42abc](https://github.com/silverstripe/sapphire/commit/fe42abc) CSSContentParser fails if CLI tidy doesn't output anything. (Sean Harvey)
|
||||||
|
* 2014-09-03 [56d84d2](https://github.com/silverstripe/sapphire/commit/56d84d2) MySQLDatabase performs queries on wrong DB connection when using connection $name != 'default' (Damian Mooyman)
|
||||||
|
* 2014-08-26 [cf456d6](https://github.com/silverstripe/sapphire/commit/cf456d6) use @param $colName in column call (Gabrijel Gavranović)
|
||||||
|
* 2014-08-26 [7993875](https://github.com/silverstripe/sapphire/commit/7993875) Sorting a DataQuery over a relation. (Will Rossiter)
|
||||||
|
* 2014-08-22 [8063b34](https://github.com/silverstripe/sapphire/commit/8063b34) Fixing Director::test() failing on BASE_URL prefixed URLs (Sean Harvey)
|
||||||
|
* 2014-08-20 [61c6dee](https://github.com/silverstripe/sapphire/commit/61c6dee) Fixing plural_name messing up singular words ending in "e" (#3251) (Sean Harvey)
|
||||||
|
* 2014-08-15 [79c7276](https://github.com/silverstripe/sapphire/commit/79c7276) Reapply fix for cms crashing due to History.js blindly appending slashes to end of url (Damian Mooyman)
|
||||||
|
* 2014-08-14 [5f1552b](https://github.com/silverstripe/sapphire/commit/5f1552b) Custom label set in summary_fields config gets overridden (Sean Harvey)
|
||||||
|
* 2014-08-14 [7c2eee1](https://github.com/silverstripe/sapphire/commit/7c2eee1) Fix 'undefined index 0' (Damian Mooyman)
|
||||||
|
* 2014-08-11 [69de7e3](https://github.com/silverstripe/sapphire/commit/69de7e3) Fix incorrect parsing of HTML content (Damian Mooyman)
|
||||||
|
* 2014-08-08 [fbc7e7c](https://github.com/silverstripe/sapphire/commit/fbc7e7c) Fix issue with generating tree data for missing pages (Damian Mooyman)
|
||||||
|
* 2014-07-28 [02265dc](https://github.com/silverstripe/sapphire/commit/02265dc) Correctly paddedResize images in IMagickBackend. FIX: Compression quality setting now takes effect. (Jeremy Shipman)
|
||||||
|
* 2014-07-28 [47cc157](https://github.com/silverstripe/sapphire/commit/47cc157) Keep ImagickBackend API consistent with Image_Backend interface and fix color formatting. (Jeremy Shipman)
|
||||||
|
* 2014-07-28 [bf3ad56](https://github.com/silverstripe/sapphire/commit/bf3ad56) Image_Backend -> croppedResize function doesn't include a backgroundColor, therefore this shouldn't be assumed in ImageMagick->croppedResize (Jeremy Shipman)
|
||||||
|
* 2014-06-27 [19e0d5e](https://github.com/silverstripe/sapphire/commit/19e0d5e) declarations matching PHPUnit_Framework_Assert (Michael Parkhill)
|
||||||
|
* 2014-03-12 [96d0874](https://github.com/silverstripe/sapphire/commit/96d0874) Fix issue with inheritance of Injector service configuration (Damian Mooyman)
|
||||||
|
* 2014-01-31 [1661213](https://github.com/silverstripe/sapphire/commit/1661213) Opt-out pf form message escaping (fixes #2796) (Ingo Schommer)
|
||||||
|
|
||||||
|
## Changelog
|
||||||
|
|
||||||
|
* [framework](https://github.com/silverstripe/silverstripe-framework/releases/tag/3.1.7-rc1)
|
||||||
|
* [cms](https://github.com/silverstripe/silverstripe-cms/releases/tag/3.1.7-rc1)
|
||||||
|
* [installer](https://github.com/silverstripe/silverstripe-installer/releases/tag/3.1.7-rc1)
|
||||||
@ -12,8 +12,9 @@ Otherwise, you'll need to include the module yourself
|
|||||||
### Framework
|
### Framework
|
||||||
|
|
||||||
* API: Removed URL routing by controller name
|
* API: Removed URL routing by controller name
|
||||||
* Security: The multiple authenticator login page should now be styled manually - i.e. without the default jQuery UI layout. A new template, Security_MultiAuthenticatorLogin.ss is available.
|
* Security: The multiple authenticator login page should now be styled manually - i.e. without the default jQuery
|
||||||
* Security: This controller's templates can be customised by overriding the `getTemplate` function.
|
UI layout. A new template, Security_MultiAuthenticatorLogin.ss is available.
|
||||||
|
* Security: This controller's templates can be customised by overriding the `getTemplatesFor` function.
|
||||||
* API: Form and FormField ID attributes rewritten.
|
* API: Form and FormField ID attributes rewritten.
|
||||||
|
|
||||||
## Details
|
## Details
|
||||||
|
|||||||
@ -16,7 +16,7 @@ Default setting:
|
|||||||
Overriding these defaults
|
Overriding these defaults
|
||||||
|
|
||||||
* `[api:HTTP::$cache_age]` can be used to set the max-age component of the cache-control line, in seconds.
|
* `[api:HTTP::$cache_age]` can be used to set the max-age component of the cache-control line, in seconds.
|
||||||
Set it to 0 to disable caching; the "no-cache" clause in `Cache-Control` and `Pragma` will be included.
|
Set it to 0 to disable caching; the "no-cache" clause in `Cache-Control` and `Pragma` will be included. It works only for live sites, if `SS_ENVIRONMENT_TYPE` is set to "dev" `[api:HTTP::$cache_age]` will be always overridden with 0.
|
||||||
* `[api:HTTP::register_modification_date()]` can be used to set the modification date to something more recent than the default.
|
* `[api:HTTP::register_modification_date()]` can be used to set the modification date to something more recent than the default.
|
||||||
|
|
||||||
How it works:
|
How it works:
|
||||||
|
|||||||
@ -86,7 +86,21 @@ or through a `<php>` flag in your `phpunit.xml` (see [Appenix C: "Setting PHP IN
|
|||||||
<phpunit>
|
<phpunit>
|
||||||
<!-- ... -->
|
<!-- ... -->
|
||||||
<php>
|
<php>
|
||||||
<var name="db" value="sqlite3"/>
|
<get name="db" value="sqlite3"/>
|
||||||
|
</php>
|
||||||
|
</phpunit>
|
||||||
|
|
||||||
|
Note that on every test run, the manifest is flushed to avoid any bugs where a test doesn't clean up after
|
||||||
|
itself properly. You can override that behaviour by passing `flush=0` to the test command:
|
||||||
|
|
||||||
|
phpunit framework/tests flush=0
|
||||||
|
|
||||||
|
Alternatively, you can set the var in your `phpunit.xml` file:
|
||||||
|
|
||||||
|
<phpunit>
|
||||||
|
<!-- ... -->
|
||||||
|
<php>
|
||||||
|
<get name="flush" value="0"/>
|
||||||
</php>
|
</php>
|
||||||
</phpunit>
|
</phpunit>
|
||||||
|
|
||||||
|
|||||||
@ -40,7 +40,7 @@ If you already have composer installed you can update it by running:
|
|||||||
Composer updates regularly, so you should run this command fairly often. These instructions assume you are running the latest version.
|
Composer updates regularly, so you should run this command fairly often. These instructions assume you are running the latest version.
|
||||||
|
|
||||||
## Installing Composer on Windows WAMP
|
## Installing Composer on Windows WAMP
|
||||||
For those that use WAMP as a development environment, [detailed information is available on installing using Composer.](/windows-wamp#install-wamp)
|
For those that use WAMP as a development environment, [detailed information is available on installing using Composer.](/installation/windows-wamp#install-wamp)
|
||||||
|
|
||||||
## Create a new site
|
## Create a new site
|
||||||
|
|
||||||
|
|||||||
@ -28,6 +28,7 @@ To run SilverStripe on Linux/Unix, set up one of the following web servers:
|
|||||||
* [Install using Apache](webserver) - our preferred platform
|
* [Install using Apache](webserver) - our preferred platform
|
||||||
* [Install using Lighttpd](lighttpd) - fast, but a bit tricker to get going
|
* [Install using Lighttpd](lighttpd) - fast, but a bit tricker to get going
|
||||||
* [Install using Nginx](nginx) - Super fast at serving static files. Great for large traffic sites.
|
* [Install using Nginx](nginx) - Super fast at serving static files. Great for large traffic sites.
|
||||||
|
* [Install using nginx and HHVM](nginx-hhvm) - nginx and [HHVM](http://hhvm.com/) as a faster alternative to PHP
|
||||||
|
|
||||||
### Windows
|
### Windows
|
||||||
|
|
||||||
|
|||||||
107
docs/en/installation/nginx-hhvm.md
Normal file
107
docs/en/installation/nginx-hhvm.md
Normal file
@ -0,0 +1,107 @@
|
|||||||
|
# nginx and HHVM
|
||||||
|
|
||||||
|
[HHVM](http://hhvm.com/) is a faster alternative to PHP, in that it runs in a virtual machine
|
||||||
|
and uses just-in-time (JIT) compilation to achieve better performance over standard PHP.
|
||||||
|
|
||||||
|
Installation on Debian or Ubuntu is relatively straightforward, in that HHVM already provide
|
||||||
|
packages available to use.
|
||||||
|
|
||||||
|
Install apt sources on Debian 7 (wheezy):
|
||||||
|
|
||||||
|
wget -O - http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
|
||||||
|
echo deb http://dl.hhvm.com/debian wheezy main | sudo tee /etc/apt/sources.list.d/hhvm.list
|
||||||
|
|
||||||
|
Install apt sources on Ubuntu 14.04 (trusty):
|
||||||
|
|
||||||
|
wget -O - http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
|
||||||
|
echo deb http://dl.hhvm.com/ubuntu trusty main | sudo tee /etc/apt/sources.list.d/hhvm.list
|
||||||
|
|
||||||
|
Now install the required packages:
|
||||||
|
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install hhvm libgmp-dev libmemcached-dev
|
||||||
|
|
||||||
|
Start HHVM automatically on boot:
|
||||||
|
|
||||||
|
sudo update-rc.d hhvm defaults
|
||||||
|
|
||||||
|
Please see [Prebuilt Packages for HHVM on HHVM wiki](https://github.com/facebook/hhvm/wiki/Prebuilt%20Packages%20for%20HHVM) for more
|
||||||
|
installation options.
|
||||||
|
|
||||||
|
Assuming you already have nginx installed, you can then run a script to enable support for
|
||||||
|
nginx and/or apache2 depending on whether they are installed or not:
|
||||||
|
|
||||||
|
sudo /usr/share/hhvm/install_fastcgi.sh
|
||||||
|
|
||||||
|
For nginx, this will place a file at `/etc/nginx/hhvm.conf` which you can use to include in
|
||||||
|
your nginx server definitions to provide support for PHP requests.
|
||||||
|
|
||||||
|
In order to get SilverStripe working, you need to add some custom nginx configuration.
|
||||||
|
|
||||||
|
Create `/etc/nginx/silverstripe.conf` and add this configuration:
|
||||||
|
|
||||||
|
fastcgi_buffer_size 32k;
|
||||||
|
fastcgi_busy_buffers_size 64k;
|
||||||
|
fastcgi_buffers 4 32k;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
try_files $uri /framework/main.php?url=$uri&$query_string;
|
||||||
|
}
|
||||||
|
|
||||||
|
error_page 404 /assets/error-404.html;
|
||||||
|
error_page 500 /assets/error-500.html;
|
||||||
|
|
||||||
|
location ^~ /assets/ {
|
||||||
|
try_files $uri =404;
|
||||||
|
}
|
||||||
|
location ~ /(mysite|framework|cms)/.*\.(php|php3|php4|php5|phtml|inc)$ {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
location ~ /\.. {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
location ~ \.ss$ {
|
||||||
|
satisfy any;
|
||||||
|
allow 127.0.0.1;
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
location ~ web\.config$ {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
location ~ \.ya?ml$ {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
location ^~ /vendor/ {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
location ~* /silverstripe-cache/ {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
location ~* composer\.(json|lock)$ {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
location ~* /(cms|framework)/silverstripe_version$ {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
|
||||||
|
The above script passes all non-static file requests to `/framework/main.php` in the webroot which relies on
|
||||||
|
`hhvm.conf` being included prior so that php requests are handled.
|
||||||
|
|
||||||
|
Now in your nginx `server` configuration you can then include the `hhvm.conf` and `silverstripe.conf` files
|
||||||
|
to complete the configuration required for PHP/HHVM and SilverStripe.
|
||||||
|
|
||||||
|
e.g. `/etc/nginx/sites-enabled/mysite`:
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
root /var/www/mysite;
|
||||||
|
server_name www.mysite.com;
|
||||||
|
|
||||||
|
error_log /var/log/nginx/mysite.error.log;
|
||||||
|
access_log /var/log/nginx/mysite.access.log;
|
||||||
|
|
||||||
|
include /etc/nginx/hhvm.conf;
|
||||||
|
include /etc/nginx/silverstripe.conf;
|
||||||
|
}
|
||||||
|
|
||||||
|
For more information on nginx configuration, please see the [nginx installation](nginx) page.
|
||||||
@ -98,19 +98,17 @@ After you have edited the file, GitHub will offer to create a pull request for y
|
|||||||
|
|
||||||
* Adhere to our [coding conventions](/misc/coding-conventions)
|
* Adhere to our [coding conventions](/misc/coding-conventions)
|
||||||
* If your patch is extensive, discuss it first on the [silverstripe-dev google group](https://groups.google.com/group/silverstripe-dev) (ideally before doing any serious coding)
|
* If your patch is extensive, discuss it first on the [silverstripe-dev google group](https://groups.google.com/group/silverstripe-dev) (ideally before doing any serious coding)
|
||||||
* When working on existing tickets, assign them to you and provide status updates through ticket comments
|
* When working on existing tickets, provide status updates through ticket comments
|
||||||
* Check your patches against the latest "trunk" or "master", as well as the latest release.
|
* Check your patches against the "master" branch, as well as the latest release branch
|
||||||
Please not that the latest stable release will often not be sufficient! (of all modules)
|
* Write [unit tests](/topics/testing)
|
||||||
* Provide complete [unit test coverage](/topics/testing) - depending on the complexity of your work, this is a required
|
* Write [Behat integration tests](https://github.com/silverstripe-labs/silverstripe-behat-extension) for any interface changes
|
||||||
step.
|
|
||||||
* Do not set milestones. If you think your patch should be looked at with priority, mark it as "critical".
|
|
||||||
* Describe specifics on how to test the effects of the patch
|
* Describe specifics on how to test the effects of the patch
|
||||||
* It's better to submit multiple patches with separate bits of functionality than a big patch containing lots of
|
* It's better to submit multiple patches with separate bits of functionality than a big patch containing lots of
|
||||||
changes
|
changes
|
||||||
|
* Only submit a pull request for work you expect to be ready to merge. Work in progress is best discussed in an issue, or on your own repository fork.
|
||||||
* Document your code inline through [PHPDoc](http://en.wikipedia.org/wiki/PHPDoc) syntax. See our
|
* Document your code inline through [PHPDoc](http://en.wikipedia.org/wiki/PHPDoc) syntax. See our
|
||||||
[API documentation](http://api.silverstripe.org/3.1/) for good examples.
|
[API documentation](http://api.silverstripe.org/3.1/) for good examples.
|
||||||
* Also check and update documentation on [doc.silverstripe.org](http://doc.silverstripe.org). Check for any references to functionality deprecated or extended through your patch. Documentation changes should be included in the patch.
|
* Check and update documentation on [doc.silverstripe.org](http://doc.silverstripe.org). Check for any references to functionality deprecated or extended through your patch. Documentation changes should be included in the patch.
|
||||||
* We will attribute the change to you whereever possible (git does this automatically for pull requests)
|
|
||||||
* If you get stuck, please post to the [forum](http://silverstripe.org/forum) or for deeper core problems, to the [core mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
|
* If you get stuck, please post to the [forum](http://silverstripe.org/forum) or for deeper core problems, to the [core mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
|
||||||
* When working with the CMS, please read the ["CMS Architecture Guide"](/reference/cms-architecture) first
|
* When working with the CMS, please read the ["CMS Architecture Guide"](/reference/cms-architecture) first
|
||||||
|
|
||||||
@ -137,7 +135,7 @@ Same goes for version control plumbing like merges, file renames or reverts.
|
|||||||
Further guidelines:
|
Further guidelines:
|
||||||
|
|
||||||
* Each commit should form a logical unit - if you fix two unrelated bugs, commit each one separately
|
* Each commit should form a logical unit - if you fix two unrelated bugs, commit each one separately
|
||||||
* If you are fixing a ticket from our [bugtracker](https://github.com/silverstripe/sapphire/issues), please append `(fixes #<ticketnumber>)`
|
* If you are fixing a issue from our bugtracker ([cms](http://github.com/silverstripe/silverstripe-framework) and [framework](http://github.com/silverstripe/silverstripe-framework)), please append `(fixes #<ticketnumber>)`
|
||||||
* When fixing issues across repos (e.g. a commit to `framework` fixes an issue raised in the `cms` bugtracker),
|
* When fixing issues across repos (e.g. a commit to `framework` fixes an issue raised in the `cms` bugtracker),
|
||||||
use `(fixes silverstripe/silverstripe-cms#<issue-number>)` ([details](https://github.com/blog/1439-closing-issues-across-repositories))
|
use `(fixes silverstripe/silverstripe-cms#<issue-number>)` ([details](https://github.com/blog/1439-closing-issues-across-repositories))
|
||||||
* If your change is related to another commit, reference it with its abbreviated commit hash.
|
* If your change is related to another commit, reference it with its abbreviated commit hash.
|
||||||
|
|||||||
@ -11,6 +11,7 @@ well written bug reports can be half of the solution already!
|
|||||||
* [CMS Bugtracker](https://github.com/silverstripe/silverstripe-cms/issues)
|
* [CMS Bugtracker](https://github.com/silverstripe/silverstripe-cms/issues)
|
||||||
* [Documentation Bugtracker](https://github.com/silverstripe/silverstripe-framework/issues)
|
* [Documentation Bugtracker](https://github.com/silverstripe/silverstripe-framework/issues)
|
||||||
* Search on [http://silverstripe.org/modules](http://silverstripe.org/modules) for module-specific bugtrackers
|
* Search on [http://silverstripe.org/modules](http://silverstripe.org/modules) for module-specific bugtrackers
|
||||||
|
* Request features: [UserVoice](http://silverstripe.uservoice.com).
|
||||||
|
|
||||||
Before submitting a bug:
|
Before submitting a bug:
|
||||||
|
|
||||||
|
|||||||
@ -184,7 +184,7 @@ initialization. The code needs to assign a value if not specified in
|
|||||||
function __construct() {
|
function __construct() {
|
||||||
$self = $this;
|
$self = $this;
|
||||||
|
|
||||||
$this->beforeExtending('populateDefaults', function() uses ($self) {
|
$this->beforeExtending('populateDefaults', function() use ($self) {
|
||||||
if(empty($self->MyField)) {
|
if(empty($self->MyField)) {
|
||||||
$self->MyField = 'Value we want as a default if not specified in $defaults, but set before extensions';
|
$self->MyField = 'Value we want as a default if not specified in $defaults, but set before extensions';
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,7 +9,7 @@ This page documents all the steps from an URL request to the delivered page.
|
|||||||
Silverstripe uses **[mod_rewrite](http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html)** to deal with page requests.
|
Silverstripe uses **[mod_rewrite](http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html)** to deal with page requests.
|
||||||
So instead of having your normal everyday `index.php` file which tells all, you need to look elsewhere.
|
So instead of having your normal everyday `index.php` file which tells all, you need to look elsewhere.
|
||||||
|
|
||||||
The basic .htaccess file after installing SilverStripe look like this:
|
The basic .htaccess file after installing SilverStripe looks like this:
|
||||||
|
|
||||||
<file>
|
<file>
|
||||||
### SILVERSTRIPE START ###
|
### SILVERSTRIPE START ###
|
||||||
@ -23,11 +23,13 @@ The basic .htaccess file after installing SilverStripe look like this:
|
|||||||
<IfModule mod_rewrite.c>
|
<IfModule mod_rewrite.c>
|
||||||
RewriteEngine On
|
RewriteEngine On
|
||||||
|
|
||||||
RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$)
|
RewriteRule ^vendor(/|$) - [F,L,NC]
|
||||||
|
RewriteRule silverstripe-cache(/|$) - [F,L,NC]
|
||||||
|
RewriteRule composer\.(json|lock) - [F,L,NC]
|
||||||
|
|
||||||
RewriteCond %{REQUEST_URI} ^(.*)$
|
RewriteCond %{REQUEST_URI} ^(.*)$
|
||||||
RewriteCond %{REQUEST_FILENAME} !-f
|
RewriteCond %{REQUEST_FILENAME} !-f
|
||||||
RewriteRule .* framework/main.php?url=%1&%{QUERY_STRING} [L]
|
RewriteRule .* framework/main.php?url=%1 [QSA]
|
||||||
</IfModule>
|
</IfModule>
|
||||||
### SILVERSTRIPE END ###
|
### SILVERSTRIPE END ###
|
||||||
</file>
|
</file>
|
||||||
@ -93,3 +95,12 @@ You can access the following controller-method with /team/signup
|
|||||||
## SSViewer template rendering
|
## SSViewer template rendering
|
||||||
|
|
||||||
See [templates](/reference/templates) for information on the SSViewer template system.
|
See [templates](/reference/templates) for information on the SSViewer template system.
|
||||||
|
|
||||||
|
## Flush requests
|
||||||
|
|
||||||
|
If `?flush=1` is requested in the URL, e.g. http://mysite.com?flush=1, this will trigger a call to `flush()` on
|
||||||
|
any classes that implement the `Flushable` interface.
|
||||||
|
|
||||||
|
See [reference documentation on Flushable](/reference/flushable) for more details.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
56
docs/en/reference/flushable.md
Normal file
56
docs/en/reference/flushable.md
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
# Flushable
|
||||||
|
|
||||||
|
## Introduction
|
||||||
|
|
||||||
|
Allows a class to define it's own flush functionality, which is triggered when `flush=1` is requested in the URL.
|
||||||
|
|
||||||
|
`[api:FlushRequestFilter]` is run before a request is made, calling `flush()` statically on all
|
||||||
|
implementors of `[api:Flushable]`.
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
To use this API, you need to make your class implement `[api:Flushable]`, and define a `flush()` static function,
|
||||||
|
this defines the actions that need to be executed on a flush request.
|
||||||
|
|
||||||
|
### Using with SS_Cache
|
||||||
|
|
||||||
|
This example uses `[api:SS_Cache]` in some custom code, and the same cache is cleaned on flush:
|
||||||
|
|
||||||
|
:::php
|
||||||
|
<?php
|
||||||
|
class MyClass extends DataObject implements Flushable {
|
||||||
|
|
||||||
|
public static function flush() {
|
||||||
|
SS_Cache::factory('mycache')->clean(Zend_Cache::CLEANING_MODE_ALL);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function MyCachedContent() {
|
||||||
|
$cache = SS_Cache::factory('mycache')
|
||||||
|
$something = $cache->load('mykey');
|
||||||
|
if(!$something) {
|
||||||
|
$something = 'value to be cached';
|
||||||
|
$cache->save($something);
|
||||||
|
}
|
||||||
|
return $something;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
### Using with filesystem
|
||||||
|
|
||||||
|
Another example, some temporary files are created in a directory in assets, and are deleted on flush. This would be
|
||||||
|
useful in an example like `GD` or `Imagick` generating resampled images, but we want to delete any cached images on
|
||||||
|
flush so they are re-created on demand.
|
||||||
|
|
||||||
|
:::php
|
||||||
|
<?php
|
||||||
|
class MyClass extends DataObject implements Flushable {
|
||||||
|
|
||||||
|
public static function flush() {
|
||||||
|
foreach(glob(ASSETS_PATH . '/_tempfiles/*.jpg') as $file) {
|
||||||
|
unlink($file);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@ -25,6 +25,7 @@ This method should return a map of permission code names with a human readable e
|
|||||||
:::php
|
:::php
|
||||||
class Page_Controller implements PermissionProvider {
|
class Page_Controller implements PermissionProvider {
|
||||||
public function init() {
|
public function init() {
|
||||||
|
parent::init();
|
||||||
if(!Permission::check("VIEW_SITE")) Security::permissionFailure();
|
if(!Permission::check("VIEW_SITE")) Security::permissionFailure();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -135,7 +135,7 @@ For more information on how to paginate your results within the template, see [T
|
|||||||
to show the results of your custom search you need at least this content in your template, notice that
|
to show the results of your custom search you need at least this content in your template, notice that
|
||||||
Results.PaginationSummary(4) defines how many pages the search will show in the search results. something like:
|
Results.PaginationSummary(4) defines how many pages the search will show in the search results. something like:
|
||||||
|
|
||||||
**Next 1 2 *3* 4 5 <20><><EFBFBD> 558**
|
**Next 1 2 *3* 4 5 … 558**
|
||||||
|
|
||||||
|
|
||||||
:::ss
|
:::ss
|
||||||
|
|||||||
@ -15,9 +15,9 @@ You can access `[api:SiteConfig]` options from any SS template by using the func
|
|||||||
|
|
||||||
// or
|
// or
|
||||||
|
|
||||||
<% loop $SiteConfig %>
|
<% with $SiteConfig %>
|
||||||
$Title $AnotherField
|
$Title $AnotherField
|
||||||
<% end_loop %>
|
<% end_with %>
|
||||||
|
|
||||||
|
|
||||||
Or if you want to access variables in the PHP you can do
|
Or if you want to access variables in the PHP you can do
|
||||||
@ -48,7 +48,7 @@ Create a mysite/code/CustomSiteConfig.php file.
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Then activate your extension in your `[config.yml](/topics/configuration)` file.
|
Then activate your extension in your [config.yml](/topics/configuration) file.
|
||||||
|
|
||||||
:::yml
|
:::yml
|
||||||
SiteConfig:
|
SiteConfig:
|
||||||
|
|||||||
@ -705,8 +705,6 @@ width independently.
|
|||||||
* Break down your templates into groups of includes. Site integrators would then have the power to override individual
|
* Break down your templates into groups of includes. Site integrators would then have the power to override individual
|
||||||
includes, rather than entire templates.
|
includes, rather than entire templates.
|
||||||
|
|
||||||
For more information about templates go to the [Advanced Templates](/reference/advanced-templates) page.
|
|
||||||
|
|
||||||
## Related
|
## Related
|
||||||
|
|
||||||
* [Built in page controls](/reference/built-in-page-controls)
|
* [Built in page controls](/reference/built-in-page-controls)
|
||||||
|
|||||||
@ -18,7 +18,7 @@ Append the option and corresponding value to your URL in your browser's address
|
|||||||
| URL Variable | | Values | | Description |
|
| URL Variable | | Values | | Description |
|
||||||
| ------------ | | ------ | | ----------- |
|
| ------------ | | ------ | | ----------- |
|
||||||
| flush=1 | | 1 | | Clears out all caches. Used mainly during development, e.g. when adding new classes or templates. Requires "dev" mode or ADMIN login |
|
| flush=1 | | 1 | | Clears out all caches. Used mainly during development, e.g. when adding new classes or templates. Requires "dev" mode or ADMIN login |
|
||||||
| showtemplate | | 1 | | Show the compiled version of all the templates used, including line numbers. Good when you have a syntax error in a template. Cannot be used on a Live site without **isDev**. **flush** can be used with the following values: |
|
| showtemplate | | 1 | | Show the compiled version of all the templates used, including line numbers. Good when you have a syntax error in a template. Cannot be used on a Live site without **isDev**. |
|
||||||
|
|
||||||
## General Testing
|
## General Testing
|
||||||
|
|
||||||
|
|||||||
55
docs/en/topics/authentication.md
Normal file
55
docs/en/topics/authentication.md
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
# Authentication
|
||||||
|
|
||||||
|
By default, silverstripe provides a `[api:MemberAuthenticator]` class which hooks into its own internal
|
||||||
|
authentication system.
|
||||||
|
|
||||||
|
The main login system uses these controllers to handle the various security requests:
|
||||||
|
|
||||||
|
* `[api:Security]` Which is the controller which handles most front-end security requests, including
|
||||||
|
Logging in, logging out, resetting password, or changing password. This class also provides an interface
|
||||||
|
to allow configured `[api:Authenticator]` classes to each display a custom login form.
|
||||||
|
* `[api:CMSSecurity]` Which is the controller which handles security requests within the CMS, and allows
|
||||||
|
users to re-login without leaving the CMS.
|
||||||
|
|
||||||
|
## Member Authentication
|
||||||
|
|
||||||
|
The default member authentication system is implemented in the following classes:
|
||||||
|
|
||||||
|
* `[api:MemberAuthenticator]` Which is the default member authentication implementation. This uses the email
|
||||||
|
and password stored internally for each member to authenticate them.
|
||||||
|
* `[api:MemberLoginForm]` Is the default form used by `MemberAuthenticator`, and is displayed on the public site
|
||||||
|
at the url `Security/login` by default.
|
||||||
|
* `[api:CMSMemberLoginForm]` Is the secondary form used by `MemberAuthenticator`, and will be displayed to the
|
||||||
|
user within the CMS any time their session expires or they are logged out via an action. This form is
|
||||||
|
presented via a popup dialog, and can be used to re-authenticate that user automatically without them having
|
||||||
|
to lose their workspace. E.g. if editing a form, the user can login and continue to publish their content.
|
||||||
|
|
||||||
|
## Custom Authentication
|
||||||
|
|
||||||
|
Additional authentication methods (oauth, etc) can be implemented by creating custom implementations of each of the
|
||||||
|
following base classes:
|
||||||
|
|
||||||
|
* `[api:Authenticator]` The base class for authentication systems. This class also acts as the factory
|
||||||
|
to generate various login forms for parts of the system. If an authenticator supports in-cms
|
||||||
|
reauthentication then it will be necessary to override the `supports_cms` and `get_cms_login_form` methods.
|
||||||
|
* `[api:LoginForm]` which is the base class for a login form which links to a specific authenticator. At the very
|
||||||
|
least, it will be necessary to implement a form class which provides a default login interface. If in-cms
|
||||||
|
re-authentication is desired, then a specialised subclass of this method may be necessary. For example, this form
|
||||||
|
could be extended to require confirmation of username as well as password.
|
||||||
|
|
||||||
|
## Default Admin
|
||||||
|
|
||||||
|
When a new silverstripe site is created for the first time, it may be necessary to create a default admin to provide
|
||||||
|
CMS access for the first time. SilverStripe provides a default admin configuration system, which allows a username
|
||||||
|
and password to be configured for a single special user outside of the normal membership system.
|
||||||
|
|
||||||
|
It is advisable to configure this user in your `_ss_environment.php` file outside of the web root, as below:
|
||||||
|
|
||||||
|
:::php
|
||||||
|
// Configure a default username and password to access the CMS on all sites in this environment.
|
||||||
|
define('SS_DEFAULT_ADMIN_USERNAME', 'admin');
|
||||||
|
define('SS_DEFAULT_ADMIN_PASSWORD', 'password');
|
||||||
|
|
||||||
|
When a user logs in with these credentials, then a `[api:Member]` with the Email 'admin' will be generated in
|
||||||
|
the database, but without any password information. This means that the password can be reset or changed by simply
|
||||||
|
updating the `_ss_environment.php` file.
|
||||||
@ -98,6 +98,13 @@ this is reasonably quick, but still requires access to slow disk I/O.
|
|||||||
The `Zend_Cache` API supports various caching backends ([list](http://framework.zend.com/manual/1.12/en/zend.cache.backends.html))
|
The `Zend_Cache` API supports various caching backends ([list](http://framework.zend.com/manual/1.12/en/zend.cache.backends.html))
|
||||||
which can provide better performance, including APC, Xcache, ZendServer, Memcached and SQLite.
|
which can provide better performance, including APC, Xcache, ZendServer, Memcached and SQLite.
|
||||||
|
|
||||||
|
## Cleaning caches on flush=1 requests
|
||||||
|
|
||||||
|
If `?flush=1` is requested in the URL, e.g. http://mysite.com?flush=1, this will trigger a call to `flush()` on
|
||||||
|
any classes that implement the `Flushable` interface. Using this, you can trigger your caches to clean.
|
||||||
|
|
||||||
|
See [reference documentation on Flushable](/reference/flushable) for implementation details.
|
||||||
|
|
||||||
### Memcached
|
### Memcached
|
||||||
|
|
||||||
This backends stores cache records into a [memcached](http://www.danga.com/memcached/)
|
This backends stores cache records into a [memcached](http://www.danga.com/memcached/)
|
||||||
|
|||||||
@ -272,8 +272,7 @@ This would be equivalent to a SQL query of
|
|||||||
The where clauses showcased in the previous two sections (filter and exclude)
|
The where clauses showcased in the previous two sections (filter and exclude)
|
||||||
specify exact matches by default. However, there are a number of suffixes that
|
specify exact matches by default. However, there are a number of suffixes that
|
||||||
you can put on field names to change this behavior such as `":StartsWith"`,
|
you can put on field names to change this behavior such as `":StartsWith"`,
|
||||||
`":EndsWith"`, `":PartialMatch"`, `":GreaterThan"`, `":GreaterThanOrEqual"`, `":LessThan"`, `":LessThanOrEqual"`,
|
`":EndsWith"`, `":PartialMatch"`, `":GreaterThan"`, `":GreaterThanOrEqual"`, `":LessThan"`, `":LessThanOrEqual"`.
|
||||||
`":Negation"`.
|
|
||||||
|
|
||||||
Each of these suffixes is represented in the ORM as a subclass of
|
Each of these suffixes is represented in the ORM as a subclass of
|
||||||
`[api:SearchFilter]`. Developers can define their own SearchFilters if needing
|
`[api:SearchFilter]`. Developers can define their own SearchFilters if needing
|
||||||
|
|||||||
@ -105,7 +105,7 @@ This is my `_ss_environment.php` file. I have it placed in `/var`, as each of th
|
|||||||
|
|
||||||
| Name | Description |
|
| Name | Description |
|
||||||
| ---- | ----------- |
|
| ---- | ----------- |
|
||||||
| `TEMP_FOLDER` | Absolute file path to store temporary files such as cached templates or the class manifest. Needs to be writeable by the webserver user. Defaults to *sys_get_temp_dir()*, and falls back to *silverstripe-cache* in the webroot. See *getTempFolder()* in *framework/core/Core.php* |
|
| `TEMP_FOLDER` | Absolute file path to store temporary files such as cached templates or the class manifest. Needs to be writeable by the webserver user. Defaults to *silverstripe-cache* in the webroot, and falls back to *sys_get_temp_dir()*. See *getTempFolder()* in *framework/core/TempPath.php* |
|
||||||
| `SS_DATABASE_CLASS` | The database class to use, MySQLDatabase, MSSQLDatabase, etc. defaults to MySQLDatabase|
|
| `SS_DATABASE_CLASS` | The database class to use, MySQLDatabase, MSSQLDatabase, etc. defaults to MySQLDatabase|
|
||||||
| `SS_DATABASE_SERVER`| The database server to use, defaulting to localhost|
|
| `SS_DATABASE_SERVER`| The database server to use, defaulting to localhost|
|
||||||
| `SS_DATABASE_USERNAME`| The database username (mandatory)|
|
| `SS_DATABASE_USERNAME`| The database username (mandatory)|
|
||||||
@ -117,8 +117,8 @@ This is my `_ss_environment.php` file. I have it placed in `/var`, as each of th
|
|||||||
| `SS_DATABASE_NAME` | Set the database name. Assumes the `$database` global variable in your config is missing or empty. |
|
| `SS_DATABASE_NAME` | Set the database name. Assumes the `$database` global variable in your config is missing or empty. |
|
||||||
| `SS_DATABASE_CHOOSE_NAME`| Boolean/Int. If set, then the system will choose a default database name for you if one isn't give in the $database variable. The database name will be "SS_" followed by the name of the folder into which you have installed SilverStripe. If this is enabled, it means that the phpinstaller will work out of the box without the installer needing to alter any files. This helps prevent accidental changes to the environment. If `SS_DATABASE_CHOOSE_NAME` is an integer greater than one, then an ancestor folder will be used for the database name. This is handy for a site that's hosted from /sites/examplesite/www or /buildbot/allmodules-2.3/build. If it's 2, the parent folder will be chosen; if it's 3 the grandparent, and so on.|
|
| `SS_DATABASE_CHOOSE_NAME`| Boolean/Int. If set, then the system will choose a default database name for you if one isn't give in the $database variable. The database name will be "SS_" followed by the name of the folder into which you have installed SilverStripe. If this is enabled, it means that the phpinstaller will work out of the box without the installer needing to alter any files. This helps prevent accidental changes to the environment. If `SS_DATABASE_CHOOSE_NAME` is an integer greater than one, then an ancestor folder will be used for the database name. This is handy for a site that's hosted from /sites/examplesite/www or /buildbot/allmodules-2.3/build. If it's 2, the parent folder will be chosen; if it's 3 the grandparent, and so on.|
|
||||||
| `SS_ENVIRONMENT_TYPE`| The environment type: dev, test or live.|
|
| `SS_ENVIRONMENT_TYPE`| The environment type: dev, test or live.|
|
||||||
| `SS_DEFAULT_ADMIN_USERNAME`| The username of the default admin - this is a non-database user with administrative privileges.|
|
| `SS_DEFAULT_ADMIN_USERNAME`| The username of the default admin. This is a user with administrative privileges.|
|
||||||
| `SS_DEFAULT_ADMIN_PASSWORD`| The password of the default admin.|
|
| `SS_DEFAULT_ADMIN_PASSWORD`| The password of the default admin. This will not be stored in the database.|
|
||||||
| `SS_USE_BASIC_AUTH`| Protect the site with basic auth (good for test sites)|
|
| `SS_USE_BASIC_AUTH`| Protect the site with basic auth (good for test sites)|
|
||||||
| `SS_SEND_ALL_EMAILS_TO`| If you set this define, all emails will be redirected to this address.|
|
| `SS_SEND_ALL_EMAILS_TO`| If you set this define, all emails will be redirected to this address.|
|
||||||
| `SS_SEND_ALL_EMAILS_FROM`| If you set this define, all emails will be send from this address.|
|
| `SS_SEND_ALL_EMAILS_FROM`| If you set this define, all emails will be send from this address.|
|
||||||
|
|||||||
@ -369,7 +369,7 @@ these methods:
|
|||||||
|
|
||||||
- FormField->setTemplate()
|
- FormField->setTemplate()
|
||||||
- FormField->setFieldHolderTemplate()
|
- FormField->setFieldHolderTemplate()
|
||||||
- FormField->getSmallFieldHolderTemplate()
|
- FormField->setSmallFieldHolderTemplate()
|
||||||
|
|
||||||
<div class="hint" markdown='1'>
|
<div class="hint" markdown='1'>
|
||||||
Caution: Not all FormFields consistently uses templates set by the above methods.
|
Caution: Not all FormFields consistently uses templates set by the above methods.
|
||||||
@ -534,10 +534,8 @@ own validation.
|
|||||||
// Limit extensions on upload (in PHP)
|
// Limit extensions on upload (in PHP)
|
||||||
// Markup contains <input type="file" data-allowed-extensions="jpg,jpeg,gif" />
|
// Markup contains <input type="file" data-allowed-extensions="jpg,jpeg,gif" />
|
||||||
$exts = array('jpg', 'jpeg', 'gif');
|
$exts = array('jpg', 'jpeg', 'gif');
|
||||||
$validator = new Upload_Validator();
|
$fileField = FileField::create('MyFile');
|
||||||
$validator->setAllowedExtensions($exts);
|
$fileField->getValidator()->setAllowedExtensions($exts);
|
||||||
$upload = Upload::create()->setValidator($validator);
|
|
||||||
$fileField = FileField::create('MyFile')->setUpload(new);
|
|
||||||
$fileField->setAttribute('data-allowed-extensions', implode(',', $exts));
|
$fileField->setAttribute('data-allowed-extensions', implode(',', $exts));
|
||||||
|
|
||||||
Note that these examples don't have any effect on the client as such, but are
|
Note that these examples don't have any effect on the client as such, but are
|
||||||
|
|||||||
@ -3,7 +3,8 @@
|
|||||||
This section provides an overview on how things fit together, the "conceptual glue" between APIs and features.
|
This section provides an overview on how things fit together, the "conceptual glue" between APIs and features.
|
||||||
It is where most documentation should live, and is the natural "second step" after finishing the tutorials.
|
It is where most documentation should live, and is the natural "second step" after finishing the tutorials.
|
||||||
|
|
||||||
* [Access Control and Page Security](access-control): Restricting access and setting up permissions on your website
|
* [Access Control and Page Security](access-control): Restricting access and setting up permissions on your website.
|
||||||
|
* [Authentication](authentication): Overview of the default member authentication system.
|
||||||
* [Caching](caching): Explains built-in caches for classes, config and templates. How to use your own caches.
|
* [Caching](caching): Explains built-in caches for classes, config and templates. How to use your own caches.
|
||||||
* [Command line Usage](commandline): Calling controllers via the command line interface using `sake`
|
* [Command line Usage](commandline): Calling controllers via the command line interface using `sake`
|
||||||
* [Configuration](configuration): Influence behaviour through PHP and YAML configuration
|
* [Configuration](configuration): Influence behaviour through PHP and YAML configuration
|
||||||
|
|||||||
@ -162,7 +162,7 @@ team.
|
|||||||
private static $many_many_extraFields = array(
|
private static $many_many_extraFields = array(
|
||||||
"Players" => array(
|
"Players" => array(
|
||||||
"Role" => "Varchar"
|
"Role" => "Varchar"
|
||||||
);
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -13,39 +13,30 @@ If you're more familiar with unit testing, but want a refresher of some of the c
|
|||||||
the [Testing Glossary](glossary). To get started now, follow the installation instructions below, and check
|
the [Testing Glossary](glossary). To get started now, follow the installation instructions below, and check
|
||||||
[Troubleshooting](testing-guide-troubleshooting) in case you run into any problems.
|
[Troubleshooting](testing-guide-troubleshooting) in case you run into any problems.
|
||||||
|
|
||||||
If you are familiar with PHP coding but new to unit testing, you should read the [Introduction](/topics/testing) and
|
If you are familiar with PHP coding but new to unit testing then check out Mark's presentation [Getting to Grips with SilverStripe Testing](http://www.slideshare.net/maetl/getting-to-grips-with-silverstripe-testing).
|
||||||
check out Mark's presentation [Getting to Grips with SilverStripe Testing](http://www.slideshare.net/maetl/getting-to-grips-with-silverstripe-testing).
|
|
||||||
|
|
||||||
[Why Unit Test?](why-should-i-test) will give you reasons why you should be testing your code.
|
[Why Unit Test?](why-should-i-test) will give you reasons why you should be testing your code.
|
||||||
|
|
||||||
You should also read over [the PHPUnit manual](http://www.phpunit.de/manual/current/en/). It provides a lot of
|
You should also read over [the PHPUnit manual](http://www.phpunit.de/manual/current/en/). It provides a lot of
|
||||||
fundamental concepts that we build on in this documentation.
|
fundamental concepts that we build on in this documentation.
|
||||||
|
|
||||||
## Installation
|
Unit tests are not included in the normal SilverStripe downloads so you need to install them through git repositories
|
||||||
|
|
||||||
### Via Composer
|
|
||||||
|
|
||||||
Unit tests are not included in the normal SilverStripe downloads, you are expected to work with local git repositories
|
|
||||||
([installation instructions](/installation/composer)).
|
([installation instructions](/installation/composer)).
|
||||||
|
|
||||||
Once you've got the project up and running, check out the additional requirements to run unit tests:
|
## Install with Composer
|
||||||
|
|
||||||
composer update --dev
|
Once you've got your project up and running, open a terminal and cd to your project root.
|
||||||
|
|
||||||
This will install (among other things) the [PHPUnit](http://www.phpunit.de/) dependency, which is the framework we're
|
composer require --dev "phpunit/phpunit:*@stable"
|
||||||
|
|
||||||
|
This will install [PHPUnit](http://www.phpunit.de/) dependency, which is the framework we're
|
||||||
building our unit tests on. Composer installs it alongside the required PHP classes into the `vendor/bin/` directory.
|
building our unit tests on. Composer installs it alongside the required PHP classes into the `vendor/bin/` directory.
|
||||||
You can either use it through its full path (`vendor/bin/phpunit`), or symlink it into the root directory of your website:
|
|
||||||
|
### Symlinking the PHPUnit Binary
|
||||||
|
You can either use PHPUnit through its full path (`vendor/bin/phpunit`), or symlink it into the root directory of your website:
|
||||||
|
|
||||||
ln -s vendor/bin/phpunit phpunit
|
ln -s vendor/bin/phpunit phpunit
|
||||||
|
|
||||||
### Via PEAR
|
|
||||||
|
|
||||||
Alternatively, you can check out PHPUnit globally via the PEAR package manager
|
|
||||||
([instructions](https://github.com/sebastianbergmann/phpunit/)).
|
|
||||||
|
|
||||||
pear config-set auto_discover 1
|
|
||||||
pear install pear.phpunit.de/PHPUnit
|
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
### phpunit.xml
|
### phpunit.xml
|
||||||
@ -83,8 +74,6 @@ You will generally write two different kinds of test classes.
|
|||||||
* **Unit Test:** Test the behaviour of one of your DataObjects.
|
* **Unit Test:** Test the behaviour of one of your DataObjects.
|
||||||
* **Functional Test:** Test the behaviour of one of your controllers.
|
* **Functional Test:** Test the behaviour of one of your controllers.
|
||||||
|
|
||||||
Some people may note that we have used the same naming convention as Ruby on Rails.
|
|
||||||
|
|
||||||
Tutorials and recipes for creating tests using the SilverStripe framework:
|
Tutorials and recipes for creating tests using the SilverStripe framework:
|
||||||
|
|
||||||
* [Creating a SilverStripe test](creating-a-silverstripe-test): Writing tests to check core data objects
|
* [Creating a SilverStripe test](creating-a-silverstripe-test): Writing tests to check core data objects
|
||||||
@ -140,7 +129,6 @@ particularly around formatting test output.
|
|||||||
### Via Web Browser
|
### Via Web Browser
|
||||||
|
|
||||||
Executing tests from the command line is recommended, since it most closely reflects
|
Executing tests from the command line is recommended, since it most closely reflects
|
||||||
test runs in any automated testing environments. If for some reason you don't have
|
test runs in any automated testing environments. However, you can also run tests through the browser (requires PHPUnit version 3.7.*@stable):
|
||||||
access to the command line, you can also run tests through the browser.
|
|
||||||
|
|
||||||
http://localhost/dev/tests
|
http://localhost/dev/tests
|
||||||
|
|||||||
@ -186,6 +186,10 @@ from the `Controller` class.
|
|||||||
|
|
||||||
## Recipes
|
## Recipes
|
||||||
|
|
||||||
|
It can be useful to add the variable `$SilverStripeNavigator` somewhere into the template, since it allows you to put a mini "admin" bar on the page which isn't visible to non editors. It shows the current stage and provides a convenient CMS link and version changing link.
|
||||||
|
|
||||||
|
Keep in mind that `$SilverStripeNavigator` is only available on ContentController, so useful when the Versioned extension is applied to SiteTree (default), and not when it's applied to DataObject.
|
||||||
|
|
||||||
### Trapping the publication event
|
### Trapping the publication event
|
||||||
|
|
||||||
Sometimes, you'll want to do something whenever a particular kind of page is published. This example sends an email
|
Sometimes, you'll want to do something whenever a particular kind of page is published. This example sends an email
|
||||||
@ -196,6 +200,5 @@ whenever a blog entry has been published.
|
|||||||
// ...
|
// ...
|
||||||
public function onAfterPublish() {
|
public function onAfterPublish() {
|
||||||
mail("sam@silverstripe.com", "Blog published", "The blog has been published");
|
mail("sam@silverstripe.com", "Blog published", "The blog has been published");
|
||||||
parent::onAfterPublish();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -249,7 +249,7 @@ by clicking on the **Add Mentor** button.
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
To associate the mentor with a project, select one the the mentors, and click on the projects tab. Add all the projects a mentor is associated with (see the [list](#What_are_we_working_towards?)), by typing the name in "Find Projects by Page name" and clicking the "Link Existing" button.
|
To associate the mentor with a project, select one of the mentors, and click on the projects tab. Add all the projects a mentor is associated with (see the [list](#What_are_we_working_towards?)), by typing the name in "Find Projects by Page name" and clicking the "Link Existing" button.
|
||||||
You will notice that you are able to select the same `Project` for multiple mentors.
|
You will notice that you are able to select the same `Project` for multiple mentors.
|
||||||
This is the definition of a **many-to-many** relation.
|
This is the definition of a **many-to-many** relation.
|
||||||
|
|
||||||
@ -406,7 +406,7 @@ lightweight `DataObject` classes. The transition between
|
|||||||
the two classes is intentionally fluent in the CMS, you can
|
the two classes is intentionally fluent in the CMS, you can
|
||||||
manage them depending on your needs.
|
manage them depending on your needs.
|
||||||
`DataObject` gives you a no-frills solution to data storage,
|
`DataObject` gives you a no-frills solution to data storage,
|
||||||
but `Page` allows for built-in WYSIWIG editing, versioning,
|
but `Page` allows for built-in WYSIWYG editing, versioning,
|
||||||
publication and hierarchical organization.
|
publication and hierarchical organization.
|
||||||
|
|
||||||
## Exercises
|
## Exercises
|
||||||
|
|||||||
@ -223,17 +223,20 @@ class GDBackend extends Object implements Image_Backend {
|
|||||||
public function resize($width, $height) {
|
public function resize($width, $height) {
|
||||||
if(!$this->gd) return;
|
if(!$this->gd) return;
|
||||||
|
|
||||||
$width = round($width);
|
if($width < 0 || $height < 0) throw new InvalidArgumentException("Image resizing dimensions cannot be negative");
|
||||||
$height = round($height);
|
if(!$width && !$height) throw new InvalidArgumentException("No dimensions given when resizing image");
|
||||||
|
if(!$width) throw new InvalidArgumentException("Width not given when resizing image");
|
||||||
|
if(!$height) throw new InvalidArgumentException("Height not given when resizing image");
|
||||||
|
|
||||||
|
//use whole numbers, ensuring that size is at least 1x1
|
||||||
|
$width = max(1, round($width));
|
||||||
|
$height = max(1, round($height));
|
||||||
|
|
||||||
// Check that a resize is actually necessary.
|
// Check that a resize is actually necessary.
|
||||||
if ($width == $this->width && $height == $this->height) {
|
if ($width == $this->width && $height == $this->height) {
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!$width && !$height) user_error("No dimensions given", E_USER_ERROR);
|
|
||||||
if(!$width) user_error("Width not given", E_USER_ERROR);
|
|
||||||
if(!$height) user_error("Height not given", E_USER_ERROR);
|
|
||||||
|
|
||||||
$newGD = imagecreatetruecolor($width, $height);
|
$newGD = imagecreatetruecolor($width, $height);
|
||||||
|
|
||||||
|
|||||||
@ -23,9 +23,8 @@ class ImagickBackend extends Imagick implements Image_Backend {
|
|||||||
public function __construct($filename = null) {
|
public function __construct($filename = null) {
|
||||||
if(is_string($filename)) {
|
if(is_string($filename)) {
|
||||||
parent::__construct($filename);
|
parent::__construct($filename);
|
||||||
} else {
|
|
||||||
self::setImageCompressionQuality($this->config()->default_quality);
|
|
||||||
}
|
}
|
||||||
|
$this->setQuality(Config::inst()->get('ImagickBackend','default_quality'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -116,8 +115,14 @@ class ImagickBackend extends Imagick implements Image_Backend {
|
|||||||
public function resize($width, $height) {
|
public function resize($width, $height) {
|
||||||
if(!$this->valid()) return;
|
if(!$this->valid()) return;
|
||||||
|
|
||||||
$width = round($width);
|
if($width < 0 || $height < 0) throw new InvalidArgumentException("Image resizing dimensions cannot be negative");
|
||||||
$height = round($height);
|
if(!$width && !$height) throw new InvalidArgumentException("No dimensions given when resizing image");
|
||||||
|
if(!$width) throw new InvalidArgumentException("Width not given when resizing image");
|
||||||
|
if(!$height) throw new InvalidArgumentException("Height not given when resizing image");
|
||||||
|
|
||||||
|
//use whole numbers, ensuring that size is at least 1x1
|
||||||
|
$width = max(1, round($width));
|
||||||
|
$height = max(1, round($height));
|
||||||
|
|
||||||
$geometry = $this->getImageGeometry();
|
$geometry = $this->getImageGeometry();
|
||||||
|
|
||||||
@ -126,10 +131,6 @@ class ImagickBackend extends Imagick implements Image_Backend {
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!$width && !$height) user_error("No dimensions given", E_USER_ERROR);
|
|
||||||
if(!$width) user_error("Width not given", E_USER_ERROR);
|
|
||||||
if(!$height) user_error("Height not given", E_USER_ERROR);
|
|
||||||
|
|
||||||
$new = clone $this;
|
$new = clone $this;
|
||||||
$new->resizeImage($width, $height, self::FILTER_LANCZOS, 1);
|
$new->resizeImage($width, $height, self::FILTER_LANCZOS, 1);
|
||||||
|
|
||||||
@ -194,46 +195,12 @@ class ImagickBackend extends Imagick implements Image_Backend {
|
|||||||
* @param int $height
|
* @param int $height
|
||||||
* @return Image_Backend
|
* @return Image_Backend
|
||||||
*/
|
*/
|
||||||
public function paddedResize($width, $height, $backgroundColor = "#FFFFFF00") {
|
public function paddedResize($width, $height, $backgroundColor = "FFFFFF") {
|
||||||
if(!$this->valid()) return;
|
$new = $this->resizeRatio($width, $height);
|
||||||
|
$new->setImageBackgroundColor("#".$backgroundColor);
|
||||||
$width = round($width);
|
$w = $new->getImageWidth();
|
||||||
$height = round($height);
|
$h = $new->getImageHeight();
|
||||||
$geometry = $this->getImageGeometry();
|
$new->extentImage($width,$height,($w-$width)/2,($h-$height)/2);
|
||||||
|
|
||||||
// Check that a resize is actually necessary.
|
|
||||||
if ($width == $geometry["width"] && $height == $geometry["height"]) {
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
$new = clone $this;
|
|
||||||
$new->setBackgroundColor($backgroundColor);
|
|
||||||
|
|
||||||
$destAR = $width / $height;
|
|
||||||
if ($geometry["width"] > 0 && $geometry["height"] > 0) {
|
|
||||||
// We can't divide by zero theres something wrong.
|
|
||||||
|
|
||||||
$srcAR = $geometry["width"] / $geometry["height"];
|
|
||||||
|
|
||||||
// Destination narrower than the source
|
|
||||||
if($destAR > $srcAR) {
|
|
||||||
$destY = 0;
|
|
||||||
$destHeight = $height;
|
|
||||||
|
|
||||||
$destWidth = round( $height * $srcAR );
|
|
||||||
$destX = round( ($width - $destWidth) / 2 );
|
|
||||||
|
|
||||||
// Destination shorter than the source
|
|
||||||
} else {
|
|
||||||
$destX = 0;
|
|
||||||
$destWidth = $width;
|
|
||||||
|
|
||||||
$destHeight = round( $width / $srcAR );
|
|
||||||
$destY = round( ($height - $destHeight) / 2 );
|
|
||||||
}
|
|
||||||
|
|
||||||
$new->extentImage($width, $height, $destX, $destY);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $new;
|
return $new;
|
||||||
}
|
}
|
||||||
@ -257,12 +224,8 @@ class ImagickBackend extends Imagick implements Image_Backend {
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!$backgroundColor){
|
|
||||||
$backgroundColor = new ImagickPixel('transparent');
|
|
||||||
}
|
|
||||||
|
|
||||||
$new = clone $this;
|
$new = clone $this;
|
||||||
$new->setBackgroundColor($backgroundColor);
|
$new->setBackgroundColor(new ImagickPixel('transparent'));
|
||||||
|
|
||||||
if(($geo['width']/$width) < ($geo['height']/$height)){
|
if(($geo['width']/$width) < ($geo['height']/$height)){
|
||||||
$new->cropImage($geo['width'], floor($height*$geo['width']/$width),
|
$new->cropImage($geo['width'], floor($height*$geo['width']/$width),
|
||||||
|
|||||||
@ -134,9 +134,10 @@ class Upload extends Controller {
|
|||||||
$file = $nameFilter->filter($tmpFile['name']);
|
$file = $nameFilter->filter($tmpFile['name']);
|
||||||
$fileName = basename($file);
|
$fileName = basename($file);
|
||||||
|
|
||||||
$relativeFilePath = $parentFolder
|
$relativeFolderPath = $parentFolder
|
||||||
? $parentFolder->getRelativePath() . "$fileName"
|
? $parentFolder->getRelativePath()
|
||||||
: ASSETS_DIR . "/" . $fileName;
|
: ASSETS_DIR . '/';
|
||||||
|
$relativeFilePath = $relativeFolderPath . $fileName;
|
||||||
|
|
||||||
// Create a new file record (or try to retrieve an existing one)
|
// Create a new file record (or try to retrieve an existing one)
|
||||||
if(!$this->file) {
|
if(!$this->file) {
|
||||||
@ -156,22 +157,32 @@ class Upload extends Controller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if filename already exists, version the filename (e.g. test.gif to test1.gif)
|
// if filename already exists, version the filename (e.g. test.gif to test2.gif, test2.gif to test3.gif)
|
||||||
if(!$this->replaceFile) {
|
if(!$this->replaceFile) {
|
||||||
|
$fileSuffixArray = explode('.', $fileName);
|
||||||
|
$fileTitle = array_shift($fileSuffixArray);
|
||||||
|
$fileSuffix = !empty($fileSuffixArray)
|
||||||
|
? '.' . implode('.', $fileSuffixArray)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
// make sure files retain valid extensions
|
||||||
|
$oldFilePath = $relativeFilePath;
|
||||||
|
$relativeFilePath = $relativeFolderPath . $fileTitle . $fileSuffix;
|
||||||
|
if($oldFilePath !== $relativeFilePath) {
|
||||||
|
user_error("Couldn't fix $relativeFilePath", E_USER_ERROR);
|
||||||
|
}
|
||||||
while(file_exists("$base/$relativeFilePath")) {
|
while(file_exists("$base/$relativeFilePath")) {
|
||||||
$i = isset($i) ? ($i+1) : 2;
|
$i = isset($i) ? ($i+1) : 2;
|
||||||
$oldFilePath = $relativeFilePath;
|
$oldFilePath = $relativeFilePath;
|
||||||
// make sure archives retain valid extensions
|
|
||||||
if(substr($relativeFilePath, strlen($relativeFilePath) - strlen('.tar.gz')) == '.tar.gz' ||
|
$pattern = '/([0-9]+$)/';
|
||||||
substr($relativeFilePath, strlen($relativeFilePath) - strlen('.tar.bz2')) == '.tar.bz2') {
|
if(preg_match($pattern, $fileTitle)) {
|
||||||
$relativeFilePath = preg_replace('/[0-9]*(\.tar\.[^.]+$)/', $i . '\\1', $relativeFilePath);
|
$fileTitle = preg_replace($pattern, $i, $fileTitle);
|
||||||
} else if (strpos($relativeFilePath, '.') !== false) {
|
|
||||||
$relativeFilePath = preg_replace('/[0-9]*(\.[^.]+$)/', $i . '\\1', $relativeFilePath);
|
|
||||||
} else if (strpos($relativeFilePath, '_') !== false) {
|
|
||||||
$relativeFilePath = preg_replace('/_([^_]+$)/', '_'.$i, $relativeFilePath);
|
|
||||||
} else {
|
} else {
|
||||||
$relativeFilePath .= '_'.$i;
|
$fileTitle .= $i;
|
||||||
}
|
}
|
||||||
|
$relativeFilePath = $relativeFolderPath . $fileTitle . $fileSuffix;
|
||||||
|
|
||||||
if($oldFilePath == $relativeFilePath && $i > 2) {
|
if($oldFilePath == $relativeFilePath && $i > 2) {
|
||||||
user_error("Couldn't fix $relativeFilePath with $i tries", E_USER_ERROR);
|
user_error("Couldn't fix $relativeFilePath with $i tries", E_USER_ERROR);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
*
|
*
|
||||||
* public function getCMSFields() {
|
* public function getCMSFields() {
|
||||||
* $fields = parent::getCMSFields();
|
* $fields = parent::getCMSFields();
|
||||||
* $field = new DropdownField('GalleryID', 'Gallery', Gallery::get()->map('ID', 'Title'));
|
* $field = DropdownField::create('GalleryID', 'Gallery', Gallery::get()->map('ID', 'Title'));
|
||||||
* $field->setEmptyString('(Select one)');
|
* $field->setEmptyString('(Select one)');
|
||||||
* $fields->addFieldToTab('Root.Content', $field, 'Content');
|
* $fields->addFieldToTab('Root.Content', $field, 'Content');
|
||||||
* </code>
|
* </code>
|
||||||
|
|||||||
@ -58,6 +58,9 @@ class Form extends RequestHandler {
|
|||||||
|
|
||||||
protected $actions;
|
protected $actions;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Controller
|
||||||
|
*/
|
||||||
protected $controller;
|
protected $controller;
|
||||||
|
|
||||||
protected $name;
|
protected $name;
|
||||||
@ -155,10 +158,6 @@ class Form extends RequestHandler {
|
|||||||
'forTemplate',
|
'forTemplate',
|
||||||
);
|
);
|
||||||
|
|
||||||
private static $casting = array(
|
|
||||||
'Message' => 'Text'
|
|
||||||
);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var FormTemplateHelper
|
* @var FormTemplateHelper
|
||||||
*/
|
*/
|
||||||
@ -293,12 +292,17 @@ class Form extends RequestHandler {
|
|||||||
// Protection against CSRF attacks
|
// Protection against CSRF attacks
|
||||||
$token = $this->getSecurityToken();
|
$token = $this->getSecurityToken();
|
||||||
if( ! $token->checkRequest($request)) {
|
if( ! $token->checkRequest($request)) {
|
||||||
if (empty($vars['SecurityID'])) {
|
$securityID = $token->getName();
|
||||||
|
if (empty($vars[$securityID])) {
|
||||||
$this->httpError(400, _t("Form.CSRF_FAILED_MESSAGE",
|
$this->httpError(400, _t("Form.CSRF_FAILED_MESSAGE",
|
||||||
"There seems to have been a technical problem. Please click the back button,
|
"There seems to have been a technical problem. Please click the back button, ".
|
||||||
refresh your browser, and try again."));
|
"refresh your browser, and try again."
|
||||||
|
));
|
||||||
} else {
|
} else {
|
||||||
Session::set("FormInfo.{$this->FormName()}.data", $this->getData());
|
// Clear invalid token on refresh
|
||||||
|
$data = $this->getData();
|
||||||
|
unset($data[$securityID]);
|
||||||
|
Session::set("FormInfo.{$this->FormName()}.data", $data);
|
||||||
Session::set("FormInfo.{$this->FormName()}.errors", array());
|
Session::set("FormInfo.{$this->FormName()}.errors", array());
|
||||||
$this->sessionMessage(
|
$this->sessionMessage(
|
||||||
_t("Form.CSRF_EXPIRED_MESSAGE", "Your session has expired. Please re-submit the form."),
|
_t("Form.CSRF_EXPIRED_MESSAGE", "Your session has expired. Please re-submit the form."),
|
||||||
@ -523,10 +527,10 @@ class Form extends RequestHandler {
|
|||||||
* Add a plain text error message to a field on this form. It will be saved into the session
|
* Add a plain text error message to a field on this form. It will be saved into the session
|
||||||
* and used the next time this form is displayed.
|
* and used the next time this form is displayed.
|
||||||
*/
|
*/
|
||||||
public function addErrorMessage($fieldName, $message, $messageType) {
|
public function addErrorMessage($fieldName, $message, $messageType, $escapeHtml = true) {
|
||||||
Session::add_to_array("FormInfo.{$this->FormName()}.errors", array(
|
Session::add_to_array("FormInfo.{$this->FormName()}.errors", array(
|
||||||
'fieldName' => $fieldName,
|
'fieldName' => $fieldName,
|
||||||
'message' => $message,
|
'message' => $escapeHtml ? Convert::raw2xml($message) : $message,
|
||||||
'messageType' => $messageType,
|
'messageType' => $messageType,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
@ -1112,9 +1116,12 @@ class Form extends RequestHandler {
|
|||||||
*
|
*
|
||||||
* @param string $message the text of the message
|
* @param string $message the text of the message
|
||||||
* @param string $type Should be set to good, bad, or warning.
|
* @param string $type Should be set to good, bad, or warning.
|
||||||
|
* @param boolean $escapeHtml Automatically sanitize the message. Set to FALSE if the message contains HTML.
|
||||||
|
* In that case, you might want to use {@link Convert::raw2xml()} to escape any
|
||||||
|
* user supplied data in the message.
|
||||||
*/
|
*/
|
||||||
public function setMessage($message, $type) {
|
public function setMessage($message, $type, $escapeHtml = true) {
|
||||||
$this->message = $message;
|
$this->message = ($escapeHtml) ? Convert::raw2xml($message) : $message;
|
||||||
$this->messageType = $type;
|
$this->messageType = $type;
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
@ -1124,14 +1131,23 @@ class Form extends RequestHandler {
|
|||||||
*
|
*
|
||||||
* @param string $message the text of the message
|
* @param string $message the text of the message
|
||||||
* @param string $type Should be set to good, bad, or warning.
|
* @param string $type Should be set to good, bad, or warning.
|
||||||
|
* @param boolean $escapeHtml Automatically sanitize the message. Set to FALSE if the message contains HTML.
|
||||||
|
* In that case, you might want to use {@link Convert::raw2xml()} to escape any
|
||||||
|
* user supplied data in the message.
|
||||||
*/
|
*/
|
||||||
public function sessionMessage($message, $type) {
|
public function sessionMessage($message, $type, $escapeHtml = true) {
|
||||||
Session::set("FormInfo.{$this->FormName()}.formError.message", $message);
|
Session::set(
|
||||||
|
"FormInfo.{$this->FormName()}.formError.message",
|
||||||
|
$escapeHtml ? Convert::raw2xml($message) : $message
|
||||||
|
);
|
||||||
Session::set("FormInfo.{$this->FormName()}.formError.type", $type);
|
Session::set("FormInfo.{$this->FormName()}.formError.type", $type);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function messageForForm($formName, $message, $type ) {
|
public static function messageForForm($formName, $message, $type, $escapeHtml = true) {
|
||||||
Session::set("FormInfo.{$formName}.formError.message", $message);
|
Session::set(
|
||||||
|
"FormInfo.{$formName}.formError.message",
|
||||||
|
$escapeHtml ? Convert::raw2xml($message) : $message
|
||||||
|
);
|
||||||
Session::set("FormInfo.{$formName}.formError.type", $type);
|
Session::set("FormInfo.{$formName}.formError.type", $type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -97,10 +97,6 @@ class FormField extends RequestHandler {
|
|||||||
*/
|
*/
|
||||||
protected $attributes = array();
|
protected $attributes = array();
|
||||||
|
|
||||||
private static $casting = array(
|
|
||||||
'Message' => 'Text'
|
|
||||||
);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Takes a fieldname and converts camelcase to spaced
|
* Takes a fieldname and converts camelcase to spaced
|
||||||
* words. Also resolves combined fieldnames with dot syntax
|
* words. Also resolves combined fieldnames with dot syntax
|
||||||
@ -563,13 +559,9 @@ class FormField extends RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the error message to be displayed on the {@link FormField}.
|
* @param string $message Message to show to the user. Allows HTML content,
|
||||||
*
|
* which means you need to use Convert::raw2xml() for any user supplied data.
|
||||||
* Set by php validation of the form.
|
|
||||||
*
|
|
||||||
* @param string $message
|
|
||||||
* @param string $messageType
|
* @param string $messageType
|
||||||
*
|
|
||||||
* @return FormField
|
* @return FormField
|
||||||
*/
|
*/
|
||||||
public function setError($message, $messageType) {
|
public function setError($message, $messageType) {
|
||||||
|
|||||||
@ -125,7 +125,7 @@ class HtmlEditorConfig {
|
|||||||
* Set the value of one option
|
* Set the value of one option
|
||||||
* @param $k string - The key of the option to set
|
* @param $k string - The key of the option to set
|
||||||
* @param $v mixed - The value of the option to set
|
* @param $v mixed - The value of the option to set
|
||||||
* @return mixed - $v returned for chaining
|
* @return HtmlEditorConfig
|
||||||
*/
|
*/
|
||||||
public function setOption($k,$v) {
|
public function setOption($k,$v) {
|
||||||
$this->settings[$k] = $v;
|
$this->settings[$k] = $v;
|
||||||
@ -135,7 +135,7 @@ class HtmlEditorConfig {
|
|||||||
/**
|
/**
|
||||||
* Set multiple options
|
* Set multiple options
|
||||||
* @param $a array - The options to set, as keys and values of the array
|
* @param $a array - The options to set, as keys and values of the array
|
||||||
* @return null
|
* @return HtmlEditorConfig
|
||||||
*/
|
*/
|
||||||
public function setOptions($a) {
|
public function setOptions($a) {
|
||||||
foreach ($a as $k=>$v) {
|
foreach ($a as $k=>$v) {
|
||||||
@ -153,7 +153,7 @@ class HtmlEditorConfig {
|
|||||||
* @see http://wiki.moxiecode.com/index.php/TinyMCE:API/tinymce.PluginManager/load
|
* @see http://wiki.moxiecode.com/index.php/TinyMCE:API/tinymce.PluginManager/load
|
||||||
*
|
*
|
||||||
* @param String [0..] a string, or several strings, or a single array of strings - The plugins to enable
|
* @param String [0..] a string, or several strings, or a single array of strings - The plugins to enable
|
||||||
* @return null
|
* @return HtmlEditorConfig
|
||||||
*/
|
*/
|
||||||
public function enablePlugins() {
|
public function enablePlugins() {
|
||||||
$plugins = func_get_args();
|
$plugins = func_get_args();
|
||||||
@ -166,12 +166,13 @@ class HtmlEditorConfig {
|
|||||||
}
|
}
|
||||||
if (!array_key_exists($plugin, $this->plugins)) $this->plugins[$plugin] = $path;
|
if (!array_key_exists($plugin, $this->plugins)) $this->plugins[$plugin] = $path;
|
||||||
}
|
}
|
||||||
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enable one or several plugins. Will properly handle being passed a plugin that is already disabled
|
* Enable one or several plugins. Will properly handle being passed a plugin that is already disabled
|
||||||
* @param String [0..] a string, or several strings, or a single array of strings - The plugins to disable
|
* @param String [0..] a string, or several strings, or a single array of strings - The plugins to disable
|
||||||
* @return null
|
* @return HtmlEditorConfig
|
||||||
*/
|
*/
|
||||||
public function disablePlugins() {
|
public function disablePlugins() {
|
||||||
$plugins = func_get_args();
|
$plugins = func_get_args();
|
||||||
@ -198,7 +199,7 @@ class HtmlEditorConfig {
|
|||||||
* @param integer from 1..3 - The line number to redefine
|
* @param integer from 1..3 - The line number to redefine
|
||||||
* @param string a string or several strings, or a single array of strings - The button names to make this line
|
* @param string a string or several strings, or a single array of strings - The button names to make this line
|
||||||
* contain
|
* contain
|
||||||
* @return null
|
* @return HtmlEditorConfig
|
||||||
*/
|
*/
|
||||||
public function setButtonsForLine() {
|
public function setButtonsForLine() {
|
||||||
if (func_num_args() == 2) {
|
if (func_num_args() == 2) {
|
||||||
@ -217,7 +218,7 @@ class HtmlEditorConfig {
|
|||||||
* @param integer from 1..3
|
* @param integer from 1..3
|
||||||
* @param string a string, or several strings, or a single array of strings - The button names to add to the end
|
* @param string a string, or several strings, or a single array of strings - The button names to add to the end
|
||||||
* of this line
|
* of this line
|
||||||
* @return null
|
* @return HtmlEditorConfig
|
||||||
*/
|
*/
|
||||||
public function addButtonsToLine() {
|
public function addButtonsToLine() {
|
||||||
$inserts = func_get_args();
|
$inserts = func_get_args();
|
||||||
|
|||||||
@ -67,7 +67,7 @@ class LookupField extends DropdownField {
|
|||||||
|
|
||||||
$inputValue = implode(', ', array_values($values));
|
$inputValue = implode(', ', array_values($values));
|
||||||
} else {
|
} else {
|
||||||
$attrValue = "<i>(none)</i>";
|
$attrValue = '<i>('._t('FormField.NONE', 'none').')</i>';
|
||||||
$inputValue = '';
|
$inputValue = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -57,4 +57,26 @@ class NumericField extends TextField {
|
|||||||
public function dataValue() {
|
public function dataValue() {
|
||||||
return (is_numeric($this->value)) ? $this->value : 0;
|
return (is_numeric($this->value)) ? $this->value : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a readonly version of this field
|
||||||
|
*/
|
||||||
|
public function performReadonlyTransformation() {
|
||||||
|
$field = new NumericField_Readonly($this->name, $this->title, $this->value);
|
||||||
|
$field->setForm($this->form);
|
||||||
|
return $field;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
class NumericField_Readonly extends ReadonlyField {
|
||||||
|
|
||||||
|
public function performReadonlyTransformation() {
|
||||||
|
return clone $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function Value() {
|
||||||
|
return Convert::raw2xml($this->value ? "$this->value" : "0");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1053,6 +1053,7 @@ class UploadField extends FileField {
|
|||||||
* @return UploadField_ItemHandler
|
* @return UploadField_ItemHandler
|
||||||
*/
|
*/
|
||||||
public function handleSelect(SS_HTTPRequest $request) {
|
public function handleSelect(SS_HTTPRequest $request) {
|
||||||
|
if(!$this->canAttachExisting()) return $this->httpError(403);
|
||||||
return UploadField_SelectHandler::create($this, $this->getFolderName());
|
return UploadField_SelectHandler::create($this, $this->getFolderName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -528,7 +528,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
|
|||||||
$this->record->write();
|
$this->record->write();
|
||||||
$list->add($this->record, $extraData);
|
$list->add($this->record, $extraData);
|
||||||
} catch(ValidationException $e) {
|
} catch(ValidationException $e) {
|
||||||
$form->sessionMessage($e->getResult()->message(), 'bad');
|
$form->sessionMessage($e->getResult()->message(), 'bad', false);
|
||||||
$responseNegotiator = new PjaxResponseNegotiator(array(
|
$responseNegotiator = new PjaxResponseNegotiator(array(
|
||||||
'CurrentForm' => function() use(&$form) {
|
'CurrentForm' => function() use(&$form) {
|
||||||
return $form->forTemplate();
|
return $form->forTemplate();
|
||||||
@ -545,11 +545,9 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
|
|||||||
|
|
||||||
// TODO Save this item into the given relationship
|
// TODO Save this item into the given relationship
|
||||||
|
|
||||||
// TODO Allow HTML in form messages
|
$link = '<a href="' . $this->Link('edit') . '">"'
|
||||||
// $link = '<a href="' . $this->Link('edit') . '">"'
|
. htmlspecialchars($this->record->Title, ENT_QUOTES)
|
||||||
// . htmlspecialchars($this->record->Title, ENT_QUOTES)
|
. '"</a>';
|
||||||
// . '"</a>';
|
|
||||||
$link = '"' . $this->record->Title . '"';
|
|
||||||
$message = _t(
|
$message = _t(
|
||||||
'GridFieldDetailForm.Saved',
|
'GridFieldDetailForm.Saved',
|
||||||
'Saved {name} {link}',
|
'Saved {name} {link}',
|
||||||
@ -559,7 +557,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
$form->sessionMessage($message, 'good');
|
$form->sessionMessage($message, 'good', false);
|
||||||
|
|
||||||
if($new_record) {
|
if($new_record) {
|
||||||
return $controller->redirect($this->Link());
|
return $controller->redirect($this->Link());
|
||||||
@ -586,7 +584,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
|
|||||||
|
|
||||||
$this->record->delete();
|
$this->record->delete();
|
||||||
} catch(ValidationException $e) {
|
} catch(ValidationException $e) {
|
||||||
$form->sessionMessage($e->getResult()->message(), 'bad');
|
$form->sessionMessage($e->getResult()->message(), 'bad', false);
|
||||||
return $this->getToplevelController()->redirectBack();
|
return $this->getToplevelController()->redirectBack();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -599,9 +597,9 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
|
|||||||
$toplevelController = $this->getToplevelController();
|
$toplevelController = $this->getToplevelController();
|
||||||
if($toplevelController && $toplevelController instanceof LeftAndMain) {
|
if($toplevelController && $toplevelController instanceof LeftAndMain) {
|
||||||
$backForm = $toplevelController->getEditForm();
|
$backForm = $toplevelController->getEditForm();
|
||||||
$backForm->sessionMessage($message, 'good');
|
$backForm->sessionMessage($message, 'good', false);
|
||||||
} else {
|
} else {
|
||||||
$form->sessionMessage($message, 'good');
|
$form->sessionMessage($message, 'good', false);
|
||||||
}
|
}
|
||||||
|
|
||||||
//when an item is deleted, redirect to the parent controller
|
//when an item is deleted, redirect to the parent controller
|
||||||
|
|||||||
@ -119,6 +119,9 @@ class GridFieldExportButton implements GridField_HTMLProvider, GridField_ActionP
|
|||||||
$fileData .= "\n";
|
$fileData .= "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Remove GridFieldPaginator as we're going to export the entire list.
|
||||||
|
$gridField->getConfig()->removeComponentsByType('GridFieldPaginator');
|
||||||
|
|
||||||
$items = $gridField->getManipulatedList();
|
$items = $gridField->getManipulatedList();
|
||||||
|
|
||||||
// @todo should GridFieldComponents change behaviour based on whether others are available in the config?
|
// @todo should GridFieldComponents change behaviour based on whether others are available in the config?
|
||||||
|
|||||||
@ -21,15 +21,17 @@ class GridFieldFooter implements GridField_HTMLProvider {
|
|||||||
* @var string - a message to display in the footer
|
* @var string - a message to display in the footer
|
||||||
*/
|
*/
|
||||||
protected $message = null;
|
protected $message = null;
|
||||||
|
protected $showrecordcount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param string $message - a message to display in the footer
|
* @param string $message - a message to display in the footer
|
||||||
*/
|
*/
|
||||||
public function __construct($message = null) {
|
public function __construct($message = null, $showrecordcount = true) {
|
||||||
if($message) {
|
if($message) {
|
||||||
$this->message = $message;
|
$this->message = $message;
|
||||||
}
|
}
|
||||||
|
$this->showrecordcount = $showrecordcount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -37,6 +39,7 @@ class GridFieldFooter implements GridField_HTMLProvider {
|
|||||||
$count = $gridField->getList()->count();
|
$count = $gridField->getList()->count();
|
||||||
|
|
||||||
$forTemplate = new ArrayData(array(
|
$forTemplate = new ArrayData(array(
|
||||||
|
'ShowRecordCount' => $this->showrecordcount,
|
||||||
'Message' => $this->message,
|
'Message' => $this->message,
|
||||||
'FirstShownRecord' => 1,
|
'FirstShownRecord' => 1,
|
||||||
'LastShownRecord' => $count,
|
'LastShownRecord' => $count,
|
||||||
|
|||||||
@ -192,8 +192,9 @@ class GridFieldSortableHeader implements GridField_HTMLProvider, GridField_DataM
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the manipulated (sorted) DataList. Field names will simply add an 'ORDER BY'
|
* Returns the manipulated (sorted) DataList. Field names will simply add an
|
||||||
* clause, relation names will add appropriate joins to the DataQuery first.
|
* 'ORDER BY' clause, relation names will add appropriate joins to the
|
||||||
|
* {@link DataQuery} first.
|
||||||
*
|
*
|
||||||
* @param GridField
|
* @param GridField
|
||||||
* @param SS_List
|
* @param SS_List
|
||||||
@ -223,10 +224,19 @@ class GridFieldSortableHeader implements GridField_HTMLProvider, GridField_DataM
|
|||||||
// Traverse to the relational list
|
// Traverse to the relational list
|
||||||
$tmpItem = $tmpItem->$methodName();
|
$tmpItem = $tmpItem->$methodName();
|
||||||
|
|
||||||
// Add a left join to the query
|
$joinClass = ClassInfo::table_for_object_field(
|
||||||
|
$lastAlias,
|
||||||
|
$methodName . "ID"
|
||||||
|
);
|
||||||
|
|
||||||
|
// if the field isn't in the object tree then it is likely
|
||||||
|
// been aliased. In that event, assume what the user has
|
||||||
|
// provided is the correct value
|
||||||
|
if(!$joinClass) $joinClass = $lastAlias;
|
||||||
|
|
||||||
$dataList = $dataList->leftJoin(
|
$dataList = $dataList->leftJoin(
|
||||||
$tmpItem->class,
|
$tmpItem->class,
|
||||||
'"' . $methodName . '"."ID" = "' . $lastAlias . '"."' . $methodName . 'ID"',
|
'"' . $methodName . '"."ID" = "' . $joinClass . '"."' . $methodName . 'ID"',
|
||||||
$methodName
|
$methodName
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -61,7 +61,7 @@ require_once 'i18nSSLegacyAdapter.php';
|
|||||||
* @package framework
|
* @package framework
|
||||||
* @subpackage misc
|
* @subpackage misc
|
||||||
*/
|
*/
|
||||||
class i18n extends Object implements TemplateGlobalProvider {
|
class i18n extends Object implements TemplateGlobalProvider, Flushable {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This static variable is used to store the current defined locale.
|
* This static variable is used to store the current defined locale.
|
||||||
@ -97,6 +97,32 @@ class i18n extends Object implements TemplateGlobalProvider {
|
|||||||
*/
|
*/
|
||||||
protected static $translators;
|
protected static $translators;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Triggered early in the request when someone requests a flush.
|
||||||
|
*/
|
||||||
|
public static function flush() {
|
||||||
|
$cache = self::get_cache();
|
||||||
|
$backend = $cache->getBackend();
|
||||||
|
|
||||||
|
if(
|
||||||
|
$backend instanceof Zend_Cache_Backend_ExtendedInterface
|
||||||
|
&& ($capabilities = $backend->getCapabilities())
|
||||||
|
&& $capabilities['tags']
|
||||||
|
) {
|
||||||
|
$cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, $cache->getTags());
|
||||||
|
} else {
|
||||||
|
$cache->clean(Zend_Cache::CLEANING_MODE_ALL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return an instance of the cache used for i18n data.
|
||||||
|
* @return Zend_Cache
|
||||||
|
*/
|
||||||
|
public static function get_cache() {
|
||||||
|
return SS_Cache::factory('i18n', 'Output', array('lifetime' => null, 'automatic_serialization' => true));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use javascript i18n through the ss.i18n class (enabled by default).
|
* Use javascript i18n through the ss.i18n class (enabled by default).
|
||||||
* If set to TRUE, includes javascript requirements for the base library
|
* If set to TRUE, includes javascript requirements for the base library
|
||||||
@ -2037,11 +2063,11 @@ class i18n extends Object implements TemplateGlobalProvider {
|
|||||||
// which is instanciated by core with a $clean instance variable.
|
// which is instanciated by core with a $clean instance variable.
|
||||||
|
|
||||||
if(!$adapter->isAvailable($lang)) {
|
if(!$adapter->isAvailable($lang)) {
|
||||||
i18n::include_by_locale($lang, (isset($_GET['flush'])));
|
i18n::include_by_locale($lang);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!$adapter->isAvailable($locale)) {
|
if(!$adapter->isAvailable($locale)) {
|
||||||
i18n::include_by_locale($locale, (isset($_GET['flush'])));
|
i18n::include_by_locale($locale);
|
||||||
}
|
}
|
||||||
|
|
||||||
$translation = $adapter->translate($entity, $locale);
|
$translation = $adapter->translate($entity, $locale);
|
||||||
@ -2105,9 +2131,7 @@ class i18n extends Object implements TemplateGlobalProvider {
|
|||||||
*/
|
*/
|
||||||
public static function get_translators() {
|
public static function get_translators() {
|
||||||
if(!Zend_Translate::getCache()) {
|
if(!Zend_Translate::getCache()) {
|
||||||
Zend_Translate::setCache(
|
Zend_Translate::setCache(self::get_cache());
|
||||||
SS_Cache::factory('i18n', 'Output', array('lifetime' => null, 'automatic_serialization' => true))
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!self::$translators) {
|
if(!self::$translators) {
|
||||||
@ -2120,8 +2144,8 @@ class i18n extends Object implements TemplateGlobalProvider {
|
|||||||
))
|
))
|
||||||
);
|
);
|
||||||
|
|
||||||
i18n::include_by_locale('en', isset($_GET['flush']));
|
i18n::include_by_locale('en');
|
||||||
i18n::include_by_locale('en_US', isset($_GET['flush']));
|
i18n::include_by_locale('en_US');
|
||||||
}
|
}
|
||||||
|
|
||||||
return self::$translators;
|
return self::$translators;
|
||||||
@ -2513,7 +2537,7 @@ class i18n extends Object implements TemplateGlobalProvider {
|
|||||||
*/
|
*/
|
||||||
public static function include_by_locale($locale, $clean = false) {
|
public static function include_by_locale($locale, $clean = false) {
|
||||||
if($clean) {
|
if($clean) {
|
||||||
Zend_Translate::clearCache();
|
self::flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get list of module => path pairs, and then just the names
|
// Get list of module => path pairs, and then just the names
|
||||||
|
|||||||
@ -449,8 +449,6 @@
|
|||||||
self._prepareIframe(iframe, editform, itemInfo);
|
self._prepareIframe(iframe, editform, itemInfo);
|
||||||
iframe.data('src', '');
|
iframe.data('src', '');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (editform.hasClass('opened')) editform.fitHeight();
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
self._prepareIframe(iframe, editform, itemInfo);
|
self._prepareIframe(iframe, editform, itemInfo);
|
||||||
@ -499,27 +497,19 @@
|
|||||||
|
|
||||||
$('div.ss-upload .ss-uploadfield-item-editform').entwine({
|
$('div.ss-upload .ss-uploadfield-item-editform').entwine({
|
||||||
fitHeight: function() {
|
fitHeight: function() {
|
||||||
var iframe = this.find('iframe'), padding = 32, parentPadding = 2;
|
var iframe = this.find('iframe'),
|
||||||
var h = iframe.contents().find('form').height() + padding;
|
contents = iframe.contents().find('body'),
|
||||||
|
bodyH = contents.find('form').outerHeight(true), // We set the height to match the form's outer height
|
||||||
|
iframeH = bodyH + (iframe.outerHeight(true) - iframe.height()), // content's height + padding on iframe elem
|
||||||
|
containerH = iframeH + (this.outerHeight(true) - this.height()); // iframe height + padding on container elem
|
||||||
|
|
||||||
if(this.hasClass('includeParent')){
|
/* Set height of body except in IE8. Setting this in IE8 breaks the dropdown */
|
||||||
padding=0;
|
if( ! $.browser.msie && $.browser.version.slice(0,3) != "8.0"){
|
||||||
parentPadding=12;
|
contents.find('body').css({'height': bodyH});
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set height of body except in IE8. Setting this in IE8 breaks the
|
iframe.height(iframeH);
|
||||||
dropdown */
|
this.animate({height: containerH}, 500);
|
||||||
if(!$.browser.msie && $.browser.version.slice(0,3) != "8.0"){
|
|
||||||
iframe.contents().find('body').css({'height':(h-padding)});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set iframe to match its contents height
|
|
||||||
iframe.height(h);
|
|
||||||
|
|
||||||
// set container to match the same height
|
|
||||||
iframe.parent().animate({height: h+parentPadding}, 500);
|
|
||||||
iframe.contents().find('body form').css({'width':'98%'});
|
|
||||||
|
|
||||||
},
|
},
|
||||||
toggleEditForm: function() {
|
toggleEditForm: function() {
|
||||||
var itemInfo = this.prev('.ss-uploadfield-item-info'), status = itemInfo.find('.ss-uploadfield-item-status');
|
var itemInfo = this.prev('.ss-uploadfield-item-info'), status = itemInfo.find('.ss-uploadfield-item-status');
|
||||||
|
|||||||
20
lang/en.yml
20
lang/en.yml
@ -85,6 +85,18 @@ en:
|
|||||||
YESANSWER: Yes
|
YESANSWER: Yes
|
||||||
CheckboxFieldSetField:
|
CheckboxFieldSetField:
|
||||||
SOURCE_VALIDATION: 'Please select a value within the list provided. {value} is not a valid option'
|
SOURCE_VALIDATION: 'Please select a value within the list provided. {value} is not a valid option'
|
||||||
|
CMSMemberLoginForm:
|
||||||
|
BUTTONFORGOTPASSWORD: 'Forgot password?'
|
||||||
|
BUTTONLOGIN: 'Log back in'
|
||||||
|
BUTTONLOGOUT: 'Log out'
|
||||||
|
PASSWORDEXPIRED: '<p>Your password has expired. <a target="_top" href="{link}">Please choose a new one.</a></p>'
|
||||||
|
CMSSecurity:
|
||||||
|
INVALIDUSER: '<p>Invalid user. <a target="_top" href="{link}">Please re-authenticate here</a> to continue.</p>'
|
||||||
|
LoginMessage: '<p>If you have any unsaved work you can return to where you left off by logging back in below.</p>'
|
||||||
|
SUCCESS: Success
|
||||||
|
SUCCESSCONTENT: '<p>Login success. If you are not automatically redirected <a target="_top" href="{link}">click here</a></p>'
|
||||||
|
TimedOutTitleAnonymous: 'Your session has timed out.'
|
||||||
|
TimedOutTitleMember: 'Hey {name}!<br />Your session has timed out.'
|
||||||
ConfirmedPasswordField:
|
ConfirmedPasswordField:
|
||||||
ATLEAST: 'Passwords must be at least {min} characters long.'
|
ATLEAST: 'Passwords must be at least {min} characters long.'
|
||||||
BETWEEN: 'Passwords must be {min} to {max} characters long.'
|
BETWEEN: 'Passwords must be {min} to {max} characters long.'
|
||||||
@ -179,7 +191,8 @@ en:
|
|||||||
TEXT2: 'password reset link'
|
TEXT2: 'password reset link'
|
||||||
TEXT3: for
|
TEXT3: for
|
||||||
Form:
|
Form:
|
||||||
CSRF_FAILED_MESSAGE: "There seems to have been a technical problem. Please click the back button, \n refresh your browser, and try again."
|
CSRF_EXPIRED_MESSAGE: 'Your session has expired. Please re-submit the form.'
|
||||||
|
CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
|
||||||
FIELDISREQUIRED: '{name} is required'
|
FIELDISREQUIRED: '{name} is required'
|
||||||
SubmitBtnLabel: Go
|
SubmitBtnLabel: Go
|
||||||
VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
|
VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
|
||||||
@ -255,6 +268,8 @@ en:
|
|||||||
HtmlEditorField:
|
HtmlEditorField:
|
||||||
ADDURL: 'Add URL'
|
ADDURL: 'Add URL'
|
||||||
ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
|
ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
|
||||||
|
ANCHORSCANNOTACCESSPAGE: 'You are not permitted to access the content of the target page.'
|
||||||
|
ANCHORSPAGENOTFOUND: 'Target page not found.'
|
||||||
ANCHORVALUE: Anchor
|
ANCHORVALUE: Anchor
|
||||||
BUTTONADDURL: 'Add url'
|
BUTTONADDURL: 'Add url'
|
||||||
BUTTONINSERT: Insert
|
BUTTONINSERT: Insert
|
||||||
@ -360,6 +375,7 @@ en:
|
|||||||
NEWPASSWORD: 'New Password'
|
NEWPASSWORD: 'New Password'
|
||||||
NoPassword: 'There is no password on this member.'
|
NoPassword: 'There is no password on this member.'
|
||||||
PASSWORD: Password
|
PASSWORD: Password
|
||||||
|
PASSWORDEXPIRED: 'Your password has expired. Please choose a new one.'
|
||||||
PLURALNAME: Members
|
PLURALNAME: Members
|
||||||
REMEMBERME: 'Remember me next time?'
|
REMEMBERME: 'Remember me next time?'
|
||||||
SINGULARNAME: Member
|
SINGULARNAME: Member
|
||||||
@ -466,8 +482,8 @@ en:
|
|||||||
SINGULARNAME: Role
|
SINGULARNAME: Role
|
||||||
Title: Title
|
Title: Title
|
||||||
PermissionRoleCode:
|
PermissionRoleCode:
|
||||||
PLURALNAME: 'Permission Role Cods'
|
|
||||||
PermsError: 'Can''t assign code "%s" with privileged permissions (requires ADMIN access)'
|
PermsError: 'Can''t assign code "%s" with privileged permissions (requires ADMIN access)'
|
||||||
|
PLURALNAME: 'Permission Role Codes'
|
||||||
SINGULARNAME: 'Permission Role Code'
|
SINGULARNAME: 'Permission Role Code'
|
||||||
Permissions:
|
Permissions:
|
||||||
PERMISSIONS_CATEGORY: 'Roles and access permissions'
|
PERMISSIONS_CATEGORY: 'Roles and access permissions'
|
||||||
|
|||||||
90
lang/hr.yml
90
lang/hr.yml
@ -1,15 +1,33 @@
|
|||||||
hr:
|
hr:
|
||||||
AssetAdmin:
|
AssetAdmin:
|
||||||
NEWFOLDER: Novi direktorij
|
NEWFOLDER: Novi direktorij
|
||||||
|
SHOWALLOWEDEXTS: 'Prikaži dozvoljene ekstenzije'
|
||||||
AssetTableField:
|
AssetTableField:
|
||||||
CREATED: 'Uploadano'
|
CREATED: 'Uploadano'
|
||||||
DIM: Dimenzije
|
DIM: Dimenzije
|
||||||
FILENAME: Ime datoteke
|
FILENAME: Ime datoteke
|
||||||
|
FOLDER: Mapa
|
||||||
LASTEDIT: 'Zadnja promjena'
|
LASTEDIT: 'Zadnja promjena'
|
||||||
OWNER: Vlasnik
|
OWNER: Vlasnik
|
||||||
SIZE: 'Veličina'
|
SIZE: 'Veličina'
|
||||||
TITLE: Naslov
|
TITLE: Naslov
|
||||||
TYPE: 'Tip'
|
TYPE: 'Tip'
|
||||||
|
URL: URL
|
||||||
|
AssetUploadField:
|
||||||
|
ChooseFiles: 'Odaberite datoteke'
|
||||||
|
DRAGFILESHERE: 'Povucite datoteke ovdje'
|
||||||
|
EDITALL: 'Uredi sve'
|
||||||
|
EDITANDORGANIZE: 'Uredi i organiziraj'
|
||||||
|
EDITINFO: 'Uredi datoteke'
|
||||||
|
FILES: Datoteke
|
||||||
|
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:
|
||||||
|
ALIGNEMENT: Poravnanje
|
||||||
BasicAuth:
|
BasicAuth:
|
||||||
ENTERINFO: 'Unesite korisničko ime i lozinu'
|
ENTERINFO: 'Unesite korisničko ime i lozinu'
|
||||||
ERRORNOTADMIN: 'Korisnik nije administrator'
|
ERRORNOTADMIN: 'Korisnik nije administrator'
|
||||||
@ -21,23 +39,49 @@ hr:
|
|||||||
CHANGEPASSWORDTEXT2: 'Za prijavu koristite slijedeće podatke'
|
CHANGEPASSWORDTEXT2: 'Za prijavu koristite slijedeće podatke'
|
||||||
HELLO: Pozdrav
|
HELLO: Pozdrav
|
||||||
ConfirmedPasswordField:
|
ConfirmedPasswordField:
|
||||||
SHOWONCLICKTITLE: 'Promjeni Lozinku'
|
SHOWONCLICKTITLE: 'Promjenite lozinku'
|
||||||
DataObject:
|
DataObject:
|
||||||
PLURALNAME: 'Podatkovni Objekti'
|
PLURALNAME: 'Podatkovni objekti'
|
||||||
SINGULARNAME: 'Podatkovni Objekt'
|
SINGULARNAME: 'Podatkovni objekt'
|
||||||
|
Date:
|
||||||
|
DAY: dan
|
||||||
|
DAYS: dana
|
||||||
|
HOUR: sat
|
||||||
|
HOURS: sati
|
||||||
|
LessThanMinuteAgo: 'manje od minute'
|
||||||
|
MIN: min
|
||||||
|
MINS: minuta
|
||||||
|
MONTH: mjesec
|
||||||
|
MONTHS: mjeseci
|
||||||
|
SEC: sek
|
||||||
|
SECS: sekundi
|
||||||
|
TIMEDIFFAGO: 'prije {difference}'
|
||||||
|
TIMEDIFFIN: 'za {difference}'
|
||||||
|
YEAR: godina
|
||||||
|
YEARS: godina
|
||||||
|
DateField:
|
||||||
|
NOTSET: 'nije postavljeno'
|
||||||
|
TODAY: danas
|
||||||
|
VALIDDATEFORMAT2: 'Molimo unesite datum u ispravnom formatu ({format})'
|
||||||
|
DatetimeField:
|
||||||
|
NOTSET: 'Nije postavljeno'
|
||||||
|
Director:
|
||||||
|
INVALID_REQUEST: 'Neispravan zahtjev'
|
||||||
DropdownField:
|
DropdownField:
|
||||||
CHOOSE: (Odaberi)
|
CHOOSE: (Odaberite)
|
||||||
|
EmailField:
|
||||||
|
VALIDATION: 'Molimo unesite email adresu'
|
||||||
File:
|
File:
|
||||||
PLURALNAME: Datoteke
|
PLURALNAME: Datoteke
|
||||||
SINGULARNAME: Datoteka
|
SINGULARNAME: Datoteka
|
||||||
ForgotPasswordEmail_ss:
|
ForgotPasswordEmail_ss:
|
||||||
HELLO: Pozdrav
|
HELLO: Pozdrav
|
||||||
TEXT1: 'Ovdje je vaš'
|
TEXT1: 'Ovdje je Vaš'
|
||||||
TEXT2: 'link za resetiranje zaporke'
|
TEXT2: 'link za resetiranje lozinke'
|
||||||
TEXT3: za
|
TEXT3: za
|
||||||
Form:
|
Form:
|
||||||
VALIDATIONNOTUNIQUE: 'Unesena vrijednost nije unikatna'
|
VALIDATIONNOTUNIQUE: 'Unešena vrijednost nije unikatna'
|
||||||
VALIDATIONPASSWORDSDONTMATCH: 'Lozine se ne slažu'
|
VALIDATIONPASSWORDSDONTMATCH: 'Lozinke se ne slažu'
|
||||||
VALIDATIONPASSWORDSNOTEMPTY: 'Lozinke moraju imati najmanje jedan broj i jedan alfanumerički znak'
|
VALIDATIONPASSWORDSNOTEMPTY: 'Lozinke moraju imati najmanje jedan broj i jedan alfanumerički znak'
|
||||||
Group:
|
Group:
|
||||||
Code: 'Krupni kod'
|
Code: 'Krupni kod'
|
||||||
@ -58,11 +102,11 @@ hr:
|
|||||||
IMAGEDIMENSIONS: Dimenzije
|
IMAGEDIMENSIONS: Dimenzije
|
||||||
IMAGEHEIGHTPX: Visina
|
IMAGEHEIGHTPX: Visina
|
||||||
IMAGEWIDTHPX: Širina
|
IMAGEWIDTHPX: Širina
|
||||||
LINK: 'Ubaci/editiraj link za označeni tekst'
|
LINK: 'Ubaci/uredi link za označeni tekst'
|
||||||
LINKDESCR: 'Opis veze'
|
LINKDESCR: 'Opis veze'
|
||||||
LINKEMAIL: 'Email adresa'
|
LINKEMAIL: 'Email adresa'
|
||||||
LINKEXTERNAL: 'Na drugom webu'
|
LINKEXTERNAL: 'Na drugom webu'
|
||||||
LINKFILE: 'Downlad datoteke'
|
LINKFILE: 'Preuzmite datoteku'
|
||||||
LINKINTERNAL: 'Stranicu na ovom webu'
|
LINKINTERNAL: 'Stranicu na ovom webu'
|
||||||
LINKOPENNEWWIN: 'Otvori vezu (link) u novom prozoru?'
|
LINKOPENNEWWIN: 'Otvori vezu (link) u novom prozoru?'
|
||||||
LINKTO: 'Poveži na'
|
LINKTO: 'Poveži na'
|
||||||
@ -72,18 +116,18 @@ hr:
|
|||||||
LeftAndMain:
|
LeftAndMain:
|
||||||
HELP: Pomoć
|
HELP: Pomoć
|
||||||
PAGETYPE: 'Tip Stranice:'
|
PAGETYPE: 'Tip Stranice:'
|
||||||
PERMAGAIN: 'Odjavili ste se sa CMS-a. Želite li se ponovno prijaviti, upišite korisničko ime i lozinku'
|
PERMAGAIN: 'Odjavili ste se sa sustava. Želite li se ponovno prijaviti upišite korisničko ime i lozinku.'
|
||||||
PERMALREADY: 'Nažalost, ne možete pristupiti tom dijelu CMS-a. Želite li se prijaviti kao netko drugi, učinite to ispod'
|
PERMALREADY: 'Nažalost, ne možete pristupiti tom dijelu sustava. Želite li se prijaviti kao netko drugi učinite to ispod'
|
||||||
PERMDEFAULT: 'Odaberite metodu autorizacije te upišite svoje podatke za pristup CMS-u.'
|
PERMDEFAULT: 'Odaberite metodu autorizacije te upišite svoje podatke za pristup sustavu.'
|
||||||
PLEASESAVE: 'Molim spremite stranicu: Nemože biti ažurirano dok nije spremljeno.'
|
PLEASESAVE: 'Molim spremite stranicu: Stranica ne može biti ažurirana jer još uvijek nije spremljena.'
|
||||||
Member:
|
Member:
|
||||||
BUTTONCHANGEPASSWORD: 'Promjeni lozinku'
|
BUTTONCHANGEPASSWORD: 'Promjeni lozinku'
|
||||||
BUTTONLOGIN: 'Prijavi'
|
BUTTONLOGIN: 'Prijava'
|
||||||
BUTTONLOGINOTHER: 'Prijavite se kao netko drugi'
|
BUTTONLOGINOTHER: 'Prijavite se kao netko drugi'
|
||||||
BUTTONLOSTPASSWORD: 'Zaboraljena lozinka'
|
BUTTONLOSTPASSWORD: 'Zaboravljena lozinka?'
|
||||||
CONFIRMNEWPASSWORD: 'Potvrdite novu lozinku'
|
CONFIRMNEWPASSWORD: 'Potvrdite novu lozinku'
|
||||||
CONFIRMPASSWORD: 'Potvrdi lozinku'
|
CONFIRMPASSWORD: 'Potvrdi lozinku'
|
||||||
ERRORNEWPASSWORD: 'Pogrečno ste upisali novu lozinku, pokušajte ponovno'
|
ERRORNEWPASSWORD: 'Pogrešno ste upisali novu lozinku, pokušajte ponovno.'
|
||||||
ERRORPASSWORDNOTMATCH: 'Vaša trenutna lozinka se ne podudara, probajte ponovno'
|
ERRORPASSWORDNOTMATCH: 'Vaša trenutna lozinka se ne podudara, probajte ponovno'
|
||||||
FIRSTNAME: 'Ime'
|
FIRSTNAME: 'Ime'
|
||||||
INTERFACELANG: 'Jezik sučelja'
|
INTERFACELANG: 'Jezik sučelja'
|
||||||
@ -92,10 +136,10 @@ hr:
|
|||||||
PLURALNAME: Članovi
|
PLURALNAME: Članovi
|
||||||
REMEMBERME: 'Zapamti me'
|
REMEMBERME: 'Zapamti me'
|
||||||
SINGULARNAME: Član
|
SINGULARNAME: Član
|
||||||
SUBJECTPASSWORDCHANGED: 'Vaša lozinka je promjenjena'
|
SUBJECTPASSWORDCHANGED: 'Vaša lozinka je izmjenjena'
|
||||||
SUBJECTPASSWORDRESET: 'Link za reset lozinke'
|
SUBJECTPASSWORDRESET: 'Link za reset lozinke'
|
||||||
SURNAME: Prezime
|
SURNAME: Prezime
|
||||||
VALIDATIONMEMBEREXISTS: 'Već postoji korisnik sa tim Emailom'
|
VALIDATIONMEMBEREXISTS: 'Već postoji korisnik sa istim %s'
|
||||||
YOUROLDPASSWORD: 'Stara lozinka'
|
YOUROLDPASSWORD: 'Stara lozinka'
|
||||||
belongs_many_many_Groups: Grupe
|
belongs_many_many_Groups: Grupe
|
||||||
db_LockedOutUntil: 'Zaključano do'
|
db_LockedOutUntil: 'Zaključano do'
|
||||||
@ -105,7 +149,7 @@ hr:
|
|||||||
PhoneNumberField:
|
PhoneNumberField:
|
||||||
VALIDATION: 'Molim unesite ispravan telefonski broj'
|
VALIDATION: 'Molim unesite ispravan telefonski broj'
|
||||||
Security:
|
Security:
|
||||||
ALREADYLOGGEDIN: 'Nemate pristup na ovu stranicu. Imate li drugi korisnički račun, koristite njega'
|
ALREADYLOGGEDIN: 'Nije Vam dozvoljen pristup ovoj stranici. Imate li drugi korisnički račun koji ima prava pristupa ovoj stranici možete se koristiti njime.'
|
||||||
BUTTONSEND: 'Pošalji mi link za reset lozinke'
|
BUTTONSEND: 'Pošalji mi link za reset lozinke'
|
||||||
CHANGEPASSWORDBELOW: 'Svoju lozinku možete promjeniti ovdje'
|
CHANGEPASSWORDBELOW: 'Svoju lozinku možete promjeniti ovdje'
|
||||||
CHANGEPASSWORDHEADER: 'Promjeni lozinku'
|
CHANGEPASSWORDHEADER: 'Promjeni lozinku'
|
||||||
@ -113,12 +157,12 @@ hr:
|
|||||||
ERRORPASSWORDPERMISSION: 'Morate biti prijavljeni kako bi ste promjenili lozinku'
|
ERRORPASSWORDPERMISSION: 'Morate biti prijavljeni kako bi ste promjenili lozinku'
|
||||||
LOGGEDOUT: 'Odlogirani ste. Želite li se ponovno logirati, upišite podatke'
|
LOGGEDOUT: 'Odlogirani ste. Želite li se ponovno logirati, upišite podatke'
|
||||||
LOGIN: 'Logiraj se'
|
LOGIN: 'Logiraj se'
|
||||||
NOTEPAGESECURED: 'Stranica je osigurana. Upišite svoje podatke i poslat ćemo Vam.'
|
NOTEPAGESECURED: 'Ova stranica je zaštićena. Prijavite se na sustav sa svojim pristupnim podatcima i odmah ćemo vas preusmjeriti.'
|
||||||
NOTERESETPASSWORD: 'Upišite vaš e-mail i polati ćemo Vam link na kojem možete dobiti novu lozinku'
|
NOTERESETPASSWORD: 'Unesite svoju e-mail adresu, a mi ćemo Vam poslati link putem kojega možete resetirati Vašu lozinku.'
|
||||||
SecurityAdmin:
|
SecurityAdmin:
|
||||||
NEWGROUP: 'Nova Grupa'
|
NEWGROUP: 'Nova Grupa'
|
||||||
SiteTree:
|
SiteTree:
|
||||||
TABMAIN: '''Main'''
|
TABMAIN: Osnovno
|
||||||
ToggleField:
|
ToggleField:
|
||||||
LESS: manje
|
LESS: manje
|
||||||
MORE: više
|
MORE: više
|
||||||
|
|||||||
41
lang/sv.yml
41
lang/sv.yml
@ -11,6 +11,7 @@ sv:
|
|||||||
SIZE: 'Filstorlek'
|
SIZE: 'Filstorlek'
|
||||||
TITLE: Titel
|
TITLE: Titel
|
||||||
TYPE: 'Filtyp'
|
TYPE: 'Filtyp'
|
||||||
|
URL: URL
|
||||||
AssetUploadField:
|
AssetUploadField:
|
||||||
ChooseFiles: 'Välj filer'
|
ChooseFiles: 'Välj filer'
|
||||||
DRAGFILESHERE: 'Dra filer hit'
|
DRAGFILESHERE: 'Dra filer hit'
|
||||||
@ -71,6 +72,7 @@ sv:
|
|||||||
ChangePasswordEmail_ss:
|
ChangePasswordEmail_ss:
|
||||||
CHANGEPASSWORDTEXT1: 'Du har ändrat ditt lösenord för'
|
CHANGEPASSWORDTEXT1: 'Du har ändrat ditt lösenord för'
|
||||||
CHANGEPASSWORDTEXT2: 'Du kan nu använda följande uppgifter för att logga in:'
|
CHANGEPASSWORDTEXT2: 'Du kan nu använda följande uppgifter för att logga in:'
|
||||||
|
EMAIL: E-post
|
||||||
HELLO: Hej
|
HELLO: Hej
|
||||||
PASSWORD: Lösenord
|
PASSWORD: Lösenord
|
||||||
ConfirmedPasswordField:
|
ConfirmedPasswordField:
|
||||||
@ -78,6 +80,8 @@ sv:
|
|||||||
BETWEEN: 'Lösenord måste vara {min} till {max} tecken långa.'
|
BETWEEN: 'Lösenord måste vara {min} till {max} tecken långa.'
|
||||||
MAXIMUM: 'Lösenord får som längst vara {max} tecken långa.'
|
MAXIMUM: 'Lösenord får som längst vara {max} tecken långa.'
|
||||||
SHOWONCLICKTITLE: 'Ändra lösenord'
|
SHOWONCLICKTITLE: 'Ändra lösenord'
|
||||||
|
ContentController:
|
||||||
|
NOTLOGGEDIN: 'Inte inloggad'
|
||||||
CreditCardField:
|
CreditCardField:
|
||||||
FIRST: första
|
FIRST: första
|
||||||
FOURTH: fjärde
|
FOURTH: fjärde
|
||||||
@ -87,8 +91,18 @@ sv:
|
|||||||
PLURALNAME: 'Dataobjekt'
|
PLURALNAME: 'Dataobjekt'
|
||||||
SINGULARNAME: 'Dataobjekt'
|
SINGULARNAME: 'Dataobjekt'
|
||||||
Date:
|
Date:
|
||||||
|
DAY: dag
|
||||||
|
DAYS: dagar
|
||||||
|
HOUR: timme
|
||||||
|
HOURS: timmar
|
||||||
|
LessThanMinuteAgo: 'mindre än en minut'
|
||||||
|
MONTH: månad
|
||||||
|
MONTHS: månader
|
||||||
|
SEC: sek
|
||||||
TIMEDIFFAGO: '{difference} sen'
|
TIMEDIFFAGO: '{difference} sen'
|
||||||
TIMEDIFFIN: 'om {difference}'
|
TIMEDIFFIN: 'om {difference}'
|
||||||
|
YEAR: år
|
||||||
|
YEARS: år
|
||||||
DateField:
|
DateField:
|
||||||
NOTSET: 'inte angivet'
|
NOTSET: 'inte angivet'
|
||||||
TODAY: i dag
|
TODAY: i dag
|
||||||
@ -101,6 +115,7 @@ sv:
|
|||||||
INVALID_REQUEST: 'Ogiltig förfrågan'
|
INVALID_REQUEST: 'Ogiltig förfrågan'
|
||||||
DropdownField:
|
DropdownField:
|
||||||
CHOOSE: (Välj)
|
CHOOSE: (Välj)
|
||||||
|
CHOOSESEARCH: '(Välj eller sök)'
|
||||||
EmailField:
|
EmailField:
|
||||||
VALIDATION: 'Var snäll och ange en epostadress'
|
VALIDATION: 'Var snäll och ange en epostadress'
|
||||||
Enum:
|
Enum:
|
||||||
@ -183,11 +198,21 @@ sv:
|
|||||||
DeletePermissionsFailure: 'Rättighet för att radera saknas'
|
DeletePermissionsFailure: 'Rättighet för att radera saknas'
|
||||||
Deleted: 'Raderade %s %s'
|
Deleted: 'Raderade %s %s'
|
||||||
Save: Spara
|
Save: Spara
|
||||||
|
GridFieldEditButton_ss:
|
||||||
|
EDIT: Redigera
|
||||||
|
GridFieldItemEditView:
|
||||||
|
Go_back: 'Gå tillbaka'
|
||||||
Group:
|
Group:
|
||||||
AddRole: 'Lägg till roll för den här gruppen'
|
AddRole: 'Lägg till roll för den här gruppen'
|
||||||
|
Code: 'Gruppkod'
|
||||||
|
DefaultGroupTitleAdministrators: Administratörer
|
||||||
DefaultGroupTitleContentAuthors: 'Författare'
|
DefaultGroupTitleContentAuthors: 'Författare'
|
||||||
|
Description: Beskrivning
|
||||||
GroupReminder: 'Om du väljer en förälder till gruppen så kommer gruppen ärva alla förälderns roller'
|
GroupReminder: 'Om du väljer en förälder till gruppen så kommer gruppen ärva alla förälderns roller'
|
||||||
|
Locked: 'Låst?'
|
||||||
|
NoRoles: 'Inga roller fun'
|
||||||
PLURALNAME: Grupper
|
PLURALNAME: Grupper
|
||||||
|
RolesAddEditLink: 'Hantera roller'
|
||||||
SINGULARNAME: Grupp
|
SINGULARNAME: Grupp
|
||||||
Sort: 'Sorteringsordning'
|
Sort: 'Sorteringsordning'
|
||||||
has_many_Permissions: Behörigheter
|
has_many_Permissions: Behörigheter
|
||||||
@ -204,6 +229,7 @@ sv:
|
|||||||
ADDURL: 'Lägg till URL'
|
ADDURL: 'Lägg till URL'
|
||||||
ADJUSTDETAILSDIMENSIONS: 'Detaljer & dimensioner'
|
ADJUSTDETAILSDIMENSIONS: 'Detaljer & dimensioner'
|
||||||
ANCHORVALUE: Ankare
|
ANCHORVALUE: Ankare
|
||||||
|
BUTTONADDURL: 'Lägg till URL'
|
||||||
BUTTONINSERT: Infoga
|
BUTTONINSERT: Infoga
|
||||||
BUTTONINSERTLINK: 'Infoga länk'
|
BUTTONINSERTLINK: 'Infoga länk'
|
||||||
BUTTONREMOVELINK: 'Ta bort länk'
|
BUTTONREMOVELINK: 'Ta bort länk'
|
||||||
@ -241,6 +267,7 @@ sv:
|
|||||||
LINKOPENNEWWIN: 'Öppna länk i nytt fönster?'
|
LINKOPENNEWWIN: 'Öppna länk i nytt fönster?'
|
||||||
LINKTO: 'Länka till'
|
LINKTO: 'Länka till'
|
||||||
PAGE: Sida
|
PAGE: Sida
|
||||||
|
URL: URL
|
||||||
URLNOTANOEMBEDRESOURCE: 'URLen ''{url}'' gick inte att omvandla till ett media.'
|
URLNOTANOEMBEDRESOURCE: 'URLen ''{url}'' gick inte att omvandla till ett media.'
|
||||||
UpdateMEDIA: 'Uppdatera media'
|
UpdateMEDIA: 'Uppdatera media'
|
||||||
Image:
|
Image:
|
||||||
@ -264,6 +291,9 @@ sv:
|
|||||||
PreviewButton: Förhandsgranska
|
PreviewButton: Förhandsgranska
|
||||||
REORGANISATIONSUCCESSFUL: 'Omorganisationen av sidträdet luyckades.'
|
REORGANISATIONSUCCESSFUL: 'Omorganisationen av sidträdet luyckades.'
|
||||||
SAVEDUP: Sparad.
|
SAVEDUP: Sparad.
|
||||||
|
ShowAsList: 'visa som lista'
|
||||||
|
TooManyPages: 'För många sidor'
|
||||||
|
ValidationError: 'Valideringsfel'
|
||||||
VersionUnknown: okänd
|
VersionUnknown: okänd
|
||||||
LeftAndMain_Menu_ss:
|
LeftAndMain_Menu_ss:
|
||||||
Hello: Hej
|
Hello: Hej
|
||||||
@ -273,6 +303,7 @@ sv:
|
|||||||
IP: 'IP-adress'
|
IP: 'IP-adress'
|
||||||
PLURALNAME: 'Inloggningsförsök'
|
PLURALNAME: 'Inloggningsförsök'
|
||||||
SINGULARNAME: 'Inloggningsförsök'
|
SINGULARNAME: 'Inloggningsförsök'
|
||||||
|
Status: Status
|
||||||
Member:
|
Member:
|
||||||
ADDGROUP: 'Lägg till grupp'
|
ADDGROUP: 'Lägg till grupp'
|
||||||
BUTTONCHANGEPASSWORD: 'Ändra lösenord'
|
BUTTONCHANGEPASSWORD: 'Ändra lösenord'
|
||||||
@ -295,6 +326,7 @@ sv:
|
|||||||
INVALIDNEWPASSWORD: 'Vi kunde inte godkänna det lösenordet: {password}'
|
INVALIDNEWPASSWORD: 'Vi kunde inte godkänna det lösenordet: {password}'
|
||||||
LOGGEDINAS: 'Du är inloggad som {name}.'
|
LOGGEDINAS: 'Du är inloggad som {name}.'
|
||||||
NEWPASSWORD: 'Nytt lösenord'
|
NEWPASSWORD: 'Nytt lösenord'
|
||||||
|
NoPassword: 'Det finns inget lösenord för den här medlemmen'
|
||||||
PASSWORD: Lösenord
|
PASSWORD: Lösenord
|
||||||
PLURALNAME: Medlemmar
|
PLURALNAME: Medlemmar
|
||||||
REMEMBERME: 'Kom ihåg mig nästa gång?'
|
REMEMBERME: 'Kom ihåg mig nästa gång?'
|
||||||
@ -335,6 +367,7 @@ sv:
|
|||||||
TWODIGITMONTH: 'Tvåsiffrig månad (01 = januari osv)'
|
TWODIGITMONTH: 'Tvåsiffrig månad (01 = januari osv)'
|
||||||
TWODIGITSECOND: 'Två siffror för sekund (00 till 59)'
|
TWODIGITSECOND: 'Två siffror för sekund (00 till 59)'
|
||||||
TWODIGITYEAR: 'Två siffror för år'
|
TWODIGITYEAR: 'Två siffror för år'
|
||||||
|
Toggle: 'Visa fomateringshjälp'
|
||||||
MemberImportForm:
|
MemberImportForm:
|
||||||
Help1: '<p>Importera användare i <em>CSV-format</em> (kommaseparerade värden). <small><a href="#" class="toggle-advanced">Visa avancerat</a></small></p>'
|
Help1: '<p>Importera användare i <em>CSV-format</em> (kommaseparerade värden). <small><a href="#" class="toggle-advanced">Visa avancerat</a></small></p>'
|
||||||
Help2: "<div class=\"advanced\">\n<h4>Avancerat </h4>\n<ul>\n<li>Tillåtna kolumner: <em>%s</em></li>\n<li>Existerade användare matchas av deras unika <em>kod</em>-attribut och uppdateras med alla nya värden från den importerade filen</li>\n<li>Grupper kan anges i <em>Grupp</em>-kolumnen. Grupper identiferas av deras <em>Code</em>-attribut. Anges flera grupper separeras dessa med kommatecken. Existerande användarrättigheter till grupperna tas inte bort.</li>\n</ul>\n</div>"
|
Help2: "<div class=\"advanced\">\n<h4>Avancerat </h4>\n<ul>\n<li>Tillåtna kolumner: <em>%s</em></li>\n<li>Existerade användare matchas av deras unika <em>kod</em>-attribut och uppdateras med alla nya värden från den importerade filen</li>\n<li>Grupper kan anges i <em>Grupp</em>-kolumnen. Grupper identiferas av deras <em>Code</em>-attribut. Anges flera grupper separeras dessa med kommatecken. Existerande användarrättigheter till grupperna tas inte bort.</li>\n</ul>\n</div>"
|
||||||
@ -350,6 +383,7 @@ sv:
|
|||||||
ModelAdmin:
|
ModelAdmin:
|
||||||
DELETE: Radera
|
DELETE: Radera
|
||||||
DELETEDRECORDS: 'Raderade {count} poster.'
|
DELETEDRECORDS: 'Raderade {count} poster.'
|
||||||
|
EMPTYBEFOREIMPORT: 'Ersätt data'
|
||||||
IMPORT: 'Importera från CSV'
|
IMPORT: 'Importera från CSV'
|
||||||
IMPORTEDRECORDS: 'Importerade {count} poster.'
|
IMPORTEDRECORDS: 'Importerade {count} poster.'
|
||||||
NOCSVFILE: 'Var god och bläddra efter en CSV-fil för import'
|
NOCSVFILE: 'Var god och bläddra efter en CSV-fil för import'
|
||||||
@ -439,7 +473,9 @@ sv:
|
|||||||
BtnImport: 'Importera från CSV'
|
BtnImport: 'Importera från CSV'
|
||||||
FileFieldLabel: 'CSV-fil <small>(Tillåtna filtyper: *.csv)</small>'
|
FileFieldLabel: 'CSV-fil <small>(Tillåtna filtyper: *.csv)</small>'
|
||||||
SilverStripeNavigator:
|
SilverStripeNavigator:
|
||||||
|
Auto: Auto
|
||||||
Edit: Ändra
|
Edit: Ändra
|
||||||
|
Width: bredd
|
||||||
TableListField:
|
TableListField:
|
||||||
CSVEXPORT: 'Exportera till CSV'
|
CSVEXPORT: 'Exportera till CSV'
|
||||||
Print: Skriv ut
|
Print: Skriv ut
|
||||||
@ -454,6 +490,8 @@ sv:
|
|||||||
ATTACHFILE: 'Bifoga en fil'
|
ATTACHFILE: 'Bifoga en fil'
|
||||||
ATTACHFILES: 'Bifoga fil(er)'
|
ATTACHFILES: 'Bifoga fil(er)'
|
||||||
AttachFile: 'Bifoga fil(er)'
|
AttachFile: 'Bifoga fil(er)'
|
||||||
|
CHOOSEANOTHERFILE: 'Välj en annan fil'
|
||||||
|
CHOOSEANOTHERINFO: 'Ersätt den här filen med en annan från filarkivet'
|
||||||
DELETE: 'Radera från filer'
|
DELETE: 'Radera från filer'
|
||||||
DELETEINFO: 'Ta bort filen permanent från filarkivet'
|
DELETEINFO: 'Ta bort filen permanent från filarkivet'
|
||||||
DOEDIT: Spara
|
DOEDIT: Spara
|
||||||
@ -468,10 +506,13 @@ sv:
|
|||||||
FROMFILES: 'Från filer'
|
FROMFILES: 'Från filer'
|
||||||
HOTLINKINFO: 'Information: Denna bild kommer att bli länkad till. Var god kontrollera med ägaren till sajten att du har tillåtelse att länka till bilden.'
|
HOTLINKINFO: 'Information: Denna bild kommer att bli länkad till. Var god kontrollera med ägaren till sajten att du har tillåtelse att länka till bilden.'
|
||||||
MAXNUMBEROFFILES: 'Max antal ({count}) filer överstiget.'
|
MAXNUMBEROFFILES: 'Max antal ({count}) filer överstiget.'
|
||||||
|
MAXNUMBEROFFILESONE: 'Kan bara ladda upp en fil'
|
||||||
MAXNUMBEROFFILESSHORT: 'Kan bara ladda upp {count} files'
|
MAXNUMBEROFFILESSHORT: 'Kan bara ladda upp {count} files'
|
||||||
|
OVERWRITEWARNING: 'En fil med samma namn finns redan'
|
||||||
REMOVE: Ta bort
|
REMOVE: Ta bort
|
||||||
REMOVEINFO: 'Ta bort filen härifrån, men radera den inte från filarkivet'
|
REMOVEINFO: 'Ta bort filen härifrån, men radera den inte från filarkivet'
|
||||||
STARTALL: 'Starta alla'
|
STARTALL: 'Starta alla'
|
||||||
Saved: Sparad
|
Saved: Sparad
|
||||||
|
UPLOADSINTO: 'sparas till /{path}'
|
||||||
Versioned:
|
Versioned:
|
||||||
has_many_Versions: Versioner
|
has_many_Versions: Versioner
|
||||||
|
|||||||
16
lang/tr.yml
16
lang/tr.yml
@ -104,10 +104,10 @@ tr:
|
|||||||
has_many_Permissions: İzinler
|
has_many_Permissions: İzinler
|
||||||
many_many_Members: Üyeler
|
many_many_Members: Üyeler
|
||||||
HtmlEditorField:
|
HtmlEditorField:
|
||||||
ANCHORVALUE: Anchor(çapa)
|
ANCHORVALUE: Çapa
|
||||||
BUTTONINSERTLINK: 'Bağlantı ekle'
|
BUTTONINSERTLINK: 'Bağlantı ekle'
|
||||||
BUTTONREMOVELINK: 'Bağlantıyı sil'
|
BUTTONREMOVELINK: 'Bağlantıyı sil'
|
||||||
CSSCLASS: 'Hizalama / stil'
|
CSSCLASS: 'Hizalama / biçem'
|
||||||
CSSCLASSCENTER: 'Ortalanmış, kendi başına'
|
CSSCLASSCENTER: 'Ortalanmış, kendi başına'
|
||||||
CSSCLASSLEFT: 'Sol tarafta, metin ile çevrili.'
|
CSSCLASSLEFT: 'Sol tarafta, metin ile çevrili.'
|
||||||
CSSCLASSLEFTALONE: 'Solda, kendisinde.'
|
CSSCLASSLEFTALONE: 'Solda, kendisinde.'
|
||||||
@ -119,7 +119,7 @@ tr:
|
|||||||
IMAGEHEIGHTPX: Yükseklik
|
IMAGEHEIGHTPX: Yükseklik
|
||||||
IMAGEWIDTHPX: Genişlik
|
IMAGEWIDTHPX: Genişlik
|
||||||
LINK: 'Link'
|
LINK: 'Link'
|
||||||
LINKANCHOR: 'Bu sayfadaki Anchor(çapa)'
|
LINKANCHOR: 'Bu sayfadaki çapa'
|
||||||
LINKDESCR: 'Bağlantı açıklaması'
|
LINKDESCR: 'Bağlantı açıklaması'
|
||||||
LINKEMAIL: 'Eposta adresi'
|
LINKEMAIL: 'Eposta adresi'
|
||||||
LINKEXTERNAL: 'Başka bir sitedeki sayfa (dış bağlantı)'
|
LINKEXTERNAL: 'Başka bir sitedeki sayfa (dış bağlantı)'
|
||||||
@ -139,9 +139,9 @@ tr:
|
|||||||
PERMDEFAULT: 'İYS erişimi için eposta adresinizi ve parolanızı giriniz.e kolaylık sağlama'
|
PERMDEFAULT: 'İYS erişimi için eposta adresinizi ve parolanızı giriniz.e kolaylık sağlama'
|
||||||
PLEASESAVE: 'Lütfen Sayfayı Kaydedin: Bu sayfa henüz kaydedilmediği için güncellenemedi.'
|
PLEASESAVE: 'Lütfen Sayfayı Kaydedin: Bu sayfa henüz kaydedilmediği için güncellenemedi.'
|
||||||
PreviewButton: Önizleme
|
PreviewButton: Önizleme
|
||||||
SAVEDUP: Kaydedilmiş.
|
SAVEDUP: Kaydedildi.
|
||||||
LoginAttempt:
|
LoginAttempt:
|
||||||
Email: 'Eposta Adresi'
|
Email: 'E-posta Adresi'
|
||||||
IP: 'IP Adresi'
|
IP: 'IP Adresi'
|
||||||
Status: Durum
|
Status: Durum
|
||||||
Member:
|
Member:
|
||||||
@ -179,12 +179,12 @@ tr:
|
|||||||
MemberAuthenticator:
|
MemberAuthenticator:
|
||||||
TITLE: 'E-posta & Şifre'
|
TITLE: 'E-posta & Şifre'
|
||||||
MemberDatetimeOptionsetField:
|
MemberDatetimeOptionsetField:
|
||||||
DATEFORMATBAD: 'Tarih formatı yanlış'
|
DATEFORMATBAD: 'Tarih biçimi geçersiz'
|
||||||
ModelAdmin:
|
ModelAdmin:
|
||||||
DELETE: Sil
|
DELETE: Sil
|
||||||
IMPORT: 'CSV''den içer aktar'
|
IMPORT: 'CSV''den içer aktar'
|
||||||
NOCSVFILE: 'CSV dosyası ekleme'
|
NOCSVFILE: 'CSV dosyası ekleme'
|
||||||
NOIMPORT: 'İçe aktarılacak birşey yok'
|
NOIMPORT: 'İçe aktarılacak bir şey yok'
|
||||||
RESET: Sıfırla
|
RESET: Sıfırla
|
||||||
NullableField:
|
NullableField:
|
||||||
IsNullLabel: 'Boş değer'
|
IsNullLabel: 'Boş değer'
|
||||||
@ -232,7 +232,7 @@ tr:
|
|||||||
EDITINFO: 'Dosyayı düzenle'
|
EDITINFO: 'Dosyayı düzenle'
|
||||||
FIELDNOTSET: 'Dosya bilgisi bulunamadı'
|
FIELDNOTSET: 'Dosya bilgisi bulunamadı'
|
||||||
FROMCOMPUTER: 'Kendi makinenizden'
|
FROMCOMPUTER: 'Kendi makinenizden'
|
||||||
FROMFILES: 'Kimden dosyaları'
|
FROMFILES: 'Dosyalardan'
|
||||||
STARTALL: 'Tümünü başlat'
|
STARTALL: 'Tümünü başlat'
|
||||||
Saved: Kaydedilmiş
|
Saved: Kaydedilmiş
|
||||||
Versioned:
|
Versioned:
|
||||||
|
|||||||
1
main.php
1
main.php
@ -158,6 +158,7 @@ global $databaseConfig;
|
|||||||
// Redirect to the installer if no database is selected
|
// Redirect to the installer if no database is selected
|
||||||
if(!isset($databaseConfig) || !isset($databaseConfig['database']) || !$databaseConfig['database']) {
|
if(!isset($databaseConfig) || !isset($databaseConfig['database']) || !$databaseConfig['database']) {
|
||||||
if(!file_exists(BASE_PATH . '/install.php')) {
|
if(!file_exists(BASE_PATH . '/install.php')) {
|
||||||
|
header($_SERVER['SERVER_PROTOCOL'] . " 500 Server Error");
|
||||||
die('SilverStripe Framework requires a $databaseConfig defined.');
|
die('SilverStripe Framework requires a $databaseConfig defined.');
|
||||||
}
|
}
|
||||||
$s = (isset($_SERVER['SSL']) || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')) ? 's' : '';
|
$s = (isset($_SERVER['SSL']) || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')) ? 's' : '';
|
||||||
|
|||||||
@ -263,6 +263,17 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a new DataList instance with distinct records or not
|
||||||
|
*
|
||||||
|
* @param bool $value
|
||||||
|
*/
|
||||||
|
public function distinct($value) {
|
||||||
|
return $this->alterDataQuery(function($query) use ($value){
|
||||||
|
$query->distinct($value);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a new DataList instance as a copy of this data list with the sort
|
* Return a new DataList instance as a copy of this data list with the sort
|
||||||
* order set.
|
* order set.
|
||||||
@ -383,21 +394,21 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a copy of this list which does not contain items matching any of these charactaristics.
|
* Return a copy of this list which contains items matching any of these charactaristics.
|
||||||
*
|
*
|
||||||
* @example // filter bob from list
|
* @example // only bob in the list
|
||||||
* $list = $list->filterAny('Name', 'bob');
|
* $list = $list->filterAny('Name', 'bob');
|
||||||
* // SQL: WHERE "Name" = 'bob'
|
* // SQL: WHERE "Name" = 'bob'
|
||||||
* @example // filter aziz and bob from list
|
* @example // azis or bob in the list
|
||||||
* $list = $list->filterAny('Name', array('aziz', 'bob');
|
* $list = $list->filterAny('Name', array('aziz', 'bob');
|
||||||
* // SQL: WHERE ("Name" IN ('aziz','bob'))
|
* // SQL: WHERE ("Name" IN ('aziz','bob'))
|
||||||
* @example // filter by bob or anybody aged 21
|
* @example // bob or anyone aged 21 in the list
|
||||||
* $list = $list->filterAny(array('Name'=>'bob, 'Age'=>21));
|
* $list = $list->filterAny(array('Name'=>'bob, 'Age'=>21));
|
||||||
* // SQL: WHERE ("Name" = 'bob' OR "Age" = '21')
|
* // SQL: WHERE ("Name" = 'bob' OR "Age" = '21')
|
||||||
* @example // filter by bob or anybody aged 21 or 43
|
* @example // bob or anyone aged 21 or 43 in the list
|
||||||
* $list = $list->filterAny(array('Name'=>'bob, 'Age'=>array(21, 43)));
|
* $list = $list->filterAny(array('Name'=>'bob, 'Age'=>array(21, 43)));
|
||||||
* // SQL: WHERE ("Name" = 'bob' OR ("Age" IN ('21', '43'))
|
* // SQL: WHERE ("Name" = 'bob' OR ("Age" IN ('21', '43'))
|
||||||
* @example // bob age 21 or 43, phil age 21 or 43 would be excluded
|
* @example // all bobs, phils or anyone aged 21 or 43 in the list
|
||||||
* $list = $list->filterAny(array('Name'=>array('bob','phil'), 'Age'=>array(21, 43)));
|
* $list = $list->filterAny(array('Name'=>array('bob','phil'), 'Age'=>array(21, 43)));
|
||||||
* // SQL: WHERE (("Name" IN ('bob', 'phil')) OR ("Age" IN ('21', '43'))
|
* // SQL: WHERE (("Name" IN ('bob', 'phil')) OR ("Age" IN ('21', '43'))
|
||||||
*
|
*
|
||||||
|
|||||||
@ -765,9 +765,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
|
|||||||
return $name;
|
return $name;
|
||||||
} else {
|
} else {
|
||||||
$name = $this->singular_name();
|
$name = $this->singular_name();
|
||||||
if(substr($name,-1) == 'e') $name = substr($name,0,-1);
|
if(substr($name,-1) == 'y') $name = substr($name,0,-1) . 'ie';
|
||||||
else if(substr($name,-1) == 'y') $name = substr($name,0,-1) . 'ie';
|
|
||||||
|
|
||||||
return ucfirst($name . 's');
|
return ucfirst($name . 's');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1050,7 +1048,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
|
|||||||
* It is expected that you call validate() in your own application to test that an object is valid before
|
* It is expected that you call validate() in your own application to test that an object is valid before
|
||||||
* attempting a write, and respond appropriately if it isn't.
|
* attempting a write, and respond appropriately if it isn't.
|
||||||
*
|
*
|
||||||
* @return A {@link ValidationResult} object
|
* @see {@link ValidationResult}
|
||||||
|
* @return ValidationResult
|
||||||
*/
|
*/
|
||||||
public function validate() {
|
public function validate() {
|
||||||
$result = ValidationResult::create();
|
$result = ValidationResult::create();
|
||||||
@ -1817,19 +1816,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
|
|||||||
* @return array The database fields
|
* @return array The database fields
|
||||||
*/
|
*/
|
||||||
public function db($fieldName = null) {
|
public function db($fieldName = null) {
|
||||||
$classes = ClassInfo::ancestry($this);
|
$classes = ClassInfo::ancestry($this, true);
|
||||||
$good = false;
|
|
||||||
$items = array();
|
$items = array();
|
||||||
|
|
||||||
foreach($classes as $class) {
|
foreach(array_reverse($classes) as $class) {
|
||||||
// Wait until after we reach DataObject
|
|
||||||
if(!$good) {
|
|
||||||
if($class == 'DataObject') {
|
|
||||||
$good = true;
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(isset(self::$_cache_db[$class])) {
|
if(isset(self::$_cache_db[$class])) {
|
||||||
$dbItems = self::$_cache_db[$class];
|
$dbItems = self::$_cache_db[$class];
|
||||||
} else {
|
} else {
|
||||||
@ -3404,6 +3394,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
|
|||||||
$types['has_one'] = (array)singleton($ancestorClass)->uninherited('has_one', true);
|
$types['has_one'] = (array)singleton($ancestorClass)->uninherited('has_one', true);
|
||||||
$types['has_many'] = (array)singleton($ancestorClass)->uninherited('has_many', true);
|
$types['has_many'] = (array)singleton($ancestorClass)->uninherited('has_many', true);
|
||||||
$types['many_many'] = (array)singleton($ancestorClass)->uninherited('many_many', true);
|
$types['many_many'] = (array)singleton($ancestorClass)->uninherited('many_many', true);
|
||||||
|
$types['belongs_many_many'] = (array)singleton($ancestorClass)->uninherited('belongs_many_many', true);
|
||||||
}
|
}
|
||||||
foreach($types as $type => $attrs) {
|
foreach($types as $type => $attrs) {
|
||||||
foreach($attrs as $name => $spec) {
|
foreach($attrs as $name => $spec) {
|
||||||
@ -3442,7 +3433,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
|
|||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function summaryFields(){
|
public function summaryFields() {
|
||||||
$fields = $this->stat('summary_fields');
|
$fields = $this->stat('summary_fields');
|
||||||
|
|
||||||
// if fields were passed in numeric array,
|
// if fields were passed in numeric array,
|
||||||
@ -3466,7 +3457,11 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
|
|||||||
|
|
||||||
// Localize fields (if possible)
|
// Localize fields (if possible)
|
||||||
foreach($this->fieldLabels(false) as $name => $label) {
|
foreach($this->fieldLabels(false) as $name => $label) {
|
||||||
if(isset($fields[$name])) $fields[$name] = $label;
|
// only attempt to localize if the label definition is the same as the field name.
|
||||||
|
// this will preserve any custom labels set in the summary_fields configuration
|
||||||
|
if(isset($fields[$name]) && $name === $fields[$name]) {
|
||||||
|
$fields[$name] = $label;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $fields;
|
return $fields;
|
||||||
|
|||||||
@ -288,6 +288,7 @@ class DataQuery {
|
|||||||
|
|
||||||
if($orderby = $query->getOrderBy()) {
|
if($orderby = $query->getOrderBy()) {
|
||||||
$newOrderby = array();
|
$newOrderby = array();
|
||||||
|
$i = 0;
|
||||||
foreach($orderby as $k => $dir) {
|
foreach($orderby as $k => $dir) {
|
||||||
$newOrderby[$k] = $dir;
|
$newOrderby[$k] = $dir;
|
||||||
|
|
||||||
@ -300,7 +301,10 @@ class DataQuery {
|
|||||||
|
|
||||||
// Pull through SortColumn references from the originalSelect variables
|
// Pull through SortColumn references from the originalSelect variables
|
||||||
if(preg_match('/_SortColumn/', $col)) {
|
if(preg_match('/_SortColumn/', $col)) {
|
||||||
if(isset($originalSelect[$col])) $query->selectField($originalSelect[$col], $col);
|
if(isset($originalSelect[$col])) {
|
||||||
|
$query->selectField($originalSelect[$col], $col);
|
||||||
|
}
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -314,6 +318,7 @@ class DataQuery {
|
|||||||
|
|
||||||
// remove original sort
|
// remove original sort
|
||||||
unset($newOrderby[$k]);
|
unset($newOrderby[$k]);
|
||||||
|
|
||||||
// add new columns sort
|
// add new columns sort
|
||||||
$newOrderby[$qualCol] = $dir;
|
$newOrderby[$qualCol] = $dir;
|
||||||
|
|
||||||
@ -326,12 +331,16 @@ class DataQuery {
|
|||||||
} else {
|
} else {
|
||||||
$qualCol = '"' . implode('"."', $parts) . '"';
|
$qualCol = '"' . implode('"."', $parts) . '"';
|
||||||
|
|
||||||
// To-do: Remove this if block once SQLSelect::$select has been refactored to store getSelect()
|
|
||||||
// format internally; then this check can be part of selectField()
|
|
||||||
if(!in_array($qualCol, $query->getSelect())) {
|
if(!in_array($qualCol, $query->getSelect())) {
|
||||||
$query->selectField($qualCol);
|
unset($newOrderby[$k]);
|
||||||
|
|
||||||
|
$newOrderby["\"_SortColumn$i\""] = $dir;
|
||||||
|
$query->selectField($qualCol, "_SortColumn$i");
|
||||||
|
|
||||||
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$query->setOrderBy($newOrderby);
|
$query->setOrderBy($newOrderby);
|
||||||
@ -577,6 +586,17 @@ class DataQuery {
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set whether this query should be distinct or not.
|
||||||
|
*
|
||||||
|
* @param bool $value
|
||||||
|
* @return DataQuery
|
||||||
|
*/
|
||||||
|
public function distinct($value) {
|
||||||
|
$this->query->setDistinct($value);
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add an INNER JOIN clause to this query.
|
* Add an INNER JOIN clause to this query.
|
||||||
*
|
*
|
||||||
@ -633,9 +653,11 @@ class DataQuery {
|
|||||||
$model = singleton($modelClass);
|
$model = singleton($modelClass);
|
||||||
if ($component = $model->has_one($rel)) {
|
if ($component = $model->has_one($rel)) {
|
||||||
if(!$this->query->isJoinedTo($component)) {
|
if(!$this->query->isJoinedTo($component)) {
|
||||||
$foreignKey = $model->getReverseAssociation($component);
|
$has_one = array_flip($model->has_one());
|
||||||
|
$foreignKey = $has_one[$component];
|
||||||
|
$realModelClass = ClassInfo::table_for_object_field($modelClass, "{$foreignKey}ID");
|
||||||
$this->query->addLeftJoin($component,
|
$this->query->addLeftJoin($component,
|
||||||
"\"$component\".\"ID\" = \"{$modelClass}\".\"{$foreignKey}ID\"");
|
"\"$component\".\"ID\" = \"{$realModelClass}\".\"{$foreignKey}ID\"");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* add join clause to the component's ancestry classes so that the search filter could search on
|
* add join clause to the component's ancestry classes so that the search filter could search on
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
* @package framework
|
* @package framework
|
||||||
* @subpackage filesystem
|
* @subpackage filesystem
|
||||||
*/
|
*/
|
||||||
class Image extends File {
|
class Image extends File implements Flushable {
|
||||||
|
|
||||||
const ORIENTATION_SQUARE = 0;
|
const ORIENTATION_SQUARE = 0;
|
||||||
const ORIENTATION_PORTRAIT = 1;
|
const ORIENTATION_PORTRAIT = 1;
|
||||||
@ -72,6 +72,19 @@ class Image extends File {
|
|||||||
*/
|
*/
|
||||||
private static $force_resample = false;
|
private static $force_resample = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @config
|
||||||
|
* @var bool Regenerates images if set to true. This is set by {@link flush()}
|
||||||
|
*/
|
||||||
|
private static $flush = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Triggered early in the request when someone requests a flush.
|
||||||
|
*/
|
||||||
|
public static function flush() {
|
||||||
|
self::$flush = true;
|
||||||
|
}
|
||||||
|
|
||||||
public static function set_backend($backend) {
|
public static function set_backend($backend) {
|
||||||
self::config()->backend = $backend;
|
self::config()->backend = $backend;
|
||||||
}
|
}
|
||||||
@ -424,7 +437,7 @@ class Image extends File {
|
|||||||
if($this->ID && $this->Filename && Director::fileExists($this->Filename)) {
|
if($this->ID && $this->Filename && Director::fileExists($this->Filename)) {
|
||||||
$cacheFile = call_user_func_array(array($this, "cacheFilename"), $args);
|
$cacheFile = call_user_func_array(array($this, "cacheFilename"), $args);
|
||||||
|
|
||||||
if(!file_exists(Director::baseFolder()."/".$cacheFile) || isset($_GET['flush'])) {
|
if(!file_exists(Director::baseFolder()."/".$cacheFile) || self::$flush) {
|
||||||
call_user_func_array(array($this, "generateFormattedImage"), $args);
|
call_user_func_array(array($this, "generateFormattedImage"), $args);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -599,6 +612,7 @@ class Image extends File {
|
|||||||
closedir($handle);
|
closedir($handle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$pattern = "/^(({$generateFuncs}).*\-)+" . preg_quote($this->Name) . "$/i";
|
||||||
|
|
||||||
$pattern = $this->getFilenamePatterns($this->Name);
|
$pattern = $this->getFilenamePatterns($this->Name);
|
||||||
|
|
||||||
|
|||||||
@ -261,7 +261,7 @@ class UnsavedRelationList extends ArrayList {
|
|||||||
*/
|
*/
|
||||||
public function column($colName = 'ID') {
|
public function column($colName = 'ID') {
|
||||||
$list = new ArrayList($this->toArray());
|
$list = new ArrayList($this->toArray());
|
||||||
return $list->column('ID');
|
return $list->column($colName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -85,7 +85,7 @@ abstract class DBConnector {
|
|||||||
$starttime = microtime(true);
|
$starttime = microtime(true);
|
||||||
$result = $callback($sql);
|
$result = $callback($sql);
|
||||||
$endtime = round(microtime(true) - $starttime, 4);
|
$endtime = round(microtime(true) - $starttime, 4);
|
||||||
Debug::message("\n$sql\n{$endtime}ms\n", false);
|
Debug::message("\n$sql\n{$endtime}s\n", false);
|
||||||
return $result;
|
return $result;
|
||||||
} else {
|
} else {
|
||||||
return $callback($sql);
|
return $callback($sql);
|
||||||
|
|||||||
@ -347,7 +347,7 @@ class MySQLSchemaManager extends DBSchemaManager {
|
|||||||
|
|
||||||
public function enumValuesForField($tableName, $fieldName) {
|
public function enumValuesForField($tableName, $fieldName) {
|
||||||
// Get the enum of all page types from the SiteTree table
|
// Get the enum of all page types from the SiteTree table
|
||||||
$classnameinfo = DB::query("DESCRIBE \"$tableName\" \"$fieldName\"")->first();
|
$classnameinfo = $this->query("DESCRIBE \"$tableName\" \"$fieldName\"")->first();
|
||||||
preg_match_all("/'[^,]+'/", $classnameinfo["Type"], $matches);
|
preg_match_all("/'[^,]+'/", $classnameinfo["Type"], $matches);
|
||||||
|
|
||||||
$classes = array();
|
$classes = array();
|
||||||
|
|||||||
@ -150,7 +150,7 @@ abstract class DBField extends ViewableData {
|
|||||||
* @return boolean
|
* @return boolean
|
||||||
*/
|
*/
|
||||||
public function exists() {
|
public function exists() {
|
||||||
return ($this->value);
|
return (bool)$this->value;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -175,6 +175,14 @@ class HTMLText extends Text {
|
|||||||
return $this->Summary();
|
return $this->Summary();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the value of the field with relative links converted to absolute urls (with placeholders parsed).
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function AbsoluteLinks() {
|
||||||
|
return HTTP::absoluteURLs($this->forTemplate());
|
||||||
|
}
|
||||||
|
|
||||||
public function forTemplate() {
|
public function forTemplate() {
|
||||||
if ($this->processShortcodes) {
|
if ($this->processShortcodes) {
|
||||||
return ShortcodeParser::get_active()->parse($this->value);
|
return ShortcodeParser::get_active()->parse($this->value);
|
||||||
|
|||||||
@ -21,6 +21,7 @@ abstract class StringField extends DBField {
|
|||||||
'LimitWordCountXML' => 'HTMLText',
|
'LimitWordCountXML' => 'HTMLText',
|
||||||
"LowerCase" => "Text",
|
"LowerCase" => "Text",
|
||||||
"UpperCase" => "Text",
|
"UpperCase" => "Text",
|
||||||
|
'NoHTML' => 'Text',
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -187,4 +188,13 @@ abstract class StringField extends DBField {
|
|||||||
public function UpperCase() {
|
public function UpperCase() {
|
||||||
return mb_strtoupper($this->value);
|
return mb_strtoupper($this->value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the value of the field stripped of html tags.
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function NoHTML() {
|
||||||
|
return strip_tags($this->value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,7 +30,6 @@ class Text extends StringField {
|
|||||||
'EscapeXML' => 'Text',
|
'EscapeXML' => 'Text',
|
||||||
'LimitWordCount' => 'Text',
|
'LimitWordCount' => 'Text',
|
||||||
'LimitWordCountXML' => 'HTMLText',
|
'LimitWordCountXML' => 'HTMLText',
|
||||||
'NoHTML' => 'Text',
|
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -53,15 +52,6 @@ class Text extends StringField {
|
|||||||
DB::require_field($this->tableName, $this->name, $values, $this->default);
|
DB::require_field($this->tableName, $this->name, $values, $this->default);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the value of the field stripped of html tags.
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function NoHTML() {
|
|
||||||
return strip_tags($this->value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the value of the field with relative links converted to absolute urls.
|
* Return the value of the field with relative links converted to absolute urls.
|
||||||
* @return string
|
* @return string
|
||||||
@ -159,14 +149,14 @@ class Text extends StringField {
|
|||||||
* Performs the same function as the big summary, but doesn't trim new paragraphs off data.
|
* Performs the same function as the big summary, but doesn't trim new paragraphs off data.
|
||||||
* Caution: Not XML/HTML-safe - does not respect closing tags.
|
* Caution: Not XML/HTML-safe - does not respect closing tags.
|
||||||
*/
|
*/
|
||||||
public function BigSummary($maxWords = 50, $plain = 1) {
|
public function BigSummary($maxWords = 50, $plain = true) {
|
||||||
$result = "";
|
$result = '';
|
||||||
|
|
||||||
// get first sentence?
|
// get first sentence?
|
||||||
// this needs to be more robust
|
// this needs to be more robust
|
||||||
if($plain) $data = Convert::xml2raw($this->value, true);
|
$data = $plain ? Convert::xml2raw($this->value, true) : $this->value;
|
||||||
|
|
||||||
if(!$data) return "";
|
if(!$data) return '';
|
||||||
|
|
||||||
$sentences = explode('.', $data);
|
$sentences = explode('.', $data);
|
||||||
$count = count(explode(' ', $sentences[0]));
|
$count = count(explode(' ', $sentences[0]));
|
||||||
|
|||||||
@ -534,8 +534,8 @@ class SQLSelect extends SQLConditionalExpression {
|
|||||||
if($this->groupby) {
|
if($this->groupby) {
|
||||||
// @todo Test case required here
|
// @todo Test case required here
|
||||||
$countQuery = new SQLSelect();
|
$countQuery = new SQLSelect();
|
||||||
$countQuery->select("count(*)");
|
$countQuery->setSelect("count(*)");
|
||||||
$countQuery->addFrom(array('(' . $clone->sql($innerParameters) . ') all_distinct'));
|
$countQuery->setFrom(array('(' . $clone->sql($innerParameters) . ') all_distinct'));
|
||||||
$sql = $countQuery->sql($parameters); // $parameters should be empty
|
$sql = $countQuery->sql($parameters); // $parameters should be empty
|
||||||
$result = DB::prepared_query($sql, $innerParameters);
|
$result = DB::prepared_query($sql, $innerParameters);
|
||||||
return $result->value();
|
return $result->value();
|
||||||
|
|||||||
@ -23,8 +23,7 @@
|
|||||||
padding-left: 12px;
|
padding-left: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fieldset {
|
body.cms.ss-uploadfield-edit-iframe {
|
||||||
padding: $grid-x*2;
|
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
background: #E2E2E2;
|
background: #E2E2E2;
|
||||||
|
|
||||||
@ -41,6 +40,11 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.composite.ss-assetuploadfield .details fieldset {
|
||||||
|
@extend body.cms.ss-uploadfield-edit-iframe;
|
||||||
|
padding: $grid-x*2;
|
||||||
|
}
|
||||||
|
|
||||||
.ss-assetuploadfield {
|
.ss-assetuploadfield {
|
||||||
border-bottom: 0;
|
border-bottom: 0;
|
||||||
@include box-shadow(none);
|
@include box-shadow(none);
|
||||||
@ -268,6 +272,8 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie
|
|||||||
|
|
||||||
iframe {
|
iframe {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
padding: $grid-x*2;
|
||||||
|
background: #E2E2E2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -165,20 +165,10 @@ abstract class SearchFilter extends Object {
|
|||||||
return $this->name;
|
return $this->name;
|
||||||
}
|
}
|
||||||
|
|
||||||
// This code finds the table where the field named $this->name lives
|
$candidateClass = ClassInfo::table_for_object_field(
|
||||||
// Todo: move to somewhere more appropriate, such as DataMapper, the
|
$this->model,
|
||||||
// magical class-to-be?
|
$this->name
|
||||||
$candidateClass = $this->model;
|
);
|
||||||
|
|
||||||
while($candidateClass != 'DataObject') {
|
|
||||||
if( DataObject::has_own_table($candidateClass)
|
|
||||||
&& DataObject::has_own_table_database_field($candidateClass, $this->name)
|
|
||||||
) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
$candidateClass = get_parent_class($candidateClass);
|
|
||||||
}
|
|
||||||
|
|
||||||
if($candidateClass == 'DataObject') {
|
if($candidateClass == 'DataObject') {
|
||||||
// fallback to the provided name in the event of a joined column
|
// fallback to the provided name in the event of a joined column
|
||||||
|
|||||||
@ -51,6 +51,23 @@ abstract class Authenticator extends Object {
|
|||||||
public static function get_login_form(Controller $controller) {
|
public static function get_login_form(Controller $controller) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method that creates the re-authentication form for the in-CMS view
|
||||||
|
*
|
||||||
|
* @param Controller $controller
|
||||||
|
*/
|
||||||
|
public static function get_cms_login_form(Controller $controller) {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine if this authenticator supports in-cms reauthentication
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public static function supports_cms() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the name of the authentication method
|
* Get the name of the authentication method
|
||||||
@ -111,7 +128,7 @@ abstract class Authenticator extends Object {
|
|||||||
if(in_array($authenticator, self::$authenticators)) {
|
if(in_array($authenticator, self::$authenticators)) {
|
||||||
unset(self::$authenticators[array_search($authenticator, self::$authenticators)]);
|
unset(self::$authenticators[array_search($authenticator, self::$authenticators)]);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
166
security/CMSMemberLoginForm.php
Normal file
166
security/CMSMemberLoginForm.php
Normal file
@ -0,0 +1,166 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provides the in-cms session re-authentication form for the "member" authenticator
|
||||||
|
*
|
||||||
|
* @package framework
|
||||||
|
* @subpackage security
|
||||||
|
*/
|
||||||
|
class CMSMemberLoginForm extends LoginForm {
|
||||||
|
|
||||||
|
protected $authenticator_class = 'MemberAuthenticator';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get link to use for external security actions
|
||||||
|
*
|
||||||
|
* @param string $action Action
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getExternalLink($action = null) {
|
||||||
|
return Security::create()->Link($action);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function __construct(Controller $controller, $name) {
|
||||||
|
// Set default fields
|
||||||
|
$fields = new FieldList(
|
||||||
|
HiddenField::create("AuthenticationMethod", null, $this->authenticator_class, $this),
|
||||||
|
HiddenField::create('tempid', null, $controller->getRequest()->requestVar('tempid')),
|
||||||
|
PasswordField::create("Password", _t('Member.PASSWORD', 'Password')),
|
||||||
|
LiteralField::create(
|
||||||
|
'forgotPassword',
|
||||||
|
sprintf(
|
||||||
|
'<p id="ForgotPassword"><a href="%s" target="_top">%s</a></p>',
|
||||||
|
$this->getExternalLink('lostpassword'),
|
||||||
|
_t('CMSMemberLoginForm.BUTTONFORGOTPASSWORD', "Forgot password?")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
if(Security::config()->autologin_enabled) {
|
||||||
|
$fields->push(new CheckboxField(
|
||||||
|
"Remember",
|
||||||
|
_t('Member.REMEMBERME', "Remember me next time?")
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine returnurl to redirect to parent page
|
||||||
|
$logoutLink = $this->getExternalLink('logout');
|
||||||
|
if($returnURL = $controller->getRequest()->requestVar('BackURL')) {
|
||||||
|
$logoutLink = Controller::join_links($logoutLink, '?BackURL='.urlencode($returnURL));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make actions
|
||||||
|
$actions = new FieldList(
|
||||||
|
FormAction::create('dologin', _t('CMSMemberLoginForm.BUTTONLOGIN', "Log back in")),
|
||||||
|
LiteralField::create(
|
||||||
|
'doLogout',
|
||||||
|
sprintf(
|
||||||
|
'<p id="doLogout"><a href="%s" target="_top">%s</a></p>',
|
||||||
|
$logoutLink,
|
||||||
|
_t('CMSMemberLoginForm.BUTTONLOGOUT', "Log out")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
parent::__construct($controller, $name, $fields, $actions);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Try to authenticate the user
|
||||||
|
*
|
||||||
|
* @param array Submitted data
|
||||||
|
* @return Member Returns the member object on successful authentication
|
||||||
|
* or NULL on failure.
|
||||||
|
*/
|
||||||
|
public function performLogin($data) {
|
||||||
|
$authenticator = $this->authenticator_class;
|
||||||
|
$member = $authenticator::authenticate($data, $this);
|
||||||
|
if($member) {
|
||||||
|
$member->LogIn(isset($data['Remember']));
|
||||||
|
return $member;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->extend('authenticationFailed', $data);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Login form handler method
|
||||||
|
*
|
||||||
|
* This method is called when the user clicks on "Log in"
|
||||||
|
*
|
||||||
|
* @param array $data Submitted data
|
||||||
|
*/
|
||||||
|
public function dologin($data) {
|
||||||
|
if($this->performLogin($data)) {
|
||||||
|
$this->logInUserAndRedirect($data);
|
||||||
|
} else {
|
||||||
|
// Find best url to redirect back to
|
||||||
|
$request = $this->controller->getRequest();
|
||||||
|
$url = $request->getHeader('X-Backurl')
|
||||||
|
?: $request->getHeader('Referer')
|
||||||
|
?: $this->controller->Link('login');
|
||||||
|
return $this->controller->redirect($url);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Redirect the user to the change password form.
|
||||||
|
*
|
||||||
|
* @return SS_HTTPResponse
|
||||||
|
*/
|
||||||
|
protected function redirectToChangePassword() {
|
||||||
|
// Since this form is loaded via an iframe, this redirect must be performed via javascript
|
||||||
|
$changePasswordForm = new ChangePasswordForm($this->controller, 'ChangePasswordForm');
|
||||||
|
$changePasswordForm->sessionMessage(
|
||||||
|
_t('Member.PASSWORDEXPIRED', 'Your password has expired. Please choose a new one.'),
|
||||||
|
'good'
|
||||||
|
);
|
||||||
|
|
||||||
|
// Get redirect url
|
||||||
|
$changePasswordURL = $this->getExternalLink('changepassword');
|
||||||
|
if($backURL = $this->controller->getRequest()->requestVar('BackURL')) {
|
||||||
|
Session::set('BackURL', $backURL);
|
||||||
|
$changePasswordURL = Controller::join_links($changePasswordURL,'?BackURL=' . urlencode($backURL));
|
||||||
|
}
|
||||||
|
$changePasswordURLATT = Convert::raw2att($changePasswordURL);
|
||||||
|
$changePasswordURLJS = Convert::raw2js($changePasswordURL);
|
||||||
|
$message = _t(
|
||||||
|
'CMSMemberLoginForm.PASSWORDEXPIRED',
|
||||||
|
'<p>Your password has expired. <a target="_top" href="{link}">Please choose a new one.</a></p>',
|
||||||
|
'Message displayed to user if their session cannot be restored',
|
||||||
|
array('link' => $changePasswordURLATT)
|
||||||
|
);
|
||||||
|
|
||||||
|
// Redirect to change password page
|
||||||
|
$this->controller->getResponse()->setStatusCode(200);
|
||||||
|
$this->controller->getResponse()->setBody(<<<PHP
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html><body>
|
||||||
|
$message
|
||||||
|
<script type="text/javascript">
|
||||||
|
setTimeout(function(){top.location.href = "$changePasswordURLJS";}, 0);
|
||||||
|
</script>
|
||||||
|
</body></html>
|
||||||
|
PHP
|
||||||
|
);
|
||||||
|
return $this->controller->getResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Send user to the right location after login
|
||||||
|
*
|
||||||
|
* @param array $data
|
||||||
|
* @return SS_HTTPResponse
|
||||||
|
*/
|
||||||
|
protected function logInUserAndRedirect($data) {
|
||||||
|
// Check password expiry
|
||||||
|
if(Member::currentUser()->isPasswordExpired()) {
|
||||||
|
// Redirect the user to the external password change form if necessary
|
||||||
|
return $this->redirectToChangePassword();
|
||||||
|
} else {
|
||||||
|
// Link to success template
|
||||||
|
$url = $this->controller->Link('success');
|
||||||
|
return $this->controller->redirect($url);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
200
security/CMSSecurity.php
Normal file
200
security/CMSSecurity.php
Normal file
@ -0,0 +1,200 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provides a security interface functionality within the cms
|
||||||
|
*/
|
||||||
|
class CMSSecurity extends Security {
|
||||||
|
|
||||||
|
private static $casting = array(
|
||||||
|
'Title' => 'HTMLText'
|
||||||
|
);
|
||||||
|
|
||||||
|
private static $allowed_actions = array(
|
||||||
|
'LoginForm',
|
||||||
|
'success'
|
||||||
|
);
|
||||||
|
|
||||||
|
public function init() {
|
||||||
|
parent::init();
|
||||||
|
|
||||||
|
// Include CMS styles and js
|
||||||
|
Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
|
||||||
|
Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/screen.css');
|
||||||
|
Requirements::combine_files(
|
||||||
|
'cmssecurity.js',
|
||||||
|
array(
|
||||||
|
THIRDPARTY_DIR . '/jquery/jquery.js',
|
||||||
|
THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js',
|
||||||
|
THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js',
|
||||||
|
FRAMEWORK_ADMIN_DIR . '/javascript/lib.js',
|
||||||
|
FRAMEWORK_ADMIN_DIR . '/javascript/CMSSecurity.js'
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function Link($action = null) {
|
||||||
|
return Controller::join_links(Director::baseURL(), "CMSSecurity", $action);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get known logged out member
|
||||||
|
*
|
||||||
|
* @return Member
|
||||||
|
*/
|
||||||
|
public function getTargetMember() {
|
||||||
|
if($tempid = $this->request->requestVar('tempid')) {
|
||||||
|
return Member::member_from_tempid($tempid);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getResponseController($title) {
|
||||||
|
// Use $this to prevent use of Page to render underlying templates
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getLoginMessage() {
|
||||||
|
return parent::getLoginMessage()
|
||||||
|
?: _t(
|
||||||
|
'CMSSecurity.LoginMessage',
|
||||||
|
'<p>If you have any unsaved work you can return to where you left off by logging back in below.</p>'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getTitle() {
|
||||||
|
// Check if logged in already
|
||||||
|
if(Member::currentUserID()) {
|
||||||
|
return _t('CMSSecurity.SUCCESS', 'Success');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Display logged-out message
|
||||||
|
$member = $this->getTargetMember();
|
||||||
|
if($member) {
|
||||||
|
return _t(
|
||||||
|
'CMSSecurity.TimedOutTitleMember',
|
||||||
|
'Hey {name}!<br />Your session has timed out.',
|
||||||
|
'Title for CMS popup login form for a known user',
|
||||||
|
array('name' => $member->FirstName)
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return _t(
|
||||||
|
'CMSSecurity.TimedOutTitleAnonymous',
|
||||||
|
'Your session has timed out.',
|
||||||
|
'Title for CMS popup login form without a known user'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Redirects the user to the external login page
|
||||||
|
*
|
||||||
|
* @return SS_HTTPResponse
|
||||||
|
*/
|
||||||
|
protected function redirectToExternalLogin() {
|
||||||
|
$loginURL = Security::create()->Link('login');
|
||||||
|
$loginURLATT = Convert::raw2att($loginURL);
|
||||||
|
$loginURLJS = Convert::raw2js($loginURL);
|
||||||
|
$message = _t(
|
||||||
|
'CMSSecurity.INVALIDUSER',
|
||||||
|
'<p>Invalid user. <a target="_top" href="{link}">Please re-authenticate here</a> to continue.</p>',
|
||||||
|
'Message displayed to user if their session cannot be restored',
|
||||||
|
array('link' => $loginURLATT)
|
||||||
|
);
|
||||||
|
$this->response->setStatusCode(200);
|
||||||
|
$this->response->setBody(<<<PHP
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html><body>
|
||||||
|
$message
|
||||||
|
<script type="text/javascript">
|
||||||
|
setTimeout(function(){top.location.href = "$loginURLJS";}, 0);
|
||||||
|
</script>
|
||||||
|
</body></html>
|
||||||
|
PHP
|
||||||
|
);
|
||||||
|
return $this->response;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function preLogin() {
|
||||||
|
// If no member has been previously logged in for this session, force a redirect to the main login page
|
||||||
|
if(!$this->getTargetMember()) {
|
||||||
|
return $this->redirectToExternalLogin();
|
||||||
|
}
|
||||||
|
|
||||||
|
return parent::preLogin();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function GetLoginForms() {
|
||||||
|
$forms = array();
|
||||||
|
$authenticators = Authenticator::get_authenticators();
|
||||||
|
foreach($authenticators as $authenticator) {
|
||||||
|
// Get only CMS-supporting authenticators
|
||||||
|
if($authenticator::supports_cms()) {
|
||||||
|
$forms[] = $authenticator::get_cms_login_form($this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $forms;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine if CMSSecurity is enabled
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public static function enabled() {
|
||||||
|
// Count all cms-supported methods
|
||||||
|
$authenticators = Authenticator::get_authenticators();
|
||||||
|
foreach($authenticators as $authenticator) {
|
||||||
|
// Supported if at least one authenticator is supported
|
||||||
|
if($authenticator::supports_cms()) return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function LoginForm() {
|
||||||
|
$authenticator = $this->getAuthenticator();
|
||||||
|
if($authenticator && $authenticator::supports_cms()) {
|
||||||
|
return $authenticator::get_cms_login_form($this);
|
||||||
|
}
|
||||||
|
user_error('Passed invalid authentication method', E_USER_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getTemplatesFor($action) {
|
||||||
|
return array("CMSSecurity_{$action}", "CMSSecurity")
|
||||||
|
+ parent::getTemplatesFor($action);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getIncludeTemplate($name) {
|
||||||
|
return array("CMSSecurity_{$name}")
|
||||||
|
+ parent::getIncludeTemplate($name);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Given a successful login, tell the parent frame to close the dialog
|
||||||
|
*
|
||||||
|
* @return SS_HTTPResponse
|
||||||
|
*/
|
||||||
|
public function success() {
|
||||||
|
// Ensure member is properly logged in
|
||||||
|
if(!Member::currentUserID()) {
|
||||||
|
return $this->redirectToExternalLogin();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get redirect url
|
||||||
|
$controller = $this->getResponseController(_t('CMSSecurity.SUCCESS', 'Success'));
|
||||||
|
$backURL = $this->request->requestVar('BackURL')
|
||||||
|
?: Session::get('BackURL')
|
||||||
|
?: Director::absoluteURL(AdminRootController::config()->url_base, true);
|
||||||
|
|
||||||
|
// Show login
|
||||||
|
$controller = $controller->customise(array(
|
||||||
|
'Content' => _t(
|
||||||
|
'CMSSecurity.SUCCESSCONTENT',
|
||||||
|
'<p>Login success. If you are not automatically redirected '.
|
||||||
|
'<a target="_top" href="{link}">click here</a></p>',
|
||||||
|
'Login message displayed in the cms popup once a user has re-authenticated themselves',
|
||||||
|
array('link' => $backURL)
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
return $controller->renderWith($this->getTemplatesFor('success'));
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -27,18 +27,17 @@ abstract class LoginForm extends Form {
|
|||||||
protected $authenticator_class;
|
protected $authenticator_class;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the authenticator class
|
* Get the authenticator instance
|
||||||
* @return Authenticator Returns the authenticator class for this login form.
|
*
|
||||||
|
* @return Authenticator Returns the authenticator instance for this login form.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public function getAuthenticator() {
|
public function getAuthenticator() {
|
||||||
if(!class_exists($this->authenticator_class) || !is_subclass_of($this->authenticator_class, 'Authenticator')) {
|
if(!class_exists($this->authenticator_class) || !is_subclass_of($this->authenticator_class, 'Authenticator')) {
|
||||||
user_error("The form uses an invalid authenticator class! '{$this->authenticator_class}'"
|
user_error("The form uses an invalid authenticator class! '{$this->authenticator_class}'"
|
||||||
. " is not a subclass of 'Authenticator'", E_USER_ERROR);
|
. " is not a subclass of 'Authenticator'", E_USER_ERROR);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
return Injector::inst()->get($this->authenticator_class);
|
||||||
return new $this->authenticator_class;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -5,21 +5,25 @@
|
|||||||
* @package framework
|
* @package framework
|
||||||
* @subpackage security
|
* @subpackage security
|
||||||
*
|
*
|
||||||
* @property string FirstName
|
* @property string $FirstName
|
||||||
* @property string Surname
|
* @property string $Surname
|
||||||
* @property string Email
|
* @property string $Email
|
||||||
* @property string Password
|
* @property string $Password
|
||||||
* @property string RememberLoginHash
|
* @property string $RememberLoginToken
|
||||||
* @property string AutoLoginHash
|
* @property string $TempIDHash
|
||||||
* @property string AutoLoginExpired
|
* @property string $TempIDExpired
|
||||||
* @property string PasswordEncryption
|
* @property int $NumVisit
|
||||||
* @property string Salt
|
* @property string $LastVisited Date and time of last visit
|
||||||
* @property string PasswordExpiry
|
* @property string $AutoLoginHash
|
||||||
* @property string LockedOutUntil
|
* @property string $AutoLoginExpired
|
||||||
* @property string Locale
|
* @property string $PasswordEncryption
|
||||||
* @property int FailedLoginCount
|
* @property string $Salt
|
||||||
* @property string DateFormat
|
* @property string $PasswordExpiry
|
||||||
* @property string TimeFormat
|
* @property string $LockedOutUntil
|
||||||
|
* @property string $Locale
|
||||||
|
* @property int $FailedLoginCount
|
||||||
|
* @property string $DateFormat
|
||||||
|
* @property string $TimeFormat
|
||||||
*/
|
*/
|
||||||
class Member extends DataObject implements TemplateGlobalProvider {
|
class Member extends DataObject implements TemplateGlobalProvider {
|
||||||
|
|
||||||
@ -27,9 +31,11 @@ class Member extends DataObject implements TemplateGlobalProvider {
|
|||||||
'FirstName' => 'Varchar',
|
'FirstName' => 'Varchar',
|
||||||
'Surname' => 'Varchar',
|
'Surname' => 'Varchar',
|
||||||
'Email' => 'Varchar(256)', // See RFC 5321, Section 4.5.3.1.3.
|
'Email' => 'Varchar(256)', // See RFC 5321, Section 4.5.3.1.3.
|
||||||
|
'TempIDHash' => 'Varchar(160)', // Temporary id used for cms re-authentication
|
||||||
|
'TempIDExpired' => 'SS_Datetime', // Expiry of temp login
|
||||||
'Password' => 'Varchar(160)',
|
'Password' => 'Varchar(160)',
|
||||||
'RememberLoginToken' => 'Varchar(160)', // Note: this currently holds a hash, not a token.
|
'RememberLoginToken' => 'Varchar(160)', // Note: this currently holds a hash, not a token.
|
||||||
'AutoLoginHash' => 'Varchar(160)',
|
'AutoLoginHash' => 'Varchar(160)', // Used to auto-login the user on password reset
|
||||||
'AutoLoginExpired' => 'SS_Datetime',
|
'AutoLoginExpired' => 'SS_Datetime',
|
||||||
// This is an arbitrary code pointing to a PasswordEncryptor instance,
|
// This is an arbitrary code pointing to a PasswordEncryptor instance,
|
||||||
// not an actual encryption algorithm.
|
// not an actual encryption algorithm.
|
||||||
@ -96,6 +102,24 @@ class Member extends DataObject implements TemplateGlobalProvider {
|
|||||||
'Email' => 'Email',
|
'Email' => 'Email',
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Internal-use only fields
|
||||||
|
*
|
||||||
|
* @config
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
private static $hidden_fields = array(
|
||||||
|
'RememberLoginToken',
|
||||||
|
'AutoLoginHash',
|
||||||
|
'AutoLoginExpired',
|
||||||
|
'PasswordEncryption',
|
||||||
|
'PasswordExpiry',
|
||||||
|
'LockedOutUntil',
|
||||||
|
'TempIDHash',
|
||||||
|
'TempIDExpired',
|
||||||
|
'Salt',
|
||||||
|
'NumVisit'
|
||||||
|
);
|
||||||
/**
|
/**
|
||||||
* @config
|
* @config
|
||||||
* @var Array See {@link set_title_columns()}
|
* @var Array See {@link set_title_columns()}
|
||||||
@ -131,7 +155,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
|
|||||||
* the user is blocked from further attempts for the timespan
|
* the user is blocked from further attempts for the timespan
|
||||||
* defined in {@link $lock_out_delay_mins}.
|
* defined in {@link $lock_out_delay_mins}.
|
||||||
*/
|
*/
|
||||||
private static $lock_out_after_incorrect_logins = null;
|
private static $lock_out_after_incorrect_logins = 10;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @config
|
* @config
|
||||||
@ -159,6 +183,23 @@ class Member extends DataObject implements TemplateGlobalProvider {
|
|||||||
*/
|
*/
|
||||||
private static $session_regenerate_id = true;
|
private static $session_regenerate_id = true;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default lifetime of temporary ids.
|
||||||
|
*
|
||||||
|
* This is the period within which a user can be re-authenticated within the CMS by entering only their password
|
||||||
|
* and without losing their workspace.
|
||||||
|
*
|
||||||
|
* Any session expiration outside of this time will require them to login from the frontend using their full
|
||||||
|
* username and password.
|
||||||
|
*
|
||||||
|
* Defaults to 72 hours. Set to zero to disable expiration.
|
||||||
|
*
|
||||||
|
* @config
|
||||||
|
* @var int Lifetime in seconds
|
||||||
|
*/
|
||||||
|
private static $temp_id_lifetime = 259200;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated 3.2 Use the "Member.session_regenerate_id" config setting instead
|
* @deprecated 3.2 Use the "Member.session_regenerate_id" config setting instead
|
||||||
*/
|
*/
|
||||||
@ -178,25 +219,42 @@ class Member extends DataObject implements TemplateGlobalProvider {
|
|||||||
public function requireDefaultRecords() {
|
public function requireDefaultRecords() {
|
||||||
parent::requireDefaultRecords();
|
parent::requireDefaultRecords();
|
||||||
// Default groups should've been built by Group->requireDefaultRecords() already
|
// Default groups should've been built by Group->requireDefaultRecords() already
|
||||||
|
static::default_admin();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the default admin record if it exists, or creates it otherwise if enabled
|
||||||
|
*
|
||||||
|
* @return Member
|
||||||
|
*/
|
||||||
|
public static function default_admin() {
|
||||||
|
// Check if set
|
||||||
|
if(!Security::has_default_admin()) return null;
|
||||||
|
|
||||||
// Find or create ADMIN group
|
// Find or create ADMIN group
|
||||||
$adminGroup = Permission::get_groups_by_permission('ADMIN')->First();
|
|
||||||
if(!$adminGroup) {
|
|
||||||
singleton('Group')->requireDefaultRecords();
|
singleton('Group')->requireDefaultRecords();
|
||||||
$adminGroup = Permission::get_groups_by_permission('ADMIN')->First();
|
$adminGroup = Permission::get_groups_by_permission('ADMIN')->First();
|
||||||
}
|
|
||||||
|
|
||||||
// Add a default administrator to the first ADMIN group found (most likely the default
|
// Find member
|
||||||
// group created through Group->requireDefaultRecords()).
|
$admin = Member::get()
|
||||||
$admins = Permission::get_members_by_permission('ADMIN')->First();
|
->filter('Email', Security::default_admin_username())
|
||||||
if(!$admins) {
|
->first();
|
||||||
// Leave 'Email' and 'Password' are not set to avoid creating
|
if(!$admin) {
|
||||||
|
// 'Password' is not set to avoid creating
|
||||||
// persistent logins in the database. See Security::setDefaultAdmin().
|
// persistent logins in the database. See Security::setDefaultAdmin().
|
||||||
|
// Set 'Email' to identify this as the default admin
|
||||||
$admin = Member::create();
|
$admin = Member::create();
|
||||||
$admin->FirstName = _t('Member.DefaultAdminFirstname', 'Default Admin');
|
$admin->FirstName = _t('Member.DefaultAdminFirstname', 'Default Admin');
|
||||||
|
$admin->Email = Security::default_admin_username();
|
||||||
$admin->write();
|
$admin->write();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure this user is in the admin group
|
||||||
|
if(!$admin->inGroup($adminGroup)) {
|
||||||
$admin->Groups()->add($adminGroup);
|
$admin->Groups()->add($adminGroup);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return $admin;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -407,12 +465,29 @@ class Member extends DataObject implements TemplateGlobalProvider {
|
|||||||
$this->LockedOutUntil = null;
|
$this->LockedOutUntil = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->regenerateTempID();
|
||||||
|
|
||||||
$this->write();
|
$this->write();
|
||||||
|
|
||||||
// Audit logging hook
|
// Audit logging hook
|
||||||
$this->extend('memberLoggedIn');
|
$this->extend('memberLoggedIn');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trigger regeneration of TempID.
|
||||||
|
*
|
||||||
|
* This should be performed any time the user presents their normal identification (normally Email)
|
||||||
|
* and is successfully authenticated.
|
||||||
|
*/
|
||||||
|
public function regenerateTempID() {
|
||||||
|
$generator = new RandomGenerator();
|
||||||
|
$this->TempIDHash = $generator->randomToken('sha1');
|
||||||
|
$this->TempIDExpired = self::config()->temp_id_lifetime
|
||||||
|
? date('Y-m-d H:i:s', strtotime(SS_Datetime::now()->getValue()) + self::config()->temp_id_lifetime)
|
||||||
|
: null;
|
||||||
|
$this->write();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the member ID logged in session actually
|
* Check if the member ID logged in session actually
|
||||||
* has a database record of the same ID. If there is
|
* has a database record of the same ID. If there is
|
||||||
@ -565,6 +640,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
|
|||||||
* @param bool $login Should the member be logged in?
|
* @param bool $login Should the member be logged in?
|
||||||
*
|
*
|
||||||
* @return Member the matching member, if valid
|
* @return Member the matching member, if valid
|
||||||
|
* @return Member
|
||||||
*/
|
*/
|
||||||
public static function member_from_autologinhash($hash, $login = false) {
|
public static function member_from_autologinhash($hash, $login = false) {
|
||||||
|
|
||||||
@ -579,6 +655,24 @@ class Member extends DataObject implements TemplateGlobalProvider {
|
|||||||
return $member;
|
return $member;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find a member record with the given TempIDHash value
|
||||||
|
*
|
||||||
|
* @param string $tempid
|
||||||
|
* @return Member
|
||||||
|
*/
|
||||||
|
public static function member_from_tempid($tempid) {
|
||||||
|
$members = Member::get()
|
||||||
|
->filter('TempIDHash', $tempid);
|
||||||
|
|
||||||
|
// Exclude expired
|
||||||
|
if(static::config()->temp_id_lifetime) {
|
||||||
|
$members = $members->filter('TempIDExpired:GreaterThan', SS_Datetime::now()->getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
return $members->first();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the fields for the member form - used in the registration/profile module.
|
* Returns the fields for the member form - used in the registration/profile module.
|
||||||
* It should return fields that are editable by the admin and the logged-in user.
|
* It should return fields that are editable by the admin and the logged-in user.
|
||||||
@ -604,15 +698,9 @@ class Member extends DataObject implements TemplateGlobalProvider {
|
|||||||
i18n::get_existing_translations()
|
i18n::get_existing_translations()
|
||||||
));
|
));
|
||||||
|
|
||||||
$fields->removeByName('RememberLoginToken');
|
$fields->removeByName(static::config()->hidden_fields);
|
||||||
$fields->removeByName('AutoLoginHash');
|
|
||||||
$fields->removeByName('AutoLoginExpired');
|
|
||||||
$fields->removeByName('PasswordEncryption');
|
|
||||||
$fields->removeByName('Salt');
|
|
||||||
$fields->removeByName('PasswordExpiry');
|
|
||||||
$fields->removeByName('FailedLoginCount');
|
$fields->removeByName('FailedLoginCount');
|
||||||
$fields->removeByName('LastViewed');
|
|
||||||
$fields->removeByName('LockedOutUntil');
|
|
||||||
|
|
||||||
$this->extend('updateMemberFormFields', $fields);
|
$this->extend('updateMemberFormFields', $fields);
|
||||||
return $fields;
|
return $fields;
|
||||||
@ -1199,19 +1287,12 @@ class Member extends DataObject implements TemplateGlobalProvider {
|
|||||||
_t('Member.INTERFACELANG', "Interface Language", 'Language of the CMS'),
|
_t('Member.INTERFACELANG', "Interface Language", 'Language of the CMS'),
|
||||||
i18n::get_existing_translations()
|
i18n::get_existing_translations()
|
||||||
));
|
));
|
||||||
|
$mainFields->removeByName($self->config()->hidden_fields);
|
||||||
$mainFields->removeByName('RememberLoginToken');
|
|
||||||
$mainFields->removeByName('AutoLoginHash');
|
|
||||||
$mainFields->removeByName('AutoLoginExpired');
|
|
||||||
$mainFields->removeByName('PasswordEncryption');
|
|
||||||
$mainFields->removeByName('PasswordExpiry');
|
|
||||||
$mainFields->removeByName('LockedOutUntil');
|
|
||||||
|
|
||||||
if( ! $self->config()->lock_out_after_incorrect_logins) {
|
if( ! $self->config()->lock_out_after_incorrect_logins) {
|
||||||
$mainFields->removeByName('FailedLoginCount');
|
$mainFields->removeByName('FailedLoginCount');
|
||||||
}
|
}
|
||||||
|
|
||||||
$mainFields->removeByName('Salt');
|
|
||||||
|
|
||||||
// Groups relation will get us into logical conflicts because
|
// Groups relation will get us into logical conflicts because
|
||||||
// Members are displayed within group edit form in SecurityAdmin
|
// Members are displayed within group edit form in SecurityAdmin
|
||||||
|
|||||||
@ -20,10 +20,115 @@ class MemberAuthenticator extends Authenticator {
|
|||||||
'sha1' => 'sha1_v2.4'
|
'sha1' => 'sha1_v2.4'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attempt to find and authenticate member if possible from the given data
|
||||||
|
*
|
||||||
|
* @param array $data
|
||||||
|
* @param Form $form
|
||||||
|
* @param bool &$success Success flag
|
||||||
|
* @return Member Found member, regardless of successful login
|
||||||
|
*/
|
||||||
|
protected static function authenticate_member($data, $form, &$success) {
|
||||||
|
// Default success to false
|
||||||
|
$success = false;
|
||||||
|
|
||||||
|
// Attempt to identify by temporary ID
|
||||||
|
$member = null;
|
||||||
|
$email = null;
|
||||||
|
if(!empty($data['tempid'])) {
|
||||||
|
// Find user by tempid, in case they are re-validating an existing session
|
||||||
|
$member = Member::member_from_tempid($data['tempid']);
|
||||||
|
if($member) $email = $member->Email;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Otherwise, get email from posted value instead
|
||||||
|
if(!$member && !empty($data['Email'])) {
|
||||||
|
$email = $data['Email'];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check default login (see Security::setDefaultAdmin())
|
||||||
|
$asDefaultAdmin = $email === Security::default_admin_username();
|
||||||
|
if($asDefaultAdmin) {
|
||||||
|
// If logging is as default admin, ensure record is setup correctly
|
||||||
|
$member = Member::default_admin();
|
||||||
|
$success = Security::check_default_admin($email, $data['Password']);
|
||||||
|
if($success) return $member;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Attempt to identify user by email
|
||||||
|
if(!$member && $email) {
|
||||||
|
// Find user by email
|
||||||
|
$member = Member::get()
|
||||||
|
->filter(Member::config()->unique_identifier_field, $email)
|
||||||
|
->first();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate against member if possible
|
||||||
|
if($member && !$asDefaultAdmin) {
|
||||||
|
$result = $member->checkPassword($data['Password']);
|
||||||
|
$success = $result->valid();
|
||||||
|
$result = new ValidationResult(false, _t('Member.ERRORWRONGCRED'));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Emit failure to member and form (if available)
|
||||||
|
if(!$success) {
|
||||||
|
if($member) $member->registerFailedLogin();
|
||||||
|
if($form) $form->sessionMessage($result->message(), 'bad');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $member;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log login attempt
|
||||||
|
* TODO We could handle this with an extension
|
||||||
|
*
|
||||||
|
* @param array $data
|
||||||
|
* @param Member $member
|
||||||
|
* @param bool $success
|
||||||
|
*/
|
||||||
|
protected static function record_login_attempt($data, $member, $success) {
|
||||||
|
if(!Security::config()->login_recording) return;
|
||||||
|
|
||||||
|
// Check email is valid
|
||||||
|
$email = isset($data['Email']) ? $data['Email'] : null;
|
||||||
|
if(is_array($email)) {
|
||||||
|
throw new InvalidArgumentException("Bad email passed to MemberAuthenticator::authenticate(): $email");
|
||||||
|
}
|
||||||
|
|
||||||
|
$attempt = new LoginAttempt();
|
||||||
|
if($success) {
|
||||||
|
// successful login (member is existing with matching password)
|
||||||
|
$attempt->MemberID = $member->ID;
|
||||||
|
$attempt->Status = 'Success';
|
||||||
|
|
||||||
|
// Audit logging hook
|
||||||
|
$member->extend('authenticated');
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// Failed login - we're trying to see if a user exists with this email (disregarding wrong passwords)
|
||||||
|
$attempt->Status = 'Failure';
|
||||||
|
if($member) {
|
||||||
|
// Audit logging hook
|
||||||
|
$attempt->MemberID = $member->ID;
|
||||||
|
$member->extend('authenticationFailed');
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// Audit logging hook
|
||||||
|
singleton('Member')->extend('authenticationFailedUnknownUser', $data);
|
||||||
|
|
||||||
|
$attempt->Email = $userEmail;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attempt->Email = $email;
|
||||||
|
$attempt->IP = Controller::curr()->getRequest()->getIP();
|
||||||
|
$attempt->write();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Method to authenticate an user
|
* Method to authenticate an user
|
||||||
*
|
*
|
||||||
* @param array $RAW_data Raw data to authenticate the user
|
* @param array $data Raw data to authenticate the user
|
||||||
* @param Form $form Optional: If passed, better error messages can be
|
* @param Form $form Optional: If passed, better error messages can be
|
||||||
* produced by using
|
* produced by using
|
||||||
* {@link Form::sessionMessage()}
|
* {@link Form::sessionMessage()}
|
||||||
@ -31,95 +136,27 @@ class MemberAuthenticator extends Authenticator {
|
|||||||
* the member object
|
* the member object
|
||||||
* @see Security::setDefaultAdmin()
|
* @see Security::setDefaultAdmin()
|
||||||
*/
|
*/
|
||||||
public static function authenticate($RAW_data, Form $form = null) {
|
public static function authenticate($data, Form $form = null) {
|
||||||
// Check for email
|
// Find authenticated member
|
||||||
if(empty($RAW_data['Email'])) return false;
|
$member = static::authenticate_member($data, $form, $success);
|
||||||
|
|
||||||
$userEmail = $RAW_data['Email'];
|
|
||||||
if(is_array($userEmail)) {
|
|
||||||
user_error("Bad email passed to MemberAuthenticator::authenticate()", E_USER_WARNING);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$result = null;
|
|
||||||
|
|
||||||
// Default login (see Security::setDefaultAdmin())
|
|
||||||
if(Security::check_default_admin($userEmail, $RAW_data['Password'])) {
|
|
||||||
$member = Security::findAnAdministrator();
|
|
||||||
} else {
|
|
||||||
$member = Member::get()
|
|
||||||
->filter(Member::config()->unique_identifier_field, $userEmail)
|
|
||||||
->where('"Member"."Password" IS NOT NULL')
|
|
||||||
->first();
|
|
||||||
|
|
||||||
if($member) {
|
|
||||||
$result = $member->checkPassword($RAW_data['Password']);
|
|
||||||
} else {
|
|
||||||
$result = new ValidationResult(false, _t('Member.ERRORWRONGCRED'));
|
|
||||||
}
|
|
||||||
|
|
||||||
if($member && !$result->valid()) {
|
|
||||||
$member->registerFailedLogin();
|
|
||||||
$member = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Optionally record every login attempt as a {@link LoginAttempt} object
|
// Optionally record every login attempt as a {@link LoginAttempt} object
|
||||||
/**
|
static::record_login_attempt($data, $member, $success);
|
||||||
* TODO We could handle this with an extension
|
|
||||||
*/
|
|
||||||
if(Security::config()->login_recording) {
|
|
||||||
$attempt = new LoginAttempt();
|
|
||||||
if($member) {
|
|
||||||
// successful login (member is existing with matching password)
|
|
||||||
$attempt->MemberID = $member->ID;
|
|
||||||
$attempt->Status = 'Success';
|
|
||||||
|
|
||||||
// Audit logging hook
|
|
||||||
$member->extend('authenticated');
|
|
||||||
} else {
|
|
||||||
// failed login - we're trying to see if a user exists with this email (disregarding wrong passwords)
|
|
||||||
$existingMember = DataObject::get_one("Member", array(
|
|
||||||
'"'.Member::config()->unique_identifier_field.'"' => $userEmail
|
|
||||||
));
|
|
||||||
if($existingMember) {
|
|
||||||
$attempt->MemberID = $existingMember->ID;
|
|
||||||
|
|
||||||
// Audit logging hook
|
|
||||||
$existingMember->extend('authenticationFailed');
|
|
||||||
} else {
|
|
||||||
|
|
||||||
// Audit logging hook
|
|
||||||
singleton('Member')->extend('authenticationFailedUnknownUser', $RAW_data);
|
|
||||||
}
|
|
||||||
$attempt->Status = 'Failure';
|
|
||||||
}
|
|
||||||
|
|
||||||
$attempt->Email = $userEmail;
|
|
||||||
$attempt->IP = Controller::curr()->getRequest()->getIP();
|
|
||||||
$attempt->write();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Legacy migration to precision-safe password hashes.
|
// Legacy migration to precision-safe password hashes.
|
||||||
// A login-event with cleartext passwords is the only time
|
// A login-event with cleartext passwords is the only time
|
||||||
// when we can rehash passwords to a different hashing algorithm,
|
// when we can rehash passwords to a different hashing algorithm,
|
||||||
// bulk-migration doesn't work due to the nature of hashing.
|
// bulk-migration doesn't work due to the nature of hashing.
|
||||||
// See PasswordEncryptor_LegacyPHPHash class.
|
// See PasswordEncryptor_LegacyPHPHash class.
|
||||||
if(
|
if($success && $member && isset(self::$migrate_legacy_hashes[$member->PasswordEncryption])) {
|
||||||
$member // only migrate after successful login
|
$member->Password = $data['Password'];
|
||||||
&& self::$migrate_legacy_hashes
|
|
||||||
&& array_key_exists($member->PasswordEncryption, self::$migrate_legacy_hashes)
|
|
||||||
) {
|
|
||||||
$member->Password = $RAW_data['Password'];
|
|
||||||
$member->PasswordEncryption = self::$migrate_legacy_hashes[$member->PasswordEncryption];
|
$member->PasswordEncryption = self::$migrate_legacy_hashes[$member->PasswordEncryption];
|
||||||
$member->write();
|
$member->write();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!$member && $form && $result) {
|
if($success) Session::clear('BackURL');
|
||||||
$form->sessionMessage($result->message(), 'bad');
|
|
||||||
}
|
|
||||||
|
|
||||||
return $member;
|
return $success ? $member : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -132,7 +169,16 @@ class MemberAuthenticator extends Authenticator {
|
|||||||
* method
|
* method
|
||||||
*/
|
*/
|
||||||
public static function get_login_form(Controller $controller) {
|
public static function get_login_form(Controller $controller) {
|
||||||
return Object::create("MemberLoginForm", $controller, "LoginForm");
|
return MemberLoginForm::create($controller, "LoginForm");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function get_cms_login_form(\Controller $controller) {
|
||||||
|
return CMSMemberLoginForm::create($controller, "LoginForm");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function supports_cms() {
|
||||||
|
// Don't automatically support subclasses of MemberAuthenticator
|
||||||
|
return get_called_class() === __CLASS__;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -134,7 +134,6 @@ JS;
|
|||||||
* Get message from session
|
* Get message from session
|
||||||
*/
|
*/
|
||||||
protected function getMessageFromSession() {
|
protected function getMessageFromSession() {
|
||||||
parent::getMessageFromSession();
|
|
||||||
|
|
||||||
$forceMessage = Session::get('MemberLoginForm.force_message');
|
$forceMessage = Session::get('MemberLoginForm.force_message');
|
||||||
if(($member = Member::currentUser()) && !$forceMessage) {
|
if(($member = Member::currentUser()) && !$forceMessage) {
|
||||||
@ -149,6 +148,8 @@ JS;
|
|||||||
if($forceMessage) {
|
if($forceMessage) {
|
||||||
Session::set('MemberLoginForm.force_message', false);
|
Session::set('MemberLoginForm.force_message', false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return parent::getMessageFromSession();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -204,7 +205,10 @@ JS;
|
|||||||
Session::set('BackURL', $backURL);
|
Session::set('BackURL', $backURL);
|
||||||
}
|
}
|
||||||
$cp = new ChangePasswordForm($this->controller, 'ChangePasswordForm');
|
$cp = new ChangePasswordForm($this->controller, 'ChangePasswordForm');
|
||||||
$cp->sessionMessage('Your password has expired. Please choose a new one.', 'good');
|
$cp->sessionMessage(
|
||||||
|
_t('Member.PASSWORDEXPIRED', 'Your password has expired. Please choose a new one.'),
|
||||||
|
'good'
|
||||||
|
);
|
||||||
return $this->controller->redirect('Security/changepassword');
|
return $this->controller->redirect('Security/changepassword');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -222,6 +222,10 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
if(!Member::currentUser()) {
|
if(!Member::currentUser()) {
|
||||||
$response->setBody(_t('ContentController.NOTLOGGEDIN','Not logged in'));
|
$response->setBody(_t('ContentController.NOTLOGGEDIN','Not logged in'));
|
||||||
$response->setStatusDescription(_t('ContentController.NOTLOGGEDIN','Not logged in'));
|
$response->setStatusDescription(_t('ContentController.NOTLOGGEDIN','Not logged in'));
|
||||||
|
// Tell the CMS to allow re-aunthentication
|
||||||
|
if(CMSSecurity::enabled()) {
|
||||||
|
$response->addHeader('X-Reauthenticate', '1');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return $response;
|
return $response;
|
||||||
} else {
|
} else {
|
||||||
@ -316,26 +320,33 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the login form to process according to the submitted data
|
* Get the selected authenticator for this request
|
||||||
|
*
|
||||||
|
* @return string Class name of Authenticator
|
||||||
*/
|
*/
|
||||||
public function LoginForm() {
|
protected function getAuthenticator() {
|
||||||
if(isset($this->requestParams['AuthenticationMethod'])) {
|
$authenticator = $this->request->requestVar('AuthenticationMethod');
|
||||||
$authenticator = trim($_REQUEST['AuthenticationMethod']);
|
if($authenticator) {
|
||||||
|
|
||||||
$authenticators = Authenticator::get_authenticators();
|
$authenticators = Authenticator::get_authenticators();
|
||||||
if(in_array($authenticator, $authenticators)) {
|
if(in_array($authenticator, $authenticators)) {
|
||||||
return call_user_func(array($authenticator, 'get_login_form'), $this);
|
return $authenticator;
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if($authenticator = Authenticator::get_default_authenticator()) {
|
|
||||||
return call_user_func(array($authenticator, 'get_login_form'), $this);
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
return Authenticator::get_default_authenticator();
|
||||||
}
|
}
|
||||||
|
|
||||||
user_error('Passed invalid authentication method', E_USER_ERROR);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the login form to process according to the submitted data
|
||||||
|
*
|
||||||
|
* @return Form
|
||||||
|
*/
|
||||||
|
public function LoginForm() {
|
||||||
|
$authenticator = $this->getAuthenticator();
|
||||||
|
if($authenticator) return $authenticator::get_login_form($this);
|
||||||
|
throw new Exception('Passed invalid authentication method');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the login forms for all available authentication methods
|
* Get the login forms for all available authentication methods
|
||||||
@ -345,15 +356,12 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
*
|
*
|
||||||
* @todo Check how to activate/deactivate authentication methods
|
* @todo Check how to activate/deactivate authentication methods
|
||||||
*/
|
*/
|
||||||
public function GetLoginForms()
|
public function GetLoginForms() {
|
||||||
{
|
|
||||||
$forms = array();
|
$forms = array();
|
||||||
|
|
||||||
$authenticators = Authenticator::get_authenticators();
|
$authenticators = Authenticator::get_authenticators();
|
||||||
foreach($authenticators as $authenticator) {
|
foreach($authenticators as $authenticator) {
|
||||||
array_push($forms,
|
$forms[] = $authenticator::get_login_form($this);
|
||||||
call_user_func(array($authenticator, 'get_login_form'),
|
|
||||||
$this));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $forms;
|
return $forms;
|
||||||
@ -367,7 +375,7 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
* @return string Returns the link to the given action
|
* @return string Returns the link to the given action
|
||||||
*/
|
*/
|
||||||
public function Link($action = null) {
|
public function Link($action = null) {
|
||||||
return "Security/$action";
|
return Controller::join_links(Director::baseURL(), "Security", $action);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -395,30 +403,37 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show the "login" page
|
* Perform pre-login checking and prepare a response if available prior to login
|
||||||
*
|
*
|
||||||
* For multiple authenticators, Security_MultiAuthenticatorLogin is used.
|
* @return SS_HTTPResponse Substitute response object if the login process should be curcumvented.
|
||||||
* See getTemplate and getIncludeTemplate for how to override template logic
|
* Returns null if should proceed as normal.
|
||||||
*
|
|
||||||
* @return string Returns the "login" page as HTML code.
|
|
||||||
*/
|
*/
|
||||||
public function login() {
|
protected function preLogin() {
|
||||||
// Event handler for pre-login, with an option to let it break you out of the login form
|
// Event handler for pre-login, with an option to let it break you out of the login form
|
||||||
$eventResults = $this->extend('onBeforeSecurityLogin');
|
$eventResults = $this->extend('onBeforeSecurityLogin');
|
||||||
// If there was a redirection, return
|
// If there was a redirection, return
|
||||||
if($this->redirectedTo()) return;
|
if($this->redirectedTo()) return $this->response;
|
||||||
// If there was an SS_HTTPResponse object returned, then return that
|
// If there was an SS_HTTPResponse object returned, then return that
|
||||||
else if($eventResults) {
|
if($eventResults) {
|
||||||
foreach($eventResults as $result) {
|
foreach($eventResults as $result) {
|
||||||
if($result instanceof SS_HTTPResponse) return $result;
|
if($result instanceof SS_HTTPResponse) return $result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(class_exists('SiteTree')) {
|
/**
|
||||||
|
* Prepare the controller for handling the response to this request
|
||||||
|
*
|
||||||
|
* @param string $title Title to use
|
||||||
|
* @return Controller
|
||||||
|
*/
|
||||||
|
protected function getResponseController($title) {
|
||||||
|
if(!class_exists('SiteTree')) return $this;
|
||||||
|
|
||||||
|
// Use sitetree pages to render the security page
|
||||||
$tmpPage = new Page();
|
$tmpPage = new Page();
|
||||||
$tmpPage->Title = _t('Security.LOGIN', 'Log in');
|
$tmpPage->Title = $title;
|
||||||
$tmpPage->URLSegment = "Security";
|
$tmpPage->URLSegment = "Security";
|
||||||
// Disable ID-based caching of the log-in page by making it a random number
|
// Disable ID-based caching of the log-in page by making it a random number
|
||||||
$tmpPage->ID = -1 * rand(1,10000000);
|
$tmpPage->ID = -1 * rand(1,10000000);
|
||||||
@ -426,45 +441,90 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
$controller = Page_Controller::create($tmpPage);
|
$controller = Page_Controller::create($tmpPage);
|
||||||
$controller->setDataModel($this->model);
|
$controller->setDataModel($this->model);
|
||||||
$controller->init();
|
$controller->init();
|
||||||
|
return $controller;
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
$controller = $this;
|
/**
|
||||||
|
* Determine the list of templates to use for rendering the given action
|
||||||
|
*
|
||||||
|
* @param string $action
|
||||||
|
* @return array Template list
|
||||||
|
*/
|
||||||
|
protected function getTemplatesFor($action) {
|
||||||
|
return array("Security_{$action}", 'Security', $this->stat('template_main'), 'BlankPage');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Combine the given forms into a formset with a tabbed interface
|
||||||
|
*
|
||||||
|
* @param array $forms List of LoginForm instances
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
protected function generateLoginFormSet($forms) {
|
||||||
|
$viewData = new ArrayData(array(
|
||||||
|
'Forms' => new ArrayList($forms),
|
||||||
|
));
|
||||||
|
return $viewData->renderWith(
|
||||||
|
$this->getIncludeTemplate('MultiAuthenticatorLogin')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the HTML Content for the $Content area during login
|
||||||
|
*
|
||||||
|
* @param string &$messageType Type of message, if available, passed back to caller
|
||||||
|
* @return string Message in HTML format
|
||||||
|
*/
|
||||||
|
protected function getLoginMessage(&$messageType = null) {
|
||||||
|
$message = Session::get('Security.Message.message');
|
||||||
|
$messageType = null;
|
||||||
|
if(empty($message)) return null;
|
||||||
|
|
||||||
|
$messageType = Session::get('Security.Message.type');
|
||||||
|
if($messageType === 'bad') {
|
||||||
|
return "<p class=\"message $messageType\">$message</p>";
|
||||||
|
} else {
|
||||||
|
return "<p>$message</p>";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show the "login" page
|
||||||
|
*
|
||||||
|
* For multiple authenticators, Security_MultiAuthenticatorLogin is used.
|
||||||
|
* See getTemplatesFor and getIncludeTemplate for how to override template logic
|
||||||
|
*
|
||||||
|
* @return string Returns the "login" page as HTML code.
|
||||||
|
*/
|
||||||
|
public function login() {
|
||||||
|
// Check pre-login process
|
||||||
|
if($response = $this->preLogin()) return $response;
|
||||||
|
|
||||||
|
// Get response handler
|
||||||
|
$controller = $this->getResponseController(_t('Security.LOGIN', 'Log in'));
|
||||||
|
|
||||||
// if the controller calls Director::redirect(), this will break early
|
// if the controller calls Director::redirect(), this will break early
|
||||||
if(($response = $controller->getResponse()) && $response->isFinished()) return $response;
|
if(($response = $controller->getResponse()) && $response->isFinished()) return $response;
|
||||||
|
|
||||||
$content = '';
|
|
||||||
$forms = $this->GetLoginForms();
|
$forms = $this->GetLoginForms();
|
||||||
$formCount = count($forms);
|
if(!count($forms)) {
|
||||||
|
|
||||||
if(!$formCount) {
|
|
||||||
user_error('No login-forms found, please use Authenticator::register_authenticator() to add one',
|
user_error('No login-forms found, please use Authenticator::register_authenticator() to add one',
|
||||||
E_USER_ERROR);
|
E_USER_ERROR);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle any for messages from validation, etc.
|
// Handle any form messages from validation, etc.
|
||||||
$message = Session::get('Security.Message.message');
|
|
||||||
$messageType = '';
|
$messageType = '';
|
||||||
if(!empty($message)) {
|
$message = $this->getLoginMessage($messageType);
|
||||||
$messageType = Session::get('Security.Message.type');
|
|
||||||
}
|
|
||||||
|
|
||||||
// We've displayed the message in the form output, so reset it for the next run.
|
// We've displayed the message in the form output, so reset it for the next run.
|
||||||
Session::clear('Security.Message');
|
Session::clear('Security.Message');
|
||||||
|
|
||||||
// If many login forms, display all to let user to choose.
|
// only display tabs when more than one authenticator is provided
|
||||||
if($formCount > 1) {
|
// to save bandwidth and reduce the amount of custom styling needed
|
||||||
$viewData = new ArrayData(array(
|
if(count($forms) > 1) {
|
||||||
'Forms' => new ArrayList($forms),
|
$content = $this->generateLoginFormSet($forms);
|
||||||
));
|
} else {
|
||||||
|
|
||||||
$content = $viewData->renderWith(
|
|
||||||
$this->getIncludeTemplate('MultiAuthenticatorLogin')
|
|
||||||
);
|
|
||||||
}
|
|
||||||
// Display the form
|
|
||||||
else {
|
|
||||||
$content = $forms[0]->forTemplate();
|
$content = $forms[0]->forTemplate();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -477,7 +537,7 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
|
|
||||||
// Return the customised controller
|
// Return the customised controller
|
||||||
return $customisedController->renderWith(
|
return $customisedController->renderWith(
|
||||||
$this->getTemplate('login')
|
$this->getTemplatesFor('login')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -492,17 +552,7 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
* @return string Returns the "lost password" page as HTML code.
|
* @return string Returns the "lost password" page as HTML code.
|
||||||
*/
|
*/
|
||||||
public function lostpassword() {
|
public function lostpassword() {
|
||||||
if(class_exists('SiteTree')) {
|
$controller = $this->getResponseController(_t('Security.LOSTPASSWORDHEADER', 'Lost Password'));
|
||||||
$tmpPage = new Page();
|
|
||||||
$tmpPage->Title = _t('Security.LOSTPASSWORDHEADER', 'Lost Password');
|
|
||||||
$tmpPage->URLSegment = 'Security';
|
|
||||||
// Disable ID-based caching of the log-in page by making it a random number
|
|
||||||
$tmpPage->ID = -1 * rand(1,10000000);
|
|
||||||
$controller = Page_Controller::create($tmpPage);
|
|
||||||
$controller->init();
|
|
||||||
} else {
|
|
||||||
$controller = $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// if the controller calls Director::redirect(), this will break early
|
// if the controller calls Director::redirect(), this will break early
|
||||||
if(($response = $controller->getResponse()) && $response->isFinished()) return $response;
|
if(($response = $controller->getResponse()) && $response->isFinished()) return $response;
|
||||||
@ -519,9 +569,7 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
));
|
));
|
||||||
|
|
||||||
//Controller::$currentController = $controller;
|
//Controller::$currentController = $controller;
|
||||||
return $customisedController->renderWith(
|
return $customisedController->renderWith($this->getTemplatesFor('lostpassword'));
|
||||||
$this->getTemplate('lostpassword')
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -555,17 +603,7 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
* @return string Returns the "password sent" page as HTML code.
|
* @return string Returns the "password sent" page as HTML code.
|
||||||
*/
|
*/
|
||||||
public function passwordsent($request) {
|
public function passwordsent($request) {
|
||||||
if(class_exists('SiteTree')) {
|
$controller = $this->getResponseController(_t('Security.LOSTPASSWORDHEADER', 'Lost Password'));
|
||||||
$tmpPage = new Page();
|
|
||||||
$tmpPage->Title = _t('Security.LOSTPASSWORDHEADER', 'Lost Password');
|
|
||||||
$tmpPage->URLSegment = 'Security';
|
|
||||||
// Disable ID-based caching of the log-in page by making it a random number
|
|
||||||
$tmpPage->ID = -1 * rand(1,10000000);
|
|
||||||
$controller = Page_Controller::create($tmpPage);
|
|
||||||
$controller->init();
|
|
||||||
} else {
|
|
||||||
$controller = $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// if the controller calls Director::redirect(), this will break early
|
// if the controller calls Director::redirect(), this will break early
|
||||||
if(($response = $controller->getResponse()) && $response->isFinished()) return $response;
|
if(($response = $controller->getResponse()) && $response->isFinished()) return $response;
|
||||||
@ -586,9 +624,7 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
));
|
));
|
||||||
|
|
||||||
//Controller::$currentController = $controller;
|
//Controller::$currentController = $controller;
|
||||||
return $customisedController->renderWith(
|
return $customisedController->renderWith($this->getTemplatesFor('passwordsent'));
|
||||||
$this->getTemplate('passwordsent')
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -622,17 +658,7 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
* @return string Returns the "change password" page as HTML code.
|
* @return string Returns the "change password" page as HTML code.
|
||||||
*/
|
*/
|
||||||
public function changepassword() {
|
public function changepassword() {
|
||||||
if(class_exists('SiteTree')) {
|
$controller = $this->getResponseController(_t('Security.CHANGEPASSWORDHEADER', 'Change your password'));
|
||||||
$tmpPage = new Page();
|
|
||||||
$tmpPage->Title = _t('Security.CHANGEPASSWORDHEADER', 'Change your password');
|
|
||||||
$tmpPage->URLSegment = 'Security';
|
|
||||||
// Disable ID-based caching of the log-in page by making it a random number
|
|
||||||
$tmpPage->ID = -1 * rand(1,10000000);
|
|
||||||
$controller = Page_Controller::create($tmpPage);
|
|
||||||
$controller->init();
|
|
||||||
} else {
|
|
||||||
$controller = $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// if the controller calls Director::redirect(), this will break early
|
// if the controller calls Director::redirect(), this will break early
|
||||||
if(($response = $controller->getResponse()) && $response->isFinished()) return $response;
|
if(($response = $controller->getResponse()) && $response->isFinished()) return $response;
|
||||||
@ -695,9 +721,7 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $customisedController->renderWith(
|
return $customisedController->renderWith($this->getTemplatesFor('changepassword'));
|
||||||
$this->getTemplate('changepassword')
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -709,21 +733,6 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
return Object::create('ChangePasswordForm', $this, 'ChangePasswordForm');
|
return Object::create('ChangePasswordForm', $this, 'ChangePasswordForm');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the template for a particular action for use in rendering
|
|
||||||
* For use in any subclass
|
|
||||||
*
|
|
||||||
* @return string|array Returns the template(s) for rendering
|
|
||||||
*/
|
|
||||||
public function getTemplate($action) {
|
|
||||||
return array(
|
|
||||||
'Security_' . $action,
|
|
||||||
'Security',
|
|
||||||
$this->stat('template_main'),
|
|
||||||
'BlankPage'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the template for an include used for security.
|
* Gets the template for an include used for security.
|
||||||
* For use in any subclass.
|
* For use in any subclass.
|
||||||
@ -731,7 +740,7 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
* @return string|array Returns the template(s) for rendering
|
* @return string|array Returns the template(s) for rendering
|
||||||
*/
|
*/
|
||||||
public function getIncludeTemplate($name) {
|
public function getIncludeTemplate($name) {
|
||||||
return 'Security_' . $name;
|
return array('Security_' . $name);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -781,9 +790,21 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
$member = Permission::get_members_by_permission('ADMIN')->First();
|
$member = Permission::get_members_by_permission('ADMIN')->First();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!$member) {
|
||||||
|
$member = Member::default_admin();
|
||||||
|
}
|
||||||
|
|
||||||
return $member;
|
return $member;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Flush the default admin credentials
|
||||||
|
*/
|
||||||
|
public static function clear_default_admin() {
|
||||||
|
self::$default_username = null;
|
||||||
|
self::$default_password = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set a default admin in dev-mode
|
* Set a default admin in dev-mode
|
||||||
@ -829,6 +850,24 @@ class Security extends Controller implements TemplateGlobalProvider {
|
|||||||
return !empty(self::$default_username) && !empty(self::$default_password);
|
return !empty(self::$default_username) && !empty(self::$default_password);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get default admin username
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public static function default_admin_username() {
|
||||||
|
return self::$default_username;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get default admin password
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public static function default_admin_password() {
|
||||||
|
return self::$default_password;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set strict path checking
|
* Set strict path checking
|
||||||
*
|
*
|
||||||
|
|||||||
@ -1,12 +1,13 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td class="bottom-all" colspan="$Colspan">
|
<td class="bottom-all" colspan="$Colspan">
|
||||||
|
<% if $ShowRecordCount %>
|
||||||
<span class="pagination-records-number">
|
<span class="pagination-records-number">
|
||||||
$FirstShownRecord -
|
$FirstShownRecord -
|
||||||
$LastShownRecord
|
$LastShownRecord
|
||||||
<% _t('TableListField_PageControls_ss.OF', 'of', 'Example: View 1 of 2') %>
|
<% _t('TableListField_PageControls_ss.OF', 'of', 'Example: View 1 of 2') %>
|
||||||
$NumRecords
|
$NumRecords
|
||||||
</span>
|
</span>
|
||||||
|
<% end_if %>
|
||||||
<% if $Message %>
|
<% if $Message %>
|
||||||
<div class="datagrid-footer-message">$Message</div>
|
<div class="datagrid-footer-message">$Message</div>
|
||||||
<% end_if %>
|
<% end_if %>
|
||||||
|
|||||||
@ -16,7 +16,6 @@ class RSSFeedTest extends SapphireTest {
|
|||||||
$rssFeed = new RSSFeed($list, "http://www.example.com", "Test RSS Feed", "Test RSS Feed Description");
|
$rssFeed = new RSSFeed($list, "http://www.example.com", "Test RSS Feed", "Test RSS Feed Description");
|
||||||
$content = $rssFeed->outputToBrowser();
|
$content = $rssFeed->outputToBrowser();
|
||||||
|
|
||||||
//Debug::message($content);
|
|
||||||
$this->assertContains('<link>http://www.example.org/item-a/</link>', $content);
|
$this->assertContains('<link>http://www.example.org/item-a/</link>', $content);
|
||||||
$this->assertContains('<link>http://www.example.com/item-b.html</link>', $content);
|
$this->assertContains('<link>http://www.example.com/item-b.html</link>', $content);
|
||||||
$this->assertContains('<link>http://www.example.com/item-c.html</link>', $content);
|
$this->assertContains('<link>http://www.example.com/item-c.html</link>', $content);
|
||||||
@ -44,6 +43,23 @@ class RSSFeedTest extends SapphireTest {
|
|||||||
$this->assertContains('<description>ItemC AltContent</description>', $content);
|
$this->assertContains('<description>ItemC AltContent</description>', $content);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testRSSFeedWithShortcode() {
|
||||||
|
$list = new ArrayList();
|
||||||
|
$list->push(new RSSFeedTest_ItemD());
|
||||||
|
|
||||||
|
$rssFeed = new RSSFeed($list, "http://www.example.com", "Test RSS Feed", "Test RSS Feed Description");
|
||||||
|
$content = $rssFeed->outputToBrowser();
|
||||||
|
|
||||||
|
$this->assertContains('<link>http://www.example.org/item-d.html</link>', $content);
|
||||||
|
|
||||||
|
$this->assertContains('<title>ItemD</title>', $content);
|
||||||
|
|
||||||
|
$this->assertContains(
|
||||||
|
'<description><p>ItemD Content test shortcode output</p></description>',
|
||||||
|
$content
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
public function testRenderWithTemplate() {
|
public function testRenderWithTemplate() {
|
||||||
$rssFeed = new RSSFeed(new ArrayList(), "", "", "");
|
$rssFeed = new RSSFeed(new ArrayList(), "", "", "");
|
||||||
$rssFeed->setTemplate('RSSFeedTest');
|
$rssFeed->setTemplate('RSSFeedTest');
|
||||||
@ -61,6 +77,10 @@ class RSSFeedTest extends SapphireTest {
|
|||||||
Config::inst()->update('Director', 'alternate_base_url', '/');
|
Config::inst()->update('Director', 'alternate_base_url', '/');
|
||||||
if(!self::$original_host) self::$original_host = $_SERVER['HTTP_HOST'];
|
if(!self::$original_host) self::$original_host = $_SERVER['HTTP_HOST'];
|
||||||
$_SERVER['HTTP_HOST'] = 'www.example.org';
|
$_SERVER['HTTP_HOST'] = 'www.example.org';
|
||||||
|
|
||||||
|
ShortcodeParser::get('default')->register('test_shortcode', function() {
|
||||||
|
return 'test shortcode output';
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tearDown() {
|
public function tearDown() {
|
||||||
@ -134,3 +154,22 @@ class RSSFeedTest_ItemC extends ViewableData {
|
|||||||
return "http://www.example.com/item-c.html";
|
return "http://www.example.com/item-c.html";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class RSSFeedTest_ItemD extends ViewableData {
|
||||||
|
// ItemD test fields - all fields use casting but Content & AltContent cast as HTMLText
|
||||||
|
private static $casting = array(
|
||||||
|
'Title' => 'Varchar',
|
||||||
|
'Content' => 'HTMLText'
|
||||||
|
);
|
||||||
|
|
||||||
|
public $Title = 'ItemD';
|
||||||
|
public $Content = '<p>ItemD Content [test_shortcode]</p>';
|
||||||
|
|
||||||
|
public function Link() {
|
||||||
|
return 'item-d.html';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function AbsoluteLink() {
|
||||||
|
return 'http://www.example.org/item-d.html';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -9,7 +9,8 @@ use Behat\Behat\Context\ClosuredContextInterface,
|
|||||||
Behat\Behat\Exception\PendingException,
|
Behat\Behat\Exception\PendingException,
|
||||||
Behat\Mink\Exception\ElementHtmlException,
|
Behat\Mink\Exception\ElementHtmlException,
|
||||||
Behat\Gherkin\Node\PyStringNode,
|
Behat\Gherkin\Node\PyStringNode,
|
||||||
Behat\Gherkin\Node\TableNode;
|
Behat\Gherkin\Node\TableNode,
|
||||||
|
Behat\MinkExtension\Context\MinkContext as MinkContext;
|
||||||
|
|
||||||
use Symfony\Component\DomCrawler\Crawler;
|
use Symfony\Component\DomCrawler\Crawler;
|
||||||
|
|
||||||
@ -43,6 +44,17 @@ class CmsFormsContext extends BehatContext {
|
|||||||
return $this->getMainContext()->getSession($name);
|
return $this->getMainContext()->getSession($name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns fixed step argument (with \\" replaced back to ").
|
||||||
|
* Copied from {@see MinkContext}
|
||||||
|
*
|
||||||
|
* @param string $argument
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
protected function fixStepArgument($argument) {
|
||||||
|
return str_replace('\\"', '"', $argument);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Then /^I should( not? |\s*)see an edit page form$/
|
* @Then /^I should( not? |\s*)see an edit page form$/
|
||||||
*/
|
*/
|
||||||
@ -58,10 +70,13 @@ class CmsFormsContext extends BehatContext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @When /^I fill in the "(?P<field>([^"]*))" HTML field with "(?P<value>([^"]*))"$/
|
* @When /^I fill in the "(?P<field>(?:[^"]|\\")*)" HTML field with "(?P<value>(?:[^"]|\\")*)"$/
|
||||||
* @When /^I fill in "(?P<value>([^"]*))" for the "(?P<field>([^"]*))" HTML field$/
|
* @When /^I fill in "(?P<value>(?:[^"]|\\")*)" for the "(?P<field>(?:[^"]|\\")*)" HTML field$/
|
||||||
*/
|
*/
|
||||||
public function stepIFillInTheHtmlFieldWith($field, $value) {
|
public function stepIFillInTheHtmlFieldWith($field, $value) {
|
||||||
|
$field = $this->fixStepArgument($field);
|
||||||
|
$value = $this->fixStepArgument($value);
|
||||||
|
|
||||||
$page = $this->getSession()->getPage();
|
$page = $this->getSession()->getPage();
|
||||||
$inputField = $page->findField($field);
|
$inputField = $page->findField($field);
|
||||||
assertNotNull($inputField, sprintf('HTML field "%s" not found', $field));
|
assertNotNull($inputField, sprintf('HTML field "%s" not found', $field));
|
||||||
@ -74,9 +89,12 @@ class CmsFormsContext extends BehatContext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @When /^I append "(?P<value>([^"]*))" to the "(?P<field>([^"]*))" HTML field$/
|
* @When /^I append "(?P<value>(?:[^"]|\\")*)" to the "(?P<field>(?:[^"]|\\")*)" HTML field$/
|
||||||
*/
|
*/
|
||||||
public function stepIAppendTotheHtmlField($field, $value) {
|
public function stepIAppendTotheHtmlField($field, $value) {
|
||||||
|
$field = $this->fixStepArgument($field);
|
||||||
|
$value = $this->fixStepArgument($value);
|
||||||
|
|
||||||
$page = $this->getSession()->getPage();
|
$page = $this->getSession()->getPage();
|
||||||
$inputField = $page->findField($field);
|
$inputField = $page->findField($field);
|
||||||
assertNotNull($inputField, sprintf('HTML field "%s" not found', $field));
|
assertNotNull($inputField, sprintf('HTML field "%s" not found', $field));
|
||||||
@ -89,9 +107,10 @@ class CmsFormsContext extends BehatContext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Then /^the "(?P<locator>([^"]*))" HTML field should(?P<negative> not? |\s*)contain "(?P<html>.*)"$/
|
* @Then /^the "(?P<locator>(?:[^"]|\\")*)" HTML field should(?P<negative> not? |\s*)contain "(?P<html>.*)"$/
|
||||||
*/
|
*/
|
||||||
public function theHtmlFieldShouldContain($locator, $negative, $html) {
|
public function theHtmlFieldShouldContain($locator, $negative, $html) {
|
||||||
|
$locator = $this->fixStepArgument($locator);
|
||||||
$page = $this->getSession()->getPage();
|
$page = $this->getSession()->getPage();
|
||||||
$element = $page->findField($locator);
|
$element = $page->findField($locator);
|
||||||
assertNotNull($element, sprintf('HTML field "%s" not found', $locator));
|
assertNotNull($element, sprintf('HTML field "%s" not found', $locator));
|
||||||
@ -132,9 +151,10 @@ class CmsFormsContext extends BehatContext {
|
|||||||
*
|
*
|
||||||
* @todo Use an actual DOM parser for more accurate assertions
|
* @todo Use an actual DOM parser for more accurate assertions
|
||||||
*
|
*
|
||||||
* @Given /^"(?P<text>([^"]*))" in the "(?P<field>([^"]*))" HTML field should(?P<negate>(?: not)?) be (?P<formatting>(.*))$/
|
* @Given /^"(?P<text>([^"]*))" in the "(?P<field>(?:[^"]|\\")*)" HTML field should(?P<negate>(?: not)?) be (?P<formatting>(.*))$/
|
||||||
*/
|
*/
|
||||||
public function stepContentInHtmlFieldShouldHaveFormatting($text, $field, $negate, $formatting) {
|
public function stepContentInHtmlFieldShouldHaveFormatting($text, $field, $negate, $formatting) {
|
||||||
|
$field = $this->fixStepArgument($field);
|
||||||
$page = $this->getSession()->getPage();
|
$page = $this->getSession()->getPage();
|
||||||
$inputField = $page->findField($field);
|
$inputField = $page->findField($field);
|
||||||
assertNotNull($inputField, sprintf('HTML field "%s" not found', $field));
|
assertNotNull($inputField, sprintf('HTML field "%s" not found', $field));
|
||||||
@ -169,9 +189,10 @@ class CmsFormsContext extends BehatContext {
|
|||||||
* Selects the first textual match in the HTML editor. Does not support
|
* Selects the first textual match in the HTML editor. Does not support
|
||||||
* selection across DOM node boundaries.
|
* selection across DOM node boundaries.
|
||||||
*
|
*
|
||||||
* @When /^I select "(?P<text>([^"]*))" in the "(?P<field>([^"]*))" HTML field$/
|
* @When /^I select "(?P<text>([^"]*))" in the "(?P<field>(?:[^"]|\\")*)" HTML field$/
|
||||||
*/
|
*/
|
||||||
public function stepIHighlightTextInHtmlField($text, $field) {
|
public function stepIHighlightTextInHtmlField($text, $field) {
|
||||||
|
$field = $this->fixStepArgument($field);
|
||||||
$page = $this->getSession()->getPage();
|
$page = $this->getSession()->getPage();
|
||||||
$inputField = $page->findField($field);
|
$inputField = $page->findField($field);
|
||||||
assertNotNull($inputField, sprintf('HTML field "%s" not found', $field));
|
assertNotNull($inputField, sprintf('HTML field "%s" not found', $field));
|
||||||
|
|||||||
@ -66,10 +66,3 @@ SapphireTest::set_is_running_test(true);
|
|||||||
// Remove the error handler so that PHPUnit can add its own
|
// Remove the error handler so that PHPUnit can add its own
|
||||||
restore_error_handler();
|
restore_error_handler();
|
||||||
|
|
||||||
if(!isset($_GET['flush']) || !$_GET['flush']) {
|
|
||||||
Debug::message(
|
|
||||||
"WARNING: Manifest not flushed. " .
|
|
||||||
"Add flush=1 as an argument to discover new classes or files.\n",
|
|
||||||
false
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|||||||
26
tests/control/FlushRequestFilterTest.php
Normal file
26
tests/control/FlushRequestFilterTest.php
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
class FlushRequestFilterTest extends FunctionalTest {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Assert that classes that implement flushable are called
|
||||||
|
*/
|
||||||
|
public function testImplementorsAreCalled() {
|
||||||
|
$this->assertFalse(FlushRequestFilterTest_Flushable::$flushed);
|
||||||
|
|
||||||
|
$this->get('?flush=1');
|
||||||
|
|
||||||
|
$this->assertTrue(FlushRequestFilterTest_Flushable::$flushed);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
class FlushRequestFilterTest_Flushable implements Flushable, TestOnly {
|
||||||
|
|
||||||
|
public static $flushed = false;
|
||||||
|
|
||||||
|
public static function flush() {
|
||||||
|
self::$flushed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -5,7 +5,7 @@
|
|||||||
* @package framework
|
* @package framework
|
||||||
* @subpackage tests
|
* @subpackage tests
|
||||||
*/
|
*/
|
||||||
class HTTPTest extends SapphireTest {
|
class HTTPTest extends FunctionalTest {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tests {@link HTTP::getLinksIn()}
|
* Tests {@link HTTP::getLinksIn()}
|
||||||
@ -228,15 +228,4 @@ class HTTPTest extends SapphireTest {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Run a test while mocking the base url with the provided value
|
|
||||||
* @param string $url The base URL to use for this test
|
|
||||||
* @param callable $callback The test to run
|
|
||||||
*/
|
|
||||||
protected function withBaseURL($url, $callback) {
|
|
||||||
$oldBase = Config::inst()->get('Director', 'alternate_base_url');
|
|
||||||
Config::inst()->update('Director', 'alternate_base_url', $url);
|
|
||||||
$callback($this);
|
|
||||||
Config::inst()->update('Director', 'alternate_base_url', $oldBase);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -87,10 +87,24 @@ class RequestHandlingTest extends FunctionalTest {
|
|||||||
$this->assertEquals("MyField requested", $response->getBody());
|
$this->assertEquals("MyField requested", $response->getBody());
|
||||||
|
|
||||||
/* We can also make a POST request on a form field, which could be used for in-place editing, for example. */
|
/* We can also make a POST request on a form field, which could be used for in-place editing, for example. */
|
||||||
$response = Director::test("testGoodBase1/TestForm/fields/MyField" ,array("MyField" => 5));
|
$response = Director::test("testGoodBase1/TestForm/fields/MyField", array("MyField" => 5));
|
||||||
$this->assertEquals("MyField posted, update to 5", $response->getBody());
|
$this->assertEquals("MyField posted, update to 5", $response->getBody());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testBaseUrlPrefixed() {
|
||||||
|
$this->withBaseFolder('/silverstripe', function($test) {
|
||||||
|
$test->assertEquals(
|
||||||
|
'MyField requested',
|
||||||
|
Director::test('/silverstripe/testGoodBase1/TestForm/fields/MyField')->getBody()
|
||||||
|
);
|
||||||
|
|
||||||
|
$test->assertEquals(
|
||||||
|
'MyField posted, update to 5',
|
||||||
|
Director::test('/silverstripe/testGoodBase1/TestForm/fields/MyField', array('MyField' => 5))->getBody()
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
public function testBadBase() {
|
public function testBadBase() {
|
||||||
/* We no longer support using hacky attempting to handle URL parsing with broken rules */
|
/* We no longer support using hacky attempting to handle URL parsing with broken rules */
|
||||||
$response = Director::test("testBadBase/method/1/2");
|
$response = Director::test("testBadBase/method/1/2");
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @package framework
|
* @package framework
|
||||||
* @subpackage tests
|
* @subpackage tests
|
||||||
@ -78,38 +79,136 @@ class ClassInfoTest extends SapphireTest {
|
|||||||
public function testDataClassesFor() {
|
public function testDataClassesFor() {
|
||||||
$expect = array(
|
$expect = array(
|
||||||
'ClassInfoTest_BaseDataClass' => 'ClassInfoTest_BaseDataClass',
|
'ClassInfoTest_BaseDataClass' => 'ClassInfoTest_BaseDataClass',
|
||||||
'ClassInfoTest_HasFields' => 'ClassInfoTest_HasFields'
|
'ClassInfoTest_HasFields' => 'ClassInfoTest_HasFields',
|
||||||
|
'ClassInfoTest_WithRelation' => 'ClassInfoTest_WithRelation'
|
||||||
);
|
);
|
||||||
|
|
||||||
$classes = array(
|
$classes = array(
|
||||||
'ClassInfoTest_BaseDataClass',
|
'ClassInfoTest_BaseDataClass',
|
||||||
'ClassInfoTest_NoFields',
|
'ClassInfoTest_NoFields',
|
||||||
'ClassInfoTest_HasFields'
|
'ClassInfoTest_HasFields',
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach ($classes as $class) {
|
|
||||||
$this->assertEquals($expect, ClassInfo::dataClassesFor($class));
|
$this->assertEquals($expect, ClassInfo::dataClassesFor($classes[0]));
|
||||||
}
|
$this->assertEquals($expect, ClassInfo::dataClassesFor($classes[1]));
|
||||||
|
|
||||||
|
$expect = array(
|
||||||
|
'ClassInfoTest_BaseDataClass' => 'ClassInfoTest_BaseDataClass',
|
||||||
|
'ClassInfoTest_HasFields' => 'ClassInfoTest_HasFields',
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertEquals($expect, ClassInfo::dataClassesFor($classes[2]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testTableForObjectField() {
|
||||||
|
$this->assertEquals('ClassInfoTest_WithRelation',
|
||||||
|
ClassInfo::table_for_object_field('ClassInfoTest_WithRelation', 'RelationID')
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertEquals('ClassInfoTest_BaseDataClass',
|
||||||
|
ClassInfo::table_for_object_field('ClassInfoTest_BaseDataClass', 'Title')
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertEquals('ClassInfoTest_BaseDataClass',
|
||||||
|
ClassInfo::table_for_object_field('ClassInfoTest_HasFields', 'Title')
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertEquals('ClassInfoTest_BaseDataClass',
|
||||||
|
ClassInfo::table_for_object_field('ClassInfoTest_NoFields', 'Title')
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertEquals('ClassInfoTest_HasFields',
|
||||||
|
ClassInfo::table_for_object_field('ClassInfoTest_HasFields', 'Description')
|
||||||
|
);
|
||||||
|
|
||||||
|
// existing behaviour fallback to DataObject? Should be null.
|
||||||
|
$this->assertEquals('DataObject',
|
||||||
|
ClassInfo::table_for_object_field('ClassInfoTest_BaseClass', 'Nonexist')
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertNull(
|
||||||
|
ClassInfo::table_for_object_field('SomeFakeClassHere', 'Title')
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertNull(
|
||||||
|
ClassInfo::table_for_object_field('Object', 'Title')
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertNull(
|
||||||
|
ClassInfo::table_for_object_field(null, null)
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @package framework
|
||||||
|
* @subpackage tests
|
||||||
|
*/
|
||||||
|
|
||||||
class ClassInfoTest_BaseClass extends DataObject {
|
class ClassInfoTest_BaseClass extends DataObject {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @package framework
|
||||||
|
* @subpackage tests
|
||||||
|
*/
|
||||||
|
|
||||||
class ClassInfoTest_ChildClass extends ClassInfoTest_BaseClass {
|
class ClassInfoTest_ChildClass extends ClassInfoTest_BaseClass {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @package framework
|
||||||
|
* @subpackage tests
|
||||||
|
*/
|
||||||
|
|
||||||
class ClassInfoTest_GrandChildClass extends ClassInfoTest_ChildClass {
|
class ClassInfoTest_GrandChildClass extends ClassInfoTest_ChildClass {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @package framework
|
||||||
|
* @subpackage tests
|
||||||
|
*/
|
||||||
|
|
||||||
class ClassInfoTest_BaseDataClass extends DataObject {
|
class ClassInfoTest_BaseDataClass extends DataObject {
|
||||||
private static $db = array('Title' => 'Varchar');
|
|
||||||
|
private static $db = array(
|
||||||
|
'Title' => 'Varchar'
|
||||||
|
);
|
||||||
}
|
}
|
||||||
class ClassInfoTest_NoFields extends ClassInfoTest_BaseDataClass {}
|
|
||||||
|
/**
|
||||||
|
* @package framework
|
||||||
|
* @subpackage tests
|
||||||
|
*/
|
||||||
|
|
||||||
|
class ClassInfoTest_NoFields extends ClassInfoTest_BaseDataClass {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @package framework
|
||||||
|
* @subpackage tests
|
||||||
|
*/
|
||||||
|
|
||||||
class ClassInfoTest_HasFields extends ClassInfoTest_NoFields {
|
class ClassInfoTest_HasFields extends ClassInfoTest_NoFields {
|
||||||
private static $db = array('Description' => 'Varchar');
|
|
||||||
|
private static $db = array(
|
||||||
|
'Description' => 'Varchar'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @package framework
|
||||||
|
* @subpackage tests
|
||||||
|
*/
|
||||||
|
|
||||||
|
class ClassInfoTest_WithRelation extends ClassInfoTest_NoFields {
|
||||||
|
|
||||||
|
private static $has_one = array(
|
||||||
|
'Relation' => 'ClassInfoTest_HasFields'
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -243,6 +243,25 @@ class ObjectTest extends SapphireTest {
|
|||||||
ObjectTest_ExtensionTest::has_extension('ObjectTest_ExtendTest3'),
|
ObjectTest_ExtensionTest::has_extension('ObjectTest_ExtendTest3'),
|
||||||
"Extensions are detected with static has_extension() when added through add_extension()"
|
"Extensions are detected with static has_extension() when added through add_extension()"
|
||||||
);
|
);
|
||||||
|
// ObjectTest_ExtendTest4 is added manually
|
||||||
|
ObjectTest_ExtensionTest3::add_extension('ObjectTest_ExtendTest4("Param")');
|
||||||
|
// test against ObjectTest_ExtendTest3, not ObjectTest_ExtendTest3
|
||||||
|
$this->assertTrue(
|
||||||
|
ObjectTest_ExtensionTest3::has_extension('ObjectTest_ExtendTest4'),
|
||||||
|
"Extensions are detected with static has_extension() when added through add_extension()"
|
||||||
|
);
|
||||||
|
// test against ObjectTest_ExtendTest3, not ObjectTest_ExtendTest4 to test if it picks up
|
||||||
|
// the sub classes of ObjectTest_ExtendTest3
|
||||||
|
$this->assertTrue(
|
||||||
|
ObjectTest_ExtensionTest3::has_extension('ObjectTest_ExtendTest3'),
|
||||||
|
"Sub-Extensions are detected with static has_extension() when added through add_extension()"
|
||||||
|
);
|
||||||
|
// strictly test against ObjectTest_ExtendTest3, not ObjectTest_ExtendTest4 to test if it picks up
|
||||||
|
// the sub classes of ObjectTest_ExtendTest3
|
||||||
|
$this->assertFalse(
|
||||||
|
ObjectTest_ExtensionTest3::has_extension('ObjectTest_ExtendTest3', null, true),
|
||||||
|
"Sub-Extensions are detected with static has_extension() when added through add_extension()"
|
||||||
|
);
|
||||||
// a singleton() wouldn't work as its already initialized
|
// a singleton() wouldn't work as its already initialized
|
||||||
$objectTest_ExtensionTest = new ObjectTest_ExtensionTest();
|
$objectTest_ExtensionTest = new ObjectTest_ExtensionTest();
|
||||||
$this->assertTrue(
|
$this->assertTrue(
|
||||||
@ -528,6 +547,10 @@ class ObjectTest_ExtensionTest2 extends Object {
|
|||||||
private static $extensions = array('ObjectTest_Extension');
|
private static $extensions = array('ObjectTest_Extension');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class ObjectTest_ExtensionTest3 extends Object {
|
||||||
|
}
|
||||||
|
|
||||||
class ObjectTest_ExtensionRemoveTest extends Object {
|
class ObjectTest_ExtensionRemoveTest extends Object {
|
||||||
|
|
||||||
private static $extensions = array (
|
private static $extensions = array (
|
||||||
@ -573,4 +596,8 @@ class ObjectTest_ExtendTest3 extends Extension {
|
|||||||
public function extendableMethod($argument = null) { return "ExtendTest3($argument)"; }
|
public function extendableMethod($argument = null) { return "ExtendTest3($argument)"; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class ObjectTest_ExtendTest4 extends ObjectTest_ExtendTest3 {
|
||||||
|
public function extendableMethod($argument = null) { return "ExtendTest4($argument)"; }
|
||||||
|
}
|
||||||
|
|
||||||
/**#@-*/
|
/**#@-*/
|
||||||
|
|||||||
116
tests/dev/DevAdminControllerTest.php
Normal file
116
tests/dev/DevAdminControllerTest.php
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Note: the running of this test is handled by the thing it's testing (DevelopmentAdmin controller).
|
||||||
|
*
|
||||||
|
* @package framework
|
||||||
|
* @package tests
|
||||||
|
*/
|
||||||
|
class DevAdminControllerTest extends FunctionalTest {
|
||||||
|
|
||||||
|
public function setUp(){
|
||||||
|
parent::setUp();
|
||||||
|
|
||||||
|
Config::nest()->update('DevelopmentAdmin', 'registered_controllers', array(
|
||||||
|
'x1' => array(
|
||||||
|
'controller' => 'DevAdminControllerTest_Controller1',
|
||||||
|
'links' => array(
|
||||||
|
'x1' => 'x1 link description',
|
||||||
|
'x1/y1' => 'x1/y1 link description'
|
||||||
|
)
|
||||||
|
),
|
||||||
|
'x2' => array(
|
||||||
|
'controller' => 'DevAdminControllerTest_Controller2', // intentionally not a class that exists
|
||||||
|
'links' => array(
|
||||||
|
'x2' => 'x2 link description'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tearDown(){
|
||||||
|
parent::tearDown();
|
||||||
|
Config::unnest();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public function testGoodRegisteredControllerOutput(){
|
||||||
|
// Check for the controller running from the registered url above
|
||||||
|
// (we use contains rather than equals because sometimes you get Warning: You probably want to define an entry in $_FILE_TO_URL_MAPPING)
|
||||||
|
$this->assertContains(DevAdminControllerTest_Controller1::OK_MSG, $this->getCapture('/dev/x1'));
|
||||||
|
$this->assertContains(DevAdminControllerTest_Controller1::OK_MSG, $this->getCapture('/dev/x1/y1'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGoodRegisteredControllerStatus(){
|
||||||
|
// Check response code is 200/OK
|
||||||
|
$this->assertEquals(false, $this->getAndCheckForError('/dev/x1'));
|
||||||
|
$this->assertEquals(false, $this->getAndCheckForError('/dev/x1/y1'));
|
||||||
|
|
||||||
|
// Check response code is 500/ some sort of error
|
||||||
|
$this->assertEquals(true, $this->getAndCheckForError('/dev/x2'));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
protected function getCapture($url){
|
||||||
|
$this->logInWithPermission('ADMIN');
|
||||||
|
|
||||||
|
ob_start();
|
||||||
|
$this->get($url);
|
||||||
|
$r = ob_get_contents();
|
||||||
|
ob_end_clean();
|
||||||
|
|
||||||
|
return $r;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getAndCheckForError($url){
|
||||||
|
$this->logInWithPermission('ADMIN');
|
||||||
|
|
||||||
|
if(Director::is_cli()){
|
||||||
|
// when in CLI the admin controller throws exceptions
|
||||||
|
ob_start();
|
||||||
|
try{
|
||||||
|
$this->get($url);
|
||||||
|
}catch(Exception $e){
|
||||||
|
ob_end_clean();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
ob_end_clean();
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}else{
|
||||||
|
// when in http the admin controller sets a response header
|
||||||
|
ob_start();
|
||||||
|
$resp = $this->get($url);
|
||||||
|
ob_end_clean();
|
||||||
|
return $resp->isError();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
class DevAdminControllerTest_Controller1 extends Controller {
|
||||||
|
|
||||||
|
const OK_MSG = 'DevAdminControllerTest_Controller1 TEST OK';
|
||||||
|
|
||||||
|
private static $url_handlers = array(
|
||||||
|
'' => 'index',
|
||||||
|
'y1' => 'y1Action'
|
||||||
|
);
|
||||||
|
|
||||||
|
private static $allowed_actions = array(
|
||||||
|
'index',
|
||||||
|
'y1Action',
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
public function index(){
|
||||||
|
echo self::OK_MSG;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function y1Action(){
|
||||||
|
echo self::OK_MSG;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -258,6 +258,10 @@ class UploadTest extends SapphireTest {
|
|||||||
$file->Name,
|
$file->Name,
|
||||||
'File has a name without a number because it\'s not a duplicate'
|
'File has a name without a number because it\'s not a duplicate'
|
||||||
);
|
);
|
||||||
|
$this->assertFileExists(
|
||||||
|
BASE_PATH . '/' . $file->getRelativePath(),
|
||||||
|
'File exists'
|
||||||
|
);
|
||||||
|
|
||||||
$u = new Upload();
|
$u = new Upload();
|
||||||
$u->load($tmpFile);
|
$u->load($tmpFile);
|
||||||
@ -267,9 +271,37 @@ class UploadTest extends SapphireTest {
|
|||||||
$file2->Name,
|
$file2->Name,
|
||||||
'File receives a number attached to the end before the extension'
|
'File receives a number attached to the end before the extension'
|
||||||
);
|
);
|
||||||
|
$this->assertFileExists(
|
||||||
|
BASE_PATH . '/' . $file2->getRelativePath(),
|
||||||
|
'File exists'
|
||||||
|
);
|
||||||
|
$this->assertGreaterThan(
|
||||||
|
$file->ID,
|
||||||
|
$file2->ID,
|
||||||
|
'File database record is not the same'
|
||||||
|
);
|
||||||
|
|
||||||
|
$u = new Upload();
|
||||||
|
$u->load($tmpFile);
|
||||||
|
$file3 = $u->getFile();
|
||||||
|
$this->assertEquals(
|
||||||
|
'UploadTest-testUpload3.tar.gz',
|
||||||
|
$file3->Name,
|
||||||
|
'File receives a number attached to the end before the extension'
|
||||||
|
);
|
||||||
|
$this->assertFileExists(
|
||||||
|
BASE_PATH . '/' . $file3->getRelativePath(),
|
||||||
|
'File exists'
|
||||||
|
);
|
||||||
|
$this->assertGreaterThan(
|
||||||
|
$file2->ID,
|
||||||
|
$file3->ID,
|
||||||
|
'File database record is not the same'
|
||||||
|
);
|
||||||
|
|
||||||
$file->delete();
|
$file->delete();
|
||||||
$file2->delete();
|
$file2->delete();
|
||||||
|
$file3->delete();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testUploadFileWithNoExtensionTwiceAppendsNumber() {
|
public function testUploadFileWithNoExtensionTwiceAppendsNumber() {
|
||||||
@ -307,16 +339,29 @@ class UploadTest extends SapphireTest {
|
|||||||
$file->Name,
|
$file->Name,
|
||||||
'File is uploaded without extension'
|
'File is uploaded without extension'
|
||||||
);
|
);
|
||||||
|
$this->assertFileExists(
|
||||||
|
BASE_PATH . '/' . $file->getRelativePath(),
|
||||||
|
'File exists'
|
||||||
|
);
|
||||||
|
|
||||||
$u = new Upload();
|
$u = new Upload();
|
||||||
$u->setValidator($v);
|
$u->setValidator($v);
|
||||||
$u->load($tmpFile);
|
$u->load($tmpFile);
|
||||||
$file2 = $u->getFile();
|
$file2 = $u->getFile();
|
||||||
$this->assertEquals(
|
$this->assertEquals(
|
||||||
'UploadTest-testUpload-2',
|
'UploadTest-testUpload2',
|
||||||
$file2->Name,
|
$file2->Name,
|
||||||
'File receives a number attached to the end'
|
'File receives a number attached to the end'
|
||||||
);
|
);
|
||||||
|
$this->assertFileExists(
|
||||||
|
BASE_PATH . '/' . $file2->getRelativePath(),
|
||||||
|
'File exists'
|
||||||
|
);
|
||||||
|
$this->assertGreaterThan(
|
||||||
|
$file->ID,
|
||||||
|
$file2->ID,
|
||||||
|
'File database record is not the same'
|
||||||
|
);
|
||||||
|
|
||||||
$file->delete();
|
$file->delete();
|
||||||
$file2->delete();
|
$file2->delete();
|
||||||
@ -357,6 +402,10 @@ class UploadTest extends SapphireTest {
|
|||||||
$file->Name,
|
$file->Name,
|
||||||
'File is uploaded without extension'
|
'File is uploaded without extension'
|
||||||
);
|
);
|
||||||
|
$this->assertFileExists(
|
||||||
|
BASE_PATH . '/' . $file->getRelativePath(),
|
||||||
|
'File exists'
|
||||||
|
);
|
||||||
|
|
||||||
$u = new Upload();
|
$u = new Upload();
|
||||||
$u->setValidator($v);
|
$u->setValidator($v);
|
||||||
@ -368,6 +417,10 @@ class UploadTest extends SapphireTest {
|
|||||||
$file2->Name,
|
$file2->Name,
|
||||||
'File does not receive new name'
|
'File does not receive new name'
|
||||||
);
|
);
|
||||||
|
$this->assertFileExists(
|
||||||
|
BASE_PATH . '/' . $file2->getRelativePath(),
|
||||||
|
'File exists'
|
||||||
|
);
|
||||||
$this->assertEquals(
|
$this->assertEquals(
|
||||||
$file->ID,
|
$file->ID,
|
||||||
$file2->ID,
|
$file2->ID,
|
||||||
@ -507,6 +560,70 @@ class UploadTest extends SapphireTest {
|
|||||||
$image->delete();
|
$image->delete();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testFileVersioningWithAnExistingFile() {
|
||||||
|
$upload = function($tmpFileName) {
|
||||||
|
// create tmp file
|
||||||
|
$tmpFilePath = TEMP_FOLDER . '/' . $tmpFileName;
|
||||||
|
$tmpFileContent = '';
|
||||||
|
for ($i = 0; $i < 10000; $i++) {
|
||||||
|
$tmpFileContent .= '0';
|
||||||
|
}
|
||||||
|
file_put_contents($tmpFilePath, $tmpFileContent);
|
||||||
|
|
||||||
|
// emulates the $_FILES array
|
||||||
|
$tmpFile = array(
|
||||||
|
'name' => $tmpFileName,
|
||||||
|
'type' => 'text/plaintext',
|
||||||
|
'size' => filesize($tmpFilePath),
|
||||||
|
'tmp_name' => $tmpFilePath,
|
||||||
|
'extension' => 'jpg',
|
||||||
|
'error' => UPLOAD_ERR_OK,
|
||||||
|
);
|
||||||
|
|
||||||
|
$v = new UploadTest_Validator();
|
||||||
|
|
||||||
|
// test upload into default folder
|
||||||
|
$u = new Upload();
|
||||||
|
$u->setReplaceFile(false);
|
||||||
|
$u->setValidator($v);
|
||||||
|
$u->load($tmpFile);
|
||||||
|
return $u->getFile();
|
||||||
|
};
|
||||||
|
|
||||||
|
$file1 = $upload('UploadTest-testUpload.jpg');
|
||||||
|
$this->assertEquals(
|
||||||
|
'UploadTest-testUpload.jpg',
|
||||||
|
$file1->Name,
|
||||||
|
'File does not receive new name'
|
||||||
|
);
|
||||||
|
|
||||||
|
$file2 = $upload('UploadTest-testUpload.jpg');
|
||||||
|
$this->assertEquals(
|
||||||
|
'UploadTest-testUpload2.jpg',
|
||||||
|
$file2->Name,
|
||||||
|
'File does receive new name'
|
||||||
|
);
|
||||||
|
|
||||||
|
$file3 = $upload('UploadTest-testUpload.jpg');
|
||||||
|
$this->assertEquals(
|
||||||
|
'UploadTest-testUpload3.jpg',
|
||||||
|
$file3->Name,
|
||||||
|
'File does receive new name'
|
||||||
|
);
|
||||||
|
|
||||||
|
$file4 = $upload('UploadTest-testUpload3.jpg');
|
||||||
|
$this->assertEquals(
|
||||||
|
'UploadTest-testUpload4.jpg',
|
||||||
|
$file4->Name,
|
||||||
|
'File does receive new name'
|
||||||
|
);
|
||||||
|
|
||||||
|
$file1->delete();
|
||||||
|
$file2->delete();
|
||||||
|
$file3->delete();
|
||||||
|
$file4->delete();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
class UploadTest_Validator extends Upload_Validator implements TestOnly {
|
class UploadTest_Validator extends Upload_Validator implements TestOnly {
|
||||||
|
|
||||||
|
|||||||
@ -308,6 +308,7 @@ class FormTest extends FunctionalTest {
|
|||||||
|
|
||||||
public function testDisableSecurityTokenAcceptsSubmissionWithoutToken() {
|
public function testDisableSecurityTokenAcceptsSubmissionWithoutToken() {
|
||||||
SecurityToken::enable();
|
SecurityToken::enable();
|
||||||
|
$expectedToken = SecurityToken::inst()->getValue();
|
||||||
|
|
||||||
$response = $this->get('FormTest_ControllerWithSecurityToken');
|
$response = $this->get('FormTest_ControllerWithSecurityToken');
|
||||||
// can't use submitForm() as it'll automatically insert SecurityID into the POST data
|
// can't use submitForm() as it'll automatically insert SecurityID into the POST data
|
||||||
@ -321,16 +322,30 @@ class FormTest extends FunctionalTest {
|
|||||||
);
|
);
|
||||||
$this->assertEquals(400, $response->getStatusCode(), 'Submission fails without security token');
|
$this->assertEquals(400, $response->getStatusCode(), 'Submission fails without security token');
|
||||||
|
|
||||||
|
// Generate a new token which doesn't match the current one
|
||||||
|
$generator = new RandomGenerator();
|
||||||
|
$invalidToken = $generator->randomToken('sha1');
|
||||||
|
$this->assertNotEquals($invalidToken, $expectedToken);
|
||||||
|
|
||||||
|
// Test token with request
|
||||||
$response = $this->get('FormTest_ControllerWithSecurityToken');
|
$response = $this->get('FormTest_ControllerWithSecurityToken');
|
||||||
$response = $this->post(
|
$response = $this->post(
|
||||||
'FormTest_ControllerWithSecurityToken/Form',
|
'FormTest_ControllerWithSecurityToken/Form',
|
||||||
array(
|
array(
|
||||||
'Email' => 'test@test.com',
|
'Email' => 'test@test.com',
|
||||||
'action_doSubmit' => 1,
|
'action_doSubmit' => 1,
|
||||||
'SecurityID' => -1
|
'SecurityID' => $invalidToken
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
$this->assertEquals(200, $response->getStatusCode(), 'Submission reloads form if security token invalid');
|
$this->assertEquals(200, $response->getStatusCode(), 'Submission reloads form if security token invalid');
|
||||||
|
$this->assertTrue(
|
||||||
|
stripos($response->getBody(), 'name="SecurityID" value="'.$expectedToken.'"') !== false,
|
||||||
|
'Submission reloads with correct security token after failure'
|
||||||
|
);
|
||||||
|
$this->assertTrue(
|
||||||
|
stripos($response->getBody(), 'name="SecurityID" value="'.$invalidToken.'"') === false,
|
||||||
|
'Submission reloads without incorrect security token after failure'
|
||||||
|
);
|
||||||
|
|
||||||
$matched = $this->cssParser()->getBySelector('#Form_Form_Email');
|
$matched = $this->cssParser()->getBySelector('#Form_Form_Email');
|
||||||
$attrs = $matched[0]->attributes();
|
$attrs = $matched[0]->attributes();
|
||||||
@ -493,6 +508,52 @@ class FormTest extends FunctionalTest {
|
|||||||
$this->assertContains('three="3"', $form->getAttributesHTML('one', 'two'));
|
$this->assertContains('three="3"', $form->getAttributesHTML('one', 'two'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function testMessageEscapeHtml() {
|
||||||
|
$form = $this->getStubForm();
|
||||||
|
$form->Controller()->handleRequest(new SS_HTTPRequest('GET', '/'), DataModel::inst()); // stub out request
|
||||||
|
$form->sessionMessage('<em>Escaped HTML</em>', 'good', true);
|
||||||
|
$parser = new CSSContentParser($form->forTemplate());
|
||||||
|
$messageEls = $parser->getBySelector('.message');
|
||||||
|
$this->assertContains(
|
||||||
|
'<em>Escaped HTML</em>',
|
||||||
|
$messageEls[0]->asXML()
|
||||||
|
);
|
||||||
|
|
||||||
|
$form = $this->getStubForm();
|
||||||
|
$form->Controller()->handleRequest(new SS_HTTPRequest('GET', '/'), DataModel::inst()); // stub out request
|
||||||
|
$form->sessionMessage('<em>Unescaped HTML</em>', 'good', false);
|
||||||
|
$parser = new CSSContentParser($form->forTemplate());
|
||||||
|
$messageEls = $parser->getBySelector('.message');
|
||||||
|
$this->assertContains(
|
||||||
|
'<em>Unescaped HTML</em>',
|
||||||
|
$messageEls[0]->asXML()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function testFieldMessageEscapeHtml() {
|
||||||
|
$form = $this->getStubForm();
|
||||||
|
$form->Controller()->handleRequest(new SS_HTTPRequest('GET', '/'), DataModel::inst()); // stub out request
|
||||||
|
$form->addErrorMessage('key1', '<em>Escaped HTML</em>', 'good', true);
|
||||||
|
$form->setupFormErrors();
|
||||||
|
$parser = new CSSContentParser($form->forTemplate());
|
||||||
|
$messageEls = $parser->getBySelector('#key1 .message');
|
||||||
|
$this->assertContains(
|
||||||
|
'<em>Escaped HTML</em>',
|
||||||
|
$messageEls[0]->asXML()
|
||||||
|
);
|
||||||
|
|
||||||
|
$form = $this->getStubForm();
|
||||||
|
$form->Controller()->handleRequest(new SS_HTTPRequest('GET', '/'), DataModel::inst()); // stub out request
|
||||||
|
$form->addErrorMessage('key1', '<em>Unescaped HTML</em>', 'good', false);
|
||||||
|
$form->setupFormErrors();
|
||||||
|
$parser = new CSSContentParser($form->forTemplate());
|
||||||
|
$messageEls = $parser->getBySelector('#key1 .message');
|
||||||
|
$this->assertContains(
|
||||||
|
'<em>Unescaped HTML</em>',
|
||||||
|
$messageEls[0]->asXML()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
protected function getStubForm() {
|
protected function getStubForm() {
|
||||||
return new Form(
|
return new Form(
|
||||||
new FormTest_Controller(),
|
new FormTest_Controller(),
|
||||||
|
|||||||
@ -33,6 +33,9 @@ class NumericFieldTest extends SapphireTest {
|
|||||||
|
|
||||||
$field->setValue('12.00');
|
$field->setValue('12.00');
|
||||||
$this->assertFalse($field->validate($validator));
|
$this->assertFalse($field->validate($validator));
|
||||||
|
|
||||||
|
$field->setValue(0);
|
||||||
|
$this->assertRegExp("#<span[^>]+>\s*0\s*<\/span>#", "".$field->performReadonlyTransformation()->Field()."");
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testNumberTypeOnInputHtml() {
|
public function testNumberTypeOnInputHtml() {
|
||||||
|
|||||||
@ -350,6 +350,28 @@ class RequirementsTest extends SapphireTest {
|
|||||||
$this->assertContains('</script></body>', $html);
|
$this->assertContains('</script></body>', $html);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testIncludedJsIsNotCommentedOut() {
|
||||||
|
$template = '<html><head></head><body><!--<script>alert("commented out");</script>--></body></html>';
|
||||||
|
$backend = new Requirements_Backend();
|
||||||
|
$backend->javascript($this->getCurrentRelativePath() . '/RequirementsTest_a.js');
|
||||||
|
$html = $backend->includeInHTML(false, $template);
|
||||||
|
//wiping out commented-out html
|
||||||
|
$html = preg_replace('/<!--(.*)-->/Uis', '', $html);
|
||||||
|
$this->assertContains("RequirementsTest_a.js", $html);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCommentedOutScriptTagIsIgnored() {
|
||||||
|
$template = '<html><head></head><body><!--<script>alert("commented out");</script>-->'
|
||||||
|
. '<h1>more content</h1></body></html>';
|
||||||
|
$backend = new Requirements_Backend();
|
||||||
|
$backend->set_suffix_requirements(false);
|
||||||
|
$src = $this->getCurrentRelativePath() . '/RequirementsTest_a.js';
|
||||||
|
$backend->javascript($src);
|
||||||
|
$html = $backend->includeInHTML(false, $template);
|
||||||
|
$this->assertEquals('<html><head></head><body><!--<script>alert("commented out");</script>-->'
|
||||||
|
. '<h1>more content</h1><script type="text/javascript" src="/' . $src . '"></script></body></html>', $html);
|
||||||
|
}
|
||||||
|
|
||||||
public function testForceJsToBottom() {
|
public function testForceJsToBottom() {
|
||||||
$backend = new Requirements_Backend();
|
$backend = new Requirements_Backend();
|
||||||
$backend->javascript('http://www.mydomain.com/test.js');
|
$backend->javascript('http://www.mydomain.com/test.js');
|
||||||
|
|||||||
@ -74,6 +74,27 @@ class GridFieldExportButtonTest extends SapphireTest {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testArrayListInput() {
|
||||||
|
$button = new GridFieldExportButton();
|
||||||
|
$this->gridField->getConfig()->addComponent(new GridFieldPaginator());
|
||||||
|
|
||||||
|
//Create an ArrayList 1 greater the Paginator's default 15 rows
|
||||||
|
$arrayList = new ArrayList();
|
||||||
|
for ($i = 1; $i <= 16; $i++) {
|
||||||
|
$dataobject = new DataObject(
|
||||||
|
array ( 'ID' => $i )
|
||||||
|
);
|
||||||
|
$arrayList->add($dataobject);
|
||||||
|
}
|
||||||
|
$this->gridField->setList($arrayList);
|
||||||
|
|
||||||
|
$this->assertEquals(
|
||||||
|
"\"ID\"\n\"1\"\n\"2\"\n\"3\"\n\"4\"\n\"5\"\n\"6\"\n\"7\"\n\"8\"\n"
|
||||||
|
."\"9\"\n\"10\"\n\"11\"\n\"12\"\n\"13\"\n\"14\"\n\"15\"\n\"16\"\n",
|
||||||
|
$button->generateExportFileData($this->gridField)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
class GridFieldExportButtonTest_Team extends DataObject implements TestOnly {
|
class GridFieldExportButtonTest_Team extends DataObject implements TestOnly {
|
||||||
|
|
||||||
|
|||||||
@ -671,6 +671,12 @@ class UploadFieldTest extends FunctionalTest {
|
|||||||
),
|
),
|
||||||
'Removes "From files" button'
|
'Removes "From files" button'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Test requests to select files have the correct given permission
|
||||||
|
$response2 = $this->get('UploadFieldTest_Controller/Form/field/CanAttachExistingFalseField/select');
|
||||||
|
$this->assertEquals(403, $response2->getStatusCode());
|
||||||
|
$response3 = $this->get('UploadFieldTest_Controller/Form/field/HasOneFile/select');
|
||||||
|
$this->assertEquals(200, $response3->getStatusCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSelect() {
|
public function testSelect() {
|
||||||
|
|||||||
@ -486,13 +486,39 @@ class InjectorTest extends SapphireTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function testInheritedConfig() {
|
public function testInheritedConfig() {
|
||||||
|
|
||||||
|
// Test top-down caching of config inheritance
|
||||||
$injector = new Injector(array('locator' => 'SilverStripeServiceConfigurationLocator'));
|
$injector = new Injector(array('locator' => 'SilverStripeServiceConfigurationLocator'));
|
||||||
Config::inst()->update('Injector', 'MyParentClass', array('properties' => array('one' => 'the one')));
|
Config::inst()->update('Injector', 'MyParentClass', array('properties' => array('one' => 'the one')));
|
||||||
|
Config::inst()->update('Injector', 'MyChildClass', array('properties' => array('one' => 'the two')));
|
||||||
$obj = $injector->get('MyParentClass');
|
$obj = $injector->get('MyParentClass');
|
||||||
$this->assertEquals($obj->one, 'the one');
|
$this->assertEquals($obj->one, 'the one');
|
||||||
|
|
||||||
$obj = $injector->get('MyChildClass');
|
$obj = $injector->get('MyChildClass');
|
||||||
$this->assertEquals($obj->one, 'the one');
|
$this->assertEquals($obj->one, 'the two');
|
||||||
|
|
||||||
|
$obj = $injector->get('MyGrandChildClass');
|
||||||
|
$this->assertEquals($obj->one, 'the two');
|
||||||
|
|
||||||
|
$obj = $injector->get('MyGreatGrandChildClass');
|
||||||
|
$this->assertEquals($obj->one, 'the two');
|
||||||
|
|
||||||
|
// Test bottom-up caching of config inheritance
|
||||||
|
$injector = new Injector(array('locator' => 'SilverStripeServiceConfigurationLocator'));
|
||||||
|
Config::inst()->update('Injector', 'MyParentClass', array('properties' => array('one' => 'the three')));
|
||||||
|
Config::inst()->update('Injector', 'MyChildClass', array('properties' => array('one' => 'the four')));
|
||||||
|
|
||||||
|
$obj = $injector->get('MyGreatGrandChildClass');
|
||||||
|
$this->assertEquals($obj->one, 'the four');
|
||||||
|
|
||||||
|
$obj = $injector->get('MyGrandChildClass');
|
||||||
|
$this->assertEquals($obj->one, 'the four');
|
||||||
|
|
||||||
|
$obj = $injector->get('MyChildClass');
|
||||||
|
$this->assertEquals($obj->one, 'the four');
|
||||||
|
|
||||||
|
$obj = $injector->get('MyParentClass');
|
||||||
|
$this->assertEquals($obj->one, 'the three');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSameNamedSingeltonPrototype() {
|
public function testSameNamedSingeltonPrototype() {
|
||||||
@ -654,16 +680,24 @@ class InjectorTest extends SapphireTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class InjectorTestConfigLocator extends SilverStripeServiceConfigurationLocator implements TestOnly {
|
class InjectorTestConfigLocator extends SilverStripeServiceConfigurationLocator implements TestOnly {
|
||||||
public function locateConfigFor($name) {
|
|
||||||
if ($name == 'TestObject') {
|
protected function configFor($name) {
|
||||||
return array('class' => 'ConstructableObject', 'constructor' => array('%$OtherTestObject'));
|
|
||||||
|
switch($name) {
|
||||||
|
case 'TestObject':
|
||||||
|
return $this->configs[$name] = array(
|
||||||
|
'class' => 'ConstructableObject',
|
||||||
|
'constructor' => array('%$OtherTestObject')
|
||||||
|
);
|
||||||
|
|
||||||
|
case 'ConfigConstructor':
|
||||||
|
return $this->configs[$name] = array(
|
||||||
|
'class' => 'ConstructableObject',
|
||||||
|
'constructor' => array('value')
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($name == 'ConfigConstructor') {
|
return parent::configFor($name);
|
||||||
return array('class' => 'ConstructableObject', 'constructor' => array('value'));
|
|
||||||
}
|
|
||||||
|
|
||||||
return parent::locateConfigFor($name);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -730,6 +764,12 @@ class MyParentClass implements TestOnly {
|
|||||||
|
|
||||||
class MyChildClass extends MyParentClass implements TestOnly {
|
class MyChildClass extends MyParentClass implements TestOnly {
|
||||||
|
|
||||||
|
}
|
||||||
|
class MyGrandChildClass extends MyChildClass implements TestOnly {
|
||||||
|
|
||||||
|
}
|
||||||
|
class MyGreatGrandChildClass extends MyGrandChildClass implements TestOnly {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class DummyRequirements implements TestOnly {
|
class DummyRequirements implements TestOnly {
|
||||||
|
|||||||
@ -122,6 +122,17 @@ class DataListTest extends SapphireTest {
|
|||||||
// $this->assertEquals(1, $check->count());
|
// $this->assertEquals(1, $check->count());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testDistinct() {
|
||||||
|
$list = DataObjectTest_TeamComment::get();
|
||||||
|
$this->assertContains('SELECT DISTINCT', $list->dataQuery()->sql(), 'Query is set as distinct by default');
|
||||||
|
|
||||||
|
$list = $list->distinct(false);
|
||||||
|
$this->assertNotContains('SELECT DISTINCT', $list->dataQuery()->sql(), 'Query does not contain distinct');
|
||||||
|
|
||||||
|
$list = $list->distinct(true);
|
||||||
|
$this->assertContains('SELECT DISTINCT', $list->dataQuery()->sql(), 'Query contains distinct');
|
||||||
|
}
|
||||||
|
|
||||||
public function testDataClass() {
|
public function testDataClass() {
|
||||||
$list = DataObjectTest_TeamComment::get();
|
$list = DataObjectTest_TeamComment::get();
|
||||||
$this->assertEquals('DataObjectTest_TeamComment',$list->dataClass());
|
$this->assertEquals('DataObjectTest_TeamComment',$list->dataClass());
|
||||||
@ -738,6 +749,27 @@ class DataListTest extends SapphireTest {
|
|||||||
$this->assertEquals(array_intersect($values, array('Joe', 'Bob')), $values);
|
$this->assertEquals(array_intersect($values, array('Joe', 'Bob')), $values);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testFilterOnImplicitJoin() {
|
||||||
|
// Many to many
|
||||||
|
$list = DataObjectTest_Team::get()
|
||||||
|
->filter('Players.FirstName', array('Captain', 'Captain 2'));
|
||||||
|
|
||||||
|
$this->assertEquals(2, $list->count());
|
||||||
|
|
||||||
|
// Has many
|
||||||
|
$list = DataObjectTest_Team::get()
|
||||||
|
->filter('Comments.Name', array('Joe', 'Phil'));
|
||||||
|
|
||||||
|
$this->assertEquals(2, $list->count());
|
||||||
|
|
||||||
|
// Has one
|
||||||
|
$list = DataObjectTest_Player::get()
|
||||||
|
->filter('FavouriteTeam.Title', 'Team 1');
|
||||||
|
|
||||||
|
$this->assertEquals(1, $list->count());
|
||||||
|
$this->assertEquals('007', $list->first()->ShirtNumber);
|
||||||
|
}
|
||||||
|
|
||||||
public function testFilterAndExcludeById() {
|
public function testFilterAndExcludeById() {
|
||||||
$id = $this->idFromFixture('DataObjectTest_SubTeam', 'subteam1');
|
$id = $this->idFromFixture('DataObjectTest_SubTeam', 'subteam1');
|
||||||
$list = DataObjectTest_SubTeam::get()->filter('ID', $id);
|
$list = DataObjectTest_SubTeam::get()->filter('ID', $id);
|
||||||
|
|||||||
@ -19,17 +19,30 @@ class DataObjectTest extends SapphireTest {
|
|||||||
'DataObjectTest_TeamComment',
|
'DataObjectTest_TeamComment',
|
||||||
'DataObjectTest\NamespacedClass',
|
'DataObjectTest\NamespacedClass',
|
||||||
'DataObjectTest\RelationClass',
|
'DataObjectTest\RelationClass',
|
||||||
|
'DataObjectTest_ExtendedTeamComment'
|
||||||
);
|
);
|
||||||
|
|
||||||
public function testBaseFieldsExcludedFromDb() {
|
public function testDb() {
|
||||||
$obj = new DataObjectTest_ValidatedObject();
|
$obj = new DataObjectTest_TeamComment();
|
||||||
|
|
||||||
$dbFields = $obj->db();
|
$dbFields = $obj->db();
|
||||||
|
|
||||||
|
// Assert fields are included
|
||||||
$this->assertArrayHasKey('Name', $dbFields);
|
$this->assertArrayHasKey('Name', $dbFields);
|
||||||
|
|
||||||
|
// Assert the base fields are excluded
|
||||||
$this->assertArrayNotHasKey('Created', $dbFields);
|
$this->assertArrayNotHasKey('Created', $dbFields);
|
||||||
$this->assertArrayNotHasKey('LastEdited', $dbFields);
|
$this->assertArrayNotHasKey('LastEdited', $dbFields);
|
||||||
$this->assertArrayNotHasKey('ClassName', $dbFields);
|
$this->assertArrayNotHasKey('ClassName', $dbFields);
|
||||||
$this->assertArrayNotHasKey('ID', $dbFields);
|
$this->assertArrayNotHasKey('ID', $dbFields);
|
||||||
|
|
||||||
|
// Assert that the correct field type is returned when passing a field
|
||||||
|
$this->assertEquals('Varchar', $obj->db('Name'));
|
||||||
|
$this->assertEquals('Text', $obj->db('Comment'));
|
||||||
|
|
||||||
|
$obj = new DataObjectTest_ExtendedTeamComment();
|
||||||
|
|
||||||
|
// Assert overloaded fields have correct data type
|
||||||
|
$this->assertEquals('HTMLText', $obj->db('Comment'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testValidObjectsForBaseFields() {
|
public function testValidObjectsForBaseFields() {
|
||||||
@ -843,6 +856,23 @@ class DataObjectTest extends SapphireTest {
|
|||||||
$this->assertEmpty($fields);
|
$this->assertEmpty($fields);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testSummaryFieldsCustomLabels() {
|
||||||
|
$team = $this->objFromFixture('DataObjectTest_Team', 'team1');
|
||||||
|
$summaryFields = $team->summaryFields();
|
||||||
|
|
||||||
|
$this->assertEquals(
|
||||||
|
'Custom Title',
|
||||||
|
$summaryFields['Title'],
|
||||||
|
'Custom title is preserved'
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertEquals(
|
||||||
|
'Captain\'s shirt number',
|
||||||
|
$summaryFields['Captain.ShirtNumber'],
|
||||||
|
'Custom title on relation is preserved'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
public function testDataObjectUpdate() {
|
public function testDataObjectUpdate() {
|
||||||
/* update() calls can use the dot syntax to reference has_one relations and other methods that return
|
/* update() calls can use the dot syntax to reference has_one relations and other methods that return
|
||||||
* objects */
|
* objects */
|
||||||
@ -1092,14 +1122,14 @@ class DataObjectTest extends SapphireTest {
|
|||||||
* Tests that singular_name() generates sensible defaults.
|
* Tests that singular_name() generates sensible defaults.
|
||||||
*/
|
*/
|
||||||
public function testSingularName() {
|
public function testSingularName() {
|
||||||
$assertions = array (
|
$assertions = array(
|
||||||
'DataObjectTest_Player' => 'Data Object Test Player',
|
'DataObjectTest_Player' => 'Data Object Test Player',
|
||||||
'DataObjectTest_Team' => 'Data Object Test Team',
|
'DataObjectTest_Team' => 'Data Object Test Team',
|
||||||
'DataObjectTest_Fixture' => 'Data Object Test Fixture'
|
'DataObjectTest_Fixture' => 'Data Object Test Fixture'
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach($assertions as $class => $expectedSingularName) {
|
foreach($assertions as $class => $expectedSingularName) {
|
||||||
$this->assertEquals (
|
$this->assertEquals(
|
||||||
$expectedSingularName,
|
$expectedSingularName,
|
||||||
singleton($class)->singular_name(),
|
singleton($class)->singular_name(),
|
||||||
"Assert that the singular_name for '$class' is correct."
|
"Assert that the singular_name for '$class' is correct."
|
||||||
@ -1107,6 +1137,25 @@ class DataObjectTest extends SapphireTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests that plural_name() generates sensible defaults.
|
||||||
|
*/
|
||||||
|
public function testPluralName() {
|
||||||
|
$assertions = array(
|
||||||
|
'DataObjectTest_Player' => 'Data Object Test Players',
|
||||||
|
'DataObjectTest_Team' => 'Data Object Test Teams',
|
||||||
|
'DataObjectTest_Fixture' => 'Data Object Test Fixtures'
|
||||||
|
);
|
||||||
|
|
||||||
|
foreach($assertions as $class => $expectedPluralName) {
|
||||||
|
$this->assertEquals(
|
||||||
|
$expectedPluralName,
|
||||||
|
singleton($class)->plural_name(),
|
||||||
|
"Assert that the plural_name for '$class' is correct."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function testHasDatabaseField() {
|
public function testHasDatabaseField() {
|
||||||
$team = singleton('DataObjectTest_Team');
|
$team = singleton('DataObjectTest_Team');
|
||||||
$subteam = singleton('DataObjectTest_SubTeam');
|
$subteam = singleton('DataObjectTest_SubTeam');
|
||||||
@ -1487,6 +1536,7 @@ class DataObjectTest_Team extends DataObject implements TestOnly {
|
|||||||
);
|
);
|
||||||
|
|
||||||
private static $summary_fields = array(
|
private static $summary_fields = array(
|
||||||
|
'Title' => 'Custom Title',
|
||||||
'Title.UpperCase' => 'Title',
|
'Title.UpperCase' => 'Title',
|
||||||
'Captain.ShirtNumber' => 'Captain\'s shirt number',
|
'Captain.ShirtNumber' => 'Captain\'s shirt number',
|
||||||
'Captain.FavouriteTeam.Title' => 'Captain\'s favourite team'
|
'Captain.FavouriteTeam.Title' => 'Captain\'s favourite team'
|
||||||
@ -1649,5 +1699,11 @@ class DataObjectTest_Fan extends DataObject {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class DataObjectTest_ExtendedTeamComment extends DataObjectTest_TeamComment {
|
||||||
|
private static $db = array(
|
||||||
|
'Comment' => 'HTMLText'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
DataObjectTest_Team::add_extension('DataObjectTest_Team_Extension');
|
DataObjectTest_Team::add_extension('DataObjectTest_Team_Extension');
|
||||||
|
|
||||||
|
|||||||
@ -10,8 +10,30 @@ class DataQueryTest extends SapphireTest {
|
|||||||
'DataQueryTest_C',
|
'DataQueryTest_C',
|
||||||
'DataQueryTest_D',
|
'DataQueryTest_D',
|
||||||
'DataQueryTest_E',
|
'DataQueryTest_E',
|
||||||
|
'DataQueryTest_F',
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
public function testSortByJoinedFieldRetainsSourceInformation() {
|
||||||
|
$bar = new DataQueryTest_C();
|
||||||
|
$bar->Title = "Bar";
|
||||||
|
$bar->write();
|
||||||
|
|
||||||
|
$foo = new DataQueryTest_B();
|
||||||
|
$foo->Title = "Foo";
|
||||||
|
$foo->TestC = $bar->ID;
|
||||||
|
$foo->write();
|
||||||
|
|
||||||
|
$query = new DataQuery('DataQueryTest_B');
|
||||||
|
$result = $query->leftJoin(
|
||||||
|
'DataQueryTest_C',
|
||||||
|
"\"DataQueryTest_B\".\"TestCID\" = \"DataQueryTest_B\".\"ID\""
|
||||||
|
)->sort('"DataQueryTest_B"."Title"', 'ASC');
|
||||||
|
|
||||||
|
$result = $result->execute()->record();
|
||||||
|
$this->assertEquals('Foo', $result['Title']);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test the leftJoin() and innerJoin method of the DataQuery object
|
* Test the leftJoin() and innerJoin method of the DataQuery object
|
||||||
*/
|
*/
|
||||||
@ -27,6 +49,14 @@ class DataQueryTest extends SapphireTest {
|
|||||||
$dq->sql($parameters));
|
$dq->sql($parameters));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testApplyReplationDeepInheretence() {
|
||||||
|
$newDQ = new DataQuery('DataQueryTest_E');
|
||||||
|
//apply a relation to a relation from an ancestor class
|
||||||
|
$newDQ->applyRelation('TestA');
|
||||||
|
$this->assertTrue($newDQ->query()->isJoinedTo('DataQueryTest_C'));
|
||||||
|
$this->assertContains('"DataQueryTest_A"."ID" = "DataQueryTest_C"."TestAID"', $newDQ->sql());
|
||||||
|
}
|
||||||
|
|
||||||
public function testRelationReturn() {
|
public function testRelationReturn() {
|
||||||
$dq = new DataQuery('DataQueryTest_C');
|
$dq = new DataQuery('DataQueryTest_C');
|
||||||
$this->assertEquals('DataQueryTest_A', $dq->applyRelation('TestA'),
|
$this->assertEquals('DataQueryTest_A', $dq->applyRelation('TestA'),
|
||||||
@ -42,6 +72,9 @@ class DataQueryTest extends SapphireTest {
|
|||||||
'DataQuery::applyRelation should return the name of the related object.');
|
'DataQuery::applyRelation should return the name of the related object.');
|
||||||
$this->assertEquals('DataQueryTest_B', $dq->applyRelation('ManyTestBs'),
|
$this->assertEquals('DataQueryTest_B', $dq->applyRelation('ManyTestBs'),
|
||||||
'DataQuery::applyRelation should return the name of the related object.');
|
'DataQuery::applyRelation should return the name of the related object.');
|
||||||
|
$newDQ = new DataQuery('DataQueryTest_E');
|
||||||
|
$this->assertEquals('DataQueryTest_A', $newDQ->applyRelation('TestA'),
|
||||||
|
'DataQuery::applyRelation should return the name of the related object.');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testRelationOrderWithCustomJoin() {
|
public function testRelationOrderWithCustomJoin() {
|
||||||
@ -138,10 +171,75 @@ class DataQueryTest extends SapphireTest {
|
|||||||
$result = $query->column('Title');
|
$result = $query->column('Title');
|
||||||
$this->assertEquals(array('First', 'Second', 'Last'), $result);
|
$this->assertEquals(array('First', 'Second', 'Last'), $result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testDistinct() {
|
||||||
|
$query = new DataQuery('DataQueryTest_E');
|
||||||
|
$this->assertContains('SELECT DISTINCT', $query->sql(), 'Query is set as distinct by default');
|
||||||
|
|
||||||
|
$query = $query->distinct(false);
|
||||||
|
$this->assertNotContains('SELECT DISTINCT', $query->sql(), 'Query does not contain distinct');
|
||||||
|
|
||||||
|
$query = $query->distinct(true);
|
||||||
|
$this->assertContains('SELECT DISTINCT', $query->sql(), 'Query contains distinct');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testComparisonClauseInt() {
|
||||||
|
DB::query("INSERT INTO \"DataQueryTest_F\" (\"SortOrder\") VALUES (2)");
|
||||||
|
$query = new DataQuery('DataQueryTest_F');
|
||||||
|
$query->where(DB::getConn()->comparisonClause('"SortOrder"', '2'));
|
||||||
|
$this->assertGreaterThan(0, $query->count(), "Couldn't find SortOrder");
|
||||||
|
$this->resetDBSchema(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testComparisonClauseDateFull() {
|
||||||
|
DB::query("INSERT INTO \"DataQueryTest_F\" (\"MyDate\") VALUES ('1988-03-04 06:30')");
|
||||||
|
$query = new DataQuery('DataQueryTest_F');
|
||||||
|
$query->where(DB::getConn()->comparisonClause('"MyDate"', '1988-03-04%'));
|
||||||
|
$this->assertGreaterThan(0, $query->count(), "Couldn't find MyDate");
|
||||||
|
$this->resetDBSchema(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testComparisonClauseDateStartsWith() {
|
||||||
|
DB::query("INSERT INTO \"DataQueryTest_F\" (\"MyDate\") VALUES ('1988-03-04 06:30')");
|
||||||
|
$query = new DataQuery('DataQueryTest_F');
|
||||||
|
$query->where(DB::getConn()->comparisonClause('"MyDate"', '1988%'));
|
||||||
|
$this->assertGreaterThan(0, $query->count(), "Couldn't find MyDate");
|
||||||
|
$this->resetDBSchema(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testComparisonClauseDateStartsPartial() {
|
||||||
|
DB::query("INSERT INTO \"DataQueryTest_F\" (\"MyDate\") VALUES ('1988-03-04 06:30')");
|
||||||
|
$query = new DataQuery('DataQueryTest_F');
|
||||||
|
$query->where(DB::getConn()->comparisonClause('"MyDate"', '%03-04%'));
|
||||||
|
$this->assertGreaterThan(0, $query->count(), "Couldn't find MyDate");
|
||||||
|
$this->resetDBSchema(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testComparisonClauseTextCaseInsensitive() {
|
||||||
|
DB::query("INSERT INTO \"DataQueryTest_F\" (\"MyString\") VALUES ('HelloWorld')");
|
||||||
|
$query = new DataQuery('DataQueryTest_F');
|
||||||
|
$query->where(DB::getConn()->comparisonClause('"MyString"', 'helloworld'));
|
||||||
|
$this->assertGreaterThan(0, $query->count(), "Couldn't find MyString");
|
||||||
|
$this->resetDBSchema(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testComparisonClauseTextCaseSensitive() {
|
||||||
|
DB::query("INSERT INTO \"DataQueryTest_F\" (\"MyString\") VALUES ('HelloWorld')");
|
||||||
|
$query = new DataQuery('DataQueryTest_F');
|
||||||
|
$query->where(DB::getConn()->comparisonClause('"MyString"', 'HelloWorld', false, false, true));
|
||||||
|
$this->assertGreaterThan(0, $query->count(), "Couldn't find MyString");
|
||||||
|
|
||||||
|
$query2 = new DataQuery('DataQueryTest_F');
|
||||||
|
$query2->where(DB::getConn()->comparisonClause('"MyString"', 'helloworld', false, false, true));
|
||||||
|
$this->assertEquals(0, $query2->count(), "Found mystring. Shouldn't be able too.");
|
||||||
|
$this->resetDBSchema(true);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class DataQueryTest_A extends DataObject implements TestOnly {
|
class DataQueryTest_A extends DataObject implements TestOnly {
|
||||||
|
|
||||||
private static $db = array(
|
private static $db = array(
|
||||||
'Name' => 'Varchar',
|
'Name' => 'Varchar',
|
||||||
);
|
);
|
||||||
@ -151,7 +249,8 @@ class DataQueryTest_A extends DataObject implements TestOnly {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
class DataQueryTest_B extends DataQueryTest_A {
|
class DataQueryTest_B extends DataObject implements TestOnly {
|
||||||
|
|
||||||
private static $db = array(
|
private static $db = array(
|
||||||
'Title' => 'Varchar',
|
'Title' => 'Varchar',
|
||||||
);
|
);
|
||||||
@ -198,3 +297,12 @@ class DataQueryTest_E extends DataQueryTest_C implements TestOnly {
|
|||||||
|
|
||||||
private static $default_sort = '"DataQueryTest_E"."SortOrder" ASC';
|
private static $default_sort = '"DataQueryTest_E"."SortOrder" ASC';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class DataQueryTest_F extends DataObject implements TestOnly {
|
||||||
|
|
||||||
|
private static $db = array(
|
||||||
|
'SortOrder' => 'Int',
|
||||||
|
'MyDate' => 'SS_Datetime',
|
||||||
|
'MyString' => 'Text'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
@ -362,4 +362,66 @@ class ImageTest extends SapphireTest {
|
|||||||
$secondImagePath = $secondImage->getRelativePath();
|
$secondImagePath = $secondImage->getRelativePath();
|
||||||
$this->assertEquals($secondImagePath, $secondImage->Filename);
|
$this->assertEquals($secondImagePath, $secondImage->Filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test all generate methods
|
||||||
|
*/
|
||||||
|
public function testGenerateMethods() {
|
||||||
|
$image = $this->objFromFixture('Image', 'imageWithoutTitle');
|
||||||
|
$generateMethods = $this->getGenerateMethods();
|
||||||
|
|
||||||
|
// test each generate method
|
||||||
|
foreach ($generateMethods as $method) {
|
||||||
|
$generatedImage = $image->$method(333, 333, 'FFFFFF');
|
||||||
|
$this->assertFileExists(
|
||||||
|
$generatedImage->getFullPath(),
|
||||||
|
'Formatted ' . $method . ' image exists'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test deleteFormattedImages() against all generate methods
|
||||||
|
*/
|
||||||
|
public function testDeleteFormattedImages() {
|
||||||
|
$image = $this->objFromFixture('Image', 'imageWithoutTitle');
|
||||||
|
$generateMethods = $this->getGenerateMethods();
|
||||||
|
|
||||||
|
// get paths for each generate method
|
||||||
|
$paths = array();
|
||||||
|
foreach ($generateMethods as $method) {
|
||||||
|
$generatedImage = $image->$method(333, 333, 'FFFFFF');
|
||||||
|
$paths[$method] = $generatedImage->getFullPath();
|
||||||
|
}
|
||||||
|
|
||||||
|
// delete formatted images
|
||||||
|
$image->deleteFormattedImages();
|
||||||
|
|
||||||
|
// test that all formatted images are deleted
|
||||||
|
foreach ($paths as $method => $path) {
|
||||||
|
$this->assertFalse(
|
||||||
|
file_exists($path),
|
||||||
|
'Formatted ' . $method . ' image does not exist'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param bool $custom include methods added dynamically at runtime
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
protected function getGenerateMethods($custom = true) {
|
||||||
|
$generateMethods = array();
|
||||||
|
$methodNames = Image::create()->allMethodNames($custom);
|
||||||
|
|
||||||
|
foreach ($methodNames as $methodName) {
|
||||||
|
if (substr($methodName, 0, 8) == 'generate' && $methodName != 'generateformattedimage') {
|
||||||
|
$format = substr($methodName, 8);
|
||||||
|
$generateMethods[] = $format;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $generateMethods;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -112,9 +112,9 @@ class TextTest extends SapphireTest {
|
|||||||
/**
|
/**
|
||||||
* Test {@link Text->BigSummary()}
|
* Test {@link Text->BigSummary()}
|
||||||
*/
|
*/
|
||||||
public function testBigSummary() {
|
public function testBigSummaryPlain() {
|
||||||
$cases = array(
|
$cases = array(
|
||||||
'This text has multiple sentences. Big Summary uses this to split sentences up.'
|
'<p>This text has multiple sentences. Big Summary uses this to split sentences up.</p>'
|
||||||
=> 'This text has multiple...',
|
=> 'This text has multiple...',
|
||||||
'This text does not have multiple sentences' => 'This text does not...',
|
'This text does not have multiple sentences' => 'This text does not...',
|
||||||
'Very short' => 'Very short',
|
'Very short' => 'Very short',
|
||||||
@ -123,7 +123,25 @@ class TextTest extends SapphireTest {
|
|||||||
|
|
||||||
foreach($cases as $originalValue => $expectedValue) {
|
foreach($cases as $originalValue => $expectedValue) {
|
||||||
$textObj = DBField::create_field('Text', $originalValue);
|
$textObj = DBField::create_field('Text', $originalValue);
|
||||||
$this->assertEquals($expectedValue, $textObj->BigSummary(4));
|
$this->assertEquals($expectedValue, $textObj->BigSummary(4, true));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test {@link Text->BigSummary()}
|
||||||
|
*/
|
||||||
|
public function testBigSummary() {
|
||||||
|
$cases = array(
|
||||||
|
'<strong>This</strong> text has multiple sentences. Big Summary uses this to split sentences up.</p>'
|
||||||
|
=> '<strong>This</strong> text has multiple...',
|
||||||
|
'This text does not have multiple sentences' => 'This text does not...',
|
||||||
|
'Very short' => 'Very short',
|
||||||
|
'' => ''
|
||||||
|
);
|
||||||
|
|
||||||
|
foreach($cases as $originalValue => $expectedValue) {
|
||||||
|
$textObj = DBField::create_field('Text', $originalValue);
|
||||||
|
$this->assertEquals($expectedValue, $textObj->BigSummary(4, false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -210,6 +210,29 @@ class UnsavedRelationListTest extends SapphireTest {
|
|||||||
$child3->ID => $child3->ID
|
$child3->ID => $child3->ID
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testColumn() {
|
||||||
|
$object = new UnsavedRelationListTest_DataObject;
|
||||||
|
|
||||||
|
$children = $object->Children();
|
||||||
|
$children->add(new UnsavedRelationListTest_DataObject(array('Name' => 'A')));
|
||||||
|
$children->add(new UnsavedRelationListTest_DataObject(array('Name' => 'B')));
|
||||||
|
$children->add(new UnsavedRelationListTest_DataObject(array('Name' => 'C')));
|
||||||
|
|
||||||
|
$children = $object->Children();
|
||||||
|
|
||||||
|
$this->assertDOSEquals(array(
|
||||||
|
array('Name' => 'A'),
|
||||||
|
array('Name' => 'B'),
|
||||||
|
array('Name' => 'C')
|
||||||
|
), $children);
|
||||||
|
|
||||||
|
$this->assertEquals($children->column('Name'), array(
|
||||||
|
'A',
|
||||||
|
'B',
|
||||||
|
'C'
|
||||||
|
));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class UnsavedRelationListTest_DataObject extends DataObject implements TestOnly {
|
class UnsavedRelationListTest_DataObject extends DataObject implements TestOnly {
|
||||||
|
|||||||
@ -7,6 +7,23 @@ class MemberAuthenticatorTest extends SapphireTest {
|
|||||||
|
|
||||||
protected $usesDatabase = true;
|
protected $usesDatabase = true;
|
||||||
|
|
||||||
|
protected $defaultUsername = null;
|
||||||
|
protected $defaultPassword = null;
|
||||||
|
|
||||||
|
public function setUp() {
|
||||||
|
parent::setUp();
|
||||||
|
|
||||||
|
$this->defaultUsername = Security::default_admin_username();
|
||||||
|
$this->defaultPassword = Security::default_admin_password();
|
||||||
|
Security::clear_default_admin();
|
||||||
|
Security::setDefaultAdmin('admin', 'password');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tearDown() {
|
||||||
|
Security::setDefaultAdmin($this->defaultUsername, $this->defaultPassword);
|
||||||
|
parent::tearDown();
|
||||||
|
}
|
||||||
|
|
||||||
public function testLegacyPasswordHashMigrationUponLogin() {
|
public function testLegacyPasswordHashMigrationUponLogin() {
|
||||||
$member = new Member();
|
$member = new Member();
|
||||||
|
|
||||||
@ -63,4 +80,88 @@ class MemberAuthenticatorTest extends SapphireTest {
|
|||||||
|
|
||||||
Member::config()->unique_identifier_field = $origField;
|
Member::config()->unique_identifier_field = $origField;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testGenerateLoginForm() {
|
||||||
|
$controller = new Security();
|
||||||
|
|
||||||
|
// Create basic login form
|
||||||
|
$frontendForm = MemberAuthenticator::get_login_form($controller);
|
||||||
|
$this->assertTrue($frontendForm instanceof MemberLoginForm);
|
||||||
|
|
||||||
|
// Supports cms login form
|
||||||
|
$this->assertTrue(MemberAuthenticator::supports_cms());
|
||||||
|
$cmsForm = MemberAuthenticator::get_cms_login_form($controller);
|
||||||
|
$this->assertTrue($cmsForm instanceof CMSMemberLoginForm);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test that a member can be authenticated via their temp id
|
||||||
|
*/
|
||||||
|
public function testAuthenticateByTempID() {
|
||||||
|
$member = new Member();
|
||||||
|
$member->Email = 'test1@test.com';
|
||||||
|
$member->PasswordEncryption = "sha1";
|
||||||
|
$member->Password = "mypassword";
|
||||||
|
$member->write();
|
||||||
|
|
||||||
|
// Make form
|
||||||
|
$controller = new Security();
|
||||||
|
$form = new Form($controller, 'Form', new FieldList(), new FieldList());
|
||||||
|
|
||||||
|
// If the user has never logged in, then the tempid should be empty
|
||||||
|
$tempID = $member->TempIDHash;
|
||||||
|
$this->assertEmpty($tempID);
|
||||||
|
|
||||||
|
// If the user logs in then they have a temp id
|
||||||
|
$member->logIn(true);
|
||||||
|
$tempID = $member->TempIDHash;
|
||||||
|
$this->assertNotEmpty($tempID);
|
||||||
|
|
||||||
|
// Test correct login
|
||||||
|
$result = MemberAuthenticator::authenticate(array(
|
||||||
|
'tempid' => $tempID,
|
||||||
|
'Password' => 'mypassword'
|
||||||
|
), $form);
|
||||||
|
$this->assertNotEmpty($result);
|
||||||
|
$this->assertEquals($result->ID, $member->ID);
|
||||||
|
$this->assertEmpty($form->Message());
|
||||||
|
|
||||||
|
// Test incorrect login
|
||||||
|
$form->clearMessage();
|
||||||
|
$result = MemberAuthenticator::authenticate(array(
|
||||||
|
'tempid' => $tempID,
|
||||||
|
'Password' => 'notmypassword'
|
||||||
|
), $form);
|
||||||
|
$this->assertEmpty($result);
|
||||||
|
$this->assertEquals('The provided details don't seem to be correct. Please try again.', $form->Message());
|
||||||
|
$this->assertEquals('bad', $form->MessageType());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test that the default admin can be authenticated
|
||||||
|
*/
|
||||||
|
public function testDefaultAdmin() {
|
||||||
|
// Make form
|
||||||
|
$controller = new Security();
|
||||||
|
$form = new Form($controller, 'Form', new FieldList(), new FieldList());
|
||||||
|
|
||||||
|
// Test correct login
|
||||||
|
$result = MemberAuthenticator::authenticate(array(
|
||||||
|
'Email' => 'admin',
|
||||||
|
'Password' => 'password'
|
||||||
|
), $form);
|
||||||
|
$this->assertNotEmpty($result);
|
||||||
|
$this->assertEquals($result->Email, Security::default_admin_username());
|
||||||
|
$this->assertEmpty($form->Message());
|
||||||
|
|
||||||
|
// Test incorrect login
|
||||||
|
$form->clearMessage();
|
||||||
|
$result = MemberAuthenticator::authenticate(array(
|
||||||
|
'Email' => 'admin',
|
||||||
|
'Password' => 'notmypassword'
|
||||||
|
), $form);
|
||||||
|
$this->assertEmpty($result);
|
||||||
|
$this->assertEquals('The provided details don't seem to be correct. Please try again.', $form->Message());
|
||||||
|
$this->assertEquals('bad', $form->MessageType());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
class SecurityDefaultAdminTest extends SapphireTest {
|
class SecurityDefaultAdminTest extends SapphireTest {
|
||||||
|
|
||||||
|
protected $defaultUsername = null;
|
||||||
|
protected $defaultPassword = null;
|
||||||
|
|
||||||
public function setUp() {
|
public function setUp() {
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
@ -8,18 +11,19 @@ class SecurityDefaultAdminTest extends SapphireTest {
|
|||||||
// and avoid sideeffects from other tests
|
// and avoid sideeffects from other tests
|
||||||
if(!self::using_temp_db()) self::create_temp_db();
|
if(!self::using_temp_db()) self::create_temp_db();
|
||||||
self::empty_temp_db();
|
self::empty_temp_db();
|
||||||
|
|
||||||
|
$this->defaultUsername = Security::default_admin_username();
|
||||||
|
$this->defaultPassword = Security::default_admin_password();
|
||||||
|
Security::clear_default_admin();
|
||||||
|
Security::setDefaultAdmin('admin', 'password');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tearDown() {
|
||||||
|
Security::setDefaultAdmin($this->defaultUsername, $this->defaultPassword);
|
||||||
|
parent::tearDown();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testCheckDefaultAdmin() {
|
public function testCheckDefaultAdmin() {
|
||||||
if(Security::has_default_admin()) {
|
|
||||||
$this->markTestSkipped(
|
|
||||||
'Default admin present. There\'s no way to inspect default admin state, ' .
|
|
||||||
'so we don\'t override existing settings'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Security::setDefaultAdmin('admin', 'password');
|
|
||||||
|
|
||||||
$this->assertTrue(Security::has_default_admin());
|
$this->assertTrue(Security::has_default_admin());
|
||||||
$this->assertTrue(
|
$this->assertTrue(
|
||||||
Security::check_default_admin('admin', 'password'),
|
Security::check_default_admin('admin', 'password'),
|
||||||
@ -33,8 +37,6 @@ class SecurityDefaultAdminTest extends SapphireTest {
|
|||||||
Security::check_default_admin('admin', 'wrongpassword'),
|
Security::check_default_admin('admin', 'wrongpassword'),
|
||||||
'Fails with incorrect password'
|
'Fails with incorrect password'
|
||||||
);
|
);
|
||||||
|
|
||||||
Security::setDefaultAdmin(null, null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testFindAnAdministratorCreatesNewUser() {
|
public function testFindAnAdministratorCreatesNewUser() {
|
||||||
@ -45,8 +47,21 @@ class SecurityDefaultAdminTest extends SapphireTest {
|
|||||||
|
|
||||||
$this->assertInstanceOf('Member', $admin);
|
$this->assertInstanceOf('Member', $admin);
|
||||||
$this->assertTrue(Permission::checkMember($admin, 'ADMIN'));
|
$this->assertTrue(Permission::checkMember($admin, 'ADMIN'));
|
||||||
$this->assertNull($admin->Email);
|
$this->assertEquals($admin->Email, Security::default_admin_username());
|
||||||
$this->assertNull($admin->Password);
|
$this->assertNull($admin->Password);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testDefaultAdmin() {
|
||||||
|
$adminMembers = Permission::get_members_by_permission('ADMIN');
|
||||||
|
$this->assertEquals(0, $adminMembers->count());
|
||||||
|
|
||||||
|
$admin = Member::default_admin();
|
||||||
|
|
||||||
|
$this->assertInstanceOf('Member', $admin);
|
||||||
|
$this->assertTrue(Permission::checkMember($admin, 'ADMIN'));
|
||||||
|
$this->assertEquals($admin->Email, Security::default_admin_username());
|
||||||
|
$this->assertNull($admin->Password);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -303,7 +303,7 @@ class SecurityTest extends FunctionalTest {
|
|||||||
$member->LockedOutUntil,
|
$member->LockedOutUntil,
|
||||||
'User does not have a lockout time set if under threshold for failed attempts'
|
'User does not have a lockout time set if under threshold for failed attempts'
|
||||||
);
|
);
|
||||||
$this->assertContains($this->loginErrorMessage(), _t('Member.ERRORWRONGCRED'));
|
$this->assertContains($this->loginErrorMessage(), Convert::raw2xml(_t('Member.ERRORWRONGCRED')));
|
||||||
} else {
|
} else {
|
||||||
// Fuzzy matching for time to avoid side effects from slow running tests
|
// Fuzzy matching for time to avoid side effects from slow running tests
|
||||||
$this->assertGreaterThan(
|
$this->assertGreaterThan(
|
||||||
@ -350,8 +350,9 @@ class SecurityTest extends FunctionalTest {
|
|||||||
$this->doTestLoginForm('sam@silverstripe.com' , 'incorrectpassword');
|
$this->doTestLoginForm('sam@silverstripe.com' , 'incorrectpassword');
|
||||||
}
|
}
|
||||||
$this->assertNull($this->session()->inst_get('loggedInAs'));
|
$this->assertNull($this->session()->inst_get('loggedInAs'));
|
||||||
$this->assertTrue(
|
$this->assertContains(
|
||||||
false !== stripos($this->loginErrorMessage(), _t('Member.ERRORWRONGCRED')),
|
$this->loginErrorMessage(),
|
||||||
|
Convert::raw2xml(_t('Member.ERRORWRONGCRED')),
|
||||||
'The user can retry with a wrong password after the lockout expires'
|
'The user can retry with a wrong password after the lockout expires'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -124,6 +124,25 @@ class SSViewerCacheBlockTest extends SapphireTest {
|
|||||||
$this->assertEquals($this->_runtemplate('<% cached %>$Foo<% end_cached %>', array('Foo' => 2)), '1');
|
$this->assertEquals($this->_runtemplate('<% cached %>$Foo<% end_cached %>', array('Foo' => 2)), '1');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test that the cacheblocks invalidate when a flush occurs.
|
||||||
|
*/
|
||||||
|
public function testBlocksInvalidateOnFlush() {
|
||||||
|
Director::test('/?flush=1');
|
||||||
|
$this->_reset(true);
|
||||||
|
|
||||||
|
// Generate cached value for foo = 1
|
||||||
|
$this->assertEquals($this->_runtemplate('<% cached %>$Foo<% end_cached %>', array('Foo' => 1)), '1');
|
||||||
|
|
||||||
|
// Test without flush
|
||||||
|
Director::test('/');
|
||||||
|
$this->assertEquals($this->_runtemplate('<% cached %>$Foo<% end_cached %>', array('Foo' => 3)), '1');
|
||||||
|
|
||||||
|
// Test with flush
|
||||||
|
Director::test('/?flush=1');
|
||||||
|
$this->assertEquals($this->_runtemplate('<% cached %>$Foo<% end_cached %>', array('Foo' => 2)), '2');
|
||||||
|
}
|
||||||
|
|
||||||
public function testVersionedCache() {
|
public function testVersionedCache() {
|
||||||
|
|
||||||
$origStage = Versioned::current_stage();
|
$origStage = Versioned::current_stage();
|
||||||
|
|||||||
@ -1076,6 +1076,7 @@ after')
|
|||||||
<body>
|
<body>
|
||||||
<a class="inline" href="#anchor">InlineLink</a>
|
<a class="inline" href="#anchor">InlineLink</a>
|
||||||
$InsertedLink
|
$InsertedLink
|
||||||
|
<svg><use xlink:href="#sprite"></use></svg>
|
||||||
<body>
|
<body>
|
||||||
</html>');
|
</html>');
|
||||||
$tmpl = new SSViewer($tmplFile);
|
$tmpl = new SSViewer($tmplFile);
|
||||||
@ -1090,6 +1091,11 @@ after')
|
|||||||
'<a class="inline" href="' . $base . '#anchor">InlineLink</a>',
|
'<a class="inline" href="' . $base . '#anchor">InlineLink</a>',
|
||||||
$result
|
$result
|
||||||
);
|
);
|
||||||
|
$this->assertContains(
|
||||||
|
'<svg><use xlink:href="#sprite"></use></svg>',
|
||||||
|
$result,
|
||||||
|
'SSTemplateParser should only rewrite anchor hrefs'
|
||||||
|
);
|
||||||
|
|
||||||
unlink($tmplFile);
|
unlink($tmplFile);
|
||||||
|
|
||||||
@ -1109,6 +1115,7 @@ after')
|
|||||||
<body>
|
<body>
|
||||||
<a class="inline" href="#anchor">InlineLink</a>
|
<a class="inline" href="#anchor">InlineLink</a>
|
||||||
$InsertedLink
|
$InsertedLink
|
||||||
|
<svg><use xlink:href="#sprite"></use></svg>
|
||||||
<body>
|
<body>
|
||||||
</html>');
|
</html>');
|
||||||
$tmpl = new SSViewer($tmplFile);
|
$tmpl = new SSViewer($tmplFile);
|
||||||
@ -1124,6 +1131,11 @@ after')
|
|||||||
// '<a class="inline" href="<?php echo str_replace(',
|
// '<a class="inline" href="<?php echo str_replace(',
|
||||||
// $result
|
// $result
|
||||||
// );
|
// );
|
||||||
|
$this->assertContains(
|
||||||
|
'<svg><use xlink:href="#sprite"></use></svg>',
|
||||||
|
$result,
|
||||||
|
'SSTemplateParser should only rewrite anchor hrefs'
|
||||||
|
);
|
||||||
|
|
||||||
unlink($tmplFile);
|
unlink($tmplFile);
|
||||||
|
|
||||||
|
|||||||
@ -7,7 +7,14 @@
|
|||||||
* @package framework
|
* @package framework
|
||||||
* @subpackage view
|
* @subpackage view
|
||||||
*/
|
*/
|
||||||
class Requirements {
|
class Requirements implements Flushable {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Triggered early in the request when someone requests a flush.
|
||||||
|
*/
|
||||||
|
public static function flush() {
|
||||||
|
self::delete_all_combined_files();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enable combining of css/javascript files.
|
* Enable combining of css/javascript files.
|
||||||
@ -272,6 +279,13 @@ class Requirements {
|
|||||||
return self::backend()->delete_combined_files($combinedFileName);
|
return self::backend()->delete_combined_files($combinedFileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deletes all generated combined files in the configured combined files directory,
|
||||||
|
* but doesn't delete the directory itself.
|
||||||
|
*/
|
||||||
|
public static function delete_all_combined_files() {
|
||||||
|
return self::backend()->delete_all_combined_files();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Re-sets the combined files definition. See {@link Requirements_Backend::clear_combined_files()}
|
* Re-sets the combined files definition. See {@link Requirements_Backend::clear_combined_files()}
|
||||||
@ -744,12 +758,22 @@ class Requirements_Backend {
|
|||||||
$jsRequirements = preg_replace('/>\n*/', '>', $jsRequirements);
|
$jsRequirements = preg_replace('/>\n*/', '>', $jsRequirements);
|
||||||
|
|
||||||
// We put script tags into the body, for performance.
|
// We put script tags into the body, for performance.
|
||||||
// If your template already has script tags in the body, then we put our script
|
// If your template already has script tags in the body, then we try to put our script
|
||||||
// tags just before those. Otherwise, we put it at the bottom.
|
// tags just before those. Otherwise, we put it at the bottom.
|
||||||
$p2 = stripos($content, '<body');
|
$p2 = stripos($content, '<body');
|
||||||
$p1 = stripos($content, '<script', $p2);
|
$p1 = stripos($content, '<script', $p2);
|
||||||
|
|
||||||
if($p1 !== false) {
|
$commentTags = array();
|
||||||
|
$canWriteToBody = ($p1 !== false)
|
||||||
|
&&
|
||||||
|
//check that the script tag is not inside a html comment tag
|
||||||
|
!(
|
||||||
|
preg_match('/.*(?|(<!--)|(-->))/U', $content, $commentTags, 0, $p1)
|
||||||
|
&&
|
||||||
|
$commentTags[1] == '-->'
|
||||||
|
);
|
||||||
|
|
||||||
|
if($canWriteToBody) {
|
||||||
$content = substr($content,0,$p1) . $jsRequirements . substr($content,$p1);
|
$content = substr($content,0,$p1) . $jsRequirements . substr($content,$p1);
|
||||||
} else {
|
} else {
|
||||||
$content = preg_replace("/(<\/body[^>]*>)/i", $jsRequirements . "\\1", $content);
|
$content = preg_replace("/(<\/body[^>]*>)/i", $jsRequirements . "\\1", $content);
|
||||||
@ -1005,6 +1029,20 @@ class Requirements_Backend {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deletes all generated combined files in the configured combined files directory,
|
||||||
|
* but doesn't delete the directory itself.
|
||||||
|
*/
|
||||||
|
public function delete_all_combined_files() {
|
||||||
|
$combinedFolder = $this->getCombinedFilesFolder();
|
||||||
|
if(!$combinedFolder) return false;
|
||||||
|
|
||||||
|
$path = Director::baseFolder() . '/' . $combinedFolder;
|
||||||
|
if(file_exists($path)) {
|
||||||
|
Filesystem::removeFolder($path, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function clear_combined_files() {
|
public function clear_combined_files() {
|
||||||
$this->combine_files = array();
|
$this->combine_files = array();
|
||||||
}
|
}
|
||||||
@ -1085,7 +1123,7 @@ class Requirements_Backend {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Determine if we need to build the combined include
|
// Determine if we need to build the combined include
|
||||||
if(file_exists($combinedFilePath) && !isset($_GET['flush'])) {
|
if(file_exists($combinedFilePath)) {
|
||||||
// file exists, check modification date of every contained file
|
// file exists, check modification date of every contained file
|
||||||
$srcLastMod = 0;
|
$srcLastMod = 0;
|
||||||
foreach($fileList as $file) {
|
foreach($fileList as $file) {
|
||||||
|
|||||||
@ -4673,8 +4673,8 @@ class SSTemplateParser extends Parser implements TemplateParser {
|
|||||||
// TODO: This is pretty ugly & gets applied on all files not just html. I wonder if we can make this
|
// TODO: This is pretty ugly & gets applied on all files not just html. I wonder if we can make this
|
||||||
// non-dynamically calculated
|
// non-dynamically calculated
|
||||||
$text = preg_replace(
|
$text = preg_replace(
|
||||||
'/href\s*\=\s*\"\#/',
|
'/(<a[^>]+href *= *)"#/i',
|
||||||
'href="\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ?' .
|
'\\1"\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ?' .
|
||||||
' strip_tags( $_SERVER[\'REQUEST_URI\'] ) : "") .
|
' strip_tags( $_SERVER[\'REQUEST_URI\'] ) : "") .
|
||||||
\'#',
|
\'#',
|
||||||
$text
|
$text
|
||||||
|
|||||||
@ -1127,8 +1127,8 @@ class SSTemplateParser extends Parser implements TemplateParser {
|
|||||||
// TODO: This is pretty ugly & gets applied on all files not just html. I wonder if we can make this
|
// TODO: This is pretty ugly & gets applied on all files not just html. I wonder if we can make this
|
||||||
// non-dynamically calculated
|
// non-dynamically calculated
|
||||||
$text = preg_replace(
|
$text = preg_replace(
|
||||||
'/href\s*\=\s*\"\#/',
|
'/(<a[^>]+href *= *)"#/i',
|
||||||
'href="\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ?' .
|
'\\1"\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ?' .
|
||||||
' strip_tags( $_SERVER[\'REQUEST_URI\'] ) : "") .
|
' strip_tags( $_SERVER[\'REQUEST_URI\'] ) : "") .
|
||||||
\'#',
|
\'#',
|
||||||
$text
|
$text
|
||||||
|
|||||||
@ -555,7 +555,7 @@ class SSViewer_DataPresenter extends SSViewer_Scope {
|
|||||||
* <b>Caching</b>
|
* <b>Caching</b>
|
||||||
*
|
*
|
||||||
* Compiled templates are cached via {@link SS_Cache}, usually on the filesystem.
|
* Compiled templates are cached via {@link SS_Cache}, usually on the filesystem.
|
||||||
* If you put ?flush=all on your URL, it will force the template to be recompiled.
|
* If you put ?flush=1 on your URL, it will force the template to be recompiled.
|
||||||
*
|
*
|
||||||
* @see http://doc.silverstripe.org/themes
|
* @see http://doc.silverstripe.org/themes
|
||||||
* @see http://doc.silverstripe.org/themes:developing
|
* @see http://doc.silverstripe.org/themes:developing
|
||||||
@ -563,7 +563,7 @@ class SSViewer_DataPresenter extends SSViewer_Scope {
|
|||||||
* @package framework
|
* @package framework
|
||||||
* @subpackage view
|
* @subpackage view
|
||||||
*/
|
*/
|
||||||
class SSViewer {
|
class SSViewer implements Flushable {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @config
|
* @config
|
||||||
@ -571,6 +571,16 @@ class SSViewer {
|
|||||||
*/
|
*/
|
||||||
private static $source_file_comments = false;
|
private static $source_file_comments = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @ignore
|
||||||
|
*/
|
||||||
|
private static $template_cache_flushed = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @ignore
|
||||||
|
*/
|
||||||
|
private static $cacheblock_cache_flushed = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set whether HTML comments indicating the source .SS file used to render this page should be
|
* Set whether HTML comments indicating the source .SS file used to render this page should be
|
||||||
* included in the output. This is enabled by default
|
* included in the output. This is enabled by default
|
||||||
@ -638,6 +648,14 @@ class SSViewer {
|
|||||||
*/
|
*/
|
||||||
private static $global_key = '$CurrentReadingMode, $CurrentUser.ID';
|
private static $global_key = '$CurrentReadingMode, $CurrentUser.ID';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Triggered early in the request when someone requests a flush.
|
||||||
|
*/
|
||||||
|
public static function flush() {
|
||||||
|
self::flush_template_cache(true);
|
||||||
|
self::flush_cacheblock_cache(true);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a template from a string instead of a .ss file
|
* Create a template from a string instead of a .ss file
|
||||||
*
|
*
|
||||||
@ -757,18 +775,6 @@ class SSViewer {
|
|||||||
public function __construct($templateList, TemplateParser $parser = null) {
|
public function __construct($templateList, TemplateParser $parser = null) {
|
||||||
$this->setParser($parser ?: Injector::inst()->get('SSTemplateParser'));
|
$this->setParser($parser ?: Injector::inst()->get('SSTemplateParser'));
|
||||||
|
|
||||||
// flush template manifest cache if requested
|
|
||||||
if (isset($_GET['flush']) && $_GET['flush'] == 'all') {
|
|
||||||
if(Director::isDev() || Director::is_cli() || Permission::check('ADMIN')) {
|
|
||||||
self::flush_template_cache();
|
|
||||||
} else {
|
|
||||||
if(!Security::ignore_disallowed_actions()) {
|
|
||||||
return Security::permissionFailure(null, 'Please log in as an administrator to flush ' .
|
|
||||||
'the template cache.');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!is_array($templateList) && substr((string) $templateList,-3) == '.ss') {
|
if(!is_array($templateList) && substr((string) $templateList,-3) == '.ss') {
|
||||||
$this->chosenTemplates['main'] = $templateList;
|
$this->chosenTemplates['main'] = $templateList;
|
||||||
} else {
|
} else {
|
||||||
@ -926,23 +932,49 @@ class SSViewer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @ignore
|
|
||||||
*/
|
|
||||||
static private $flushed = false;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clears all parsed template files in the cache folder.
|
* Clears all parsed template files in the cache folder.
|
||||||
*
|
*
|
||||||
* Can only be called once per request (there may be multiple SSViewer instances).
|
* Can only be called once per request (there may be multiple SSViewer instances).
|
||||||
|
*
|
||||||
|
* @param bool $force Set this to true to force a re-flush. If left to false, flushing
|
||||||
|
* may only be performed once a request.
|
||||||
*/
|
*/
|
||||||
public static function flush_template_cache() {
|
public static function flush_template_cache($force = false) {
|
||||||
if (!self::$flushed) {
|
if (!self::$template_cache_flushed || $force) {
|
||||||
$dir = dir(TEMP_FOLDER);
|
$dir = dir(TEMP_FOLDER);
|
||||||
while (false !== ($file = $dir->read())) {
|
while (false !== ($file = $dir->read())) {
|
||||||
if (strstr($file, '.cache')) { unlink(TEMP_FOLDER.'/'.$file); }
|
if (strstr($file, '.cache')) unlink(TEMP_FOLDER . '/' . $file);
|
||||||
}
|
}
|
||||||
self::$flushed = true;
|
self::$template_cache_flushed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clears all partial cache blocks.
|
||||||
|
*
|
||||||
|
* Can only be called once per request (there may be multiple SSViewer instances).
|
||||||
|
*
|
||||||
|
* @param bool $force Set this to true to force a re-flush. If left to false, flushing
|
||||||
|
* may only be performed once a request.
|
||||||
|
*/
|
||||||
|
public static function flush_cacheblock_cache($force = false) {
|
||||||
|
if (!self::$cacheblock_cache_flushed || $force) {
|
||||||
|
$cache = SS_Cache::factory('cacheblock');
|
||||||
|
$backend = $cache->getBackend();
|
||||||
|
|
||||||
|
if(
|
||||||
|
$backend instanceof Zend_Cache_Backend_ExtendedInterface
|
||||||
|
&& ($capabilities = $backend->getCapabilities())
|
||||||
|
&& $capabilities['tags']
|
||||||
|
) {
|
||||||
|
$cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, $cache->getTags());
|
||||||
|
} else {
|
||||||
|
$cache->clean(Zend_Cache::CLEANING_MODE_ALL);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
self::$cacheblock_cache_flushed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1044,7 +1076,7 @@ class SSViewer {
|
|||||||
. str_replace(array('\\','/',':'), '.', Director::makeRelative(realpath($template)));
|
. str_replace(array('\\','/',':'), '.', Director::makeRelative(realpath($template)));
|
||||||
$lastEdited = filemtime($template);
|
$lastEdited = filemtime($template);
|
||||||
|
|
||||||
if(!file_exists($cacheFile) || filemtime($cacheFile) < $lastEdited || isset($_GET['flush'])) {
|
if(!file_exists($cacheFile) || filemtime($cacheFile) < $lastEdited) {
|
||||||
$content = file_get_contents($template);
|
$content = file_get_contents($template);
|
||||||
$content = $this->parseTemplateContent($content, $template);
|
$content = $this->parseTemplateContent($content, $template);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user