From f210b17cb53912684f810456dab138f5674b5538 Mon Sep 17 00:00:00 2001 From: Cam Findlay Date: Tue, 16 Feb 2016 10:32:08 +1300 Subject: [PATCH] Adding quickfeedback form --- .gitignore | 3 +- app/_config/config.yml | 5 +- app/_config/routes.yml | 3 +- composer.json | 5 +- composer.lock | 54 ++++++++++++++++--- .../DocumentationViewer_DocumentationPage.ss | 21 ++++++++ 6 files changed, 78 insertions(+), 13 deletions(-) create mode 100755 themes/docs/templates/Layout/DocumentationViewer_DocumentationPage.ss diff --git a/.gitignore b/.gitignore index 0133453..0a799f6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ /toolbar/ /display_logic/ /silverstripe-dynamodb/ -/crontask/ \ No newline at end of file +/crontask/ +/quickfeedback/ diff --git a/app/_config/config.yml b/app/_config/config.yml index c27c045..1e9964c 100644 --- a/app/_config/config.yml +++ b/app/_config/config.yml @@ -9,4 +9,7 @@ StaticExporter: disable_sitetree_export: true Controller: extensions: - - ControllerExtension \ No newline at end of file + - ControllerExtension +QuickFeedbackExtension: + redirect_field: true + rate_limit: 1 \ No newline at end of file diff --git a/app/_config/routes.yml b/app/_config/routes.yml index e74f2f7..a46f38a 100644 --- a/app/_config/routes.yml +++ b/app/_config/routes.yml @@ -4,9 +4,10 @@ After: framework/routes#coreroutes --- Director: rules: + 'en//QuickFeedbackForm': 'DocumentationViewer' 'Security//$Action/$ID/$OtherID': 'Security' 'admin': 'AdminRootController' 'dev/buildcache/$Action': 'RebuildStaticCacheTask' 'dev': 'DevelopmentAdmin' '': '->en/' - '$Lang/$Action': 'DocumentationViewer' + '$Lang/$Action': 'DocumentationViewer' \ No newline at end of file diff --git a/composer.json b/composer.json index 6a29945..d5ca672 100644 --- a/composer.json +++ b/composer.json @@ -4,10 +4,11 @@ "require": { "ext-gd": "*", "ext-mbstring": "*", - "silverstripe/docsviewer": "dev-master", + "silverstripe/docsviewer": "^1.2", "silverstripe/framework": "^3.2", "silverstripe/toolbar": "^4.0", - "silverstripe/dynamodb": "^1.1" + "silverstripe/dynamodb": "^1.1", + "mandrew/silverstripe-quickfeedback": "^0.2" }, "require-dev": { "phpunit/PHPUnit": "~3.7@stable" diff --git a/composer.lock b/composer.lock index 836e30e..9f5b4b1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "1ddd85476025c0b7a81ac788f843c0ee", - "content-hash": "fc7210e99b3e3e346c1ea1bd9edf7cb8", + "hash": "9f1ebf69ac08e2236c2eb2d037edba18", + "content-hash": "f88a0b9a12e2d68c269af2e927349145", "packages": [ { "name": "aws/aws-sdk-php", @@ -416,6 +416,45 @@ ], "time": "2015-03-18 18:23:50" }, + { + "name": "mandrew/silverstripe-quickfeedback", + "version": "0.2.0", + "source": { + "type": "git", + "url": "https://github.com/mandrew/silverstripe-quickfeedback.git", + "reference": "b2f28c28ed089a4f5ea5d2d870f47de77e854b3c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mandrew/silverstripe-quickfeedback/zipball/b2f28c28ed089a4f5ea5d2d870f47de77e854b3c", + "reference": "b2f28c28ed089a4f5ea5d2d870f47de77e854b3c", + "shasum": "" + }, + "require": { + "silverstripe/framework": "^3.2" + }, + "type": "silverstripe-module", + "extra": { + "installer-name": "quickfeedback" + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Michael Andrewartha", + "email": "michael@silverstripe.com" + } + ], + "description": "Creates a quick yes/no feedback form which can be added at the bottom of your site", + "keywords": [ + "feedback", + "member", + "silverstripe" + ], + "time": "2016-02-15 21:06:37" + }, { "name": "mtdowling/cron-expression", "version": "v1.0.4", @@ -510,16 +549,16 @@ }, { "name": "silverstripe/docsviewer", - "version": "dev-master", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-docsviewer.git", - "reference": "f70d5fde0a2bae46d6ee49779f57249c72b55e69" + "reference": "cf7505b340966252d9fef504dd880c63e6152a9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/f70d5fde0a2bae46d6ee49779f57249c72b55e69", - "reference": "f70d5fde0a2bae46d6ee49779f57249c72b55e69", + "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/cf7505b340966252d9fef504dd880c63e6152a9d", + "reference": "cf7505b340966252d9fef504dd880c63e6152a9d", "shasum": "" }, "require": { @@ -547,7 +586,7 @@ "documentation", "silverstripe" ], - "time": "2016-01-24 12:24:56" + "time": "2016-02-06 00:54:31" }, { "name": "silverstripe/dynamodb", @@ -1204,7 +1243,6 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "silverstripe/docsviewer": 20, "phpunit/phpunit": 0 }, "prefer-stable": true, diff --git a/themes/docs/templates/Layout/DocumentationViewer_DocumentationPage.ss b/themes/docs/templates/Layout/DocumentationViewer_DocumentationPage.ss new file mode 100755 index 0000000..cfc2f17 --- /dev/null +++ b/themes/docs/templates/Layout/DocumentationViewer_DocumentationPage.ss @@ -0,0 +1,21 @@ +
+ <% if VersionWarning %> + <% include DocumentationVersion_warning Version=$Entity.Version %> + <% end_if %> + + <% include DocumentationTableContents %> + + + $Content.RAW + + $QuickFeedbackForm + + <% include DocumentationNextPrevious %> + + <% if EditLink %> + <% include DocumentationEditLink %> + <% end_if %> + + + <% include DocumentationComments %> +
\ No newline at end of file