Index: NEWS.txt
===================================================================
--- NEWS.txt (Revision 10577)
+++ NEWS.txt (Arbeitskopie)
@@ -138,10 +138,6 @@
Also the syntax highlighting engine is now extracted from the system extension
so it can be used in other places of the TYPO3 Core as well.
- * A donation notice will be shown to administrators in the TYPO3 Backend
- on login after using TYPO3 for more than three months. This behaviour
- can be disabled completely - see $TYPO3_CONF_VARS[BE][allowDonateWindow].
-
* Most Icons used in the TYPO3 Backend are now rendered through so-called
sprites. Instead of loading many image tags with single icons and therefore
many http requests there are now only 6 sprite images (a sprite image is a
Index: t3lib/config_default.php
===================================================================
--- t3lib/config_default.php (Revision 10577)
+++ t3lib/config_default.php (Arbeitskopie)
@@ -249,7 +249,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 this .htaccess rule to work: RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule ^(.+)\.(\d+)\.(php|js|css|png|jpg|gif|gzip)$ $1.$3 [L]. 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
- '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.
'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',
'SC_alt_file_navframe::expandCollapse' => 'typo3/alt_file_navframe.php:SC_alt_file_navframe->ajaxExpandCollapse',
@@ -272,8 +271,6 @@
'BackendLogin::refreshLogin' => 'typo3/classes/class.ajaxlogin.php:AjaxLogin->refreshLogin',
'BackendLogin::isTimedOut' => 'typo3/classes/class.ajaxlogin.php:AjaxLogin->isTimedOut',
'BackendLogin::getChallenge' => 'typo3/classes/class.ajaxlogin.php:AjaxLogin->getChallenge',
- 'DonateWindow::disable' => 'typo3/classes/class.donatewindow.php:DonateWindow->disable',
- 'DonateWindow::postpone' => 'typo3/classes/class.donatewindow.php:DonateWindow->postpone',
'WorkspaceMenu::toggleWorkspacePreview' => 'typo3/classes/class.workspaceselector.php:WorkspaceSelector->toggleWorkspacePreview',
'WorkspaceMenu::setWorkspace' => 'typo3/classes/class.workspaceselector.php:WorkspaceSelector->setWorkspace',
'ExtDirect::getAPI' => 't3lib/extjs/class.t3lib_extjs_extdirectapi.php:t3lib_extjs_ExtDirectApi->getAPI',
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.workspaceselector.php');
@@ -189,10 +188,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');
@@ -413,11 +408,6 @@
'tabs_closeAll' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:tabs.closeAll'),
'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'),
- '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'),
);
$t3LLLfileUpload = array(
'windowTitle' => $GLOBALS['LANG']->getLL('fileUpload_windowTitle'),
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)
@@ -2239,8 +2239,3 @@
padding-left: 3px;
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;
-}
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)
@@ -111,6 +111,15 @@