Skip to content

Commit c215919

Browse files
committed
fix style and database name
Signed-off-by: Greta Doci <gretadoci@gmail.com>
1 parent 18f777c commit c215919

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

apps/settings/css/settings.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,8 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
15381538
}
15391539
.toggleUserActions {
15401540
position: relative;
1541-
display: flex;
1541+
display: inline-flex;
1542+
align-items: center;
15421543
.icon-more {
15431544
width: 44px;
15441545
height: 44px;

apps/settings/src/components/UserList/UserRowSimple.vue

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,15 @@
3232
<progress class="quota-user-progress"
3333
:class="{'warn':usedQuota>80}"
3434
:value="usedQuota"
35+
v-tooltip.auto="usedSpace"
3536
max="100" />
3637
</div>
3738
<div v-if="showConfig.showLanguages" class="languages">
3839
{{ userLanguage.name }}
3940
</div>
40-
<div v-if="showConfig.showStoragePath" class="storageLocation">
41+
<div v-if="showConfig.showStoragePath"
42+
class="storageLocation"
43+
v-tooltip.auto="user.storageLocation">
4144
{{ user.storageLocation }}
4245
</div>
4346
<div v-if="showConfig.showUserBackend" class="userBackend">
@@ -148,6 +151,12 @@ export default {
148151
return this.userSubAdminsGroups
149152
.map((groupObject) => groupObject.name)
150153
.join(', ')
154+
},
155+
usedSpace() {
156+
if (this.user.quota.used) {
157+
return t('settings', '{size} used', { size: OC.Util.humanFileSize(this.user.quota.used) })
158+
}
159+
return t('settings', '{size} used', { size: OC.Util.humanFileSize(0) })
151160
}
152161
153162
},

lib/private/User/Database.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ public function loginName2UserName($loginName) {
459459
* @return string the name of the backend to be shown
460460
*/
461461
public function getBackendName() {
462-
return 'Database';
462+
return 'Local';
463463
}
464464

465465
public static function preLoginNameUsedAsUserName($param) {

0 commit comments

Comments
 (0)