Skip to content

Commit

Permalink
Merge branch 'develop' into feature/3570_incorrect_issns
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven-Eardley committed Aug 28, 2023
2 parents 7626ffe + 7b979fc commit 12f72e7
Show file tree
Hide file tree
Showing 65 changed files with 4,284 additions and 338 deletions.
4 changes: 4 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ Instructions for reviewers:
- [ ] Developer
- [ ] Reviewer

- Urls are constructed with `url_for` not hard-coded
- [ ] N/A
- [ ] Developer
- [ ] Reviewer
### Testing

- Unit tests have been added/modified
Expand Down
19 changes: 19 additions & 0 deletions cms/assets/img/sponsors/IUCN.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/sponsors/nerac.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms/assets/img/tours/dashboard-ed-assed/card.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions cms/data/sponsors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ bronze:
url: https://www.iop.org/
logo: iop.jpg

- name: International Union for Conservation of Nature
url: https://iucn.org/
logo: IUCN.svg

- name: JMIR Publications
url: https://jmirpublications.com/
logo: jmir.svg
Expand All @@ -106,6 +110,10 @@ bronze:
url: https://www.keaipublishing.com/
logo: keai.svg

- name: NERAC Inc.
url: https://www.nerac.com/
logo: nerac.jpg

- name: OASPA
url: https://oaspa.org/
logo: oaspa.png
Expand Down
6 changes: 4 additions & 2 deletions cms/pages/about/at-20.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ featuremap: ~~At20:Fragment~~

We are celebrating 20 years of being an important part of open infrastructure with a year-long campaign throughout 2023, and we want to invite you to be a part of our celebrations!

