diff --git a/cms/sass/base/_general.scss b/cms/sass/base/_general.scss
index 0cc4ed5ceb..69b900aac0 100644
--- a/cms/sass/base/_general.scss
+++ b/cms/sass/base/_general.scss
@@ -1,335 +1,379 @@
/* General styles */
html {
- scroll-behavior: smooth;
- font-size: 20px;
+ scroll-behavior: smooth;
+ font-size: 20px;
- @media (max-width: 768px) {
- font-size: 18px;
- }
+ @media (max-width: 768px) {
+ font-size: 18px;
+ }
}
main {
- margin-bottom: $spacing-06;
+ margin-bottom: $spacing-06;
}
h2, h3, h4, h5, h6 {
- margin: $spacing-04 0 $spacing-03 0;
- line-height: 1.05;
- font-weight: 400;
- scroll-margin-top: 60px;
+ margin: $spacing-04 0 $spacing-03 0;
+ line-height: 1.05;
+ font-weight: 400;
+ scroll-margin-top: 60px;
- &:first-child {
- margin-top: 0;
- }
+ &:first-child {
+ margin-top: 0;
+ }
}
h1 {
- margin: $spacing-04 0;
- font-weight: 700;
- line-height: 1.05;
- scroll-margin-top: 600px;
- @include typescale-01;
- @include font-serif;
+ margin: $spacing-04 0;
+ font-weight: 700;
+ line-height: 1.05;
+ scroll-margin-top: 600px;
+ @include typescale-01;
+ @include font-serif;
}
h2 {
- @include typescale-02;
+ @include typescale-02;
}
h3 {
- @include typescale-03;
+ @include typescale-03;
}
h4 {
- @include typescale-04;
+ @include typescale-04;
}
h5 {
- @include typescale-05;
+ @include typescale-05;
}
h6 {
- @include typescale-06;
+ @include typescale-06;
}
ul, ol {
- padding-left: $spacing-04;
+ padding-left: $spacing-04;
- ul, ol {
- margin-left: $spacing-03;
- }
+ ul, ol {
+ margin-left: $spacing-03;
+ }
- li {
- line-height: 1.5;
- }
+ li {
+ line-height: 1.5;
+ }
}
dl {
- margin: 0 0 $spacing-03 0;
+ margin: 0 0 $spacing-03 0;
- dt {
- color: $dark-grey;
- @include typescale-06;
+ dt {
+ color: $dark-grey;
+ @include typescale-06;
- &:not(:first-child) {
- margin-top: $spacing-03;
+ &:not(:first-child) {
+ margin-top: $spacing-03;
+ }
}
- }
- dd {
- margin: 0;
- }
+ dd {
+ margin: 0;
+ }
}
p, blockquote, ul, ol {
- margin: 0 0 $spacing-04 0;
+ margin: 0 0 $spacing-04 0;
- &:last-child {
- margin-bottom: 0;
- }
+ &:last-child {
+ margin-bottom: 0;
+ }
}
pre, code {
- @include font-monospace;
- @include typescale-06;
- background: $light-grey;
+ @include font-monospace;
+ @include typescale-06;
+ background: $light-grey;
}
pre {
- padding: $spacing-02;
+ padding: $spacing-02;
}
strong, b {
- font-weight: 600;
+ font-weight: 600;
}
a {
- text-decoration: underline;
- color: $warm-black;
- overflow-wrap: break-word;
- word-wrap: break-word;
-
- &:hover,
- &:focus,
- &:active {
- color: $grapefruit;
- text-decoration: none;
- }
+ text-decoration: underline;
+ color: $warm-black;
+ overflow-wrap: break-word;
+ word-wrap: break-word;
+
+ &:hover,
+ &:focus,
+ &:active {
+ color: $grapefruit;
+ text-decoration: none;
+ }
}
section {
- padding: $spacing-04 0;
+ padding: $spacing-04 0;
}
blockquote {
- padding-left: 1.5em;
- border-left: 1px solid $sanguine;
- font-style: italic;
+ padding-left: 1.5em;
+ border-left: 1px solid $sanguine;
+ font-style: italic;
- em, i {
- font-style: normal;
- }
+ em, i {
+ font-style: normal;
+ }
}
hr {
- margin: $spacing-05 0;
- border: 0;
- height: 1px;
- background-color: rgba($dark-grey, 0.5);
+ margin: $spacing-05 0;
+ border: 0;
+ height: 1px;
+ background-color: rgba($dark-grey, 0.5);
}
img {
- height: auto;
- max-width: 100%;
+ height: auto;
+ max-width: 100%;
}
iframe {
- padding: $spacing-02;
- width: 100%;
- border: 0;
- border-radius: $spacing-02;
- @include box-shadow;
+ padding: $spacing-02;
+ width: 100%;
+ border: 0;
+ border-radius: $spacing-02;
+ @include box-shadow;
}
table {
- margin-bottom: $spacing-04;
- width: 100%;
+ margin-bottom: $spacing-04;
+ width: 100%;
- thead {
- text-align: left;
- color: $dark-grey;
- @include typescale-06;
- }
+ thead {
+ text-align: left;
+ color: $dark-grey;
+ @include typescale-06;
+ }
- tr {
- border-bottom: 1px solid rgba($dark-grey, 0.25);
+ tr {
+ border-bottom: 1px solid rgba($dark-grey, 0.25);
- &:last-child {
- border: 0;
+ &:last-child {
+ border: 0;
+ }
}
- }
- th, td {
- vertical-align: top;
- padding: $spacing-03;
+ th, td {
+ vertical-align: top;
+ padding: $spacing-03;
- &:first-child {
- padding-left: 0;
- }
+ &:first-child {
+ padding-left: 0;
+ }
- &.long_content {
- word-wrap: break-word;
+ &.long_content {
+ word-wrap: break-word;
+ }
}
- }
- th {
- text-align: left;
- font-weight: 400;
- color: $dark-grey;
- }
+ th {
+ text-align: left;
+ font-weight: 400;
+ color: $dark-grey;
+ }
- td:last-child {
- width: 50%;
- }
+ td:last-child {
+ width: 50%;
+ }
}
::placeholder {
- font-style: italic;
- color: rgba($dark-grey, 0.5);
+ font-style: italic;
+ color: rgba($dark-grey, 0.5);
}
+
/* Aside */
aside {
- h2 {
- @include typescale-03;
- }
+ h2 {
+ @include typescale-03;
+ }
- h2 {
- @include typescale-04;
- }
+ h2 {
+ @include typescale-04;
+ }
- form {
- margin-bottom: 0;
- }
+ form {
+ margin-bottom: 0;
+ }
}
/* Forms */
form {
- margin-bottom: $spacing-04;
+ margin-bottom: $spacing-04;
- label, p {
- display: block;
- margin: 0 0 $spacing-03 0;
+ label, p {
+ display: block;
+ margin: 0 0 $spacing-03 0;
- small, a {
- color: $dark-grey;
+ small, a {
+ color: $dark-grey;
+ }
}
- }
}
input, select, button, textarea {
- -webkit-appearance: none;
- -moz-appearance: none;
- border-radius: 0;
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ border-radius: 0;
- display: inline-block;
- padding: 0.5em;
- background-color: $white;
- border: 1px solid $warm-black;
- font-size: smaller;
- @include font-sans;
+ display: inline-block;
+ padding: 0.5em;
+ background-color: $white;
+ border: 1px solid $warm-black;
+ font-size: smaller;
+ @include font-sans;
}
textarea {
- resize: vertical;
+ resize: vertical;
}
select {
- padding-right: 30px;
- -webkit-appearance: none;
- -moz-appearance: none;
- appearance: none;
- -webkit-border-radius: 0;
- border-radius: 0;
- background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-chevron-down'%3E%3Cpolyline points='6 9 12 15 18 9'%3E%3C/polyline%3E%3C/svg%3E");
- background-size: 1em;
- background-position: calc(100% - 0.5em) center;
- background-repeat: no-repeat;
+ padding-right: 30px;
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
+ -webkit-border-radius: 0;
+ border-radius: 0;
+ background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-chevron-down'%3E%3Cpolyline points='6 9 12 15 18 9'%3E%3C/polyline%3E%3C/svg%3E");
+ background-size: 1em;
+ background-position: calc(100% - 0.5em) center;
+ background-repeat: no-repeat;
}
/* Custom radio buttons & checkboxes */
input[type="checkbox"],
input[type="radio"] {
- position: absolute;
+ position: absolute;
- opacity: 0;
- width: 0.8em;
- height: 0.8em;
- pointer-events: none;
- //margin-left: -0.8rem;
+ opacity: 0;
+ width: 0.8em;
+ height: 0.8em;
+ pointer-events: none;
+ //margin-left: -0.8rem;
- &:focus + label {
- outline: solid 2px $warm-black;
- outline-offset: 1px;
- }
+ &:focus + label {
+ outline: solid 2px $warm-black;
+ outline-offset: 1px;
+ }
- &:focus:not(:focus-visible){
- outline: none;
- }
+ &:focus:not(:focus-visible) {
+ outline: none;
+ }
- + label {
- margin: 0 0 $spacing-03 0;
- line-height: 1;
- color: $dark-grey;
- font-size: 1rem;
- }
+ + label {
+ margin: 0 0 $spacing-03 0;
+ line-height: 1;
+ color: $dark-grey;
+ font-size: 1rem;
+ }
- + label::before {
- content: '\a0';
- display: inline-block;
- margin: 0 $spacing-02 0 0;
- width: 0.8em;
- height: 0.8em;
- line-height: 0.75em;
- transition: all 0.35s;
- border: 1px solid $warm-black;
- }
+ + label::before {
+ content: '\a0';
+ display: inline-block;
+ margin: 0 $spacing-02 0 0;
+ width: 0.8em;
+ height: 0.8em;
+ line-height: 0.75em;
+ transition: all 0.35s;
+ border: 1px solid $warm-black;
+ }
- &:checked + label {
- color: $sanguine;
+ &:checked + label {
+ color: $sanguine;
- &::before {
- content: '\a0';
- background: $sanguine;
- border: 1px solid $white;
- box-shadow: inset 0 0 0 1px $white, 0 0 0 1px $sanguine;
+ &::before {
+ content: '\a0';
+ background: $sanguine;
+ border: 1px solid $white;
+ box-shadow: inset 0 0 0 1px $white, 0 0 0 1px $sanguine;
+ }
}
- }
}
input[type="radio"] + label {
- display: inline-block;
- margin: 0 $spacing-04 $spacing-03 0;
+ display: inline-block;
+ margin: 0 $spacing-04 $spacing-03 0;
- &::before {
- border-radius: 50%;
- }
+ &::before {
+ border-radius: 50%;
+ }
}
fieldset {
- padding: 0;
- margin: 0 0 $spacing-04 0;
- border: 0;
- min-width: 0;
+ padding: 0;
+ margin: 0 0 $spacing-04 0;
+ border: 0;
+ min-width: 0;
}
/* Feather icons */
.feather {
- height: 1em;
- width: auto;
+ height: 1em;
+ width: auto;
+}
+
+.click-to-copy {
+ cursor: pointer;
+ display: inline-flex;
+ border: none;
+ position: relative;
+ bottom: 0.75em;
+ margin: 0 0 0 .25rem;
+ padding: 0;
+ height: .75rem;
+ align-items: center;
+ gap: .25rem;
+
+ &:hover,
+ &:focus,
+ &:active {
+ background-color: transparent;
+
+ .feather-copy {
+ stroke: $grapefruit;
+ }
+ }
+ &:active {
+ background-color: transparent;
+
+ .feather {
+ stroke: $dark-grey;
+ }
+ }
+
+ .feather-check {
+ stroke: $mid-green;
+ }
+
+ &--confirmation {
+ font-size: 0.75em;
+ font-family: 'Source Sans Pro', sans-serif;
+ font-weight: normal;
+ color: $mid-green;
+ letter-spacing: 0;
+ }
}
+
diff --git a/cms/sass/layout/_page-header.scss b/cms/sass/layout/_page-header.scss
index d9b21d4a4e..1f50fdcdb6 100644
--- a/cms/sass/layout/_page-header.scss
+++ b/cms/sass/layout/_page-header.scss
@@ -1,18 +1,76 @@
/* Page header */
.page-header {
- min-height: 150px;
+ min-height: 150px;
- @media screen and (max-width: 768px) {
- min-height: 100px;
- }
+ @media screen and (max-width: 768px) {
+ min-height: 100px;
+ }
- /* do not underline the links, unless in an alert */
- a:not(.alert a) {
- text-decoration: none;
- }
+ /* do not underline the links, unless in an alert */
+ a:not(.alert a) {
+ text-decoration: none;
+ }
- .feather {
- position: relative;
- }
+ .feather {
+ position: relative;
+ }
}
+
+.above_the_fold--title {
+ margin-bottom: 1rem;
+}
+
+.above_the_fold h2 {
+ margin-top: 0;
+ margin-bottom: 1rem;
+}
+
+.above_the_fold--url {
+ color: #5c5956;
+}
+
+.above_the_fold--issns {
+ font-size: 0.9rem;
+ font-weight: bold;
+ color: $sanguine;
+ margin-top: 0;
+ margin-bottom: 1rem !important;
+}
+
+.button.button--tertiary.see_in_doaj {
+ margin-bottom: 0;
+}
+
+@media (max-width: 1279px) and (min-width: 768px) {
+ .button.button--tertiary.see_in_doaj {
+ margin-top: 1rem;
+ }
+}
+
+@media (min-height: calc((10rem + 105px) * 2.5)) {
+ main:has(> .main-header.fixed) {
+ margin-top: 10rem;
+ @media (max-width: 1279px) and (min-width: 768px) {
+ &:has(.button.button--tertiary.see_in_doaj){
+ margin-top: 13rem;
+ }
+ .button.button--tertiary.see_in_doaj {
+ margin-top: 1rem;
+ }
+ }
+ .button.button--tertiary.see_in_doaj {
+ margin-top: 1rem;
+ }
+
+ .main-header.fixed {
+ position: fixed;
+ top: 75px;
+ left: 75px;
+ z-index: 1000;
+ background-color: white;
+ width: calc(100% - 75px);
+ padding: 25px 30px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/cms/sass/themes/_dashboard.scss b/cms/sass/themes/_dashboard.scss
index 5d68af6374..5e48e54a04 100644
--- a/cms/sass/themes/_dashboard.scss
+++ b/cms/sass/themes/_dashboard.scss
@@ -3,10 +3,6 @@
.dashboard {
font-size: 18px;
- h1 {
- margin-top: 0;
- }
-
> header:first-of-type {
height: 75px;
}
diff --git a/cms/sass/themes/_editorial-form.scss b/cms/sass/themes/_editorial-form.scss
index db3df08500..e6b7108c98 100644
--- a/cms/sass/themes/_editorial-form.scss
+++ b/cms/sass/themes/_editorial-form.scss
@@ -3,7 +3,7 @@
#maned_form,
#ed_form,
#assed_form {
- padding: $spacing-04 0;
+ padding: 2.5rem 0;
background: rgba($light-grey, .5);
details {
diff --git a/doajtest/testbook/new_application_form/associate_editor_form.yml b/doajtest/testbook/new_application_form/associate_editor_form.yml
index f9f9fd4619..30a7868bb6 100644
--- a/doajtest/testbook/new_application_form/associate_editor_form.yml
+++ b/doajtest/testbook/new_application_form/associate_editor_form.yml
@@ -11,6 +11,13 @@ tests:
and click "Review application"
results:
- The associate editor view application form is displayed
+ - At the top the title, url and issn(s) are displayed
+ - Each item in the header has a copy button next to it
+ - step: Click each copy button and
+ - step: Paste the value somewhere (e.g., Notepad)
+ - results:
+ - correct value is copied
+ - The top section stays visible while scrolling, unless the screen is very short and the header takes more than 40% of the viewport
- '"Unlock and Close" is available on the top right'
- A "SAVE" button is available
- Application Status and Subject Classification sections are available
diff --git a/doajtest/testbook/new_application_form/editor_form.yml b/doajtest/testbook/new_application_form/editor_form.yml
index b9db0066f7..239a493f88 100644
--- a/doajtest/testbook/new_application_form/editor_form.yml
+++ b/doajtest/testbook/new_application_form/editor_form.yml
@@ -11,6 +11,13 @@ tests:
and click "Review application"
results:
- The editor view of the application form is displayed
+ - At the top the title, url and issn(s) are displayed
+ - Each item in the header has a copy button next to it
+ - step: Click each copy button and
+ - step: Paste the value somewhere (e.g., Notepad)
+ results:
+ - correct value is copied
+ - The top section stays visible while scrolling, unless the screen is very short and the header takes more than 40% of the viewport
- '"Unlock and Close" is available on the top right'
- The ability to assign to an associate editor is available, and the ability to
change the editor group is disabled
diff --git a/doajtest/testbook/new_application_form/maned_form.yml b/doajtest/testbook/new_application_form/maned_form.yml
index 23483521db..4df88d5da6 100644
--- a/doajtest/testbook/new_application_form/maned_form.yml
+++ b/doajtest/testbook/new_application_form/maned_form.yml
@@ -11,6 +11,13 @@ tests:
and click "Review application"
results:
- The managing editor view application form is displayed
+ - At the top the title, url and issn(s) are displayed
+ - Each item in the header has a copy button next to it
+ - step: Click each copy button and
+ - step: Paste the value somewhere (e.g., Notepad)
+ results:
+ - correct value is copied
+ - The top section stays visible while scrolling, unless the screen is very short and the header takes more than 40% of the viewport
- '"Unlock and Close" is available'
- The Quick Reject feature is available
- The ability to assign to an editor group and associate editor is available
diff --git a/doajtest/testbook/new_application_form/publishers_form.yml b/doajtest/testbook/new_application_form/publishers_form.yml
index 1367eff7ba..acc901ec94 100644
--- a/doajtest/testbook/new_application_form/publishers_form.yml
+++ b/doajtest/testbook/new_application_form/publishers_form.yml
@@ -8,6 +8,9 @@ tests:
role: publisher
steps:
- step: Go to the application form
+ results:
+ - The top section displays only the journal title
+ - There is no fixed/sticky section
- step: Click the question mark next to the questions.
results:
- A pop-up help box appears 'You can click the link in the help box'
diff --git a/portality/constants.py b/portality/constants.py
index a0cd15f521..9b993d231f 100644
--- a/portality/constants.py
+++ b/portality/constants.py
@@ -27,6 +27,7 @@
APPLICATION_TYPE_UPDATE_REQUEST = "update_request"
APPLICATION_TYPE_NEW_APPLICATION = "new_application"
+ES_TYPE_JOURNAL = "journal"
INDEX_RECORD_TYPE_UPDATE_REQUEST_UNFINISHED = "Update Request (in progress)"
INDEX_RECORD_TYPE_UPDATE_REQUEST_FINISHED = "Update Request (finished)"
diff --git a/portality/models/v2/journal.py b/portality/models/v2/journal.py
index 6206c72219..43486b683f 100644
--- a/portality/models/v2/journal.py
+++ b/portality/models/v2/journal.py
@@ -8,6 +8,7 @@
from unidecode import unidecode
+from portality import constants
from portality.core import app
from portality.dao import DomainObject
from portality.lib import es_data_mapping, dates, coerce
@@ -572,7 +573,7 @@ def _generate_index(self):
class Journal(JournalLikeObject):
- __type__ = "journal"
+ __type__ = constants.ES_TYPE_JOURNAL
__SEAMLESS_STRUCT__ = [
shared_structs.JOURNAL_BIBJSON,
diff --git a/portality/static/js/doaj.js b/portality/static/js/doaj.js
index d33ab221c2..844b158b9b 100644
--- a/portality/static/js/doaj.js
+++ b/portality/static/js/doaj.js
@@ -67,6 +67,7 @@ var doaj = {
});
doaj.bindMiniSearch();
+
},
doajUrlShortener : function(query, success_callback, error_callback) {
diff --git a/portality/static/js/util.js b/portality/static/js/util.js
new file mode 100644
index 0000000000..f5c53c19aa
--- /dev/null
+++ b/portality/static/js/util.js
@@ -0,0 +1,51 @@
+$.extend(true, doaj, {
+ util: {
+ clickToCopy: () => {
+ const copyBtn = `
+
+ `;
+
+ const onClick = function (event, $valueElem) {
+ if (!$valueElem.length) return;
+ const textToCopy = $valueElem.val() || $valueElem.text();
+ const $btn = $(event.currentTarget);
+ const $msg = $btn.find('.click-to-copy--confirmation');
+ const $copyIcon = $btn.find('.feather-copy');
+ const $copiedIcon = $btn.find('.feather-check');
+
+ navigator.clipboard.writeText(textToCopy)
+ .then(() => {
+ $btn.addClass('click-to-copy--clicked');
+ $msg.show();
+ $copyIcon.hide();
+ $copiedIcon.show();
+ setTimeout(() => {
+ $btn.removeClass('click-to-copy--clicked');
+ $msg.hide();
+ $copiedIcon.hide();
+ $copyIcon.show();
+ }, 3000);
+ })
+ .catch(err => console.error('Failed to copy:', err));
+ };
+
+ $("[data-widget--click-to-copy]").each(function () {
+ const $element = $(this);
+ const $copyBtn = $(copyBtn);
+ $copyBtn[0].id = $element[0].id + '-copy';
+ $copyBtn.attr('data-copy-target', $element[0].id);
+ $copyBtn.attr('aria-label', `Copy "${$element.val() || $element.text()}" to clipboard`);
+ $copyBtn.data('copyTarget', $element);
+ $element.after($copyBtn);
+ $copyBtn.on("click", (event) => onClick(event, $element));
+ });
+
+ }
+ }
+});
+
+doaj.util.clickToCopy();
\ No newline at end of file
diff --git a/portality/templates-v2/includes/_js_includes.html b/portality/templates-v2/includes/_js_includes.html
index 99a347045a..bcf5f592ad 100644
--- a/portality/templates-v2/includes/_js_includes.html
+++ b/portality/templates-v2/includes/_js_includes.html
@@ -36,6 +36,7 @@
+
diff --git a/portality/templates-v2/management/_application-form/includes/_editorial_form_body.html b/portality/templates-v2/management/_application-form/includes/_editorial_form_body.html
index 809bc7180b..1f033b97d4 100644
--- a/portality/templates-v2/management/_application-form/includes/_editorial_form_body.html
+++ b/portality/templates-v2/management/_application-form/includes/_editorial_form_body.html
@@ -4,7 +4,6 @@
{% if obj and (obj.es_type == 'journal' and obj.is_in_doaj()) %}
{{ _msg.build_journal_withdrawn_deleted_msg(obj) }}
- See this journal in DOAJ
{% endif %}
diff --git a/portality/templates-v2/management/_application-form/includes/_fixed_header.html b/portality/templates-v2/management/_application-form/includes/_fixed_header.html
new file mode 100644
index 0000000000..526d918ee7
--- /dev/null
+++ b/portality/templates-v2/management/_application-form/includes/_fixed_header.html
@@ -0,0 +1,23 @@
+
+
+
{% if obj.es_type == constants.ES_TYPE_JOURNAL %}Journal{% elif obj.application_type == constants.APPLICATION_TYPE_UPDATE_REQUEST %}Update Request{% else %}Application{% endif %}: {{ obj.bibjson().title }}
+
+
+
+ {% if obj.bibjson().pissn %}
+ P: {{ obj.bibjson().pissn }}
+ {% if obj.bibjson().eissn %}
+ /
+ {% endif %}
+ {% endif %}
+ {% if obj.bibjson().eissn %}
+ E: {{ obj.bibjson().eissn }}
+ {% endif %}
+
+
+ {% if obj and (obj.es_type == constants.LOCK_JOURNAL and obj.is_in_doaj()) %}
+
+ {% endif %}
+
diff --git a/portality/templates-v2/management/admin/dashboard.html b/portality/templates-v2/management/admin/dashboard.html
index f26f771444..678d9e4322 100644
--- a/portality/templates-v2/management/admin/dashboard.html
+++ b/portality/templates-v2/management/admin/dashboard.html
@@ -4,8 +4,8 @@
{% block page_title %}Managing Editor Dashboard{% endblock %}
{% block page_header %}
- Hi, {% if current_user.name %}{{ current_user.name }}{% else %}
- {{ current_user.id }}{% endif %}!
+ Hi, {% if current_user.name %}{{ current_user.name }}{% else %}
+ {{ current_user.id }}{% endif %}!
{% endblock %}
{% block admin_content %}
diff --git a/portality/templates-v2/management/admin/maned_application.html b/portality/templates-v2/management/admin/maned_application.html
index 0c7bbe8086..e2320333cd 100644
--- a/portality/templates-v2/management/admin/maned_application.html
+++ b/portality/templates-v2/management/admin/maned_application.html
@@ -9,8 +9,12 @@
{% set notabs = true %}
{% set diff_table = true %}
{% set quick_reject = true %}
+{% set header_style = "fixed" %}
+
+{% block page_header %}
+{% include "management/_application-form/includes/_fixed_header.html" with context %}
+{% endblock %}
-{% block page_title %}{% if obj.application_type == constants.APPLICATION_TYPE_UPDATE_REQUEST %}Update Request{% else %}Application{% endif %}: {{ obj.bibjson().title }}{% endblock %}
{% block body_id %}apply{% endblock %}
{% block admin_content scoped %}
@@ -53,3 +57,10 @@
{% endif %}
{% endblock %}
+
+{% block management_js %}
+{{ super() }}
+
+{% endblock %}
diff --git a/portality/templates-v2/management/admin/maned_journal.html b/portality/templates-v2/management/admin/maned_journal.html
index aeb4063ae3..aeb6846a4f 100644
--- a/portality/templates-v2/management/admin/maned_journal.html
+++ b/portality/templates-v2/management/admin/maned_journal.html
@@ -30,7 +30,10 @@
{% set quick_reject = false %}
{% set withdrawable = true %}
-{% block page_title %}Journal: {{ obj.bibjson().title }}{% endblock %}
+{% set header_style = "fixed" %}
+{% block page_header %}
+{% include "management/_application-form/includes/_fixed_header.html" with context %}
+{% endblock %}
{% block body_id %}apply{% endblock %}
{% block admin_content scoped %}
diff --git a/portality/templates-v2/management/base.html b/portality/templates-v2/management/base.html
index 46da453e3c..9ab90f30c1 100644
--- a/portality/templates-v2/management/base.html
+++ b/portality/templates-v2/management/base.html
@@ -12,9 +12,19 @@
{% endblock %}
{% block base_stylesheets %}
- {% block management_stylesheets %}{% endblock %}
+ {% block management_stylesheets %}
+ {% endblock %}
{% endblock %}
+{% block page_header %}
+ {% if header_style|default('') == "fixed" %}
+ {% include "management/_application-form/includes/_fixed_header.html" with context %}
+ {% else %}
+
+ {{ self.page_title() }}
+
+ {% endif %}
+{% endblock %}
{% block body_class %}dashboard{% endblock %}
{# ~~Dashboard:Template~~ #}
@@ -72,12 +82,10 @@ DOAJ Dashboard
{% block nav %}{% endblock %}
-
-
-
+
+
+
+ {{ self.page_header() }}
+
+
{% include "includes/_flash_notification.html" %}
{% block management_content %}{% endblock %}
diff --git a/portality/templates-v2/management/editor/assed_application.html b/portality/templates-v2/management/editor/assed_application.html
index cb4e69eb20..b11be25812 100644
--- a/portality/templates-v2/management/editor/assed_application.html
+++ b/portality/templates-v2/management/editor/assed_application.html
@@ -10,11 +10,11 @@
{% set diff_table = false %}
{% set quick_reject = false %}
-{% block page_title %}{% if obj.application_type == constants.APPLICATION_TYPE_UPDATE_REQUEST %}Update Request{% else %}Application{% endif %}: {{ obj.bibjson().title }}{% endblock %}
+{% set header_style = "fixed" %}
+
{% block body_id %}apply{% endblock %}
{% block editor_content scoped %}
- {{ obj.bibjson().title }}
{% include "management/_application-form/includes/_editorial_form_body.html" %}
{% endblock %}
diff --git a/portality/templates-v2/management/editor/assed_journal.html b/portality/templates-v2/management/editor/assed_journal.html
index a6ec92f9bf..8b227f6917 100644
--- a/portality/templates-v2/management/editor/assed_journal.html
+++ b/portality/templates-v2/management/editor/assed_journal.html
@@ -13,11 +13,13 @@
{% set quick_reject = false %}
{% set withdrawable = false %}
-{% block page_title %}Journal: {{ obj.bibjson().title }}{% endblock %}
+{% set header_style = "fixed" %}
+{% block page_header %}
+{% include "management/_application-form/includes/_fixed_header.html" with context %}
+{% endblock %}
{% block body_id %}apply{% endblock %}
{% block editor_content scoped %}
- {{ obj.bibjson().title }}
{% include "management/_application-form/includes/_editorial_form_body.html" %}
{% endblock %}
diff --git a/portality/templates-v2/management/editor/editor_application.html b/portality/templates-v2/management/editor/editor_application.html
index 01b1dad841..211d777cfc 100644
--- a/portality/templates-v2/management/editor/editor_application.html
+++ b/portality/templates-v2/management/editor/editor_application.html
@@ -10,11 +10,13 @@
{% set diff_table = false %}
{% set quick_reject = false %}
-{% block page_title %}{% if obj.application_type == constants.APPLICATION_TYPE_UPDATE_REQUEST %}Update Request{% else %}Application{% endif %}: {{ obj.bibjson().title }}{% endblock %}
+{% set header_style = "fixed" %}
+{% block page_header %}
+{% include "management/_application-form/includes/_fixed_header.html" with context %}
+{% endblock %}
{% block body_id %}apply{% endblock %}
{% block editor_content scoped %}
- {{ obj.bibjson().title }}
{% include "management/_application-form/includes/_editorial_form_body.html" %}
{% endblock %}
diff --git a/portality/templates-v2/management/editor/editor_journal.html b/portality/templates-v2/management/editor/editor_journal.html
index 42c03d72df..82eb234a9e 100644
--- a/portality/templates-v2/management/editor/editor_journal.html
+++ b/portality/templates-v2/management/editor/editor_journal.html
@@ -12,11 +12,13 @@
{% set quick_reject = false %}
{% set withdrawable = false %}
-{% block page_title %}Journal: {{ obj.bibjson().title }}{% endblock %}
+{% block page_header %}
+{% include "management/_application-form/includes/_fixed_header.html" with context %}
+{% endblock %}
{% block body_id %}apply{% endblock %}
+{% set header_style = "fixed" %}
{% block editor_content scoped %}
- {{ obj.bibjson().title }}
{% include "management/_application-form/includes/_editorial_form_body.html" %}
{% endblock %}
diff --git a/portality/templates-v2/public/index.html b/portality/templates-v2/public/index.html
index 5ae0404a0e..66772d73a0 100644
--- a/portality/templates-v2/public/index.html
+++ b/portality/templates-v2/public/index.html
@@ -42,7 +42,7 @@ Find open access journals & articles.