From 2050a39da793b9ed219beed868ec86ebade423f6 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 11 Oct 2013 17:40:16 +0200 Subject: [feature/plupload/integration] Integration of Plupload This commit is a highly-refactored and up-to-date version of Fyorl's work which was part of his Google Summer of Code 2012 project "Attachment Improvements". PHPBB3-10929 --- .../styles/prosilver/template/overall_footer.html | 1 + .../styles/prosilver/template/overall_header.html | 5 +++ phpBB/styles/prosilver/template/plupload.html | 48 ++++++++++++++++++++++ phpBB/styles/prosilver/theme/plupload.css | 11 +++++ 4 files changed, 65 insertions(+) create mode 100644 phpBB/styles/prosilver/template/plupload.html create mode 100644 phpBB/styles/prosilver/theme/plupload.css (limited to 'phpBB/styles') diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index e26c94f367..b26a4c1610 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -65,6 +65,7 @@ {$SCRIPTS} + diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 6ca5c86fa4..92baf6ee51 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -33,6 +33,11 @@ + + + + + diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html new file mode 100644 index 0000000000..564c1b5c36 --- /dev/null +++ b/phpBB/styles/prosilver/template/plupload.html @@ -0,0 +1,48 @@ + + + + + diff --git a/phpBB/styles/prosilver/theme/plupload.css b/phpBB/styles/prosilver/theme/plupload.css new file mode 100644 index 0000000000..16c26822b5 --- /dev/null +++ b/phpBB/styles/prosilver/theme/plupload.css @@ -0,0 +1,11 @@ +.plupload_filelist li.can_delete:hover { + cursor: pointer; +} + +.plupload_filelist li.can_delete:hover a { + background: url('../../../assets/plupload/jquery.plupload.queue/img/delete.gif'); +} + +.plupload_filelist li a.working { + background: url('../../../assets/plupload/jquery.plupload.queue/img/throbber.gif'); +} -- cgit v1.2.1