tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1.0' into 3.1

This commit is contained in:
Ingo Schommer 2013-08-16 13:36:34 +02:00
parent acc07e67ea de3b1b22d3
commit d325551079
6 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/css/screen.css
View File

@ -792,6 +792,12 @@ form.import-form label.left { width: 250px; }
.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 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.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-3, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul.col-3 { width: 540px; }
.cms #vakata-contextmenu li ul.col-3 li, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul.col-3 li { width: 33%; }
.cms #vakata-contextmenu li ul li, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul li { min-width: 180px; float: left; }
.cms #vakata-contextmenu li ul li a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul li a { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
.cms #vakata-contextmenu li.vakata-separator, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-separator { min-height: 0; height: 1px; line-height: 1px; font-size: 1px; overflow: hidden; margin: 0 2px; background: #ccc; padding: 0; }
.cms #vakata-dragged, .TreeDropdownField .treedropdownfield-panel #vakata-dragged { display: block; margin: 0 0 0 0; padding: 4px 4px 4px 24px; position: absolute; top: -2000px; line-height: 16px; z-index: 10000; }
.cms #vakata-dragged ins, .TreeDropdownField .treedropdownfield-panel #vakata-dragged ins { display: block; text-decoration: none; width: 16px; height: 16px; margin: 0 0 0 0; padding: 0; position: absolute; top: 4px; left: 4px; -moz-border-radius: 4px; border-radius: 4px; -webkit-border-radius: 4px; }

19
admin/scss/_tree.scss
View File

@ -337,6 +337,25 @@
background: #FFF;
border: 1px solid silver;
@include box-shadow(0 0 10px #CCC);
&.col-2{
width:360px;
li{
width:50%;
}
}
&.col-3{
width:540px;
li{
width:33%;
}
}
li{
min-width:180px;
float:left;
a{
@include hide-text-overflow;
}
}
}
li{
&.vakata-separator {

4
i18n/i18n.php
View File

@ -834,7 +834,7 @@ class i18n extends Object implements TemplateGlobalProvider {
'native' => 'македонски'
),
'mi' => array(
'name' => 'Maori',
'name' => 'Māori',
'native' => 'Māori'
),
'ms' => array(
@ -1183,7 +1183,7 @@ class i18n extends Object implements TemplateGlobalProvider {
'native' => 'македонски'
),
'mi_NZ' => array(
'name' => 'Maori',
'name' => 'Māori',
'native' => 'Māori'
),
'ms_MY' => array(

2
tests/behat/features/manage-files.feature
View File

@ -43,7 +43,7 @@ Feature: Manage files
Scenario: I can delete a file
Given I click on "folder1" in the "Files" table
And I click on "file1" in the "folder1" table
And I press the "Delete" button
And I press the "Delete" button, confirming the dialog
Then the "folder1" table should not contain "file1"
Scenario: I can change the folder of a file

2
tests/behat/features/manage-users.feature
View File

@ -51,6 +51,6 @@ Feature: Manage users
Scenario: I can delete an existing user
When I click the "Users" CMS tab
And I click "staffmember@test.com" in the "#Root_Users" element
And I press the "Delete" button
And I press the "Delete" button, confirming the dialog
Then I should see "admin@test.com"
And I should not see "staffmember@test.com"

2
thirdparty/Zend/Locale/Data/Translation.php vendored
View File

@ -109,7 +109,7 @@ class Zend_Locale_Data_Translation
'Malayalam' => 'ml',
'Maltese' => 'mt',
'Manipuri' => 'mni',
'Maori' => 'mi',
'Māori' => 'mi',
'Marathi' => 'mr',
'Mongolian' => 'mn',
'Nepali' => 'ne',