[-FEATURE] Removed experimental RTE integration.
authorjocrau <jocrau@735d13b6-9817-0410-8766-e36946ffe9aa>
Mon, 16 Nov 2009 09:38:16 +0000 (09:38 +0000)
committerBastian Bringenberg <spam@bastian-bringenberg.de>
Thu, 4 Dec 2014 23:56:07 +0000 (00:56 +0100)
[+BUGFIX] Added missing option "showRange" to pagebrowser.
[+FEATURE] You can now pass additional table tag params (pagebrowser.tableParams= class="foo"). This is only active if you don't overwrite the wraps.
[+FEATURE] You can now specify, if the "prev." link should always be shown (pagebrowser.alwaysPrev = 1).

git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/contagged/trunk@26566 735d13b6-9817-0410-8766-e36946ffe9aa

12 files changed:
ChangeLog
extensions/contagged/class.tx_rtehtmlarea_contagged.php [deleted file]
extensions/contagged/locallang.xml [deleted file]
extensions/contagged/skin/htmlarea.css [deleted file]
extensions/contagged/skin/images/contagged.gif [deleted file]
extensions/contagged/skin/images/contagged.png [deleted file]
htmlarea/plugins/contagged/contagged.js [deleted file]
htmlarea/plugins/contagged/locallang.xml [deleted file]
js/selecttext.js [deleted file]
pi1/class.tx_contagged_pi1.php
static/constants.txt
static/setup.txt

index b8e6bbd..fe85f57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+v1.4.1 2009-11-16 Jochen Rau <jochen.rau@typoplanet.de>
+
+       [-FEATURE] Removed experimental RTE integration.
+       [+BUGFIX] Added missing option "showRange" to pagebrowser.
+       [+FEATURE] You can now pass additional table tag params (pagebrowser.tableParams= class="foo"). This is only active if you don't overwrite the wraps.
+       [+FEATURE] You can now specify, if the "prev." link should always be shown (pagebrowser.alwaysPrev = 1).
+       
 v1.4.0 2009-10-01 Jochen Rau <jochen.rau@typoplanet.de>
 
        [~TASK] Deployed version 1.4.0 to TER. Tagged version 1.4.0.
