fix style and database name

Signed-off-by: Greta Doci <gretadoci@gmail.com>
nextcloud · Dec 3, 2019 · 50f2f99 · 50f2f99
1 parent 18f777c
commit 50f2f99
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss
@@ -1538,7 +1538,8 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 					}
 					.toggleUserActions {
 						position: relative;
-						display: flex;
+						display: inline-flex;
+						align-items: center;
 						.icon-more {
 							width: 44px;
 							height: 44px;

diff --git a/apps/settings/src/components/UserList/UserRowSimple.vue b/apps/settings/src/components/UserList/UserRowSimple.vue
@@ -32,12 +32,15 @@
 			<progress class="quota-user-progress"
 				:class="{'warn':usedQuota>80}"
 				:value="usedQuota"
+				v-tooltip.auto="usedSpace"
 				max="100" />
 		</div>
 		<div v-if="showConfig.showLanguages" class="languages">
 			{{ userLanguage.name }}
 		</div>
-		<div v-if="showConfig.showStoragePath" class="storageLocation">
+		<div v-if="showConfig.showStoragePath"
+			class="storageLocation"
+			v-tooltip.auto="user.storageLocation">
 			{{ user.storageLocation }}
 		</div>
 		<div v-if="showConfig.showUserBackend" class="userBackend">
@@ -148,6 +151,12 @@ export default {
 			return this.userSubAdminsGroups
 				.map((groupObject) => groupObject.name)
 				.join(', ')
+		},
+		usedSpace() {
+			if (this.user.quota.used) {
+				return t('settings', '{size} used', { size: OC.Util.humanFileSize(this.user.quota.used) })
+			}
+			return t('settings', '{size} used', { size: OC.Util.humanFileSize(0) })
 		}
 
 	},

diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php
@@ -459,7 +459,7 @@ public function loginName2UserName($loginName) {
 	 * @return string the name of the backend to be shown
 	 */
 	public function getBackendName() {
-		return 'Database';
+		return 'gitLocal';
 	}
 
 	public static function preLoginNameUsedAsUserName($param) {