Fixed bug #14534: Cleanup: Icons missing in the new icon-set, and therefore sprites...

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

diff --git a/ChangeLog b/ChangeLog
index f0b218a..32d0c37 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-05-31  Benjamin Mack  <benni@typo3.org>
 
+       * Fixed bug #14534: Cleanup: Icons missing in the new icon-set, and therefore sprites are updated (Thanks to Steffen Ritter)
        * Fixed bug #14535: Checkbox Alignment in TCEforms is broken (Thanks to Steffen Kamper)
        * Fixed bug #14532: SpriteIcons: Clickmenu is not replaced (Thanks to Steffen Ritter)
 

diff --git a/t3lib/class.t3lib_iconworks.php b/t3lib/class.t3lib_iconworks.php
index df0f5c4..3550c70 100644 (file)
--- a/t3lib/class.t3lib_iconworks.php
+++ b/t3lib/class.t3lib_iconworks.php
@@ -887,7 +887,7 @@ final class t3lib_iconWorks {
                }
 
                        // Detecting extendToSubpages (for pages only)
-               if ($table == 'pages' && $row['extendToSubpages'] && ($status['hidden'] || $status['starttime'] || $status['endtime'] || $status['futureendtime'] || $status['fe_group'])) {
+               if ($table == 'pages' && $row['extendToSubpages']) {
                        $status['protectedSection'] = TRUE;
                }
 

diff --git a/t3lib/stddb/tables.php b/t3lib/stddb/tables.php
index cb2fd14..0c35c4d 100644 (file)
--- a/t3lib/stddb/tables.php
+++ b/t3lib/stddb/tables.php
@@ -155,22 +155,21 @@ $TCA['pages'] = array(
                        '1-root' => 'apps-pagetree-page-domain',
                        '3' => 'apps-pagetree-page-shortcut-external',
                        '3-hideinmenu' => 'apps-pagetree-page-shortcut-external-hideinmenu',
-                       '3-root' => 'apps-pagetree-page-domain',
+                       '3-root' => 'apps-pagetree-page-shortcut-external-root',
                        '4' => 'apps-pagetree-page-shortcut',
                        '4-hideinmenu' => 'apps-pagetree-page-shortcut-hideinmenu',
-                       '4-root' => 'apps-pagetree-page-domain',
-                       '6' => 'apps-pagetree-page-backend-user',
-                       '6-hideinmenu' => 'apps-pagetree-page-backend-user-hideinmenu',
-                       '6-root' => 'apps-pagetree-page-domain',
+                       '4-root' => 'apps-pagetree-page-shortcut-root',
+                       '6' => 'apps-pagetree-page-backend-users',
+                       '6-hideinmenu' => 'apps-pagetree-page-backend-users-hideinmenu',
+                       '6-root' => 'apps-pagetree-page-backend-users-root',
                        '7' => 'apps-pagetree-page-mountpoint',
                        '7-hideinmenu' => 'apps-pagetree-page-mountpoint-hideinmenu',
-                       '7-root' => 'apps-pagetree-page-domain',
+                       '7-root' => 'apps-pagetree-page-mountpoint-root',
                        '199' => 'apps-pagetree-spacer',
                        '199-hideinmenu' => 'apps-pagetree-spacer-hideinmenu',
                        '254' => 'apps-pagetree-folder-default',
                        '254-hideinmenu' => 'apps-pagetree-folder-default-hideinmenu',
-                       '255' => 'apps-pagetree-dust-bin',
-                       '255-hideinmenu' => 'apps-pagetree-dust-bin-hideinmenu',
+                       '255' => 'apps-pagetree-page-recycler',
                        'default' => 'apps-pagetree-page-default',
                        
                ),
@@ -606,6 +605,7 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageName'] = array(
        'actions-edit-cut-release',
        'actions-system-extension-import',
        'actions-view-go-down',
+       'actions-document-edit-access',
        'actions-edit-undo',
        'actions-document-open',
        'actions-view-list-expand',
@@ -640,6 +640,8 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageName'] = array(
        'actions-window-open',
        'apps-filetree-root',
        'apps-pagetree-page-frontend-users',
+       'apps-toolbar-menu-opendocs',
+       'apps-pagetree-page-recycler',
        'apps-filetree-folder-temp',
        'apps-pagetree-page-advanced-hideinmenu',
        'apps-pagetree-page-shortcut-hideinmenu',
@@ -648,8 +650,11 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageName'] = array(
        'apps-pagetree-page-default',
        'apps-pagetree-drag-place-denied',
        'apps-filetree-folder-user',
+       'apps-pagetree-page-shortcut-external-hideinmenu',
+       'apps-pagetree-page-shortcut-root',
        'apps-pagetree-drag-new-inside',
        'apps-pagetree-drag-move-into',
+       'apps-pagetree-page-backend-users-root',
        'apps-filetree-folder-add',
        'apps-pagetree-page-domain',
        'apps-toolbar-menu-workspace',
@@ -662,8 +667,12 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageName'] = array(
        'apps-pagetree-page-mountpoint',
        'apps-pagetree-root',
        'apps-pagetree-page-frontend-user',
+       'apps-pagetree-page-shortcut-external-root',
        'apps-pagetree-page-advanced',
+       'apps-toolbar-menu-cache',
        'apps-pagetree-page-frontend-users-hideinmenu',
+       'apps-pagetree-page-frontend-users-root',
+       'apps-pagetree-page-frontend-user-root',
        'apps-filetree-mount',
        'apps-toolbar-menu-shortcut',
        'apps-pagetree-page-no-icon-found-hideinmenu',
@@ -673,18 +682,24 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageName'] = array(
        'apps-pagetree-page-no-icon-found',
        'apps-filetree-folder-media',
        'apps-pagetree-spacer',
+       'apps-pagetree-page-mountpoint-root',
+       'apps-pagetree-page-advanced-root',
        'apps-pagetree-page-mountpoint-hideinmenu',
        'apps-pagetree-page-backend-users-hideinmenu',
        'apps-pagetree-folder-default',
        'apps-pagetree-page-not-in-menu',
+       'apps-toolbar-menu-search',
        'apps-clipboard-list',
        'apps-filetree-folder-news',
+       'apps-pagetree-page-no-icon-found-root',
        'apps-filetree-folder-list',
        'mimetypes-x-content-link',
        'mimetypes-text-css',
        'mimetypes-media-video',
        'mimetypes-x-content-script',
        'mimetypes-x-content-plugin',
+       'mimetypes-x-content-template-extension',
+       'mimetypes-x-content-page-language-overlay',
        'mimetypes-media-audio',
        'mimetypes-other-other',
        'mimetypes-pdf',
@@ -692,6 +707,7 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageName'] = array(
        'mimetypes-powerpoint',
        'mimetypes-x-content-table',
        'mimetypes-x-content-text-picture',
+       'mimetypes-x-sys_workspace',
        'mimetypes-x-content-login',
        'mimetypes-x-content-header',
        'mimetypes-x-content-form-search',
@@ -709,6 +725,7 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageName'] = array(
        'mimetypes-x-content-image',
        'mimetypes-x-content-menu',
        'mimetypes-compressed',
+       'mimetypes-x-content-domain',
        'mimetypes-x-content-html',
        'mimetypes-text-html',
        'mimetypes-media-flash',
@@ -782,6 +799,7 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageName'] = array(
        'status-warning-in-use',
        'status-status-workspace-draft',
        'status-user-admin',
+       'status-overlay-scheduled-future-end',
        'status-version-7',
        'status-version-10',
        'status-version-27',
@@ -798,14 +816,15 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageName'] = array(
        'status-status-permission-denied',
        'status-overlay-access-restricted',
        'status-version-26'
+
 );
 
 $GLOBALS['TBE_STYLES']['spriteIconApi']['spriteIconRecordOverlayPriorities'] = array('hidden', 'starttime', 'endtime', 'futureendtime', 'fe_group', 'protectedSection');
 $GLOBALS['TBE_STYLES']['spriteIconApi']['spriteIconRecordOverlayNames'] = array(
        'hidden'           => 'status-overlay-hidden',
        'fe_group'         => 'status-overlay-access-restricted',
-       'starttime'        => 'status-overlay-scheduled-start',
-       'endtime'          => 'status-overlay-scheduled-end',
+       'starttime'        => 'status-overlay-scheduled',
+       'endtime'          => 'status-overlay-scheduled',
        'futureendtime'    => 'status-overlay-scheduled-future-end',
        'readonly'         => 'status-overlay-locked',
        'deleted'          => 'status-overlay-deleted',

diff --git a/typo3/stylesheets/visual/main_content.css b/typo3/stylesheets/visual/main_content.css
index d4f037a..047a626 100644 (file)
--- a/typo3/stylesheets/visual/main_content.css
+++ b/typo3/stylesheets/visual/main_content.css
@@ -12,7 +12,7 @@ span.t3-icon {
        display: inline-block;
        position: relative;
        width: 16px;
-       height: 18px;
+       height: 16px;
        overflow: hidden;
 }
 .t3-icon {

diff --git a/typo3/sysext/cms/ext_tables.php b/typo3/sysext/cms/ext_tables.php
index ee6c7e4..221b6e2 100755 (executable)
--- a/typo3/sysext/cms/ext_tables.php
+++ b/typo3/sysext/cms/ext_tables.php
@@ -860,7 +860,7 @@ $TCA['sys_template'] = array (
                ),
                'typeicon_column' => 'root',
                'typeicon_classes' => array(
-                       '0' => 'mimetypes-x-content-template-extension',
+                       'default' => 'mimetypes-x-content-template-extension',
                        '1' => 'mimetypes-x-content-template',
                ),
                'typeicons' => array (

diff --git a/typo3/sysext/t3skin/images/icons/actions/edit-hide.png b/typo3/sysext/t3skin/images/icons/actions/edit-hide.png
index bbd491a..c3146e6 100755 (executable)
Binary files a/typo3/sysext/t3skin/images/icons/actions/edit-hide.png and b/typo3/sysext/t3skin/images/icons/actions/edit-hide.png differ

diff --git a/typo3/sysext/t3skin/images/icons/actions/edit-unhide.png b/typo3/sysext/t3skin/images/icons/actions/edit-unhide.png
index 25f31fd..e33b709 100755 (executable)
Binary files a/typo3/sysext/t3skin/images/icons/actions/edit-unhide.png and b/typo3/sysext/t3skin/images/icons/actions/edit-unhide.png differ

diff --git a/typo3/sysext/t3skin/images/icons/actions/system-tree-search-open.png b/typo3/sysext/t3skin/images/icons/actions/system-tree-search-open.png
index 83ddcb8..79552c9 100755 (executable)
Binary files a/typo3/sysext/t3skin/images/icons/actions/system-tree-search-open.png and b/typo3/sysext/t3skin/images/icons/actions/system-tree-search-open.png differ

diff --git a/typo3/sysext/t3skin/images/icons/actions/view-list-collapse.png b/typo3/sysext/t3skin/images/icons/actions/view-list-collapse.png
index eba4b28..ba960b0 100755 (executable)
Binary files a/typo3/sysext/t3skin/images/icons/actions/view-list-collapse.png and b/typo3/sysext/t3skin/images/icons/actions/view-list-collapse.png differ

diff --git a/typo3/sysext/t3skin/images/icons/actions/view-list-expand.png b/typo3/sysext/t3skin/images/icons/actions/view-list-expand.png
index 1ba4401..6dbf329 100755 (executable)
Binary files a/typo3/sysext/t3skin/images/icons/actions/view-list-expand.png and b/typo3/sysext/t3skin/images/icons/actions/view-list-expand.png differ

diff --git a/typo3/sysext/t3skin/images/icons/apps/filetree-folder-temp.png b/typo3/sysext/t3skin/images/icons/apps/filetree-folder-temp.png
index 1acbc45..0f19f59 100755 (executable)
Binary files a/typo3/sysext/t3skin/images/icons/apps/filetree-folder-temp.png and b/typo3/sysext/t3skin/images/icons/apps/filetree-folder-temp.png differ

diff --git a/typo3/sysext/t3skin/images/icons/apps/filetree-mount.png b/typo3/sysext/t3skin/images/icons/apps/filetree-mount.png
index 7bf0d8a..8aab116 100755 (executable)
Binary files a/typo3/sysext/t3skin/images/icons/apps/filetree-mount.png and b/typo3/sysext/t3skin/images/icons/apps/filetree-mount.png differ

diff --git a/typo3/sysext/t3skin/images/icons/apps/filetree-root.png b/typo3/sysext/t3skin/images/icons/apps/filetree-root.png
index 369902a..2fab786 100755 (executable)
Binary files a/typo3/sysext/t3skin/images/icons/apps/filetree-root.png and b/typo3/sysext/t3skin/images/icons/apps/filetree-root.png differ

diff --git a/typo3/sysext/t3skin/images/icons/apps/pagetree-page-shortcut-external.png b/typo3/sysext/t3skin/images/icons/apps/pagetree-page-shortcut-external.png
index 1be94d6..25eacb7 100755 (executable)
Binary files a/typo3/sysext/t3skin/images/icons/apps/pagetree-page-shortcut-external.png and b/typo3/sysext/t3skin/images/icons/apps/pagetree-page-shortcut-external.png differ

diff --git a/typo3/sysext/t3skin/images/sprites/t3-icon-actions.png b/typo3/sysext/t3skin/images/sprites/t3-icon-actions.png
index 7db50c8..22d2e10 100644 (file)
Binary files a/typo3/sysext/t3skin/images/sprites/t3-icon-actions.png and b/typo3/sysext/t3skin/images/sprites/t3-icon-actions.png differ

diff --git a/typo3/sysext/t3skin/images/sprites/t3-icon-apps.png b/typo3/sysext/t3skin/images/sprites/t3-icon-apps.png
index 9e06567..3ab1093 100644 (file)
Binary files a/typo3/sysext/t3skin/images/sprites/t3-icon-apps.png and b/typo3/sysext/t3skin/images/sprites/t3-icon-apps.png differ

diff --git a/typo3/sysext/t3skin/images/sprites/t3-icon-mimetypes.png b/typo3/sysext/t3skin/images/sprites/t3-icon-mimetypes.png
index b9adf38..e533b49 100644 (file)
Binary files a/typo3/sysext/t3skin/images/sprites/t3-icon-mimetypes.png and b/typo3/sysext/t3skin/images/sprites/t3-icon-mimetypes.png differ

diff --git a/typo3/sysext/t3skin/images/sprites/t3-icon-places.png b/typo3/sysext/t3skin/images/sprites/t3-icon-places.png
index 36c253a..4b14e28 100644 (file)
Binary files a/typo3/sysext/t3skin/images/sprites/t3-icon-places.png and b/typo3/sysext/t3skin/images/sprites/t3-icon-places.png differ

diff --git a/typo3/sysext/t3skin/images/sprites/t3-icon-status.png b/typo3/sysext/t3skin/images/sprites/t3-icon-status.png
index 9607cd2..4a67ad3 100644 (file)
Binary files a/typo3/sysext/t3skin/images/sprites/t3-icon-status.png and b/typo3/sysext/t3skin/images/sprites/t3-icon-status.png differ

diff --git a/typo3/sysext/t3skin/stylesheets/sprites/_t3-icon.css b/typo3/sysext/t3skin/stylesheets/sprites/_t3-icon.css
index e66bc5a..70d9c38 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/sprites/_t3-icon.css
+++ b/typo3/sysext/t3skin/stylesheets/sprites/_t3-icon.css
@@ -1,6 +1,6 @@
 span.t3-icon {
        margin-right: 2px;
-       margin-top: 2px;
+       vertical-align: middle;
 }
 span.t3-icon-overlay {
        display: block;

diff --git a/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-actions.css b/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-actions.css
index cc41410..b212a56 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-actions.css
+++ b/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-actions.css
@@ -183,99 +183,102 @@
 .t3-icon-actions.t3-icon-view-go-down {
        background-position: 0 -1416px;
 }
-.t3-icon-actions.t3-icon-edit-undo {
+.t3-icon-actions.t3-icon-document-edit-access {
        background-position: 0 -1440px;
 }
-.t3-icon-actions.t3-icon-document-open {
+.t3-icon-actions.t3-icon-edit-undo {
        background-position: 0 -1464px;
 }
-.t3-icon-actions.t3-icon-view-list-expand {
+.t3-icon-actions.t3-icon-document-open {
        background-position: 0 -1488px;
 }
-.t3-icon-actions.t3-icon-view-paging-first {
+.t3-icon-actions.t3-icon-view-list-expand {
        background-position: 0 -1512px;
 }
-.t3-icon-actions.t3-icon-document-localize {
+.t3-icon-actions.t3-icon-view-paging-first {
        background-position: 0 -1536px;
 }
-.t3-icon-actions.t3-icon-view-table-expand {
+.t3-icon-actions.t3-icon-document-localize {
        background-position: 0 -1560px;
 }
-.t3-icon-actions.t3-icon-system-refresh {
+.t3-icon-actions.t3-icon-view-table-expand {
        background-position: 0 -1584px;
 }
-.t3-icon-actions.t3-icon-system-extension-documentation {
+.t3-icon-actions.t3-icon-system-refresh {
        background-position: 0 -1608px;
 }
-.t3-icon-actions.t3-icon-system-cache-clear-rte {
+.t3-icon-actions.t3-icon-system-extension-documentation {
        background-position: 0 -1632px;
 }
-.t3-icon-actions.t3-icon-page-new {
+.t3-icon-actions.t3-icon-system-cache-clear-rte {
        background-position: 0 -1656px;
 }
-.t3-icon-actions.t3-icon-view-paging-next-disabled {
+.t3-icon-actions.t3-icon-page-new {
        background-position: 0 -1680px;
 }
-.t3-icon-actions.t3-icon-view-paging-last {
+.t3-icon-actions.t3-icon-view-paging-next-disabled {
        background-position: 0 -1704px;
 }
-.t3-icon-actions.t3-icon-document-paste-into {
+.t3-icon-actions.t3-icon-view-paging-last {
        background-position: 0 -1728px;
 }
-.t3-icon-actions.t3-icon-document-history-open {
+.t3-icon-actions.t3-icon-document-paste-into {
        background-position: 0 -1752px;
 }
-.t3-icon-actions.t3-icon-view-table-collapse {
+.t3-icon-actions.t3-icon-document-history-open {
        background-position: 0 -1776px;
 }
-.t3-icon-actions.t3-icon-document-export-csv {
+.t3-icon-actions.t3-icon-view-table-collapse {
        background-position: 0 -1800px;
 }
-.t3-icon-actions.t3-icon-document-select {
+.t3-icon-actions.t3-icon-document-export-csv {
        background-position: 0 -1824px;
 }
-.t3-icon-actions.t3-icon-version-swap-version {
+.t3-icon-actions.t3-icon-document-select {
        background-position: 0 -1848px;
 }
-.t3-icon-actions.t3-icon-move-to-top {
+.t3-icon-actions.t3-icon-version-swap-version {
        background-position: 0 -1872px;
 }
-.t3-icon-actions.t3-icon-view-list-collapse {
+.t3-icon-actions.t3-icon-move-to-top {
        background-position: 0 -1896px;
 }
-.t3-icon-actions.t3-icon-edit-copy-release {
+.t3-icon-actions.t3-icon-view-list-collapse {
        background-position: 0 -1920px;
 }
-.t3-icon-actions.t3-icon-template-new {
+.t3-icon-actions.t3-icon-edit-copy-release {
        background-position: 0 -1944px;
 }
-.t3-icon-actions.t3-icon-system-extension-download {
+.t3-icon-actions.t3-icon-template-new {
        background-position: 0 -1968px;
 }
-.t3-icon-actions.t3-icon-system-cache-clear-impact-medium {
+.t3-icon-actions.t3-icon-system-extension-download {
        background-position: 0 -1992px;
 }
-.t3-icon-actions.t3-icon-view-go-up {
+.t3-icon-actions.t3-icon-system-cache-clear-impact-medium {
        background-position: 0 -2016px;
 }
-.t3-icon-actions.t3-icon-edit-hide {
+.t3-icon-actions.t3-icon-view-go-up {
        background-position: 0 -2040px;
 }
-.t3-icon-actions.t3-icon-document-view {
+.t3-icon-actions.t3-icon-edit-hide {
        background-position: 0 -2064px;
 }
-.t3-icon-actions.t3-icon-edit-localize-status-low {
+.t3-icon-actions.t3-icon-document-view {
        background-position: 0 -2088px;
 }
-.t3-icon-actions.t3-icon-system-options-view {
+.t3-icon-actions.t3-icon-edit-localize-status-low {
        background-position: 0 -2112px;
 }
-.t3-icon-actions.t3-icon-edit-delete {
+.t3-icon-actions.t3-icon-system-options-view {
        background-position: 0 -2136px;
 }
-.t3-icon-actions.t3-icon-move-right {
+.t3-icon-actions.t3-icon-edit-delete {
        background-position: 0 -2160px;
 }
-.t3-icon-actions.t3-icon-window-open {
+.t3-icon-actions.t3-icon-move-right {
        background-position: 0 -2184px;
+}
+.t3-icon-actions.t3-icon-window-open {
+       background-position: 0 -2208px;
 }
\ No newline at end of file

diff --git a/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-apps.css b/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-apps.css
index afe4121..7ea6511 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-apps.css
+++ b/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-apps.css
@@ -9,123 +9,162 @@
 .t3-icon-apps.t3-icon-pagetree-page-frontend-users {
        background-position: 0 -24px;
 }
-.t3-icon-apps.t3-icon-filetree-folder-temp {
+.t3-icon-apps.t3-icon-toolbar-menu-opendocs {
        background-position: 0 -48px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-advanced-hideinmenu {
+.t3-icon-apps.t3-icon-pagetree-page-recycler {
        background-position: 0 -72px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-shortcut-hideinmenu {
+.t3-icon-apps.t3-icon-filetree-folder-temp {
        background-position: 0 -96px;
 }
-.t3-icon-apps.t3-icon-pagetree-backend-user {
+.t3-icon-apps.t3-icon-pagetree-page-advanced-hideinmenu {
        background-position: 0 -120px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-frontend-user-hideinmenu {
+.t3-icon-apps.t3-icon-pagetree-page-shortcut-hideinmenu {
        background-position: 0 -144px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-default {
+.t3-icon-apps.t3-icon-pagetree-backend-user {
        background-position: 0 -168px;
 }
-.t3-icon-apps.t3-icon-pagetree-drag-place-denied {
+.t3-icon-apps.t3-icon-pagetree-page-frontend-user-hideinmenu {
        background-position: 0 -192px;
 }
-.t3-icon-apps.t3-icon-filetree-folder-user {
+.t3-icon-apps.t3-icon-pagetree-page-default {
        background-position: 0 -216px;
 }
-.t3-icon-apps.t3-icon-pagetree-drag-new-inside {
+.t3-icon-apps.t3-icon-pagetree-drag-place-denied {
        background-position: 0 -240px;
 }
-.t3-icon-apps.t3-icon-pagetree-drag-move-into {
+.t3-icon-apps.t3-icon-filetree-folder-user {
        background-position: 0 -264px;
 }
-.t3-icon-apps.t3-icon-filetree-folder-add {
+.t3-icon-apps.t3-icon-pagetree-page-shortcut-external-hideinmenu {
        background-position: 0 -288px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-domain {
+.t3-icon-apps.t3-icon-pagetree-page-shortcut-root {
        background-position: 0 -312px;
 }
-.t3-icon-apps.t3-icon-toolbar-menu-workspace {
+.t3-icon-apps.t3-icon-pagetree-drag-new-inside {
        background-position: 0 -336px;
 }
-.t3-icon-apps.t3-icon-pagetree-drag-new-between {
+.t3-icon-apps.t3-icon-pagetree-drag-move-into {
        background-position: 0 -360px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-shortcut-external {
+.t3-icon-apps.t3-icon-pagetree-page-backend-users-root {
        background-position: 0 -384px;
 }
-.t3-icon-apps.t3-icon-pagetree-drag-move-between {
+.t3-icon-apps.t3-icon-filetree-folder-add {
        background-position: 0 -408px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-backend-users {
+.t3-icon-apps.t3-icon-pagetree-page-domain {
        background-position: 0 -432px;
 }
-.t3-icon-apps.t3-icon-filetree-folder-locked {
+.t3-icon-apps.t3-icon-toolbar-menu-workspace {
        background-position: 0 -456px;
 }
-.t3-icon-apps.t3-icon-pagetree-backend-user-hideinmenu {
+.t3-icon-apps.t3-icon-pagetree-drag-new-between {
        background-position: 0 -480px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-mountpoint {
+.t3-icon-apps.t3-icon-pagetree-page-shortcut-external {
        background-position: 0 -504px;
 }
-.t3-icon-apps.t3-icon-pagetree-root {
+.t3-icon-apps.t3-icon-pagetree-drag-move-between {
        background-position: 0 -528px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-frontend-user {
+.t3-icon-apps.t3-icon-pagetree-page-backend-users {
        background-position: 0 -552px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-advanced {
+.t3-icon-apps.t3-icon-filetree-folder-locked {
        background-position: 0 -576px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-frontend-users-hideinmenu {
+.t3-icon-apps.t3-icon-pagetree-backend-user-hideinmenu {
        background-position: 0 -600px;
 }
-.t3-icon-apps.t3-icon-filetree-mount {
+.t3-icon-apps.t3-icon-pagetree-page-mountpoint {
        background-position: 0 -624px;
 }
-.t3-icon-apps.t3-icon-toolbar-menu-shortcut {
+.t3-icon-apps.t3-icon-pagetree-root {
        background-position: 0 -648px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-no-icon-found-hideinmenu {
+.t3-icon-apps.t3-icon-pagetree-page-frontend-user {
        background-position: 0 -672px;
 }
-.t3-icon-apps.t3-icon-filetree-folder-default {
+.t3-icon-apps.t3-icon-pagetree-page-shortcut-external-root {
        background-position: 0 -696px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-shortcut {
+.t3-icon-apps.t3-icon-pagetree-page-advanced {
        background-position: 0 -720px;
 }
-.t3-icon-apps.t3-icon-clipboard-images {
+.t3-icon-apps.t3-icon-toolbar-menu-cache {
        background-position: 0 -744px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-no-icon-found {
+.t3-icon-apps.t3-icon-pagetree-page-frontend-users-hideinmenu {
        background-position: 0 -768px;
 }
-.t3-icon-apps.t3-icon-filetree-folder-media {
+.t3-icon-apps.t3-icon-pagetree-page-frontend-users-root {
        background-position: 0 -792px;
 }
-.t3-icon-apps.t3-icon-pagetree-spacer {
+.t3-icon-apps.t3-icon-pagetree-page-frontend-user-root {
        background-position: 0 -816px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-mountpoint-hideinmenu {
+.t3-icon-apps.t3-icon-filetree-mount {
        background-position: 0 -840px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-backend-users-hideinmenu {
+.t3-icon-apps.t3-icon-toolbar-menu-shortcut {
        background-position: 0 -864px;
 }
-.t3-icon-apps.t3-icon-pagetree-folder-default {
+.t3-icon-apps.t3-icon-pagetree-page-no-icon-found-hideinmenu {
        background-position: 0 -888px;
 }
-.t3-icon-apps.t3-icon-pagetree-page-not-in-menu {
+.t3-icon-apps.t3-icon-filetree-folder-default {
        background-position: 0 -912px;
 }
-.t3-icon-apps.t3-icon-clipboard-list {
+.t3-icon-apps.t3-icon-pagetree-page-shortcut {
        background-position: 0 -936px;
 }
-.t3-icon-apps.t3-icon-filetree-folder-news {
+.t3-icon-apps.t3-icon-clipboard-images {
        background-position: 0 -960px;
 }
-.t3-icon-apps.t3-icon-filetree-folder-list {
+.t3-icon-apps.t3-icon-pagetree-page-no-icon-found {
        background-position: 0 -984px;
+}
+.t3-icon-apps.t3-icon-filetree-folder-media {
+       background-position: 0 -1008px;
+}
+.t3-icon-apps.t3-icon-pagetree-spacer {
+       background-position: 0 -1032px;
+}
+.t3-icon-apps.t3-icon-pagetree-page-mountpoint-root {
+       background-position: 0 -1056px;
+}
+.t3-icon-apps.t3-icon-pagetree-page-advanced-root {
+       background-position: 0 -1080px;
+}
+.t3-icon-apps.t3-icon-pagetree-page-mountpoint-hideinmenu {
+       background-position: 0 -1104px;
+}
+.t3-icon-apps.t3-icon-pagetree-page-backend-users-hideinmenu {
+       background-position: 0 -1128px;
+}
+.t3-icon-apps.t3-icon-pagetree-folder-default {
+       background-position: 0 -1152px;
+}
+.t3-icon-apps.t3-icon-pagetree-page-not-in-menu {
+       background-position: 0 -1176px;
+}
+.t3-icon-apps.t3-icon-toolbar-menu-search {
+       background-position: 0 -1200px;
+}
+.t3-icon-apps.t3-icon-clipboard-list {
+       background-position: 0 -1224px;
+}
+.t3-icon-apps.t3-icon-filetree-folder-news {
+       background-position: 0 -1248px;
+}
+.t3-icon-apps.t3-icon-pagetree-page-no-icon-found-root {
+       background-position: 0 -1272px;
+}
+.t3-icon-apps.t3-icon-filetree-folder-list {
+       background-position: 0 -1296px;
 }
\ No newline at end of file

diff --git a/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-mimetypes.css b/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-mimetypes.css
index 6f250a9..bbc8b79 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-mimetypes.css
+++ b/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-mimetypes.css
@@ -18,90 +18,102 @@
 .t3-icon-mimetypes.t3-icon-x-content-plugin {
        background-position: 0 -96px;
 }
-.t3-icon-mimetypes.t3-icon-media-audio {
+.t3-icon-mimetypes.t3-icon-x-content-template-extension {
        background-position: 0 -120px;
 }
-.t3-icon-mimetypes.t3-icon-other-other {
+.t3-icon-mimetypes.t3-icon-x-content-page-language-overlay {
        background-position: 0 -144px;
 }
-.t3-icon-mimetypes.t3-icon-pdf {
+.t3-icon-mimetypes.t3-icon-media-audio {
        background-position: 0 -168px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-divider {
+.t3-icon-mimetypes.t3-icon-other-other {
        background-position: 0 -192px;
 }
-.t3-icon-mimetypes.t3-icon-powerpoint {
+.t3-icon-mimetypes.t3-icon-pdf {
        background-position: 0 -216px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-table {
+.t3-icon-mimetypes.t3-icon-x-content-divider {
        background-position: 0 -240px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-text-picture {
+.t3-icon-mimetypes.t3-icon-powerpoint {
        background-position: 0 -264px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-login {
+.t3-icon-mimetypes.t3-icon-x-content-table {
        background-position: 0 -288px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-header {
+.t3-icon-mimetypes.t3-icon-x-content-text-picture {
        background-position: 0 -312px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-form-search {
+.t3-icon-mimetypes.t3-icon-x-sys_workspace {
        background-position: 0 -336px;
 }
-.t3-icon-mimetypes.t3-icon-excel {
+.t3-icon-mimetypes.t3-icon-x-content-login {
        background-position: 0 -360px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-template {
+.t3-icon-mimetypes.t3-icon-x-content-header {
        background-position: 0 -384px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-multimedia {
+.t3-icon-mimetypes.t3-icon-x-content-form-search {
        background-position: 0 -408px;
 }
-.t3-icon-mimetypes.t3-icon-text-csv {
+.t3-icon-mimetypes.t3-icon-excel {
        background-position: 0 -432px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-list-files {
+.t3-icon-mimetypes.t3-icon-x-content-template {
        background-position: 0 -456px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-text {
+.t3-icon-mimetypes.t3-icon-x-content-multimedia {
        background-position: 0 -480px;
 }
-.t3-icon-mimetypes.t3-icon-text-text {
+.t3-icon-mimetypes.t3-icon-text-csv {
        background-position: 0 -504px;
 }
-.t3-icon-mimetypes.t3-icon-text-php {
+.t3-icon-mimetypes.t3-icon-x-content-list-files {
        background-position: 0 -528px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-list-bullets {
+.t3-icon-mimetypes.t3-icon-x-content-text {
        background-position: 0 -552px;
 }
-.t3-icon-mimetypes.t3-icon-media-image {
+.t3-icon-mimetypes.t3-icon-text-text {
        background-position: 0 -576px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-form {
+.t3-icon-mimetypes.t3-icon-text-php {
        background-position: 0 -600px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-image {
+.t3-icon-mimetypes.t3-icon-x-content-list-bullets {
        background-position: 0 -624px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-menu {
+.t3-icon-mimetypes.t3-icon-media-image {
        background-position: 0 -648px;
 }
-.t3-icon-mimetypes.t3-icon-compressed {
+.t3-icon-mimetypes.t3-icon-x-content-form {
        background-position: 0 -672px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-html {
+.t3-icon-mimetypes.t3-icon-x-content-image {
        background-position: 0 -696px;
 }
-.t3-icon-mimetypes.t3-icon-text-html {
+.t3-icon-mimetypes.t3-icon-x-content-menu {
        background-position: 0 -720px;
 }
-.t3-icon-mimetypes.t3-icon-media-flash {
+.t3-icon-mimetypes.t3-icon-compressed {
        background-position: 0 -744px;
 }
-.t3-icon-mimetypes.t3-icon-x-content-template-static {
+.t3-icon-mimetypes.t3-icon-x-content-domain {
        background-position: 0 -768px;
 }
-.t3-icon-mimetypes.t3-icon-text-js {
+.t3-icon-mimetypes.t3-icon-x-content-html {
        background-position: 0 -792px;
+}
+.t3-icon-mimetypes.t3-icon-text-html {
+       background-position: 0 -816px;
+}
+.t3-icon-mimetypes.t3-icon-media-flash {
+       background-position: 0 -840px;
+}
+.t3-icon-mimetypes.t3-icon-x-content-template-static {
+       background-position: 0 -864px;
+}
+.t3-icon-mimetypes.t3-icon-text-js {
+       background-position: 0 -888px;
 }
\ No newline at end of file

diff --git a/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-status.css b/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-status.css
index cf7b612..bb8a5c2 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-status.css
+++ b/typo3/sysext/t3skin/stylesheets/sprites/t3-icons-status.css
@@ -201,51 +201,54 @@
 .t3-icon-status.t3-icon-user-admin {
        background-position: 0 -1560px;
 }
-.t3-icon-status.t3-icon-version-7 {
+.t3-icon-status.t3-icon-overlay-scheduled-future-end {
        background-position: 0 -1584px;
 }
-.t3-icon-status.t3-icon-version-10 {
+.t3-icon-status.t3-icon-version-7 {
        background-position: 0 -1608px;
 }
-.t3-icon-status.t3-icon-version-27 {
+.t3-icon-status.t3-icon-version-10 {
        background-position: 0 -1632px;
 }
-.t3-icon-status.t3-icon-version-23 {
+.t3-icon-status.t3-icon-version-27 {
        background-position: 0 -1656px;
 }
-.t3-icon-status.t3-icon-version-42 {
+.t3-icon-status.t3-icon-version-23 {
        background-position: 0 -1680px;
 }
-.t3-icon-status.t3-icon-dialog-notification {
+.t3-icon-status.t3-icon-version-42 {
        background-position: 0 -1704px;
 }
-.t3-icon-status.t3-icon-version-20 {
+.t3-icon-status.t3-icon-dialog-notification {
        background-position: 0 -1728px;
 }
-.t3-icon-status.t3-icon-status-current {
+.t3-icon-status.t3-icon-version-20 {
        background-position: 0 -1752px;
 }
-.t3-icon-status.t3-icon-version-25 {
+.t3-icon-status.t3-icon-status-current {
        background-position: 0 -1776px;
 }
-.t3-icon-status.t3-icon-overlay-translated {
+.t3-icon-status.t3-icon-version-25 {
        background-position: 0 -1800px;
 }
-.t3-icon-status.t3-icon-version-31 {
+.t3-icon-status.t3-icon-overlay-translated {
        background-position: 0 -1824px;
 }
-.t3-icon-status.t3-icon-version-12 {
+.t3-icon-status.t3-icon-version-31 {
        background-position: 0 -1848px;
 }
-.t3-icon-status.t3-icon-dialog-warning {
+.t3-icon-status.t3-icon-version-12 {
        background-position: 0 -1872px;
 }
-.t3-icon-status.t3-icon-status-permission-denied {
+.t3-icon-status.t3-icon-dialog-warning {
        background-position: 0 -1896px;
 }
-.t3-icon-status.t3-icon-overlay-access-restricted {
+.t3-icon-status.t3-icon-status-permission-denied {
        background-position: 0 -1920px;
 }
-.t3-icon-status.t3-icon-version-26 {
+.t3-icon-status.t3-icon-overlay-access-restricted {
        background-position: 0 -1944px;
+}
+.t3-icon-status.t3-icon-version-26 {
+       background-position: 0 -1968px;
 }
\ No newline at end of file

diff --git a/typo3/sysext/t3skin/stylesheets/structure/element_docheader.css b/typo3/sysext/t3skin/stylesheets/structure/element_docheader.css
index 9272e4f..db4dd71 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/structure/element_docheader.css
+++ b/typo3/sysext/t3skin/stylesheets/structure/element_docheader.css
@@ -53,9 +53,9 @@ div#typo3-docheader div.buttonsright {
        margin: 0 3px 0 0;
 }
 
-div#typo3-docheader img,
-div#typo3-docheader input,
-div#typo3-docheader span.t3-icon {
+div#typo3-docheader-row1 img,
+div#typo3-docheader-row1 input,
+div#typo3-docheader-row1 span.t3-icon {
        margin: 2px 3px 0;
        vertical-align: top;
 }
@@ -69,7 +69,7 @@ div#typo3-docheader-row2 img {
 }
 
 div#typo3-docheader select {
-       margin: 1px 0 0;
+       margin: 2px 0 0;
 }
 
 div#typo3-docheader div.docheader-row2-left {

diff --git a/typo3/sysext/t3skin/stylesheets/structure/element_tree.css b/typo3/sysext/t3skin/stylesheets/structure/element_tree.css
index 9c41156..ec55c9f 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/structure/element_tree.css
+++ b/typo3/sysext/t3skin/stylesheets/structure/element_tree.css
@@ -53,18 +53,6 @@ ul.tree {
        padding: 0;
 }
 
-ul.tree span.dragIcon {
-       position: relative;
-       top: -1px;
-}
-
-ul.tree .typo3-red,
-ul.tree span.dragTitle,
-ul.tree span.dragId {
-       position: relative;
-       top: -7px;
-}
-
 ul.tree ul {
        padding: 0;
        margin: 0;
@@ -86,22 +74,23 @@ ul.tree ul li {
 ul.tree div.treeLinkItem {
        display: block;
        height: 16px;
+       overflow: hidden;
        padding-left: 2px;
 }
+span.dragIcon {
+       display: inline-block;
+       height: 16px;
+}
 
+ul.tree div.treeLinkItem span.dragId,
+ul.tree div.treeLinkItem span.dragTitle,
 ul.tree div.treeLinkItem img {
-       position: relative;
-       top: -3px;
+       vertical-align: middle;
 }
 
 ul.tree div.treeLinkItem span.dragIcon {
-       margin: 0 3px 0 1px;
+       vertical-align: top;
 }
-
-ul.tree span.t3-icon {
-       margin: 0;
-}
-
 #dragIcon {
        position: absolute;
        visibility: hidden;

diff --git a/typo3/sysext/t3skin/stylesheets/structure/main_content.css b/typo3/sysext/t3skin/stylesheets/structure/main_content.css
index 626c46a..1326ef8 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/structure/main_content.css
+++ b/typo3/sysext/t3skin/stylesheets/structure/main_content.css
@@ -61,7 +61,6 @@ td {
 
 .t3-row-header span.t3-icon {
        margin-right: 3px;
-       margin-top: 2px;
 }
 
 a span {

diff --git a/typo3/sysext/t3skin/stylesheets/structure/module_web_page.css b/typo3/sysext/t3skin/stylesheets/structure/module_web_page.css
index 840b9b9..db02159 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/structure/module_web_page.css
+++ b/typo3/sysext/t3skin/stylesheets/structure/module_web_page.css
@@ -11,11 +11,14 @@ td.t3-page-column {
 
 .t3-page-colHeader {
        margin-bottom: 10px;
+       padding-left: 20px;
+       padding-right: 20px;
        position: relative;
 }
 
 .t3-page-colHeader-icons {
        position: absolute;
+       left: 2px;
 }
 
 .t3-page-ce {
@@ -38,6 +41,11 @@ td.t3-page-column {
        float: right;
 }
 
+.t3-page-ce .t3-row-header .t3-icon,
+.t3-page-colHeader .t3-icon {
+       margin-top: 2px;
+}
+
 .t3-page-ce-icons-move span {
        float: left;
 }

diff --git a/typo3/sysext/t3skin/stylesheets/visual/element_tree.css b/typo3/sysext/t3skin/stylesheets/visual/element_tree.css
index 0e7e7e2..39bb950 100644 (file)
--- a/typo3/sysext/t3skin/stylesheets/visual/element_tree.css
+++ b/typo3/sysext/t3skin/stylesheets/visual/element_tree.css
@@ -29,7 +29,7 @@ AJAX Page Tree
 - - - - - - - - - - - - - - - - - - - - - */
 
 ul.tree {
-       line-height: 13px;
+       line-height: 12px;
        list-style: none;
 }
 

diff --git a/typo3/sysext/version/ext_tables.php b/typo3/sysext/version/ext_tables.php
index 6c30d27..11979f3 100755 (executable)
--- a/typo3/sysext/version/ext_tables.php
+++ b/typo3/sysext/version/ext_tables.php
@@ -25,6 +25,9 @@ $TCA['sys_workspace'] = array(
                'rootLevel' => 1,
                'delete' => 'deleted',
                'iconfile' => 'sys_workspace.png',
+               'typeicon_classes' => array(
+                       'default' => 'mimetypes-x-sys_workspace'
+               ),
                'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY) . 'tca.php',
                'versioningWS_alwaysAllowLiveEdit' => true,
                'dividers2tabs' => true