Follow-up to #13319: plupload: CSS, CGL and styling fixes
authorErnesto Baschny <ernst@cron-it.de>
Wed, 12 Jan 2011 20:22:08 +0000 (20:22 +0000)
committerErnesto Baschny <ernst@cron-it.de>
Wed, 12 Jan 2011 20:22:08 +0000 (20:22 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10049 709f56b5-9817-0410-a4d7-c38de5d9e867

typo3/js/extjs/PluploadWindow.js
typo3/sysext/t3skin/stylesheets/structure/module_file_upload.css
typo3/sysext/t3skin/stylesheets/visual/module_file_upload.css

index 59a2b4d..a369ebd 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************
  *  Copyright notice
  *
- *  (c) 2011 Christian M?ller <christian@kitsunet.de>
+ *  (c) 2011 Christian Müller <christian@kitsunet.de>
  *  All rights reserved
  *
  *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -28,7 +28,7 @@ Ext.onReady(function() {
        /**
         * Upload Window based on plupload.
         *
-        * @author      Christian Müller <christian@kitsunet.de>
+        * @author      Christian Müller <christian@kitsunet.de>
         */
 
        TYPO3.PluploadWindow = new Ext.Window({
@@ -55,9 +55,9 @@ Ext.onReady(function() {
                                max_file_size: '1mb',
                                flash_swf_url : top.TYPO3.configuration.PATH_typo3 + 'contrib/plupload/js/plupload.flash.swf',
                                runtime_visible: false,
-                               addButtonText: top.TYPO3.LLL.fileUpload.buttonSelectFiles,
-                               uploadButtonText: top.TYPO3.LLL.fileUpload.buttonStartUpload,
-                               cancelButtonText: top.TYPO3.LLL.fileUpload.buttonCancelAll,
+                               addButtonText: '<span class="t3-icon t3-icon-actions t3-icon-actions-edit t3-icon-edit-add"></span>' + top.TYPO3.LLL.fileUpload.buttonSelectFiles,
+                               uploadButtonText: '<span class="t3-icon t3-icon-actions t3-icon-actions-edit t3-icon-edit-upload"></span>' + top.TYPO3.LLL.fileUpload.buttonStartUpload,
+                               cancelButtonText: '<span class="t3-icon t3-icon-status t3-icon-status-status t3-icon-status-permission-denied"></span>' + top.TYPO3.LLL.fileUpload.buttonCancelAll,
                                progressText: top.TYPO3.LLL.fileUpload.progressText,
                                emptyText: top.TYPO3.LLL.fileUpload.infoFileQueueEmpty,
                                statusQueuedText: top.TYPO3.LLL.fileUpload.infoFileQueued,
index cc23e44..f3d9b11 100644 (file)
@@ -24,70 +24,32 @@ $Id$
 }
 
 .x-plupload-body {
-    overflow-x: hidden;
-    overflow-y: auto;
+       overflow-x: hidden;
+       overflow-y: auto;
 }
 
 .x-plupload-body dl {
-    padding: 5px;
-    border-bottom: 1px solid #D0D0D0;
-    font: normal 11px arial,tahoma,verdana,helvetica;
-    width: 100%;
+       padding: 5px;
+       width: 100%;
 }
 
 .x-plupload-body dt {
-    float: left;
-    cursor: pointer;
-    display: block;
-    overflow: hidden;
-    white-space: nowrap;
+       float: left;
+       display: block;
+       overflow: hidden;
 }
 
 .t3-plupload-remove {
        visibility: hidden;
 }
 
-.plupload_over {
-       filter: alpha(opacity=50);
-       opacity: 0.5;
-       -moz-opacity: 0.5;
-}
 
 .plupload_over .t3-plupload-remove {
        visibility: visible;
 }
 
 
-.plupload_selected {
-    background-color: #EFF5FB;
-}
-
 .plupload_emptytext {
-    font: 11px Arial,Helvetica,sans-serif;
-    vertical-align: middle;
-    text-align: center;
-}
-
-.plupload_emptytext span {
-    line-height: 100px;
-}
-
-.silk-accept {
-       background-image: url(../../images/icons/status/dialog-ok.png) !important; background-repeat: no-repeat;
+       vertical-align: middle;
+       text-align: center;
 }
-
-.silk-add {
-       background-image: url(../../images/icons/actions/edit-add.png) !important; background-repeat: no-repeat;
-}
-
-.silk-cross {
-       background-image: url(../../images/icons/status/status-icon-missing.png) !important; background-repeat: no-repeat;
-}
-
-.silk-stop {
-       background-image: url(../../images/icons/status/status-permission-denied.png) !important; background-repeat: no-repeat;
-}
-
-.silk-arrow-up {
-       background-image: url(../../images/icons/actions/edit-upload.png) !important; background-repeat: no-repeat;
-}
\ No newline at end of file
index 424a7bd..f7d994e 100644 (file)
@@ -14,4 +14,30 @@ $Id$
 .t3-upload-window-progressbar .x-progress-text div {
        text-align: left;
        text-indent: 6px;
-}
\ No newline at end of file
+}
+
+.x-plupload-body dl {
+       border-bottom: 1px solid #D0D0D0;
+       font: normal 11px Verdana,Arial,Helvetica,sans-serif;
+}
+
+.x-plupload-body dt {
+       cursor: pointer;
+       white-space: nowrap;
+}
+
+.plupload_emptytext {
+       font: 11px Arial,Helvetica,sans-serif;
+}
+
+.plupload_over {
+       background-color: #dedede;
+}
+
+.plupload_selected {
+       background-color: #EFF5FB;
+}
+
+.plupload_emptytext span {
+       line-height: 100px;
+}