From cf75166d83fdeb5037aadf9e1191c2137e69a2a7 Mon Sep 17 00:00:00 2001 From: Jeremy Bridson Date: Mon, 12 Aug 2013 15:39:00 +1200 Subject: [PATCH 1/4] =?UTF-8?q?MINOR:=20ISSUE-19=20CWP=20Accessibility=20f?= =?UTF-8?q?ixes=20-=20Added=20macron=20to=20M=C4=81ori=20toggle=20button?= =?UTF-8?q?=20for=20translations=20on=20the=20CWP=20demo=20site.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/i18n.php | 4 ++-- thirdparty/Zend/Locale/Data/Translation.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/i18n.php b/i18n/i18n.php index b54b13947..fd87f58fa 100644 --- a/i18n/i18n.php +++ b/i18n/i18n.php @@ -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( diff --git a/thirdparty/Zend/Locale/Data/Translation.php b/thirdparty/Zend/Locale/Data/Translation.php index 916abff3f..0db97088d 100644 --- a/thirdparty/Zend/Locale/Data/Translation.php +++ b/thirdparty/Zend/Locale/Data/Translation.php @@ -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', From fb67181366c3df17e7c89c90d6bf4166ac9cb13c Mon Sep 17 00:00:00 2001 From: Naomi Guyer Date: Wed, 7 Aug 2013 13:40:37 +1200 Subject: [PATCH 2/4] BUG: Context menu too long - CSS only (Fixes CMS #811) --- admin/css/screen.css | 6 ++++++ admin/scss/_tree.scss | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/admin/css/screen.css b/admin/css/screen.css index 36acef0eb..5222c9ceb 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -789,6 +789,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; } diff --git a/admin/scss/_tree.scss b/admin/scss/_tree.scss index ad2749277..19990a997 100644 --- a/admin/scss/_tree.scss +++ b/admin/scss/_tree.scss @@ -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 { From 362d35742fc79d8b533a5104e1ae7958a824c796 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 16 Aug 2013 13:05:30 +0200 Subject: [PATCH 3/4] Fixed behat tests to confirm file deletion dialog --- tests/behat/features/manage-files.feature | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/behat/features/manage-files.feature b/tests/behat/features/manage-files.feature index c56938475..0a817eb3a 100644 --- a/tests/behat/features/manage-files.feature +++ b/tests/behat/features/manage-files.feature @@ -44,6 +44,7 @@ Feature: Manage files 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 confirm the dialog Then the "folder1" table should not contain "file1" Scenario: I can change the folder of a file From de3b1b22d3b483823c1582569677f45facbb636f Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 16 Aug 2013 13:32:23 +0200 Subject: [PATCH 4/4] Fixed behat tests for confirming grid field dialogs --- tests/behat/features/manage-files.feature | 3 +-- tests/behat/features/manage-users.feature | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/behat/features/manage-files.feature b/tests/behat/features/manage-files.feature index 0a817eb3a..4a4675e04 100644 --- a/tests/behat/features/manage-files.feature +++ b/tests/behat/features/manage-files.feature @@ -43,8 +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 confirm the dialog + 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 diff --git a/tests/behat/features/manage-users.feature b/tests/behat/features/manage-users.feature index 7b4a7e2d7..99d608d3f 100644 --- a/tests/behat/features/manage-users.feature +++ b/tests/behat/features/manage-users.feature @@ -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" \ No newline at end of file