* Installer: added new option BE/RTE_imageStorageDir. related to issue #7185
authorThomas Hempel <thomas.hempel@typo3.org>
Wed, 23 Jan 2008 11:58:34 +0000 (11:58 +0000)
committerThomas Hempel <thomas.hempel@typo3.org>
Wed, 23 Jan 2008 11:58:34 +0000 (11:58 +0000)
* Installer: Added some styles for deliverable lists

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2951 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/install/modules/class.tx_install_module_base.php
typo3/sysext/install/modules/directories/conf.php
typo3/sysext/install/modules/setup/class.tx_install_module_setup.php
typo3/sysext/install/modules/setup/res/styles.css
typo3/sysext/install/modules/system/conf.php

index 526cc92..4ca0961 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-23     Thomas Hempel  <thomas@typo3-unleashed.net>
+
+       * Installer: added new option BE/RTE_imageStorageDir. related to issue #7185
+       * Installer: Added some styles for deliverable lists
+
 2008-01-22     Thomas Hempel  <thomas@typo3-unleashed.net>
 
        * Installer: Added a "hide" button to hide the results of executed methods
index d2e78f1..69068ac 100644 (file)
@@ -76,8 +76,8 @@ class tx_install_module_base {
         * 
         * @return      Locallang label or $index if no label was found
         */
-       protected function get_LL($index)       {
-               return $this->basicsObject->getLabel($index);
+       protected function get_LL($index, $alternative = '')    {
+               return $this->basicsObject->getLabel($index, $alternative);
        }
        
        
index fdd4f3f..6aec0a3 100644 (file)
@@ -3,7 +3,7 @@ $GLOBALS['MCA']['directories'] = array (
        'general' => array (
                'title' => 'module_directories_title',
        ),
-       
+               
        'checks' => array (
                'directories' => array (
                        'title' => 'module_directories_checks_directories',
index 9cd977b..1fd5334 100644 (file)
@@ -199,6 +199,7 @@ class tx_install_module_setup extends tx_install_module_base        {
                                        '<input type="hidden" name="categorySub" value="'.$this->env['categorySub'].'" />';
                        }
                        
+                       $odd = false;
                        foreach ($names as $name => $mod)       {
                                $modConfig = $GLOBALS['MCA'][$mod][$deliverable][$name];
                                
@@ -298,24 +299,27 @@ class tx_install_module_setup extends tx_install_module_base      {
                                
                                if ($modConfig['elementType'] == 'checkbox')    {
                                                // draw checkboxes in front of the caption
-                                       $deliverableBox = $this->pObj->getViewObject()->renderTag('h3', $deliverableContent.$this->get_LL($modConfig['title']).' '.(($helpData) ? $helpData['button'] : '')).(($helpData) ? $helpData['container'] : '').$descr;
+                                       $deliverableBox = $this->pObj->getViewObject()->renderTag('h3', $deliverableContent.$this->get_LL($modConfig['title'], $name).' '.(($helpData) ? $helpData['button'] : '')).(($helpData) ? $helpData['container'] : '').$descr;
                                } elseif ($deliverable == 'methods') {
                                                // draw "execute" link after caption and target div under caption
-                                       $deliverableBox = $this->pObj->getViewObject()->renderTag('h3', $this->get_LL($modConfig['title']).$headerContent.' '.(($helpData) ? $helpData['button'] : '')).(($helpData) ? $helpData['container'] : '').$descr.$deliverableContent;
+                                       $deliverableBox = $this->pObj->getViewObject()->renderTag('h3', $this->get_LL($modConfig['title'], $name).$headerContent.' '.(($helpData) ? $helpData['button'] : '')).(($helpData) ? $helpData['container'] : '').$descr.$deliverableContent;
                                } else {
                                                // draw caption and content under it (default)
-                                       $deliverableBox = $this->pObj->getViewObject()->renderTag('h3', $this->get_LL($modConfig['title']).' '.(($helpData) ? $helpData['button'] : '')).(($helpData) ? $helpData['container'] : '').$descr.$deliverableContent;
+                                       $deliverableBox = $this->pObj->getViewObject()->renderTag('h3', $this->get_LL($modConfig['title'], $name).' '.(($helpData) ? $helpData['button'] : '')).(($helpData) ? $helpData['container'] : '').$descr.$deliverableContent;
                                }
                                
                                $paramData = array (
                                        'id' => 'container_'.$name,
-                                       'class' => 'deliverable-box'
+                                       'class' => 'deliverable-box'.(($odd) ? ' odd' : '')
                                );
+                               
                                if ($filterResults[$name])      {
                                        $paramData['style'] = 'background-color:#99ff99';
                                }
                                
                                $result .= $this->pObj->getViewObject()->renderTag('div', $deliverableBox, $paramData);
+                               
+                               $odd = !$odd;
                        }
                        
                                // add form for saving options
index 1e03eda..668bb64 100644 (file)
@@ -21,6 +21,14 @@ p {
        margin: 10px 0; 
 }
 
+label em       {
+       font-style: italic;
+       display: block;
+       margin: 0px 0px 7px 20px;
+}
+
+/* FORMS GENRAL */
+
 fieldset legend        {
        font-weight: bold;
 }
@@ -32,7 +40,17 @@ input.bg, select.bg, button  {
        padding:3px;
 }
 
-/** styles for login box - start **/
+/* GENERAL CLASSES */
+.italic        {
+       font-style: italic;
+}
+
+.description   {
+       margin: 5px;
+}
+
+
+/* LOGIN SCREEN */
 form#formLogin {
        width: 400px;
        position: absolute;
@@ -83,13 +101,8 @@ form#formLogin ul {
        text-align: left;
 }
 
-/** styles for login box - end **/
 
-label em       {
-       font-style: italic;
-       display: block;
-       margin: 0px 0px 7px 20px;
-}
+/* CATEGORY TREE */
 
 .categoryTreeContainer {
        position: fixed;
@@ -123,6 +136,9 @@ label em    {
        padding-left: 14px;
 }
 
+
+/* DELIVERABLES */
+
 .help_container        {
        border-bottom: 3px gray solid;
        width: 600px;
@@ -132,16 +148,33 @@ label em  {
        position: absolute;
 }
 
+div.deliverable-box {
+       margin-bottom: 10px;
+       padding: 0 5px 5px 5px;
+}
+
+div.deliverable-box h3 {
+       background: none;
+       text-transform: uppercase;
+}
+
+div.odd {
+       background-color: #dddddd;
+}
+
+.formElementCheckbox   {
+       display: inline;
+       margin-right: 5px;
+}
+
+/* MODULE CONTENT */
+
 #moduleContent {
        position: absolute;
        left: 270px;
        
        opacity: 1.0;
 }
-.formElementCheckbox   {
-       display: inline;
-       margin-right: 5px;
-}
 
 .category_about        {
        background: #c0c0c0 url(../../../imgs/icons/bg_about.png) repeat-y top left;
@@ -156,13 +189,9 @@ label em   {
        margin: 0 5px 0 0;
 }
 
-.italic        {
-       font-style: italic;
-}
 
-.description   {
-       margin: 5px;
-}
+
+/* MESSAGES */
 
 .installer-message     {
        margin-bottom: 15px;
index b61c444..55548bd 100644 (file)
@@ -64,6 +64,15 @@ $GLOBALS['MCA']['system'] = array (
                        'valueType' => 'int'
                ),
                
+               'RTE_imageStorageDir' => array (
+                       'categoryMain' => 'system',
+                       'categorySub' => 'backend',
+                       'tags' => array ('system', 'directory', 'rte'),
+                       'elementType' => 'input',
+                       'value' => 'LC:BE/RTE_imageStorageDir',
+                       'default' => 'uploads/rte/'
+               ),
+               
                /** FRONTEND **/
                
                'png_to_gif' => array (