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.

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

Fix/UI renaming #875

Merged
merged 2 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions cds_ils/static_pages/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h3>How do I renew my loans for books borrowed from other libraries?</h3>

<h3>I cannot renew a loan. Could you help me?</h3>
<p>For books that are reserved by someone else, a renewal is not possible. Please bring or send back the book to the Library.</p>
<p>You can check if an ebook is available or place a new reservation on the book.</p>
<p>You can check if an e-book is available or place a new reservation on the book.</p>

<h3>I did not find the book/article I needed in the Library catalogue. What can I do?</h3>
<p>Request the document using this <a href="/request">form</a>.</p>
Expand All @@ -39,7 +39,7 @@ <h3>I would like to purchase a book from the Bookshop. How do I proceed?</h3>
<h3>I would need a technical standard. How do I get it?</h3>
<p>Check if the standard is available in the Standards collection, if not <a href="/request">request it</a> (a budget code is required).</p>

<h3>How can I access the Library ebooks? </h3>
<h3>How can I access the Library e-books? </h3>
<p>Look for the book in the catalogue and follow the corresponding link. Ebooks acquired by CERN Library are only available to CERN account holders.</p>

<h3>How can I access the Library online journals and books from home?</h3>
Expand Down
2 changes: 1 addition & 1 deletion cds_ils/static_pages/terms.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<br /><br />
<p>Use of the CERN Library Catalogue service (hereafter "CLC") denotes agreement with the following terms of use:<p>
<ul>
<li>The CLC is provided free of charge. It allows users to find and borrow books, ebooks, series, journals and standards that are maintained and managed by the CERN Library.</li>
<li>The CLC is provided free of charge. It allows users to find and borrow books, e-books, series, journals and standards that are maintained and managed by the CERN Library.</li>
<li>CERN bases the CLC on leading technologies and architectures, operated within the limits of its financial and human resources. It is made available by CERN on an "as is" and "best efforts” basis without any guarantees or service level commitments.</li>
<li>Similarly, all content in the CLC is provided "as is”, without warranty or representation of any kind.</li>
<li>CERN excludes all liability for loss or damage resulting from your access and use of, or inability to access or use, the CLC. In particular, CERN bears no liability in respect of third party links displayed in the CLC or the content behind them.</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
your request for "{{ request.title }}" has been declined because the item that you are looking for is already in the Library catalogue:
<{{ spa_routes.HOST }}{{ spa_routes.PATHS['literature']|format(pid=request.document_pid) }}>

You can either place a request to loan it or read the ebook.
You can either place a request to loan it or read the e-book.

Please let us know if does not suit your needs.
{% endblock %}
Expand All @@ -20,7 +20,7 @@
your request for "{{ request.title }}" has been declined because the item that you are looking for is already in the Library catalogue: <br/>
<a href="{{ spa_routes.HOST }}{{ spa_routes.PATHS['literature']|format(pid=request.document_pid) }}">{{ spa_routes.HOST }}{{ spa_routes.PATHS['literature']|format(pid=request.document_pid) }}</a> <br/><br/>

You can either place a request to loan it or read the ebook. <br/><br/>
You can either place a request to loan it or read the e-book. <br/><br/>

Please let us know if does not suit your needs.<br/>
{% endblock %}
24 changes: 24 additions & 0 deletions ui/src/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
export const config = {
APP: {
LOGO_SRC: null,
HOME_SEARCH_BAR_PLACEHOLDER:
"Search for books, e-books, series, journals and standards.",
STATIC_PAGES: [
{ name: "about", route: "/about", apiURL: "1" },
{ name: "terms", route: "/terms", apiURL: "2" },
Expand Down Expand Up @@ -242,4 +244,26 @@ export const config = {
],
fetchTaskStatusIntervalSecs: 5000,
},
ACQ_ORDERS: {
editorSchema: {
definitions: {
"order-line": {
properties: {
inter_departmental_transaction_id: {
title: "ID of inter-departmental transaction (TID)",
type: "string",
},
},
},
"payment": {
properties: {
internal_purchase_requisition_id: {
title: "Internal purchase requisition ID (DAI)",
type: "string",
},
},
},
},
},
},
};
6 changes: 5 additions & 1 deletion ui/src/overridableMapping.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ import { StandardNumber } from "./overridden/frontsite/Document/DocumentDetails/
import { HomeContent, HomeHeadline } from "./overridden/frontsite/Home/HomeContent";
import { LegacyRecordRoute } from "./overridden/frontsite/Routes/LegacyRoute";
import { Slogan } from "./overridden/frontsite/Home/Slogan";
import { SideBarMenuItem } from "./overridden/backoffice/Sidebar/SideBarMenuItem";
import {
SideBarMenuItem,
SideBarCatalogueItem,
} from "./overridden/backoffice/Sidebar/SideBarMenuItem";
import { ImporterRoute } from "./overridden/routes/ImporterRoute";
import { overriddenSearchAppCmps } from "./overridden/frontsite/LiteratureSearch/LiteratureSearch";
import { StandardCardView } from "./overridden/frontsite/DocumentSearch/StandardCardView";
Expand Down Expand Up @@ -49,6 +52,7 @@ export const overriddenCmps = {
"LiteratureSearch": overriddenSearchAppCmps,
"BackOfficeRoutesSwitch.CustomRoute": ImporterRoute,
"Backoffice.Sidebar.CustomMenuItem": SideBarMenuItem,
"Backoffice.Sidebar.Menu.Catalogue": SideBarCatalogueItem,
"LiteratureKeywords.layout": LiteratureKeyword,
"DocumentMetadataTabs.Identifiers": Identifiers,
"DocumentConference.layout": DocumentConference,
Expand Down
40 changes: 40 additions & 0 deletions ui/src/overridden/backoffice/Sidebar/SideBarMenuItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Menu } from "semantic-ui-react";
import { CdsBackOfficeRoutes } from "../../routes/BackofficeUrls";
import PropTypes from "prop-types";
import { Link } from "react-router-dom";
import { BackOfficeRoutes } from "@inveniosoftware/react-invenio-app-ils";

export class SideBarMenuItem extends React.Component {
render() {
Expand All @@ -29,3 +30,42 @@ export class SideBarMenuItem extends React.Component {
SideBarMenuItem.propTypes = {
activePath: PropTypes.string.isRequired,
};

export class SideBarCatalogueItem extends React.Component {
render() {
const { activePath } = this.props;

const documentsActive = activePath.includes(BackOfficeRoutes.documentsList);
const seriesActive = activePath.includes(BackOfficeRoutes.seriesList);
const itemsActive = activePath.includes(BackOfficeRoutes.itemsList);
const eitemsActive = activePath.includes(BackOfficeRoutes.eitemsList);

return (
<Menu.Item>
<Menu.Header>Catalogue</Menu.Header>
<Menu.Menu>
<Menu.Item
as={Link}
active={documentsActive}
to={BackOfficeRoutes.documentsList}
>
Books / Articles
</Menu.Item>
<Menu.Item as={Link} active={seriesActive} to={BackOfficeRoutes.seriesList}>
Series / Multiparts
</Menu.Item>
<Menu.Item as={Link} active={itemsActive} to={BackOfficeRoutes.itemsList}>
Physical Copies
</Menu.Item>
<Menu.Item as={Link} active={eitemsActive} to={BackOfficeRoutes.eitemsList}>
E-Items
</Menu.Item>
</Menu.Menu>
</Menu.Item>
);
}
}

SideBarCatalogueItem.propTypes = {
activePath: PropTypes.string.isRequired,
};
Loading