Merge remote-tracking branch 'origin/master'

Author: ArtificialOwl

css/files_lock.css

@@ -0,0 +1,12 @@
+tr[data-locked='true'] .fileactions .action.action-menu.permanent {
+	position: relative;
+	top: 7px;
+}
+.locking-inline-state.icon-password {
+	padding: 17px 23px;
+	margin-right: -45px;
+	top: -5px;
+	width: 44px;
+	position: relative;
+	opacity: 0.5;
+}

js/files.js

@@ -47,9 +47,9 @@
 					}
 					return t('files_lock', 'Lock file')
 				},
-				mime: 'all',
+				mime: 'file',
 				order: -140,
-				iconClass: 'icon-security',
+				iconClass: 'icon-password',
 				permissions: OC.PERMISSION_UPDATE,
 				actionHandler: self.switchLock
 			})
@@ -61,12 +61,13 @@
 					var locked = context.$file.data('locked')
 					var $actionLink = $('<span/>')
 					if (locked) {
-						$actionLink.text('Locked')
+						$actionLink.addClass('locking-inline-state')
+						$actionLink.addClass('icon-password')
 					}
 					context.$file.find('a.name>span.fileactions').append($actionLink)
 					return $actionLink
 				},
-				mime: 'all',
+				mime: 'file',
 				order: -140,
 				type: OCA.Files.FileActions.TYPE_INLINE,
 				permissions: OC.PERMISSION_UPDATE,

lib/AppInfo/Application.php

@@ -88,6 +88,7 @@ public function registerHooks() {
 			'OCA\Files::loadAdditionalScripts',
 			function () {
 				Util::addScript(self::APP_NAME, 'files');
+				Util::addStyle(self::APP_NAME, 'files_lock');
 			}
 		);