From 257ebc2830a04272c0b662cce85fea6470e77f7c Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 17 Jun 2013 12:18:45 +0200
Subject: use consistent icon for 'restore'/versions/history, also SVG

---
 apps/files_trashbin/js/trash.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apps')

diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 691642811b7..82119a59517 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -2,7 +2,7 @@
 $(document).ready(function() {
 
 	if (typeof FileActions !== 'undefined') {
-		FileActions.register('all', 'Restore', OC.PERMISSION_READ,  OC.imagePath('core', 'actions/undelete.png'), function(filename) {
+		FileActions.register('all', 'Restore', OC.PERMISSION_READ,  OC.imagePath('core', 'actions/history.svg'), function(filename) {
 			var tr=$('tr').filterAttr('data-file', filename);
 			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
 			var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date");
-- 
cgit v1.2.3


From d9dcba9a39a468a0fe5cfaad99d6a7282ba2702a Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 17 Jun 2013 12:35:25 +0200
Subject: remove unused loading spinners, just have one

---
 apps/files_trashbin/js/trash.js |   4 ++--
 core/img/loader.gif             | Bin 847 -> 0 bytes
 core/img/loading-dark.gif       | Bin 673 -> 0 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 core/img/loader.gif
 delete mode 100644 core/img/loading-dark.gif

(limited to 'apps')

diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 82119a59517..307ac743a3c 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -4,7 +4,7 @@ $(document).ready(function() {
 	if (typeof FileActions !== 'undefined') {
 		FileActions.register('all', 'Restore', OC.PERMISSION_READ,  OC.imagePath('core', 'actions/history.svg'), function(filename) {
 			var tr=$('tr').filterAttr('data-file', filename);
-			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
+			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
 			var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date");
 			var files = tr.attr('data-file');
 			undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
@@ -94,7 +94,7 @@ $(document).ready(function() {
 
 		$('.undelete').click('click',function(event) {
 			event.preventDefault();
-			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
+			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
 			var files=getSelectedFiles('file');
 			var fileslist = JSON.stringify(files);
 			var dirlisting=getSelectedFiles('dirlisting')[0];
diff --git a/core/img/loader.gif b/core/img/loader.gif
deleted file mode 100644
index e192ca895cd..00000000000
Binary files a/core/img/loader.gif and /dev/null differ
diff --git a/core/img/loading-dark.gif b/core/img/loading-dark.gif
deleted file mode 100644
index 5fe86acabc4..00000000000
Binary files a/core/img/loading-dark.gif and /dev/null differ
-- 
cgit v1.2.3


From 2a5776354251ddfeccc854d2d0af157575afa28d Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 17 Jun 2013 13:30:57 +0200
Subject: use history icon in Deleted Files template as well

---
 apps/files_trashbin/js/trash.js         | 2 +-
 apps/files_trashbin/templates/index.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'apps')

diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 307ac743a3c..87dfea491e7 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -2,7 +2,7 @@
 $(document).ready(function() {
 
 	if (typeof FileActions !== 'undefined') {
-		FileActions.register('all', 'Restore', OC.PERMISSION_READ,  OC.imagePath('core', 'actions/history.svg'), function(filename) {
+		FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) {
 			var tr=$('tr').filterAttr('data-file', filename);
 			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
 			var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date");
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index cb5edaa2c91..66ec36df867 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -18,7 +18,7 @@
 				<span class='selectedActions'>
 						<a href="" class="undelete">
 							<img class="svg" alt="<?php p($l->t( 'Restore' )); ?>"
-								 src="<?php print_unescaped(OCP\image_path("core", "actions/undelete.png")); ?>" />
+								 src="<?php print_unescaped(OCP\image_path("core", "actions/history.svg")); ?>" />
 							<?php p($l->t('Restore'))?>
 						</a>
 				</span>
-- 
cgit v1.2.3