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.

Sign up for GitHub

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

Bugfix/rs scrolling issue #398

Merged
merged 4 commits into from
Jan 10, 2023
Merged

Bugfix/rs scrolling issue #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c50ea42
removed extra div
lagartoverde Jan 6, 2023
47a49b5
removed extra div on edit
lagartoverde Jan 6, 2023
1924c1f
Merge branch 'master' into bugfix/rs-scrolling-issue
abeforgit Jan 10, 2023
aead6e4
Merge branch 'master' into bugfix/rs-scrolling-issue
abeforgit Jan 10, 2023
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
125 changes: 62 additions & 63 deletions app/templates/regulatory-statements/edit.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,68 @@
{{page-title "reglementaire bijlage"}}
<div
{{did-update (perform this.fetchRevisions)}}
{{did-insert (perform this.fetchRevisions)}}
<AppChrome
@editorDocument={{this.editorDocument}}
@documentContainer={{this.documentContainer}}
@onTitleUpdate={{perform this.onTitleUpdate}}
@allowTitleUpdate={{true}}
>
<AppChrome
@editorDocument={{this.editorDocument}}
@documentContainer={{this.documentContainer}}
@onTitleUpdate={{perform this.onTitleUpdate}}
@allowTitleUpdate={{true}}
>
<:return-link>
<AuLink @route="inbox.regulatory-statements" @model={{@meetingId}}>
<AuIcon @icon="arrow-left" @alignment="left" />
{{t 'inbox.regulatoryStatements.return'}}
</AuLink>
</:return-link>
<:actions-after-title>
<AuDropdown @title={{t 'utils.currentVersion'}} @buttonLabel={{t 'utils.currentVersion'}} @alignment="left">
<p class="au-u-padding-small regulatory-statement-current-version-container-active">
<span class="au-u-bold au-u-margin-right-large">{{t 'utils.currentVersion'}}: </span>
<span class="au-u-light">{{human-friendly-date this.editorDocument.updatedOn}}</span>
</p>
<AuHr />
<div class="au-u-margin-small au-u-flex--column au-u-flex">
<p class="au-u-muted">{{t 'utils.history'}}</p>
{{#each this.revisions as |revision|}}
<AuLink @route="regulatory-statements.revisions" @skin="secondary" role="menuitem" @models={{array this.documentContainer.id revision.id}}>
{{human-friendly-date revision.updatedOn}}
{{#if revision.status.label}}
<AuPill @skin='success'>{{revision.status.label}}</AuPill>
{{/if}}
</AuLink>
{{/each}}
<AuLink @route="regulatory-statements.edit.history" @model={{this.documentContainer.id}} @skin="link" role="menuitem" >
<AuIcon @icon="clock" @alignment="left" />
{{t 'utils.fullHistory'}}
<:return-link>
<AuLink @route="inbox.regulatory-statements" @model={{@meetingId}}>
<AuIcon @icon="arrow-left" @alignment="left" />
{{t 'inbox.regulatoryStatements.return'}}
</AuLink>
</:return-link>
<:actions-after-title>
<AuDropdown @title={{t 'utils.currentVersion'}} @buttonLabel={{t 'utils.currentVersion'}} @alignment="left">
<p class="au-u-padding-small regulatory-statement-current-version-container-active">
<span class="au-u-bold au-u-margin-right-large">{{t 'utils.currentVersion'}}: </span>
<span class="au-u-light">{{human-friendly-date this.editorDocument.updatedOn}}</span>
</p>
<AuHr />
<div
class="au-u-margin-small au-u-flex--column au-u-flex"
{{did-update (perform this.fetchRevisions)}}
{{did-insert (perform this.fetchRevisions)}}
>
<p class="au-u-muted">{{t 'utils.history'}}</p>
{{#each this.revisions as |revision|}}
<AuLink @route="regulatory-statements.revisions" @skin="secondary" role="menuitem" @models={{array this.documentContainer.id revision.id}}>
{{human-friendly-date revision.updatedOn}}
{{#if revision.status.label}}
<AuPill @skin='success'>{{revision.status.label}}</AuPill>
{{/if}}
</AuLink>
</div>
</AuDropdown>
</:actions-after-title>
<:actions>
<AuDropdown @title={{t "utils.fileOptions"}} @buttonLabel={{t "utils.fileOptions"}} @alignment="right">
<AuButton {{on "click" this.download}} @skin="tertiary" role="menuitem">
<AuIcon @icon="export" @alignment="left" />
{{t "utils.htmlExport"}}
</AuButton>
</AuDropdown>
<AuButton {{on "click" (perform this.saveTask)}} @disabled={{this.save.isRunning}}>
{{t "utils.save"}}
{{/each}}
<AuLink @route="regulatory-statements.edit.history" @model={{this.documentContainer.id}} @skin="link" role="menuitem" >
<AuIcon @icon="clock" @alignment="left" />
{{t 'utils.fullHistory'}}
</AuLink>
</div>
</AuDropdown>
</:actions-after-title>
<:actions>
<AuDropdown @title={{t "utils.fileOptions"}} @buttonLabel={{t "utils.fileOptions"}} @alignment="right">
<AuButton {{on "click" this.download}} @skin="tertiary" role="menuitem">
<AuIcon @icon="export" @alignment="left" />
{{t "utils.htmlExport"}}
</AuButton>
</:actions>
</AppChrome>
</AuDropdown>
<AuButton {{on "click" (perform this.saveTask)}} @disabled={{this.save.isRunning}}>
{{t "utils.save"}}
</AuButton>
</:actions>
</AppChrome>

<AuBodyContainer vocab="http://data.vlaanderen.be/ns/besluit#"
prefix="eli: http://data.europa.eu/eli/ontology# prov: http://www.w3.org/ns/prov# mandaat: http://data.vlaanderen.be/ns/mandaat# besluit: http://data.vlaanderen.be/ns/besluit# say:https://say.data.gift/ns/ dct: http://purl.org/dc/terms/ ext:http://mu.semte.ch/vocabularies/ext/">
<RdfaEditorContainer
@plugins={{this.plugins}}
@rdfaEditorInit={{this.handleRdfaEditorInit}}
@typeOfWrappingDiv="lblodgn:ReglementaireBijlage"
@showToggleRdfaAnnotations={{true}}
@editorDocument={{this.editorDocument}}
@busy={{or this.saveTask.isRunning}}
@busyText={{t "rdfaEditorContainer.saving"}}
/>
</AuBodyContainer>
<ConfirmRouteLeave @enabled={{this.dirty}} @message={{t "behandelingVanAgendapunten.confirmLeaveWithoutSaving"}}/>
</div>
<AuBodyContainer vocab="http://data.vlaanderen.be/ns/besluit#"
prefix="eli: http://data.europa.eu/eli/ontology# prov: http://www.w3.org/ns/prov# mandaat: http://data.vlaanderen.be/ns/mandaat# besluit: http://data.vlaanderen.be/ns/besluit# say:https://say.data.gift/ns/ dct: http://purl.org/dc/terms/ ext:http://mu.semte.ch/vocabularies/ext/">
<RdfaEditorContainer
@plugins={{this.plugins}}
@rdfaEditorInit={{this.handleRdfaEditorInit}}
@typeOfWrappingDiv="lblodgn:ReglementaireBijlage"
@showToggleRdfaAnnotations={{true}}
@editorDocument={{this.editorDocument}}
@busy={{or this.saveTask.isRunning}}
@busyText={{t "rdfaEditorContainer.saving"}}
/>
</AuBodyContainer>
<ConfirmRouteLeave @enabled={{this.dirty}} @message={{t "behandelingVanAgendapunten.confirmLeaveWithoutSaving"}}/>
{{outlet}}
147 changes: 73 additions & 74 deletions app/templates/regulatory-statements/revisions.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,81 +1,80 @@
<div
<AppChrome
@editorDocument={{this.model.editorDocument}}
@documentContainer={{this.model.documentContainer}}
@documentStatus={{this.model.editorDocument.status}}
>
<:return-link>
<AuLink @route={{if (or this.model.currentVersion.status (not this.currentSession.canWrite)) 'regulatory-statements.show' 'regulatory-statements.edit'}} @model={{this.model.documentContainer.id}}>
<AuIcon @icon="arrow-left" @alignment="left"/>
{{t 'inbox.regulatoryStatements.revisionsReturn'}}
</AuLink>
</:return-link>
<:actions-after-title>
<AuDropdown @title={{human-friendly-date this.model.editorDocument.updatedOn}} @buttonLabel={{human-friendly-date
this.model.editorDocument.updatedOn}} @alignment="left">
<LinkTo @route="{{if (or this.model.currentVersion.status (not this.currentSession.canWrite)) 'regulatory-statements.show' 'regulatory-statements.edit'}}" @model={{this.model.documentContainer.id}}
class="au-u-padding-small regulatory-statement-current-version-container">
<span class="au-u-bold au-u-margin-right-large">{{t 'utils.currentVersion'}}: </span>
<span class="au-u-light">{{human-friendly-date this.model.currentVersion.updatedOn}}</span>
</LinkTo>
<AuHr/>
<div class="au-u-margin-small au-u-flex--column au-u-flex">
<p class="au-u-muted">{{t 'utils.history'}}: </p>
{{#each this.revisions as |revision|}}
<AuLink @route="regulatory-statements.revisions" @skin="secondary" role="menuitem" @models={{array
this.model.documentContainer.id revision.id}}>
{{human-friendly-date revision.updatedOn}}
{{#if revision.status.label}}
<AuPill @skin='success'>{{revision.status.label}}</AuPill>
{{/if}}
</AuLink>
{{/each}}
<AuLink @route="regulatory-statements.revisions.history" @skin="link" role="menuitem">
<AuIcon @icon="clock" @alignment="left"/>
{{t 'utils.fullHistory'}}
</AuLink>
</div>
</AuDropdown>
</:actions-after-title>
<:actions>
<AuDropdown @title={{t "utils.fileOptions"}} @buttonLabel={{t "utils.fileOptions"}} @alignment="right">
<AuButton {{on "click" this.download}} @skin="tertiary" role="menuitem">
<AuIcon @icon="export" @alignment="left"/>
{{t "utils.htmlExport"}}
</AuButton>
</AuDropdown>
{{#if this.currentSession.canWrite}}
<AuButton {{on "click" (perform this.restoreTask)}} @disabled={{this.restoreTask.isRunning}}>
{{t "utils.restore"}}
</AuButton>
{{/if}}
</:actions>
</AppChrome>

<div
class="au-c-body-container"
{{did-update (perform this.fetchRevisions)}}
{{did-insert (perform this.fetchRevisions)}}
>
<AppChrome
@editorDocument={{this.model.editorDocument}}
@documentContainer={{this.model.documentContainer}}
@documentStatus={{this.model.editorDocument.status}}
>
<:return-link>
<AuLink @route={{if (or this.model.currentVersion.status (not this.currentSession.canWrite)) 'regulatory-statements.show' 'regulatory-statements.edit'}} @model={{this.model.documentContainer.id}}>
<AuIcon @icon="arrow-left" @alignment="left"/>
{{t 'inbox.regulatoryStatements.revisionsReturn'}}
</AuLink>
</:return-link>
<:actions-after-title>
<AuDropdown @title={{human-friendly-date this.model.editorDocument.updatedOn}} @buttonLabel={{human-friendly-date
this.model.editorDocument.updatedOn}} @alignment="left">
<LinkTo @route="{{if (or this.model.currentVersion.status (not this.currentSession.canWrite)) 'regulatory-statements.show' 'regulatory-statements.edit'}}" @model={{this.model.documentContainer.id}}
class="au-u-padding-small regulatory-statement-current-version-container">
<span class="au-u-bold au-u-margin-right-large">{{t 'utils.currentVersion'}}: </span>
<span class="au-u-light">{{human-friendly-date this.model.currentVersion.updatedOn}}</span>
</LinkTo>
<AuHr/>
<div class="au-u-margin-small au-u-flex--column au-u-flex">
<p class="au-u-muted">{{t 'utils.history'}}: </p>
{{#each this.revisions as |revision|}}
<AuLink @route="regulatory-statements.revisions" @skin="secondary" role="menuitem" @models={{array
this.model.documentContainer.id revision.id}}>
{{human-friendly-date revision.updatedOn}}
{{#if revision.status.label}}
<AuPill @skin='success'>{{revision.status.label}}</AuPill>
<div class="au-c-rdfa-editor">
<div class="say-container say-container--sidebar-left say-container--paper say-container--sidebar-right">
<div class="say-container__main">
{{#unless this.readOnly}}
<div class="au-o-box au-o-box--small au-u-background-gray-100">
<AuAlert @icon="info-circle" @title={{t "inbox.regulatoryStatements.readOnlyBanner.title"}} @skin="info"
@size="small" class="au-u-margin-bottom-none">
{{#if this.model.editorDocument.status}}
<p>{{t "inbox.regulatoryStatements.readOnlyBanner.oldPublishedMessage"}}</p>
{{else}}
<p>{{t "inbox.regulatoryStatements.readOnlyBanner.message"}}</p>
{{/if}}
</AuLink>
{{/each}}
<AuLink @route="regulatory-statements.revisions.history" @skin="link" role="menuitem">
<AuIcon @icon="clock" @alignment="left"/>
{{t 'utils.fullHistory'}}
</AuLink>
</div>
</AuDropdown>
</:actions-after-title>
<:actions>
<AuDropdown @title={{t "utils.fileOptions"}} @buttonLabel={{t "utils.fileOptions"}} @alignment="right">
<AuButton {{on "click" this.download}} @skin="tertiary" role="menuitem">
<AuIcon @icon="export" @alignment="left"/>
{{t "utils.htmlExport"}}
</AuButton>
</AuDropdown>
{{#if this.currentSession.canWrite}}
<AuButton {{on "click" (perform this.restoreTask)}} @disabled={{this.restoreTask.isRunning}}>
{{t "utils.restore"}}
</AuButton>
{{/if}}
</:actions>
</AppChrome>

<div class="au-c-body-container">
<div class="au-c-rdfa-editor">
<div class="say-container say-container--sidebar-left say-container--paper say-container--sidebar-right">
<div class="say-container__main">
{{#unless this.readOnly}}
<div class="au-o-box au-o-box--small au-u-background-gray-100">
<AuAlert @icon="info-circle" @title={{t "inbox.regulatoryStatements.readOnlyBanner.title"}} @skin="info"
@size="small" class="au-u-margin-bottom-none">
{{#if this.model.editorDocument.status}}
<p>{{t "inbox.regulatoryStatements.readOnlyBanner.oldPublishedMessage"}}</p>
{{else}}
<p>{{t "inbox.regulatoryStatements.readOnlyBanner.message"}}</p>
{{/if}}
</AuAlert>
</div>
{{/unless}}
<div class="say-editor rdfa-annotations rdfa-annotations-hover rdfa-annotations--disabled">
<div class="say-editor__paper">
<div class="say-editor__inner say-content say-content--disabled">
{{ this.model.editorDocument.htmlSafeContent }}
</div>
</AuAlert>
</div>
{{/unless}}
<div class="say-editor rdfa-annotations rdfa-annotations-hover rdfa-annotations--disabled">
<div class="say-editor__paper">
<div class="say-editor__inner say-content say-content--disabled">
{{ this.model.editorDocument.htmlSafeContent }}
</div>
</div>
</div>
Expand Down
Loading