Couple fixes:

- Corrected password restore link on log in page - Trashbin info button movement fix
cernbox · Nov 18, 2015 · 700a7e3 · 700a7e3
1 parent d683068
commit 700a7e3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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; ?>