Fixed bug #17719: Move donation popup to about module (thanks to Steffen Kamper)
authorohader <ohader@709f56b5-9817-0410-a4d7-c38de5d9e867>
Wed, 23 Feb 2011 13:19:04 +0000 (13:19 +0000)
committerohader <ohader@709f56b5-9817-0410-a4d7-c38de5d9e867>
Wed, 23 Feb 2011 13:19:04 +0000 (13:19 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10593 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/config_default.php
typo3/backend.php
typo3/sysext/about/mod/index.php
typo3/sysext/lang/locallang_mod_help_about.xml
typo3/sysext/t3skin/extjs/xtheme-t3skin.css
typo3/sysext/t3skin/stylesheets/structure/module_help_about.css
typo3/sysext/t3skin/stylesheets/visual/module_help_about.css

index 7a576ac..48d5564 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-23  Oliver Hader  <oliver.hader@typo3.org>
+
+       * Fixed bug #17719: Move donation popup to about module (thanks to Steffen Kamper)
+
 2011-02-23  Steffen Kamper  <steffen@typo3.org>
 
        * Fixed bug #17520: Pagetree - Locked records are not indicated anymore (Thanks to Stefan Galinski)
index 258124e..990f8db 100644 (file)
@@ -487,7 +487,6 @@ $TYPO3_CONF_VARS = array(
                '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,     // <p>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)</p><p>If false the filemtime will be appended as a query-string.</p>
                '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',
@@ -511,8 +510,6 @@ $TYPO3_CONF_VARS = array(
                        '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',
                ),
@@ -664,6 +661,7 @@ define('TYPO3_URL_DONATE', 'http://typo3.com/Donations.1261.0.html');
 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 12d1054..3758f30 100644 (file)
@@ -31,7 +31,6 @@ require_once('interfaces/interface.backend_toolbaritem.php');
 
 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 @@ class TYPO3backend {
        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 @@ class TYPO3backend {
                        '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 bacba79..b6a79b3 100644 (file)
@@ -110,6 +110,15 @@ class SC_mod_help_about_index {
                                </div>
 
                                <div class="typo3-mod-help-about-index-php-inner">
+                                       <h2>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_help_about.xml:donation_header', TRUE) . '</h2>
+                                       <p id="donation-description">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_help_about.xml:donation_message') . '</p>
+                                       <div class="donation-button">
+                                               <input type="button" id="donation-button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_help_about.xml:donation_button') . '"
+                                               onclick="window.open(\'' . TYPO3_URL_DONATE . '\');" />
+                                       </div>
+                               </div>
+
+                               <div class="typo3-mod-help-about-index-php-inner">
                                        <h2>'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_help_about.xml:community_credits', true).'</h2>
                                        <p>'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_help_about.xml:information_detail').'</p>
                                </div>
index 75ba3dc..09b9b8d 100755 (executable)
@@ -6,6 +6,7 @@
        </meta>
        <data type="array">
                <languageKey index="default" type="array">
+                       <label index="title">About TYPO3</label>
                        <label index="typo3_logo">TYPO3 logo</label>
                        <label index="information">TYPO3 Information</label>
                        <label index="welcome">TYPO3 Professional Web Content Management System</label>
@@ -21,6 +22,9 @@
                        <label index="mlang_labels_tablabel">About TYPO3</label>
                        <label index="mlang_labels_tabdescr">Displays the basic facts about the TYPO3 application, version and licensing terms.</label>
                        <label index="mlang_tabs_tab">About TYPO3</label>
+                       <label index="donation_header">TYPO3 Donation</label>
+                       <label index="donation_message">It would be great if you could donate. TYPO3 is Open Source and relies heavily on donations from its users and supporters.&lt;br/&gt; &lt;b&gt;Thank you&lt;/b&gt; for making this great Content Management System even better with your help!</label>
+                       <label index="donation_button">Donate now</label>
                </languageKey>
        </data>
 </T3locallang>
index b17d5e7..48648bd 100644 (file)
@@ -2357,11 +2357,6 @@ body.x-body-masked .x-window-plain .x-window-mc {
        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 2ac9fb6..3cba7b2 100644 (file)
@@ -9,6 +9,15 @@ $Id$
        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 ed1fe13..38ac0d5 100644 (file)
@@ -8,6 +8,22 @@ $Id$
        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;