Skip to content

Commit

Permalink
Merge pull request #1336 from nextcloud/fix/move-version-number-to-fi…
Browse files Browse the repository at this point in the history
…rst-page

fix: Move version information to first page
  • Loading branch information
susnux authored Aug 29, 2024
2 parents 1546e64 + efa8365 commit f73c238
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 21 deletions.
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-sZberbjX.chunk.mjs'),window.OC.filePath('firstrunwizard', '', 'js/NcIconSvgWrapper-DjrkBUkC-CA4h7GKx.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-sZberbjX.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-DZzAxuS-.chunk.mjs'),window.OC.filePath('firstrunwizard', '', 'js/NcIconSvgWrapper-DjrkBUkC-CA4h7GKx.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-DZzAxuS-.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-sZberbjX.chunk.mjs'),window.OC.filePath('firstrunwizard', '', 'js/NcIconSvgWrapper-DjrkBUkC-CA4h7GKx.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-sZberbjX.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-DZzAxuS-.chunk.mjs'),window.OC.filePath('firstrunwizard', '', 'js/NcIconSvgWrapper-DjrkBUkC-CA4h7GKx.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-DZzAxuS-.chunk.mjs"),__vite__mapDeps([0,1]),import.meta.url)).open()});
2 changes: 1 addition & 1 deletion js/main-sZberbjX.chunk.mjs → js/main-DZzAxuS-.chunk.mjs

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

File renamed without changes.
1 change: 0 additions & 1 deletion js/main-sZberbjX.chunk.mjs.map

This file was deleted.

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>

0 comments on commit f73c238

Please sign in to comment.