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

BUGFIX:fixed broken styling of iframe in IE for member and group import

Browse Source
This commit is contained in:
Jeremy Bridson 2013-01-15 12:16:45 +13:00 committed by Ingo Schommer
parent 80feb8c0b4
commit a93f8841d7
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/code/SecurityAdmin.php
View File

@ -105,7 +105,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
new LiteralField(
'MemberImportFormIframe',
sprintf(
'<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="250px" border="0">'
'<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="250px" frameBorder="0">'
. '</iframe>',
$this->Link('memberimport')
)
@ -117,7 +117,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
new LiteralField(
'GroupImportFormIframe',
sprintf(
'<iframe src="%s" id="GroupImportFormIframe" width="100%%" height="250px" border="0">'
'<iframe src="%s" id="GroupImportFormIframe" width="100%%" height="250px" frameBorder="0">'
. '</iframe>',
$this->Link('groupimport')
)

2
admin/css/screen.css
View File

@ -679,6 +679,8 @@ form.small .cms-file-info-data .field .middleColumn { margin-left: 120px; }
.members_grid p button#action_export span.btn-icon-download-csv { height: 17px; }
/** Import forms */
body.SecurityAdmin { background-color: #eceff1; }
form.import-form ul { list-style: disc; }
form.import-form ul li { margin-left: 20px; }
form.import-form p { margin-bottom: 5px; }

5
admin/scss/_style.scss
View File

@ -1573,6 +1573,11 @@ form.small {
/**
* Import forms
*/
body.SecurityAdmin {
background-color: $tab-panel-texture-color; //adds background to import members/groups iframe
}
form.import-form {
ul {
list-style: disc;