This commit is contained in:
les
2020-02-20 20:56:24 +01:00
parent 53738cc9d7
commit d1eaf2396b
5 changed files with 62 additions and 68 deletions

View File

@@ -11,7 +11,7 @@
el-table-column(label='Name' width='100') el-table-column(label='Name' width='100')
template(slot-scope='data') template(slot-scope='data')
span(slot='reference') {{data.row.name}} span(slot='reference') {{data.row.name}}
el-table-column(label='Users' width='60') el-table-column(:label="$t('common.users')" width='70')
template(slot-scope='data') template(slot-scope='data')
span(slot='reference') {{data.row.users}} span(slot='reference') {{data.row.users}}
el-table-column(:label="$t('common.actions')" width='120') el-table-column(:label="$t('common.actions')" width='120')
@@ -29,7 +29,7 @@
client-only client-only
el-pagination(v-if='users.length>perPage' :page-size='perPage' :currentPage.sync='instancePage' :total='users.length') el-pagination(v-if='users.length>perPage' :page-size='perPage' :currentPage.sync='instancePage' :total='users.length')
el-table(:data='paginatedSelectedUsers' small) el-table(:data='paginatedSelectedUsers' small)
el-table-column(label='User' width='150') el-table-column(:label="$t('common.user')" width='150')
template(slot-scope='data') template(slot-scope='data')
span(slot='reference') span(slot='reference')
a(:href='data.row.object.id' target='_blank') {{data.row.object.name}} a(:href='data.row.object.id' target='_blank') {{data.row.object.name}}

View File

@@ -15,11 +15,11 @@ div
//- USERS LIST //- USERS LIST
el-table(:data='paginatedUsers' small) el-table(:data='paginatedUsers' small)
el-table-column(label='Email' width='250') el-table-column(label='Email' width='220')
template(slot-scope='data') template(slot-scope='data')
el-popover(trigger='hover' :content='data.row.description' width='400') el-popover(trigger='hover' :content='data.row.description' width='400')
span(slot='reference') {{data.row.email}} span(slot='reference') {{data.row.email}}
el-table-column(:label="$t('common.actions')" width='350') el-table-column(:label="$t('common.actions')")
template(slot-scope='data') template(slot-scope='data')
div(v-if='data.row.id!==$auth.user.id') div(v-if='data.row.id!==$auth.user.id')
el-button-group el-button-group
@@ -34,7 +34,6 @@ div
@click='delete_user(data.row)') {{$t('admin.delete_user')}} @click='delete_user(data.row)') {{$t('admin.delete_user')}}
div(v-else) div(v-else)
span {{$t('common.me')}} span {{$t('common.me')}}
el-table-column
client-only client-only
el-pagination(:page-size='perPage' :currentPage.sync='userPage' v-if='perPage<users_.length' :total='users_.length') el-pagination(:page-size='perPage' :currentPage.sync='userPage' v-if='perPage<users_.length' :total='users_.length')

View File

@@ -36,9 +36,6 @@ export default {
#footer { #footer {
a { a {
font-size: 1.1em; font-size: 1.1em;
&:hover {
border-bottom: 1px solid yellow;
}
} }
} }
</style> </style>

View File

