Index: t3lib/stddb/tables.php =================================================================== --- t3lib/stddb/tables.php (Revision 7766) +++ t3lib/stddb/tables.php (Arbeitskopie) @@ -155,22 +155,21 @@ '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 @@ '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 @@ '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 @@ '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 @@ '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 @@ '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 @@ '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 @@ '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 @@ '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', @@ -804,8 +822,8 @@ $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', Index: t3lib/class.t3lib_iconworks.php =================================================================== --- t3lib/class.t3lib_iconworks.php (Revision 7766) +++ t3lib/class.t3lib_iconworks.php (Arbeitskopie) @@ -887,7 +887,7 @@ } // 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; } Index: typo3/stylesheets/visual/main_content.css =================================================================== --- typo3/stylesheets/visual/main_content.css (Revision 7766) +++ typo3/stylesheets/visual/main_content.css (Arbeitskopie) @@ -12,7 +12,7 @@ display: inline-block; position: relative; width: 16px; - height: 18px; + height: 16px; overflow: hidden; } .t3-icon { Index: typo3/sysext/t3skin/images/sprites/t3-icon-apps.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/sprites/t3-icon-status.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/sprites/t3-icon-places.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/sprites/t3-icon-mimetypes.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/sprites/t3-icon-actions.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/icons/actions/document-edit-access.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/actions/document-edit-access.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/actions/edit-unhide.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/icons/actions/view-list-expand.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/icons/actions/view-list-collapse.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/icons/actions/system-tree-search-open.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/icons/actions/edit-hide.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/filetree-mount.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/pagetree-page-shortcut-external.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/pagetree-page-shortcut-root.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/pagetree-page-shortcut-root.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/pagetree-page-no-icon-found-root.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/pagetree-page-no-icon-found-root.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/pagetree-page-mountpoint-root.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/pagetree-page-mountpoint-root.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/filetree-folder-temp.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/pagetree-page-recycler.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/pagetree-page-recycler.png ___________________________________________________________________ Hinzugefügt: svn:executable + * Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/toolbar-menu-opendocs.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/toolbar-menu-opendocs.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/pagetree-page-frontend-user-root.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/pagetree-page-frontend-user-root.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/pagetree-page-shortcut-external-root.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/pagetree-page-shortcut-external-root.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/pagetree-page-shortcut-external-hideinmenu.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/pagetree-page-shortcut-external-hideinmenu.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/pagetree-page-advanced-root.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/pagetree-page-advanced-root.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/pagetree-page-frontend-users-root.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/pagetree-page-frontend-users-root.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/toolbar-menu-cache.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/toolbar-menu-cache.png ___________________________________________________________________ Hinzugefügt: svn:executable + * Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/toolbar-menu-search.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/toolbar-menu-search.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/pagetree-page-backend-users-root.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/apps/pagetree-page-backend-users-root.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/apps/filetree-root.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/images/icons/status/overlay-scheduled-future-end.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/status/overlay-scheduled-future-end.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/mimetypes/x-content-template-extension.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/mimetypes/x-content-template-extension.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/mimetypes/x-sys_workspace.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/mimetypes/x-sys_workspace.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/mimetypes/x-content-page-language-overlay.gif =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/mimetypes/x-content-page-language-overlay.gif ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/images/icons/mimetypes/x-content-domain.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Eigenschaftsänderungen: typo3/sysext/t3skin/images/icons/mimetypes/x-content-domain.png ___________________________________________________________________ Hinzugefügt: svn:mime-type + application/octet-stream Index: typo3/sysext/t3skin/stylesheets/structure/element_tree.css =================================================================== --- typo3/sysext/t3skin/stylesheets/structure/element_tree.css (Revision 7766) +++ typo3/sysext/t3skin/stylesheets/structure/element_tree.css (Arbeitskopie) @@ -53,18 +53,6 @@ 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; @@ -89,19 +77,13 @@ padding-left: 2px; } +ul.tree div.treeLinkItem a, +ul.tree div.treeLinkItem span, +ul.tree div.treeLinkItem span span, ul.tree div.treeLinkItem img { - position: relative; - top: -3px; + vertical-align:middle; } -ul.tree div.treeLinkItem span.dragIcon { - margin: 0 3px 0 1px; -} - -ul.tree span.t3-icon { - margin: 0; -} - #dragIcon { position: absolute; visibility: hidden; Index: typo3/sysext/t3skin/stylesheets/structure/main_content.css =================================================================== --- typo3/sysext/t3skin/stylesheets/structure/main_content.css (Revision 7766) +++ typo3/sysext/t3skin/stylesheets/structure/main_content.css (Arbeitskopie) @@ -61,7 +61,7 @@ .t3-row-header span.t3-icon { margin-right: 3px; - margin-top: 2px; + /*margin-top: 2px;*/ } a span { Index: typo3/sysext/t3skin/stylesheets/structure/module_web_page.css =================================================================== --- typo3/sysext/t3skin/stylesheets/structure/module_web_page.css (Revision 7766) +++ typo3/sysext/t3skin/stylesheets/structure/module_web_page.css (Arbeitskopie) @@ -11,11 +11,14 @@ .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 @@ 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; } Index: typo3/sysext/t3skin/stylesheets/structure/element_docheader.css =================================================================== --- typo3/sysext/t3skin/stylesheets/structure/element_docheader.css (Revision 7766) +++ typo3/sysext/t3skin/stylesheets/structure/element_docheader.css (Arbeitskopie) @@ -53,9 +53,9 @@ 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 select { - margin: 1px 0 0; + margin: 2px 0 0; } div#typo3-docheader div.docheader-row2-left { Index: typo3/sysext/t3skin/stylesheets/visual/element_tree.css =================================================================== --- typo3/sysext/t3skin/stylesheets/visual/element_tree.css (Revision 7766) +++ typo3/sysext/t3skin/stylesheets/visual/element_tree.css (Arbeitskopie) @@ -29,7 +29,7 @@ - - - - - - - - - - - - - - - - - - - - - */ ul.tree { - line-height: 13px; + line-height: 12px; list-style: none; } Index: typo3/sysext/t3skin/stylesheets/sprites/t3-icons-mimetypes.css =================================================================== --- typo3/sysext/t3skin/stylesheets/sprites/t3-icons-mimetypes.css (Revision 7766) +++ typo3/sysext/t3skin/stylesheets/sprites/t3-icons-mimetypes.css (Arbeitskopie) @@ -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-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 -792px; + background-position: 0 -888px; } \ No newline at end of file Index: typo3/sysext/t3skin/stylesheets/sprites/_t3-icon.css =================================================================== --- typo3/sysext/t3skin/stylesheets/sprites/_t3-icon.css (Revision 7766) +++ typo3/sysext/t3skin/stylesheets/sprites/_t3-icon.css (Arbeitskopie) @@ -1,6 +1,7 @@ span.t3-icon { margin-right: 2px; - margin-top: 2px; + /*margin-top: 2px;*/ + vertical-align: middle; } span.t3-icon-overlay { display: block; @@ -15,3 +16,8 @@ .t3-icon-empty { background-image: none; } + +.t3-icon.t3-icon-verticalCentered { + vertical-align: middle; + margin-top: 0px; +} \ No newline at end of file Index: typo3/sysext/t3skin/stylesheets/sprites/t3-icons-actions.css =================================================================== --- typo3/sysext/t3skin/stylesheets/sprites/t3-icons-actions.css (Revision 7766) +++ typo3/sysext/t3skin/stylesheets/sprites/t3-icons-actions.css (Arbeitskopie) @@ -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-move-right { + background-position: 0 -2184px; +} .t3-icon-actions.t3-icon-window-open { - background-position: 0 -2184px; + background-position: 0 -2208px; } \ No newline at end of file Index: typo3/sysext/t3skin/stylesheets/sprites/t3-icons-apps.css =================================================================== --- typo3/sysext/t3skin/stylesheets/sprites/t3-icons-apps.css (Revision 7766) +++ typo3/sysext/t3skin/stylesheets/sprites/t3-icons-apps.css (Arbeitskopie) @@ -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-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 -984px; + background-position: 0 -1296px; } \ No newline at end of file Index: typo3/sysext/t3skin/stylesheets/sprites/t3-icons-status.css =================================================================== --- typo3/sysext/t3skin/stylesheets/sprites/t3-icons-status.css (Revision 7766) +++ typo3/sysext/t3skin/stylesheets/sprites/t3-icons-status.css (Arbeitskopie) @@ -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-overlay-access-restricted { + background-position: 0 -1944px; +} .t3-icon-status.t3-icon-version-26 { - background-position: 0 -1944px; + background-position: 0 -1968px; } \ No newline at end of file Index: typo3/sysext/cms/ext_tables.php =================================================================== --- typo3/sysext/cms/ext_tables.php (Revision 7766) +++ typo3/sysext/cms/ext_tables.php (Arbeitskopie) @@ -860,7 +860,7 @@ ), '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 ( Index: typo3/sysext/version/ext_tables.php =================================================================== --- typo3/sysext/version/ext_tables.php (Revision 7766) +++ typo3/sysext/version/ext_tables.php (Arbeitskopie) @@ -25,6 +25,9 @@ '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