Skip to content

Commit 3a1293d

Browse files
committed
Frontend: Improve RTL rendering
Signed-off-by: Michael Mayer <michael@photoprism.app>
1 parent a2ab1fd commit 3a1293d

3 files changed

Lines changed: 18 additions & 12 deletions

File tree

frontend/src/component/navigation.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -490,26 +490,26 @@
490490
</v-list-group>
491491
</template>
492492

493-
<v-list-tile v-show="!auth" :to="{ name: 'login' }" class="nav-login" @click.stop="">
494-
<v-list-tile-action :title="$gettext('Login')">
495-
<v-icon>lock</v-icon>
493+
<v-list-tile v-show="isAdmin && !isPublic && !isDemo && !isSponsor" :to="{ name: 'upgrade' }" class="nav-upgrade" @click.stop="">
494+
<v-list-tile-action :title="$gettext('Upgrade')">
495+
<v-icon>diamond</v-icon>
496496
</v-list-tile-action>
497497

498498
<v-list-tile-content>
499499
<v-list-tile-title>
500-
<translate key="Login">Login</translate>
500+
<translate key="Upgrade">Upgrade</translate>
501501
</v-list-tile-title>
502502
</v-list-tile-content>
503503
</v-list-tile>
504504

505-
<v-list-tile v-show="isAdmin && !isPublic && !isDemo && !isSponsor" :to="{ name: 'upgrade' }" class="nav-upgrade" @click.stop="">
506-
<v-list-tile-action :title="$gettext('Upgrade')">
507-
<v-icon>diamond</v-icon>
505+
<v-list-tile v-show="!auth" :to="{ name: 'login' }" class="nav-login" @click.stop="">
506+
<v-list-tile-action :title="$gettext('Login')">
507+
<v-icon>lock</v-icon>
508508
</v-list-tile-action>
509509

510510
<v-list-tile-content>
511511
<v-list-tile-title>
512-
<translate key="Upgrade">Upgrade</translate>
512+
<translate key="Login">Login</translate>
513513
</v-list-tile-title>
514514
</v-list-tile-content>
515515
</v-list-tile>

frontend/src/page/connect.vue

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<div class="p-page p-page-upgrade">
33
<v-toolbar flat color="secondary" :dense="$vuetify.breakpoint.smAndDown">
44
<v-toolbar-title>
5-
<a href="https://link.photoprism.app/membership" target="_blank"><translate>Upgrade</translate></a> <v-icon>navigate_next</v-icon>
5+
<translate>Upgrade</translate>
6+
<v-icon v-if="rtl">navigate_before</v-icon>
7+
<v-icon v-else>navigate_next</v-icon>
68
<span v-if="busy">
79
<translate>Busy, please wait…</translate>
810
</span>
@@ -95,15 +97,17 @@
9597
:disabled="busy"
9698
@click.stop="upgrade">
9799
<translate>Proceed</translate>
98-
<v-icon :right="!rtl" :left="rtl" dark>navigate_next</v-icon>
100+
<v-icon v-if="rtl" left dark>navigate_before</v-icon>
101+
<v-icon v-else right dark>navigate_next</v-icon>
99102
</v-btn>
100103
<v-btn v-else color="primary-button" :block="$vuetify.breakpoint.xsOnly"
101104
class="white--text ml-0"
102105
depressed
103106
:disabled="busy || form.token.length !== tokenMask.length"
104107
@click.stop="activate">
105108
<translate>Activate</translate>
106-
<v-icon :right="!rtl" :left="rtl" dark>navigate_next</v-icon>
109+
<v-icon v-if="rtl" left dark>navigate_before</v-icon>
110+
<v-icon v-else right dark>navigate_next</v-icon>
107111
</v-btn>
108112
</v-flex>
109113
<v-flex xs12 class="px-2 pt-3 pb-0">
@@ -141,6 +145,7 @@
141145
:disabled="busy"
142146
@click.stop="compare">
143147
<translate>Compare Editions</translate>
148+
<v-icon :right="!rtl" :left="rtl" dark>compare_arrows</v-icon>
144149
</v-btn>
145150
</v-flex>
146151
</v-layout>

frontend/src/page/login.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
:block="$vuetify.breakpoint.xsOnly"
5858
class="white--text action-confirm ra-6 py-2 px-3" @click.stop.prevent="login">
5959
<translate>Sign in</translate>
60-
<v-icon dark>navigate_next</v-icon>
60+
<v-icon v-if="rtl" left dark>navigate_before</v-icon>
61+
<v-icon v-else right dark>navigate_next</v-icon>
6162
</v-btn>
6263
</div>
6364
</v-flex>

0 commit comments

Comments
 (0)