Implemented Feature #53737 additional TS
authorpatrick@roquin <patrick@roquin@735d13b6-9817-0410-8766-e36946ffe9aa>
Fri, 17 Jan 2014 15:04:34 +0000 (15:04 +0000)
committerpatrick@roquin <patrick@roquin@735d13b6-9817-0410-8766-e36946ffe9aa>
Fri, 17 Jan 2014 15:04:34 +0000 (15:04 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/roq_newsevent/trunk@83260 735d13b6-9817-0410-8766-e36946ffe9aa

Classes/Controller/EventController.php
Classes/ViewHelpers/LinkViewHelper.php
Resources/Private/Partials/EventList/Item.html
Resources/Private/Templates/News/EventDetail.html
Resources/Private/Templates/News/EventList.xml
doc/manual.pdf
doc/manual.sxw
doc/manual.txt
ext_emconf.php

index 3f1ac0a..4b7c741 100644 (file)
@@ -132,6 +132,10 @@ class Tx_RoqNewsevent_Controller_EventController extends Tx_News_Controller_News
             }
         }
 
+        if($settings['event']['startingpoint']) {
+            $demand->setStoragePage(Tx_News_Utility_Page::extendPidListByChildren($settings['event']['startingpoint'], $settings['recursive']));
+        }
+
         return $demand;
     }
 
