Index: t3lib/config_default.php =================================================================== --- t3lib/config_default.php (Revision 10577) +++ t3lib/config_default.php (Arbeitskopie) @@ -488,7 +488,6 @@ 'elementVersioningOnly' => TRUE, // If true, only element versioning is allowed in the backend (see option newPagesVersioningType). Setting this flag is recommended for new installations of TYPO3 4.2+ since "page" and "branch" versioning types are known for the drawbacks of loosing ids and "element" type versions supports moving now. Please note that "page" and "branch" types are deprecated since TYPO3 4.2 and will be unsupported in TYPO3 4.6. Thus, this option will be removed in TYPO3 4.6. 'versionNumberInFilename' => FALSE, //

Boolean: If true, included CSS and JS files will have the timestamp embedded in the filename, ie. filename.1269312081.js. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). IMPORTANT: this feature requires extra .htaccess rules to work (please refer to _.htaccess or the _.htaccess file from the dummy package)

If false the filemtime will be appended as a query-string.

'spriteIconGenerator_handler' => '', // String: Used to register own/other spriteGenerating Handler, they have to implement the interface t3lib_spritemanager_SpriteIconGenerator. If set to "t3lib_spritemanager_SpriteBuildingHandler" icons from extensions will automatically merged into sprites. - 'allowDonateWindow' => TRUE, // Boolean: Defines whether to display a TYPO3 donate window to admin users that have been working with the system for more than three months. 'debug' => FALSE, // Boolean: If set, the loginrefresh is disabled and pageRenderer is set to debug mode. Use this to debug the backend only! 'AJAX' => array( // array of key-value pairs for a unified use of AJAX calls in the TYPO3 backend. Keys are the unique ajaxIDs where the value will be resolved to call a method in an object. See ajax.php and the classes/class.typo3ajax.php for more information. 'SC_alt_db_navframe::expandCollapse' => 'typo3/alt_db_navframe.php:SC_alt_db_navframe->ajaxExpandCollapse', @@ -512,8 +511,6 @@ 'BackendLogin::isTimedOut' => 'typo3/classes/class.ajaxlogin.php:AjaxLogin->isTimedOut', 'BackendLogin::getChallenge' => 'typo3/classes/class.ajaxlogin.php:AjaxLogin->getChallenge', 'BackendLogin::refreshTokens' => 'typo3/classes/class.ajaxlogin.php:AjaxLogin->refreshTokens', - 'DonateWindow::disable' => 'typo3/classes/class.donatewindow.php:DonateWindow->disable', - 'DonateWindow::postpone' => 'typo3/classes/class.donatewindow.php:DonateWindow->postpone', 'ExtDirect::getAPI' => 't3lib/extjs/class.t3lib_extjs_extdirectapi.php:t3lib_extjs_ExtDirectApi->getAPI', 'ExtDirect::route' => 't3lib/extjs/class.t3lib_extjs_extdirectrouter.php:t3lib_extjs_ExtDirectRouter->route', ), @@ -665,6 +662,7 @@ define('TYPO3_URL_SECURITY', 'http://typo3.org/teams/security/'); define('TYPO3_URL_DOWNLOAD', 'http://typo3.org/download/packages/'); define('TYPO3_URL_SYSTEMREQUIREMENTS', 'http://typo3.org/1275.0.html'); +define('TYPO3_URL_DONATE', 'http://typo3.org/donate/'); // Include localconf.php. Use this file to configure TYPO3 for your needs and database if (!@is_file(PATH_typo3conf . 'localconf.php')) { Index: typo3/backend.php =================================================================== --- typo3/backend.php (Revision 10577) +++ typo3/backend.php (Arbeitskopie) @@ -31,7 +31,6 @@ require('classes/class.typo3logo.php'); require('classes/class.modulemenu.php'); -require_once('classes/class.donatewindow.php'); // core toolbar items require('classes/class.clearcachemenu.php'); @@ -192,10 +191,6 @@ public function render() { $this->executeHook('renderPreProcess'); - if (t3lib_div::makeInstance('DonateWindow')->isDonateWindowAllowed()) { - $this->pageRenderer->addJsFile('js/donate.js'); - } - // prepare the scaffolding, at this point extension may still add javascript and css $logo = t3lib_div::makeInstance('TYPO3Logo'); $logo->setLogo('gfx/typo3logo_mini.png'); @@ -445,11 +440,6 @@ 'tabs_closeOther' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:tabs.closeOther'), 'tabs_close' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:tabs.close'), 'tabs_openInBrowserWindow' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:tabs.openInBrowserWindow'), - 'donateWindow_title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:donateWindow.title'), - 'donateWindow_message' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:donateWindow.message'), - 'donateWindow_button_donate' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:donateWindow.button_donate'), - 'donateWindow_button_disable' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:donateWindow.button_disable'), - 'donateWindow_button_postpone' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:donateWindow.button_postpone'), 'csh_tooltip_loading' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:csh_tooltip_loading'), ); Index: typo3/sysext/t3skin/extjs/xtheme-t3skin.css =================================================================== --- typo3/sysext/t3skin/extjs/xtheme-t3skin.css (Revision 10577) +++ typo3/sysext/t3skin/extjs/xtheme-t3skin.css (Arbeitskopie) @@ -2357,11 +2357,6 @@ padding-right: 3px; } -#donateWindow.t3-window .x-window-body.x-window-body-noborder { - padding-left: 100px; - background: url(../images/general/donate_teaser.png) no-repeat 25px 10px !important; -} - .icon-collapse-all { background-image: url("images/tree/collapse-all.gif") !important; } Index: typo3/sysext/t3skin/stylesheets/structure/module_help_about.css =================================================================== --- typo3/sysext/t3skin/stylesheets/structure/module_help_about.css (Revision 10577) +++ typo3/sysext/t3skin/stylesheets/structure/module_help_about.css (Arbeitskopie) @@ -9,6 +9,15 @@ width: 500px; } +#typo3-mod-help-about-index-php-outer #donation-description { + padding-left: 60px; + margin: 10px 0; +} + +#typo3-mod-help-about-index-php-outer .donation-button input { + padding-left: 20px; +} + #typo3-mod-help-about-index-php-outer .typo3-mod-help-about-index-php-inner { margin: 10px auto 20px; padding: 10px; Index: typo3/sysext/t3skin/stylesheets/visual/module_help_about.css =================================================================== --- typo3/sysext/t3skin/stylesheets/visual/module_help_about.css (Revision 10577) +++ typo3/sysext/t3skin/stylesheets/visual/module_help_about.css (Arbeitskopie) @@ -8,6 +8,22 @@ text-align: center; } +#typo3-mod-help-about-index-php-outer #donation-description { + background-image: url("../../images/general/donate_teaser.png"); + background-repeat: no-repeat; +} + +#typo3-mod-help-about-index-php-outer .donation-button { + overflow: auto; +} +#typo3-mod-help-about-index-php-outer .donation-button input { + float: right; + background-image: url("../../images/icons/status/dialog-ok.png"); + background-repeat: no-repeat; + background-position: 2px; +} + + #typo3-mod-help-about-index-php-outer .typo3-mod-help-about-index-php-inner { background: #ffffff; border: 1px solid #adadad; Index: typo3/sysext/lang/locallang_mod_help_about.xml =================================================================== --- typo3/sysext/lang/locallang_mod_help_about.xml (Revision 10577) +++ typo3/sysext/lang/locallang_mod_help_about.xml (Arbeitskopie) @@ -6,6 +6,7 @@ + @@ -21,6 +22,9 @@ + + + Index: typo3/sysext/about/mod/index.php =================================================================== --- typo3/sysext/about/mod/index.php (Revision 10577) +++ typo3/sysext/about/mod/index.php (Arbeitskopie) @@ -110,6 +110,15 @@
+

' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_help_about.xml:donation_header', TRUE) . '

+

' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_help_about.xml:donation_message') . '

+
+ +
+
+ +

'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_help_about.xml:community_credits', true).'

'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_help_about.xml:information_detail').'