diff --git a/.gitattributes b/.gitattributes
index 475f5f2..89eb187 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,3 +4,4 @@
/.gitignore export-ignore
/.travis.yml export-ignore
/.scrutinizer.yml export-ignore
+/codecov.yml export-ignore
diff --git a/.travis.yml b/.travis.yml
index aad900e..7a70cdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: php
env:
global:
- - COMPOSER_ROOT_VERSION="4.0.x-dev"
+ - COMPOSER_ROOT_VERSION="2.x-dev"
matrix:
include:
diff --git a/README.md b/README.md
index 4d68583..a112a81 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,8 @@
# Widgets Module
-[![Build Status](http://img.shields.io/travis/silverstripe/silverstripe-widgets.svg?style=flat-square)](https://travis-ci.org/silverstripe/silverstripe-widgets)
-[![Code Quality](http://img.shields.io/scrutinizer/g/silverstripe/silverstripe-widgets.svg?style=flat-square)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-widgets)
-[![Code Coverage](https://codecov.io/gh/silverstripe/silverstripe-widgets/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-widgets)
-[![Version](http://img.shields.io/packagist/v/silverstripe/widgets.svg?style=flat-square)](https://packagist.org/packages/silverstripe/widgets)
-[![License](http://img.shields.io/packagist/l/silverstripe/widgets.svg?style=flat-square)](LICENSE.md)
+[![Build Status](http://img.shields.io/travis/silverstripe/silverstripe-widgets.svg)](https://travis-ci.org/silverstripe/silverstripe-widgets)
+[![Code Quality](http://img.shields.io/scrutinizer/g/silverstripe/silverstripe-widgets.svg)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-widgets)
+[![Code Coverage](https://img.shields.io/codecov/c/github/silverstripe/silverstripe-widgets.svg)](https://codecov.io/gh/silverstripe/silverstripe-widgets)
## Overview
@@ -13,8 +11,9 @@ the sidebar of your website.
## Requirements
- * SilverStripe 4.0
-
+* SilverStripe 4.0
+
+**Note:** this version is compatible with SilverStripe 4. For SilverStripe 3, please see [the 1.x release line](https://github.com/silverstripe/silverstripe-widgets/tree/1.3).
### Installation
diff --git a/composer.json b/composer.json
index 0434fb9..d6f702d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"name": "silverstripe/widgets",
"description": "Widgets are small pieces of functionality such as showing the latest Comments or Flickr Photos. They normally display on the sidebar of your website.",
- "type": "silverstripe-module",
+ "type": "silverstripe-vendormodule",
"keywords": ["silverstripe", "widgets", "blog"],
"authors": [
{
diff --git a/lang/ar.yml b/lang/ar.yml
index ba3faa9..cedef65 100644
--- a/lang/ar.yml
+++ b/lang/ar.yml
@@ -1,11 +1,11 @@
ar:
- Widget:
+ SilverStripe\Widgets\Model\Widget:
PLURALNAME: 'تطبيقات مصغرة'
SINGULARNAME: 'تطبيق مصغر'
- WidgetArea:
+ SilverStripe\Widgets\Model\WidgetArea:
PLURALNAME: 'مساحات التطبيقات المصغرة'
SINGULARNAME: 'مساحة التطبيقات المصغرة'
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'التطبيقات المصغرة المتاحة'
AVAILWIDGETS: 'اضغط على عنوان تطبيق مصغر بالأسفل لاستخدامه بهذه الصفحة.'
INUSE: 'التطبيقات المصغرة المستخدمة حاليا'
diff --git a/lang/de.yml b/lang/de.yml
index bfaeaed..437a3ed 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -1,11 +1,11 @@
de:
- Widget:
+ SilverStripe\Widgets\Model\Widget:
PLURALNAME: Widgets
SINGULARNAME: Widget
- WidgetArea:
+ SilverStripe\Widgets\Model\WidgetArea:
PLURALNAME: Widgetbereiche
SINGULARNAME: Widgetbereich
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'Vorhandene Widgets'
AVAILWIDGETS: 'Klicke den Widget Titel, um es zu benutzen.'
INUSE: 'Benutzte Widgets'
diff --git a/lang/en.yml b/lang/en.yml
index 4d96be6..5d797f3 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -1,19 +1,25 @@
en:
- Widget:
- PLURALNAME: Widgets
- SINGULARNAME: Widget
- WidgetArea:
- PLURALNAME: 'Widget Areas'
- SINGULARNAME: 'Widget Area'
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Extensions\WidgetPageExtension:
+ INHERITSIDEBAR: 'Inherit Sidebar From Parent'
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'Available Widgets'
AVAILWIDGETS: 'Click a widget title below to use it on this page.'
INUSE: 'Widgets currently used'
NOAVAIL: 'There are currently no widgets available.'
TOSORT: 'To sort currently used widgets on this page, drag them up and down.'
+ SilverStripe\Widgets\Model\Widget:
+ PLURALNAME: Widgets
+ PLURALS:
+ one: 'A Widget'
+ other: '{count} Widgets'
+ SINGULARNAME: Widget
+ SilverStripe\Widgets\Model\WidgetArea:
+ PLURALNAME: 'Widget Areas'
+ PLURALS:
+ one: 'A Widget Area'
+ other: '{count} Widget Areas'
+ SINGULARNAME: 'Widget Area'
WidgetDescription_ss:
CLICKTOADDWIDGET: 'Click to add this widget'
WidgetEditor_ss:
DELETE: Delete
- WidgetPageExtension:
- INHERITSIDEBAR: 'Inherit Sidebar From Parent'
diff --git a/lang/eo.yml b/lang/eo.yml
index 9f59308..28c0559 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -1,11 +1,11 @@
eo:
- Widget:
+ SilverStripe\Widgets\Model\Widget:
PLURALNAME: Fenestraĵoj
SINGULARNAME: Fenestraĵo
- WidgetArea:
+ SilverStripe\Widgets\Model\WidgetArea:
PLURALNAME: 'Fenestraĵaj zonoj'
SINGULARNAME: 'Fenestraĵa zono'
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'Disponeblaj fenestraĵoj'
AVAILWIDGETS: 'Alklaku sube titolon de fenestraĵo por uzi ĝin en ĉi tiu paĝo.'
INUSE: 'Fenestraĵoj aktuale uzataj'
diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
index 4782275..004259f 100644
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@@ -1,11 +1,11 @@
fa_IR:
- Widget:
+ SilverStripe\Widgets\Model\Widget:
PLURALNAME: 'ویجت ها'
SINGULARNAME: ویجت
- WidgetArea:
+ SilverStripe\Widgets\Model\WidgetArea:
PLURALNAME: 'محیط ویجت ها'
SINGULARNAME: 'محیط ویجت'
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'ویجت های موجود'
AVAILWIDGETS: 'بر روی عنوان یک ویجت در پایین کلیک کنید تا آن را در این صفحه بکار بگیرید.'
INUSE: 'ویجت هایی که در حال حاضر استفاده می شوند'
diff --git a/lang/fi.yml b/lang/fi.yml
index a19b31c..97e5309 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -1,11 +1,11 @@
fi:
- Widget:
+ SilverStripe\Widgets\Model\Widget:
PLURALNAME: Vimpaimet
SINGULARNAME: Vimpain
- WidgetArea:
+ SilverStripe\Widgets\Model\WidgetArea:
PLURALNAME: 'Vimpain alueet'
SINGULARNAME: 'Vimpain alue'
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'Käytettävissä olevat vimpaimet'
AVAILWIDGETS: 'Napsauta vimpaimen otsikkoa alla ottaaksesi se käyttöön tällä sivulla.'
INUSE: 'Käytössä olevat vimpaimet'
diff --git a/lang/hr.yml b/lang/hr.yml
index 73aa32e..64add83 100644
--- a/lang/hr.yml
+++ b/lang/hr.yml
@@ -1,11 +1,11 @@
hr:
- Widget:
+ SilverStripe\Widgets\Model\Widget:
PLURALNAME: Widgeti
SINGULARNAME: Widget
- WidgetArea:
+ SilverStripe\Widgets\Model\WidgetArea:
PLURALNAME: 'Zone widgeta'
SINGULARNAME: 'Zona widgeta'
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'Dostupni widgeti'
AVAILWIDGETS: 'Kliknite na naziv widgeta ispod za korištenje na ovoj stranici'
INUSE: 'Trenutno korišteni widgeti'
diff --git a/lang/it_IT.yml b/lang/it_IT.yml
index 50a8a55..a5f387f 100644
--- a/lang/it_IT.yml
+++ b/lang/it_IT.yml
@@ -1,11 +1,11 @@
it_IT:
- Widget:
+ SilverStripe\Widgets\Model\Widget:
PLURALNAME: Widgets
SINGULARNAME: Widget
- WidgetArea:
+ SilverStripe\Widgets\Model\WidgetArea:
PLURALNAME: 'Aree Widget'
SINGULARNAME: 'Area Widget'
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'Widgets disponibili'
AVAILWIDGETS: 'Clicca sul titolo di un widget qui sotto per usarlo in questa pagina'
INUSE: 'Widgets attualmente utilizzati'
diff --git a/lang/nl.yml b/lang/nl.yml
index dd52b82..830631a 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -1,5 +1,5 @@
nl:
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'Beschikbare Widgets'
AVAILWIDGETS: 'Klik op een widget titel hieronder, om de widget te gebruiken op deze pagina.'
INUSE: 'Huidige gebruikte Widgets'
diff --git a/lang/pl_PL.yml b/lang/pl_PL.yml
index 5b76731..8910d94 100644
--- a/lang/pl_PL.yml
+++ b/lang/pl_PL.yml
@@ -1,5 +1,5 @@
pl_PL:
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'Dostępne widżety'
AVAILWIDGETS: 'Kliknij w tytuł widżetu, aby używać go na tej stronie.'
INUSE: 'Obecnie stosowane widżety'
diff --git a/lang/ro_RO.yml b/lang/ro_RO.yml
index b279ce9..cf397c6 100644
--- a/lang/ro_RO.yml
+++ b/lang/ro_RO.yml
@@ -1,5 +1,5 @@
ro_RO:
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'Widget-uri disponibile'
AVAILWIDGETS: 'Faceți clic pe un titlu widget de mai jos pentru a-l folosi pe aceasta pagina.'
INUSE: 'Widget-uri utilizate în prezent'
diff --git a/lang/ru.yml b/lang/ru.yml
index 04959f6..1cc0956 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -1,11 +1,11 @@
ru:
- Widget:
+ SilverStripe\Widgets\Model\Widget:
PLURALNAME: Виджеты
SINGULARNAME: Виджет
- WidgetArea:
+ SilverStripe\Widgets\Model\WidgetArea:
PLURALNAME: 'Области виджетов'
SINGULARNAME: 'Область виджета'
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'Доступные виджеты'
AVAILWIDGETS: 'Щелкните заголовок виджета ниже, чтобы использовать его на этой странице.'
INUSE: 'Используемые виджеты'
diff --git a/lang/sk.yml b/lang/sk.yml
index d896c60..71ae736 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -1,11 +1,11 @@
sk:
- Widget:
+ SilverStripe\Widgets\Model\Widget:
PLURALNAME: Widgety
SINGULARNAME: Widget
- WidgetArea:
+ SilverStripe\Widgets\Model\WidgetArea:
PLURALNAME: 'Oblasti widgetu'
SINGULARNAME: 'Oblasť widgetu'
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'Dostupné widgety'
AVAILWIDGETS: 'Kliknite na názov widgetu pre jeho použitie na tejto stránke.'
INUSE: 'Momentálne používané widgety.'
diff --git a/lang/sv.yml b/lang/sv.yml
index f6d0157..89809d2 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -1,11 +1,11 @@
sv:
- Widget:
+ SilverStripe\Widgets\Model\Widget:
PLURALNAME: Widgets
SINGULARNAME: Widget
- WidgetArea:
+ SilverStripe\Widgets\Model\WidgetArea:
PLURALNAME: Widgetområden
SINGULARNAME: Widgetområde
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 'Tillgängliga widgets'
AVAILWIDGETS: 'Klicka på en widget nedan för att använda den på sidan.'
INUSE: 'Använda widgets'
diff --git a/lang/zh.yml b/lang/zh.yml
index 5ce6487..af291cb 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -1,11 +1,11 @@
zh:
- Widget:
+ SilverStripe\Widgets\Model\Widget:
PLURALNAME: 小工具
SINGULARNAME: 小工具
- WidgetArea:
+ SilverStripe\Widgets\Model\WidgetArea:
PLURALNAME: 小工具区域
SINGULARNAME: 小工具区域
- WidgetAreaEditor_ss:
+ SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
AVAILABLE: 可用的小工具
AVAILWIDGETS: 点击下方的小工具名称即可在此页上使用。
INUSE: 当前使用的小工具
diff --git a/license.md b/license.md
index 9445c8e..8794670 100644
--- a/license.md
+++ b/license.md
@@ -1,4 +1,4 @@
-Copyright (c) 2016, SilverStripe Limited
+Copyright (c) 2017, SilverStripe Limited
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
new file mode 100644
index 0000000..0be077b
--- /dev/null
+++ b/phpcs.xml.dist
@@ -0,0 +1,9 @@
+
+
<% _t('WidgetAreaEditor_ss.NOAVAIL', 'There are currently no widgets available.') %>
+<%t SilverStripe\\Widgets\\Forms\\WidgetAreaEditor_ss.NOAVAIL 'There are currently no widgets available.' %>
+