We are holding three events for our community around the themes: ['Open', 'Global', and 'Trusted'](https://drive.google.com/file/d/1tw0d_Ztl09AQS_6L-VP1CqR3jtZ1iw5h/view?usp=sharing). Details about these events and how you can join them will be available on this page. We will also share interviews with key individuals who have shaped DOAJ into what it is today.
We are holding three events for our community around the themes: ['Open', 'Global', and 'Trusted'](https://drive.google.com/file/d/1tw0d_Ztl09AQS_6L-VP1CqR3jtZ1iw5h/view?usp=sharing). Full details about these events and how you can join them are available on this page.

Further down the page is a historical timeline to give you a full overview of DOAJ’s important milestones from 2003 to today.
Below is a historical timeline providing an overview of DOAJ’s important milestones from 2003 to today.

There is also an opportunity for you to [support DOAJ during its 20th year](/at-20/#support-our-anniversary-campaign) via Paypal.

---

Expand Down
12 changes: 12 additions & 0 deletions cms/tours/dashboard_ed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
steps:
- selector: '#group-tab'
title: Your group activity
content: This panel allows you to see how many applications your group has and their status, and which Associates need more applications.

- selector: '#group-tab ul.progress-bar'
title: Progress bar
content: Click any coloured block to open the list of applications.

- selector: "#feature_tour_nav"
title: Want to see the tour again?
content: Take the tour again by selecting it from the Feature Tours menu.
48 changes: 48 additions & 0 deletions cms/tours/dashboard_ed_assed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
steps:
- selector: header h1
title: Welcome to your dashboard!
content: Your dashboard is the starting point for your work and shows you a prioritised list of the applications that you have to work on.

- selector: "nav.vertical-nav a[href='/editor/']"
title: Navigation
content: Use the buttons here on the left to navigate around.

- selector: nav dl
title: Your groups
content: The groups that you are a member of and the email address of your Editor or Managing Editor are shown here.

- selector: "#notifications_nav"
title: Notifications
content: Notifications that you receive by email can also be found here. Click 'See all notifications' to find old notifications.

- selector: "header h1"
title: Your prioritised list
content: Each application is shown as a "card". The cards are arranged in date and priority order, from left to right.
They are also categorised by colour. Click a card to open the application so you can start your work.

- selector: "header h1"
title: "Each card contains:"
content: |
<div>
<div><img src="/assets/img/tours/dashboard-ed-assed/card.png" alt="Dashboard card screenshot"></div>
<div><ol>
<li>The date the application was submitted.</li>
<li>The application's status.</li>
<li>What you need to do with the application.</li>
<li>The journal's title.</li>
<li>Which group the application is assigned to.</li>
<li>To who the application is assigned.</li>
</ol></div>
</div>
- selector: "#logout"
title: Log out
content: "You can now log out or update your account from the bottom of your dashboard."

- selector: "#doaj_home"
title: "DOAJ Home"
content: "To get back to the main DOAJ website, click 'DOAJ HOME' in the top right corner"

- selector: "#feature_tour_nav"
title: Want to see the tour again?
content: Take the tour again by selecting it from the Feature Tours menu.
4 changes: 4 additions & 0 deletions doajtest/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,10 @@ def tearDown(self):
pass # could be removed by other thread / process
shutil.rmtree(paths.rel2abs(__file__, "..", "tmp"), ignore_errors=True)

self.reset_db_record()

@staticmethod
def reset_db_record():
global CREATED_INDICES
if len(CREATED_INDICES) > 0:
dao.DomainObject.destroy_index()
Expand Down
4 changes: 4 additions & 0 deletions doajtest/matrices/bll_todo_assed/top_todo_assed.matrix.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
test_id,account,raises,todo_associate_follow_up_old,todo_associate_progress_stalled,todo_associate_start_pending,todo_associate_all_applications,todo_associate_follow_up_old_order,todo_associate_progress_stalled_order,todo_associate_start_pending_order,todo_associate_all_applications_order
1,none,ArgumentException,0,0,0,0,,,,
2,no_role,,0,0,0,0,,,,
3,assed,,1,1,1,4,1,2,3,4
26 changes: 26 additions & 0 deletions doajtest/matrices/bll_todo_assed/top_todo_assed.settings.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
field,test_id,account,raises,todo_associate_follow_up_old,todo_associate_progress_stalled,todo_associate_start_pending,todo_associate_all_applications,todo_associate_follow_up_old_order,todo_associate_progress_stalled_order,todo_associate_start_pending_order,todo_associate_all_applications_order
type,index,generated,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional
default,,,,,,,,,,,
,,,,,,,,,,,
values,,none,ArgumentException,,,,,,,,
values,,no_role,,,,,,,,,
values,,assed,,,,,,,,,
,,,,,,,,,,,
conditional raises,,none,ArgumentException,,,,,,,,
,,,,,,,,,,,
conditional todo_associate_follow_up_old,,assed,,1,,,,,,,
conditional todo_associate_follow_up_old,,!assed,,0,,,,,,,
,,,,,,,,,,,
conditional todo_associate_progress_stalled,,assed,,,1,,,,,,
conditional todo_associate_progress_stalled,,!assed,,,0,,,,,,
,,,,,,,,,,,
conditional todo_associate_start_pending,,assed,,,,1,,,,,
conditional todo_associate_start_pending,,!assed,,,,0,,,,,
,,,,,,,,,,,
conditional todo_associate_all_applications,,assed,,,,,4,,,,
conditional todo_associate_all_applications,,!assed,,,,,0,,,,
,,,,,,,,,,,
conditional todo_associate_follow_up_old_order,,assed,,,,,,1,,,
conditional todo_associate_progress_stalled_order,,assed,,,,,,,2,,
conditional todo_associate_start_pending_order,,assed,,,,,,,,3,
conditional todo_associate_all_applications_order,,assed,,,,,,,,,4
223 changes: 223 additions & 0 deletions doajtest/matrices/bll_todo_assed/top_todo_assed.settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
{
"parameters": [
{
"name": "test_id",
"type": "index"
},
{
"name": "account",
"type": "generated",
"values": {
"none": {},
"no_role": {},
"assed": {}
}
},
{
"name": "raises",
"type": "conditional",
"default": "",
"values": {
"ArgumentException": {
"conditions": [
{
"account": {
"or": [
"none"
]
}
}
]
}
}
},
{
"name": "todo_associate_follow_up_old",
"type": "conditional",
"default": "",
"values": {
"1": {
"conditions": [
{
"account": {
"or": [
"assed"
]
}
}
]
},
"0": {
"conditions": [
{
"account": {
"nor": [
"assed"
]
}
}
]
}
}
},
{
"name": "todo_associate_progress_stalled",
"type": "conditional",
"default": "",
"values": {
"1": {
"conditions": [
{
"account": {
"or": [
"assed"
]
}
}
]
},
"0": {
"conditions": [
{
"account": {
"nor": [
"assed"
]
}
}
]
}
}
},
{
"name": "todo_associate_start_pending",
"type": "conditional",
"default": "",
"values": {
"1": {
"conditions": [
{
"account": {
"or": [
"assed"
]
}
}
]
},
"0": {
"conditions": [
{
"account": {
"nor": [
"assed"
]
}
}
]
}
}
},
{
"name": "todo_associate_all_applications",
"type": "conditional",
"default": "",
"values": {
"4": {
"conditions": [
{
"account": {
"or": [
"assed"
]
}
}
]
},
"0": {
"conditions": [
{
"account": {
"nor": [
"assed"
]
}
}
]
}
}
},
{
"name": "todo_associate_follow_up_old_order",
"type": "conditional",
"default": "",
"values": {
"1": {
"conditions": [
{
"account": {
"or": [
"assed"
]
}
}
]
}
}
},
{
"name": "todo_associate_progress_stalled_order",
"type": "conditional",
"default": "",
"values": {
"2": {
"conditions": [
{
"account": {
"or": [
"assed"
]
}
}
]
}
}
},
{
"name": "todo_associate_start_pending_order",
"type": "conditional",
"default": "",
"values": {
"3": {
"conditions": [
{
"account": {
"or": [
"assed"
]
}
}
]
}
}
},
{
"name": "todo_associate_all_applications_order",
"type": "conditional",
"default": "",
"values": {
"4": {
"conditions": [
{
"account": {
"or": [
"assed"
]
}
}
]
}
}
}
]
}
Loading

0 comments on commit 12f72e7

Please sign in to comment.