From 45c800a818094e82954f9b01e2fdc0596967e018 Mon Sep 17 00:00:00 2001 From: Nicolaas / Sunn Side Up Date: Sun, 4 Sep 2022 15:07:43 +1200 Subject: [PATCH 01/11] Update config.yml --- _config/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/_config/config.yml b/_config/config.yml index 6305e3a..b5fbe87 100644 --- a/_config/config.yml +++ b/_config/config.yml @@ -10,6 +10,7 @@ SilverStripe\SiteConfig\SiteConfig: extensions: - ilateral\SilverStripe\Dashboard\Extensions\DashboardSiteConfig -SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest: - extensions: - - ilateral\SilverStripe\Dashboard\Extensions\DashboardItemEditForm \ No newline at end of file +# this is so generic, it can break lots of other things. +#SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest: +# extensions: +# - ilateral\SilverStripe\Dashboard\Extensions\DashboardItemEditForm From 39a3ac862163b093427c8333e849f0d4e8284379 Mon Sep 17 00:00:00 2001 From: Nicolaas / Sunn Side Up Date: Sun, 4 Sep 2022 15:08:53 +1200 Subject: [PATCH 02/11] Update DashboardPanel.php --- src/Panels/DashboardPanel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Panels/DashboardPanel.php b/src/Panels/DashboardPanel.php index 9c353ef..14b2152 100755 --- a/src/Panels/DashboardPanel.php +++ b/src/Panels/DashboardPanel.php @@ -281,7 +281,7 @@ public function getPanelHolder(): string */ public function getSize(): string { - return $this->PanelSize; + return (string) $this->PanelSize; } /** From ee47169bb730aaf158444c14c2de99561123c6c6 Mon Sep 17 00:00:00 2001 From: "Nicolaas @ Tappy @ Sunny Side Up" Date: Sun, 4 Sep 2022 15:12:29 +1200 Subject: [PATCH 03/11] WIP --- _config/legacy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config/legacy.yml b/_config/legacy.yml index a50c8ab..d4b97c7 100644 --- a/_config/legacy.yml +++ b/_config/legacy.yml @@ -5,5 +5,5 @@ SilverStripe\ORM\DatabaseAdmin: classname_value_remapping: DashboardPanel: 'ilateral\SilverStripe\Dashboard\DashboardPanel' DashboardPanelDataObject: 'ilateral\SilverStripe\Dashboard\DashboardPanelDataObject' - UncleCheese\Dashboard\DashboardPanel: 'ilateral\SilverStripe\Dashboard\DashboardPanel' + UncleCheese\Dashboard\DashboardPanel: 'ilateral\SilverStripe\Dashboard\Panels\DashboardPanel' UncleCheese\Dashboard\DashboardPanelDataObject: 'ilateral\SilverStripe\Dashboard\DashboardPanelDataObject' From c862d63341e3ecfb9338e2acedcc3ec2842539f6 Mon Sep 17 00:00:00 2001 From: Sunny Side Up Date: Tue, 1 Aug 2023 12:20:30 +1200 Subject: [PATCH 04/11] MINOR: update to SilverStripe 5.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d067f68..de3c0ab 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ } ], "require": { - "silverstripe/framework": "^4.0" + "silverstripe/framework": "^4.0 || ^5.0" }, "replace": { "silverstripe/dashboard": "*" From 1e1199820da48fe98f52ea94a126500b5535ddfc Mon Sep 17 00:00:00 2001 From: Sunny Side Up Date: Tue, 1 Aug 2023 12:23:00 +1200 Subject: [PATCH 05/11] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index de3c0ab..6e915d9 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "i-lateral/silverstripe-dashboard", + "name": "sunnysideup/silverstripe-dashboard", "description": "Adds a customisable dashboard to the SilverStripe CMS (fork of Unclecheese's module)", "type": "silverstripe-vendormodule", "keywords": [ From 1f3d21ee9fd67248a07cccb3b7de494fc0581aa2 Mon Sep 17 00:00:00 2001 From: Nicolaas Date: Wed, 2 Aug 2023 10:47:51 +1200 Subject: [PATCH 06/11] PATCH: fixing references --- CONTRIBUTING.md | 6 +++--- _config/adminpanels.yml | 14 +++++++------- composer.json | 2 +- .../Dashboard/Panels/DashboardPanel_Holder.ss | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 91f7629..274c702 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,11 +6,11 @@ welcome any feedback that a user may have. If you encounter any issues, have any ideas or want to request a feature, please use the following links: - * [Sharing your opinion and raising issues](https://github.com/i-lateral/silverstripe-dashboard/issues) - * [Submit a pull request](https://github.com/i-lateral/silverstripe-dashboard/pulls) + * [Sharing your opinion and raising issues](https://github.com/sunnysideup/silverstripe-dashboard/issues) + * [Submit a pull request](https://github.com/sunnysideup/silverstripe-dashboard/pulls) ## Translations If you would like to add some translations to this module, please either provide us with a pull request or alternativley submit an issue with the -translations you would like implemented \ No newline at end of file +translations you would like implemented diff --git a/_config/adminpanels.yml b/_config/adminpanels.yml index 2ebeb06..cdf9a32 100644 --- a/_config/adminpanels.yml +++ b/_config/adminpanels.yml @@ -9,11 +9,11 @@ SilverStripe\Admin\AdminRootController: # Inject custom styles and JS SilverStripe\Admin\LeftAndMain: extra_requirements_javascript: - - "i-lateral/silverstripe-dashboard:javascript/jquery.flip.js" - - "i-lateral/silverstripe-dashboard:javascript/dashboard.js" - - "i-lateral/silverstripe-dashboard:javascript/thirdparty/google_jsapi_visualization.js" - - "i-lateral/silverstripe-dashboard:javascript/dashboard-chart.js" - - "i-lateral/silverstripe-dashboard:javascript/dashboard-button-options.js" + - "sunnysideup/silverstripe-dashboard:javascript/jquery.flip.js" + - "sunnysideup/silverstripe-dashboard:javascript/dashboard.js" + - "sunnysideup/silverstripe-dashboard:javascript/thirdparty/google_jsapi_visualization.js" + - "sunnysideup/silverstripe-dashboard:javascript/dashboard-chart.js" + - "sunnysideup/silverstripe-dashboard:javascript/dashboard-button-options.js" extra_requirements_css: - - "i-lateral/silverstripe-dashboard:css/dashboard.css" - - "i-lateral/silverstripe-dashboard:css/dashboard_icon.css" + - "sunnysideup/silverstripe-dashboard:css/dashboard.css" + - "sunnysideup/silverstripe-dashboard:css/dashboard_icon.css" diff --git a/composer.json b/composer.json index 6e915d9..56f64b7 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ ] }, "support": { - "issues": "http://github.com/i-lateral/silverstripe-dashboard/issues" + "issues": "http://github.com/sunnysideup/silverstripe-dashboard/issues" }, "minimum-stability": "dev", "prefer-stable": true diff --git a/templates/ilateral/SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss b/templates/ilateral/SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss index 3090e7e..95240d0 100644 --- a/templates/ilateral/SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss +++ b/templates/ilateral/SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss @@ -30,10 +30,10 @@ <% end_if %>
<% if $Dashboard.CanConfigurePanels %> - + <% end_if %> <% if $Dashboard.CanDeletePanels %> - + <% end_if %>
@@ -53,4 +53,4 @@ - \ No newline at end of file + From d5e94c27a81654b95dd8f14c2516a7bb42fb7f85 Mon Sep 17 00:00:00 2001 From: Nicolaas Date: Wed, 2 Aug 2023 10:52:54 +1200 Subject: [PATCH 07/11] PATCH: fixing references --- README.md | 28 +++++++-------- _config/adminpanels.yml | 2 +- _config/config.yml | 6 ++-- _config/legacy.yml | 8 ++--- composer.json | 6 +++- lang/de.yml | 32 ++++++++--------- lang/en.yml | 32 ++++++++--------- lang/es.yml | 32 ++++++++--------- lang/fi.yml | 32 ++++++++--------- lang/nl.yml | 34 +++++++++---------- .../DashboardButtonOptionsField.php | 2 +- src/Components/DashboardChart.php | 2 +- .../DashboardHasManyRelationEditor.php | 16 ++++----- ...hboardHasManyRelationEditorItemRequest.php | 14 ++++---- src/Components/DashboardPanelAction.php | 4 +-- src/Components/DashboardQuickLink.php | 10 +++--- src/Dashboard.php | 18 +++++----- src/DashboardPanelDataObject.php | 6 ++-- src/Extensions/DashboardItemEditForm.php | 2 +- src/Extensions/DashboardMember.php | 4 +-- src/Extensions/DashboardSiteConfig.php | 8 ++--- src/Panels/DashboardPanel.php | 10 +++--- src/Panels/DashboardPanelRequest.php | 8 ++--- src/Panels/DashboardQuickLinksPanel.php | 10 +++--- .../DashboardHasManyRelationEditor.ss | 4 +-- .../Dashboard/Dashboard_Content.ss | 12 +++---- 26 files changed, 173 insertions(+), 169 deletions(-) diff --git a/README.md b/README.md index dbcb021..d5bf805 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ First, create a class for the panel as a descendant of DashboardPanel. We'll inc use SilverStripe\Forms\TextField; use SilverStripe\Forms\CheckboxField; -use ilateral\SilverStripe\Dashboard\DashboardPanel; +use Sunnysideup\Dashboard\DashboardPanel; class DashboardRecentOrdersPanel extends DashboardPanel { @@ -49,30 +49,30 @@ class DashboardRecentOrdersPanel extends DashboardPanel { 'Count' => 'Int', 'OnlyShowShipped' => 'Boolean' ]; - - + + private static $icon = "mysite/images/dashboard-recent-orders.png"; - - + + public function getLabel() { return _t('Mysite.RECENTORDERS','Recent Orders'); } - - + + public function getDescription() { return _t('Mysite.RECENTORDERSDESCRIPTION','Shows recent orders for this fake website.'); } - - + + public function getConfigurationFields() { $fields = parent::getConfigurationFields(); $fields->push(TextField::create("Count", "Number of orders to show")); $fields->push(CheckboxField::create("OnlyShowShipped","Only show shipped orders")); return $fields; } - - - + + + public function Orders() { $orders = Order::get()->sort("Created DESC")->limit($this->Count); return $this->OnlyShowShipped ? $orders->filter(['Shipped' => true]) : $orders; @@ -146,7 +146,7 @@ You can create your own templates for either of these panel types which will ove You can access all the properties of your model in the template as normal along with a EditLink method which will contain the CMS edit link for that item. -For model admin panels, create a templated called DashboardModelAdminPanel\_**ModelAdminClass**\_**ModelAdminModel**.ss and place it in your _mysite/templates/Includes folder_. +For model admin panels, create a templated called DashboardModelAdminPanel\_**ModelAdminClass**\_**ModelAdminModel**.ss and place it in your _mysite/templates/Includes folder_. eg; **DashboardModelAdminPanel\_MyAdmin\_Product.ss** @@ -162,7 +162,7 @@ You need to add your Google Analytics config information to the project config.y DashboardGoogleAnalyticsPanel: email: [XXXXX]@developer.gserviceaccount.com profile: 123456 - key_file_path: google_oauth.p12 + key_file_path: google_oauth.p12 ``` To locate your profile ID, visit the Google Analytics website, login and select the website. At the end of the URL will be fragment similar to this: ``` diff --git a/_config/adminpanels.yml b/_config/adminpanels.yml index cdf9a32..0a5f212 100644 --- a/_config/adminpanels.yml +++ b/_config/adminpanels.yml @@ -4,7 +4,7 @@ After: cmsdefaultadmin #Override the CMS module's setting (if CMS is installed) --- SilverStripe\Admin\AdminRootController: - default_panel: 'ilateral\SilverStripe\Dashboard\Dashboard' + default_panel: 'Sunnysideup\SilverStripe\Dashboard\Dashboard' # Inject custom styles and JS SilverStripe\Admin\LeftAndMain: diff --git a/_config/config.yml b/_config/config.yml index b5fbe87..390b0a5 100644 --- a/_config/config.yml +++ b/_config/config.yml @@ -4,13 +4,13 @@ Name: dashboardconfig SilverStripe\Security\Member: extensions: - - ilateral\SilverStripe\Dashboard\Extensions\DashboardMember + - Sunnysideup\Dashboard\Extensions\DashboardMember SilverStripe\SiteConfig\SiteConfig: extensions: - - ilateral\SilverStripe\Dashboard\Extensions\DashboardSiteConfig + - Sunnysideup\Dashboard\Extensions\DashboardSiteConfig # this is so generic, it can break lots of other things. #SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest: # extensions: -# - ilateral\SilverStripe\Dashboard\Extensions\DashboardItemEditForm +# - Sunnysideup\Dashboard\Extensions\DashboardItemEditForm diff --git a/_config/legacy.yml b/_config/legacy.yml index d4b97c7..bd3867b 100644 --- a/_config/legacy.yml +++ b/_config/legacy.yml @@ -3,7 +3,7 @@ Name: dashboardlegacy --- SilverStripe\ORM\DatabaseAdmin: classname_value_remapping: - DashboardPanel: 'ilateral\SilverStripe\Dashboard\DashboardPanel' - DashboardPanelDataObject: 'ilateral\SilverStripe\Dashboard\DashboardPanelDataObject' - UncleCheese\Dashboard\DashboardPanel: 'ilateral\SilverStripe\Dashboard\Panels\DashboardPanel' - UncleCheese\Dashboard\DashboardPanelDataObject: 'ilateral\SilverStripe\Dashboard\DashboardPanelDataObject' + DashboardPanel: 'Sunnysideup\Dashboard\DashboardPanel' + DashboardPanelDataObject: 'Sunnysideup\Dashboard\DashboardPanelDataObject' + UncleCheese\Dashboard\DashboardPanel: 'Sunnysideup\Dashboard\Panels\DashboardPanel' + UncleCheese\Dashboard\DashboardPanelDataObject: 'Sunnysideup\Dashboard\DashboardPanelDataObject' diff --git a/composer.json b/composer.json index 56f64b7..f506c92 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,10 @@ { "name": "Morven Lewis-Everley", "email": "morven@ilateral.co.uk" + }, + { + "name": "Sunny Side Up", + "email": "nt@sunnysideup.co.nz" } ], "require": { @@ -27,7 +31,7 @@ }, "autoload": { "psr-4": { - "ilateral\\SilverStripe\\Dashboard\\": "src/" + "Sunnysideup\\Dashboard\\": "src/" } }, "extra": { diff --git a/lang/de.yml b/lang/de.yml index feabeed..3ab2807 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -3,11 +3,11 @@ de: AddNew: 'Neue Seite hinzufügen' ListFiltered: 'Gefilterte Liste.' TreeFilteredClear: 'Filter leeren' - ilateral\SilverStripe\Dashboard\Dashboard_Content: + Sunnysideup\Dashboard\Dashboard_Content: ADMINISTRATION: Administration - ilateral\SilverStripe\Dashboard\DashboardModelAdmin: + Sunnysideup\Dashboard\DashboardModelAdmin: COUNT: 'Anzahl der Objekte zur Anzeige' - ilateral\SilverStripe\Dashboard\Dashboard: + Sunnysideup\Dashboard\Dashboard: QUICKLINKSDESCRIPTION: 'Ermöglicht die Verwaltung von beliebigen Links aus dem Dashboard heraus' SECTIONEDITORDESCRIPTION: 'Holt Seiten aus einem Bereich der Website zur Anzeige und Erstellung' ACCESS: 'Zugriff zum ''{title}'' Bereich' @@ -69,44 +69,44 @@ de: WEATHER: Wetter WEATHERDESCRIPTION: 'Zeigt das Wetter für den angegebenen Ort.' WEATHERNORESPONSE: 'Der Wetter-Server antwortet nicht. Versuchen Sie es in wenigen Minuten erneut.' - ilateral\SilverStripe\Dashboard\DashboardGoogleAnalyticsPanel: + Sunnysideup\Dashboard\DashboardGoogleAnalyticsPanel: PLURALNAME: 'Dashboard Google Analytics Felder' SINGULARNAME: 'Dashboard Google Analytics Feld' - ilateral\SilverStripe\Dashboard\DashboardModelAdminPanel: + Sunnysideup\Dashboard\DashboardModelAdminPanel: PLURALNAME: 'Model Admins' SINGULARNAME: 'Model Admin' - ilateral\SilverStripe\Dashboard\DashboardPanel: + Sunnysideup\Dashboard\DashboardPanel: PLURALNAME: 'Dashboard Felder' SINGULARNAME: 'Dashboard Feld' - ilateral\SilverStripe\Dashboard\DashboardPanelDataObject: + Sunnysideup\Dashboard\DashboardPanelDataObject: PLURALNAME: 'Dashboard Felder Data Objects' SINGULARNAME: 'Dashboard Feld Data Object' - ilateral\SilverStripe\Dashboard\DashboardQuickLink: + Sunnysideup\Dashboard\DashboardQuickLink: LINK: 'Link (mit http://)' LINKTEXT: 'Link text' NEWWINDOW: 'Öffnet link in einem neuen Fenster' PLURALNAME: 'Dashboard Quick Links' SINGULARNAME: 'Dashboard Quick Link' - ilateral\SilverStripe\Dashboard\DashboardQuickLinksPanel: + Sunnysideup\Dashboard\DashboardQuickLinksPanel: PLURALNAME: 'Dashboard Quick Links Felder' SINGULARNAME: 'Dashboard Quick Links Feld' - ilateral\SilverStripe\Dashboard\DashboardRSSFeedPanel: + Sunnysideup\Dashboard\DashboardRSSFeedPanel: PLURALNAME: 'Dashboard R S S Feed Felder' SINGULARNAME: 'Dashboard R S S Feed Feld' - ilateral\SilverStripe\Dashboard\DashboardRecentEdits: + Sunnysideup\Dashboard\DashboardRecentEdits: COUNT: 'Anzahl der Seiten zur Anzeige' - ilateral\SilverStripe\Dashboard\DashboardRecentEditsPanel: + Sunnysideup\Dashboard\DashboardRecentEditsPanel: PLURALNAME: 'Dashboard Zuletzt Editiert Felder' SINGULARNAME: 'Dashboard Zuletzt Editiert Felder' - ilateral\SilverStripe\Dashboard\DashboardRecentFile: + Sunnysideup\Dashboard\DashboardRecentFile: COUNT: 'Anzahl der Dateien zur Anzeige' - ilateral\SilverStripe\Dashboard\DashboardRecentFilesPanel: + Sunnysideup\Dashboard\DashboardRecentFilesPanel: PLURALNAME: 'Dashboard Letzte Dateien Felder' SINGULARNAME: 'Dashboard Letzte Dateien Felde' - ilateral\SilverStripe\Dashboard\DashboardSectionEditorPanel: + Sunnysideup\Dashboard\DashboardSectionEditorPanel: PLURALNAME: 'Dashboard Bereichs-Editor Felder' SINGULARNAME: 'Dashboard Bereichs-Editor Felde' - ilateral\SilverStripe\Dashboard\DashboardWeatherPanel: + Sunnysideup\Dashboard\DashboardWeatherPanel: PLURALNAME: 'Dashboard Wetter Felder' SINGULARNAME: 'Dashboard Wetter Feld' SilverStripe\Security\Permission: diff --git a/lang/en.yml b/lang/en.yml index 33cbdc3..8cd64d6 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -3,11 +3,11 @@ en: AddNew: 'Add new page' ListFiltered: 'Filtered list.' TreeFilteredClear: 'Clear filter' - ilateral\SilverStripe\Dashboard\Dashboard_Content: + Sunnysideup\Dashboard\Dashboard_Content: ADMINISTRATION: Administration - ilateral\SilverStripe\Dashboard\DashboardModelAdmin: + Sunnysideup\Dashboard\DashboardModelAdmin: COUNT: 'Number of records to display' - ilateral\SilverStripe\Dashboard\Dashboard: + Sunnysideup\Dashboard\Dashboard: QUICKLINKSDESCRIPTION: 'Allows management of arbitrary links from the dashboard' SECTIONEDITORDESCRIPTION: 'Pulls pages from a section of the website for viewing and creation' ACCESS: 'Access to ''{title}'' section' @@ -69,44 +69,44 @@ en: WEATHER: Weather WEATHERDESCRIPTION: 'Shows the weather for a given location.' WEATHERNORESPONSE: 'The weather server did not respond. Try again in a few minutes.' - ilateral\SilverStripe\Dashboard\DashboardGoogleAnalyticsPanel: + Sunnysideup\Dashboard\DashboardGoogleAnalyticsPanel: PLURALNAME: 'Dashboard Google Analytics Panels' SINGULARNAME: 'Dashboard Google Analytics Panel' - ilateral\SilverStripe\Dashboard\DashboardModelAdminPanel: + Sunnysideup\Dashboard\DashboardModelAdminPanel: PLURALNAME: 'Model Admins' SINGULARNAME: 'Model Admin' - ilateral\SilverStripe\Dashboard\DashboardPanel: + Sunnysideup\Dashboard\DashboardPanel: PLURALNAME: 'Dashboard Panels' SINGULARNAME: 'Dashboard Panel' - ilateral\SilverStripe\Dashboard\DashboardPanelDataObject: + Sunnysideup\Dashboard\DashboardPanelDataObject: PLURALNAME: 'Dashboard Panel Data Objects' SINGULARNAME: 'Dashboard Panel Data Object' - ilateral\SilverStripe\Dashboard\DashboardQuickLink: + Sunnysideup\Dashboard\DashboardQuickLink: LINK: 'Link (include http://)' LINKTEXT: 'Link text' NEWWINDOW: 'Open link in new window' PLURALNAME: 'Dashboard Quick Links' SINGULARNAME: 'Dashboard Quick Link' - ilateral\SilverStripe\Dashboard\DashboardQuickLinksPanel: + Sunnysideup\Dashboard\DashboardQuickLinksPanel: PLURALNAME: 'Dashboard Quick Links Panels' SINGULARNAME: 'Dashboard Quick Links Panel' - ilateral\SilverStripe\Dashboard\DashboardRSSFeedPanel: + Sunnysideup\Dashboard\DashboardRSSFeedPanel: PLURALNAME: 'Dashboard R S S Feed Panels' SINGULARNAME: 'Dashboard R S S Feed Panel' - ilateral\SilverStripe\Dashboard\DashboardRecentEdits: + Sunnysideup\Dashboard\DashboardRecentEdits: COUNT: 'Number of pages to display' - ilateral\SilverStripe\Dashboard\DashboardRecentEditsPanel: + Sunnysideup\Dashboard\DashboardRecentEditsPanel: PLURALNAME: 'Dashboard Recent Edits Panels' SINGULARNAME: 'Dashboard Recent Edits Panel' - ilateral\SilverStripe\Dashboard\DashboardRecentFile: + Sunnysideup\Dashboard\DashboardRecentFile: COUNT: 'Number of files to display' - ilateral\SilverStripe\Dashboard\DashboardRecentFilesPanel: + Sunnysideup\Dashboard\DashboardRecentFilesPanel: PLURALNAME: 'Dashboard Recent Files Panels' SINGULARNAME: 'Dashboard Recent Files Panel' - ilateral\SilverStripe\Dashboard\DashboardSectionEditorPanel: + Sunnysideup\Dashboard\DashboardSectionEditorPanel: PLURALNAME: 'Dashboard Section Editor Panels' SINGULARNAME: 'Dashboard Section Editor Panel' - ilateral\SilverStripe\Dashboard\DashboardWeatherPanel: + Sunnysideup\Dashboard\DashboardWeatherPanel: PLURALNAME: 'Dashboard Weather Panels' SINGULARNAME: 'Dashboard Weather Panel' SilverStripe\Security\Permission: diff --git a/lang/es.yml b/lang/es.yml index 9e20c5a..8880a14 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -3,11 +3,11 @@ es: AddNew: 'Agregar nueva página' ListFiltered: 'Lista filtrada.' TreeFilteredClear: 'Limpiar filtro' - ilateral\SilverStripe\Dashboard\Dashboard_Content: + Sunnysideup\Dashboard\Dashboard_Content: ADMINISTRATION: Administración - ilateral\SilverStripe\Dashboard\DashbordModelAdmin: + Sunnysideup\Dashboard\DashbordModelAdmin: COUNT: 'Objetos a mostrar' - ilateral\SilverStripe\Dashboard\Dashboard: + Sunnysideup\Dashboard\Dashboard: QUICKLINKSDESCRIPTION: 'Enlaces arbitrarios en el panel de control' SECTIONEDITORDESCRIPTION: 'Agrega páginas a sección del sitio' ACCESS: 'Acceso a la sección ''{title}''' @@ -67,44 +67,44 @@ es: WEATHER: Clima WEATHERDESCRIPTION: 'Clima de un lugar en el mundo.' WEATHERNORESPONSE: 'El servidor de climas no responde, deben tener una tormenta por ahí.' - ilateral\SilverStripe\Dashboard\DashboardGoogleAnalyticsPanel: + Sunnysideup\Dashboard\DashboardGoogleAnalyticsPanel: PLURALNAME: 'Paneles de control para Google Analytics' SINGULARNAME: 'Panel de control para Google Analytics' - ilateral\SilverStripe\Dashboard\DashboardModelAdminPanel: + Sunnysideup\Dashboard\DashboardModelAdminPanel: PLURALNAME: 'Model Admins' SINGULARNAME: 'Model Admin' - ilateral\SilverStripe\Dashboard\DashboardPanel: + Sunnysideup\Dashboard\DashboardPanel: PLURALNAME: 'Paneles de control' SINGULARNAME: 'Panel de control' - ilateral\SilverStripe\Dashboard\DashboardPanelDataObject: + Sunnysideup\Dashboard\DashboardPanelDataObject: PLURALNAME: 'Paneles de control para Data Objects' SINGULARNAME: 'Panel de control para Data Objects' - ilateral\SilverStripe\Dashboard\DashboardQuickLink: + Sunnysideup\Dashboard\DashboardQuickLink: LINK: 'Enlace (incluír http://)' LINKTEXT: 'Texto del enlace' NEWWINDOW: 'Abrir el enlace en una ventana nueva' PLURALNAME: 'Enlaces rápidos para el panel de control' SINGULARNAME: 'Enlace rápido para el panel de control' - ilateral\SilverStripe\Dashboard\DashboardQuickLinksPanel: + Sunnysideup\Dashboard\DashboardQuickLinksPanel: PLURALNAME: 'Paneles de control para enlaces' SINGULARNAME: 'Panel de control para enlaces' - ilateral\SilverStripe\Dashboard\DashboardRSSFeedPanel: + Sunnysideup\Dashboard\DashboardRSSFeedPanel: PLURALNAME: 'Paneles de control para RSS' SINGULARNAME: 'Panel de control para RSS' - ilateral\SilverStripe\Dashboard\DashboardRecentEdits: + Sunnysideup\Dashboard\DashboardRecentEdits: COUNT: 'Número de páginas a mostrar' - ilateral\SilverStripe\Dashboard\DashboardRecentEditsPanel: + Sunnysideup\Dashboard\DashboardRecentEditsPanel: PLURALNAME: 'Paneles de control para páginas recién editadas' SINGULARNAME: 'Panel de control para páginas recién editadas' - ilateral\SilverStripe\Dashboard\DashboardRecentFile: + Sunnysideup\Dashboard\DashboardRecentFile: COUNT: 'Número de archivos a mostrar' - ilateral\SilverStripe\Dashboard\DashboardRecentFilesPanel: + Sunnysideup\Dashboard\DashboardRecentFilesPanel: PLURALNAME: 'Paneles de control para archivos' SINGULARNAME: 'Panel de control para archivos' - ilateral\SilverStripe\Dashboard\DashboardSectionEditorPanel: + Sunnysideup\Dashboard\DashboardSectionEditorPanel: PLURALNAME: 'Paneles de control para el panel de edición' SINGULARNAME: 'Panel de control para el panel de edición' - ilateral\SilverStripe\Dashboard\DashboardWeatherPanel: + Sunnysideup\Dashboard\DashboardWeatherPanel: PLURALNAME: 'Paneles de control para el panel del tiempo' SINGULARNAME: 'Panel de control para el panel del tiempo' SilverStripe\Security\Permission: diff --git a/lang/fi.yml b/lang/fi.yml index 1672037..57c7289 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -3,11 +3,11 @@ fi: AddNew: 'Lisää uusi sivu' ListFiltered: 'Suodatettu lista.' TreeFilteredClear: 'Puhdista lista' - ilateral\SilverStripe\Dashboard\Dashboard_Content: + Sunnysideup\Dashboard\Dashboard_Content: ADMINISTRATION: Ylläpito - ilateral\SilverStripe\Dashboard\DashboardModelAdmin: + Sunnysideup\Dashboard\DashboardModelAdmin: COUNT: 'Näytettävien tietueiden määrä' - ilateral\SilverStripe\Dashboard\Dashboard: + Sunnysideup\Dashboard\Dashboard: QUICKLINKSDESCRIPTION: 'Antaa ylläpidon hallita satunnaisia linkkejä etusivulta' SECTIONEDITORDESCRIPTION: 'Vetää sivuja webbisivun alueelta katselua ja luontia varten' ACCESS: 'Käyttöoikeus osioon ''{title}''' @@ -69,44 +69,44 @@ fi: WEATHER: Sää WEATHERDESCRIPTION: 'Näyttää sään annetussa sijainnissa.' WEATHERNORESPONSE: 'Sää palvelin ei vastaa. Kokeile muutaman minuutin kuluttua uudelleen.' - ilateral\SilverStripe\Dashboard\DashboardGoogleAnalyticsPanel: + Sunnysideup\Dashboard\DashboardGoogleAnalyticsPanel: PLURALNAME: 'Dashboard Google Analytics Panels' SINGULARNAME: 'Dashboard Google Analytics Panel' - ilateral\SilverStripe\Dashboard\DashboardModelAdminPanel: + Sunnysideup\Dashboard\DashboardModelAdminPanel: PLURALNAME: 'ModelAdmins' SINGULARNAME: 'ModelAdmin' - ilateral\SilverStripe\Dashboard\DashboardPanel: + Sunnysideup\Dashboard\DashboardPanel: PLURALNAME: 'Etusivun Paneelit' SINGULARNAME: 'Etusivun Paneeli' - ilateral\SilverStripe\Dashboard\DashboardPanelDataObject: + Sunnysideup\Dashboard\DashboardPanelDataObject: PLURALNAME: 'Etusivu Paneelin Data Objektit' SINGULARNAME: 'Etusivu Paneelin Data Objekti' - ilateral\SilverStripe\Dashboard\DashboardQuickLink: + Sunnysideup\Dashboard\DashboardQuickLink: LINK: 'Linkki (sisältäen alussa http://)' LINKTEXT: 'Linkin teksti' NEWWINDOW: 'Avaa linkki uuteen ikkunaan' PLURALNAME: 'Etusivun Pika Linkit' SINGULARNAME: 'Etusivun Pika Linkki' - ilateral\SilverStripe\Dashboard\DashboardQuickLinksPanel: + Sunnysideup\Dashboard\DashboardQuickLinksPanel: PLURALNAME: 'Etusivun Pika Linkki Paneelit' SINGULARNAME: 'Etusivun Pika Linkki Paneeli' - ilateral\SilverStripe\Dashboard\DashboardRSSFeedPanel: + Sunnysideup\Dashboard\DashboardRSSFeedPanel: PLURALNAME: 'Etusivun Syötteen Paneelit' SINGULARNAME: 'Etusivun Syötteen Paneeli' - ilateral\SilverStripe\Dashboard\DashboardRecentEdits: + Sunnysideup\Dashboard\DashboardRecentEdits: COUNT: 'Näytettävä sivumäärä' - ilateral\SilverStripe\Dashboard\DashboardRecentEditsPanel: + Sunnysideup\Dashboard\DashboardRecentEditsPanel: PLURALNAME: 'Etusivun Viimeaikaiset muutokset Paneelit' SINGULARNAME: 'Etusivun Viimeaikaiset muutokset Paneeli' - ilateral\SilverStripe\Dashboard\DashboardRecentFile: + Sunnysideup\Dashboard\DashboardRecentFile: COUNT: 'Näytettävät tiedostot' - ilateral\SilverStripe\Dashboard\DashboardRecentFilesPanel: + Sunnysideup\Dashboard\DashboardRecentFilesPanel: PLURALNAME: 'Etusivun Viimeaikaiset Tiedostot Paneelit' SINGULARNAME: 'Etusivun Viimeaikaiset Tiedostot Paneeli' - ilateral\SilverStripe\Dashboard\DashboardSectionEditorPanel: + Sunnysideup\Dashboard\DashboardSectionEditorPanel: PLURALNAME: 'Etusivun Editori Paneelit' SINGULARNAME: 'Etusivun Editori Paneeli' - ilateral\SilverStripe\Dashboard\DashboardWeatherPanel: + Sunnysideup\Dashboard\DashboardWeatherPanel: PLURALNAME: 'Etusivun Sää Paneelit' SINGULARNAME: 'Etusivun Sää Paneeli' SilverStripe\Security\Permission: diff --git a/lang/nl.yml b/lang/nl.yml index c3f7f6f..54bb7f3 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -3,11 +3,11 @@ nl: AddNew: 'Nieuwe pagina' ListFiltered: 'Gefilterde lijst' TreeFilteredClear: 'Filter verwijderen' - ilateral\SilverStripe\Dashboard\Dashboard_Content: + Sunnysideup\Dashboard\Dashboard_Content: ADMINISTRATION: Administratie - ilateral\SilverStripe\Dashboard\DashboardModelAdmin: + Sunnysideup\Dashboard\DashboardModelAdmin: COUNT: 'Aantal items om te tonen' - ilateral\SilverStripe\Dashboard\Dashboard: + Sunnysideup\Dashboard\Dashboard: QUICKLINKSDESCRIPTION: 'Sta management van willekeurige links op het dashboard toe' SECTIONEDITORDESCRIPTION: 'Haalt pagina''s van een deel van de website voor bekijken en aanmaken' ACCESS: 'Toegang tot ''{title}'' onderdeel' @@ -69,44 +69,44 @@ nl: WEATHER: Weer WEATHERDESCRIPTION: 'Toont het weer van de gekozen locatie.' WEATHERNORESPONSE: 'Weerserver reageerde niet. Probeer nogmaals over een paar minuten.' - ilateral\SilverStripe\Dashboard\DashboardGoogleAnalyticsPanel: + Sunnysideup\Dashboard\DashboardGoogleAnalyticsPanel: PLURALNAME: 'Dashboard Google Analytics Paneelen' SINGULARNAME: 'Dashboard Google Analytics Paneel' - ilateral\SilverStripe\Dashboard\DashboardModelAdminPanel: + Sunnysideup\Dashboard\DashboardModelAdminPanel: PLURALNAME: 'Model Admins' SINGULARNAME: 'Model Admin' - ilateral\SilverStripe\Dashboard\DashboardPanel: + Sunnysideup\Dashboard\DashboardPanel: PLURALNAME: 'Dashboardpanelen' SINGULARNAME: 'Dashboardpaneel' - ilateral\SilverStripe\Dashboard\DashboardPanelDataObject: + Sunnysideup\Dashboard\DashboardPanelDataObject: PLURALNAME: 'Dashboard Paneel Data Objects' SINGULARNAME: 'Dashboard Paneel Data Object' - ilateral\SilverStripe\Dashboard\DashboardQuickLink: + Sunnysideup\Dashboard\DashboardQuickLink: LINK: 'Link (inclusief http://)' LINKTEXT: 'Link tekst' NEWWINDOW: 'Open link in nieuw scherm' PLURALNAME: 'Dashboard snellinks' SINGULARNAME: 'Dashboard snellink' - ilateral\SilverStripe\Dashboard\DashboardQuickLinksPanel: + Sunnysideup\Dashboard\DashboardQuickLinksPanel: PLURALNAME: 'Dashboard snellinks Paneelen' SINGULARNAME: 'Dashboard snellinks Paneel' - ilateral\SilverStripe\Dashboard\DashboardRSSFeedPanel: + Sunnysideup\Dashboard\DashboardRSSFeedPanel: PLURALNAME: 'Dashboard R S S Feed Paneelen' SINGULARNAME: 'Dashboard R S S Feed Paneel' - ilateral\SilverStripe\Dashboard\DashboardRecentEdits: + Sunnysideup\Dashboard\DashboardRecentEdits: COUNT: 'Aantal pagina''s om te tonen' - ilateral\SilverStripe\Dashboard\DashboardRecentEditsPanel: + Sunnysideup\Dashboard\DashboardRecentEditsPanel: PLURALNAME: 'Dashboard Recente Bewerkingen Paneelen' SINGULARNAME: 'Dashboard Recente Bewerkingen Paneel' - ilateral\SilverStripe\Dashboard\DashboardRecentFile: + Sunnysideup\Dashboard\DashboardRecentFile: COUNT: 'Aantal bestanden om te tonen' - ilateral\SilverStripe\Dashboard\DashboardRecentFilesPanel: + Sunnysideup\Dashboard\DashboardRecentFilesPanel: PLURALNAME: 'Dashboard Recente Bestanden Paneelen' SINGULARNAME: 'Dashboard Recent Bestanden Paneel' - ilateral\SilverStripe\Dashboard\DashboardSectionEditorPanel: + Sunnysideup\Dashboard\DashboardSectionEditorPanel: PLURALNAME: 'Dashboard Sectiebewerker Paneelen' SINGULARNAME: 'Dashboard Sectiebewerker Paneel' - ilateral\SilverStripe\Dashboard\DashboardWeatherPanel: + Sunnysideup\Dashboard\DashboardWeatherPanel: PLURALNAME: 'Dashboard Weer Paneelen' SINGULARNAME: 'Dashboard Weer Paneel' SilverStripe\Security\Permission: @@ -116,4 +116,4 @@ nl: LABEL: 'Recente bewerkingen' RecentFiles: DESCRIPTION: 'Toon een gelinkte lijst van recent bewerkte bestanden' - LABEL: 'Recente bestanden' \ No newline at end of file + LABEL: 'Recente bestanden' diff --git a/src/Components/DashboardButtonOptionsField.php b/src/Components/DashboardButtonOptionsField.php index 3e8e13e..881737b 100644 --- a/src/Components/DashboardButtonOptionsField.php +++ b/src/Components/DashboardButtonOptionsField.php @@ -1,6 +1,6 @@ controller->getDashboard(), $this->controller, $this, $item); return $handler->handleRequest($r); - } + } return $this->httpError(404); } diff --git a/src/Components/DashboardHasManyRelationEditorItemRequest.php b/src/Components/DashboardHasManyRelationEditorItemRequest.php index 685d7de..cddb90b 100644 --- a/src/Components/DashboardHasManyRelationEditorItemRequest.php +++ b/src/Components/DashboardHasManyRelationEditorItemRequest.php @@ -1,6 +1,6 @@ editor->Link(), "item", $this->item->ID ? $this->item->ID : "new", $action); } - /** + /** * A link to refresh the editor * * @return string @@ -124,7 +124,7 @@ public function DetailForm() FormAction::create('cancel', _t('Dashboard.CANCEL', 'Cancel')) ->setUseButtonTag(true) ->addExtraClass('small') - ) + ) ); $form->setHTMLID("Form_DetailForm_".$this->panel->ID."_".$this->item->ID); $form->loadDataFrom($this->item); diff --git a/src/Components/DashboardPanelAction.php b/src/Components/DashboardPanelAction.php index d86ab5e..d0eabc2 100644 --- a/src/Components/DashboardPanelAction.php +++ b/src/Components/DashboardPanelAction.php @@ -1,6 +1,6 @@ DashboardQuickLinksPanel::class, ]; - + private static $label_field = "Text"; public function getConfigurationFields(): FieldList @@ -54,4 +54,4 @@ public function getConfigurationFields(): FieldList return $fields; } -} \ No newline at end of file +} diff --git a/src/Dashboard.php b/src/Dashboard.php index 3c41f09..1a425ae 100755 --- a/src/Dashboard.php +++ b/src/Dashboard.php @@ -1,6 +1,6 @@ ID == $curr_member->ID) { continue; } - + $member->DashboardPanels()->removeAll(); /** @var DashboardPanel $panel */ foreach (Security::getCurrentUser()->DashboardPanels() as $panel) { - $clone = $panel->duplicate(); + $clone = $panel->duplicate(); $clone->MemberID = $member->ID; $clone->write(); - } + } } return new HTTPResponse(_t( @@ -231,7 +231,7 @@ public function BasePanels(): DataList { return Security::getCurrentUser()->DashboardPanels(); } - + /** * Gets the current user's dashboard configuration * @@ -302,7 +302,7 @@ public function canView($member = null) return Permission::check("CMS_ACCESS_Dashboard"); } - /** + /** * Check if the current user can add panels to the dashboard * * @return bool @@ -312,7 +312,7 @@ public function canAddPanels() return Permission::check("CMS_ACCESS_DashboardAddPanels"); } - /** + /** * Check if the current user can delete panels from the dashboard * * @return bool @@ -322,7 +322,7 @@ public function canDeletePanels() return Permission::check("CMS_ACCESS_DashboardDeletePanels"); } - /** + /** * Check if the current user can configure panels on the dashboard * * @return bool diff --git a/src/DashboardPanelDataObject.php b/src/DashboardPanelDataObject.php index 646a0c6..28d98e5 100644 --- a/src/DashboardPanelDataObject.php +++ b/src/DashboardPanelDataObject.php @@ -1,12 +1,12 @@ */ @@ -17,4 +17,4 @@ class DashboardSiteConfig extends DataExtension private static $has_many = [ 'DashboardPanels' => DashboardPanel::class, ]; -} \ No newline at end of file +} diff --git a/src/Panels/DashboardPanel.php b/src/Panels/DashboardPanel.php index 14b2152..4bfe738 100755 --- a/src/Panels/DashboardPanel.php +++ b/src/Panels/DashboardPanel.php @@ -1,6 +1,6 @@ get(static::class, 'font_icon'); - + if (empty($icon_class)) { return ""; } @@ -226,7 +226,7 @@ public function getConfigurationFields(): FieldList // Cannot be an empty string because SilverStripe\i18n\i18n::_t() // would yell that a default should be defined. So use a space as a workaround. $default_size_title = ' '; - + return FieldList::create( DashboardButtonOptionsField::create( "PanelSize", diff --git a/src/Panels/DashboardPanelRequest.php b/src/Panels/DashboardPanelRequest.php index 2c661e1..e663d31 100644 --- a/src/Panels/DashboardPanelRequest.php +++ b/src/Panels/DashboardPanelRequest.php @@ -1,6 +1,6 @@ dashboard = $dashboard; + $this->dashboard = $dashboard; $this->panel = $panel; parent::__construct(); } @@ -79,7 +79,7 @@ public function panel(HTTPRequest $r) if(!$panel->canView()) { return $this->httpError(403); } - + return $panel->getPanelHolder(); } diff --git a/src/Panels/DashboardQuickLinksPanel.php b/src/Panels/DashboardQuickLinksPanel.php index 89d0178..7baa1f7 100644 --- a/src/Panels/DashboardQuickLinksPanel.php +++ b/src/Panels/DashboardQuickLinksPanel.php @@ -1,11 +1,11 @@ DashboardQuickLink::class ]; diff --git a/templates/ilateral/SilverStripe/Dashboard/Components/DashboardHasManyRelationEditor.ss b/templates/ilateral/SilverStripe/Dashboard/Components/DashboardHasManyRelationEditor.ss index 1b6040a..78ad9df 100644 --- a/templates/ilateral/SilverStripe/Dashboard/Components/DashboardHasManyRelationEditor.ss +++ b/templates/ilateral/SilverStripe/Dashboard/Components/DashboardHasManyRelationEditor.ss @@ -2,7 +2,7 @@
$Title - <%t ilateral\SilverStripe\Dashboard\Dashboard.ADD 'Add' %> + <%t Sunnysideup\Dashboard\Dashboard.ADD 'Add' %>
<% if $Items %> @@ -17,7 +17,7 @@ <% end_loop %> <% else %> -
<%t ilateral\SilverStripe\Dashboard\Dashboard.NORECORDS 'No records' %>
+
<%t Sunnysideup\Dashboard\Dashboard.NORECORDS 'No records' %>
<% end_if %>
diff --git a/templates/ilateral/SilverStripe/Dashboard/Dashboard_Content.ss b/templates/ilateral/SilverStripe/Dashboard/Dashboard_Content.ss index f0060af..49447df 100644 --- a/templates/ilateral/SilverStripe/Dashboard/Dashboard_Content.ss +++ b/templates/ilateral/SilverStripe/Dashboard/Dashboard_Content.ss @@ -7,16 +7,16 @@
<% if $CanAddPanels %> - <%t ilateral\SilverStripe\Dashboard\Dashboard.ADDPANEL 'New Panel' %> + <%t Sunnysideup\Dashboard\Dashboard.ADDPANEL 'New Panel' %> <% end_if %> <% if $IsAdmin %> - <%t ilateral\SilverStripe\Dashboard\Dashboard_Content.ADMINISTRATION 'Administration' %> + <%t Sunnysideup\Dashboard\Dashboard_Content.ADMINISTRATION 'Administration' %> - <%t ilateral\SilverStripe\Dashboard\Dashboard.SETASDEFAULT 'Make this the default dashboard' %> - <%t ilateral\SilverStripe\Dashboard\Dashboard.APPLYTOALL 'Apply this dashboard to all members' %> + <%t Sunnysideup\Dashboard\Dashboard.SETASDEFAULT 'Make this the default dashboard' %> + <%t Sunnysideup\Dashboard\Dashboard.APPLYTOALL 'Apply this dashboard to all members' %> <% end_if %> @@ -39,7 +39,7 @@
-