index b2ff3bf..a541eed 100644 (file)
@@ -9,37 +9,30 @@
  */
 
 class Tx_RoqNewsevent_ViewHelpers_LinkViewHelper extends Tx_News_ViewHelpers_LinkViewHelper {
-    const NEWS_TYPE_DEFAULT         = 0;
-       const NEWS_TYPE_URL_INTERNAL    = 1;
-       const NEWS_TYPE_URL_EXTERNAL    = 2;
 
     /**
      * Render link to news item or internal/external pages
      *
-     * @param Tx_News_Domain_Model_News $newsItem
-     * @param array optional $settings
-     * @param boolean $uriOnly optional return only the url without the a-tag
+     * @param Tx_RoqNewsevent_Domain_Model_Event $newsItem current news object
+     * @param array $settings
+     * @param boolean $uriOnly return only the url without the a-tag
      * @param array $configuration optional typolink configuration
-     * @param string $action optional typolink additional action
+     *
      * @return string $link
      */
-    public function render(Tx_RoqNewsevent_Domain_Model_Event $newsItem, array $settings = array(), $uriOnly = FALSE, $configuration = array(), $action = NULL) {
-        // modify link action, so that the event detail action will be used (only for default news records)
-        if($newsItem->getType() == Tx_RoqNewsevent_ViewHelpers_LinkViewHelper::NEWS_TYPE_DEFAULT) {
-            if($action !== NULL) {
-                $configuration['additionalParams'] .= '&tx_news_pi1[action]=' . $action;
-            }
-
-            $link = parent::render($newsItem, $settings, $uriOnly, $configuration);
+    public function render(Tx_RoqNewsevent_Domain_Model_Event $newsItem, array $settings = array(), $uriOnly = FALSE, $configuration = array()) {
+        // Override the news detailPid with event backPid
+        if($settings['event']['detailPid']) {
+            $settings['detailPid'] = $settings['event']['detailPid'];
+        }
 
-            // ignore the getDynamicGetVarsManipulation settings, which can cause the action to be added hardcoded (which is only applicable for news only items)
-            if(stristr($link, urlencode('tx_news_pi1[action]') . '=detail') !== FALSE) {
-                $link = str_replace(urlencode('tx_news_pi1[action]') . '=detail', urlencode('tx_news_pi1[action]') . '=' . $action, $link);
-            }
-        } else {
-            $link = parent::render($newsItem, $settings, $uriOnly, $configuration);
+        // Override the news backPid with event backPid
+        if($settings['event']['backPid']) {
+            $settings['backPid'] = $settings['event']['backPid'];
         }
 
+        $link = parent::render($newsItem, $settings, $uriOnly, $configuration);
+
         return $link;
     }
 
index 77897cf..b9a708b 100644 (file)
@@ -8,7 +8,7 @@
        <!-- header -->
        <div class="header">
                <h3>
-                       <e:link newsItem="{newsItem}" settings="{settings}" action="eventDetail">
+                       <e:link newsItem="{newsItem}" settings="{settings}">
                                {newsItem.title}
                        </e:link>
                </h3>
@@ -18,7 +18,7 @@
                <!-- media preview element -->
                <f:then>
                <div class="news-img-wrap">
-                       <e:link newsItem="{newsItem}" settings="{settings}" action="eventDetail">
+                       <e:link newsItem="{newsItem}" settings="{settings}">
                                <f:if condition="{newsItem.mediaPreviews}">
                                        <f:then>
                                                <f:alias map="{mediaElement: newsItem.mediaPreviews.0}">
@@ -65,7 +65,7 @@
                        <f:if condition="{settings.displayDummyIfNoMedia}">
                                <f:then>
                                        <div class="news-img-wrap">
-                                               <e:link newsItem="{newsItem}" settings="{settings}" action="eventDetail">
+                                               <e:link newsItem="{newsItem}" settings="{settings}">
                                                        <span class="no-media-element">
                                                                <f:image
                                                                        src="typo3conf/ext/news/Resources/Public/Images/dummy-preview-image.png"
index dba388d..855202d 100644 (file)
@@ -94,7 +94,7 @@
                                                                <li>
                                                                        <span class="news-related-news-date"><f:format.date format="d.m.Y">{related.datetime}</f:format.date></span>
                                                                        <span class="hidden">. </span>
-                                                                       <e:link newsItem="{related}" settings="{settings}" action="eventDetail">
+                                                                       <e:link newsItem="{related}" settings="{settings}">
                                                                                {related.title}
                                                                        </e:link>
                                                                </li>
index cd80d83..fe1f6ef 100644 (file)
@@ -23,7 +23,7 @@
                                                <guid>news-{newsItem.uid}</guid>
                                                <pubDate><e:format.date format="%a, %d %b %Y %T %z" currentDate="1" strftime="1">{newsItem.datetime}</e:format.date></pubDate>
                                                <title><n:format.hsc>{newsItem.title}</n:format.hsc></title>
-                                               <link><n:link newsItem="{newsItem}" settings="{settings}" configuration="{returnLast:'url'}" hsc="TRUE"></n:link></link>
+                                               <link><e:link newsItem="{newsItem}" settings="{settings}" configuration="{returnLast:'url'}" hsc="TRUE"></e:link></link>
                                                <description>
                             <e:format.trim trimTabs="FALSE">
                                 <n:format.striptags><f:render partial="Event/Item.html" arguments="{newsItem: newsItem, settings:settings}"/></n:format.striptags>
index 46f41c7..8035f71 100644 (file)
Binary files a/doc/manual.pdf and b/doc/manual.pdf differ
index 7e6dbec..b3e2dd9 100644 (file)
Binary files a/doc/manual.sxw and b/doc/manual.sxw differ
index 852118e..09ba2d1 100644 (file)
@@ -1,7 +1,7 @@
 News event: Events for the versatile news system\r
 Extension Key: roq_newsevent\r
 Language: en\r
-Version: 1.0.5 (rev. 59)\r
+Version: 1.0.6 (rev. 60)\r
 Keywords: forEditors, forAdmins, forBeginners, forIntermediates\r
 Copyright 2006-2012, ROQUIN B.V., <extensions@roquin.nl>\r
 \r
@@ -29,9 +29,10 @@ Tutorial     9
 General        9\r
 How to add an event section to your site       9\r
 Updating from version 2.0.x    10\r
-Known problems 12\r
-To-Do list     13\r
-ChangeLog      14\r
+Updating from version 2.1.2 to 2.1.3   12\r
+Known problems 13\r
+To-Do list     14\r
+ChangeLog      15\r
 \r
 Introduction\r
 What does it do?\r
@@ -226,6 +227,18 @@ dateField
 string\r
 Field to use for dateMenu\r
 EventStartdate\r
+startingpoint\r
+string\r
+Page id of the event sysfolder\r
+plugin.tx_news.settings.startingpoint\r
+detailPid\r
+string\r
+Page id of the event detail view\r
+plugin.tx_news.settings.detailPid\r
+backPid\r
+string\r
+Page id for the event detail view to return to\r
+plugin.tx_news.settings.backPid\r
 News event view settings\r
 See the table below for the specific news event view settings, which are defined by using: plugin.tx_news.view.event.<property>. You can override these settings if you want to use your own Fluid templates for news event.\r
 Property:\r
@@ -324,7 +337,27 @@ Update and running the update script
 2. After you've successfully performed the update, go to the \93Loaded extensions\94 list in the TYPO3 \93Extension Manager\94, and click on the News event extension.\r
 3. Click on the Extension manager selectbox on the top, and check if the item 'UPDATE!' is available from the selectbox in the top, as shown in the image below:\r
 4. If this option is not available, you've already performed this update or there are no news records available which must be updated.\r
-5. Finally, click on 'UPDATE!' to update all old news event database records. From now all older news event records are converted to the newer format. Please note: The 'UPDATE!' option will disappear when the update has performed successfully.\r
+1. Finally, click on 'UPDATE!' to update all old news event database records. From now all older news event records are converted to the newer format. Please note: The 'UPDATE!' option will disappear when the update has performed successfully.\r
+\r
+\r
+Updating from version 2.1.2 to 2.1.3\r
+Please read this section carefully, if you already have news event version 2.1.2 installed, and want to update to version 2.1.3 of news event.\r
+What has been changed?\r
+The link view helper for linking the event to the event detail page.\r
+Ok, but what does this mean?\r
+You only have to change the link view helper in the fluid template. First you need to remove all the action arguments in the fluid templates for the e:link tag. So change:\r
+<e:link newsItem="{newsItem}" settings="{settings}" action="eventDetail">\r
+Into:\r
+<e:link newsItem="{newsItem}" settings="{settings}">\r
+For the fluid templates:\r
+/Partials/EventList/Item.html\r
+/Templates/News/EventDetail.html\r
+\r
+And finally you have to change in the /Templates/News/Eventlist.xml the n:link into an e:link. So change:\r
+<n:link newsItem="{newsItem}" settings="{settings}" configuration="{returnLast:'url'}" hsc="TRUE"></n:link>\r
+Into:\r
+<e:link newsItem="{newsItem}" settings="{settings}" configuration="{returnLast:'url'}" hsc="TRUE"></e:link>\r
+\r
 Known problems\r
 Please let me know if you have any suggestions, tips, or questions about the news event extension. Further progress, and other information can be found at TYPO3 forge: http://forge.typo3.org/projects/extension-roq_newsevent.\r
 The bugtracker at http://forge.typo3.org/projects/extension-roq_newsevent/issues holds all known bugs of the news event extension. \r
@@ -335,21 +368,4 @@ If possible: an attached patch would be very nice!
 To-Do list\r
 See the roadmap section on Forge: http://forge.typo3.org/projects/extension-roq_newsevent/roadmap.\r
 ChangeLog\r
-Version\r
-Changes:\r
-2.1.1\r
-Fixed bug #49651 due to TYPO3 6.1 compatibility (thanks to Sascha Treiber)\r
-Implemented suggestion #45882 (thanks to Georg Ringer)\r
-2.1.0\r
-Changed 'Event' type to an 'Is event' checkbox to also support the 'Internal Page' and 'External Page' news types for events. \r
-Added support for news event specific templates paths \r
-Lowered version dependency of News from 1.4.0 to 1.3.2 due to issue #40303\r
-\r
-Important: Please run the update script when updating from previous versions of news event! See the manual (section: Updating news event from version 2.0.x) or the wiki on TYPO3 Forge for instructions.\r
-2.0.2\r
-Fixed bug #41042 and updated contact details \r
-2.0.1\r
-Native support for more languages, and some minor fixes \r
-2.0.0\r
-Initial (public) version\r
-\r
+See the Wiki section on Forge for Release notes: http://forge.typo3.org/projects/extension-roq_newsevent/wiki.\r
index e458409..4750df5 100644 (file)
@@ -3,7 +3,7 @@
 /***************************************************************
  * Extension Manager/Repository config file for ext "roq_newsevent".
  *
- * Auto generated 19-11-2013 17:10
+ * Auto generated 16-01-2014 10:38
  *
  * Manual updates:
  * Only the data in the array - everything else is removed by next
@@ -14,20 +14,24 @@ $EM_CONF[$_EXTKEY] = array (
        'title' => 'News event',
        'description' => 'Event extension based on the versatile news system extension and Extbase & Fluid. Supplies additional event functionality to news records.',
        'category' => 'plugin',
-       'author' => 'ROQUIN B.V.',
-       'author_email' => 'extensions@roquin.nl',
-       'author_company' => 'ROQUIN B.V.',
-       'shy' => '',
+       'shy' => 0,
+       'version' => '2.1.2',
+       'dependencies' => '',
+       'conflicts' => '',
        'priority' => '',
+       'loadOrder' => '',
        'module' => '',
        'state' => 'stable',
-       'internal' => '',
        'uploadfolder' => 0,
        'createDirs' => '',
        'modify_tables' => 'tx_news_domain_model_news',
-       'clearCacheOnLoad' => 1,
+       'clearcacheonload' => 1,
        'lockType' => '',
-       'version' => '2.1.2',
+       'author' => 'ROQUIN B.V.',
+       'author_email' => 'extensions@roquin.nl',
+       'author_company' => 'ROQUIN B.V.',
+       'CGLcompliance' => NULL,
+       'CGLcompliance_note' => NULL,
        'constraints' => 
        array (
                'depends' => 
@@ -44,7 +48,6 @@ $EM_CONF[$_EXTKEY] = array (
                array (
                ),
        ),
-       '_md5_values_when_last_written' => 'a:47:{s:9:"Changelog";s:4:"ad35";s:20:"class.ext_update.php";s:4:"6963";s:12:"ext_icon.gif";s:4:"d6cc";s:17:"ext_localconf.php";s:4:"c834";s:14:"ext_tables.php";s:4:"f31b";s:14:"ext_tables.sql";s:4:"9803";s:21:"ExtensionBuilder.json";s:4:"c6aa";s:38:"Classes/Controller/EventController.php";s:4:"ab4b";s:30:"Classes/Domain/Model/Event.php";s:4:"cd86";s:45:"Classes/Domain/Repository/EventRepository.php";s:4:"d477";s:36:"Classes/ViewHelpers/IfViewHelper.php";s:4:"0625";s:38:"Classes/ViewHelpers/LinkViewHelper.php";s:4:"0155";s:43:"Classes/ViewHelpers/TranslateViewHelper.php";s:4:"e892";s:45:"Classes/ViewHelpers/Format/DateViewHelper.php";s:4:"f7f1";s:45:"Classes/ViewHelpers/Format/TimeViewHelper.php";s:4:"586d";s:45:"Classes/ViewHelpers/Format/TrimViewHelper.php";s:4:"b1fc";s:44:"Configuration/ExtensionBuilder/settings.yaml";s:4:"406d";s:27:"Configuration/TCA/Event.php";s:4:"a0fd";s:38:"Configuration/TypoScript/constants.txt";s:4:"c80e";s:34:"Configuration/TypoScript/setup.txt";s:4:"00b2";s:40:"Resources/Private/Language/locallang.xml";s:4:"eb43";s:70:"Resources/Private/Language/locallang_csh_tx_news_domain_model_news.xml";s:4:"9c21";s:43:"Resources/Private/Language/locallang_db.xml";s:4:"5fff";s:46:"Resources/Private/Partials/Category/Items.html";s:4:"7304";s:53:"Resources/Private/Partials/Detail/MediaContainer.html";s:4:"29ed";s:47:"Resources/Private/Partials/Detail/MediaDam.html";s:4:"df99";s:48:"Resources/Private/Partials/Detail/MediaHtml.html";s:4:"14e2";s:49:"Resources/Private/Partials/Detail/MediaImage.html";s:4:"4fdd";s:49:"Resources/Private/Partials/Detail/MediaVideo.html";s:4:"2993";s:48:"Resources/Private/Partials/Detail/Opengraph.html";s:4:"3410";s:42:"Resources/Private/Partials/Event/Item.html";s:4:"ab77";s:41:"Resources/Private/Partials/Event/Item.ics";s:4:"26ac";s:41:"Resources/Private/Partials/Event/Item.xml";s:4:"a115";s:46:"Resources/Private/Partials/EventList/Item.html";s:4:"c6d5";s:51:"Resources/Private/Templates/News/EventDateMenu.html";s:4:"d404";s:49:"Resources/Private/Templates/News/EventDetail.html";s:4:"0eac";s:48:"Resources/Private/Templates/News/EventDetail.ics";s:4:"ebd0";s:47:"Resources/Private/Templates/News/EventList.html";s:4:"4a1a";s:46:"Resources/Private/Templates/News/EventList.ics";s:4:"8638";s:46:"Resources/Private/Templates/News/EventList.xml";s:4:"6808";s:35:"Resources/Public/Icons/relation.gif";s:4:"e615";s:52:"Resources/Public/Icons/tx_news_domain_model_news.gif";s:4:"905a";s:45:"Tests/Unit/Controller/EventControllerTest.php";s:4:"33b1";s:37:"Tests/Unit/Domain/Model/EventTest.php";s:4:"0bbc";s:14:"doc/manual.pdf";s:4:"1a9f";s:14:"doc/manual.sxw";s:4:"2c43";s:14:"doc/manual.txt";s:4:"cc3a";}',
 );
 
 ?>
\ No newline at end of file