@@ -1,69 +1,69 @@
<template lang="pug"> <template lang="pug">
el-main el-main
el-tabs(v-model='tab') el-tabs(v-model='tab')
//- SETTINGS //- SETTINGS
el-tab-pane.pt-1 el-tab-pane.pt-1
template(slot='label') template(slot='label')
v-icon(name='cog') v-icon(name='cog')
span {{$t('common.settings')}} span.hidden-xs-only {{$t('common.settings')}}
Settings Settings
//- USERS //- USERS
el-tab-pane.pt-1 el-tab-pane.pt-1
template(slot='label') template(slot='label')
v-icon(name='users') v-icon(name='users')
span.ml-1 {{$t('common.users')}} span.hidden-xs-only.ml-1 {{$t('common.users')}}
el-badge(v-show='unconfirmedUsers.length>0' :value='unconfirmedUsers.length') el-badge(v-show='unconfirmedUsers.length>0' :value='unconfirmedUsers.length')
Users(:users='users') Users(:users='users')
//- PLACES //- PLACES
el-tab-pane.pt-1 el-tab-pane.pt-1
template(slot='label') template(slot='label')
v-icon(name='map-marker-alt') v-icon(name='map-marker-alt')
span.ml-1 {{$t('common.places')}} span.hidden-xs-only.ml-1 {{$t('common.places')}}
Places Places
//- EVENTS //- EVENTS
el-tab-pane.pt-1 el-tab-pane.pt-1
template(slot='label') template(slot='label')
v-icon(name='calendar') v-icon(name='calendar')
span.ml-1 {{$t('common.events')}} span.hidden-xs-only.ml-1 {{$t('common.events')}}
el-badge(v-show='events.length>0' :value='events.length') el-badge(v-show='events.length>0' :value='events.length')
p {{$t('admin.event_confirm_description')}} p {{$t('admin.event_confirm_description')}}
el-table(:data='paginatedEvents' small primary-key='id' v-loading='loading') el-table(:data='paginatedEvents' small primary-key='id' v-loading='loading')
el-table-column(:label='$t("common.name")' width='300') el-table-column(:label='$t("common.name")' width='300')
template(slot-scope='data') {{data.row.title}} template(slot-scope='data') {{data.row.title}}
el-table-column(:label='$t("common.where")' width='250') el-table-column(:label='$t("common.where")' width='250')
template(slot-scope='data') {{data.row.place.name}} template(slot-scope='data') {{data.row.place.name}}
el-table-column(:label='$t("common.confirm")' width='250') el-table-column(:label='$t("common.confirm")' width='250')
template(slot-scope='data') template(slot-scope='data')
el-button(type='primary' @click='confirm(data.row.id)' size='mini') {{$t('common.confirm')}} el-button(type='primary' @click='confirm(data.row.id)' size='mini') {{$t('common.confirm')}}
el-button(type='success' @click='preview(data.row.id)' size='mini') {{$t('common.preview')}} el-button(type='success' @click='preview(data.row.id)' size='mini') {{$t('common.preview')}}
client-only client-only
el-pagination(:page-size='perPage' :currentPage.sync='eventPage' :total='events.length') el-pagination(:page-size='perPage' :currentPage.sync='eventPage' :total='events.length')
//- FEDERATION //- ANNOUNCEMENTS
el-tab-pane.pt-1 el-tab-pane.pt-1
template(slot='label') template(slot='label')
v-icon(name='network-wired') v-icon(name='bullhorn')
span.ml-1 {{$t('common.federation')}} span.hidden-xs-only.ml-1 {{$t('common.announcements')}}
Federation Announcement
//- MODERATION //- FEDERATION
el-tab-pane.pt-1(v-if='settings.enable_federation') el-tab-pane.pt-1
template(slot='label') template(slot='label')
v-icon(name='vector-square') v-icon(name='network-wired')
span.ml-1 {{$t('common.moderation')}} span.hidden-xs-only.ml-1 {{$t('common.federation')}}
Moderation Federation
//- ANNOUNCEMENTS //- MODERATION
el-tab-pane.pt-1 el-tab-pane.pt-1(v-if='settings.enable_federation')
template(slot='label') template(slot='label')
v-icon(name='bullhorn') v-icon(name='vector-square')
span.ml-1 {{$t('common.announcements')}} span.hidden-xs-only.ml-1 {{$t('common.moderation')}}
Announcement Moderation
</template> </template>
<script> <script>

View File

@@ -30,9 +30,7 @@
span {{$t('common.where')}} span {{$t('common.where')}}
p(v-html="$t('event.where_description')") p(v-html="$t('event.where_description')")
el-autocomplete(v-model='event.place.name' @blur='selectPlace($event.target.value)' el-autocomplete(v-model='event.place.name' @blur='selectPlace($event.target.value)'
highlight-first-item highlight-first-item :fetch-suggestions='filterPlaces' @select='selectPlace')
:fetch-suggestions='filterPlaces' @select='selectPlace')
div {{$t("common.address")}} div {{$t("common.address")}}
el-input.mb-3(ref='address' v-model='event.place.address' :disabled='disableAddress') el-input.mb-3(ref='address' v-model='event.place.address' :disabled='disableAddress')