<%t ilateral\SilverStripe\Dashboard\Dashboard.CHOOSEPANELTYPE 'Choose a panel type' %>

+

<%t Sunnysideup\Dashboard\Dashboard.CHOOSEPANELTYPE 'Choose a panel type' %>

@@ -60,7 +60,7 @@
- +
From 1e7a8f8b8b613701639f1a21bf1dd78526ee6ae8 Mon Sep 17 00:00:00 2001 From: Nicolaas Date: Wed, 2 Aug 2023 10:58:59 +1200 Subject: [PATCH 08/11] PATCH: fixing references --- _config/adminpanels.yml | 14 +++++++------- composer.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/_config/adminpanels.yml b/_config/adminpanels.yml index 0a5f212..90ec3db 100644 --- a/_config/adminpanels.yml +++ b/_config/adminpanels.yml @@ -9,11 +9,11 @@ SilverStripe\Admin\AdminRootController: # Inject custom styles and JS SilverStripe\Admin\LeftAndMain: extra_requirements_javascript: - - "sunnysideup/silverstripe-dashboard:javascript/jquery.flip.js" - - "sunnysideup/silverstripe-dashboard:javascript/dashboard.js" - - "sunnysideup/silverstripe-dashboard:javascript/thirdparty/google_jsapi_visualization.js" - - "sunnysideup/silverstripe-dashboard:javascript/dashboard-chart.js" - - "sunnysideup/silverstripe-dashboard:javascript/dashboard-button-options.js" + - "sunnysideup/dashboard:javascript/jquery.flip.js" + - "sunnysideup/dashboard:javascript/dashboard.js" + - "sunnysideup/dashboard:javascript/thirdparty/google_jsapi_visualization.js" + - "sunnysideup/dashboard:javascript/dashboard-chart.js" + - "sunnysideup/dashboard:javascript/dashboard-button-options.js" extra_requirements_css: - - "sunnysideup/silverstripe-dashboard:css/dashboard.css" - - "sunnysideup/silverstripe-dashboard:css/dashboard_icon.css" + - "sunnysideup/dashboard:css/dashboard.css" + - "sunnysideup/dashboard:css/dashboard_icon.css" diff --git a/composer.json b/composer.json index f506c92..f6b178b 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "sunnysideup/silverstripe-dashboard", + "name": "sunnysideup/dashboard", "description": "Adds a customisable dashboard to the SilverStripe CMS (fork of Unclecheese's module)", "type": "silverstripe-vendormodule", "keywords": [ From 4018653b34f38b9ab063144760701fd0fea1f050 Mon Sep 17 00:00:00 2001 From: Nicolaas Date: Wed, 2 Aug 2023 11:00:15 +1200 Subject: [PATCH 09/11] PATCH: fixing references --- CONTRIBUTING.md | 4 ++-- README.md | 2 +- composer.json | 5 ++--- .../SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 274c702..6199099 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,8 +6,8 @@ welcome any feedback that a user may have. If you encounter any issues, have any ideas or want to request a feature, please use the following links: - * [Sharing your opinion and raising issues](https://github.com/sunnysideup/silverstripe-dashboard/issues) - * [Submit a pull request](https://github.com/sunnysideup/silverstripe-dashboard/pulls) + * [Sharing your opinion and raising issues](https://github.com/sunnysideup/dashboard/issues) + * [Submit a pull request](https://github.com/sunnysideup/dashboard/pulls) ## Translations diff --git a/README.md b/README.md index d5bf805..a842f62 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ The Dashboard module provides a splash page for the CMS in SilverStripe 4 with c ## Screenshot & Videos -Images and videos about this module can be found [in this blog post.](https://www.silverstripe.org/blog/the-dashboard-module-make-a-splash-in-silverstripe-3/) +Images and videos about this module can be found [in this blog post.](https://www.silverstripe.org/blog/the-dashboard-module-make-a-splash-in-3/) ## Included panels diff --git a/composer.json b/composer.json index f6b178b..129f950 100644 --- a/composer.json +++ b/composer.json @@ -1,11 +1,10 @@ { "name": "sunnysideup/dashboard", "description": "Adds a customisable dashboard to the SilverStripe CMS (fork of Unclecheese's module)", - "type": "silverstripe-vendormodule", + "type": "vendormodule", "keywords": [ "silverstripe", "dashboard", - "module", "cms" ], "license": "BSD-3-Clause", @@ -42,7 +41,7 @@ ] }, "support": { - "issues": "http://github.com/sunnysideup/silverstripe-dashboard/issues" + "issues": "http://github.com/sunnysideup/dashboard/issues" }, "minimum-stability": "dev", "prefer-stable": true diff --git a/templates/ilateral/SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss b/templates/ilateral/SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss index 95240d0..8fe52b9 100644 --- a/templates/ilateral/SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss +++ b/templates/ilateral/SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss @@ -30,10 +30,10 @@ <% end_if %>
<% if $Dashboard.CanConfigurePanels %> - + <% end_if %> <% if $Dashboard.CanDeletePanels %> - + <% end_if %>
From f665d0858695a716b89afb04d5f6c24be017b78b Mon Sep 17 00:00:00 2001 From: Nicolaas Date: Wed, 27 Sep 2023 14:50:16 +1300 Subject: [PATCH 10/11] PATCH: fixing default login --- _config/adminpanels.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/_config/adminpanels.yml b/_config/adminpanels.yml index 90ec3db..ac27f53 100644 --- a/_config/adminpanels.yml +++ b/_config/adminpanels.yml @@ -2,18 +2,17 @@ Name: dashboarddefaultadmin After: cmsdefaultadmin #Override the CMS module's setting (if CMS is installed) --- - -SilverStripe\Admin\AdminRootController: - default_panel: 'Sunnysideup\SilverStripe\Dashboard\Dashboard' +# SilverStripe\Admin\AdminRootController: +# default_panel: 'Sunnysideup\SilverStripe\Dashboard\Dashboard' # Inject custom styles and JS SilverStripe\Admin\LeftAndMain: extra_requirements_javascript: - - "sunnysideup/dashboard:javascript/jquery.flip.js" - - "sunnysideup/dashboard:javascript/dashboard.js" - - "sunnysideup/dashboard:javascript/thirdparty/google_jsapi_visualization.js" - - "sunnysideup/dashboard:javascript/dashboard-chart.js" - - "sunnysideup/dashboard:javascript/dashboard-button-options.js" + - 'sunnysideup/dashboard:javascript/jquery.flip.js' + - 'sunnysideup/dashboard:javascript/dashboard.js' + - 'sunnysideup/dashboard:javascript/thirdparty/google_jsapi_visualization.js' + - 'sunnysideup/dashboard:javascript/dashboard-chart.js' + - 'sunnysideup/dashboard:javascript/dashboard-button-options.js' extra_requirements_css: - - "sunnysideup/dashboard:css/dashboard.css" - - "sunnysideup/dashboard:css/dashboard_icon.css" + - 'sunnysideup/dashboard:css/dashboard.css' + - 'sunnysideup/dashboard:css/dashboard_icon.css' From 583b26ba6e8f0a69075e5266888ae3503cbb005e Mon Sep 17 00:00:00 2001 From: Nicolaas Date: Fri, 18 Oct 2024 14:15:26 +1300 Subject: [PATCH 11/11] ENH: lazy load images --- .../SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/ilateral/SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss b/templates/ilateral/SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss index 8fe52b9..ad9f431 100644 --- a/templates/ilateral/SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss +++ b/templates/ilateral/SilverStripe/Dashboard/Panels/DashboardPanel_Holder.ss @@ -30,10 +30,10 @@ <% end_if %>
<% if $Dashboard.CanConfigurePanels %> - + <% end_if %> <% if $Dashboard.CanDeletePanels %> - + <% end_if %>