Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable30] fix: Move version information to first page #1340

Merged
merged 2 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion css/firstrunwizard-style.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/firstrunwizard-about.mjs
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=[window.OC.filePath('firstrunwizard', '', 'js/main-BcjniB4F.chunk.mjs'),window.OC.filePath('firstrunwizard', '', 'js/NcIconSvgWrapper-Ckqpz-vm-BmlRkq83.chunk.mjs')])))=>i.map(i=>d[i]);
import{_ as a}from"./modulepreload-polyfill-MVl3sFGm.chunk.mjs";document.addEventListener("DOMContentLoaded",function(){const e=()=>document.querySelector("#firstrunwizard_about"),n=()=>{e().addEventListener("click",async function(t){var o;t.stopPropagation(),t.preventDefault();const r=(o=document.querySelector('[aria-controls="header-menu-user-menu"]'))!=null?o:void 0,{open:u}=await a(async()=>{const{open:i}=await import("./main-BcjniB4F.chunk.mjs");return{open:i}},__vite__mapDeps([0,1]),import.meta.url);u(r),OC.hideMenus(()=>!1)})};e()?n():window._nc_event_bus.subscribe("core:user-menu:mounted",n)});
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=[window.OC.filePath('firstrunwizard', '', 'js/main-C7ETGyXR.chunk.mjs'),window.OC.filePath('firstrunwizard', '', 'js/NcIconSvgWrapper-Ckqpz-vm-BmlRkq83.chunk.mjs')])))=>i.map(i=>d[i]);
import{_ as a}from"./modulepreload-polyfill-MVl3sFGm.chunk.mjs";document.addEventListener("DOMContentLoaded",function(){const e=()=>document.querySelector("#firstrunwizard_about"),n=()=>{e().addEventListener("click",async function(t){var o;t.stopPropagation(),t.preventDefault();const r=(o=document.querySelector('[aria-controls="header-menu-user-menu"]'))!=null?o:void 0,{open:u}=await a(async()=>{const{open:i}=await import("./main-C7ETGyXR.chunk.mjs");return{open:i}},__vite__mapDeps([0,1]),import.meta.url);u(r),OC.hideMenus(()=>!1)})};e()?n():window._nc_event_bus.subscribe("core:user-menu:mounted",n)});
4 changes: 2 additions & 2 deletions js/firstrunwizard-activate.mjs
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=[window.OC.filePath('firstrunwizard', '', 'js/main-BcjniB4F.chunk.mjs'),window.OC.filePath('firstrunwizard', '', 'js/NcIconSvgWrapper-Ckqpz-vm-BmlRkq83.chunk.mjs')])))=>i.map(i=>d[i]);
import{_ as t}from"./modulepreload-polyfill-MVl3sFGm.chunk.mjs";document.addEventListener("DOMContentLoaded",async function(){(await t(()=>import("./main-BcjniB4F.chunk.mjs"),__vite__mapDeps([0,1]),import.meta.url)).open()});
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=[window.OC.filePath('firstrunwizard', '', 'js/main-C7ETGyXR.chunk.mjs'),window.OC.filePath('firstrunwizard', '', 'js/NcIconSvgWrapper-Ckqpz-vm-BmlRkq83.chunk.mjs')])))=>i.map(i=>d[i]);
import{_ as t}from"./modulepreload-polyfill-MVl3sFGm.chunk.mjs";document.addEventListener("DOMContentLoaded",async function(){(await t(()=>import("./main-C7ETGyXR.chunk.mjs"),__vite__mapDeps([0,1]),import.meta.url)).open()});
1 change: 0 additions & 1 deletion js/main-BcjniB4F.chunk.mjs.map

This file was deleted.

2 changes: 1 addition & 1 deletion js/main-BcjniB4F.chunk.mjs → js/main-C7ETGyXR.chunk.mjs

Large diffs are not rendered by default.

File renamed without changes.
1 change: 1 addition & 0 deletions js/main-C7ETGyXR.chunk.mjs.map

Large diffs are not rendered by default.

14 changes: 0 additions & 14 deletions src/components/pages/AboutNextcloud.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
<Card href="https://nextcloud.com/enterprise/"
:title="t('firstrunwizard', 'For large organisations ↗')"
:subtitle="t('firstrunwizard', 'Get Nextcloud Enterprise for mission critical environments where advanced security and compliance are important.')" />

<p :class="$style.version">
{{ versionNumber }}
</p>
</WizardPage>
</template>

Expand All @@ -29,14 +25,4 @@ import { translate as t } from '@nextcloud/l10n'

import Card from '../Card.vue'
import WizardPage from '../WizardPage.vue'

const versionNumber = t('firstrunwizard', 'This Nextcloud is on version {version}', { version: window.OC.config.versionstring })
</script>

<style module>
.version {
color: var(--color-text-maxcontrast);
margin-block: calc(var(--default-grid-baseline) * 4) 0;
text-align: center;
}
</style>
12 changes: 12 additions & 0 deletions src/components/pages/KeyNotes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
:subtitle="t('firstrunwizard', 'Enjoy constant improvements from a thriving open-source community.')">
<NcIconSvgWrapper :class="$style.icon" inline :path="mdiAccountGroup" />
</Card>

<p :class="$style.version">
{{ versionNumber }}
</p>
</WizardPage>
</template>

Expand All @@ -36,10 +40,18 @@ import WizardPage from '../WizardPage.vue'
defineProps<{
scrollerClasses?: string | string[] | Record<string, boolean>
}>()

const versionNumber = t('firstrunwizard', 'This Nextcloud is on version {version}', { version: window.OC.config.versionstring })
</script>

<style module>
.icon {
margin-block: calc((1lh - 20px) / 2);
}

.version {
color: var(--color-text-maxcontrast);
margin-block: calc(var(--default-grid-baseline) * 4) 0;
text-align: center;
}
</style>
Loading