diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-05-29 22:39:54 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-06-06 11:40:09 +0200 |
| commit | 5f8b935c8e44304db3d0d0caefbc78e503041bcf (patch) | |
| tree | 27d019bfe1ea49e9e37395988d103226792310e6 /settings | |
| parent | 30cd8ed837d0e106c93b8ab3aa70cc4291f9df6c (diff) | |
| download | nextcloud-server-5f8b935c8e44304db3d0d0caefbc78e503041bcf.tar.gz nextcloud-server-5f8b935c8e44304db3d0d0caefbc78e503041bcf.zip | |
Restructure main view layout
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.scss | 2 | ||||
| -rw-r--r-- | settings/src/components/appList.vue | 34 |
2 files changed, 19 insertions, 17 deletions
diff --git a/settings/css/settings.scss b/settings/css/settings.scss index fec5e13e99a..484e62592ac 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -955,7 +955,7 @@ span.version { margin-bottom: 1em; } -#apps-list { +#apps-list, #apps-list-search { &.installed { display: table; width: 100%; diff --git a/settings/src/components/appList.vue b/settings/src/components/appList.vue index ebaab914d88..78e6cdb5adf 100644 --- a/settings/src/components/appList.vue +++ b/settings/src/components/appList.vue @@ -22,34 +22,36 @@ <template> <div id="app-content" class="app-settings-content" :class="{ 'with-app-sidebar': app, 'icon-loading': loading }"> - <div id="apps-list" class="installed" v-if="useListView"> - <app-item v-for="app in apps" :key="app.id" :app="app" :category="category" /> - </div> - <div id="apps-list" class="installed" v-if="useBundleView"> - <template v-for="bundle in bundles"> + <div id="apps-list" :class="{installed: (useBundleView || useListView), store: useAppStoreView}"> + <template v-if="useListView"> + <app-item v-for="app in apps" :key="app.id" :app="app" :category="category" /> + </template> + <template v-for="bundle in bundles" v-if="useBundleView && bundleApps(bundle.id).length > 0"> <div class="apps-header"> <div class="app-image"></div> - <h2>{{ bundle.name }} <input class="enable" type="button" value="Alle aktivieren"></h2> + <h2>{{ bundle.name }} <input type="button" :value="bundleToggleText(bundle.id)" v-on:click="toggleBundle(bundle.id)"></h2> <div class="app-version"></div> <div class="app-level"></div> <div class="app-groups"></div> <div class="actions"> </div> </div> - <app-item v-for="app in bundleApps(bundle.id)" :key="app.id" :app="app" :category="category"/> + <app-item v-for="app in bundleApps(bundle.id)" :key="bundle.id + app.id" :app="app" :category="category"/> + </template> + <template v-if="useAppStoreView"> + <app-item v-for="app in apps" :key="app.id" :app="app" :category="category" :list-view="false" /> </template> - </div> - <div id="apps-list" class="store" v-if="useAppStoreView"> - <app-item v-for="app in apps" :key="app.id" :app="app" :category="category" :list-view="false" /> </div> - <div id="apps-list" class="installed" v-if="search !== '' && searchApps.length > 0"> - <div class="section"> - <div></div> - <h2>{{ t('settings', 'Results from other categories') }}</h2> - </div> - <app-item v-for="app in searchApps" :key="app.id" :app="app" :category="category" :list-view="true" /> + <div id="apps-list-search" class="installed"> + <template v-if="search !== '' && searchApps.length > 0"> + <div class="section"> + <div></div> + <h2>{{ t('settings', 'Results from other categories') }}</h2> + </div> + <app-item v-for="app in searchApps" :key="app.id" :app="app" :category="category" :list-view="true" /> + </template> </div> <div id="apps-list-empty" class="emptycontent emptycontent-search" v-if="!loading && searchApps.length === 0 && apps.length === 0"> |