Merge pull request #1866 from prototech/ticket/11915

[ticket/11915] Improve Plupload integration

phpBB/styles/prosilver/theme/colours.css

@@ -76,8 +76,14 @@ hr {
 	color: #000000;
 }
 
-.bg1	{ background-color: #ECF3F7; }
-.bg2	{ background-color: #e1ebf2; }
+table.zebra-list tr:nth-child(odd) td, ul.zebra-list li:nth-child(odd), .bg1 {
+	background-color: #ECF3F7;
+}
+
+table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even), .bg2 {
+	background-color: #e1ebf2;
+}
+
 .bg3	{ background-color: #cadceb; }
 
 .ucprowbg {
@@ -803,11 +809,11 @@ Colours and backgrounds for cp.css
 /* Main CP box
 ----------------------------------------*/
 
-#cp-main h3, #cp-main hr, #cp-menu hr {
+.panel-container h3, .panel-container hr, #cp-menu hr {
 	border-color: #A4B3BF;
 }
 
-#cp-main .panel li.row {
+.panel-container .panel li.row {
 	border-bottom-color: #B5C1CB;
 	border-top-color: #F9F9F9;
 }
@@ -816,11 +822,11 @@ ul.cplist {
 	border-top-color: #B5C1CB;
 }
 
-#cp-main .panel li.header dd, #cp-main .panel li.header dt {
+.panel-container .panel li.header dd, .panel-container .panel li.header dt {
 	color: #000000;
 }
 
-#cp-main table.table1 thead th {
+.panel-container table.table1 thead th {
 	color: #333333;
 	border-bottom-color: #333333;
 }
@@ -921,11 +927,11 @@ ul.cplist {
 
 /* Preferences pane layout
 ----------------------------------------*/
-#cp-main h2 {
+.panel-container h2 {
 	color: #333333;
 }
 
-#cp-main .panel {
+.panel-container .panel {
 	background-color: #F9F9F9;
 }
 

phpBB/styles/prosilver/theme/cp.css

@@ -20,16 +20,16 @@
 	padding: 0;
 }
 
-#cp-main .panel p {
+.panel-container .panel p {
 	font-size: 1.1em;
 }
 
-#cp-main .panel ol {
+.panel-container .panel ol {
 	margin-left: 2em;
 	font-size: 1.1em;
 }
 
-#cp-main .panel li.row {
+.panel-container .panel li.row {
 	border-bottom: 1px solid transparent;
 	border-top: 1px solid transparent;
 }
@@ -39,21 +39,21 @@ ul.cplist {
 	border-top: 1px solid transparent;
 }
 
-#cp-main .panel li.header dd, #cp-main .panel li.header dt {
+.panel-container .panel li.header dd, .panel-container .panel li.header dt {
 	margin-bottom: 2px;
 }
 
-#cp-main table.table1 {
+.panel-container table.table1 {
 	margin-bottom: 1em;
 }
 
-#cp-main table.table1 thead th {
+.panel-container table.table1 thead th {
 	font-weight: bold;
 	border-bottom: 1px solid transparent;
 	padding: 5px;
 }
 
-#cp-main table.table1 tbody th {
+.panel-container table.table1 tbody th {
 	font-style: italic;
 	background-color: transparent !important;
 	border-bottom: none;

phpBB/styles/prosilver/theme/plupload.css

@@ -1,11 +1,76 @@
-.plupload_filelist li.can_delete:hover {
-	cursor: pointer;
+#attach-panel-multi {
+	display: none;
+	margin-bottom: 1em;
 }
 
-.plupload_filelist li.can_delete:hover a {
-	background: url('../../../assets/plupload/jquery.plupload.queue/img/delete.gif');
+#file-list td {
+	vertical-align: middle;
 }
 
-.plupload_filelist li a.working {
-	background: url('../../../assets/plupload/jquery.plupload.queue/img/throbber.gif');
+.attach-name {
+	width: 50%;
+}
+
+.attach-comment {
+	width: 30%;
+}
+
+.attach-filesize {
+	width: 15%;
+}
+
+.attach-status {
+	width: 5%;
+}
+
+.attach-filesize, .attach-status {
+	text-align: center;
+}
+
+.attach-controls {
+	display: inline-block;
+	float: right;
+}
+
+#attach-row-tpl, .nojs .file-inline-bbcode {
+	display: none;
+}
+
+#file-total-progress {
+	height: 2px;
+	display: block;
+	position: relative;
+	margin: 4px -10px -6px -10px;
+}
+
+.file-progress {
+	background-color: #CCCCCC;
+	display:inline-block;
+	height: 8px;
+	width: 50px;
+}
+
+.file-progress-bar, #file-total-progress-bar {
+	background-color: green;
+	display: block;
+	height: 100%;
+	width: 0;
+}
+
+.file-status.file-working {
+	background: url('../../../assets/plupload/img/throbber.gif');
+}
+
+.file-status.file-uploaded {
+	background: url('../../../assets/plupload/img/done.gif');
+}
+
+.file-status.file-error {
+	background: url('../../../assets/plupload/img/error.gif');
+}
+
+.file-status {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
 }

phpBB/styles/prosilver/theme/responsive.css

@@ -499,6 +499,10 @@ fieldset.display-actions {
 	margin: 0 25px;
 }
 
+.attach-comment dfn {
+	width: 100%;
+}
+
 @media only screen and (max-width: 500px), only screen and (max-device-width: 500px)
 {
 	p.responsive-center {
@@ -526,4 +530,9 @@ fieldset.display-actions {
 		display: block;
 		margin-bottom: 5px;
 	}
+
+	.attach-controls {
+		margin-top: 5px;
+		width: 100%;
+	}
 }