From 700a7e368fcaf47d351ce4f282e8dc2fc54e5360 Mon Sep 17 00:00:00 2001
From: nadir <tft105b@hotmail.com>
Date: Wed, 18 Nov 2015 17:12:00 +0100
Subject: [PATCH] Couple fixes: 	- Corrected password restore link on log in
 page 	- Trashbin info button movement fix

---
 apps/files_sharing/js/share.js | 2 +-
 apps/files_trashbin/js/app.js  | 4 ++--
 core/templates/login.php       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index f679857351fb..b598d2fe5815 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -98,7 +98,7 @@
 					'all',
 					'Info',
 					OC.PERMISSION_READ,
-					OC.imagePath('core', 'actions/share'),
+					OC.imagePath('core', 'actions/info'),
 					function(filename, context) {
 						window.alert("here");
 					},
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
index 41a14ba7398d..f7ef8dfb25bf 100644
--- a/apps/files_trashbin/js/app.js
+++ b/apps/files_trashbin/js/app.js
@@ -88,14 +88,14 @@ OCA.Trashbin.App = {
 				var curFileId = tr.attr('data-item-id');
 				if($('#dropdown').data('item-id') != curFileId) {
 					OCA.Trashbin.App.hideInfoDropDown(function () {
-						OCA.Trashbin.App.showInfoDropDown(curFileId, tr.attr('eospath'), $(tr).find('.action.action-info'));
+						OCA.Trashbin.App.showInfoDropDown(curFileId, tr.attr('eospath'), $(tr).find('td.filename'));
 					});
 				} else {
 					OCA.Trashbin.App.hideInfoDropDown();
 					OCA.Trashbin.App.dropDownShown = false;
 				}
 			} else {
-				OCA.Trashbin.App.showInfoDropDown(tr.attr('data-item-id'), tr.attr('eospath'), $(tr).find('.action.action-info'));
+				OCA.Trashbin.App.showInfoDropDown(tr.attr('data-item-id'), tr.attr('eospath'), $(tr).find('td.filename'));
 				OCA.Trashbin.App.dropDownShown = true;
 			}
 		
diff --git a/core/templates/login.php b/core/templates/login.php
index e6c4e937fa0d..5957b3ff003a 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -51,7 +51,7 @@
 		</p>
 
 		<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
-		<a id="lost-password" class="warning" href="https://account.cern.ch/account/" target="_blank">
+		<a id="lost-password" class="warning" href="https://account.cern.ch/account/CERNAccount/ChangePassword.aspx" target="_blank">
 			<?php p($l->t('Forgot your password? Reset it!')); ?>
 		</a>
 		<?php endif; ?>