diff --git a/extensions/contagged/class.tx_rtehtmlarea_contagged.php b/extensions/contagged/class.tx_rtehtmlarea_contagged.php
deleted file mode 100644 (file)
index c11bf53..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 2008 Fabien Udriot <fabien.udriot(arobas)ecodev.ch>
-*  All rights reserved
-*
-*  This script is part of the Typo3 project. The Typo3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-/**
- * Ecodocument plugin for htmlArea RTE
- *
- * @author Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
- *
- * TYPO3 SVN ID: $Id: class.tx_rtehtmlarea_contagged.php 2985 2008-01-31 11:37:57Z ingmars $
- *
- */
-
-require_once(t3lib_extMgm::extPath('rtehtmlarea').'class.tx_rtehtmlareaapi.php');
-
-class tx_rtehtmlarea_contagged extends tx_rtehtmlareaapi {
-
-       protected $extensionKey = 'contagged'; // The key of the extension that is extending htmlArea RTE       
-       protected $pluginName = 'contagged'; // The name of the plugin registered by the extension
-       protected $relativePathToSkin = 'extensions/contagged/skin/htmlarea.css';// Path to the skin (css) file relative to the extension dir.
-       
-       protected $pluginButtons = 'contagged';
-       protected $convertToolbarForHtmlAreaArray = array (
-               'contagged'     => 'contagged', #must be the same in the javascript var buttonId = Dummyplugin
-               );
-       
-       
-        /**
-        * Return JS configuration of the htmlArea plugins registered by the extension
-        *
-        * @param       integer         Relative id of the RTE editing area in the form
-        *
-        * @return string               JS configuration for registered plugins
-        *
-        * The returned string will be a set of JS instructions defining the configuration that will be provided to the plugin(s)
-        * Each of the instructions should be of the form:
-        *      RTEarea['.$RTEcounter.']["buttons"]["button-id"]["property"] = "value";
-        */
-       public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
-               
-               $registerRTEinJavascriptString = '';
-               return $registerRTEinJavascriptString;
-       }
-       
-
-} // end of class
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea_contagged/extensions/contagged/class.tx_rtehtmlarea_contagged.php']) {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/rtehtmlarea_contagged/contagged/class.tx_rtehtmlarea_contagged.php']);
-}
-
-?>
\ No newline at end of file
diff --git a/extensions/contagged/locallang.xml b/extensions/contagged/locallang.xml
deleted file mode 100644 (file)
index 51aa09d..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<T3locallang>
-       <meta type="array">
-               <type>database</type>
-               <description>Language labels for extension 'dummyplugin'</description>
-       </meta>
-       <data type="array">
-               <languageKey index="default" type="array">
-                       <label index="asdf">asdf</label>
-               </languageKey>
-               <languageKey index="fr" type="array">
-                       
-               </languageKey>
-       </data>
-       
-</T3locallang>
\ No newline at end of file
diff --git a/extensions/contagged/skin/htmlarea.css b/extensions/contagged/skin/htmlarea.css
deleted file mode 100644 (file)
index bc434ce..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Selectors for the AboutEditor plugin of htmlArea RTE */
-/* TYPO3 SVN ID: $Id $ */
-.htmlarea .toolbar .contagged {background-image:url("images/contagged.gif");}
\ No newline at end of file
diff --git a/extensions/contagged/skin/images/contagged.gif b/extensions/contagged/skin/images/contagged.gif
deleted file mode 100644 (file)
index 87c8b61..0000000
Binary files a/extensions/contagged/skin/images/contagged.gif and /dev/null differ
diff --git a/extensions/contagged/skin/images/contagged.png b/extensions/contagged/skin/images/contagged.png
deleted file mode 100644 (file)
index 75f8c13..0000000
Binary files a/extensions/contagged/skin/images/contagged.png and /dev/null differ
diff --git a/htmlarea/plugins/contagged/contagged.js b/htmlarea/plugins/contagged/contagged.js
deleted file mode 100644 (file)
index aec8f5e..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 2008 Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*  A copy is found in the textfile GPL.txt and important notices to the license
-*  from the author is found in LICENSE.txt distributed with these scripts.
-*
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This script is a modified version of a script published under the htmlArea License.
-*  A copy of the htmlArea License may be found in the textfile HTMLAREA_LICENSE.txt.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-/*
- * Character Map Plugin for TYPO3 htmlArea RTE
- *
- * TYPO3 SVN ID: $Id: $
- */
-contagged = HTMLArea.Plugin.extend({
-
-       constructor : function(editor, pluginName) {
-               this.base(editor, pluginName);
-       },
-
-       /*
-        * This function gets called by the class constructor
-        */
-       configurePlugin : function(editor) {
-
-               /*
-                * Registering plugin "About" information
-                */
-               var pluginInformation = {
-                       version         : "1.0",
-                       developer       : "Jochen Rau",
-                       developerUrl    : "http://www.typoplanet.de/",
-                       copyrightOwner  : "Jochen Rau",
-                       sponsor         : "",
-                       sponsorUrl      : "",
-                       license         : "GPL"
-               };
-               this.registerPluginInformation(pluginInformation);
-
-               /*
-                * Registering the button
-                */
-               var buttonId = "contagged";
-               var buttonConfiguration = {
-                       id              : buttonId,
-                       tooltip         : this.localize("contagged"),
-                       action          : "onButtonPress",
-                       textMode        : true,
-                       dialog          : true
-               };
-               this.registerButton(buttonConfiguration);
-
-               return true;
-        },
-
-       /*
-        * This function gets called when the button was pressed.
-        *
-        * @param       object          editor: the editor instance
-        * @param       string          id: the button id or the key
-        *
-        * @return      boolean         false if action is completed
-        */
-       onButtonPress : function(editor, id) {
-
-               if (this.editor.hasSelectedText()) {
-                       var term = this.editor.getSelectedHTML();
-                       vHWin=window.open('http://localhost:8888/t3dev/typo3/alt_doc.php?edit[tx_contagged_terms][2]=edit&columnsOnly=term_main%2Cterm_alt%2Cterm_type%2Cterm_lang%2Cterm_replace%2Cdesc_short%2Cdesc_long%2Clink%2Cexclude&noView=0&returnUrl=close.html','FEquickEditWindow','width=540,height=400,status=0,menubar=0,scrollbars=1,resizable=1');vHWin.focus();return false;
-               }
-               
-               alert(term);
-       }
-});
-
diff --git a/htmlarea/plugins/contagged/locallang.xml b/htmlarea/plugins/contagged/locallang.xml
deleted file mode 100644 (file)
index 1cbfe77..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<T3locallang>
-       <meta type="array">
-               <description>Labels for ecodocuments plugin of htmlArea RTE</description>
-               <type>module</type>
-       </meta>
-       <data type="array">
-               <languageKey index="default" type="array">
-                       <label index="contagged">Insert Term</label>
-               </languageKey>
-       </data>
-       <orig_hash type="array">
-               <languageKey index="default" type="array">
-               </languageKey>
-       </orig_hash>
-       <orig_text type="array">
-               <languageKey index="default" type="array">
-               </languageKey>
-       </orig_text>
-</T3locallang>
\ No newline at end of file
diff --git a/js/selecttext.js b/js/selecttext.js
deleted file mode 100644 (file)
index d605d4c..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-// Find out if IE runs in quirks mode
-var documentElement = (
-             typeof document.compatMode != "undefined" && 
-             document.compatMode        != "BackCompat"
-            )? "documentElement" : "body";
-
-// Register event
-function init_getSelectedText() {
-    document.onmouseup = getSelectedText;
-    document.onmousedown = resetClassAttribute;
-}
-
-
-function getSelectedText(e) {  
-
-       var txt = '';
-       if (window.getSelection) {
-               txt = window.getSelection();
-       } else if (document.getSelection) {
-               txt = document.getSelection();
-       } else if (document.selection) {
-               txt = document.selection.createRange().text;
-       } else return;
-
-       // Get mouse position
-       xPos = 0;
-       yPos = 0;
-    // Position where the mouse event fired
-    var xPos =  e? e.pageX : window.event.x;
-       var yPos =  e? e.pageY : window.event.y;
-       // For IE: add scroll position
-       if (document.all && !document.captureEvents) {
-           xPos += document[documentElement].scrollLeft;
-           yPos += document[documentElement].scrollTop;
-    }
-       var panel = document.getElementById('tx_contagged_panel');
-       if (txt!='' && panel ) {
-               if (panel.getAttribute('class')=='') {
-                       panel.style.visibility = 'visible';
-                       panel.style.top = (yPos-20)+'px';
-                       panel.style.left = xPos+'px';
-                       panel.setAttribute('class','fixed');
-                       var form = panel.getElementsByTagName('FORM')[0];
-                       // alert(form);
-                       var link = form.getElementsByTagName('A')[0];
-                       onclick = link.getAttribute('onclick');
-                       parts = onclick.split('&noView=0');
-                       // alert(parts[1]);
-                       newOnclick = parts[0]+'&noView=0&defVals[tx_contagged_terms][term_main]='+txt+'&'+parts[1];
-                       link.setAttribute('onclick',newOnclick);
-                       // childs = form[0].getElementById('tx_contagged_defVal');
-                       // childs = form[0];
-                       // if (false) {
-                       //      childs[0].setAttribute('value',txt);                            
-                       // } else {
-                       //      var hiddenField = document.createElement('input');
-                       //      hiddenField.setAttribute('type','hidden');
-                       //      hiddenField.setAttribute('name','TSFE_EDIT[data][tx_contagged_terms][NEW][term_main]');
-                       //      hiddenField.setAttribute('value',txt);
-                       //      hiddenField.setAttribute('id','tx_contagged_defVal');
-                       //      form[0].insertBefore(hiddenField,form[0].firstChild);                           
-                       // }
-               }
-       // '<input type="hidden" name="TSFE_EDIT[data][tx_contagged_terms][NEW][term_main]" value="'+txt+'" />');
-       } else {
-               panel.style.visibility = 'hidden';
-       }
-}
-
-function resetClassAttribute(e) {
-       var panel = document.getElementById('tx_contagged_panel');
-       if (panel.getAttribute('class')=='fixed') {
-               panel.setAttribute('class','second');
-       } else {
-               panel.setAttribute('class','');
-       }
-}
\ No newline at end of file
index e37edd4..9fdbda0 100644 (file)
@@ -438,11 +438,13 @@ class tx_contagged_pi1 extends tslib_pibase {
                $this->internal['maxPages'] = $this->conf['pagebrowser.']['maxPages'] ? intval($this->conf['pagebrowser.']['maxPages']) : 3;
                $this->internal['dontLinkActivePage'] = $this->conf['pagebrowser.']['dontLinkActivePage'] ? (boolean)$this->conf['pagebrowser.']['dontLinkActivePage'] : FALSE;
                $this->internal['showFirstLast'] = $this->conf['pagebrowser.']['showFirstLast'] ? (boolean)$this->conf['pagebrowser.']['showFirstLast'] : FALSE;
-               $this->internal['pagefloat'] = 'center';
-               if ( ($this->internal['res_count'] > $this->internal['results_at_a_time']) && ($this->conf['pagebrowser.']['enable'] > 0)) {
-                       $showResultCount = $this->conf['pagebrowser.']['showResultCount'] ? (boolean)$this->conf['pagebrowser.']['showResultCount'] : FALSE;
+               $this->internal['pagefloat'] = $this->conf['pagebrowser.']['pagefloat'];
+               $this->internal['showRange'] = $this->conf['pagebrowser.']['showRange'];
+               $this->pi_alwaysPrev = intval($this->conf['pagebrowser.']['alwaysPrev']);
+
+               if (($this->internal['res_count'] > $this->internal['results_at_a_time']) && ($this->conf['pagebrowser.']['enable'] > 0)) {
                        $wrapArray = is_array($this->conf['pagebrowser.']['wraps.']) ? $this->conf['pagebrowser.']['wraps.'] : array();
-                       $markerArray['###PAGEBROWSER###'] = $this->pi_list_browseresults($showResultCount, NULL, $wrapArray);
+                       $markerArray['###PAGEBROWSER###'] = $this->pi_list_browseresults($this->conf['pagebrowser.']['showResultCount'], $this->conf['pagebrowser.']['tableParams'], $wrapArray);
                } else {
                        $markerArray['###PAGEBROWSER###'] = '';                 
                }
index 3245f50..eb30ead 100644 (file)
@@ -73,6 +73,12 @@ contagged {
        dontLinkActivePage = 1  
        # cat=contagged (list)//40; type=boolean; label=Show "First"/"Last": Show link to first and last page.
        showFirstLast = 0       
+       # cat=contagged (list)//45; type=boolean; label=Show always link to previous.
+       alwaysPrev = 1       
        # cat=contagged (list)//50; type=boolean; label=Show result counter
        showResultCount = 0
+       # cat=contagged (list)//60; type=boolean; label=Show page links as range (1-5 6-10 11-15... instead of 1 2 3...)
+       showRange = 0
+       # cat=contagged (list)//60; type=string; label=Additional table tag params.
+       tableParams = 
 }
\ No newline at end of file
index bd64efa..1a5d912 100644 (file)
@@ -78,7 +78,10 @@ plugin.tx_contagged {
                maxPages = {$contagged.maxPages}
                dontLinkActivePage = {$contagged.dontLinkActivePage}
                showFirstLast = {$contagged.showFirstLast}
+               alwaysPrev = {$contagged.alwaysPrev}
                showResultCount = {$contagged.showResultCount}
+               showRange = {$contagged.showRange}
+               tableParams = {$contagged.tableParams}
                wraps {
                        browseBoxWrap = <div class="browseBoxWrap">|</div>
                        showResultsWrap = <div class="showResultsWrap">|</div>