diff --git a/package.json b/package.json index 18b5da5a..6d073527 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "osit-aether-app-svelte", - "version": "3.9.5", + "version": "3.9.6", "description": "One Sky IT's Aether App created with Svelte, SvelteKit, Tailwind CSS, Lucide, Font Awesome, and Skeleton UI. -Scott Idem", "homepage": "https://oneskyit.com/", "private": true, diff --git a/src/lib/ae_events/ae_events__event.ts b/src/lib/ae_events/ae_events__event.ts index 06176c81..1ca6d426 100644 --- a/src/lib/ae_events/ae_events__event.ts +++ b/src/lib/ae_events/ae_events__event.ts @@ -1029,8 +1029,11 @@ export function sync_config__event_pres_mgmt( // pres_mgmt_cfg_local.show__copy_access_link = pres_mgmt_cfg_remote?.show__copy_access_link ?? false; // pres_mgmt_cfg_local.show__email_access_link = pres_mgmt_cfg_remote?.show__email_access_link ?? false; - pres_mgmt_cfg_local.show__launcher_link = pres_mgmt_cfg_remote?.show__launcher_link ?? false; - pres_mgmt_cfg_local.show__launcher_link_legacy = pres_mgmt_cfg_remote?.show__launcher_link_legacy ?? false; + // pres_mgmt_cfg_local.show__launcher_link = pres_mgmt_cfg_remote?.show__launcher_link ?? false; + // pres_mgmt_cfg_local.show__launcher_link_legacy = pres_mgmt_cfg_remote?.show__launcher_link_legacy ?? false; + + pres_mgmt_cfg_local.hide_launcher_link = pres_mgmt_cfg_remote?.hide_launcher_link ?? false; + pres_mgmt_cfg_local.hide_launcher_link_legacy = pres_mgmt_cfg_remote?.hide_launcher_link_legacy ?? false; } if (log_lvl) { diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts index 389eda84..0b83b8e9 100644 --- a/src/lib/ae_events_stores.ts +++ b/src/lib/ae_events_stores.ts @@ -249,8 +249,8 @@ let events_local_data_struct: key_val = { // show_content__agree_text: false, show_content__event_view: null, - show__launcher_link: false, - show__location_link: false, + // show__launcher_link: false, + // show__location_link: false, show_content__location_qr: false, show_content__presentation_description: false, // Note that this is for *all* presentations in the user interface. It is a global setting. show_content__presenter_page_help: true, @@ -271,6 +271,13 @@ let events_local_data_struct: key_val = { hide__session_poc_biography: true, hide__presenter_biography: true, + // Only specific to lists and tables: + hide__session_li_location_field: false, + hide__session_li_poc_field: false, + hide__launcher_link_legacy: true, // Flask version + hide__launcher_link: true, // New Svelte version + hide__location_link: true, + show_content__disabled_files: false, show_content__hidden_files: false, show_content__hidden_presentations: false, diff --git a/src/routes/events/[event_id]/+page.svelte b/src/routes/events/[event_id]/+page.svelte index 95d73a15..c42a7a7c 100644 --- a/src/routes/events/[event_id]/+page.svelte +++ b/src/routes/events/[event_id]/+page.svelte @@ -571,6 +571,11 @@ max-w-max --> diff --git a/src/routes/events/[event_id]/event_page_menu.svelte b/src/routes/events/[event_id]/event_page_menu.svelte index 1b21d180..6ef2c014 100644 --- a/src/routes/events/[event_id]/event_page_menu.svelte +++ b/src/routes/events/[event_id]/event_page_menu.svelte @@ -168,9 +168,9 @@ import Comp__pres_mgmt_menu_nav from '../ae_comp__events_menu_nav.svelte'; {#if $ae_loc.authenticated_access} -
+
500 -
+ + + + + + + + {#if $ae_loc.manager_access} + + {/if} + +
{/if} {#if $ae_loc.authenticated_access}
- - {#if $events_loc.pres_mgmt.show__launcher_link || $events_loc.pres_mgmt.show__location_link} - - {:else} - - {/if} + + - - {#if !$events_loc.pres_mgmt?.hide__session_li_poc_field} - - {:else} - - {/if} + + + + + + + + + + + - - {#if $events_loc.pres_mgmt.qry_hidden == 'all'} - - {:else} - - {/if} - {#if $ae_loc.manager_access} - {#if $events_loc.pres_mgmt.qry_enabled == 'all'} - - {:else} - - {/if} - {/if}
{/if} diff --git a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte index 1b622675..2fb157ef 100644 --- a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte +++ b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte @@ -222,8 +222,8 @@ $effect(() => { @@ -237,9 +237,9 @@ $effect(() => { hide__session_location={true} show__session_files={$events_loc.pres_mgmt.show_content__session_files} show__session_presentations={$events_loc.pres_mgmt.show_content__session_presentations} - show__launcher_link={$ae_loc.administrator_access && $events_loc.pres_mgmt.show__launcher_link} - show__launcher_link_legacy={$events_loc.pres_mgmt.show__launcher_link_legacy} - show__location_link={$events_loc.pres_mgmt.show__location_link} + hide__launcher_link={$ae_loc.administrator_access && $events_loc.pres_mgmt.hide__launcher_link} + hide__launcher_link_legacy={$events_loc.pres_mgmt.hide__launcher_link_legacy} + hide__location_link={$events_loc.pres_mgmt.hide__location_link} log_lvl={log_lvl} > diff --git a/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte b/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte index c097bc88..52dcfc5e 100644 --- a/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte +++ b/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte @@ -333,34 +333,50 @@ let ae_triggers: key_val = $state({}); {/if} --> - - {#if $events_loc.pres_mgmt.show__launcher_link || $events_loc.pres_mgmt.show__location_link} - - {:else} - - {/if} + + + + + + + + {#if $events_loc.pres_mgmt.show_content__session_files} {:else} {/if} @@ -392,10 +414,13 @@ let ae_triggers: key_val = $state({}); onclick={() => { $events_loc.pres_mgmt.show_content__session_presentations = false; }} - class="btn btn-sm ae_btn_surface" + class="btn btn-sm ae_btn_surface justify-between w-full text-center" > - Showing Presentations + + + Hide Linked Presentations (testing) + {:else} {/if} {/if} - {#if $ae_loc.trusted_access} - {#if $ae_loc.edit_mode} + {#if $ae_loc?.trusted_access} +
+ {#if $ae_loc?.edit_mode} {:else} {/if} + + {#if $ae_loc?.adv_mode} + + {:else} + + {/if} + +
{/if} diff --git a/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte b/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte index ddad7bdb..9b82137b 100644 --- a/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte +++ b/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte @@ -1,15 +1,15 @@ @@ -14,7 +18,7 @@ export let hide: boolean = true;

- {:else} + Hide Hidden Sessions + + {:else} + + + Show Hidden Sessions? + + {/if} + + + + + {#if $ae_loc.manager_access} {/if} - {#if $ae_loc.manager_access} - {#if $events_loc.pres_mgmt.qry_enabled == 'all'} - - {:else} - - {/if} - {/if} {/if} @@ -204,21 +227,26 @@ export let hide: boolean = true; @@ -226,24 +254,30 @@ export let hide: boolean = true; {#if !$events_loc.pres_mgmt.hide__session_msg} {:else} {/if} {/if} @@ -253,24 +287,30 @@ export let hide: boolean = true; {#if !$events_loc.pres_mgmt.hide__session_code} {:else} {/if} {/if} @@ -286,7 +326,7 @@ export let hide: boolean = true; {#if $events_loc.pres_mgmt.show__copy_access_link} {:else} {/if} {#if $events_loc.pres_mgmt.show_content__presenter_qr} {:else} {/if} @@ -395,82 +447,145 @@ export let hide: boolean = true; {#if $ae_loc.authenticated_access}
- - {#if $events_loc.pres_mgmt.show__launcher_link || $events_loc.pres_mgmt.show__location_link} - - {:else} - - {/if} + + + + + + + + + + + + + + + + + {#if $events_loc.pres_mgmt.show_content__session_files} {:else} {/if} {#if $events_loc.pres_mgmt.show_content__session_presentations} {:else} {/if} @@ -478,57 +593,69 @@ export let hide: boolean = true; {/if} -
+
{#if $ae_loc?.trusted_access} {#if $ae_loc?.edit_mode} {:else} {/if} {#if $ae_loc?.adv_mode} {:else} {/if} {/if}