diff --git a/.gitignore b/.gitignore index 7d065aca061..1c049515fa5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ +# Ignore Greg's Agent Framework local settings and agents. +# This is a symbolic link to the actual directory, +# which is located outside of the repository. +.agents + /.angular/cache /__build__ /__server_build__ @@ -18,6 +23,7 @@ npm-debug.log *.ngfactory.ts *.css.shim.ts *.scss.shim.ts +*.backup .DS_Store @@ -29,7 +35,7 @@ morgan.log yarn-error.log -*.css +#*.css package-lock.json @@ -41,3 +47,6 @@ package-lock.json junit.xml /src/mirador-viewer/config.local.js + +config/config.development.yaml + diff --git a/angular.json b/angular.json index 5e597d4d307..2d5a508d5e5 100644 --- a/angular.json +++ b/angular.json @@ -41,7 +41,8 @@ "aot": true, "assets": [ "src/assets", - "src/robots.txt" + "src/robots.txt", + "src/clockss.txt" ], "styles": [ "src/styles/startup.scss", diff --git a/config/config.example.yml b/config/config.example.yml index ea38303fa36..a09a46b865b 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -75,7 +75,7 @@ cache: anonymousCache: # Maximum number of pages to cache. Default is zero (0) which means anonymous user cache is disabled. # As all pages are cached in server memory, increasing this value will increase memory needs. - # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory. + # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory. max: 0 # Amount of time after which cached pages are considered stale (in ms). After becoming stale, the cached # copy is automatically refreshed on the next request. @@ -100,6 +100,11 @@ auth: # If the rest token expires in less than this amount of time, it will be refreshed automatically. # This is independent from the idle warning. timeLeftBeforeTokenRefresh: 120000 # 2 minutes + # When true, show only the username/password login form and hide all non-password authentication methods. + # Set to true only in environments where password login should be the only login option (e.g. demo). + # Default: false (non-password authentication methods such as OIDC/LDAP/X509 remain available, password form hidden). + # Can also be set via environment variable: DSPACE_AUTH_SHOWPASSWORDLOGIN=true + # showPasswordLogin: false # Form settings form: @@ -246,12 +251,15 @@ browseBy: # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items) defaultLowerLimit: 1900 # If true, thumbnail images for items will be added to BOTH search and browse result lists. - showThumbnails: true + showThumbnails: false # The number of entries in a paginated browse results list. # Rounded to the nearest size in the list of selectable sizes on the # settings menu. pageSize: 20 + # Show the Altmetric badge in the simple item page. + showAltmetricBadge: true + communityList: # No. of communities to list per expansion (show more) pageSize: 20 @@ -376,7 +384,7 @@ vocabularies: vocabulary: 'srsc' enabled: true -# Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query. +# Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query. comcolSelectionSort: sortField: 'dc.title' - sortDirection: 'ASC' \ No newline at end of file + sortDirection: 'ASC' diff --git a/config/config.yml b/config/config.yml index b5eecd112f0..7e6f41a1c7c 100644 --- a/config/config.yml +++ b/config/config.yml @@ -1,5 +1,9 @@ +ui: + host: 0.0.0.0 rest: ssl: true - host: api7.dspace.org + host: backend.production.deepblue-documents.lib.umich.edu port: 443 nameSpace: /server +item: + showAltmetricBadge: true diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml index e5f62600e70..6e2a62d0181 100644 --- a/docker/docker-compose-rest.yml +++ b/docker/docker-compose-rest.yml @@ -70,6 +70,7 @@ services: environment: PGDATA: /pgdata image: dspace/dspace-postgres-pgcrypto + platform: linux/amd64 networks: dspacenet: ports: diff --git a/server.ts b/server.ts index 23327c2058e..43958213260 100644 --- a/server.ts +++ b/server.ts @@ -69,6 +69,16 @@ const cookieParser = require('cookie-parser'); const appConfig: AppConfig = buildAppConfig(join(DIST_FOLDER, 'assets/config.json')); +// List of paths for SSR; you can use regex for more flexibility if needed +const ssrPaths = [ + '/documents', + '/items/', + '/collections/', + '/communities/', + '/bitstream/', + '/bitstreams/' +]; + // cache of SSR pages for known bots, only enabled in production mode let botCache: LRU; @@ -78,6 +88,15 @@ let anonymousCache: LRU; // extend environment with app config for server extendEnvironmentWithAppConfig(environment, appConfig); + +// Helper function to extract client IP +function getClientIp(req) { + // Extracting IP from X-Forwarded-For if available + const xForwardedFor = req.headers['x-forwarded-for']; + return xForwardedFor ? xForwardedFor.split(',')[0] : req.connection.remoteAddress; +} + + // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -90,7 +109,9 @@ export function app() { // Tell Express to trust X-FORWARDED-* headers from proxies // See https://expressjs.com/en/guide/behind-proxies.html - server.set('trust proxy', environment.ui.useProxies); + // server.set('trust proxy', environment.ui.useProxies); +server.set('trust proxy', true); + /* * If production mode is enabled in the environment file: @@ -130,6 +151,7 @@ export function app() { server.engine('html', (_, options, callback) => ngExpressEngine({ bootstrap: ServerAppModule, + inlineCriticalCss: false, providers: [ { provide: REQUEST, @@ -159,12 +181,26 @@ export function app() { * Serve the robots.txt ejs template, filling in the origin variable */ server.get('/robots.txt', (req, res) => { + const clientIp = getClientIp(req); + console.log(`Client IP: ${clientIp}`); + res.setHeader('content-type', 'text/plain'); res.render('assets/robots.txt.ejs', { 'origin': req.protocol + '://' + req.headers.host }); }); + server.get('/clockss.txt', (req, res) => { + const clientIp = getClientIp(req); + console.log(`Client IP: ${clientIp}`); + + res.setHeader('content-type', 'text/plain'); + res.render('assets/clockss.txt.ejs', { + 'origin': req.protocol + '://' + req.headers.host + }); + }); + + /* * Set views folder path to directory where template files are stored */ @@ -227,25 +263,84 @@ export function app() { */ router.get('*', cacheCheck, ngApp); + server.use(environment.ui.nameSpace, router); +server.set('trust proxy', true); + return server; } +// Check if the request URL starts with any of the SSR paths +function shouldUseSSR(url) { + // First, check for the browse exclusion patterns + const browseBlacklistRegexes = [ + /^\/communities\/[a-f0-9-]{36}\/browse(\/.*)?$/i, + /^\/collections\/[a-f0-9-]{36}\/browse(\/.*)?$/i, + ]; + + // If the URL contains 'handle' anywhere, return false + if (/\/handle(\/|$)/i.test(url)) { + return false; + } + + // If the URL contains '/2027.42' anywhere, return false + if (/\/2027\.42(\/|$)/i.test(url)) { + return false; + } + + // If the url matches any exclusion, do NOT use SSR + if (browseBlacklistRegexes.some(regex => regex.test(url))) { + return false; + } + + // Otherwise + return ssrPaths.some(path => url.startsWith(path)); +} + + /* * The callback function to serve server side angular */ function ngApp(req, res) { - if (environment.universal.preboot) { - // Render the page to user via SSR (server side rendering) + + console.log('SSR: Original Request= ' + req.url); + + // If URL contains '/assets/', redirect to Deep Blue Repositories + if (req.url.includes('/assets/')) { + res.writeHead(404, { + 'Location': 'https://www.lib.umich.edu/collections/deep-blue-repositories' + }); + res.end(); + return; // Exit after redirecting + + } + + if ( + req.url.includes('/discover') || + req.url.includes('/Mirage2') || + req.url.includes('/feed/') || + req.url.includes('/search-filter') + ) { + res.writeHead(404, { + 'Location': 'https://www.lib.umich.edu/collections/deep-blue-repositories' + }); + res.end(); + return; // Exit after redirecting + } + + if (environment.universal.preboot && req.method === 'GET' && shouldUseSSR(req.url)) { + // Only run SSR for matching paths + console.log('SSR: Using SSR= ' + req.url); serverSideRender(req, res); } else { - // If preboot is disabled, just serve the client - console.log('Universal off, serving for direct client-side rendering (CSR)'); + // For all other paths, serve CSR + console.log('SSR:Universal off or path excluded. Serving direct client-side rendering (CSR)' + req.url); clientSideRender(req, res); } } + /** * Render page content on server side using Angular SSR. By default this page content is * returned to the user. @@ -255,6 +350,22 @@ function ngApp(req, res) { * If false, then only save this rendered content to the in-memory cache (to refresh cache). */ function serverSideRender(req, res, sendToUser: boolean = true) { + + + // Check if 'X-Forwarded-For' is set; if not, set it to the request's IP address. +const xForwardedForHeader = req.headers['x-forwarded-for']; + +console.log("xForwardedForHeader=" + xForwardedForHeader); + +if (!xForwardedForHeader) { + // Consider appending instead if chaining proxies + console.log("req.ip=" + req.ip); + + // Example of appending to support proxy chains: + req.headers['x-forwarded-for'] = req.ip; +} + + // Render the page via SSR (server side rendering) res.render(indexHtml, { req, @@ -535,7 +646,7 @@ function createHttpsServer(keys) { function run() { const port = environment.ui.port || 4000; - const host = environment.ui.host || '/'; + const host = '0.0.0.0'; // Start up the Node server const server = app(); diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html index e3a8e2c590f..255cbac0d61 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.html +++ b/src/app/access-control/epeople-registry/epeople-registry.component.html @@ -5,7 +5,7 @@
- diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts index 62fbb3ee3df..426df9b6309 100644 --- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts +++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts @@ -4,6 +4,8 @@ import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-c import { Collection } from '../../core/shared/collection.model'; import { getCollectionPageRoute } from '../collection-page-routing-paths'; +import { HttpClient} from '@angular/common/http'; + /** * Component that represents the page where a user can edit an existing Collection */ @@ -15,10 +17,11 @@ export class EditCollectionPageComponent extends EditComColPageComponent -

{{ 'communityList.title' | translate }}

+

{{ 'communityList.title' | translate }}

diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts index 99e9dbeb0de..7ff1082ef3f 100644 --- a/src/app/community-list-page/community-list-service.ts +++ b/src/app/community-list-page/community-list-service.ts @@ -96,6 +96,7 @@ export class CommunityListService { private collectionDataService: CollectionDataService, private store: Store ) { + // This is where the 20 communities listed on the community/collection page comes from. this.pageSize = appConfig.communityList.pageSize; } diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.ts b/src/app/community-page/edit-community-page/edit-community-page.component.ts index 54a6ee49442..20e11286309 100644 --- a/src/app/community-page/edit-community-page/edit-community-page.component.ts +++ b/src/app/community-page/edit-community-page/edit-community-page.component.ts @@ -4,6 +4,8 @@ import { ActivatedRoute, Router } from '@angular/router'; import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component'; import { getCommunityPageRoute } from '../community-page-routing-paths'; +import { HttpClient} from '@angular/common/http'; + /** * Component that represents the page where a user can edit an existing Community */ @@ -15,10 +17,11 @@ export class EditCommunityPageComponent extends EditComColPageComponent typeof type === 'string') + .find((type: string) => Object.keys(this.factories).includes(type)) as string; + + let name; + if (hasValue(match)) { + name = this.factories[match](dso); + } + if (isEmpty(name)) { + name = this.factories.Default(dso); + } + + if ( name.endsWith(".pdf") ) + { + return "PDF file"; + } + else if ( (name.endsWith(".txt") ) || (name.endsWith(".asc") ) ) + { + return "TXT file"; + } + else if ( (name.endsWith(".doc") ) || (name.endsWith(".docx") ) ) + { + return "MS Word file"; + } + else if ( (name.endsWith(".pptx") ) || (name.endsWith(".ppt") ) ) + { + return "MS Powerpoint file"; + } + else if ( (name.endsWith(".xlsx") ) || (name.endsWith(".xls") ) ) + { + return "MS Excel file"; + } + else if ( (name.endsWith(".jpeg") ) || (name.endsWith(".jpg") ) ) + { + return "JPEG file"; + } + else if ( (name.endsWith(".tiff") ) || (name.endsWith(".tif") ) ) + { + return "TIFF file"; + } + else if ( (name.endsWith(".gif") ) || (name.endsWith(".png") ) || (name.endsWith(".jp2") ) || (name.endsWith(".pcd") ) ) + { + return "Image file"; + } + else if ( (name.endsWith(".mov") ) || (name.endsWith(".qt") ) ) + { + return "Video file"; + } + else if ( name.endsWith(".zip") ) + { + return "Zip file"; + } + else if ( (name.endsWith(".htm") ) || (name.endsWith(".html") ) ) + { + return "HTML file";; + } + else if ( (name.endsWith(".wav") ) || (name.endsWith(".aiff") ) || + (name.endsWith(".aif") ) || (name.endsWith(".au") ) || + (name.endsWith(".aifc") ) || (name.endsWith(".snd") ) || + (name.endsWith(".ra") ) || (name.endsWith(".ram") ) || + (name.endsWith(".mpa") ) || (name.endsWith(".abs") ) || + (name.endsWith(".mpga") ) || (name.endsWith(".mp3") ) || + (name.endsWith(".ma4") ) ) + { + return "Audio file"; + } + else + { + return "Unidentified file format"; + } + } else { + return ''; + } + } + /** * Gets the Hit highlight * diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index dbca773375a..067227cb430 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -86,6 +86,7 @@ import { ItemType } from './shared/item-relationships/item-type.model'; import { RelationshipType } from './shared/item-relationships/relationship-type.model'; import { Relationship } from './shared/item-relationships/relationship.model'; import { Item } from './shared/item.model'; + import { License } from './shared/license.model'; import { ResourcePolicy } from './resource-policy/models/resource-policy.model'; import { SearchConfigurationService } from './shared/search/search-configuration.service'; @@ -318,6 +319,7 @@ export const models = Bitstream, BitstreamFormat, Item, + ItemRequest, Site, Collection, Community, diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts index 89178f8dd21..45dfb8a68de 100644 --- a/src/app/core/data/bitstream-data.service.spec.ts +++ b/src/app/core/data/bitstream-data.service.spec.ts @@ -49,7 +49,7 @@ describe('BitstreamDataService', () => { id: '2', shortDescription: 'PNG', description: 'Portable Network Graphics', - supportLevel: BitstreamFormatSupportLevel.Known + supportLevel: BitstreamFormatSupportLevel.AS_IS_KNOWN }); const url = 'fake-bitstream-url'; diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts index c3fa84dd6c8..f81cffe77ad 100644 --- a/src/app/core/data/item-data.service.ts +++ b/src/app/core/data/item-data.service.ts @@ -149,10 +149,12 @@ export abstract class BaseItemDataService extends IdentifiableDataService * @param item * @param withdrawn */ - public setWithDrawn(item: Item, withdrawn: boolean): Observable> { + +////// + public setWithDrawn(item: Item, withdrawn: boolean, reason: string): Observable> { const patchOperation = { - op: 'replace', path: '/withdrawn', value: withdrawn + op: 'replace', path: '/withdrawn', value: withdrawn, reason: reason } as Operation; this.requestService.removeByHrefSubstring('/discover'); diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts index 2e2e59fa6b8..6b9da58493e 100644 --- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts +++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts @@ -18,6 +18,19 @@ export class ForwardClientIpInterceptor implements HttpInterceptor { */ intercept(httpRequest: HttpRequest, next: HttpHandler): Observable> { const clientIp = this.req.get('x-forwarded-for') || this.req.connection.remoteAddress; - return next.handle(httpRequest.clone({ setHeaders: { 'X-Forwarded-For': clientIp } })); +// return next.handle(httpRequest.clone({ setHeaders: { 'X-Forwarded-For': clientIp } })); + +// This came from here: https://github.com/DSpace/dspace-angular/issues/2902 +// UM Change. I was having issues getting the referer, aske Tim about it and +// he pointed me to this. This is not solve the issue, but seems like it would +// be good to have anyway + const headers = { 'X-Forwarded-For': clientIp }; + // if the request has a user-agent retain it + const userAgent = this.req.get('user-agent'); + if (userAgent) { + headers['User-Agent'] = userAgent; + } + + return next.handle(httpRequest.clone({ setHeaders: headers })); } } diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts index 204c925e6bb..ceea18e4a1a 100644 --- a/src/app/core/metadata/metadata.service.ts +++ b/src/app/core/metadata/metadata.service.ts @@ -167,6 +167,8 @@ export class MetadataService { this.setCitationDissertationNameTag(); } + this.setRightsTag(); + // this.setCitationJournalTitleTag(); // this.setCitationVolumeTag(); // this.setCitationIssueTag(); @@ -210,6 +212,28 @@ export class MetadataService { this.addMetaTag('citation_title', value); } + private setRightsTag(): void { + const value = this.getMetaTagValue('dc.rights.robot'); + + let rights: string + if ( value === undefined ) + { + rights = "index,nofollow"; + } + else + { + if ( value === "IndexNoFollow" ) + { + rights = "index,nofollow"; + } + if ( value === "NoIndexNoFollow" ) + { + rights = "noindex,nofollow"; + } + } + this.addMetaTag('rights', rights); + } + /** * Add to the */ diff --git a/src/app/core/reload/reload.guard.ts b/src/app/core/reload/reload.guard.ts index 1e99a5687a3..9566aa9ab0d 100644 --- a/src/app/core/reload/reload.guard.ts +++ b/src/app/core/reload/reload.guard.ts @@ -27,7 +27,7 @@ export class ReloadGuard implements CanActivate { : route.queryParams.redirect; return this.router.parseUrl(url); } else { - return this.router.createUrlTree(['home']); + return this.router.createUrlTree(['documents']); } } } diff --git a/src/app/core/shared/bitstream-format-support-level.ts b/src/app/core/shared/bitstream-format-support-level.ts index d92aac77083..c687fc55c58 100644 --- a/src/app/core/shared/bitstream-format-support-level.ts +++ b/src/app/core/shared/bitstream-format-support-level.ts @@ -1,5 +1,6 @@ export enum BitstreamFormatSupportLevel { - Known = 'KNOWN', - Unknown = 'UNKNOWN', - Supported = 'SUPPORTED' + AS_IS_UNKNOWN = 'AS_IS_UNKNOWN', + LIMITED = 'LIMITED', + HIGHEST_LEVEL = 'HIGHEST_LEVEL', + AS_IS_KNOWN = 'AS_IS_KNOWN' } diff --git a/src/app/core/shared/bitstream.model.ts b/src/app/core/shared/bitstream.model.ts index c855325d2d6..fe3256d64e3 100644 --- a/src/app/core/shared/bitstream.model.ts +++ b/src/app/core/shared/bitstream.model.ts @@ -22,6 +22,14 @@ export class Bitstream extends DSpaceObject implements ChildHALResource { @autoserialize sizeBytes: number; + // UM Change - For hidden file + @autoserialize + formatId: number; + + @autoserialize + sequenceId: number; + // End UM Change + /** * The description of this Bitstream */ diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts index 20fc275ee28..38ee1d01e15 100644 --- a/src/app/core/shared/item.model.ts +++ b/src/app/core/shared/item.model.ts @@ -117,6 +117,19 @@ export class Item extends DSpaceObject implements ChildHALResource, HandleObject @link(BITSTREAM, false, 'thumbnail') thumbnail?: Observable>; + get withdrawReason(): string { + let reason : string; + reason = this.firstMetadataValue('dc.description.withdrawalreason'); + if ( reason ) + { + return reason; + } + else + { + return ''; + } + } + /** * The access status for this Item * Will be undefined unless the access status {@link HALLink} has been resolved. diff --git a/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts b/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts index 177473b7d58..5a1ec912aa2 100644 --- a/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts +++ b/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts @@ -29,6 +29,20 @@ export class WorkspaceitemSectionUploadFileObject { value: string; }; + /** not sure this is needed UM */ + /** + * The file format information + */ + format: { + shortDescription: string, + description: string, + mimetype: string, + supportLevel: string, + internal: boolean, + type: string + }; + + /** * The file url */ diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html index 24c3dc5cd7a..3ac8b83f67f 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -1,6 +1,6 @@
-
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts index e20683e6e3c..b27e1391cb6 100644 --- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts +++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts @@ -81,7 +81,7 @@ export class ForgotPasswordFormComponent { this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.content') ); this.store.dispatch(new AuthenticateAction(this.email, this.password)); - this.router.navigate(['/home']); + this.router.navigate(['/documents']); } else { this.notificationsService.error( this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.error.title'), response.errorMessage diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 4d879835235..cea4d701987 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -1,7 +1,7 @@
- + diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 366b4f5e7a1..59831483db9 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -3,6 +3,8 @@ import { Observable } from 'rxjs'; import { MenuService } from '../shared/menu/menu.service'; import { MenuID } from '../shared/menu/menu-id.model'; +import { Router } from '@angular/router'; + /** * Represents the header with the logo and simple navigation */ @@ -11,6 +13,7 @@ import { MenuID } from '../shared/menu/menu-id.model'; styleUrls: ['header.component.scss'], templateUrl: 'header.component.html', }) + export class HeaderComponent { /** * Whether user is authenticated. @@ -21,7 +24,8 @@ export class HeaderComponent { menuID = MenuID.PUBLIC; constructor( - private menuService: MenuService + public router: Router, + protected menuService: MenuService ) { } diff --git a/src/app/header/universalheader.component.ts b/src/app/header/universalheader.component.ts new file mode 100644 index 00000000000..acdadbe8bc8 --- /dev/null +++ b/src/app/header/universalheader.component.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; +import { Observable } from 'rxjs'; + + +/** + * Represents the header with the logo and simple navigation + */ +@Component({ + selector: 'ds-universal-header', + styleUrls: [], + template: '

jose

', +}) +export class UniversalHeaderComponent { + + + +} diff --git a/src/app/home-page/home-news/home-news.component.html b/src/app/home-page/home-news/home-news.component.html index 6bee3cd76f0..c00a63e9f1e 100644 --- a/src/app/home-page/home-news/home-news.component.html +++ b/src/app/home-page/home-news/home-news.component.html @@ -2,8 +2,9 @@
-

DSpace 7

-

DSpace is the world leading open source repository platform that enables organisations to:

+ dsfsdaf +

Deep Blue Documents

+

Deep Blue Documents

    diff --git a/src/app/home-page/home-page-routing.module.ts b/src/app/home-page/home-page-routing.module.ts index 196a290552a..7483571deb9 100644 --- a/src/app/home-page/home-page-routing.module.ts +++ b/src/app/home-page/home-page-routing.module.ts @@ -18,8 +18,8 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model'; menu: { public: [{ id: 'statistics_site', - active: true, - visible: true, + active: false, + visible: false, index: 2, model: { type: MenuItemType.LINK, diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html index cd14891b3ff..caf7c253a4f 100644 --- a/src/app/home-page/recent-item-list/recent-item-list.component.html +++ b/src/app/home-page/recent-item-list/recent-item-list.component.html @@ -1,6 +1,8 @@
    +

    {{'home.recent-submissions.head' | translate}}

    diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.html b/src/app/home-page/top-level-community-list/top-level-community-list.component.html index b8dd7f8f76b..ad9131a8c8a 100644 --- a/src/app/home-page/top-level-community-list/top-level-community-list.component.html +++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.html @@ -1,3 +1,4 @@ + diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html index 02745f2580d..371513de5a7 100644 --- a/src/app/info/feedback/feedback-form/feedback-form.component.html +++ b/src/app/info/feedback/feedback-form/feedback-form.component.html @@ -17,6 +17,19 @@

    {{ 'info.feedback.head' | translate }}

    + +
    +
    + + +
    +
    + + + + +
    diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts index 684f974701b..6f48c9efde9 100644 --- a/src/app/info/feedback/feedback-form/feedback-form.component.ts +++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts @@ -31,6 +31,7 @@ export class FeedbackFormComponent implements OnInit { feedbackForm = this.fb.group({ email: ['', [Validators.required, Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$')]], message: ['', Validators.required], + subject: ['', Validators.required], page: [''], }); diff --git a/src/app/item-page/alerts/item-alerts.component.html b/src/app/item-page/alerts/item-alerts.component.html index cd71d23a910..888280f26c6 100644 --- a/src/app/item-page/alerts/item-alerts.component.html +++ b/src/app/item-page/alerts/item-alerts.component.html @@ -5,8 +5,13 @@
    - {{'item.alerts.withdrawn' | translate}} - {{"404.link.home-page" | translate}} + {{'item.alerts.withdrawn' | translate}} + + + ; + + {{"404.link.home-page" | translate}}
    diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html index 1fae737fdb9..c1e6700b53f 100644 --- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html +++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html @@ -1,9 +1,11 @@

    {{'bitstream-request-a-copy.header' | translate}}

    +

    {{'bitstream-request-a-copy.intro' | translate}} {{itemName}}

    {{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}

    @@ -62,9 +64,16 @@

    {{'bitstream-request-a-copy.header' | translate}}

    - + + +
    + + {{ 'bitstream-request-a-copy.name.error' | translate }} + +
    +
    diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts index 77e1049d87f..bba0461e1b7 100644 --- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts +++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts @@ -67,7 +67,9 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy { Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$')] }), allfiles: new UntypedFormControl(''), - message: new UntypedFormControl(''), + message: new UntypedFormControl('', { + validators: [Validators.required], + }), }); diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html index 1732da1235f..aa75305484c 100644 --- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html +++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html @@ -24,7 +24,7 @@

    {{'item.bitstreams.upload.title' | translate}}

    (click)="f.open()" ngDefaultControl> -
    -

    {{'item.edit.head' | translate}}

    +

    {{'item.edit.head' | translate}}

    + diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.ts index 3c41731c5f4..89ad5736d6f 100644 --- a/src/app/item-page/simple/field-components/file-section/file-section.component.ts +++ b/src/app/item-page/simple/field-components/file-section/file-section.component.ts @@ -9,17 +9,30 @@ import { hasValue } from '../../../../shared/empty.util'; import { PaginatedList } from '../../../../core/data/paginated-list.model'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface'; import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; + +import { ConfigurationDataService } from '../../../../core/data/configuration-data.service'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getRemoteDataPayload +} from '../../../../core/shared/operators'; + /** * This component renders the file section of the item * inside a 'ds-metadata-field-wrapper' component. */ @Component({ selector: 'ds-item-page-file-section', - templateUrl: './file-section.component.html' + templateUrl: './file-section.component.html', + styles: [`.no-text-decoration { + text-decoration: none !important; + width: 30px; + display: inline-block; + margin-right: 10px; +}`] }) export class FileSectionComponent implements OnInit { @@ -39,20 +52,74 @@ export class FileSectionComponent implements OnInit { pageSize: number; + //UM Change to support Hidden files. + formatId: string; + constructor( protected bitstreamDataService: BitstreamDataService, protected notificationsService: NotificationsService, protected translateService: TranslateService, + protected configService: ConfigurationDataService, public dsoNameService: DSONameService, @Inject(APP_CONFIG) protected appConfig: AppConfig ) { this.pageSize = this.appConfig.item.bitstream.pageSize; } + // This is called when component is 1st created. Very important. ngOnInit(): void { + + this.configService.findByPropertyName('hidden.format').pipe( + getFirstCompletedRemoteData(), + getRemoteDataPayload() + ).subscribe((remoteData) => { + if (remoteData === undefined || remoteData.values.length === 0) { + this.formatId = ''; + } else { + this.formatId = remoteData.values[0]; + } + }) + this.getNextPage(); } + getIconForFileRestriction(desc: string): string { + + if ( desc == null) + { + return ""; + } + else if ( (desc.toLowerCase().includes('restricted to u') ) ) + { + return "Restricted to current U-M faculty, staff, and students"; + } + else if ( (desc.toLowerCase().includes('restricted to on-site access at biological station') ) ) + { + return "Restricted to on-site access at Biological Station"; + } + else if ( (desc.toLowerCase().includes('restricted to on-site access at bentley historical library') ) ) + { + return "Restricted to on-site access at Bentley Historical Library"; + } + else + { + return ""; + } + + } + + + getIconForRequestCopy(desc: string): string { + if ( desc == null) + { + return ""; + } + else + { + return "Request Copy"; + } + } + /** * This method will retrieve the next page of Bitstreams from the external BitstreamDataService call. * It'll retrieve the currentPage from the class variables and it'll add the next page of bitstreams with the diff --git a/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/dimensions/item-page-dimensions-field.component.html b/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/dimensions/item-page-dimensions-field.component.html new file mode 100644 index 00000000000..833022e2dd6 --- /dev/null +++ b/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/dimensions/item-page-dimensions-field.component.html @@ -0,0 +1,11 @@ +
    + +
    + + diff --git a/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/dimensions/item-page-dimensions-field.component.scss b/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/dimensions/item-page-dimensions-field.component.scss new file mode 100644 index 00000000000..5c439bc1af1 --- /dev/null +++ b/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/dimensions/item-page-dimensions-field.component.scss @@ -0,0 +1,10 @@ +.custom-dimensions-container { + width: 300px; /* Your desired width */ + height: 50px; /* Your desired height */ +} + +.custom-dimensions-badge { + display: block; /* Ensure it behaves as a block element for scaling */ + transform: scale(1.5); /* Adjust the scale as necessary */ + transform-origin: 0 0; /* Scale from the top-left corner */ +} \ No newline at end of file diff --git a/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/dimensions/item-page-dimensions-field.component.ts b/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/dimensions/item-page-dimensions-field.component.ts new file mode 100644 index 00000000000..a222a1fb98d --- /dev/null +++ b/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/dimensions/item-page-dimensions-field.component.ts @@ -0,0 +1,72 @@ +import { AfterViewInit, Component, EventEmitter, HostListener, Inject, Input, Output } from '@angular/core'; +import { ExternalScriptLoaderDimensionsService } from 'src/app/shared/utils/scripts-loader-dimensions/external-script-loader-dimensions.service'; +import { + ExternalScriptsNames, + ExternalScriptsStatus, +} from 'src/app/shared/utils/scripts-loader-dimensions/external-script.model'; +import { Item } from '../../../../../../core/shared/item.model'; +import { APP_CONFIG, AppConfig } from 'src/config/app-config.interface'; + +@Component({ + selector: 'ds-item-page-dimensions-field', + templateUrl: './item-page-dimensions-field.component.html', + styleUrls: ['./item-page-dimensions-field.component.scss'], +}) +export class ItemPageDimensionsFieldComponent implements AfterViewInit { + @Input() item: Item; + + @Output() widgetLoaded = new EventEmitter(); + + constructor( + @Inject(APP_CONFIG) protected appConfig: AppConfig, + private scriptLoader: ExternalScriptLoaderDimensionsService + ) {} + + ngAfterViewInit() { + if (!this.appConfig.item.showAltmetricBadge) { + return; + } + this.scriptLoader + .load(ExternalScriptsNames.DIMENSIONS) + .then((data) => this.reloadBadge(data)) + .catch((error) => console.error(error)); + } + + /** + * We ensure that the badge is visible after the script is loaded + * @param data The data returned from the promise + */ + // private reloadBadge(data: any[]) { + // if (data.find((element) => this.isLoaded(element))) { + // const initMethod = '__dimensions_embed_installed__'; + // window[initMethod](); + // } + // } + + // I got this method from the community. The init method has to be different. + private reloadBadge(data: any[]) { + if (data.find((element) => this.isLoaded(element))) { + const initClass = '__dimensions_embed'; + const initMethod = 'addBadges'; + window[initClass][initMethod](); + } + } + + + /** + * Check if the script has been previously loaded in the DOM + * @param element The resolve element from the promise + * @returns true if the script has been already loaded, false if not + */ + private isLoaded(element: any): unknown { + return ( + element.script === ExternalScriptsNames.DIMENSIONS && + element.status === ExternalScriptsStatus.ALREADY_LOADED + ); + } + + @HostListener('window:altmetric:show', ['$event']) + private onWidgetShow(event: Event) { + this.widgetLoaded.emit(true); + } +} diff --git a/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/dimensions/item-page-dimensions-field.directive.ts b/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/dimensions/item-page-dimensions-field.directive.ts new file mode 100644 index 00000000000..65eb62aaedf --- /dev/null +++ b/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/dimensions/item-page-dimensions-field.directive.ts @@ -0,0 +1,83 @@ +import { Directive, ElementRef, Input, OnInit, Renderer2 } from '@angular/core'; +import { Item } from 'src/app/core/shared/item.model'; + +/** + * This directive adds the data-* attribute for the Altmetric badge dependening on the first identifier found in the item + */ +@Directive({ + selector: '[dsDimensionsData]', +}) +export class DimensionsDirective implements OnInit { + @Input() item: Item; + + constructor(private renderer: Renderer2, private elementRef: ElementRef) {} + + ngOnInit(): void { + const identifier = this.obtainFirstValidID(this.initItemIdentifiers()); + if (identifier !== undefined) { + this.renderer.setAttribute( + this.elementRef.nativeElement, + identifier.name, + this.applyRegex(identifier.value, identifier.regex) + ); + } + } + + /** + * This initialize an array of identifiers founded in the item. + * It search for DOI, Handle, PMID, ISBN, ARXIV and URI. + * Some identifiers may be stored with more text than the ID so this objects has a regex property to clean it + */ + private initItemIdentifiers(): any[] { + return [ + { + name: 'data-doi', + value: this.item.firstMetadataValue('dc.identifier.doi'), + regex: /https?:\/\/(dx\.)?doi\.org\//gi, + }, + { + name: 'data-handle', + value: this.item.firstMetadataValue('dc.identifier.uri'), + regex: /http?:\/\/hdl\.handle\.net\//gi, + }, + { + name: 'data-pmid', + value: this.item.firstMetadataValue('dc.identifier.pmid'), + regex: '', + }, + { + name: 'data-isbn', + value: this.item.firstMetadataValue('dc.identifier.isbn'), + regex: '', + }, + { + name: 'data-arxiv-id', + value: this.item.firstMetadataValue('dc.identifier.arxiv'), + regex: '', + }, + { + name: 'data-uri', + value: this.item.firstMetadataValue('dc.identifier.uri'), + regex: '', + }, + ]; + } + + /** + * This function obtains the first valid ID from the item + * @returns Returns first valid identifier (not undefined), undefined otherwise + */ + private obtainFirstValidID(itemIdentifiers: any[]): any { + return itemIdentifiers.find((element) => element.value !== undefined); + } + + /** + * Apply the specified regex to clean the metadata and obtain only the ID + * @param value The metadata value + * @param regex The regex to apply + * @returns The result is the ID clean + */ + private applyRegex(value: string, regex: string): string { + return value.replace(regex, ''); + } +} diff --git a/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/item-page-metrics-dimensions-field.component.html b/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/item-page-metrics-dimensions-field.component.html new file mode 100644 index 00000000000..a22c6aefbac --- /dev/null +++ b/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/item-page-metrics-dimensions-field.component.html @@ -0,0 +1,12 @@ +
    + +
    + +
    + +
    +
    +     +
    diff --git a/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/item-page-metrics-dimensions-field.component.ts b/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/item-page-metrics-dimensions-field.component.ts new file mode 100644 index 00000000000..48a95a254a8 --- /dev/null +++ b/src/app/item-page/simple/field-components/specific-field/metrics-dimensions/item-page-metrics-dimensions-field.component.ts @@ -0,0 +1,24 @@ +import { Component, Input } from '@angular/core'; +import { ItemPageFieldComponent } from '../item-page-field.component'; +import { Item } from 'src/app/core/shared/item.model'; + +@Component({ + selector: 'ds-item-page-metrics-dimensions-field', + templateUrl: './item-page-metrics-dimensions-field.component.html', + styleUrls: [ + '../../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component.scss', + ], +}) +export class ItemPageMetricsDimensionsFieldComponent extends ItemPageFieldComponent { + + @Input() item: Item; + + public showTitle = false; + + public someWidgetHasLoaded(widgetLoaded: boolean) { + if (widgetLoaded) { + this.showTitle = true; + } + } + +} diff --git a/src/app/item-page/simple/field-components/specific-field/metrics/altmetric/item-page-altmetric-field.component.html b/src/app/item-page/simple/field-components/specific-field/metrics/altmetric/item-page-altmetric-field.component.html new file mode 100644 index 00000000000..c8e02bb0715 --- /dev/null +++ b/src/app/item-page/simple/field-components/specific-field/metrics/altmetric/item-page-altmetric-field.component.html @@ -0,0 +1,12 @@ +
    + +
    diff --git a/src/app/item-page/simple/field-components/specific-field/metrics/altmetric/item-page-altmetric-field.component.scss b/src/app/item-page/simple/field-components/specific-field/metrics/altmetric/item-page-altmetric-field.component.scss new file mode 100644 index 00000000000..d18805c1952 --- /dev/null +++ b/src/app/item-page/simple/field-components/specific-field/metrics/altmetric/item-page-altmetric-field.component.scss @@ -0,0 +1,10 @@ +.custom-altmetric-container { + width: 300px; /* Your desired width */ + height: 50px; /* Your desired height */ +} + +.custom-altmetric-badge { + display: block; /* Ensure it behaves as a block element for scaling */ + transform: scale(1.5); /* Adjust the scale as necessary */ + transform-origin: 0 0; /* Scale from the top-left corner */ +} \ No newline at end of file diff --git a/src/app/item-page/simple/field-components/specific-field/metrics/altmetric/item-page-altmetric-field.component.ts b/src/app/item-page/simple/field-components/specific-field/metrics/altmetric/item-page-altmetric-field.component.ts new file mode 100644 index 00000000000..c82511256bf --- /dev/null +++ b/src/app/item-page/simple/field-components/specific-field/metrics/altmetric/item-page-altmetric-field.component.ts @@ -0,0 +1,63 @@ +import { AfterViewInit, Component, EventEmitter, HostListener, Inject, Input, Output } from '@angular/core'; +import { ExternalScriptLoaderService } from 'src/app/shared/utils/scripts-loader/external-script-loader.service'; +import { + ExternalScriptsNames, + ExternalScriptsStatus, +} from 'src/app/shared/utils/scripts-loader/external-script.model'; +import { Item } from '../../../../../../core/shared/item.model'; +import { APP_CONFIG, AppConfig } from 'src/config/app-config.interface'; + +@Component({ + selector: 'ds-item-page-altmetric-field', + templateUrl: './item-page-altmetric-field.component.html', + styleUrls: ['./item-page-altmetric-field.component.scss'], +}) +export class ItemPageAltmetricFieldComponent implements AfterViewInit { + @Input() item: Item; + + @Output() widgetLoaded = new EventEmitter(); + + constructor( + @Inject(APP_CONFIG) protected appConfig: AppConfig, + private scriptLoader: ExternalScriptLoaderService + ) {} + + ngAfterViewInit() { + if (!this.appConfig.item.showAltmetricBadge) { + return; + } + + this.scriptLoader + .load(ExternalScriptsNames.ALTMETRIC) + .then((data) => this.reloadBadge(data)) + .catch((error) => console.error(error)); + } + + /** + * We ensure that the badge is visible after the script is loaded + * @param data The data returned from the promise + */ + private reloadBadge(data: any[]) { + if (data.find((element) => this.isLoaded(element))) { + const initMethod = '_altmetric_embed_init'; + window[initMethod](); + } + } + + /** + * Check if the script has been previously loaded in the DOM + * @param element The resolve element from the promise + * @returns true if the script has been already loaded, false if not + */ + private isLoaded(element: any): unknown { + return ( + element.script === ExternalScriptsNames.ALTMETRIC && + element.status === ExternalScriptsStatus.ALREADY_LOADED + ); + } + + @HostListener('window:altmetric:show', ['$event']) + private onWidgetShow(event: Event) { + this.widgetLoaded.emit(true); + } +} diff --git a/src/app/item-page/simple/field-components/specific-field/metrics/altmetric/item-page-altmetric-field.directive.ts b/src/app/item-page/simple/field-components/specific-field/metrics/altmetric/item-page-altmetric-field.directive.ts new file mode 100644 index 00000000000..c2063eda370 --- /dev/null +++ b/src/app/item-page/simple/field-components/specific-field/metrics/altmetric/item-page-altmetric-field.directive.ts @@ -0,0 +1,83 @@ +import { Directive, ElementRef, Input, OnInit, Renderer2 } from '@angular/core'; +import { Item } from 'src/app/core/shared/item.model'; + +/** + * This directive adds the data-* attribute for the Altmetric badge dependening on the first identifier found in the item + */ +@Directive({ + selector: '[dsAltmetricData]', +}) +export class AltmetricDirective implements OnInit { + @Input() item: Item; + + constructor(private renderer: Renderer2, private elementRef: ElementRef) {} + + ngOnInit(): void { + const identifier = this.obtainFirstValidID(this.initItemIdentifiers()); + if (identifier !== undefined) { + this.renderer.setAttribute( + this.elementRef.nativeElement, + identifier.name, + this.applyRegex(identifier.value, identifier.regex) + ); + } + } + + /** + * This initialize an array of identifiers founded in the item. + * It search for DOI, Handle, PMID, ISBN, ARXIV and URI. + * Some identifiers may be stored with more text than the ID so this objects has a regex property to clean it + */ + private initItemIdentifiers(): any[] { + return [ + { + name: 'data-doi', + value: this.item.firstMetadataValue('dc.identifier.doi'), + regex: /https?:\/\/(dx\.)?doi\.org\//gi, + }, + { + name: 'data-handle', + value: this.item.firstMetadataValue('dc.identifier.uri'), + regex: /http?:\/\/hdl\.handle\.net\//gi, + }, + { + name: 'data-pmid', + value: this.item.firstMetadataValue('dc.identifier.pmid'), + regex: '', + }, + { + name: 'data-isbn', + value: this.item.firstMetadataValue('dc.identifier.isbn'), + regex: '', + }, + { + name: 'data-arxiv-id', + value: this.item.firstMetadataValue('dc.identifier.arxiv'), + regex: '', + }, + { + name: 'data-uri', + value: this.item.firstMetadataValue('dc.identifier.uri'), + regex: '', + }, + ]; + } + + /** + * This function obtains the first valid ID from the item + * @returns Returns first valid identifier (not undefined), undefined otherwise + */ + private obtainFirstValidID(itemIdentifiers: any[]): any { + return itemIdentifiers.find((element) => element.value !== undefined); + } + + /** + * Apply the specified regex to clean the metadata and obtain only the ID + * @param value The metadata value + * @param regex The regex to apply + * @returns The result is the ID clean + */ + private applyRegex(value: string, regex: string): string { + return value.replace(regex, ''); + } +} diff --git a/src/app/item-page/simple/field-components/specific-field/metrics/item-page-metrics-field.component.html b/src/app/item-page/simple/field-components/specific-field/metrics/item-page-metrics-field.component.html new file mode 100644 index 00000000000..81e9630d0a9 --- /dev/null +++ b/src/app/item-page/simple/field-components/specific-field/metrics/item-page-metrics-field.component.html @@ -0,0 +1,12 @@ +
    + +
    + +
    + +
    +
    +     +
    diff --git a/src/app/item-page/simple/field-components/specific-field/metrics/item-page-metrics-field.component.ts b/src/app/item-page/simple/field-components/specific-field/metrics/item-page-metrics-field.component.ts new file mode 100644 index 00000000000..95f8a267675 --- /dev/null +++ b/src/app/item-page/simple/field-components/specific-field/metrics/item-page-metrics-field.component.ts @@ -0,0 +1,24 @@ +import { Component, Input } from '@angular/core'; +import { ItemPageFieldComponent } from '../item-page-field.component'; +import { Item } from 'src/app/core/shared/item.model'; + +@Component({ + selector: 'ds-item-page-metrics-field', + templateUrl: './item-page-metrics-field.component.html', + styleUrls: [ + '../../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component.scss', + ], +}) +export class ItemPageMetricsFieldComponent extends ItemPageFieldComponent { + + @Input() item: Item; + + public showTitle = false; + + public someWidgetHasLoaded(widgetLoaded: boolean) { + if (widgetLoaded) { + this.showTitle = true; + } + } + +} diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html index 15960bdc9d7..85975d45335 100644 --- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html +++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html @@ -1,6 +1,6 @@ -

    +

    {{ type.toLowerCase() + '.page.titleprefix' | translate }}
    {{ dsoNameService.getName(item) }} -

    + diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html index cc9983bb354..1c18e80d268 100644 --- a/src/app/item-page/simple/item-page.component.html +++ b/src/app/item-page/simple/item-page.component.html @@ -4,7 +4,7 @@ - +
    diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts index b9be6bebfb6..054fd99625b 100644 --- a/src/app/item-page/simple/item-page.component.ts +++ b/src/app/item-page/simple/item-page.component.ts @@ -2,7 +2,8 @@ import { ChangeDetectionStrategy, Component, Inject, OnDestroy, OnInit, PLATFORM import { ActivatedRoute, Router } from '@angular/router'; import { isPlatformServer } from '@angular/common'; -import { Observable } from 'rxjs'; +import { Observable, of as observableOf } from 'rxjs'; + import { map, take } from 'rxjs/operators'; import { ItemDataService } from '../../core/data/item-data.service'; @@ -16,6 +17,9 @@ import { getItemPageRoute } from '../item-page-routing-paths'; import { redirectOn4xx } from '../../core/shared/authorized.operators'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../core/data/feature-authorization/feature-id'; + +import { RoleService } from '../../core/roles/role.service'; + import { ServerResponseService } from '../../core/services/server-response.service'; import { SignpostingDataService } from '../../core/data/signposting-data.service'; import { SignpostingLink } from '../../core/data/signposting-links.model'; @@ -63,6 +67,10 @@ export class ItemPageComponent implements OnInit, OnDestroy { itemUrl: string; + showReason: boolean; + + private roleService: RoleService + /** * Contains a list of SignpostingLink related to the item */ @@ -90,13 +98,13 @@ export class ItemPageComponent implements OnInit, OnDestroy { map((data) => data.dso as RemoteData), redirectOn4xx(this.router, this.authService) ); + // This is where the item data comes from this.itemPageRoute$ = this.itemRD$.pipe( getAllSucceededRemoteDataPayload(), map((item) => getItemPageRoute(item)) ); this.isAdmin$ = this.authorizationService.isAuthorized(FeatureID.AdministratorOf); - } /** diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html index 3749f639644..1741d1cfaf2 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.html +++ b/src/app/item-page/simple/item-types/publication/publication.component.html @@ -47,6 +47,7 @@ [fields]="['dc.publisher']" [label]="'publication.page.publisher'"> +
    { + if (remoteData === undefined || remoteData.values.length === 0) { + this.handlePrefix = ''; + } else { + this.handlePrefix = remoteData.values[0]; + } + }) + + + this.configService.findByPropertyName('identifier.doi.prefix').pipe( + getFirstCompletedRemoteData(), + getRemoteDataPayload() + ).subscribe((remoteData) => { + if (remoteData === undefined || remoteData.values.length === 0) { + this.doiPrefix = ''; + } else { + this.doiPrefix = remoteData.values[0]; + } + }) } } diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html index 904b7e039cc..e8a35b03a4e 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html @@ -9,29 +9,56 @@
    + +
    - - + + + + + + +
    + +
    + +
    + + + + + - - - + + + + + +
    -
    - +
    +
    + +

    Abstract

    + + + +     +
    + + + + + + + + + +

    Other identifiers

    + {{uri}} +     + +

    +     +     + + + + + + +

    Deep Blue Documents DOI

    + + {{doi}} + http://dx.doi.org/{{doi}} +     + +

    +     +     + + + + +

    Other DOIs

    + {{doi}} + http://dx.doi.org/{{doi}} +     + +

    +     +     + + + +
    + +
    + + + [fields]="['dc.title.alternative']" + [label]="'Other Titles'"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    + +

    Videos

    + + + +{{getVideoUrl(video)}} + + + +

    +     +     +
    + + + + + + + + + + +
    + + cc-logo + + + {{ object.firstMetadataValue('dc.rights') }} + +
    + + + + +
    + + +
    +
    +
    +

    +

    Remediation for Accessibility

    + If you are unable to use this deposit in its current form, you can request accessibility remediation through our contact form. +
    +
    + + + +
    +

    +

    Remediation of Harmful Language

    +The University of Michigan Library aims to describe its collections in a way that respects the people and communities who create, use, and are represented in them. We encourage you to Contact Us anonymously if you encounter harmful or problematic language in catalog records or finding aids. More information about our policies and practices is available at Remediation of Harmful Language. +
    + +
    +

    +

    Remediation for Accessibility

    + If you are unable to use this deposit in its current form, you can request accessibility remediation through our contact form. +
    +     +
    + +
    +
    diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss index b810d2ddd4f..fd7baf03164 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss @@ -1,2 +1,3 @@ @import '../../../../../styles/variables.scss'; +.simple-view-element-header {margin-top: 1.5rem;} \ No newline at end of file diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts index ead62008dee..b8bd2e33409 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts @@ -1,9 +1,21 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { Item } from '../../../../core/shared/item.model'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ItemComponent } from '../shared/item.component'; +import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../../../core/data/feature-authorization/feature-id'; +import { Observable, of as observableOf } from 'rxjs'; + +import { DomSanitizer } from '@angular/platform-browser'; + +import { RouteService } from '../../../../core/services/route.service'; +import { ConfigurationDataService } from '../../../../core/data/configuration-data.service'; +import { Router } from '@angular/router'; + +import { BreadcrumbsService } from '../../../../breadcrumbs/breadcrumbs.service'; +import { Breadcrumb } from '../../../../breadcrumbs/breadcrumb/breadcrumb.model'; /** * Component that represents a publication Item page */ @@ -17,4 +29,130 @@ import { ItemComponent } from '../shared/item.component'; }) export class UntypedItemComponent extends ItemComponent { + breadcrumbs: Breadcrumb[] = []; + private sanitizer = inject(DomSanitizer); + trustedUrl: any = ''; + + + constructor( + private breadcrumbsService: BreadcrumbsService, + protected routeService: RouteService, + protected configService: ConfigurationDataService, + protected router: Router // Include all necessary services + ) { + super(routeService, configService, router); // Pass the arguments to the base class constructor + } + + ngOnInit(): void { + super.ngOnInit(); // Call ngOnInit of the base class + + this.breadcrumbsService.breadcrumbs$.subscribe((breadcrumbs: Breadcrumb[]) => { + this.breadcrumbs = breadcrumbs; + }); + } + + + // Method to check if any breadcrumb URL matches the specified value + containsSpecificUrl(): boolean { + return this.breadcrumbs.some( + breadcrumb => breadcrumb.url === '/communities/de1689ee-a219-4b31-a8db-1517ad4608b1' + ); + } + + public getSelectedCcLicense(ccLicense: String): String { + if ( ccLicense.startsWith("http://creativecommons.org/licenses/by/") ) + { + return '../../../../assets/images/cc_licenses/cc-by.png'; + } else if ( ccLicense.startsWith("http://creativecommons.org/licenses/by-sa/") ) + { + return '../../../../assets/images/cc_licenses/cc-by-sa.png'; + } else if ( ccLicense.startsWith("http://creativecommons.org/licenses/by-nd/") ) + { + return '../../../../assets/images/cc_licenses/cc-by-nd.png'; + } else if ( ccLicense.startsWith("http://creativecommons.org/licenses/by-nc/") ) + { + return '../../../../assets/images/cc_licenses/cc-by-nc.png'; + } else if ( ccLicense.startsWith("http://creativecommons.org/licenses/by-nc-sa/") ) + { + return '../../../../assets/images/cc_licenses/cc-by-nc-sa.png'; + } else if ( ccLicense.startsWith("http://creativecommons.org/licenses/by-nc-nd/") ) + { + return '../../../../assets/images/cc_licenses/cc-by-nc-nd.png'; + } else if ( ccLicense.startsWith("http://creativecommons.org/publicdomain/zero/") ) + { + return '../../../../assets/images/cc_licenses/cc-zero.png'; + } else if ( ccLicense.startsWith("http://creativecommons.org/publicdomain/mark/") ) + { + return '../../../../assets/images/cc_licenses/cc-mark.png'; + } else + { + return '../../../../assets/images/cc_licenses/cc-generic.png'; + } + } + + public getHandle(values: String[]): String { + for(var index in values) + { + if (values[index].includes("https://hdl.handle.net/") ){ + return values[index].replace("https://hdl.handle.net/", ""); + } + } + } + + public getParent(value: String): String { + + //value ="https://cdnapisec.kaltura.com/p/1038472/sp/103847200/embedIframeJs/uiconf_id/33084471/partner_id/1038472?autoembed=true&entry_id=1_irztzumh&playerId=kaltura_player_01&cache_st=1455309475&width=400&height=330&flashvars[streamerType]=auto="; + const matches = value.match(/https:\/\/cdnapisec\.kaltura\.com\/p\/(\w+)\//); + if (matches) { + } + return matches[1]; + } + + public getSubParent(value: String): String { + + //value ="https://cdnapisec.kaltura.com/p/1038472/sp/103847200/embedIframeJs/uiconf_id/33084471/partner_id/1038472?autoembed=true&entry_id=1_irztzumh&playerId=kaltura_player_01&cache_st=1455309475&width=400&height=330&flashvars[streamerType]=auto="; + const matches = value.match(/https:\/\/cdnapisec\.kaltura\.com\/p\/.*?\/sp\/(\w+)\//); + if (matches) { + } + return matches[1]; + } + + public getUiConf(value: String): String { + + //value ="https://cdnapisec.kaltura.com/p/1038472/sp/103847200/embedIframeJs/uiconf_id/33084471/partner_id/1038472?autoembed=true&entry_id=1_irztzumh&playerId=kaltura_player_01&cache_st=1455309475&width=400&height=330&flashvars[streamerType]=auto="; + const matches = value.match(/.*?\/uiconf_id\/(\w+)\//); + if (matches) { + } + return matches[1]; + } + + public getEntryId(value: String): String { + //value ="https://cdnapisec.kaltura.com/p/1038472/sp/103847200/embedIframeJs/uiconf_id/33084471/partner_id/1038472?autoembed=true&entry_id=1_irztzumh&playerId=kaltura_player_01&cache_st=1455309475&width=400&height=330&flashvars[streamerType]=auto="; + const matches = value.match(/.*?entry_id=(\w+)\&/); + if (matches) { + } + return matches[1]; + } + + // Explains how to do this. + //https://www.google.com/search?q=iframe+angular&sca_esv=3acf9be9fedf7d41&sca_upv=1&rlz=1C5GCEM_enUS944US945&ei=hw8UZp7gBIG4wN4P4q-F0A0&ved=0ahUKEwjev7vP-bKFAxUBHNAFHeJXAdoQ4dUDCBE&uact=5&oq=iframe+angular&gs_lp=Egxnd3Mtd2l6LXNlcnAiDmlmcmFtZSBhbmd1bGFyMgsQABiABBiKBRiRAjIFEAAYgAQyBRAAGIAEMgUQABiABDIFEAAYgAQyBhAAGBYYHjIGEAAYFhgeMgYQABgWGB4yBhAAGBYYHjIGEAAYFhgeSIYrUIkMWMgmcAF4AJABAJgBeKAB9gmqAQQxMS40uAEDyAEA-AEBmAIPoALzCcICChAAGEcY1gQYsAPCAg4QABiABBiKBRixAxiDAcICCxAAGIAEGLEDGIMBwgIOEC4YgAQYigUYsQMYgwHCAhEQLhiABBixAxiDARjHARjRA8ICCxAuGIMBGLEDGIAEwgIOEC4YgAQYsQMYxwEY0QPCAgUQLhiABMICCxAuGIAEGMcBGK8BwgIOEAAYgAQYigUYkQIYsQPCAgoQABiABBiKBRhDwgINEAAYgAQYigUYQxixA8ICCBAAGIAEGLEDmAMAiAYBkAYIkgcEMTEuNKAHsWU&sclient=gws-wiz-serp#fpstate=ive&vld=cid:a23e759d,vid:VCJ45dH0aOs,st:0 + public getVideoUrl(value: String) { + let url = "https://cdnapisec.kaltura.com/p/" + this.getParent(value) + "/sp/" + this.getSubParent(value) + "/embedIframeJs/uiconf_id/" + this.getUiConf(value) + "/partner_id/" + this.getParent(value) + "?iframeembed=true&playerId=kaltura_player_1712258806&entry_id=" + this.getEntryId(value); + this.trustedUrl = this.sanitizer.bypassSecurityTrustResourceUrl(url); + } + + // This is used for the altmetrics and dimensions icon. + public getDoi(doi: String): String { + doi.replace("http://dx.doi.org/", ""); + doi.replace("https://dx.doi.org/", ""); + return doi; + } + + // public isAdmin(): Boolean { + + // let authorizationService: AuthorizationDataService; + // return authorizationService.isAuthorized(FeatureID.CanSendFeedback); + // //return false; + // } + } diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html index efbe9206d18..bd3f1276dd7 100644 --- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html +++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html @@ -5,7 +5,7 @@ [mdRepresentation]="rep"> -
    +
    diff --git a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html index 0aa22f80cf0..b439ac50bf5 100644 --- a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html +++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html @@ -26,7 +26,7 @@ title="{{'item.version.create.modal.button.cancel.tooltip' | translate}}"> {{'item.version.create.modal.button.cancel' | translate}} - -
    -
    - - + +

    {{'mydspace.title' | translate}}

    +Deposited Works can only be changed by an administrator. To request a change, please Contact Us . Draft Works can be edited, deleted, or deposited by you. +

    + +
    +You maystart a new Work. The deposit process includes describing the item and uploading its file(s). +
    + +
    + + + + + +
    diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html index d0052b9355b..9935ad549d2 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html @@ -1,17 +1,7 @@ -
    -
    - -
    +
    -
    - -
    -
    + diff --git a/src/app/my-dspace-page/my-dspace-page.component.html b/src/app/my-dspace-page/my-dspace-page.component.html index ea5784170fb..614cb540a01 100644 --- a/src/app/my-dspace-page/my-dspace-page.component.html +++ b/src/app/my-dspace-page/my-dspace-page.component.html @@ -2,6 +2,21 @@
    +
    +

    + +

    +
    + = new InjectionToken('searchConfigurationService'); @@ -32,6 +35,8 @@ export const SEARCH_CONFIG_SERVICE: InjectionToken = }) export class MyDSpacePageComponent implements OnInit { + subscribeStats: boolean = false; + /** * The list of available configuration options */ @@ -57,7 +62,10 @@ export class MyDSpacePageComponent implements OnInit { */ viewModeList = [ViewMode.ListElement, ViewMode.DetailedListElement]; + private serverLocation = environment.serverLocation; + constructor(private service: SearchService, + private http: HttpClient, @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: MyDSpaceConfigurationService) { this.service.setServiceOptions(MyDSpaceResponseParsingService, MyDSpaceRequest); } @@ -82,6 +90,28 @@ export class MyDSpacePageComponent implements OnInit { this.context = configurationList[0].context; }); + this.http.get(this.serverLocation + '/api/eperson/groups/issubscribed', {responseType: 'text'}).subscribe((data: any) => { + this.subscribeStats = data === "true"; + }); } -} + public toggleSubscription() { + if (this.subscribeStats) { + this.unsubscribeToDepositStats(); + } else { + this.subscribeToDepositStats(); + } + } + + public subscribeToDepositStats() { + this.http.get(this.serverLocation + '/api/eperson/groups/subscribe', {responseType: 'text'}).subscribe(() => { + this.subscribeStats = true; + }); + } + + public unsubscribeToDepositStats() { + this.http.get(this.serverLocation + '/api/eperson/groups/unsubscribe', {responseType: 'text'}).subscribe(() => { + this.subscribeStats = false; + }); + } +} \ No newline at end of file diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss index 65de77b6007..0044533e5f3 100644 --- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss +++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss @@ -14,6 +14,14 @@ padding-right: var(--bs-spacer); padding-left: var(--bs-spacer); white-space: nowrap; + color: var(--ds-anchors-color); + &:hover { + color: var(--ds-anchors-color); + text-decoration: underline; + } + &:focus { + color: var(--ds-anchors-color); + } } } diff --git a/src/app/page-error/page-error.component.html b/src/app/page-error/page-error.component.html index 9a5f02600ae..cd066d7c6d4 100644 --- a/src/app/page-error/page-error.component.html +++ b/src/app/page-error/page-error.component.html @@ -5,6 +5,6 @@

    {{"error-page.description." + status | translate}}

    {{"error-page." + code | translate}}


    - {{ status + ".link.home-page" | translate}} + {{ status + ".link.home-page" | translate}}

    diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html index 87a3bef2357..f6f226695f1 100644 --- a/src/app/page-internal-server-error/page-internal-server-error.component.html +++ b/src/app/page-internal-server-error/page-internal-server-error.component.html @@ -7,6 +7,6 @@

    {{"500.help" | translate}}


    - {{"500.link.home-page" | translate}} + {{"500.link.home-page" | translate}}

    diff --git a/src/app/pagenotfound/pagenotfound.component.html b/src/app/pagenotfound/pagenotfound.component.html index e85316b0ec1..6a6ad429e28 100644 --- a/src/app/pagenotfound/pagenotfound.component.html +++ b/src/app/pagenotfound/pagenotfound.component.html @@ -5,6 +5,6 @@

    {{"404.page-not-found" | translate}}

    {{"404.help" | translate}}


    - {{"404.link.home-page" | translate}} + {{"404.link.home-page" | translate}}

    -
    \ No newline at end of file +
    diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html index 5f905cbfff3..c00798c2b27 100644 --- a/src/app/process-page/detail/process-detail.component.html +++ b/src/app/process-page/detail/process-detail.component.html @@ -62,7 +62,7 @@

    - -

    diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html index 44783da84e8..0b02bc7e8b6 100644 --- a/src/app/profile-page/profile-page.component.html +++ b/src/app/profile-page/profile-page.component.html @@ -1,5 +1,6 @@
    +

    {{'profile.head' | translate}}

    {{'profile.head' | translate}}

    @@ -17,29 +18,37 @@

    {{'profile.head' | translate}}

    -
    -
    {{'profile.card.security' | translate}}
    -
    - -
    -
    - -
    -

    {{'profile.groups.head' | translate}}

    -
      -
    • {{ dsoNameService.getName(group) }}
      • -
    -
    -     +

    + +
    -     + diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts index ddb77b669cb..9617a2e0364 100644 --- a/src/app/register-email-form/register-email-form.component.ts +++ b/src/app/register-email-form/register-email-form.component.ts @@ -190,7 +190,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit { if (response.hasSucceeded) { this.notificationService.success(this.translateService.get(`${this.MESSAGE_PREFIX}.success.head`), this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, {email: this.email.value})); - this.router.navigate(['/home']); + this.router.navigate(['/documents']); } else if (response.statusCode === 422) { this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`), this.translateService.get(`${this.MESSAGE_PREFIX}.error.maildomain`, {domains: this.validMailDomains.join(', ')})); } else { diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts index eaaa983a43d..e1fbd4e55bc 100644 --- a/src/app/register-page/create-profile/create-profile.component.ts +++ b/src/app/register-page/create-profile/create-profile.component.ts @@ -169,7 +169,7 @@ export class CreateProfileComponent implements OnInit { this.notificationsService.success(this.translateService.get(this.NOTIFICATIONS_PREFIX + 'success.head'), this.translateService.get(this.NOTIFICATIONS_PREFIX + 'success.content')); this.store.dispatch(new AuthenticateAction(this.email, this.password)); - this.router.navigate(['/home']); + this.router.navigate(['/documents']); } else { this.notificationsService.error(this.translateService.get(this.NOTIFICATIONS_PREFIX + 'error.head'), rd.errorMessage); } diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts index 098c7a1efd7..c2e8bda7de9 100644 --- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts +++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts @@ -102,7 +102,7 @@ export class DenyRequestCopyComponent implements OnInit { ).subscribe((rd) => { if (rd.hasSucceeded) { this.notificationsService.success(this.translateService.get('deny-request-copy.success')); - this.router.navigateByUrl('/'); + this.router.navigateByUrl('/documents'); } else { this.notificationsService.error(this.translateService.get('deny-request-copy.error'), rd.errorMessage); } diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html index 4837e0dcda1..38917b7a20d 100644 --- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html @@ -22,7 +22,7 @@

    {{'grant-deny-request-copy.header' | translate}}

    {{'grant-deny-request-copy.processed' | translate}}

    - {{'grant-deny-request-copy.home-page' | translate}} + {{'grant-deny-request-copy.home-page' | translate}}

diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.html b/src/app/request-copy/grant-request-copy/grant-request-copy.component.html index 179206566ed..81da18ce8bf 100644 --- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.html +++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.html @@ -4,6 +4,7 @@

{{'grant-request-copy.header' | translate}}

{{'grant-request-copy.intro' | translate}}

+
diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts index baf078df76a..583e5c58f84 100644 --- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts +++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts @@ -76,7 +76,7 @@ export class GrantRequestCopyComponent implements OnInit { ).subscribe((rd) => { if (rd.hasSucceeded) { this.notificationsService.success(this.translateService.get('grant-request-copy.success')); - this.router.navigateByUrl('/'); + this.router.navigateByUrl('/documents'); } else { this.notificationsService.error(this.translateService.get('grant-request-copy.error'), rd.errorMessage); } diff --git a/src/app/root.module.ts b/src/app/root.module.ts index a8af0ef5b5f..819634b1bce 100644 --- a/src/app/root.module.ts +++ b/src/app/root.module.ts @@ -27,6 +27,7 @@ import { RootComponent } from './root/root.component'; import { ThemedRootComponent } from './root/themed-root.component'; import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component'; import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component'; + import { ThemedHeaderComponent } from './header/themed-header.component'; import { ThemedFooterComponent } from './footer/themed-footer.component'; import { ThemedBreadcrumbsComponent } from './breadcrumbs/themed-breadcrumbs.component'; diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html index bf49e507c0b..89a70f3b5bf 100644 --- a/src/app/root/root.component.html +++ b/src/app/root/root.component.html @@ -6,7 +6,7 @@
-
+
diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html index 2b30507f3ec..f853e1977b5 100644 --- a/src/app/search-navbar/search-navbar.component.html +++ b/src/app/search-navbar/search-navbar.component.html @@ -4,9 +4,11 @@ -
diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss index cf46c25d914..f5997f27926 100644 --- a/src/app/search-navbar/search-navbar.component.scss +++ b/src/app/search-navbar/search-navbar.component.scss @@ -13,9 +13,11 @@ input[type="text"] { position: sticky; top: 0; - color: var(--ds-header-icon-color); + color: #00274c; + background-color: white; + margin-right: 2px; &:hover, &:focus { - color: var(--ds-header-icon-color-hover); + color: #00274c; } } diff --git a/src/app/search-page/search-page.module.ts b/src/app/search-page/search-page.module.ts index cc76d0427d8..2d405ad5533 100644 --- a/src/app/search-page/search-page.module.ts +++ b/src/app/search-page/search-page.module.ts @@ -13,6 +13,8 @@ import { ResearchEntitiesModule } from '../entity-groups/research-entities/resea import { ThemedSearchPageComponent } from './themed-search-page.component'; import { SearchModule } from '../shared/search/search.module'; +import { FileSectionComponent } from '../item-page/simple/field-components/file-section/file-section.component'; + const components = [ SearchPageComponent, ThemedSearchPageComponent diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss index 40e9113b009..48325a17141 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss @@ -4,7 +4,7 @@ } .loginDropdownMenu { - min-height: 260px; + } .dropdown-item.active, .dropdown-item:active, @@ -13,9 +13,9 @@ } .loginLink, .dropdownLogin, .logoutLink, .dropdownLogout { - color: var(--ds-header-icon-color); + color: white; &:hover, &:focus { - color: var(--ds-header-icon-color-hover); + color: white; } } diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html index 85b9d8aece2..06d57ffccaa 100644 --- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html +++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html @@ -1,12 +1,12 @@
- + {{dsoNameService.getName(user$ | async)}}
{{(user$ | async)?.email}} - {{'nav.profile' | translate}} - {{'nav.mydspace' | translate}} - {{'nav.subscriptions' | translate}} + {{'nav.profile' | translate}} + {{'nav.mydspace' | translate}} + {{'nav.subscriptions' | translate}}
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html index d6a00051739..37799e805ff 100644 --- a/src/app/shared/browse-by/browse-by.component.html +++ b/src/app/shared/browse-by/browse-by.component.html @@ -1,5 +1,5 @@ -

{{title | translate}}

+

{{title | translate}}

diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html index 5d7b092f740..07e2e7b73c9 100644 --- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html +++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html @@ -7,7 +7,7 @@
- +
diff --git a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts index 9034bffe8e6..595f771ece7 100644 --- a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts +++ b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts @@ -109,7 +109,7 @@ export class CreateComColPageComponent i * Navigate to home page */ navigateToHome() { - this.router.navigate(['/home']); + this.router.navigate(['/documents']); } /** diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html index 819d080f895..9fa30d0cbf7 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html @@ -1,14 +1,38 @@
-
-

{{ type + '.edit.head' | translate }}

+

{{ type + '.edit.head' | translate }}

+ +
+
+ +
+
+
+ +
+
+
+ +
+ +
{{type + '.edit.delete' | translate}}
+ +
+
  • diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts index e4d6c9c8a74..42f81fc28f9 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts @@ -1,25 +1,34 @@ import { Component, OnInit } from '@angular/core'; - import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; - import { ActivatedRoute, Router } from '@angular/router'; import { RemoteData } from '../../../../core/data/remote-data'; import { isNotEmpty } from '../../../empty.util'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { HttpClient } from '@angular/common/http'; +import { Collection } from '../../../../core/shared/collection.model'; +import { ChangeDetectorRef } from '@angular/core'; + +// UM Used for global config paramter - location of backend. +import { environment } from '../../../../../environments/environment'; /** * Component representing the edit page for communities and collections */ @Component({ selector: 'ds-edit-comcol', - template: '' + templateUrl: './edit-comcol-page.component.html' }) export class EditComColPageComponent implements OnInit { + + subscribeStats: boolean = false; // Ensure this reflects the current subscription state + showContent: boolean = false; + /** * The type of DSpaceObject (used to create i18n messages) */ public type: string; + public id: string; /** * The current page outlet string @@ -36,24 +45,68 @@ export class EditComColPageComponent implements On */ public dsoRD$: Observable>; + public count: number; + + private serverLocation = environment.serverLocation; + /** * Hide the default return button? */ public hideReturnButton: boolean; public constructor( + protected http: HttpClient, protected router: Router, protected route: ActivatedRoute ) { this.router.events.subscribe(() => this.initPageParamsByRoute()); + this.count = 0; } ngOnInit(): void { this.initPageParamsByRoute(); + this.pages = this.route.routeConfig.children .map((child: any) => child.path) .filter((path: string) => isNotEmpty(path)); // ignore reroutes + this.dsoRD$ = this.route.data.pipe(map((data) => data.dso)); + + this.dsoRD$.subscribe((value: any) => { + let id = value.payload.uuid; + this.type = value.payload.type; + + this.http.get(this.serverLocation + '/api/eperson/groups/issubscribed_admin/' + id, { responseType: 'text' }).subscribe((data: any) => { + this.subscribeStats = data === "true"; + }); + }); + } + + public goToCollectionAdminStats(id: string) { + var link = document.createElement('a'); + var working_href = 'https://angular.io/guide/router?restrict=1' + 'collid=' + id; + link.href = working_href; + link.click(); + } + + public subscribeToAdminStats(id: string) { + this.http.get(this.serverLocation + '/api/eperson/groups/subscribe_admin/' + id, { responseType: 'text' }).subscribe(() => { + this.subscribeStats = true; + }); + } + + public unsubscribeToAdminStats(id: string) { + this.http.get(this.serverLocation + '/api/eperson/groups/unsubscribe_admin/' + id, { responseType: 'text' }).subscribe(() => { + this.subscribeStats = false; + }); + } + + public toggleSubscription(isSubscribed: boolean, coll_uuid: string) { + if (isSubscribed) { + this.subscribeToAdminStats(coll_uuid); + } else { + this.unsubscribeToAdminStats(coll_uuid); + } } /** @@ -73,4 +126,4 @@ export class EditComColPageComponent implements On this.hideReturnButton = this.route.routeConfig.children .find((child: any) => child.path === this.currentPage).data.hideReturnButton; } -} +} \ No newline at end of file diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts index 2ce49ebea2b..a024eaa5c89 100644 --- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts +++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts @@ -20,6 +20,19 @@ export class ComcolPageHandleComponent { @Input() content: string; public getHandle(): string { + + // I had to put this in before I could find where the handle + // value was coming from. + + const prefix = 'https://hdl.handle.net/'; + const handleIndex = this.content.lastIndexOf('handle/'); + + if (!this.content.startsWith(prefix) && handleIndex !== -1) { + this.content = prefix + this.content.substring(handleIndex + 'handle/'.length); + } + + // Now return the modified content return this.content; + } } diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss index e69de29bb2d..6e81b0c2c52 100644 --- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss +++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss @@ -0,0 +1 @@ +.dso-logo { width: 30%;} \ No newline at end of file diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts index a41b641dec1..87e223768db 100644 --- a/src/app/shared/cookies/klaro-configuration.ts +++ b/src/app/shared/cookies/klaro-configuration.ts @@ -22,6 +22,8 @@ export const GOOGLE_ANALYTICS_KLARO_KEY = 'google-analytics'; export const klaroConfiguration: any = { storageName: ANONYMOUS_STORAGE_NAME_KLARO, + noNotice: true, + privacyPolicy: '/info/privacy', /* diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html index 16fda1caa83..67752d88ee0 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html @@ -1,9 +1,12 @@ + + +
    - + @@ -15,11 +18,14 @@
+ diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts index af3381ef716..fc962f805f7 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts @@ -6,6 +6,8 @@ import { isNotEmpty } from '../../../empty.util'; import { MenuID } from '../../../menu/menu-id.model'; import { MenuSection } from '../../../menu/menu-section.model'; +import { RoleService } from '../../../../core/roles/role.service'; +import { combineLatest, Observable } from 'rxjs'; /** * Represents a non-expandable section in the dso edit menus */ @@ -23,18 +25,25 @@ export class DsoEditMenuSectionComponent extends MenuSectionComponent implements hasLink: boolean; canActivate: boolean; + isAdmin$: Observable; + isSiteAdmin constructor( @Inject('sectionDataProvider') menuSection: MenuSection, protected menuService: MenuService, + protected roleService: RoleService, protected injector: Injector, ) { super(menuSection, menuService, injector); this.itemModel = menuSection.model; + + } ngOnInit(): void { this.hasLink = isNotEmpty(this.itemModel?.link); this.canActivate = isNotEmpty(this.itemModel?.function); + //this.canActivate = false; + this.isAdmin$ = this.roleService.isAdmin(); super.ngOnInit(); } diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html index 000da1678e9..5e6083c4051 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html @@ -1,6 +1,5 @@ -
-
-
+ +
\ No newline at end of file diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html index 5fccd58f48c..7e6fbb35153 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html @@ -6,6 +6,7 @@
{{header | translate}}
+
Not seeing the right collection? Please Contact Us .
+
{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-
+ +
+
+
+ +
+ + + + +
+ + + + diff --git a/src/app/shared/listfiles/listfiles.component.html.backup b/src/app/shared/listfiles/listfiles.component.html.backup new file mode 100644 index 00000000000..d35019b398c --- /dev/null +++ b/src/app/shared/listfiles/listfiles.component.html.backup @@ -0,0 +1,53 @@ + +
+ + + + +
+ + + + + + {{ dsoNameService.getName(file) }} + ({{(file?.sizeBytes) | dsFileSize }}) +{{(file?._links | async)?.payload?.format.mimetype}} + + + + + + + + Click file name to request access from the owner + + + + + + + {{file.firstMetadataValue('dc.description')}} + + + + + +
+ + +
+ +
+
+ +
+ + + + + + + +
+ diff --git a/src/app/shared/listfiles/listfiles.component.ts b/src/app/shared/listfiles/listfiles.component.ts new file mode 100644 index 00000000000..92be2e23ecb --- /dev/null +++ b/src/app/shared/listfiles/listfiles.component.ts @@ -0,0 +1,145 @@ +import { Component, Inject, Input, OnInit } from '@angular/core'; +import { BehaviorSubject } from 'rxjs'; + +import { Item } from '../../core/shared/item.model'; +import { BitstreamDataService } from '../../core/data/bitstream-data.service'; +import { Bitstream } from '../../core/shared/bitstream.model'; + +import { RemoteData } from '../../core/data/remote-data'; +import { hasValue } from '../../shared/empty.util'; +import { PaginatedList } from '../../core/data/paginated-list.model'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; + + +import { ConfigurationDataService } from '../../core/data/configuration-data.service'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getRemoteDataPayload +} from '../../core/shared/operators'; + + +@Component({ + selector: 'ds-listfiles', + templateUrl: './listfiles.component.html' +}) + +export class ListfilesComponent implements OnInit { + + @Input() item: Item; + + label = 'item.page.files'; + + #separator = '
'; + + separator = ' '; + + bitstreams$: BehaviorSubject; + + currentPage: number; + + isLoading: boolean; + + isLastPage: boolean; + + pageSize: number; + + //UM Change to support Hidden files. + formatId: string; + + constructor( + protected bitstreamDataService: BitstreamDataService, + protected notificationsService: NotificationsService, + protected translateService: TranslateService, + protected configService: ConfigurationDataService, + public dsoNameService: DSONameService, + @Inject(APP_CONFIG) protected appConfig: AppConfig + ) { + //this.pageSize = this.appConfig.item.bitstream.pageSize; + // Just going to hardcode it to 1000 + this.pageSize = 1000; + + } + + ngOnInit(): void { + + this.configService.findByPropertyName('hidden.format').pipe( + getFirstCompletedRemoteData(), + getRemoteDataPayload() + ).subscribe((remoteData) => { + if (remoteData === undefined || remoteData.values.length === 0) { + this.formatId = '12345'; + } else { + this.formatId = remoteData.values[0]; + } + }) + + this.getNextPageDisplay(); + } + + getIconForFileRestriction(desc: string): string { + + if ( desc == null) + { + return ""; + } + else if ( (desc.toLowerCase().includes('restricted to u') ) ) + { + return "Restricted to current U-M faculty, staff, and students"; + } + else if ( (desc.toLowerCase().includes('restricted to on-site access at biological station') ) ) + { + return "Restricted to on-site access at Biological Station"; + } + else if ( (desc.toLowerCase().includes('restricted to on-site access at bentley historical library') ) ) + { + return "Restricted to on-site access at Bentley Historical Library"; + } + else + { + return ""; + } + + } + + getIconForRequestCopy(desc: string): string { + if ( desc == null) + { + return ""; + } + else + { + return "Request Copy"; + } + } + + getNextPageDisplay(): void { + this.isLoading = true; + if (this.currentPage === undefined) { + this.currentPage = 1; + this.bitstreams$ = new BehaviorSubject([]); + } else { + this.currentPage++; + } + this.bitstreamDataService.findAllByItemAndBundleName(this.item, 'ORIGINAL', { + currentPage: this.currentPage, + elementsPerPage: this.pageSize + }).pipe( + getFirstCompletedRemoteData(), + ).subscribe((bitstreamsRD: RemoteData>) => { + if (bitstreamsRD.errorMessage) { + // this.notificationsService.error(this.translateService.get('file-section.error.header'), `${bitstreamsRD.statusCode} ${bitstreamsRD.errorMessage}`); + // return ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"; + } else if (hasValue(bitstreamsRD.payload)) { + const current: Bitstream[] = this.bitstreams$.getValue(); + this.bitstreams$.next([...current, ...bitstreamsRD.payload.page]); + this.isLoading = false; + this.isLastPage = this.currentPage === bitstreamsRD.payload.totalPages; + } + }); + } + +} diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index 6b1fdb9ff66..b25f58646cd 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -1,13 +1,17 @@ diff --git a/src/app/shared/log-in/log-in.component.spec.ts b/src/app/shared/log-in/log-in.component.spec.ts index 0a13e8b701e..e3c797b71b9 100644 --- a/src/app/shared/log-in/log-in.component.spec.ts +++ b/src/app/shared/log-in/log-in.component.spec.ts @@ -11,6 +11,9 @@ import { AuthService } from '../../core/auth/auth.service'; import { authMethodsMock, AuthServiceStub } from '../testing/auth-service.stub'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { SharedModule } from '../shared.module'; +import { LogInContainerComponent } from './container/log-in-container.component'; +import { LogInPasswordComponent } from './methods/password/log-in-password.component'; +import { LogInExternalProviderComponent } from './methods/log-in-external-provider/log-in-external-provider.component'; import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref'; import { ActivatedRouteStub } from '../testing/active-router.stub'; import { ActivatedRoute } from '@angular/router'; @@ -21,6 +24,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HardRedirectService } from '../../core/services/hard-redirect.service'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { of } from 'rxjs'; +import { APP_CONFIG } from '../../../config/app-config.interface'; +import { environment } from '../../../environments/environment'; describe('LogInComponent', () => { @@ -74,6 +79,7 @@ describe('LogInComponent', () => { { provide: ActivatedRoute, useValue: new ActivatedRouteStub() }, { provide: HardRedirectService, useValue: hardRedirectService }, { provide: AuthorizationDataService, useValue: authorizationService }, + { provide: APP_CONFIG, useValue: environment }, provideMockStore({ initialState }), LogInComponent ], @@ -121,11 +127,36 @@ describe('LogInComponent', () => { component = null; }); - it('should render a log-in container component for each auth method available', () => { - const loginContainers = fixture.debugElement.queryAll(By.css('ds-log-in-container')); - expect(loginContainers.length).toBe(2); + it('should render only non-password auth methods when showPasswordLogin is false (default)', () => { + const loginContainers = fixture.debugElement.queryAll(By.directive(LogInContainerComponent)); + // authMethodsMock = [password, shibboleth]. With showPasswordLogin: false (default), + // only the shibboleth container renders (exclusive toggle). The outer container count + // and the inner rendered method component both confirm which method is shown. + expect(loginContainers.length).toBe(1); + expect(loginContainers[0].componentInstance.authMethod.authMethodType).toBe('shibboleth'); + // The external-provider inner component is loaded via ngComponentOutlet for shibboleth. + expect(fixture.debugElement.queryAll(By.directive(LogInExternalProviderComponent)).length).toBe(1); + expect(fixture.debugElement.queryAll(By.directive(LogInPasswordComponent)).length).toBe(0); + }); + it('should render only the password auth method when showPasswordLogin is enabled', () => { + // TestBed.overrideProvider() cannot be called after the module is instantiated, so we + // set the property directly on the component instance instead of going through APP_CONFIG. + component.showPasswordLogin = true; + fixture.detectChanges(); // re-render LogInComponent; creates the password LogInContainerComponent + fixture.detectChanges(); // second cycle allows ngComponentOutlet inside the new container to render LogInPasswordComponent + + const loginContainers = fixture.debugElement.queryAll(By.directive(LogInContainerComponent)); + // authMethodsMock = [password, shibboleth]. With showPasswordLogin: true, + // only the password container renders (exclusive toggle). The outer container count + // and the inner rendered method component both confirm which method is shown. + expect(loginContainers.length).toBe(1); + // The password inner component is loaded via ngComponentOutlet for password. + expect(fixture.debugElement.queryAll(By.directive(LogInPasswordComponent)).length).toBe(1); + expect(fixture.debugElement.queryAll(By.directive(LogInExternalProviderComponent)).length).toBe(0); }); + + }); }); diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts index e6b2ba9dcf1..79dff4cb6e3 100644 --- a/src/app/shared/log-in/log-in.component.ts +++ b/src/app/shared/log-in/log-in.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Inject, Input, OnInit } from '@angular/core'; import { Observable } from 'rxjs'; import { select, Store } from '@ngrx/store'; import { AuthMethod } from '../../core/auth/models/auth.method'; @@ -15,6 +15,7 @@ import { AuthorizationDataService } from '../../core/data/feature-authorization/ import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { CoreState } from '../../core/core-state.model'; import { AuthMethodType } from '../../core/auth/models/auth.method-type'; +import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface'; /** * /users/sign-in @@ -56,12 +57,20 @@ export class LogInComponent implements OnInit { */ canRegister$: Observable; + /** + * Whether the username/password login form should be shown (exclusive toggle). + * Driven by config.auth.showPasswordLogin. Defaults to false. + */ + public showPasswordLogin: boolean; + constructor(private store: Store, private authService: AuthService, - private authorizationService: AuthorizationDataService) { + private authorizationService: AuthorizationDataService, + @Inject(APP_CONFIG) private appConfig: AppConfig) { } ngOnInit(): void { + this.showPasswordLogin = this.appConfig.auth?.showPasswordLogin ?? false; this.store.pipe( select(getAuthenticationMethods), diff --git a/src/app/shared/log-out/log-out.component.ts b/src/app/shared/log-out/log-out.component.ts index 6fa71caa328..831edfa7c45 100644 --- a/src/app/shared/log-out/log-out.component.ts +++ b/src/app/shared/log-out/log-out.component.ts @@ -43,7 +43,7 @@ export class LogOutComponent implements OnInit { * Go to the home page. */ public home() { - this.router.navigate(['/home']); + this.router.navigate(['/documents']); } public logOut() { diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html index d69f87883bb..7748e385ca4 100644 --- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html +++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html @@ -1,5 +1,5 @@
-
{{ label }}
+

{{ label }}

diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss index 75dfd09d0d9..5033ebfc0d3 100644 --- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss +++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss @@ -2,4 +2,9 @@ .simple-view-element { margin-bottom: 15px; } + + .simple-view-element-header { + margin-top: 1.5rem; + } } + diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html index 7944d24d96d..2f4a4c81045 100644 --- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html +++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html @@ -1,5 +1,5 @@ - -
- +
+ +
+ - +
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.html b/src/app/shared/search/search-export-csv/search-export-csv.component.html index 7bf87043007..4e890b6078c 100644 --- a/src/app/shared/search/search-export-csv/search-export-csv.component.html +++ b/src/app/shared/search/search-export-csv/search-export-csv.component.html @@ -1,7 +1,9 @@ + \ No newline at end of file diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html index 7834c4c5571..08e55954f9a 100644 --- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html +++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html @@ -32,13 +32,15 @@ + + +
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html index e392cd2663e..91ae9b5833e 100644 --- a/src/app/shared/search/search-filters/search-filters.component.html +++ b/src/app/shared/search/search-filters/search-filters.component.html @@ -1,7 +1,33 @@

{{"search.filters.head" | translate}}

+ + {{"search.filters.reset" | translate}} +
- {{"search.filters.reset" | translate}} + + +
+

Legend

+
+ + Restricted to current U-M faculty, staff, and students Limited access: U-M users only + + + Request Copy Access by request + + + Hathi Access via HathiTrust + + + Fulcrum Access via Fulcrum +
+
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html index bffb7f9329b..32e651e54c9 100644 --- a/src/app/shared/search/search-labels/search-label/search-label.component.html +++ b/src/app/shared/search/search-labels/search-label/search-label.component.html @@ -1,6 +1,11 @@ - - {{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }} + {{ ('search.filters.applied.' + key) | translate }}: + {{ + value === 'item,authority' ? 'Deposited' : + value === 'workspace,authority' ? 'Draft' : + ('search.filters.' + filterName + '.' + value) | translate: {default: normalizeFilterValue(value)} + }} × diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html index 11c589254a2..1f1e58ea108 100644 --- a/src/app/shared/search/search-results/search-results.component.html +++ b/src/app/shared/search/search-results/search-results.component.html @@ -1,5 +1,5 @@
-

{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}

+

{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}

diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.html b/src/app/shared/search/search-sidebar/search-sidebar.component.html index f489de5d289..cbcf373559a 100644 --- a/src/app/shared/search/search-sidebar/search-sidebar.component.html +++ b/src/app/shared/search/search-sidebar/search-sidebar.component.html @@ -8,22 +8,27 @@
+
+ + + -
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html index d43f506866f..74d5cb6bccb 100644 --- a/src/app/shared/search/search.component.html +++ b/src/app/shared/search/search.component.html @@ -22,7 +22,9 @@
+ -
@@ -45,17 +45,16 @@
- +

{{'submission.general.discard.confirm.title' | translate}}

 + + +
+

{{'submission.general.deposit.confirm.title' | translate}}

+ +
+
+

{{'submission.general.deposit.confirm.info' | translate}}

+
+
+ + +
+ + diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts index dd28f9a10a7..cad08ba2368 100644 --- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts +++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts @@ -213,7 +213,7 @@ describe('SubmissionFormFooterComponent', () => { comp.showDepositAndDiscard = observableOf(true); compAsAny.submissionIsInvalid = observableOf(true); fixture.detectChanges(); - const depositBtn: any = fixture.debugElement.query(By.css('.btn-success')); + const depositBtn: any = fixture.debugElement.query(By.css('.btn-info')); expect(depositBtn.nativeElement.disabled).toBeFalsy(); }); @@ -222,7 +222,7 @@ describe('SubmissionFormFooterComponent', () => { comp.showDepositAndDiscard = observableOf(true); compAsAny.submissionIsInvalid = observableOf(false); fixture.detectChanges(); - const depositBtn: any = fixture.debugElement.query(By.css('.btn-success')); + const depositBtn: any = fixture.debugElement.query(By.css('.btn-info')); expect(depositBtn.nativeElement.disabled).toBeFalsy(); }); diff --git a/src/app/submission/form/footer/submission-form-footer.component.ts b/src/app/submission/form/footer/submission-form-footer.component.ts index 7a11537616d..5841b45b23f 100644 --- a/src/app/submission/form/footer/submission-form-footer.component.ts +++ b/src/app/submission/form/footer/submission-form-footer.component.ts @@ -115,4 +115,14 @@ export class SubmissionFormFooterComponent implements OnChanges { } ); } + + public confirmDeposit(content) { + this.modalService.open(content).result.then( + (result) => { + if (result === 'ok') { + this.submissionService.dispatchDeposit(this.submissionId); + } + } + ); + } } diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html index 4a916cfe238..22d0cfc8128 100644 --- a/src/app/submission/form/submission-form.component.html +++ b/src/app/submission/form/submission-form.component.html @@ -1,14 +1,16 @@
+
+
+
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html index bbb0dbcc942..76ba3eaada2 100644 --- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html +++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html @@ -30,7 +30,7 @@

{{'submission.import-external.preview.title.' + labelPrefix | translate}}
-
diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html index e6ae9d1b9c1..cf24326b77d 100644 --- a/src/app/submission/sections/container/section-container.component.html +++ b/src/app/submission/sections/container/section-container.component.html @@ -9,21 +9,27 @@ 'submission.sections.'+sectionData.header | translate }}
- - - - + + + + + + + + + @@ -48,4 +54,4 @@ -
\ No newline at end of file +
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.html b/src/app/submission/sections/identifiers/section-identifiers.component.html index dd0b5d2930a..d225b027b82 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.html +++ b/src/app/submission/sections/identifiers/section-identifiers.component.html @@ -15,6 +15,7 @@ + {{'submission.sections.identifiers.para' | translate}}

diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts index 9ee4a7dda5e..45da77036bb 100644 --- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts +++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts @@ -377,9 +377,11 @@ export class SubmissionSectionUploadFileEditComponent // Number of access conditions blocks in form accessConditionsArrayConfig.initialCount = isNotEmpty(this.fileData.accessConditions) ? this.fileData.accessConditions.length : 1; - formModel.push( - new DynamicFormArrayModel(accessConditionsArrayConfig, BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT) - ); + + // UM Change Don't allow user to embargo files individually. + // formModel.push( + // new DynamicFormArrayModel(accessConditionsArrayConfig, BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT) + // ); } this.initModelData(formModel); @@ -416,55 +418,57 @@ export class SubmissionSectionUploadFileEditComponent this.operationsBuilder.remove(this.pathCombiner.getPath(path)); }); const accessConditionsToSave = []; - formData.accessConditions - .map((accessConditions) => accessConditions.accessConditionGroup) - .filter((accessCondition) => isNotEmpty(accessCondition)) - .forEach((accessCondition) => { - let accessConditionOpt; - - this.availableAccessConditionOptions - .filter((element) => isNotNull(accessCondition.name) && element.name === accessCondition.name[0].value) - .forEach((element) => accessConditionOpt = element); - - if (accessConditionOpt) { - const currentAccessCondition = Object.assign({}, accessCondition); - currentAccessCondition.name = this.retrieveValueFromField(accessCondition.name); - - /* When start and end date fields are deactivated, their values may be still present in formData, - therefore it is necessary to delete them if they're not allowed by the current access condition option. */ - if (!accessConditionOpt.hasStartDate) { - delete currentAccessCondition.startDate; - } else if (accessCondition.startDate) { - const startDate = this.retrieveValueFromField(accessCondition.startDate); - // Clamp the start date to the maximum, if any, since the - // datepicker sometimes exceeds it. - let startDateDate = new Date(startDate); - if (accessConditionOpt.maxStartDate) { - const maxStartDateDate = new Date(accessConditionOpt.maxStartDate); - if (startDateDate > maxStartDateDate) { - startDateDate = maxStartDateDate; - } - } - currentAccessCondition.startDate = dateToISOFormat(startDateDate); - } - if (!accessConditionOpt.hasEndDate) { - delete currentAccessCondition.endDate; - } else if (accessCondition.endDate) { - const endDate = this.retrieveValueFromField(accessCondition.endDate); - // Clamp the end date to the maximum, if any, since the - // datepicker sometimes exceeds it. - let endDateDate = new Date(endDate); - if (accessConditionOpt.maxEndDate) { - const maxEndDateDate = new Date(accessConditionOpt.maxEndDate); - if (endDateDate > maxEndDateDate) { - endDateDate = maxEndDateDate; - } - } - currentAccessCondition.endDate = dateToISOFormat(endDateDate); - } - accessConditionsToSave.push(currentAccessCondition); - } - }); + // UM Change + // Remove this so user is not able to embargo files independently. + // formData.accessConditions + // .map((accessConditions) => accessConditions.accessConditionGroup) + // .filter((accessCondition) => isNotEmpty(accessCondition)) + // .forEach((accessCondition) => { + // let accessConditionOpt; + + // this.availableAccessConditionOptions + // .filter((element) => isNotNull(accessCondition.name) && element.name === accessCondition.name[0].value) + // .forEach((element) => accessConditionOpt = element); + + // if (accessConditionOpt) { + // const currentAccessCondition = Object.assign({}, accessCondition); + // currentAccessCondition.name = this.retrieveValueFromField(accessCondition.name); + + // /* When start and end date fields are deactivated, their values may be still present in formData, + // therefore it is necessary to delete them if they're not allowed by the current access condition option. */ + // if (!accessConditionOpt.hasStartDate) { + // delete currentAccessCondition.startDate; + // } else if (accessCondition.startDate) { + // const startDate = this.retrieveValueFromField(accessCondition.startDate); + // // Clamp the start date to the maximum, if any, since the + // // datepicker sometimes exceeds it. + // let startDateDate = new Date(startDate); + // if (accessConditionOpt.maxStartDate) { + // const maxStartDateDate = new Date(accessConditionOpt.maxStartDate); + // if (startDateDate > maxStartDateDate) { + // startDateDate = maxStartDateDate; + // } + // } + // currentAccessCondition.startDate = dateToISOFormat(startDateDate); + // } + // if (!accessConditionOpt.hasEndDate) { + // delete currentAccessCondition.endDate; + // } else if (accessCondition.endDate) { + // const endDate = this.retrieveValueFromField(accessCondition.endDate); + // // Clamp the end date to the maximum, if any, since the + // // datepicker sometimes exceeds it. + // let endDateDate = new Date(endDate); + // if (accessConditionOpt.maxEndDate) { + // const maxEndDateDate = new Date(accessConditionOpt.maxEndDate); + // if (endDateDate > maxEndDateDate) { + // endDateDate = maxEndDateDate; + // } + // } + // currentAccessCondition.endDate = dateToISOFormat(endDateDate); + // } + // accessConditionsToSave.push(currentAccessCondition); + // } + // }); if (isNotEmpty(accessConditionsToSave)) { this.operationsBuilder.add(this.pathCombiner.getPath('accessConditions'), accessConditionsToSave, true); diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html index 8999853d722..deae7165bf5 100644 --- a/src/app/submission/sections/upload/file/section-upload-file.component.html +++ b/src/app/submission/sections/upload/file/section-upload-file.component.html @@ -1,24 +1,25 @@
-
- - -
-
+
+

{{fileName}} ({{fileData?.sizeBytes | dsFileSize}})

+ + +
- + - +
- +
@@ -46,7 +47,9 @@

{{ 'submission.sections.upload.delete.confir

{{ 'submission.sections.upload.delete.confirm.info' | translate }}

- - + +
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html index b84ef6f6a8c..c5ad21ec402 100644 --- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html +++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html @@ -1,5 +1,6 @@
+ {{entry.value | dsTruncate:['150']}} diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html index b57b4542885..111f0f9003c 100644 --- a/src/app/submission/sections/upload/section-upload.component.html +++ b/src/app/submission/sections/upload/section-upload.component.html @@ -2,6 +2,14 @@ [dismissible]="true" [type]="AlertTypeEnum.Info"> + +
+ +
+
+
diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts index eefed8a36b5..bd3dc227de7 100644 --- a/src/app/submission/sections/upload/section-upload.component.ts +++ b/src/app/submission/sections/upload/section-upload.component.ts @@ -1,15 +1,25 @@ -import { ChangeDetectorRef, Component, Inject } from '@angular/core'; - +import { ChangeDetectorRef, Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, - Subscription + Subscription, } from 'rxjs'; -import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators'; - +import { + distinctUntilChanged, + filter, + map, + mergeMap, + switchMap, + tap, +} from 'rxjs/operators'; import { SectionModelComponent } from '../models/section.model'; -import { hasValue, isNotEmpty, isNotUndefined, isUndefined } from '../../../shared/empty.util'; +import { + hasValue, + isNotEmpty, + isNotUndefined, + isUndefined, +} from '../../../shared/empty.util'; import { SectionUploadService } from './section-upload.service'; import { CollectionDataService } from '../../../core/data/collection-data.service'; import { GroupDataService } from '../../../core/eperson/group-data.service'; @@ -23,7 +33,6 @@ import { SectionDataObject } from '../models/section-data.model'; import { SubmissionObjectEntry } from '../../objects/submission-objects.reducer'; import { AlertType } from '../../../shared/alert/aletr-type'; import { RemoteData } from '../../../core/data/remote-data'; -import { Group } from '../../../core/eperson/models/group.model'; import { SectionsService } from '../sections.service'; import { SubmissionService } from '../../submission.service'; import { Collection } from '../../../core/shared/collection.model'; @@ -31,170 +40,131 @@ import { AccessConditionOption } from '../../../core/config/models/config-access import { followLink } from '../../../shared/utils/follow-link-config.model'; import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; +import { UploaderOptions } from '../../../shared/upload/uploader/uploader-options.model'; +import { AuthService } from '../../../core/auth/auth.service'; +import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; +import { Group } from '../../../core/eperson/models/group.model'; -export const POLICY_DEFAULT_NO_LIST = 1; // Banner1 -export const POLICY_DEFAULT_WITH_LIST = 2; // Banner2 +export const POLICY_DEFAULT_NO_LIST = 1; +export const POLICY_DEFAULT_WITH_LIST = 2; export interface AccessConditionGroupsMapEntry { accessCondition: string; groups: Group[]; } -/** - * This component represents a section that contains submission's bitstreams - */ @Component({ selector: 'ds-submission-section-upload', styleUrls: ['./section-upload.component.scss'], templateUrl: './section-upload.component.html', }) @renderSectionFor(SectionsType.Upload) -export class SubmissionSectionUploadComponent extends SectionModelComponent { - - /** - * The AlertType enumeration - * @type {AlertType} - */ +export class SubmissionSectionUploadComponent + extends SectionModelComponent + implements OnInit, OnDestroy +{ public AlertTypeEnum = AlertType; - - /** - * The array containing the keys of file list array - * @type {Array} - */ public fileIndexes: string[] = []; - - /** - * The file list - * @type {Array} - */ public fileList: any[] = []; - - /** - * The array containing the name of the files - * @type {Array} - */ public fileNames: string[] = []; - - /** - * The collection name this submission belonging to - * @type {string} - */ public collectionName: string; - - /** - * Default access conditions of this collection - * @type {Array} - */ public collectionDefaultAccessConditions: any[] = []; - - /** - * Define if collection access conditions policy type : - * POLICY_DEFAULT_NO_LIST : is not possible to define additional access group/s for the single file - * POLICY_DEFAULT_WITH_LIST : is possible to define additional access group/s for the single file - * @type {number} - */ public collectionPolicyType: number; - - /** - * The configuration for the bitstream's metadata form - */ public configMetadataForm$: Observable; - - /** - * List of available access conditions that could be set to files - */ - public availableAccessConditionOptions: AccessConditionOption[]; // List of accessConditions that an user can select - - /** - * Is the upload required - * @type {boolean} - */ + public availableAccessConditionOptions: AccessConditionOption[]; public required$ = new BehaviorSubject(true); - - /** - * Array to track all subscriptions and unsubscribe them onDestroy - * @type {Array} - */ protected subs: Subscription[] = []; - - /** - * Initialize instance variables - * - * @param {SectionUploadService} bitstreamService - * @param {ChangeDetectorRef} changeDetectorRef - * @param {CollectionDataService} collectionDataService - * @param {GroupDataService} groupService - * @param {ResourcePolicyDataService} resourcePolicyService - * @param {SectionsService} sectionService - * @param {SubmissionService} submissionService - * @param {SubmissionUploadsConfigDataService} uploadsConfigService - * @param {SectionDataObject} injectedSectionData - * @param {string} injectedSubmissionId - */ - constructor(private bitstreamService: SectionUploadService, - private changeDetectorRef: ChangeDetectorRef, - private collectionDataService: CollectionDataService, - private groupService: GroupDataService, - private resourcePolicyService: ResourcePolicyDataService, - protected sectionService: SectionsService, - private submissionService: SubmissionService, - private uploadsConfigService: SubmissionUploadsConfigDataService, - public dsoNameService: DSONameService, - @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject, - @Inject('submissionIdProvider') public injectedSubmissionId: string) { + + public uploadEnabled$: Observable; + public uploadFilesOptions: UploaderOptions = new UploaderOptions(); + + constructor( + private authService: AuthService, + private bitstreamService: SectionUploadService, + private changeDetectorRef: ChangeDetectorRef, + private collectionDataService: CollectionDataService, + private groupService: GroupDataService, + private resourcePolicyService: ResourcePolicyDataService, + protected sectionService: SectionsService, + private submissionService: SubmissionService, + private uploadsConfigService: SubmissionUploadsConfigDataService, + public dsoNameService: DSONameService, + private halService: HALEndpointService, // Add this line + @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject, + @Inject('submissionIdProvider') public injectedSubmissionId: string + ) { super(undefined, injectedSectionData, injectedSubmissionId); } - /** - * Initialize all instance variables and retrieve collection default access conditions - */ + ngOnInit() { + this.initUploadOptions(); + this.onSectionInit(); + } + + private initUploadOptions() { + this.uploadEnabled$ = this.sectionService.isSectionTypeAvailable(this.submissionId, SectionsType.Upload); + + this.halService.getEndpoint(this.submissionService.getSubmissionObjectLinkName()) + .pipe( + filter((href: string) => isNotEmpty(href)), + distinctUntilChanged() + ).subscribe((endpointURL) => { + this.uploadFilesOptions.authToken = this.authService.buildAuthHeader(); + this.uploadFilesOptions.url = endpointURL.concat(`/${this.submissionId}`); + }); + } + onSectionInit() { const config$ = this.uploadsConfigService.findByHref(this.sectionData.config, true, false, followLink('metadata')).pipe( getFirstSucceededRemoteData(), - map((config) => config.payload)); + map((config) => config.payload) + ); - // retrieve configuration for the bitstream's metadata form this.configMetadataForm$ = config$.pipe( switchMap((config: SubmissionUploadsModel) => config.metadata.pipe( getFirstSucceededRemoteData(), map((remoteData: RemoteData) => remoteData.payload) ) - )); + ) + ); this.subs.push( this.submissionService.getSubmissionObject(this.submissionId).pipe( - filter((submissionObject: SubmissionObjectEntry) => isNotUndefined(submissionObject) && !submissionObject.isLoading), - filter((submissionObject: SubmissionObjectEntry) => isUndefined(this.collectionId) || this.collectionId !== submissionObject.collection), - tap((submissionObject: SubmissionObjectEntry) => this.collectionId = submissionObject.collection), - mergeMap((submissionObject: SubmissionObjectEntry) => this.collectionDataService.findById(submissionObject.collection)), - filter((rd: RemoteData) => isNotUndefined((rd.payload))), - tap((collectionRemoteData: RemoteData) => this.collectionName = this.dsoNameService.getName(collectionRemoteData.payload)), - // TODO review this part when https://github.com/DSpace/dspace-angular/issues/575 is resolved -/* mergeMap((collectionRemoteData: RemoteData) => { - return this.resourcePolicyService.findByHref( - (collectionRemoteData.payload as any)._links.defaultAccessConditions.href + filter((submissionObject: SubmissionObjectEntry) => + isNotUndefined(submissionObject) && !submissionObject.isLoading + ), + filter((submissionObject: SubmissionObjectEntry) => + isUndefined(this.collectionId) || + this.collectionId !== submissionObject.collection + ), + tap( + (submissionObject: SubmissionObjectEntry) => + (this.collectionId = submissionObject.collection) + ), + mergeMap((submissionObject: SubmissionObjectEntry) => + this.collectionDataService.findById(submissionObject.collection) + ), + filter((rd: RemoteData) => + isNotUndefined(rd.payload) + ), + tap((collectionRemoteData: RemoteData) => { + this.collectionName = this.dsoNameService.getName( + collectionRemoteData.payload ); }), - filter((defaultAccessConditionsRemoteData: RemoteData) => - defaultAccessConditionsRemoteData.hasSucceeded), - tap((defaultAccessConditionsRemoteData: RemoteData) => { - if (isNotEmpty(defaultAccessConditionsRemoteData.payload)) { - this.collectionDefaultAccessConditions = Array.isArray(defaultAccessConditionsRemoteData.payload) - ? defaultAccessConditionsRemoteData.payload : [defaultAccessConditionsRemoteData.payload]; - } - }),*/ - mergeMap(() => config$), + mergeMap(() => config$) ).subscribe((config: SubmissionUploadsModel) => { this.required$.next(config.required); - this.availableAccessConditionOptions = isNotEmpty(config.accessConditionOptions) ? config.accessConditionOptions : []; + this.availableAccessConditionOptions = isNotEmpty(config.accessConditionOptions) + ? config.accessConditionOptions + : []; this.collectionPolicyType = this.availableAccessConditionOptions.length > 0 ? POLICY_DEFAULT_WITH_LIST : POLICY_DEFAULT_NO_LIST; this.changeDetectorRef.detectChanges(); }), - // retrieve submission's bitstreams from state observableCombineLatest(this.configMetadataForm$, this.bitstreamService.getUploadedFileList(this.submissionId, this.sectionData.id)).pipe( filter(([configMetadataForm, fileList]: [SubmissionFormsModel, any[]]) => { @@ -213,7 +183,6 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent { this.fileNames.push(this.getFileName(configMetadataForm, file)); }); } - this.changeDetectorRef.detectChanges(); } ) @@ -236,10 +205,10 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent { } else { title = fileData.uuid; } - return title; } + /** * Get section status * @@ -251,7 +220,7 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent { // if mandatory, at least one file is required return observableCombineLatest(this.required$, this.bitstreamService.getUploadedFileList(this.submissionId, this.sectionData.id), - (required,fileList: any[]) => { + (required, fileList: any[]) => { return (!required || (isNotUndefined(fileList) && fileList.length > 0)); }); } diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts index eaff12c169d..a7d9c053017 100644 --- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts +++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts @@ -247,7 +247,7 @@ export class SystemWideAlertFormComponent implements OnInit { * Navigate back to the homepage */ back() { - this.router.navigate(['/home']); + this.router.navigate(['/documents']); } diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts index 61393d9f64e..d75c184053e 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts @@ -13,7 +13,7 @@ import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete @NgModule({ imports: [ RouterModule.forChild([ - { path: '', redirectTo: '/home', pathMatch: 'full' }, + { path: '', redirectTo: '/documents', pathMatch: 'full' }, { path: ':id', resolve: { wsi: WorkspaceItemPageResolver }, diff --git a/src/assets/header.js b/src/assets/header.js new file mode 100644 index 00000000000..9a6937dcd2e --- /dev/null +++ b/src/assets/header.js @@ -0,0 +1,28 @@ +// assets/header.js +window.umConsentManager = { + //mode: 'prod', // values: 'prod', 'dev' + //customManager: { + // enabled: true, + // alwaysShow: true + //enabled : false, + //alwaysShow: false, + //rootDomain: false, + //preferencePanel: { + // beforeCategories: false, // HTML + // afterCategories: false // HTML + //} + //}, + privacyUrl: 'https://lib.umich.edu/about-us/policies/library-privacy-statement', + //onConsentChange: ({ cookie }){}, + googleAnalyticsID: false, // e.g. G-XXXXXXXXXX + //cookies: { + // necessary: [], // {name: '', domain: '', regex: ''} + // analytics: [] + //} +}; +(function() { + var script = document.createElement('script'); + script.src = 'https://umich.edu/apis/umconsentmanager/consentmanager.js'; + script.async = true; // Enables asynchronous loading + document.head.appendChild(script); +})(); diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 6c91bae4c16..50d728bc37c 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -132,11 +132,13 @@ "admin.registries.bitstream-formats.table.return": "Back", - "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known", + "admin.registries.bitstream-formats.table.supportLevel.AS_IS_UNKNOWN": "Level 3 (As-Is, Unknown)", - "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported", + "admin.registries.bitstream-formats.table.supportLevel.LIMITED": "Level 2 (Limited)", - "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown", + "admin.registries.bitstream-formats.table.supportLevel.HIGHEST_LEVEL": "Level 1 (Highest Level)", + + "admin.registries.bitstream-formats.table.supportLevel.AS_IS_KNOWN": "Level 3 (As-Is, Known)", "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level", @@ -286,7 +288,7 @@ "admin.access-control.epeople.form.firstName": "First name", - "admin.access-control.epeople.form.lastName": "Last name", + "admin.access-control.epeople.form.lastName": "Last name(s)", "admin.access-control.epeople.form.email": "E-mail", @@ -566,7 +568,7 @@ "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here", - "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import", + "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Works to import", "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source", @@ -602,7 +604,7 @@ "advanced-workflow-action.rating.form.rating.label": "Rating", - "advanced-workflow-action.rating.form.rating.error": "You must rate the item", + "advanced-workflow-action.rating.form.rating.error": "You must rate the work", "advanced-workflow-action.rating.form.review.label": "Review", @@ -688,7 +690,7 @@ "bitstream.edit.form.description.label": "Description", - "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. This date cannot be modified on this form. To set an embargo date for a bitstream, go to the Item Status tab, click Authorizations..., create or edit the bitstream's READ policy, and set the Start Date as desired.", + "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. This date cannot be modified on this form. To set an embargo date for a bitstream, go to the Work Status tab, click Authorizations..., create or edit the bitstream's READ policy, and set the Start Date as desired.", "bitstream.edit.form.embargo.label": "Embargo until specific date", @@ -732,7 +734,7 @@ "bitstream.edit.notifications.saved.title": "Bitstream saved", - "bitstream.edit.title": "Edit bitstream", + "bitstream.edit.title": "Edit File Details", "bitstream-request-a-copy.alert.canDownload1": "You already have access to this file. If you want to download the file, click ", @@ -740,7 +742,7 @@ "bitstream-request-a-copy.header": "Request a copy of the file", - "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ", + "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following work: ", "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ", @@ -758,9 +760,9 @@ "bitstream-request-a-copy.allfiles.label": "Files", - "bitstream-request-a-copy.files-all-false.label": "Only the requested file", + "bitstream-request-a-copy.files-all-false.label": "Only the file I clicked on", - "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access", + "bitstream-request-a-copy.files-all-true.label": "All files from this work", "bitstream-request-a-copy.message.label": "Message", @@ -768,9 +770,9 @@ "bitstream-request-a-copy.submit": "Request copy", - "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.", + "bitstream-request-a-copy.submit.success": "The work request was submitted successfully.", - "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.", + "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the work request.", "browse.back.all-results": "All browse results", @@ -780,13 +782,13 @@ "browse.comcol.by.subject": "By Subject", - "browse.comcol.by.srsc": "By Subject Category", + "browse.comcol.by.srsc": "By Subject Category 123", "browse.comcol.by.title": "By Title", "browse.comcol.head": "Browse", - "browse.empty": "No items to show.", + "browse.empty": "No works to show.", "browse.metadata.author": "Author", @@ -856,7 +858,7 @@ "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button", - "browse.startsWith.type_text": "Filter results by typing the first few letters", + "browse.startsWith.type_text": "Enter first few letters:", "browse.startsWith.input": "Filter", @@ -904,45 +906,47 @@ "collection.edit.breadcrumbs": "Edit Collection", - "collection.edit.tabs.mapper.head": "Item Mapper", + "collection.edit.tabs.mapper.head": "Work Mapper", - "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper", + "collection.edit.tabs.item-mapper.title": "Collection Edit - Work Mapper", "collection.edit.item-mapper.cancel": "Cancel", "collection.edit.item-mapper.collection": "Collection: \"{{name}}\"", - "collection.edit.item-mapper.confirm": "Map selected items", + "collection.edit.item-mapper.confirm": "Map selected works", + + "collection.edit.item-mapper.description": "This is the work mapper tool that allows collection administrators to map works from other collections into this collection. You can search for works from other collections and map them, or browse the list of currently mapped works.", - "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.", + "collection.edit.item-mapper.head": "Work Mapper - Map Works from Other Collections", - "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections", + "collection.edit.item-mapper.checkall-desc": "By clicking on this, you will select/uselect all the works.", "collection.edit.item-mapper.no-search": "Please enter a query to search", - "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.", + "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} works.", "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors", - "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.", + "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} works.", "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed", - "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.", + "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} works.", "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors", - "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.", + "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} works.", "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed", - "collection.edit.item-mapper.remove": "Remove selected item mappings", + "collection.edit.item-mapper.remove": "Remove selected work mappings", - "collection.edit.item-mapper.search-form.placeholder": "Search items...", + "collection.edit.item-mapper.search-form.placeholder": "Search works...", - "collection.edit.item-mapper.tabs.browse": "Browse mapped items", + "collection.edit.item-mapper.tabs.browse": "Browse mapped works", - "collection.edit.item-mapper.tabs.map": "Map new items", + "collection.edit.item-mapper.tabs.map": "Map new works", "collection.edit.logo.delete.title": "Delete logo", @@ -1030,7 +1034,7 @@ "collection.edit.template.add-button": "Add", - "collection.edit.template.breadcrumbs": "Item template", + "collection.edit.template.breadcrumbs": "Work template", "collection.edit.template.cancel": "Cancel", @@ -1038,19 +1042,19 @@ "collection.edit.template.edit-button": "Edit", - "collection.edit.template.error": "An error occurred retrieving the template item", + "collection.edit.template.error": "An error occurred retrieving the template work", - "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"", + "collection.edit.template.head": "Edit Template Work for Collection \"{{ collection }}\"", - "collection.edit.template.label": "Template item", + "collection.edit.template.label": "Template work", - "collection.edit.template.loading": "Loading template item...", + "collection.edit.template.loading": "Loading template work...", - "collection.edit.template.notifications.delete.error": "Failed to delete the item template", + "collection.edit.template.notifications.delete.error": "Failed to delete the work template", - "collection.edit.template.notifications.delete.success": "Successfully deleted the item template", + "collection.edit.template.notifications.delete.success": "Successfully deleted the work template", - "collection.edit.template.title": "Edit Template Item", + "collection.edit.template.title": "Edit Template Work", "collection.form.abstract": "Short Description", @@ -1072,9 +1076,9 @@ "collection.listelement.badge": "Collection", - "collection.page.browse.recent.head": "Recent Submissions", + "collection.page.browse.recent.head": "Recent Deposits", - "collection.page.browse.recent.empty": "No items to show", + "collection.page.browse.recent.empty": "No works to show", "collection.page.edit": "Edit this collection", @@ -1140,11 +1144,11 @@ "collection.source.update.notifications.error.title": "Server Error", - "communityList.breadcrumbs": "Community List", + "communityList.breadcrumbs": "Communities & Collections", - "communityList.tabTitle": "Community List", + "communityList.tabTitle": "Communities & Collections", - "communityList.title": "List of Communities", + "communityList.title": "Communities & Collections", "communityList.showMore": "Show More", @@ -1240,23 +1244,23 @@ "comcol-role.edit.collection-admin.name": "Administrators", - "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).", + "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit works to any sub-collections, edit work metadata (after submission), and add (map) existing works from other collections (subject to authorization).", - "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).", + "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit works to the collection, edit work metadata (after submission), and add (map) existing works from other collections to this collection (subject to authorization for that collection).", "comcol-role.edit.submitters.name": "Submitters", - "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.", + "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new works to this collection.", - "comcol-role.edit.item_read.name": "Default item read access", + "comcol-role.edit.item_read.name": "Default work read access", - "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.", + "comcol-role.edit.item_read.description": "E-People and Groups that can read new works submitted to this collection. Changes to this role are not retroactive. Existing works in the system will still be viewable by those who had read access at the time of their addition.", - "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.", + "comcol-role.edit.item_read.anonymous-group": "Default read for incoming works is currently set to Anonymous.", "comcol-role.edit.bitstream_read.name": "Default bitstream read access", - "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).", + "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit works to any sub-collections, edit work metadata (after submission), and add (map) existing works from other collections (subject to authorization).", "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.", @@ -1422,7 +1426,7 @@ "deny-request-copy.intro": "This message will be sent to the applicant of the request", - "deny-request-copy.success": "Successfully denied item request", + "deny-request-copy.success": "Successfully denied work request", "dso.name.untitled": "Untitled", @@ -1440,17 +1444,17 @@ "dso-selector.create.community.top-level": "Create a new top-level community", - "dso-selector.create.item.head": "New item", + "dso-selector.create.item.head": "New Work", - "dso-selector.create.item.sub-level": "Create a new item in", + "dso-selector.create.item.sub-level": "Create a new Work in one of the following collections", - "dso-selector.create.submission.head": "New submission", + "dso-selector.create.submission.head": "New Deposit", "dso-selector.edit.collection.head": "Edit collection", "dso-selector.edit.community.head": "Edit community", - "dso-selector.edit.item.head": "Edit item", + "dso-selector.edit.item.head": "Edit work", "dso-selector.error.title": "An error occurred searching for a {{ type }}", @@ -1468,7 +1472,7 @@ "dso-selector.set-scope.community.head": "Select a search scope", - "dso-selector.set-scope.community.button": "Search all of DSpace", + "dso-selector.set-scope.community.button": "Search all of DB Docs", "dso-selector.set-scope.community.or-divider": "or", @@ -1508,7 +1512,7 @@ "supervision-group-selector.notification.create.failure.title": "Error", - "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group", + "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this work for selected group", "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}", @@ -1552,7 +1556,7 @@ "error.bitstream": "Error fetching bitstream", - "error.browse-by": "Error fetching items", + "error.browse-by": "Error fetching works", "error.collection": "Error fetching collection", @@ -1560,13 +1564,13 @@ "error.community": "Error fetching community", - "error.identifier": "No item found for the identifier", + "error.identifier": "No work found for the identifier", "error.default": "Error", - "error.item": "Error fetching item", + "error.item": "Error fetching work", - "error.items": "Error fetching items", + "error.items": "Error fetching works", "error.objects": "Error fetching objects", @@ -1614,7 +1618,7 @@ "feed.description": "Syndication feed", - "file-section.error.header": "Error obtaining files for this item", + "file-section.error.header": "Error obtaining files for this work", "footer.copyright": "copyright © 2002-{{ year }}", @@ -1630,6 +1634,8 @@ "footer.link.feedback": "Send Feedback", + "info.feedback.subject": "Subject", + "forgot-email.form.header": "Forgot Password", "forgot-email.form.info": "Enter the email address associated with the account.", @@ -1708,7 +1714,7 @@ "form.group-expand-help": "Click here to expand and add more elements", - "form.last-name": "Last name", + "form.last-name": "Last name(s)", "form.loading": "Loading...", @@ -1746,13 +1752,13 @@ "form.create": "Create", - "form.repeatable.sort.tip": "Drop the item in the new position", + "form.repeatable.sort.tip": "Drop the work in the new position", "grant-deny-request-copy.deny": "Don't send copy", "grant-deny-request-copy.email.back": "Back", - "grant-deny-request-copy.email.message": "Optional additional message", + "grant-deny-request-copy.email.message": "Additional message (required)", "grant-deny-request-copy.email.message.empty": "Please enter a message", @@ -1786,7 +1792,7 @@ "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.", - "grant-request-copy.success": "Successfully granted item request", + "grant-request-copy.success": "Successfully granted work request", "health.breadcrumbs": "Health", @@ -1832,11 +1838,11 @@ "home.breadcrumbs": "Home", - "home.search-form.placeholder": "Search the repository ...", + "home.search-form.placeholder": "Search all of Deep Blue Documents", "home.title": "Home", - "home.top-level-communities.head": "Communities in DSpace", + "home.top-level-communities.head": "Communities in Deep Blue Documents", "home.top-level-communities.help": "Select a community to browse its collections.", @@ -1870,7 +1876,7 @@ "info.feedback.title": "Feedback", - "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!", + "info.feedback.info": "Thanks for sharing your feedback about the Deep Blue Documents. Your comments are appreciated!", "info.feedback.email_help": "This address will be used to follow up on your feedback.", @@ -1886,17 +1892,19 @@ "info.feedback.error.message.required": "A comment is required", + "info.feedback.error.subject.required" : "A subject is required", + "info.feedback.page-label": "Page", "info.feedback.page_help": "Tha page related to your feedback", - "item.alerts.private": "This item is non-discoverable", + "item.alerts.private": "This work is non-discoverable", - "item.alerts.withdrawn": "This item has been withdrawn", + "item.alerts.withdrawn": "This work has been withdrawn", - "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.", + "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an work, plus alter policies of individual work components: bundles and bitstreams. Briefly, an work is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.", - "item.edit.authorizations.title": "Edit item's Policies", + "item.edit.authorizations.title": "Edit work's Policies", "item.badge.private": "Non-discoverable", @@ -1908,13 +1916,13 @@ "item.bitstreams.upload.bundle.new": "Create bundle", - "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.", + "item.bitstreams.upload.bundles.empty": "This work doesn't contain any bundles to upload a bitstream to.", "item.bitstreams.upload.cancel": "Cancel", "item.bitstreams.upload.drop-message": "Drop a file to upload", - "item.bitstreams.upload.item": "Item: ", + "item.bitstreams.upload.item": "Work: ", "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.", @@ -1946,7 +1954,7 @@ "item.edit.bitstreams.edit.buttons.undo": "Undo changes", - "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.", + "item.edit.bitstreams.empty": "This work doesn't contain any bitstreams. Click the upload button to create one.", "item.edit.bitstreams.headers.actions": "Actions", @@ -1964,17 +1972,17 @@ "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams", - "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.", + "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this work's bitstreams and bundles have been saved.", "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved", - "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", + "item.edit.bitstreams.notifications.outdated.content": "The work you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", "item.edit.bitstreams.notifications.outdated.title": "Changes outdated", "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream", - "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.", + "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this work's bitstreams have been saved.", "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved", @@ -1988,23 +1996,23 @@ "item.edit.delete.confirm": "Delete", - "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.", + "item.edit.delete.description": "Are you sure this work should be completely deleted? Caution: At present, no tombstone would be left.", - "item.edit.delete.error": "An error occurred while deleting the item", + "item.edit.delete.error": "An error occurred while deleting the work", - "item.edit.delete.header": "Delete item: {{ id }}", + "item.edit.delete.header": "Delete work: {{ id }}", - "item.edit.delete.success": "The item has been deleted", + "item.edit.delete.success": "The work has been deleted", - "item.edit.head": "Edit Item", + "item.edit.head": "Edit Work", - "item.edit.breadcrumbs": "Edit Item", + "item.edit.breadcrumbs": "Edit Work", "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab", "item.edit.tabs.mapper.head": "Collection Mapper", - "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper", + "item.edit.tabs.item-mapper.title": "Work Edit - Collection Mapper", "item.edit.identifiers.doi.status.UNKNOWN": "Unknown", @@ -2036,7 +2044,7 @@ "item.edit.register-doi.header": "Register a new or pending DOI", - "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out", + "item.edit.register-doi.description": "Review any pending identifiers and work metadata below and click Confirm to proceed with DOI registration, or Cancel to back out", "item.edit.register-doi.confirm": "Confirm", @@ -2048,25 +2056,25 @@ "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online", - "item.edit.item-mapper.buttons.add": "Map item to selected collections", + "item.edit.item-mapper.buttons.add": "Map work to selected collections", - "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections", + "item.edit.item-mapper.buttons.remove": "Remove work's mapping for selected collections", "item.edit.item-mapper.cancel": "Cancel", - "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.", + "item.edit.item-mapper.description": "This is the work mapper tool that allows administrators to map this work to other collections. You can search for collections and map them, or browse the list of collections the work is currently mapped to.", - "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections", + "item.edit.item-mapper.head": "Work Mapper - Map Work to Collections", - "item.edit.item-mapper.item": "Item: \"{{name}}\"", + "item.edit.item-mapper.item": "Work: \"{{name}}\"", "item.edit.item-mapper.no-search": "Please enter a query to search", - "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.", + "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of work to {{amount}} collections.", "item.edit.item-mapper.notifications.add.error.head": "Mapping errors", - "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.", + "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped work to {{amount}} collections.", "item.edit.item-mapper.notifications.add.success.head": "Mapping completed", @@ -2074,7 +2082,7 @@ "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors", - "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.", + "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of work to {{amount}} collections.", "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed", @@ -2102,7 +2110,7 @@ "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab", - "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.", + "item.edit.metadata.empty": "The work currently doesn't contain any metadata. Click Add to start adding a metadata value.", "item.edit.metadata.headers.edit": "Edit", @@ -2126,11 +2134,11 @@ "item.edit.metadata.notifications.invalid.title": "Metadata invalid", - "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", + "item.edit.metadata.notifications.outdated.content": "The work you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", "item.edit.metadata.notifications.outdated.title": "Changes outdated", - "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.", + "item.edit.metadata.notifications.saved.content": "Your changes to this work's metadata were saved.", "item.edit.metadata.notifications.saved.title": "Metadata saved", @@ -2152,11 +2160,11 @@ "item.edit.move.discard-button": "Discard", - "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.", + "item.edit.move.description": "Select the collection you wish to move this work to. To narrow down the list of displayed collections, you can enter a search query in the box.", - "item.edit.move.error": "An error occurred when attempting to move the item", + "item.edit.move.error": "An error occurred when attempting to move the work", - "item.edit.move.head": "Move item: {{id}}", + "item.edit.move.head": "Move work: {{id}}", "item.edit.move.inheritpolicies.checkbox": "Inherit policies", @@ -2168,45 +2176,45 @@ "item.edit.move.search.placeholder": "Enter a search query to look for collections", - "item.edit.move.success": "The item has been moved successfully", + "item.edit.move.success": "The work has been moved successfully", - "item.edit.move.title": "Move item", + "item.edit.move.title": "Move work", "item.edit.private.cancel": "Cancel", "item.edit.private.confirm": "Make it non-discoverable", - "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?", + "item.edit.private.description": "Are you sure this work should be made non-discoverable in the archive?", - "item.edit.private.error": "An error occurred while making the item non-discoverable", + "item.edit.private.error": "An error occurred while making the work non-discoverable", - "item.edit.private.header": "Make item non-discoverable: {{ id }}", + "item.edit.private.header": "Make work non-discoverable: {{ id }}", - "item.edit.private.success": "The item is now non-discoverable", + "item.edit.private.success": "The work is now non-discoverable", "item.edit.public.cancel": "Cancel", "item.edit.public.confirm": "Make it discoverable", - "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?", + "item.edit.public.description": "Are you sure this work should be made discoverable in the archive?", - "item.edit.public.error": "An error occurred while making the item discoverable", + "item.edit.public.error": "An error occurred while making the work discoverable", - "item.edit.public.header": "Make item discoverable: {{ id }}", + "item.edit.public.header": "Make work discoverable: {{ id }}", - "item.edit.public.success": "The item is now discoverable", + "item.edit.public.success": "The work is now discoverable", "item.edit.reinstate.cancel": "Cancel", "item.edit.reinstate.confirm": "Reinstate", - "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?", + "item.edit.reinstate.description": "Are you sure this work should be reinstated to the archive?", - "item.edit.reinstate.error": "An error occurred while reinstating the item", + "item.edit.reinstate.error": "An error occurred while reinstating the work", - "item.edit.reinstate.header": "Reinstate item: {{ id }}", + "item.edit.reinstate.header": "Reinstate work: {{ id }}", - "item.edit.reinstate.success": "The item was reinstated successfully", + "item.edit.reinstate.success": "The work was reinstated successfully", "item.edit.relationships.discard-button": "Discard", @@ -2224,11 +2232,11 @@ "item.edit.relationships.notifications.failed.title": "Error editing relationships", - "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", + "item.edit.relationships.notifications.outdated.content": "The work you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", "item.edit.relationships.notifications.outdated.title": "Changes outdated", - "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.", + "item.edit.relationships.notifications.saved.content": "Your changes to this work's relationships were saved.", "item.edit.relationships.notifications.saved.title": "Relationships saved", @@ -2236,7 +2244,7 @@ "item.edit.relationships.save-button": "Save", - "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item", + "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this work", "item.edit.return": "Back", @@ -2246,111 +2254,113 @@ "item.edit.tabs.curate.head": "Curate", - "item.edit.tabs.curate.title": "Item Edit - Curate", + "item.edit.tabs.curate.title": "Work Edit - Curate", - "item.edit.curate.title": "Curate Item: {{item}}", + "item.edit.curate.title": "Curate Work: {{item}}", "item.edit.tabs.access-control.head": "Access Control", - "item.edit.tabs.access-control.title": "Item Edit - Access Control", + "item.edit.tabs.access-control.title": "Work Edit - Access Control", "item.edit.tabs.metadata.head": "Metadata", - "item.edit.tabs.metadata.title": "Item Edit - Metadata", + "item.edit.tabs.metadata.title": "Work Edit - Metadata", "item.edit.tabs.relationships.head": "Relationships", - "item.edit.tabs.relationships.title": "Item Edit - Relationships", + "item.edit.tabs.relationships.title": "Work Edit - Relationships", "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...", - "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies", + "item.edit.tabs.status.buttons.authorizations.label": "Edit work's authorization policies", "item.edit.tabs.status.buttons.delete.button": "Permanently delete", - "item.edit.tabs.status.buttons.delete.label": "Completely expunge item", + "item.edit.tabs.status.buttons.delete.label": "Completely expunge work", "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections", "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections", - "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection", + "item.edit.tabs.status.buttons.move.button": "Move this Work to a different Collection", - "item.edit.tabs.status.buttons.move.label": "Move item to another collection", + "item.edit.tabs.status.buttons.move.label": "Move work to another collection", "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...", - "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable", + "item.edit.tabs.status.buttons.private.label": "Make work non-discoverable", "item.edit.tabs.status.buttons.public.button": "Make it discoverable...", - "item.edit.tabs.status.buttons.public.label": "Make item discoverable", + "item.edit.tabs.status.buttons.public.label": "Make work discoverable", "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...", - "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository", + "item.edit.tabs.status.buttons.reinstate.label": "Reinstate work into the repository", "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action", - "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item", + "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this work", - "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository", + "item.edit.tabs.status.buttons.withdraw.label": "Withdraw work from the repository", - "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.", + "item.edit.tabs.status.description": "Welcome to the work management page. From here you can withdraw, reinstate, move or delete the work. You may also update or add new metadata / bitstreams on the other tabs.", "item.edit.tabs.status.head": "Status", "item.edit.tabs.status.labels.handle": "Handle", - "item.edit.tabs.status.labels.id": "Item Internal ID", + "item.edit.tabs.status.labels.id": "Work Internal ID", - "item.edit.tabs.status.labels.itemPage": "Item Page", + "item.edit.tabs.status.labels.itemPage": "Work Page", "item.edit.tabs.status.labels.lastModified": "Last Modified", - "item.edit.tabs.status.title": "Item Edit - Status", + "item.edit.tabs.status.title": "Work Edit - Status", "item.edit.tabs.versionhistory.head": "Version History", - "item.edit.tabs.versionhistory.title": "Item Edit - Version History", + "item.edit.tabs.versionhistory.title": "Work Edit - Version History", "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.", - "item.edit.tabs.view.head": "View Item", + "item.edit.tabs.view.head": "View Work", - "item.edit.tabs.view.title": "Item Edit - View", + "item.edit.tabs.view.title": "Work Edit - View", "item.edit.withdraw.cancel": "Cancel", "item.edit.withdraw.confirm": "Withdraw", - "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?", + "item.edit.withdraw.description": "Are you sure this work should be withdrawn from the archive?", - "item.edit.withdraw.error": "An error occurred while withdrawing the item", + "item.edit.withdraw.error": "An error occurred while withdrawing the work", - "item.edit.withdraw.header": "Withdraw item: {{ id }}", + "item.edit.withdraw.header": "Withdraw work: {{ id }}", - "item.edit.withdraw.success": "The item was withdrawn successfully", + "item.edit.withdraw.success": "The work was withdrawn successfully", "item.orcid.return": "Back", - "item.listelement.badge": "Item", + "item.listelement.badge": "Work", "item.page.description": "Description", + "item.page.filename": "Filename(s)", + "item.page.journal-issn": "Journal ISSN", "item.page.journal-title": "Journal Title", "item.page.publisher": "Publisher", - "item.page.titleprefix": "Item: ", + "item.page.titleprefix": "Work: ", "item.page.volume-title": "Volume Title", - "item.search.results.head": "Item Search Results", + "item.search.results.head": "Work Search Results", - "item.search.title": "Item Search", + "item.search.title": "Work Search", "item.truncatable-part.show-more": "Show more", @@ -2386,7 +2396,7 @@ "item.page.date": "Date", - "item.page.edit": "Edit this item", + "item.page.edit": "Edit this work", "item.page.files": "Files", @@ -2402,9 +2412,9 @@ "item.page.journal.search.title": "Articles in this journal", - "item.page.link.full": "Full item page", + "item.page.link.full": "Full work page", - "item.page.link.simple": "Simple item page", + "item.page.link.simple": "Simple work page", "item.page.orcid.title": "ORCID", @@ -2444,7 +2454,9 @@ "item.page.claim.button": "Claim", - "item.page.claim.tooltip": "Claim this item as profile", + "item.page.claim.tooltip": "Claim this work as profile", + + "item.page.metrics": "Metrics", "item.preview.dc.identifier.uri": "Identifier:", @@ -2500,7 +2512,7 @@ "item.select.confirm": "Confirm selected", - "item.select.empty": "No items to show", + "item.select.empty": "No works to show", "item.select.table.author": "Author", @@ -2508,7 +2520,7 @@ "item.select.table.title": "Title", - "item.version.history.empty": "There are no other versions for this item yet.", + "item.version.history.empty": "There are no other versions for this work yet.", "item.version.history.head": "Version History", @@ -2516,11 +2528,11 @@ "item.version.history.selected": "Selected version", - "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.", + "item.version.history.selected.alert": "You are currently viewing version {{version}} of the work.", "item.version.history.table.version": "Version", - "item.version.history.table.item": "Item", + "item.version.history.table.item": "Work", "item.version.history.table.editor": "Editor", @@ -2528,13 +2540,13 @@ "item.version.history.table.summary": "Summary", - "item.version.history.table.workspaceItem": "Workspace item", + "item.version.history.table.workspaceItem": "Workspace work", - "item.version.history.table.workflowItem": "Workflow item", + "item.version.history.table.workflowItem": "Workflow work", "item.version.history.table.actions": "Action", - "item.version.history.table.action.editWorkspaceItem": "Edit workspace item", + "item.version.history.table.action.editWorkspaceItem": "Edit workspace work", "item.version.history.table.action.editSummary": "Edit summary", @@ -2548,11 +2560,11 @@ "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", - "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", + "item.version.notice": "This is not the latest version of this work. The latest version can be found here.", "item.version.create.modal.header": "New version", - "item.version.create.modal.text": "Create a new version for this item", + "item.version.create.modal.text": "Create a new version for this work", "item.version.create.modal.text.startingFrom": "starting from version {{version}}", @@ -2570,7 +2582,7 @@ "item.version.create.modal.submitted.header": "Creating new version...", - "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.", + "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the work has a lot of relationships.", "item.version.create.notification.success": "New version has been created with version number {{version}}", @@ -2614,7 +2626,7 @@ "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing", - "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.", + "itemtemplate.edit.metadata.empty": "The work template currently doesn't contain any metadata. Click Add to start adding a metadata value.", "itemtemplate.edit.metadata.headers.edit": "Edit", @@ -2638,11 +2650,11 @@ "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid", - "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", + "itemtemplate.edit.metadata.notifications.outdated.content": "The work template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated", - "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.", + "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this work template's metadata were saved.", "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved", @@ -2656,7 +2668,7 @@ "journal.page.description": "Description", - "journal.page.edit": "Edit this item", + "journal.page.edit": "Edit this work", "journal.page.editor": "Editor-in-Chief", @@ -2676,7 +2688,7 @@ "journalissue.page.description": "Description", - "journalissue.page.edit": "Edit this item", + "journalissue.page.edit": "Edit this work", "journalissue.page.issuedate": "Issue Date", @@ -2694,7 +2706,7 @@ "journalvolume.page.description": "Description", - "journalvolume.page.edit": "Edit this item", + "journalvolume.page.edit": "Edit this work", "journalvolume.page.issuedate": "Issue Date", @@ -2742,11 +2754,11 @@ "loading.default": "Loading...", - "loading.item": "Loading item...", + "loading.item": "Loading work...", - "loading.items": "Loading items...", + "loading.items": "Loading works...", - "loading.mydspace-results": "Loading items...", + "loading.mydspace-results": "Loading works...", "loading.objects": "Loading...", @@ -2764,13 +2776,13 @@ "login.form.forgot-password": "Have you forgotten your password?", - "login.form.header": "Please log in to DSpace", + "login.form.header": "Please log in to Deep Blue Documents", "login.form.new-user": "New user? Click here to register.", "login.form.or-divider": "or", - "login.form.oidc": "Log in with OIDC", + "login.form.oidc": "Login", "login.form.orcid": "Log in with ORCID", @@ -2784,13 +2796,13 @@ "login.breadcrumbs": "Login", - "logout.form.header": "Log out from DSpace", + "logout.form.header": "Log out from Deep Blue Documents", "logout.form.submit": "Log out", "logout.title": "Logout", - "menu.header.admin": "Management", + "menu.header.admin": "Dashboard", "menu.header.image.logo": "Repository logo", @@ -2816,17 +2828,17 @@ "menu.section.browse_community_by_title": "By Title", - "menu.section.browse_global": "All of DSpace", + "menu.section.browse_global": "Browse", - "menu.section.browse_global_by_author": "By Author", + "menu.section.browse_global_by_author": "Author", - "menu.section.browse_global_by_dateissued": "By Issue Date", + "menu.section.browse_global_by_dateissued": "Issue Date", - "menu.section.browse_global_by_subject": "By Subject", + "menu.section.browse_global_by_subject": "Subject", - "menu.section.browse_global_by_srsc": "By Subject Category", + "menu.section.browse_global_by_srsc": "By Subject Category 456", - "menu.section.browse_global_by_title": "By Title", + "menu.section.browse_global_by_title": "Title", "menu.section.browse_global_communities_and_collections": "Communities & Collections", @@ -2840,7 +2852,7 @@ "menu.section.edit_community": "Community", - "menu.section.edit_item": "Item", + "menu.section.edit_item": "Work", "menu.section.export": "Export", @@ -2848,7 +2860,7 @@ "menu.section.export_community": "Community", - "menu.section.export_item": "Item", + "menu.section.export_item": "Work", "menu.section.export_metadata": "Metadata", @@ -2892,15 +2904,15 @@ "menu.section.import_metadata": "Metadata", - "menu.section.new": "New", + "menu.section.new": "Create New", "menu.section.new_collection": "Collection", "menu.section.new_community": "Community", - "menu.section.new_item": "Item", + "menu.section.new_item": "Work", - "menu.section.new_item_version": "Item Version", + "menu.section.new_item_version": "Work Version", "menu.section.new_process": "Process", @@ -2950,11 +2962,11 @@ "metadata-export-search.submit.error": "Starting the export has failed", - "mydspace.breadcrumbs": "MyDSpace", + "mydspace.breadcrumbs": "My Works", "mydspace.description": "", - "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.", + "mydspace.messages.controller-help": "Select this option to send a message to work's submitter.", "mydspace.messages.description-placeholder": "Insert your message here...", @@ -2980,13 +2992,13 @@ "mydspace.messages.to": "To", - "mydspace.new-submission": "New submission", + "mydspace.new-submission": "New Deposit", "mydspace.new-submission-external": "Import metadata from external source", "mydspace.new-submission-external-short": "Import metadata", - "mydspace.results.head": "Your submissions", + "mydspace.results.head": "Your deposits", "mydspace.results.no-abstract": "No Abstract", @@ -2998,21 +3010,23 @@ "mydspace.results.no-files": "No Files", - "mydspace.results.no-results": "There were no items to show", + "mydspace.results.no-results": "There were no works to show", "mydspace.results.no-title": "No title", "mydspace.results.no-uri": "No Uri", - "mydspace.search-form.placeholder": "Search in mydspace...", + "mydspace.search-form.placeholder": "Search in my documents...", "mydspace.show.workflow": "Workflow tasks", - "mydspace.show.workspace": "Your Submissions", + "mydspace.show.workspace": "Your Works", + + "mydspace.show.supervisedWorkspace": "Supervised works", - "mydspace.show.supervisedWorkspace": "Supervised items", + "mydspace.status.mydspaceArchived": "Deposited", - "mydspace.status.mydspaceArchived": "Archived", + "mydspace.status.draft": "Draft", "mydspace.status.mydspaceValidation": "Validation", @@ -3022,7 +3036,7 @@ "mydspace.status.mydspaceWorkspace": "Workspace", - "mydspace.title": "MyDSpace", + "mydspace.title": "My Works", "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.", @@ -3030,11 +3044,11 @@ "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.", - "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.", + "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace works created.", "mydspace.view-btn": "View", - "nav.browse.header": "All of DSpace", + "nav.browse.header": "All of DB Docs", "nav.community-browse.header": "By Community", @@ -3050,7 +3064,7 @@ "nav.main.description": "Main navigation bar", - "nav.mydspace": "MyDSpace", + "nav.mydspace": "My Works", "nav.profile": "Profile", @@ -3068,7 +3082,7 @@ "nav.user.description": "User profile bar", - "none.listelement.badge": "Item", + "none.listelement.badge": "Work", "orgunit.listelement.badge": "Organizational Unit", @@ -3082,7 +3096,7 @@ "orgunit.page.description": "Description", - "orgunit.page.edit": "Edit this item", + "orgunit.page.edit": "Edit this work", "orgunit.page.id": "ID", @@ -3104,7 +3118,7 @@ "person.page.birthdate": "Birth Date", - "person.page.edit": "Edit this item", + "person.page.edit": "Edit this work", "person.page.email": "Email Address", @@ -3320,7 +3334,7 @@ "project.page.description": "Description", - "project.page.edit": "Edit this item", + "project.page.edit": "Edit this work", "project.page.expectedcompletion": "Expected Completion", @@ -3342,7 +3356,7 @@ "publication.page.description": "Description", - "publication.page.edit": "Edit this item", + "publication.page.edit": "Edit this work", "publication.page.journal-issn": "Journal ISSN", @@ -3410,7 +3424,7 @@ "register-page.registration.header": "New user registration", - "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.", + "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new works to Deep Blue Documents.", "register-page.registration.email": "Email Address *", @@ -3448,7 +3462,7 @@ "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains", - "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items", + "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two works", "relationships.add.error.server.content": "The server returned an error", @@ -3492,9 +3506,9 @@ "repository.image.logo": "Repository logo", - "repository.title": "DSpace Repository", + "repository.title": "Deep Blue Documents Repository", - "repository.title.prefix": "DSpace Repository :: ", + "repository.title.prefix": "Deep Blue Documents Repository :: ", "resource-policies.add.button": "Add", @@ -3504,7 +3518,7 @@ "resource-policies.add.for.bundle": "Add a new Bundle policy", - "resource-policies.add.for.item": "Add a new Item policy", + "resource-policies.add.for.item": "Add a new Work policy", "resource-policies.add.for.community": "Add a new Community policy", @@ -3604,7 +3618,7 @@ "resource-policies.table.headers.title.for.bundle": "Policies for Bundle", - "resource-policies.table.headers.title.for.item": "Policies for Item", + "resource-policies.table.headers.title.for.item": "Policies for Work", "resource-policies.table.headers.title.for.community": "Policies for Community", @@ -3630,10 +3644,20 @@ "search.filters.applied.f.discoverable": "Non-discoverable", - "search.filters.applied.f.entityType": "Item Type", + "search.filters.applied.f.entityType": "Work Type", "search.filters.applied.f.has_content_in_original_bundle": "Has files", + "search.filters.applied.f.type": "Type", + + "search.filters.applied.f.peerreviewed": "Peer Reviewed", + + "search.filters.applied.f.identifiersource": "Source Pubication", + + "search.filters.applied.f.hlbtoplevel": "Primary Subject", + + "search.filters.applied.f.hlbsecondlevel": "Secondary Subject", + "search.filters.applied.f.itemtype": "Type", "search.filters.applied.f.namedresourcetype": "Status", @@ -3654,10 +3678,46 @@ "search.filters.filter.author.head": "Author", + + + "search.filters.filter.discipline.head": "Discipline", + + "search.filters.filter.identifiersource.head": "Source Publication", + + "search.filters.filter.hlbtoplevel.head": "Primary Subject", + + "search.filters.filter.hlbsecondlevel.head": "Secondary Subject", + + "search.filters.filter.peerreviewed.head": "Peer Reviewed", + + + "search.filters.filter.type.head": "Type", + + "search.filters.filter.type.placeholder": "Type", + + "search.filters.filter.type.label": "Search Type", + + "search.filters.filter.author.placeholder": "Author name", "search.filters.filter.author.label": "Search author name", + "search.filters.filter.peerreviewed.placeholder": "PeerReviewed", + + "search.filters.filter.peerreviewed.label": "Search PeerReviewed", + + "search.filters.filter.identifiersource.placeholder": "Source", + + "search.filters.filter.identifiersource.label": "Search Source", + + "search.filters.filter.hlbtoplevel.placeholder": "Primary Subject", + + "search.filters.filter.hlbtoplevel.label": "Search Primary Subject", + + "search.filters.filter.hlbsecondlevel.placeholder": "Secondary Subject", + + "search.filters.filter.hlbsecondlevel.label": "Search Secondary Subject", + "search.filters.filter.birthDate.head": "Birth Date", "search.filters.filter.birthDate.placeholder": "Birth Date", @@ -3690,7 +3750,7 @@ "search.filters.filter.creativeWorkPublisher.label": "Search publisher", - "search.filters.filter.dateIssued.head": "Date", + "search.filters.filter.dateIssued.head": "Date Published", "search.filters.filter.dateIssued.max.placeholder": "Maximum Date", @@ -3710,11 +3770,11 @@ "search.filters.filter.withdrawn.head": "Withdrawn", - "search.filters.filter.entityType.head": "Item Type", + "search.filters.filter.entityType.head": "Work Type", - "search.filters.filter.entityType.placeholder": "Item Type", + "search.filters.filter.entityType.placeholder": "Work Type", - "search.filters.filter.entityType.label": "Search item type", + "search.filters.filter.entityType.label": "Search work type", "search.filters.filter.expand": "Expand filter", @@ -3826,7 +3886,7 @@ "search.form.search_dspace": "All repository", - "search.form.scope.all": "All of DSpace", + "search.form.scope.all": "All of Deep Blue Documents", "search.results.head": "Search Results", @@ -3876,13 +3936,13 @@ "sorting.score.DESC": "Most Relevant", - "sorting.dc.date.issued.ASC": "Date Issued Ascending", + "sorting.dc.date.issued.ASC": "Date Published Ascending", - "sorting.dc.date.issued.DESC": "Date Issued Descending", + "sorting.dc.date.issued.DESC": "Date Published Descending", - "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending", + "sorting.dc.date.accessioned.ASC": "Most Recently Deposited Ascending", - "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending", + "sorting.dc.date.accessioned.DESC": "Most Recently Deposited Descending", "sorting.lastModified.ASC": "Last modified Ascending", @@ -3912,13 +3972,13 @@ "statistics.table.no-name": "(object name could not be loaded)", - "submission.edit.breadcrumbs": "Edit Submission", + "submission.edit.breadcrumbs": "New Deposit", - "submission.edit.title": "Edit Submission", + "submission.edit.title": "New Deposit", "submission.general.cancel": "Cancel", - "submission.general.cannot_submit": "You don't have permission to make a new submission.", + "submission.general.cannot_submit": "You don't have permission to make a new deposit.", "submission.general.deposit": "Deposit", @@ -3926,10 +3986,14 @@ "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?", + "submission.general.deposit.confirm.info": "Depositing an work locks in the data and files as you’ve entered them, and future changes will require a support request. If you plan to enter additional work information, please cancel Deposit and select Save or Save for Later to store your work as a draft.", + "submission.general.discard.confirm.submit": "Yes, I'm sure", "submission.general.discard.confirm.title": "Discard submission", + "submission.general.deposit.confirm.title": "Confirm deposit", + "submission.general.discard.submit": "Discard", "submission.general.info.saved": "Saved", @@ -3960,9 +4024,9 @@ "submission.import-external.title.none": "Import metadata from an external source", - "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.", + "submission.import-external.page.hint": "Enter a query above to find works from the web to import in to Deep Blue Documents.", - "submission.import-external.back-to-my-dspace": "Back to MyDSpace", + "submission.import-external.back-to-my-dspace": "Back to My Works", "submission.import-external.search.placeholder": "Search the external source", @@ -4012,11 +4076,11 @@ "submission.import-external.source.lcname": "Library of Congress Names", - "submission.import-external.preview.title": "Item Preview", + "submission.import-external.preview.title": "Work Preview", "submission.import-external.preview.title.Publication": "Publication Preview", - "submission.import-external.preview.title.none": "Item Preview", + "submission.import-external.preview.title.none": "Work Preview", "submission.import-external.preview.title.Journal": "Journal Preview", @@ -4048,7 +4112,7 @@ "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project", - "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote work", "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event", @@ -4142,7 +4206,7 @@ "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page", - "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items", + "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} works", "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})", @@ -4332,11 +4396,11 @@ "submission.sections.general.collection": "Collection", - "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.", + "submission.sections.general.deposit_error_notice": "There was an issue when submitting the work, please try again later.", "submission.sections.general.deposit_success_notice": "Submission deposited successfully.", - "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.", + "submission.sections.general.discard_error_notice": "There was an issue when discarding the work, please try again later.", "submission.sections.general.discard_success_notice": "Submission discarded successfully.", @@ -4348,7 +4412,7 @@ "submission.sections.general.no-sections": "No options available", - "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.", + "submission.sections.general.save_error_notice": "There was an issue when saving the work, please try again later.", "submission.sections.general.save_success_notice": "Submission saved successfully.", @@ -4356,11 +4420,13 @@ "submission.sections.general.sections_not_valid": "There are incomplete sections.", - "submission.sections.identifiers.info": "The following identifiers will be created for your item:", + "submission.sections.identifiers.info": "The following identifiers will be created for your work:", + + "submission.sections.identifiers.para": "Note: Identifiers are assigned when drafting a Work, and will publicly resolve once the Work is published. Discarding a Work will cancel its assigned identifiers.", - "submission.sections.identifiers.no_handle": "No handles have been minted for this item.", + "submission.sections.identifiers.no_handle": "No handles have been minted for this work.", - "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.", + "submission.sections.identifiers.no_doi": "No DOIs have been minted for this work.", "submission.sections.identifiers.handle_label": "Handle: ", @@ -4370,13 +4436,13 @@ "submission.sections.submit.progressbar.accessCondition": "Item access conditions", - "submission.sections.submit.progressbar.CClicense": "Creative commons license", + "submission.sections.submit.progressbar.CClicense": "Creative commons license (Optional)", "submission.sections.submit.progressbar.describe.recycle": "Recycle", - "submission.sections.submit.progressbar.describe.stepcustom": "Describe", + "submission.sections.submit.progressbar.describe.stepcustom": "Description", - "submission.sections.submit.progressbar.describe.stepone": "Describe", + "submission.sections.submit.progressbar.describe.stepone": "Work Details", "submission.sections.submit.progressbar.describe.steptwo": "Describe", @@ -4384,7 +4450,7 @@ "submission.sections.submit.progressbar.identifiers": "Identifiers", - "submission.sections.submit.progressbar.license": "Deposit license", + "submission.sections.submit.progressbar.license": "Terms of Deposit", "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies", @@ -4396,9 +4462,9 @@ "submission.sections.status.errors.title": "Errors", - "submission.sections.status.valid.title": "Valid", + "submission.sections.status.valid.title": "Complete", - "submission.sections.status.warnings.title": "Warnings", + "submission.sections.status.warnings.title": "Incomplete", "submission.sections.status.errors.aria": "has errors", @@ -4430,13 +4496,13 @@ "submission.sections.upload.download.title": "Download bitstream", - "submission.sections.upload.drop-message": "Drop files to attach them to the item", + "submission.sections.upload.drop-message": "Drop files to attach them to the work", - "submission.sections.upload.edit.title": "Edit bitstream", + "submission.sections.upload.edit.title": "Edit File Details", "submission.sections.upload.form.access-condition-label": "Access condition type", - "submission.sections.upload.form.access-condition-hint": "Select an access condition to apply on the bitstream once the item is deposited", + "submission.sections.upload.form.access-condition-hint": "Select an access condition to apply on the bitstream once the work is deposited", "submission.sections.upload.form.date-required": "Date is required.", @@ -4464,7 +4530,7 @@ "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):", - "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", + "submission.sections.upload.info": "Here you will find all the files currently in the work. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.
Please note that Deep Blue Documents preserves the content of certain types of files better than others. Learn more about file types/formats and levels of support", "submission.sections.upload.no-entry": "No", @@ -4478,13 +4544,13 @@ "submission.sections.upload.upload-successful": "Upload successful", - "submission.sections.accesses.form.discoverable-description": "When checked, this item will be discoverable in search/browse. When unchecked, the item will only be available via a direct link and will never appear in search/browse.", + "submission.sections.accesses.form.discoverable-description": "When checked, this work will be discoverable in search/browse. When unchecked, the work will only be available via a direct link and will never appear in search/browse.", "submission.sections.accesses.form.discoverable-label": "Discoverable", "submission.sections.accesses.form.access-condition-label": "Access condition type", - "submission.sections.accesses.form.access-condition-hint": "Select an access condition to apply on the item once it is deposited", + "submission.sections.accesses.form.access-condition-hint": "Select an access condition to apply on the work once it is deposited", "submission.sections.accesses.form.date-required": "Date is required.", @@ -4566,21 +4632,21 @@ "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations", - "submission.submit.breadcrumbs": "New submission", + "submission.submit.breadcrumbs": "New Deposit", - "submission.submit.title": "New submission", + "submission.submit.title": "New Deposit", "submission.workflow.generic.delete": "Delete", - "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.", + "submission.workflow.generic.delete-help": "Select this option to discard this work. You will then be asked to confirm it.", "submission.workflow.generic.edit": "Edit", - "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.", + "submission.workflow.generic.edit-help": "Select this option to change the work's metadata.", "submission.workflow.generic.view": "View", - "submission.workflow.generic.view-help": "Select this option to view the item's metadata.", + "submission.workflow.generic.view-help": "Select this option to view the work's metadata.", "submission.workflow.generic.submit_select_reviewer": "Select Reviewer", @@ -4592,11 +4658,11 @@ "submission.workflow.tasks.claimed.approve": "Approve", - "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".", + "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the work and it is suitable for inclusion in the collection, select \"Approve\".", "submission.workflow.tasks.claimed.edit": "Edit", - "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.", + "submission.workflow.tasks.claimed.edit_help": "Select this option to change the work's metadata.", "submission.workflow.tasks.claimed.decline": "Decline", @@ -4606,13 +4672,13 @@ "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject", - "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item", + "submission.workflow.tasks.claimed.reject.reason.submit": "Reject work", "submission.workflow.tasks.claimed.reject.reason.title": "Reason", "submission.workflow.tasks.claimed.reject.submit": "Reject", - "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is not suitable for inclusion in the collection, select \"Reject\". You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.", + "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the work and found it is not suitable for inclusion in the collection, select \"Reject\". You will then be asked to enter a message indicating why the work is unsuitable, and whether the submitter should change something and resubmit.", "submission.workflow.tasks.claimed.return": "Return to pool", @@ -4636,13 +4702,13 @@ "submission.workspace.generic.view": "View", - "submission.workspace.generic.view-help": "Select this option to view the item's metadata.", + "submission.workspace.generic.view-help": "Select this option to view the work's metadata.", "submitter.empty": "N/A", "subscriptions.title": "Subscriptions", - "subscriptions.item": "Subscriptions for items", + "subscriptions.item": "Subscriptions for works", "subscriptions.collection": "Subscriptions for collections", @@ -4706,7 +4772,7 @@ "subscriptions.table.not-available": "Not available", - "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it", + "subscriptions.table.not-available-message": "The subscribed work has been deleted, or you don't currently have the permission to view it", "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.", @@ -4726,7 +4792,7 @@ "thumbnail.person.placeholder": "No Profile Picture Available", - "title": "DSpace", + "title": "Deep Blue Documents", "vocabulary-treeview.header": "Hierarchical tree view", @@ -4736,7 +4802,7 @@ "vocabulary-treeview.search.form.search": "Search", - "vocabulary-treeview.search.no-result": "There were no items to show", + "vocabulary-treeview.search.no-result": "There were no works to show", "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index", @@ -4760,11 +4826,11 @@ "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation", - "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata", + "virtual-metadata.delete-relationship.modal-head": "Select the works for which you want to save the virtual metadata as real metadata", - "supervisedWorkspace.search.results.head": "Supervised Items", + "supervisedWorkspace.search.results.head": "Supervised Works", - "workspace.search.results.head": "Your submissions", + "workspace.search.results.head": "Your deposits", "workflowAdmin.search.results.head": "Administer Workflow", @@ -4778,15 +4844,15 @@ "workflow-item.delete.notification.success.title": "Deleted", - "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted", + "workflow-item.delete.notification.success.content": "This workflow work was successfully deleted", "workflow-item.delete.notification.error.title": "Something went wrong", - "workflow-item.delete.notification.error.content": "The workflow item could not be deleted", + "workflow-item.delete.notification.error.content": "The workflow work could not be deleted", - "workflow-item.delete.title": "Delete workflow item", + "workflow-item.delete.title": "Delete workflow work", - "workflow-item.delete.header": "Delete workflow item", + "workflow-item.delete.header": "Delete workflow work", "workflow-item.delete.button.cancel": "Cancel", @@ -4794,15 +4860,15 @@ "workflow-item.send-back.notification.success.title": "Sent back to submitter", - "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter", + "workflow-item.send-back.notification.success.content": "This workflow work was successfully sent back to the submitter", "workflow-item.send-back.notification.error.title": "Something went wrong", - "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter", + "workflow-item.send-back.notification.error.content": "The workflow work could not be sent back to the submitter", - "workflow-item.send-back.title": "Send workflow item back to submitter", + "workflow-item.send-back.title": "Send workflow work back to submitter", - "workflow-item.send-back.header": "Send workflow item back to submitter", + "workflow-item.send-back.header": "Send workflow work back to submitter", "workflow-item.send-back.button.cancel": "Cancel", @@ -4816,7 +4882,7 @@ "workspace-item.delete.breadcrumbs": "Workspace Delete", - "workspace-item.delete.header": "Delete workspace item", + "workspace-item.delete.header": "Delete workspace work", "workspace-item.delete.button.confirm": "Delete", @@ -4824,21 +4890,21 @@ "workspace-item.delete.notification.success.title": "Deleted", - "workspace-item.delete.title": "This workspace item was successfully deleted", + "workspace-item.delete.title": "This workspace work was successfully deleted", "workspace-item.delete.notification.error.title": "Something went wrong", - "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + "workspace-item.delete.notification.error.content": "The workspace work could not be deleted", "workflow-item.advanced.title": "Advanced workflow", "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", - "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected", + "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow work has been successfully selected", "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong", - "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item", + "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow work", "workflow-item.selectrevieweraction.title": "Select Reviewer", @@ -4850,15 +4916,15 @@ "workflow-item.scorereviewaction.notification.success.title": "Rating review", - "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted", + "workflow-item.scorereviewaction.notification.success.content": "The rating for this work workflow work has been successfully submitted", "workflow-item.scorereviewaction.notification.error.title": "Something went wrong", - "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item", + "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this work", - "workflow-item.scorereviewaction.title": "Rate this item", + "workflow-item.scorereviewaction.title": "Rate this work", - "workflow-item.scorereviewaction.header": "Rate this item", + "workflow-item.scorereviewaction.header": "Rate this work", "workflow-item.scorereviewaction.button.cancel": "Cancel", @@ -4900,7 +4966,7 @@ "researcher.profile.status": "Status:", - "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).", + "researcherprofile.claim.not-authorized": "You are not authorized to claim this work. For more details contact the administrator(s).", "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later", @@ -5116,7 +5182,7 @@ "person.orcid.registry.auth": "ORCID Authorizations", - "home.recent-submissions.head": "Recent Submissions", + "home.recent-submissions.head": "Recent Deposits", "listable-notification-object.default-message": "This object couldn't be retrieved", @@ -5166,13 +5232,13 @@ "admin.system-wide-alert.title": "System-wide Alerts", - "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.", + "item-access-control-title": "This form allows you to perform changes to the access conditions of the work's metadata or its bitstreams.", - "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).", + "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the works owned by this collection. Changes may be performed to either all Work metadata or all content (bitstreams).", - "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).", + "community-access-control-title": "This form allows you to perform changes to the access conditions of all the works owned by any collection under this community. Changes may be performed to either all Work metadata or all content (bitstreams).", - "access-control-item-header-toggle": "Item's Metadata", + "access-control-item-header-toggle": "Work's Metadata", "access-control-bitstream-header-toggle": "Bitstreams", @@ -5188,7 +5254,7 @@ "access-control-limit-to-specific": "Limit the changes to specific bitstreams", - "access-control-process-all-bitstreams": "Update all the bitstreams in the item", + "access-control-process-all-bitstreams": "Update all the bitstreams in the work", "access-control-bitstreams-selected": "bitstreams selected", @@ -5200,7 +5266,7 @@ "access-control-select-bitstreams-modal.title": "Select bitstreams", - "access-control-select-bitstreams-modal.no-items": "No items to show.", + "access-control-select-bitstreams-modal.no-items": "No works to show.", "access-control-select-bitstreams-modal.close": "Close", diff --git a/src/assets/images/cc_licenses/cc-by-nc-nd.png b/src/assets/images/cc_licenses/cc-by-nc-nd.png new file mode 100644 index 00000000000..cd7f385a28e Binary files /dev/null and b/src/assets/images/cc_licenses/cc-by-nc-nd.png differ diff --git a/src/assets/images/cc_licenses/cc-by-nc-sa.png b/src/assets/images/cc_licenses/cc-by-nc-sa.png new file mode 100644 index 00000000000..22c1af34213 Binary files /dev/null and b/src/assets/images/cc_licenses/cc-by-nc-sa.png differ diff --git a/src/assets/images/cc_licenses/cc-by-nc.png b/src/assets/images/cc_licenses/cc-by-nc.png new file mode 100644 index 00000000000..1874426e356 Binary files /dev/null and b/src/assets/images/cc_licenses/cc-by-nc.png differ diff --git a/src/assets/images/cc_licenses/cc-by-nd.png b/src/assets/images/cc_licenses/cc-by-nd.png new file mode 100644 index 00000000000..edb43158954 Binary files /dev/null and b/src/assets/images/cc_licenses/cc-by-nd.png differ diff --git a/src/assets/images/cc_licenses/cc-by-sa.png b/src/assets/images/cc_licenses/cc-by-sa.png new file mode 100644 index 00000000000..13f97d57bb7 Binary files /dev/null and b/src/assets/images/cc_licenses/cc-by-sa.png differ diff --git a/src/assets/images/cc_licenses/cc-by.png b/src/assets/images/cc_licenses/cc-by.png new file mode 100644 index 00000000000..f9cd594cbed Binary files /dev/null and b/src/assets/images/cc_licenses/cc-by.png differ diff --git a/src/assets/images/cc_licenses/cc-generic.png b/src/assets/images/cc_licenses/cc-generic.png new file mode 100644 index 00000000000..4590b0a7a04 Binary files /dev/null and b/src/assets/images/cc_licenses/cc-generic.png differ diff --git a/src/assets/images/cc_licenses/cc-mark.png b/src/assets/images/cc_licenses/cc-mark.png new file mode 100644 index 00000000000..6a782386e72 Binary files /dev/null and b/src/assets/images/cc_licenses/cc-mark.png differ diff --git a/src/assets/images/cc_licenses/cc-zero.png b/src/assets/images/cc_licenses/cc-zero.png new file mode 100644 index 00000000000..ec98a3f3f91 Binary files /dev/null and b/src/assets/images/cc_licenses/cc-zero.png differ diff --git a/src/assets/images/file_icons/audio_icon18x18.png b/src/assets/images/file_icons/audio_icon18x18.png new file mode 100644 index 00000000000..d7e18cf76f7 Binary files /dev/null and b/src/assets/images/file_icons/audio_icon18x18.png differ diff --git a/src/assets/images/file_icons/audio_icon32x32.png b/src/assets/images/file_icons/audio_icon32x32.png new file mode 100644 index 00000000000..dabee6bd71c Binary files /dev/null and b/src/assets/images/file_icons/audio_icon32x32.png differ diff --git a/src/assets/images/file_icons/droplet.jpg b/src/assets/images/file_icons/droplet.jpg new file mode 100644 index 00000000000..c39ede37a25 Binary files /dev/null and b/src/assets/images/file_icons/droplet.jpg differ diff --git a/src/assets/images/file_icons/excel_icon-18x18.png b/src/assets/images/file_icons/excel_icon-18x18.png new file mode 100644 index 00000000000..6360fc3e4ae Binary files /dev/null and b/src/assets/images/file_icons/excel_icon-18x18.png differ diff --git a/src/assets/images/file_icons/excel_icon-32x32.png b/src/assets/images/file_icons/excel_icon-32x32.png new file mode 100644 index 00000000000..cc34dbeed72 Binary files /dev/null and b/src/assets/images/file_icons/excel_icon-32x32.png differ diff --git a/src/assets/images/file_icons/feed-icon-14x14.png b/src/assets/images/file_icons/feed-icon-14x14.png new file mode 100644 index 00000000000..b3c949d2244 Binary files /dev/null and b/src/assets/images/file_icons/feed-icon-14x14.png differ diff --git a/src/assets/images/file_icons/feed-icon-28x28.png b/src/assets/images/file_icons/feed-icon-28x28.png new file mode 100644 index 00000000000..d64c669c758 Binary files /dev/null and b/src/assets/images/file_icons/feed-icon-28x28.png differ diff --git a/src/assets/images/file_icons/fulcrum_icon.png b/src/assets/images/file_icons/fulcrum_icon.png new file mode 100644 index 00000000000..5f32708008d Binary files /dev/null and b/src/assets/images/file_icons/fulcrum_icon.png differ diff --git a/src/assets/images/file_icons/generic_bitstream18x18.png b/src/assets/images/file_icons/generic_bitstream18x18.png new file mode 100644 index 00000000000..924aaae452f Binary files /dev/null and b/src/assets/images/file_icons/generic_bitstream18x18.png differ diff --git a/src/assets/images/file_icons/generic_bitstream32x32.png b/src/assets/images/file_icons/generic_bitstream32x32.png new file mode 100644 index 00000000000..58ab3bba707 Binary files /dev/null and b/src/assets/images/file_icons/generic_bitstream32x32.png differ diff --git a/src/assets/images/file_icons/generic_image_icon-18x18.png b/src/assets/images/file_icons/generic_image_icon-18x18.png new file mode 100644 index 00000000000..e4e4d7187ad Binary files /dev/null and b/src/assets/images/file_icons/generic_image_icon-18x18.png differ diff --git a/src/assets/images/file_icons/generic_image_icon-32x32.png b/src/assets/images/file_icons/generic_image_icon-32x32.png new file mode 100644 index 00000000000..c8190d65dce Binary files /dev/null and b/src/assets/images/file_icons/generic_image_icon-32x32.png differ diff --git a/src/assets/images/file_icons/hathi_trust_icon18x18.png b/src/assets/images/file_icons/hathi_trust_icon18x18.png new file mode 100644 index 00000000000..f3eb2f3d97e Binary files /dev/null and b/src/assets/images/file_icons/hathi_trust_icon18x18.png differ diff --git a/src/assets/images/file_icons/html_icon-18x18.PNG b/src/assets/images/file_icons/html_icon-18x18.PNG new file mode 100644 index 00000000000..cc24f6af865 Binary files /dev/null and b/src/assets/images/file_icons/html_icon-18x18.PNG differ diff --git a/src/assets/images/file_icons/icons_for_deep_blue b/src/assets/images/file_icons/icons_for_deep_blue new file mode 100644 index 00000000000..22b6a34d37c --- /dev/null +++ b/src/assets/images/file_icons/icons_for_deep_blue @@ -0,0 +1,82 @@ +ICONS TO USE FOR DEEP BLUE FORMATS + + + +pdf_icon-18x18.png +pdf-icon32x32.png + .pdf + +text_icon-18x18.png +text_icon-32x32.png + .txt + .rtf + +word_icon-18x18.png +word-icon32x32.png + .doc + .docx + +excel_icon-18x18.png +excel_icon-32x32.png + .xls + .xlsx + +powerpoint_icon-18x18.png +powerpoint_icon-32x32.png + .ppt + .pptx + +jpeg_icon-18x18.png +jpeg_icon-32x32.png + .jpg + .jpeg + +tiff_icon-18x18.png +tiff_icon-32x32.png + .tiff + .tif + +generic_image_icon-18x18.png +generic_image_icon-32x32.png + .png + .bmp + .gif + .pcd + .psd + +audio_icon18x18.png +audio_icon32x32.png + .aif + .aiff + .wav + .au + .snd + .mp3 + .m4a + .mp4 + .ra + .rm + .ram + .wma + +video_icon18x18.png +video_icon32x32.png + .avi + .mov + .mp1 + .mp2 + .mp4 + .wmv + +zip_icon-18x18.png +zip_icon-32x32.png + .zip + .gz + .tar.gz + +generic_bitstream18x18.png +generic_bitstream32x32.png + [everything else] + +u-m_campus_only_access_icon.png + [added when we know an item/bitstream has campus-only restrictions] \ No newline at end of file diff --git a/src/assets/images/file_icons/jpeg_icon-18x18.png b/src/assets/images/file_icons/jpeg_icon-18x18.png new file mode 100644 index 00000000000..35d24e736d9 Binary files /dev/null and b/src/assets/images/file_icons/jpeg_icon-18x18.png differ diff --git a/src/assets/images/file_icons/jpeg_icon-32x32.png b/src/assets/images/file_icons/jpeg_icon-32x32.png new file mode 100644 index 00000000000..c2792138501 Binary files /dev/null and b/src/assets/images/file_icons/jpeg_icon-32x32.png differ diff --git a/src/assets/images/file_icons/pdf-icon32x32.png b/src/assets/images/file_icons/pdf-icon32x32.png new file mode 100644 index 00000000000..7c93b3342bf Binary files /dev/null and b/src/assets/images/file_icons/pdf-icon32x32.png differ diff --git a/src/assets/images/file_icons/pdf_icon-18x18.png b/src/assets/images/file_icons/pdf_icon-18x18.png new file mode 100644 index 00000000000..92fce52311f Binary files /dev/null and b/src/assets/images/file_icons/pdf_icon-18x18.png differ diff --git a/src/assets/images/file_icons/powerpoint_icon-18x18.png b/src/assets/images/file_icons/powerpoint_icon-18x18.png new file mode 100644 index 00000000000..e80a14f1be8 Binary files /dev/null and b/src/assets/images/file_icons/powerpoint_icon-18x18.png differ diff --git a/src/assets/images/file_icons/powerpoint_icon-32x32.png b/src/assets/images/file_icons/powerpoint_icon-32x32.png new file mode 100644 index 00000000000..e1c8b886bd7 Binary files /dev/null and b/src/assets/images/file_icons/powerpoint_icon-32x32.png differ diff --git a/src/assets/images/file_icons/text_icon-18x18.png b/src/assets/images/file_icons/text_icon-18x18.png new file mode 100644 index 00000000000..fcc918760cd Binary files /dev/null and b/src/assets/images/file_icons/text_icon-18x18.png differ diff --git a/src/assets/images/file_icons/text_icon-32x32.png b/src/assets/images/file_icons/text_icon-32x32.png new file mode 100644 index 00000000000..f474e416e56 Binary files /dev/null and b/src/assets/images/file_icons/text_icon-32x32.png differ diff --git a/src/assets/images/file_icons/tiff_icon-18x18.png b/src/assets/images/file_icons/tiff_icon-18x18.png new file mode 100644 index 00000000000..33f8b0a70df Binary files /dev/null and b/src/assets/images/file_icons/tiff_icon-18x18.png differ diff --git a/src/assets/images/file_icons/tiff_icon-32x32.png b/src/assets/images/file_icons/tiff_icon-32x32.png new file mode 100644 index 00000000000..340d2cc94d3 Binary files /dev/null and b/src/assets/images/file_icons/tiff_icon-32x32.png differ diff --git a/src/assets/images/file_icons/u-m_campus_only_access_icon.png b/src/assets/images/file_icons/u-m_campus_only_access_icon.png new file mode 100644 index 00000000000..c0f8a70f621 Binary files /dev/null and b/src/assets/images/file_icons/u-m_campus_only_access_icon.png differ diff --git a/src/assets/images/file_icons/video_icon18x18.png b/src/assets/images/file_icons/video_icon18x18.png new file mode 100644 index 00000000000..16aaf3222f5 Binary files /dev/null and b/src/assets/images/file_icons/video_icon18x18.png differ diff --git a/src/assets/images/file_icons/video_icon32x32.png b/src/assets/images/file_icons/video_icon32x32.png new file mode 100644 index 00000000000..8e29926d7c7 Binary files /dev/null and b/src/assets/images/file_icons/video_icon32x32.png differ diff --git a/src/assets/images/file_icons/word-icon32x32.png b/src/assets/images/file_icons/word-icon32x32.png new file mode 100644 index 00000000000..1810c3e3b87 Binary files /dev/null and b/src/assets/images/file_icons/word-icon32x32.png differ diff --git a/src/assets/images/file_icons/word_icon-18x18.png b/src/assets/images/file_icons/word_icon-18x18.png new file mode 100644 index 00000000000..fcc918760cd Binary files /dev/null and b/src/assets/images/file_icons/word_icon-18x18.png differ diff --git a/src/assets/images/file_icons/zip_icon-18x18.png b/src/assets/images/file_icons/zip_icon-18x18.png new file mode 100644 index 00000000000..a7fa8f3cfe9 Binary files /dev/null and b/src/assets/images/file_icons/zip_icon-18x18.png differ diff --git a/src/assets/images/file_icons/zip_icon-32x32.png b/src/assets/images/file_icons/zip_icon-32x32.png new file mode 100644 index 00000000000..362fcc90f43 Binary files /dev/null and b/src/assets/images/file_icons/zip_icon-32x32.png differ diff --git a/src/assets/static/README.md b/src/assets/static/README.md new file mode 100644 index 00000000000..34235cb9ed1 --- /dev/null +++ b/src/assets/static/README.md @@ -0,0 +1,2 @@ +# deepbluedocs +Deep Blue Documents FAQ Redesign diff --git a/src/assets/static/about.html b/src/assets/static/about.html new file mode 100755 index 00000000000..fe25ebd251c --- /dev/null +++ b/src/assets/static/about.html @@ -0,0 +1,191 @@ + + + + + + + About Deep Blue Documents + + + + + + + + + + +
+ + +
+
+
+

About Deep Blue Documents

+ + +
+

Overview

+

Deep Blue Documents provides access to the content that makes the University of Michigan (U-M) a leader in research, teaching, learning, and creativity. Works in this repository are openly available, accessible, and preserved in a stable place. By representing our faculty, staff, and student scholars as individuals and as members of communities, Deep Blue Documents is where you will find the best scholarly and artistic Works done at U-M, preserved by the U-M Library.

+ +

Benefits

+
    +
  • Visibility: Making your Work accessible via Deep Blue Documents will ensure more of your peers can find it (in Google Scholar, for example) and can cite it. When you move your scholarship out from behind paywalls and preserve it for the future, you may find that your research profile is elevated as your Works become more discoverable.

    • +
  • Permanence: Each Work receives a permanent, unique Digital Object Identifier (DOI) which you can share with others or post to social media, your personal website, and more. You won’t have to worry about broken links, or migrating and re-posting your Work to a new web page if you move to a new institution.

    • +
  • Comprehensiveness: Deep Blue Documents supports a variety of formats, and we encourage you to deposit any Works related to your research, teaching, learning, and creativity - including articles, chapters, posters, presentations, images, audio and video files, etc. (Datasets and code should be deposited into Deep Blue Data.)

    • +
  • Safe storage: Deep Blue Documents ensures that you only have to deposit the content once. From then on the U-M Library takes care of backups, compatibility, and format issues. There are some technical limitations to our ability to preserve the functionality of proprietary formats, but we commit to preserving your files exactly as you deposit them.

    • +
  • Control over access: Deep Blue Documents allows you to limit who can see various aspects of your Work for a given time (e.g. an embargo period). This is difficult to do on a personal website without hiding the Work completely.

    • +
  • Context: U-M is a destination for the best researchers and scholars, and depositing your Works in Deep Blue Documents places you in the larger context of the U-M environment, side-by-side with the scholarly and artistic contributions of your colleagues and students. +
    • +
+

The U-M Library provides this service free to you as part of the U-M scholarly community. Deep Blue Documents is designed to meet not only today's demands but also new ones as they evolve. It will continue to grow and evolve to reflect current publishing needs and norms identified by U-M faculty, staff, and students.

+

Generative artificial intelligence (genAI) and large language models (LLMs) have become part of many research workflows. Currently, the Deep Blue team does not use any genAI tools or services to add to or modify the content in our repositories. If these practices change, for transparency, we will update the About and Help pages to include details on why and how we’re using genAI or LLMs. Any content produced by genAI or LLMs will be reviewed and approved by a human (either a Deep Blue staff member or the depositor) before it’s published.

+

Your Work: discovered, cited, preserved. Deep Blue Documents makes it simple.

+ +
+ + + +
+

Depositing a Work

+

Individuals deposit Works into Collections. For example, a Sociology faculty member who gave a conference presentation can deposit the slides for that presentation, audio and/or video clips of the presentation, a working paper about the research, and so on, all as one Work in the Department of Sociology Collection. The research data that underlies this presentation, however, can be deposited in Deep Blue Data.

+ +

Eligibility

+

We welcome Works from all three U-M campuses (Ann Arbor, Dearborn and Flint) and Michigan Medicine. Works can be deposited by:

+
    +
  • Current U-M faculty and research staff.
    • +
  • Multi-institutional collaborations including at least one participant actively employed by U-M.
    • +
  • Proxies designated by U-M faculty and research staff.
    • +
  • Undergraduate and graduate students, with permission of faculty or staff members. (See our Deep Blue Documents Institutional Repository for Students guide for more detailed information.)
    • +
+ +

Types of Accepted Works

+

We encourage the deposit of Works with the following characteristics:

+
    +
  • The Work must be educational, artistic, or research-oriented.
    • +
  • The Work is original and does not infringe on or violate the law or any rights of others.
    • +
  • The Work must be completed, ready for distribution.
    • +
  • The author must be willing and able to grant U-M the non-exclusive right to preserve and distribute the Work via Deep Blue Documents. (See Terms of Deposit).
    • +
  • If the Work is part of a series, we strongly encourage you to deposit other Works in that series so that Deep Blue Documents can offer as complete a series as possible.
    • +
+

Examples of acceptable Works include:

+
    +
  • Manuscripts such as articles, preprints, working papers, technical reports, conference papers, etc.
    • +
  • Research posters
    • +
  • Web-based exhibits/presentations
    • +
  • Books and book chapters
    • +
  • Dissertations and theses
    • +
  • Multimedia
    • +
  • Learning objects (typically modular resources used in teaching, e.g. texts, syllabi, websites)
    • +
+

Additionally, we can collaborate with you to digitize print Works. See Preservation for more information about digitizing Works for deposit.

+ +

Defining "Original Work"

+

In most cases it's obvious when a Work is original to you, especially when you are its sole author. But some cases can be complex. Other examples of original Work that you may deposit include:

+
    +
  • Annotated or illustrated versions of public domain Works. For example, if a U-M mathematics lecturer added annotations to Alice in Wonderland or an art professor illustrated Moby Dick, both have created a new original Work and we would encourage them to deposit the digital versions of those Works in Deep Blue Documents.
    • +
  • Works which you co-authored, such as reports on research done with colleagues at U-M or elsewhere. Unless you grant specific rights (such as the right to distribute) to someone else, the intellectual property is owned equally and in full by all creators.
    • +
+

Depositors are required to acknowledge their use of generative artificial intelligence (genAI) tools or large language models (LLMs) by citing the tools used as a contributor or as a source in their Bibliography, References section, etc. Additionally, depositors should investigate disciplinary guidelines, including ethical considerations, around the use of genAI and LLMs in their research.

+ +

Types of Works that aren’t Accepted

+

While Deep Blue Documents is dedicated to preserving and promoting the diverse scholarly and creative Works of U-M, certain content types are more appropriately housed in other U-M online locations, or are unable to be deposited for other reasons. Here's a guide to ensure your Work finds the right home:

+
+

Data Sets, Software, Code, Visualizations, Simulations, and Models: For scientific, demographic, GPS data, and similar datasets, Deep Blue Data is the ideal repository, tailored for Works primarily intended for computational use.

+

Administrative Records: Such records should be directed to the University Archives at the Bentley Historical Library, in accordance with Standard Practice Guide 601.8.

+

Non-U-M Affiliated Works: Only Works affiliated with U-M faculty, staff, or students should be deposited. Works without such affiliations will not be accepted.

+

Works in progress: These will be better served via personal websites or departmental servers which provide tools and platforms for modifying and completing Work.

+

Works that contain sensitive information: Sensitive information includes protected health information (PHI), personally identifiable information (PII), information subject to FERPA, HIPAA, etc. To determine whether your Work contains sensitive information, please consult the Sensitive Data Guide or contact the Research Ethics & Compliance group.

Works subject to the DOJ Bulk Data Rule: Works that meets any of the following types and volume thresholds, regardless of whether the data is anonymized, pseudonymized, or de-identified: +
  • Human genomic data concerning over 100 U.S. persons or other categories of human ‘omic data concerning over 1,000 U.S. persons.
    • +
  • Biometric identifiers concerning over 1,000 U.S. persons.
    • +
  • Precise geolocation data concerning over 1,000 U.S. devices.
    • +
  • Personal health data concerning over 10,000 U.S. persons.
    • +
  • Personal financial data concerning over 10,000 U.S. persons.
    • +
  • Specific types of personal identifiers concerning over 100,000 U.S. persons.
    • +
  • U.S. government-related data concerning any amount of precise geolocation data tied to DOJ-listed geofenced areas near government facilities, or sensitive personal data marketed as linkable to U.S. government employees, contractors, or officials.
    • +
+ If the dataset contains such data, it will not be made available to users located in China (including Hong Kong and Macau), Russia, Cuba, Iran, North Korea, and Venezuela (collectively, “Countries of Concern”). + +

+

Works on microfilm: The Library doesn’t have the capability to digitize Works on microfilm. We do have the capability to digitize print Works. See Preservation for more information about digitizing Works for deposit. +

+

Deep Blue Documents may in exceptional cases decline submission of a Work due to technical challenges or out-of-scope content. If you have questions please Contact Us and we will be glad to help you determine the best place for your Work(s).

+ +

Deep Blue Documents and Deep Blue Data

+

The U-M Library hosts two repositories specifically for U-M authored Works: Deep Blue Documents and Deep Blue Data.

+

Deep Blue Documents is a repository for scholarship and teaching materials that are primarily meant to be viewed or consumed by humans, such as articles, curriculum materials, presentations, reports, images, etc. +

+

Deep Blue Data is a repository for research data primarily meant to be viewed or consumed by computers, such as observations, survey results, simulations, experimental data, etc. +

+

If you’re unsure which repository to use, please Contact Us and we can provide guidance.

+ +

Intellectual Property Rights

+

You retain all your intellectual property rights (including copyright) upon depositing a Work. The limited rights you grant to Deep Blue Documents are non-exclusive, and your ability to grant, assign, or retain any and all rights you had before you deposit your Work does not change as a result of your deposit. Please note that some publishers may ask that you grant them exclusive rights to your Work, thus limiting your ability to use it as you see fit and perhaps even limiting your ability to deposit it in Deep Blue Documents and Deep Blue Data.

+

When depositing a Work, depositors or their designees should represent the Work's copyright status in a manner consistent with the U-M's Technology Transfer Policy, SPG 303.04, and Who Holds Copyright at or in Affiliation with the University of Michigan, SPG 601.28.

+

When depositing Works, you are required to select whether you’d like the Work to be in the public domain or have a Creative Commons license.

+

If you believe a Work has been uploaded to Deep Blue Documents without appropriate rights or permissions, please see the U-M Library Takedown Policy for information on how to report your concern. +

+ +

Access Permissions

+

Deep Blue Documents is committed to open access and prefers that content be deposited without any access restrictions. However, the Deep Blue team will make reasonable efforts to limit access to U-M affiliates or specific users, if restrictions are associated with a Work at the time of deposit.

+

You may choose to deposit your Work but prevent it from being seen in full for a limited amount of time. You may also choose to allow people to find out about the existence of your Work, but not download the Work itself for a limited time. (See the Managing page for more details about how to set access restrictions). +

+
+ +
+

Reporting & Remediation

+ +

Harmful Content

+

The U-M Library maintains a broad and inclusive Collection to support research and teaching, which may include Works some find objectionable. We do not remove content solely based on objection, guided by our commitment to academic freedom, diversity of thought, and freedom of expression. For more details, see the U-M Library Statement on Potentially Objectionable Collection Material.

+

Harmful Descriptive Language

+

The University of Michigan Library acknowledges that description and metadata creation are not neutral acts, but rather reflect the perspectives, biases, and power structures of those who create them. Because Deep Blue Documents Works are self-deposited and self-published, there is no unified perspective or standard represented in Work descriptions. In our commitment to reparative and inclusive stewardship, we recognize that harmful, outdated, or insensitive language may appear in our collections, both in the original language from creators and as artifacts of past descriptive practices that privileged certain voices while marginalizing others. We work to remediate the impacts of harmful descriptive metadata and provide contextual information where original terminology is retained; this is an iterative process and one that may require experience and expertise beyond our own. We strive to learn, continually update our practices, and ensure our descriptive work honors the dignity and knowledge systems of all individuals and communities documented in our repository. Please see the Library’s policy on remediation of harmful descriptive language to learn more about our practices, or submit feedback on a particular Work using the Library’s Feedback Form on Remediation.

+ +

File Format Remediation

+

If you are unable to use a Work’s file in its current format, please Contact Us and we can modify it to make it more accessible to you. We are developing a process for remediating all of the Works in Deep Blue Documents so that they are compliant with the Americans with Disabilities Act Title II Regulations. We will add more information on this process as it becomes available.

+
+ + +
+

Privacy in Deep Blue Documents

+

Your privacy is important to us, and its protection is supported by national and state laws, specifically the Michigan Library Privacy Act as well as by U-M policies and guidelines and U-M Library's Privacy Statement.

+ +

Automatically Collected and Stored Information

+

We gather user data on Works viewed or downloaded from Deep Blue Documents so we can better meet your needs and troubleshoot problems. Some of this information, in the form of session logs (which contain data such as browser type, your uniqname, and IP address) is retained for 90 days, then discarded.

+

The information you choose to save in the following areas is retained:

+
    +
  • Information you store in your Profile;
    • +
  • Information matching your name with the Works you deposit, and;
    • +
  • Questions and comments submitted to provide feedback are identifiable.
    • +
+

Access to the above information is restricted to U-M Library staff who need to use it in the normal course of library business. This information is never used for commercial or marketing purposes and will never be revealed to any third party except by such process, order, or subpoena authorized by national, state, or local law.

+ +

Information Protection Measures

+

To guard against unauthorized access, maintain the integrity of the data, and promote the proper use of that data, we have implemented physical, electronic, and managerial procedures to safeguard and secure the information we collect.

+

While we consider these reasonable measures, no guarantee can be made that they will always prevent invalid access or improper activity. For this reason, wherever possible we delete data (such as information about what Works you have previously viewed) that might cause activities to be linked to you as an individual. +

+ +

Additional Resources on Data Security

+

For more information on safe computing practices and U-M Library data security, visit the Safe Computing website. The Safe Computing website provides information on how U-M collects and uses U-M Library data, including patron profile information, service usage, and logging data. The site explains how this data supports service improvements, teaching integration, research, and institutional planning while maintaining strict privacy protections. Users can also find options for managing their U-M Library data preferences.

+
+ + +
+

Using Downloaded Works from Deep Blue Documents

+

Authors retain all of their intellectual property rights when they deposit a Work in Deep Blue Documents. If the Work has a Creative Commons License, you must abide by this license. Unless otherwise noted in Deep Blue Documents or on the Work itself, you should treat the Work like any other copyrighted material, and may make "Fair Use" of it as allowed by law. If you decide to use any of these materials, you are responsible for making your own legal assessment and securing any necessary permission. Please contact the author(s) directly if you need to secure permissions to reuse all or part of a Work. Deep Blue Documents is not the copyright holder and therefore, cannot grant permission for re-use.

+
+ +
+

Deep Blue Documents hosts content from a number of authors. The statements and views of these authors are theirs alone, and do not reflect the stances or policies of U-M or their sponsors, nor does their posting imply the endorsement of the U-M or their sponsors. +

+
+ +
+ + +
+ + + + diff --git a/src/assets/static/accessibility-statement.html b/src/assets/static/accessibility-statement.html new file mode 100644 index 00000000000..171a3ee35b9 --- /dev/null +++ b/src/assets/static/accessibility-statement.html @@ -0,0 +1,70 @@ + + + + + + + + Accessibility in Deep Blue Documents + + + + + + + + + + + +
+ + +
+
+ +
+
+

Accessibility Statement

+
+

Deep Blue Documents Accessibility

+

+ The University of Michigan Library is dedicated to creating inclusive services and products for all users. + See more about our approach to + digital product accessibility, + as well as our overall accessibility services and practices at the U-M Library. +

+
+
+

Contact us

+

We welcome your feedback and will do our best to resolve any issues promptly.

+

+ If you encounter any accessibility issues while using this product or have questions, + please contact us via our support form. +

+
+
+

Standards and evaluations

+

+ Our baseline accessibility target is to meet WCAG 2.1 AA standards. + The last accessibility evaluation for Deep Blue Documents was in October 2025. +

+

The next scheduled accessibility evaluation for this product is in 2026.

+
+
+ +

Resources for Accessible Content Creation

+

+ We provide resources to help depositors produce accessible content. For more information, + please see our Creating Accessible Works page. +

+
+
+
+ +
+ + + + + diff --git a/src/assets/static/accessibility.html b/src/assets/static/accessibility.html new file mode 100644 index 00000000000..953bda2f2f4 --- /dev/null +++ b/src/assets/static/accessibility.html @@ -0,0 +1,585 @@ + + + + + + + + Accessibility in Deep Blue Documents + + + + + + + + + + + +
+ + +
+
+ +
+
+

Accessibility in Deep Blue Documents: Creating Accessible Works

+ +
+

We strongly recommend following this guide to ensure your Work is as accessible, reusable, and preservable as possible.

+

Important Note: hile this page focuses on creating accessible Works to deposit into Deep Blue Documents, if you are unable to use a deposited Work’s file in its current format, please Contact Us and we can modify it to make it more accessible to you. We are developing a process for remediating all of the Works in Deep Blue Documents so that they are compliant with the Americans with Disabilities Act Title II Regulations. We will add more information on this process as it becomes available.

+

For more university resources, please see the Information and Technology Services Digital Accessibility Statement and the Electronic and Information Technology (EIT) Accessibility Standard Practice Guide (SPG). +

+
+ +
+

Understanding Accessibility Standards: ADA Title II and WCAG 2.2

+

Accessibility is a key consideration when depositing Works in Deep Blue Documents. Two major frameworks guide digital accessibility:

+
    +
  • ADA Title II (Americans with Disabilities Act, Title II) requires public entities to ensure equal access to services, including digital resources, for individuals with disabilities. All publicly available materials should accommodate diverse user needs.
    • +
  • WCAG 2.2 (Web Content Accessibility Guidelines 2.2) sets global standards for digital accessibility, ensuring content is perceivable, operable, understandable, and robust for users with various disabilities.
    • +
+

By adhering to these guidelines, you can help ensure that your Work is accessible to all users, including those who rely on screen readers, keyboard navigation, and other assistive technologies.

+
+ +
+

Digital Preservation and File Format Support

+

Deep Blue Documents follows the U-M Library Digital Preservation Policy to ensure the long-term accessibility and usability of deposited materials. File formats are classified into three levels based on their preservation support, as outlined in the U-M Library Registered Formats and Support Levels Document:

+
+

File Format Levels

+
    +
  1. + Level 1 (Recommended Formats): Highest support, ensuring preservation of content, structure, and functionality. This applies to publicly documented, widely used formats like PDF/A, JPEG, and AIFF. +
    2. +
  2. + Level 2 (Supported Formats, Not Preferred): Usable but may require format migration over time, such as certain proprietary document types or compressed file formats. +
    3. +
  3. + Level 3 (Limited Support Formats, Not Recommended): Basic preservation with no active monitoring or migration, putting these formats at risk for obsolescence, including uncommon or proprietary formats with limited accessibility features. +
    4. +
+

To maximize long-term accessibility, Level 1 formats are strongly recommended.

+
+ +
+

Document Types and Accessibility Guidelines

+ +

How to Use This Guide

+
    +
  1. Identify your document type (e.g., PDF, Word, HTML, audio, video, etc.).
    2. +
  2. Follow the general accessibility checklist for best practices. +
    3. +
  3. Check format-specific guidelines to ensure compliance with accessibility standards. +
    4. +
  4. Utilize resources and best practices links to improve the accessibility of your Work. +
    5. +
+ +
+

Text Documents

+ +

General Checklist

+
    +
  • Headings: Use clear, hierarchical headings (H1, H2, etc.) when applicable.
    • +
  • Font: Choose legible fonts and appropriate sizes. *Resources such as this font size standards article can be found online. +
    • +
  • Contrast: Ensure text meets WCAG contrast ratios (4.5:1 for normal text). *Resources such as this contrast color checker can be found online.
    • +
  • Text-to-Speech: Ensure compatibility with screen readers and text-to-speech tools.
    • +
  • Alternative Text: Provide alternative text for images (where applicable). *Alternative (alt) text is a brief, descriptive phrase that conveys a media's purpose or content, focusing on essential details without unnecessary words. +
    • +
+

Potential uses: PDF/A for archiving official documents with preserved formatting, Plain Text UTF-8 for multilingual web content across diverse systems, and SGML for detailed markup in technical manuals and publications.

+ +

Format Details

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Text Document Formats
FormatFile ExtensionSupport LevelFormat-Specific Accessibility ChecklistResources
PDF/A.pdfLevel 1 +
    +
  • Include accessible metadata (title, author).
    • +
  • Use proper tagging for structure.
    • +
+ 		+ +
Plain Text UTF-8 (Unicode).txtLevel 1 +
    +
  • Use descriptive file names (no metadata support so no metadata needed).
    • +
  • Structure with clear line breaks and headings.
    • +
+ 		+

No Plain Text UTF-8 specific criteria– see these resources for guidance:

+ +
Plain Text ANSI X3.4/ECMA-6/US-ASCII (7-bit).txtLevel 1 +
    +
  • Use descriptive file names (no metadata support needed).
    • +
  • Structure with clear line breaks and headings.
    • +
+ 		+

No Plain Text ANSI X3.4/ECMA-6 /US-ASCII specific criteria– see these resources for guidance:

+ +
SGML.sgm, .sgmlLevel 1 +
    +
  • Include accessible metadata (title, author).
    • +
  • Use semantic markup for structure (headings, lists, etc.).
    • +
+ 		+

No SGML specific criteria– see these resources for guidance:

+ +
XML.xmlLevel 1 / Level 2 +
    +
  • Ensure proper metadata is included (title, author).
    • +
  • Use semantic markup for structure (headings, lists, etc.).
    • +
  • Make sure the XML file is well-formed and properly validated for accessibility.
    • +
+ 		+

No XML specific criteria– see these resources for guidance:

+ +
HTML.html, .htmLevel 2 +
    +
  • Use clear, hierarchical headings (H1, H2, etc.).
    • +
  • Apply semantic HTML (e.g., <header>, <footer>, <article>).
    • +
  • Provide alternative text for images.
    • +
  • Ensure keyboard accessibility for interactive elements.
    • +
  • Validate HTML for syntax and accessibility.
    • +
+ 		+ +
+

Note: Level 2 and 3 formats are not recommended. We advise converting them to Level 1 formats for better long-term accessibility. Formats like HTML (.html, .htm), LaTeX (.latex), Postscript (.ps), Rich Text (.rtf), TeX (.tex), Plain Text ISO 8859-x (.txt), and Plain Text (all other encodings) (.txt) should be converted to a Level 1 format.You can convert to PDF using tools like Adobe Acrobat or online converters, and to plain text using text editors or free online tools. +

+
+ +
+

Common Desktop Software Formats

+ +

General Checklist

+
    +
  • Headings Structure: Ensure all documents (Word, Excel, PowerPoint) use proper heading structures.
    • +
  • Tables: Use accessible tables (e.g., with table headers marked correctly).
    • +
  • Images: Add alternative text to images and graphs in all formats. *Alternative (alt) text is a brief, descriptive phrase that conveys a media's purpose or content, focusing on essential details without unnecessary words.
    • +
  • Navigation: Ensure documents are navigable by screen readers (e.g., correctly marked links and form fields).
    • +
  • Contrast: Check and maintain adequate color contrast. Resources such as this contrast color checker can be found online.
    • +
  • Multimedia Alternative Text: Provide alt text for any audio or video content. *See more information about alternative text above.
    • +
+ +

Format Details

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Common Desktop Software Formats
FormatFile ExtensionSupport LevelFormat-Specific Accessibility ChecklistResources
Microsoft Word.docLevel 2 +
    +
  • Text Structure: Use proper paragraph styles and formatting to create clear and accessible text flow. Ensure it's assigned a Heading 1, Heading 2, or Heading 3, rather than just bolded text.
    • +
+ 		+ +
Microsoft PowerPoint.pptLevel 2 +
    +
  • Slide Titles: Ensure each slide has a clear and concise title for easy navigation.
    • +
  • Animations: Avoid using complex animations or transitions that may be confusing for screen readers or users with cognitive disabilities.
    • +
+ 		+ +
Microsoft Excel.xlsLevel 2 +
    +
  • Cell Headers: Use clear and descriptive headers for columns and rows.
    • +
  • Formulas: Ensure formulas are accessible and explained with cell comments or data validation.
    • +
+ 		+ +
+

Note: Level 2 formats are not recommended. We advise converting them to Level 1 formats for better long-term accessibility. Formats like Microsoft Word (.doc), Microsoft PowerPoint (.ppt), and Microsoft Excel (.xls) should be converted to a Level 1 format such as a PDF. You can convert to PDF using tools like Adobe Acrobat or online converters, and to plain text using text editors or online tools. +

+
+ +
+

Image File Formats

+ +

General Checklist

+
    +
  • Alternative Text: Always add descriptive alternative text for all images. *Alternative (alt) text is a brief, descriptive phrase that conveys a media's purpose or content, focusing on essential details without unnecessary words.
    • +
  • Contrast: Ensure images have good contrast against their backgrounds. Resources such as this contrast color checker can be found online.
    • +
  • Avoid Images of Text: Avoid embedding text within images; use accessible HTML text instead. +
    • +
  • Proper Labeling: Label images clearly for accessibility purposes. Avoid generic image names (such as Image1).
    • +
  • Screen Reader Compatibility: Ensure images are properly recognized by screen readers (through alternative text and proper tagging).
    • +
+

Potential uses: JPEG for efficiently sharing photographs with complex color gradients, and TIFF for preserving high-quality images in professional and archival settings.

+ +

General Sources for All

+ + +

Format Details

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Image File Formats
FormatFile ExtensionSupport LevelFormat-Specific Accessibility Checklist
JPEG.jpgLevel 1 +
    +
  • Optimize Compression: Ensure compression levels preserve necessary details for accessibility. Test for clarity, especially for critical image details.
    • +
+
TIFF.tiffLevel 1 +
    +
  • Manage File Size: Consider the impact of large file sizes on page load times, especially for users with slower internet connections.
    • +
+
PNG.pngLevel 2None
GIF.gifLevel 3 +
    +
  • Control Animations: Ensure that animations do not flash at frequencies between 2 Hz and 55 Hz. Provide user controls to pause or stop animations.
    • +
+
Photoshop.psdLevel 3 +
    +
  • Export for Web Use: Convert PSD files to web-friendly formats like JPEG if possible.
    • +
+
+

Note: Level 2 and 3 formats are not recommended. We advise converting them to Level 1 formats for better long-term accessibility. Formats like JPEG 2000 (.jp2), PNG (.png), BMP (.bmp), GIF (.gif), Photo CD (.pcd), and Photoshop (.psd) should be converted to JPEG or TIFF using image editing software or online converters. +

+
+ +
+

Audio File Formats

+ +

General Checklist

+
    +
  • Captions/Transcripts: Provide captions or transcripts for audio files. +
    • These typically exist as separate files (e.g., SRT files for captions) or as a transcript document, which must be provided alongside the audio content. Deposit these two files along with the audio file (as part of the Work).
    • +
  • Audio Descriptions: For content that relies heavily on sound, ensure audio descriptions are provided.
    • +
  • Clarity and Loudness: Ensure audio is clear and loud enough for individuals with hearing impairments.
    • +
  • Accessibility Testing: Test audio content with screen readers to ensure compatibility. *Free testing is available through online resources.
    • +
+

Potential uses: AIFF for high-quality audio editing and archival purposes, and Wave for professional recordings requiring maximum fidelity.

+ +

General Sources for All

+ + +

Format Details

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Audio File Formats
FormatFile ExtensionSupport LevelFormat-Specific Accessibility Checklist
AIFF.aif, .aiffLevel 1None. Follow General Checklist.
Wave.wavLevel 1None. Follow General Checklist.
MPEG audio.mp3Level 2None. Follow General Checklist.
+

Note: Level 2 and 3 formats are not recommended. We advise converting them to Level 1 formats for better long-term accessibility. Formats like Audio/Basic (.au, .snd), MPEG audio (.mp3), AAC_M4A (.m4a, .mp4), Real Audio (.ra, .rm, .ram), and Windows Media Audio (.wma) should be converted to widely supported formats like WAV using audio conversion tools or online converters.

+
+ +
+

Video File Formats

+ +

General Checklist

+
    +
  • Captions/Transcripts: Ensure videos have captions or transcripts available. +
    • These typically exist as separate files (e.g., SRT files for captions) or as a transcript document, which must be provided alongside the audio content. Deposit these two files along with the audio file (as part of the Work) +
    • +
  • Audio Descriptions: Provide audio descriptions for critical visual elements in videos.
    • +
  • Ensure ADA Compliance: Check videos for compliance with ADA Title II and WCAG 2.2 standards for visual and auditory impairments.
    • +
  • Clear Video Quality: Ensure videos are clear and viewable by individuals with visual impairments.
    • +
+ +

General Sources for All

+ + +

Format Details

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Video File Formats
FormatFile ExtensionSupport LevelFormat-Specific Accessibility Checklist
AVI.aviLevel 2As an older format, AVI files can sometimes have compatibility issues with modern accessibility tools, though most can handle them if proper captions, descriptions, and metadata are provided externally.
Quicktime.movLevel 2This format is widely used for high-quality video and can handle various accessibility features like captions and audio descriptions. It’s important to ensure these features are properly embedded or linked to the video.
MPEG-1 / MPEG-2.mp1, .mp2Level 2None. Follow General Checklist.
MPEG-4.mp4Level 2Ensure captions and subtitles are provided for audio content.
+ +

Note: Formats like AVI (.avi), Quicktime (.mov), MPEG-1/MPEG-2 (.mp1, .mp2), MPEG-4 (.mp4), and Windows Media Video (.wmv) are Level 2 and 3 formats. There are no Level 1 video formats due to the reliance on evolving technologies and codecs, which present challenges in ensuring long-term stability and universal support.

+
+
+

Other/Miscellaneous File Formats

+ +

General Checklist

+

Only specific requirements based on file format.

+ +

Format Details

+ + + + + + + + + + + + + + + + + + + + +
Other/Miscellaneous File Formats
FormatFile ExtensionSupport LevelFormat-Specific Accessibility ChecklistResources
ZIP/tar.zip, .gz, .tar.gzLevel 1/2/3 +
    +
  • Preserve Accessibility: ZIP or tar files are only as good as their contents; all best practices above still apply. Ensure all files inside are accessible (e.g., text documents, images with alternative text (see more information about alternative text above, under the General Checklist).
    • +
  • Label Clearly: Use descriptive names for compressed files.
    • +
  • Ensure Easy Extraction: Files should be easy to extract and maintain accessibility when unzipped.
    • +
+ 		+ +
+

Note: ZIP/tar formats (.zip, .gz, .tar.gz) are classified across Level 1, Level 2, and Level 3 depending on the specific use case and preservation needs. For long-term accessibility, we recommend converting to more stable, widely supported formats when possible. +

+
+
+ +
+

Government resources

+

For more information on accessibility and best practices, please refer to the following resources:

+ +
+ +
+
+ +
+ + + + + diff --git a/src/assets/static/components/footer.html b/src/assets/static/components/footer.html new file mode 100644 index 00000000000..8f0a35f1f7f --- /dev/null +++ b/src/assets/static/components/footer.html @@ -0,0 +1,35 @@ + + +
+
+
+

University of Michigan Library

+ +
+
+

About Deep Blue Documents

+ +
+
+

Privacy and copyright

+ +
+
+
+
+
+

© 2023, Regents of the University of Michigan

+
+
+ \ No newline at end of file diff --git a/src/assets/static/components/header.html b/src/assets/static/components/header.html new file mode 100644 index 00000000000..c202863b109 --- /dev/null +++ b/src/assets/static/components/header.html @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/src/assets/static/components/nav.html b/src/assets/static/components/nav.html new file mode 100755 index 00000000000..b231d1158be --- /dev/null +++ b/src/assets/static/components/nav.html @@ -0,0 +1,23 @@ + + + + + diff --git a/src/assets/static/css/style.css b/src/assets/static/css/style.css new file mode 100644 index 00000000000..a767ee6c14f --- /dev/null +++ b/src/assets/static/css/style.css @@ -0,0 +1,289 @@ +html, body { + margin: 0; + padding: 0; + scroll-behavior: smooth; +} + +body h1 { + font-family: var(--font-base-family); +} + +img { + display: block; + height: auto; + width: auto; + max-height: 400px; + max-width: 600px; + margin: 10px 10px 20px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); +} + +/* Style for the hamburger button */ +.hamburger-menu { + display: block; + background: none; + border: none; + font-size: 1.5rem; + color: white; + cursor: pointer; + right: 0; + padding: 20px; + z-index: 30; +} + +/* Default navigation links */ +.nav-links { + display: none; + flex-direction: column; + width: 100%; + padding: 10px 0; +} + +.nav-links a { + color: white; + text-decoration: none; + padding: 10px 15px; + margin: 5px 0; + display: block; + text-align: center; + background-color: var(--color-blue-400); +} + +/* Show menu when toggled */ +.nav-links.show { + display: flex; + align-items: flex-end; +} + +/* Skip to main content link */ +.skip-to-content { + position: absolute; + top: 0; + left: 0; + background: var(--color-blue-400); + color: #fff; + padding: 10px; + z-index: 10000; + transform: translateY(-100%); + transition: transform 0.3s ease; + clip: rect(0, 0, 0, 0); +} + +.skip-to-content:focus { + transform: translateY(0); + clip: auto; +} + +/* Flex container for sidebar and content */ +.flex-container { + display: flex; + flex-direction: column; +} + +.sidebar-container { + width: 100%; + box-shadow: none; + overflow: visible; + line-height: 1; + background-color: #fff; + padding: 20px; + position: relative; + z-index: 10; +} + +.sidebar ul { + list-style: none; + padding: 0; +} + +.sidebar .nav-header h2 { + font-weight: bold; + margin-top: 15px; + font-size: 1.2em; +} + +.sidebar li a { + text-decoration: none; + color: var(--color-teal-400); + display: block; + padding: 0.5em 1em; +} + +.sidebar a:hover { + text-decoration: underline; +} + +.sidebar a.active { + font-weight: var(--bold); + color: var(--color-teal-400); + padding-left: 12px; + border-left: solid 4px var(--color-teal-400); +} + +.sidebar ul ul { + padding-left: 1.5em; +} + +.content { + flex: 1; + margin-left: 0; + margin-right: var(--space-xx-large); + padding: 20px; + font-family: "Muli", sans-serif; + width: 100%; + max-width: 80ch; + margin: 0 auto; +} +.content h1, .content h2, .content h3, .content p { + max-width: 80ch; + line-height: 1.5; +} + +.indented-content p { + margin-left: 2em; + } + +/*Table styles with border color*/ +table { + width: 100%; + border-collapse: collapse; + margin-bottom: 20px; +} + +table, th, td { + border: 1px solid #ddd; +} + +th, td { + padding: 8px; + text-align: left; +} + +th { + background-color: #f4f4f4; +} + +caption { + font-weight: bold; + margin-bottom: 10px; + text-align: left; +} + +.footer { + background: var(--color-blue-400); +} + +.footer ul { + list-style: none; + margin: 0; + padding: 0; +} + +.footer ul a { + display: inline-block; + padding: .25rem 0; +} + +.footer ul a:hover { + text-decoration: underline; + text-decoration-thickness: 1px; +} + +.footer ul a span:hover { + text-decoration: underline; + text-decoration-thickness: 1px; +} + +.footer a { + color: white; +} + +.footer a > svg { + margin-right: 0.5em; +} + +.address { + max-width: 22ch; +} + +.footer__content { + color: var(--color-blue-100); + padding: 3rem 0; + display: grid; + grid-template-columns: 1fr; + gap: 3rem; +} + +.footer__content .first-column ul li a { + text-decoration: none; + display: flex; + align-items: baseline; +} + +.footer__content ul li a { + text-decoration: none; +} + +.footer__content h2 { + color: var(--color-blue-200); + font-size: 0.875rem; + font-weight: 800; + letter-spacing: 1.25px; + text-transform: uppercase; + margin-bottom: 1rem; +} + +.footer__policies { + border-left: solid 1px var(--color-blue-300); + padding-left: 2em; +} + +.footer__disclaimer{ + color: var(--color-blue-100); +} + +/* Media queries for larger screens */ +@media (min-width: 768px) { + .flex-container { + flex-direction: row; + } + + /* Sidebar styles for larger screens */ + .sidebar-container { + width: 25%; + min-width: 200px; + max-width: 300px; + box-shadow: 2px 0 5px rgba(0, 0, 0, 0.1); + overflow-y: auto; + line-height: 1.5; + height: 100vh; + /* Add sticky positioning (if we want) */ + position: sticky; + top: 0; + align-self: flex-start; + } + + .content { + padding: 40px; + } + + /* Navigation styles for larger screens */ + .hamburger-menu { + display: none; + } + + .nav-links { + display: flex; + width: auto; + padding: 0; + flex-direction: row; + } + + .nav-links a { + text-align: left; + } + + .footer__content { + grid-template-columns: repeat(auto-fill, 350px); + } +} \ No newline at end of file diff --git a/src/assets/static/depositing-via-experts.html b/src/assets/static/depositing-via-experts.html new file mode 100644 index 00000000000..4e9df34572d --- /dev/null +++ b/src/assets/static/depositing-via-experts.html @@ -0,0 +1,104 @@ + + + + + + + Depositing via Michigan Experts + + + + + + + + + + +
+ + +
+
+ +
+
+

How to Deposit Works into Deep Blue Documents via Michigan Experts +

+ +
+

Michigan Experts is U-M’s researcher profiling system. Among other things, you can showcase your research outputs in your profile. Deep Blue Documents is integrated into Michigan Experts, allowing you to add a Work to your Experts Profile and deposit it into Deep Blue Documents simultaneously.

+ +

Here’s how to deposit Works into Deep Blue Documents via Michigan Experts:

+

Here’s how to deposit Works into Deep Blue Documents via Michigan Experts:

+
    +
  1. Log into Michigan Experts. Note: the software underlying Michigan Experts is called Symplectic Elements. After logging in, the Michigan Experts branding will be replaced with the Symplectic Elements branding. +
    2. +
  2. In the Scholarly Activities tile, select ‘View All.’ + Michigan Experts homepage highlighting the 'Scholarly Articles' section in the bottom left, with a 'View All' button in the section’s bottom right corner.
    3. +
  3. On the ‘My claimed scholarly activities’ page, determine if the Work that you want to deposit into Deep Blue Documents is already listed. +
      +
    • If it is listed, proceed to step 4.
      • +
    • If not, skip to step 8.
      • +
    + Claimed scholarly activities page with button at the top of the page indicating the amount of claimed Works. +
    4. +
  4. If the Work that you want to deposit into Deep Blue Documents is already listed, click the blue ‘Deposit’ button next to the Works name. +
      +
    • A Work won’t have this button if it’s already deposited into Deep Blue Documents - see the Work’s History tab for more information. +
      • +
    + + Details of one selected Work. Deposit button if found on the far right of the Work.
    5. +
  5. If applicable, select which version of the Work you’d like to deposit. You may see two options: choose an external source or choose a file from your local machine. +
      +
    • Selecting either option is fine. It won’t affect how the Work is deposited into Deep Blue Documents.
      • +
    • Select the version via the dropdown list. Then click ‘Use this File.’
      • +
    + + Deposit process screen showing deposit advice on the left and a file preparation section on the right with a version dropdown menu.
    6. +
  6. Optional: Select an embargo period. This is the length of time before the Work becomes publicly available in Deep Blue Documents. +
      +
    • If your Work was published in a scholarly journal, check Jisc’s Open Policy Finder to determine if the journal publisher requires an embargo period. +
      • +
    • You can include a note in the Comments section about the chosen embargo period but it’s not necessary. +
      • +
    + + Deposit process screen showing the second step of the process: Add additional information, including embargo specifications.
    7. +
  7. Click Deposit. It may take a few minutes for the Work to be deposited so don’t refresh or hit the Back button. +
    8. +
  8. If the Work that you want to deposit isn’t listed, you can enter it manually. Click the blue + icon in the upper right corner. + + Claimed Scholarly Activities page with the plus icon emphasized in the top right corner.
    9. +
  9. Select the type of scholarly activity that you’d like to deposit. Notice that there are many different types of scholarly activities that you can add! + + New scholary activity page showing options to select activity type.
    10. +
  10. Then fill in the metadata about the scholarly activity. The screenshot below is to add a conference proceeding, abstract, or poster. Metadata requirements will vary slightly by the type of scholarly activity selected. + + Scholarly activity deposit screen, 'Tell Us More' section showing fields for submitting metadata, such as privacy settings.
    11. +
  11. Next, click ‘Deposit to Deep Blue Documents’ and follow steps 5-7 above. + + Page displaying the 'Deposit to Deep Blue Documents' button, emphasized in the upper left corner.
    12. +
  12. After a successful deposit, you will receive an email with the subject: “Deep Blue: Submission Approved and Archived” +
      +
    • If you click the DOI in this email, you’ll be taken to your Work in Deep Blue Documents. Note that the DOI may take a few hours to become active.
      • +
    + + Image of the confirmation email from deeblue@umich.edu, conformation sucessful submission. + +

    If you have any other questions, please Contact Us.

    +
+
+ + + + +
+
+ +
+ + + + diff --git a/src/assets/static/depositing.html b/src/assets/static/depositing.html new file mode 100644 index 00000000000..bf2f28857a7 --- /dev/null +++ b/src/assets/static/depositing.html @@ -0,0 +1,236 @@ + + + + + + + Depositing into Deep Blue Documents + + + + + + + + + + +
+ + +
+
+
+

Depositing into Deep Blue Documents

+ +
+

How to Deposit a Work

+

The process for depositing a Work into Deep Blue Documents is outlined below. This process is different for U-M faculty/staff compared to students. To determine eligibility, please refer to the About page. For students, please see our Deep Blue Documents Institutional Repository for Students guide on how to get permission to deposit. +

+

For U-M faculty and staff, please follow the steps below:

+
    +
  1. Log in to Deep Blue Documents + + Deep Blue Documents homepage with the 'Login' in the upper right corner of the menu. +
    2. +
  2. Start a New Work +
      +
    • Open your Deep Blue Documents dashboard by clicking on the menu icon in the upper left-hand corner.
      • +
    • Click “Work” under "+ New” to begin a new Work deposit.
      • +
    + Deep Blue Documents dashboard sidebar expanded and 'Deposit' selected under the '+ New' section. +
    3. +
  3. Select a Collection +
      +
    • A pop-up will appear prompting you to select a Collection.
      • + +
        +
      • If a Collection does appear, select your Collection and proceed to step 4.
        • +
      • If a Collection does not appear, follow the steps below. (Note: New users do not automatically receive these privileges - you must be granted access by a Collection Administrator.)
          +
        • Review the Research Collections list to determine which Collection you’d like to be affiliated with.
          • +
        • Contact your Collection Administrator or Contact Us (the Deep Blue team) to request access to your desired Collection.
        +
      +
    + Deep Blue Documents pop-up window showing a list of available Collections to choose from. +
    4. +
  4. New Work Page +
      +
    • After selecting a Collection, you will be directed to the New Work page.
      • +
    • At the time the Work is deposited, Deep Blue Documents automatically assigns several pieces of metadata:
      • +
    + Deep Blue Documents New Deposit page showing the DOI and handle generated. +
    5. + + +
  5. + Provide Descriptive Information (Metadata) about your Work +
      To enhance discoverability, you must fill in the following details:
    +
      +
    • + Depositor Information +
        +
      • Author name(s) (First and Last)
        • +
      • U-M Campus
        • +
      +
      • +
    • + Item Details +
        +
      • Title
        • +
      • Date of Issue
        • +
      • Deposit Type (e.g., Image, Article, Book)
        • +
      +
      • +
    • File uploads
      • +
    • Creative Commons License
      • +
    • Terms of Deposit acceptance
      • +
    • Optional metadata fields (ORCID iD, author affiliation, language, etc.) which can enhance the discoverability of your Work.
      • +
    +
    6. +
  6. Check for Completion +
      +
    • A green check mark will appear next to each section once all required information is entered.
      • +
    • If any required section is incomplete, an orange exclamation mark will appear.Deep Blue Documents New Work page with green check marks next to completed steps.
    7. + + +
  7. Finalizing Your Work +
      +
    • Deep Blue Documents encourages filling out both required and optional fields to maximize discoverability.
      • +
    • At the bottom of the page, use the submission bar to choose from Discard, Save, Save for later, and Deposit.Deep Blue Documents deposit options menu at the bottom of the New Work page.
      • +
    • Submission Options:
        +
      • Discard: Deletes the Work and all associated metadata and files.
        • +
      • Save: Saves your progress.
        • +
      • Save for Later: Saves your Work as a draft (marked with an orange Draft indicator in “My Works).
        • +
      • Deposit: Permanently deposits the Work. This action locks the Work and its metadata—future edits will require administrative support. If you anticipate making changes, use Save or Save for Later instead.
        • +
      +
      • +
    +
    8. +
  8. View your Works +
      +
    • To view your draft and deposited Works, click the profile icon in the top right corner and then select ‘My Works’ +
      • +
    • On your My Works page, all of your deposited (flagged “Deposited” in green) and draft (flagged “Draft” in orange) Works will appear.
      • +
    + Deep Blue Documents My Works page showing a list of deposited and draft works. +
    9. +
+
+ +
+

Collections in Deep Blue Documents

+

Understanding Collections

+

Deep Blue Documents organizes its content around Collections to simplify the process of depositing your Work and to provide you with the most flexibility for finding Work interesting to you. Schools, colleges, departments, research institutes, and other large groups can create Collections in Deep Blue Documents to group related Works at the broadest levels. Collections allow people to explore a specific area in depth, or to focus specifically on only the areas they find interesting.

+ +

Creating Collections

+

Only Deep Blue Documents staff have the authority to create new Collections. We strongly encourage individuals to add their Work to an existing Collection, which is designed to accommodate a wide array of scholarly materials. If you find that existing Collections don't suit your needs, please Contact Us to discuss how we can best assist you.

+

Remember, the Collection in which a Work is placed doesn't affect its discoverability; works are fully searchable within the repository and indexed by search engines, regardless of which Collection they are located in.

+ +

Archival Collections – Bentley Library and Research Collections

+

The Archival Collections – Bentley Library contains some of the Bentley Historical Library’s online materials. The Bentley Historical Library collects the materials for and promotes the study of the State of Michigan and U-M. Only archivists at the Bentley Historical Library can deposit Works into their Collections. The Research Collections are related to various schools, colleges, departments, research institutes, etc. on all three U-M campuses. U-M faculty, staff, and students may be eligible to deposit into the Research Collections.

+ +

Missing Collections While Depositing

+

If you can’t find a Collection in the dropdown box, you haven’t been added as a depositor to a Collection. New Deep Blue Documents users don’t automatically receive deposit privileges—your Collection Administrator must grant access. Please contact your Collection Administrator to be added. If you have any other questions, feel free to Contact Us.

+
+ +
+

Additional Information on Depositing Works

+ +
+

Proxy Depositing

+

A designated proxy is someone who is authorized to deposit on behalf of another depositor. Follow the steps below to either designate a proxy or deposit as a proxy once you're set up.

+
    +
  1. How to Designate a Proxy +

    To designate a proxy, please Contact Us, specifying the name and uniqname of both the depositor and proxy. Once we receive this information, we will set up proxy access.

    +
    2. +
  2. Once You’re a Proxy: How to Deposit +

    Once you're set up as a proxy, you can follow the regular How to Deposit process. However, during the deposit process, in the field labeled “Depositing As,” select or enter the name of the depositor you are acting on behalf of.

    + + Deep Blue Documents Deposit page showing 'Depositing As' dropdown. +

    Please note that if you’re depositing as a proxy, you must agree to additional items in the Terms of Deposit.

    3. +
+ +
+

Accepted File Formats

+

Our goal of providing access to your Work means that Deep Blue Documents accepts all digital formats. However, not all formats can receive the same level of preservation support. See more detail on the Preservation page.

+

Note that research data primarily meant to be viewed or consumed by computers should be deposited into Deep Blue Data (See the About page for more information).

+
+ +
+

File Size Limitations

+

Deep Blue Documents doesn’t limit the size of files deposited. However, due to network constraints, depositing files larger than 5 GB requires Deep Blue Documents staff to deposit the Work on your behalf. (For instance, we will want to compare checksums on your file before and after deposit to verify that the file transferred correctly and completely.) We will handle these on a case-by-case basis, so please Contact Us if you plan to deposit large files.

+
+ +
+

Types of Works that aren’t Accepted

+

There are some Works that you may not be able to deposit or that may find a better home, either temporarily or permanently, elsewhere at U-M, such as datasets, non-U-M affiliated Works, Works in progress, etc. See more information on the About page. +

+
+
+

Enhanced Metadata in Deep Blue Documents

+

The U-M Library will only assign additional metadata that can be added automatically. Assigning metadata can be time-consuming and costly, therefore we are unable to do this routinely on a per-Work basis. When the U-M Library finds that we can improve access by enhancing the information about a deposited Work or providing a new context for the Work (such as representing the Work in additional Collections beyond the one you deposited it in) or better preserve your Work by changing its format, we may do so.

+
+ +
+

Inserting Special Characters in Titles and Abstracts

+

You can include special characters in the title or abstract of your Work with a bit of extra effort. Be sure to use a UTF-8 or UTF-16 compatible font—'Arial' is a reliable choice for Roman characters and is widely available on both PC and Mac. The steps to insert special characters are described below: +

+
    +
  • Mac +
      +
    • Accented Characters: Press and hold a letter key (like "a") to see a menu of accented versions (e.g., à, á, â, ã). Use arrow keys to navigate and spacebar to select. You can also use the Option key with other keys for specific accents.
      • +
    • Special Symbols and the Character Viewer: Access Character Viewer: Press Control + Command + Spacebar to open the Character Viewer for a wide range of symbols and special characters.
      • +
    +
    • +
  • Windows +
      +
    • Using the Character Map: +
        +
      • Open Character Map: Press Windows key + S, type "Character Map," and select the app. +
        • +
      • Find and Insert Characters: Search for and select the character, then click "Copy" and paste it into your document. +
        • + +
      • +
    • Using Keyboard Shortcuts (Accents): +
        +
      • Grave Accent: Press Ctrl + ` (key to the left of 1) then the vowel.
        • +
      • Circumflex Accent: Press Ctrl + Shift + 6 then the vowel.
        • +
      • Acute Accent: Press Ctrl + ' (key to the right of P) then the vowel.
        • +
      +
      • +
    • Using Alt Codes (Numeric Keypad): +
        +
      • Hold the Alt key, type the numerical code on the numeric keypad, then release Alt to insert the character.
        • +
      +
      • +
    +
    • +
+ +

If you have any questions, please Contact Us.

+
+ +
+

Batch Upload Process

+

If you have more than twenty Works that need to be uploaded simultaneously to the same Collection, Deep Blue Documents staff can do a batch upload on your behalf. In order to do this, you will need to provide us with a structured spreadsheet containing metadata for each Work. We can help you set up a template spreadsheet and a mechanism for systematically collecting Works (including metadata) from authors. See the Terms of Deposit page for more information. Please Contact Us to learn more about the batch upload process.

+
+
+ + +
+
+ +
+ + + + diff --git a/src/assets/static/glossary.html b/src/assets/static/glossary.html new file mode 100644 index 00000000000..b3d198a7abd --- /dev/null +++ b/src/assets/static/glossary.html @@ -0,0 +1,116 @@ + + + + + + + Glossary + + + + + + + + + + +
+ + +
+
+ +
+

Deep Blue Documents Glossary

+

In this glossary, we define how we use the following terms in Deep Blue Documents.

+ +

A Work and its components

+ +
+

Metadata

+

Descriptive information that defines key attributes about a Work. When researchers create metadata for their Work, others can more easily discover the Work and assess its relevance to their needs. As metadata are designed to be discoverable through online search engines, researchers preparing metadata should consider what details others will need in order to find and connect with the Work.

+
+ +
+

Work

+

The main organizational unit within the Deep Blue Documents repository. A Work refers to a group of related documents or materials that can be in a variety of formats plus accompanying metadata. A Work can contain multiple files. In the example below, this Work is a video recording that includes three files: (1) a video file, (2) a caption file, and (3) a transcript file (along with metadata).

+ Components of a Deep Blue Documents 'Work' are all relevant files of any type plus the metadata. +
+ +

Important terms

+ +
+

Bit-level preservation

+

All digital files are, at their most basic level, a sequence of bits (1’s and 0’s) encoded in physical material like a hard drive. When Deep Blue Documents ingests a new file, our system automatically preserves the file’s sequence of bits (or "bitstream"), no matter the file type. "Bit-level preservation" means that we keep this bitstream for reference so that we can a) regularly check that files have not been corrupted over time, and b) restore files that have undergone changes if necessary.

+
+ +
+

Checksum

+

A handy algorithm for detecting even the smallest differences between files. We can immediately see if a file has changed by comparing its current checksum to the checksum our system generated when the file was first uploaded; we can then restore the file to its original state if need be.

+
+ +
+

Collection

+

A Deep Blue Documents Collection corresponds to an academic or administrative unit at U-M that produces creative, intellectual, or artistic Works, has a defined leader, has long-term stability, and can assume responsibility for setting collection policies. Groups wishing to establish a Deep Blue Documents collection that do not fall into this definition will be considered on a case-by-case basis. The U-M Library will also assist individuals in locating or establishing collections to host their Work.

+
+ +
+

Collection Administrator

+

A faculty or staff member from a school, college, department, research institute, or a Library liaison who helps define and manage procedures for a collection. They ensure each collection meets the needs of the community and adapts to changing requirements, working with the U-M Library to establish procedures that best suit the collection's needs. Each collection can have one or more administrators to fulfill these roles.

+
+ +
+

Community

+

In Deep Blue, there are two main communities: the research community and the archival community. The research community encompasses Deep Blue Documents and Deep Blue Data. The archival community is represented by the Bentley Historical Library, focused on preserving and providing access to historically significant materials. These communities organize, manage, and facilitate the discovery of scholarly and archival content.

+
+ +
+

DOI

+

A unique, permanent digital identifier assigned to an object. DOI stands for Digital Object Identifier. DOIs are commonly used in academia to identify scholarly Works and can be connected to metadata and URLs that point to an object’s online location or representation. As part of its mission to encourage sharing and preserving the research, teaching, learning and creativity, Deep Blue Documents works with DataCite, a DOI Registration Agency, to mint DOIs for Works deposited to Deep Blue Documents. For a more detailed discussion of DOIs, visit DataCite’s website. Each Work also receives a handle, another unique, persistent digital identifier. +

+
+ +
+

Fixity

+

The state of being unchanged over time. Deep Blue Documents ensures fixity for the files it hosts; in other words, we ensure that all files are continually fixed in the exact same state they were in upon upload, without a bit out of place.

+
+ +
+

Handle

+

A unique, persistent digital identifier assigned to every Work in Deep Blue Documents. Each Handle takes the form of a stable URL, providing a reliable way to cite and access Works in the repository. Each Work also receives a DOI, another unique, persistent digital identifier.

+
+ +
+

Open access

+

A publishing model that seeks to make scholarly output, which is often indirectly paid for by tax dollars, freely and readily available to the public. As an Open Access repository, Deep Blue Documents allows anyone with access to the internet to view Works and download files. Allowed uses of those files are governed by Deep Blue Documents’s Terms of Deposit and can be governed by a Creative Commons License that was selected by the depositor. +

+
+ +
+

Open or non-proprietary format

+

A file format with publicly available documentation or specifications. These files can be opened with a variety of software and hardware systems and are often associated with widely accepted professional standards. Quintessential examples are PDF/A (.pdf) and JPEG (.jpg) files. Deep Blue Documents can provide superior preservation services for open formats as compared with proprietary formats.

+
+ +
+

Proprietary format

+

A file format that is commercially developed, which often means that its specifications are not publicly available and/or that files in that format can only be used with specialized software or hardware. Although Deep Blue Documents accepts files in all formats, the repository’s ability to preserve proprietary formats is limited; therefore, files in open formats are preferred. For more details about Deep Blue Documents’s Preservation Policy, visit the Preservation page.

+
+ +
+

Proxy

+

A person to whom a depositor gives the authority to make a deposit on the depositor’s behalf. In cases where a proxy is appointed, the depositor of record still retains the authority to alter the deposit and answer questions about it; they remain responsible for its content.

+
+ +
+

Personally identifiable information

+

Information that can be used to discover the identity of human research subjects is considered to be personally identifiable information. In the vast majority of cases, we do not accept this kind of information, for both legal and ethical reasons. For more information, review U-M’s standard practice guide for research with human participants.

+
+
+
+ +
+ + + + diff --git a/src/assets/static/images/depositing-via-experts/AddNewWork.jpg b/src/assets/static/images/depositing-via-experts/AddNewWork.jpg new file mode 100644 index 00000000000..2995a6ecd4f Binary files /dev/null and b/src/assets/static/images/depositing-via-experts/AddNewWork.jpg differ diff --git a/src/assets/static/images/depositing-via-experts/AddProceeding.jpg b/src/assets/static/images/depositing-via-experts/AddProceeding.jpg new file mode 100644 index 00000000000..7c809ef024e Binary files /dev/null and b/src/assets/static/images/depositing-via-experts/AddProceeding.jpg differ diff --git a/src/assets/static/images/depositing-via-experts/AddScholarlyActivity.jpg b/src/assets/static/images/depositing-via-experts/AddScholarlyActivity.jpg new file mode 100644 index 00000000000..e04e75e5ef2 Binary files /dev/null and b/src/assets/static/images/depositing-via-experts/AddScholarlyActivity.jpg differ diff --git a/src/assets/static/images/depositing-via-experts/ArticleToDeposit.jpg b/src/assets/static/images/depositing-via-experts/ArticleToDeposit.jpg new file mode 100644 index 00000000000..2fdc665ff93 Binary files /dev/null and b/src/assets/static/images/depositing-via-experts/ArticleToDeposit.jpg differ diff --git a/src/assets/static/images/depositing-via-experts/ClaimedScholarlyActivities.jpg b/src/assets/static/images/depositing-via-experts/ClaimedScholarlyActivities.jpg new file mode 100644 index 00000000000..486284edd96 Binary files /dev/null and b/src/assets/static/images/depositing-via-experts/ClaimedScholarlyActivities.jpg differ diff --git a/src/assets/static/images/depositing-via-experts/ConfirmationEmail.jpg b/src/assets/static/images/depositing-via-experts/ConfirmationEmail.jpg new file mode 100644 index 00000000000..89d525d08da Binary files /dev/null and b/src/assets/static/images/depositing-via-experts/ConfirmationEmail.jpg differ diff --git a/src/assets/static/images/depositing-via-experts/DepositProcess.jpg b/src/assets/static/images/depositing-via-experts/DepositProcess.jpg new file mode 100644 index 00000000000..87a45796387 Binary files /dev/null and b/src/assets/static/images/depositing-via-experts/DepositProcess.jpg differ diff --git a/src/assets/static/images/depositing-via-experts/DepositToDBDocs.jpg b/src/assets/static/images/depositing-via-experts/DepositToDBDocs.jpg new file mode 100644 index 00000000000..a81cb2bc5aa Binary files /dev/null and b/src/assets/static/images/depositing-via-experts/DepositToDBDocs.jpg differ diff --git a/src/assets/static/images/depositing-via-experts/Homepage.jpg b/src/assets/static/images/depositing-via-experts/Homepage.jpg new file mode 100644 index 00000000000..dfa5016b11e Binary files /dev/null and b/src/assets/static/images/depositing-via-experts/Homepage.jpg differ diff --git a/src/assets/static/images/depositing-via-experts/SelectEmbargo.jpg b/src/assets/static/images/depositing-via-experts/SelectEmbargo.jpg new file mode 100644 index 00000000000..a06191ec9d5 Binary files /dev/null and b/src/assets/static/images/depositing-via-experts/SelectEmbargo.jpg differ diff --git a/src/assets/static/images/depositing/My-works.png b/src/assets/static/images/depositing/My-works.png new file mode 100644 index 00000000000..ce00397587a Binary files /dev/null and b/src/assets/static/images/depositing/My-works.png differ diff --git a/src/assets/static/images/depositing/deposit-options.png b/src/assets/static/images/depositing/deposit-options.png new file mode 100644 index 00000000000..1ccef8f419f Binary files /dev/null and b/src/assets/static/images/depositing/deposit-options.png differ diff --git a/src/assets/static/images/depositing/deposit-required-steps.png b/src/assets/static/images/depositing/deposit-required-steps.png new file mode 100644 index 00000000000..64fd55b3df3 Binary files /dev/null and b/src/assets/static/images/depositing/deposit-required-steps.png differ diff --git a/src/assets/static/images/depositing/identifiers-assigned.png b/src/assets/static/images/depositing/identifiers-assigned.png new file mode 100644 index 00000000000..dd2d21172f7 Binary files /dev/null and b/src/assets/static/images/depositing/identifiers-assigned.png differ diff --git a/src/assets/static/images/depositing/login.png b/src/assets/static/images/depositing/login.png new file mode 100644 index 00000000000..8001b414274 Binary files /dev/null and b/src/assets/static/images/depositing/login.png differ diff --git a/src/assets/static/images/depositing/proxy-depositing.png b/src/assets/static/images/depositing/proxy-depositing.png new file mode 100644 index 00000000000..61105b6df6c Binary files /dev/null and b/src/assets/static/images/depositing/proxy-depositing.png differ diff --git a/src/assets/static/images/depositing/select-collection.png b/src/assets/static/images/depositing/select-collection.png new file mode 100644 index 00000000000..db19074fa5b Binary files /dev/null and b/src/assets/static/images/depositing/select-collection.png differ diff --git a/src/assets/static/images/depositing/start-new-deposit.png b/src/assets/static/images/depositing/start-new-deposit.png new file mode 100644 index 00000000000..13ce509c063 Binary files /dev/null and b/src/assets/static/images/depositing/start-new-deposit.png differ diff --git a/src/assets/static/images/glossary/work-description.png b/src/assets/static/images/glossary/work-description.png new file mode 100644 index 00000000000..6844cbe227d Binary files /dev/null and b/src/assets/static/images/glossary/work-description.png differ diff --git a/src/assets/static/images/managing/My-works.png b/src/assets/static/images/managing/My-works.png new file mode 100644 index 00000000000..ce00397587a Binary files /dev/null and b/src/assets/static/images/managing/My-works.png differ diff --git a/src/assets/static/images/managing/Profile.png b/src/assets/static/images/managing/Profile.png new file mode 100644 index 00000000000..0b696ed2883 Binary files /dev/null and b/src/assets/static/images/managing/Profile.png differ diff --git a/src/assets/static/images/managing/ProfileAnnotated.jpg b/src/assets/static/images/managing/ProfileAnnotated.jpg new file mode 100644 index 00000000000..9d9fa72272d Binary files /dev/null and b/src/assets/static/images/managing/ProfileAnnotated.jpg differ diff --git a/src/assets/static/images/searching/UMonly.png b/src/assets/static/images/searching/UMonly.png new file mode 100755 index 00000000000..ac6a7aea07d Binary files /dev/null and b/src/assets/static/images/searching/UMonly.png differ diff --git a/src/assets/static/images/searching/browse-author.png b/src/assets/static/images/searching/browse-author.png new file mode 100755 index 00000000000..8af4c186bac Binary files /dev/null and b/src/assets/static/images/searching/browse-author.png differ diff --git a/src/assets/static/images/searching/browse-issuedate.png b/src/assets/static/images/searching/browse-issuedate.png new file mode 100755 index 00000000000..36bb7191755 Binary files /dev/null and b/src/assets/static/images/searching/browse-issuedate.png differ diff --git a/src/assets/static/images/searching/browse-menu.png b/src/assets/static/images/searching/browse-menu.png new file mode 100755 index 00000000000..a9dc6eeff82 Binary files /dev/null and b/src/assets/static/images/searching/browse-menu.png differ diff --git a/src/assets/static/images/searching/browse-subject-title.png b/src/assets/static/images/searching/browse-subject-title.png new file mode 100755 index 00000000000..675e5f7b580 Binary files /dev/null and b/src/assets/static/images/searching/browse-subject-title.png differ diff --git a/src/assets/static/images/searching/browse-subject.png b/src/assets/static/images/searching/browse-subject.png new file mode 100755 index 00000000000..951f18e150c Binary files /dev/null and b/src/assets/static/images/searching/browse-subject.png differ diff --git a/src/assets/static/images/searching/browse-title.png b/src/assets/static/images/searching/browse-title.png new file mode 100755 index 00000000000..cbb03c5ec9c Binary files /dev/null and b/src/assets/static/images/searching/browse-title.png differ diff --git a/src/assets/static/images/searching/catalog.png b/src/assets/static/images/searching/catalog.png new file mode 100755 index 00000000000..2600207521d Binary files /dev/null and b/src/assets/static/images/searching/catalog.png differ diff --git a/src/assets/static/images/searching/homepage.png b/src/assets/static/images/searching/homepage.png new file mode 100755 index 00000000000..ef668337c3c Binary files /dev/null and b/src/assets/static/images/searching/homepage.png differ diff --git a/src/assets/static/images/searching/librarysearch.png b/src/assets/static/images/searching/librarysearch.png new file mode 100755 index 00000000000..e66f8db11a0 Binary files /dev/null and b/src/assets/static/images/searching/librarysearch.png differ diff --git a/src/assets/static/intellectual-property-rights.html b/src/assets/static/intellectual-property-rights.html new file mode 100644 index 00000000000..3a7b63f46ee --- /dev/null +++ b/src/assets/static/intellectual-property-rights.html @@ -0,0 +1,73 @@ + + + + + + + Intellectual Property Rights + + + + + + + + + + +
+ + +
+
+ +
+
+

Intellectual Property Rights

+ +
+

Deep Blue Formal Policy Overview

+

Deep Blue Documents supports the University's mission of communicating the knowledge created here to the citizens of Michigan and the world, and does so by offering a service geared towards providing the broadest possible access to our creative, intellectual, and artistic Work. We encourage you to explore all means of allowing others to build upon your Work. When depositing Works, you are required to select whether you’d like the Work to be in the public domain or have a Creative Commons license. +

+

Because the topic of intellectual property has specific legal implications, Deep Blue Documents has a formal policy. It has four parts:

+ +
+ +
+

Rights Granted to the University Upon Deposit

+

When you agree to our standard Author's Deposit Agreement at the time of deposit, you grant Deep Blue Documents the non-exclusive right to:

+
    +
  • retain, reproduce, and distribute the deposited Work;
    • +
  • keep more than one copy of your Work for purposes of security, backup, preservation, and access, and;
    • +
  • migrate your Work to any future medium or format for the purpose of preservation and access.
    • +
+
+ +
+

Rights Retained Upon Deposit

+

You retain all your intellectual property rights (including copyright) upon deposit. The limited rights you grant to Deep Blue Documents are non-exclusive, and your ability to grant, assign, or retain any and all rights you had before you deposit your Work does not change as a result of your deposit. Please note that some publishers may ask that you grant them exclusive rights to your Work, thus limiting your ability to use it as you see fit and perhaps even limiting your ability to deposit it in Deep Blue Documents and Deep Blue Data.

+
+ +
+

Definition of "Original Work" in the Author's Deposit Agreement

+

In most cases it's obvious when a Work is original to you, especially when you are its sole creator. But some cases can be complex. Other examples of original Work that you may deposit include:

+
    +
  • Annotated or illustrated versions of public domain Works. For example, if a U-M mathematics lecturer added annotations to Alice in Wonderland or an art professor illustrated Moby Dick, both have created a new original Work and we would encourage them to deposit the digital versions of those Works in Deep Blue Documents.
    • +
  • Works which you co-authored, such as reports on research done with colleagues at U-M or elsewhere. Unless you grant specific rights (such as the right to distribute) to someone else, the intellectual property is owned equally and in full by all creators.
    • +
+

Related to that, in the third and fourth paragraph of the agreement, you represent that you have the right to make and deposit the Work and that you're not infringing on the rights of others by doing so. If you have questions about the status of your Work, a number of resources exist on campus to assist you, including the U-M Library Copyright Policy.

+
+
+
+ + +
+ + + + diff --git a/src/assets/static/js/script.js b/src/assets/static/js/script.js new file mode 100644 index 00000000000..4b73063f647 --- /dev/null +++ b/src/assets/static/js/script.js @@ -0,0 +1,67 @@ +document.addEventListener("DOMContentLoaded", function () { + function loadComponent(componentPath, componentSelector, callback) { + fetch(componentPath) + .then(response => response.text()) + .then(data => { + const element = document.querySelector(componentSelector); + if (element) { + element.innerHTML = data; + if (callback) callback(); + } else { + console.log(`Element not found for selector: ${componentSelector}`); + } + }) + .catch(error => console.error(`Error loading component from ${componentPath}:`, error)); + } + + loadComponent('components/header.html', 'header', initializeMenu); + loadComponent('components/footer.html', 'footer'); + loadComponent('components/nav.html', '.sidebar-container', enhanceSidebar); + + function initializeMenu() { + const menuButton = document.querySelector(".hamburger-menu"); + const navLinks = document.querySelector(".nav-links"); + + if (menuButton && navLinks) { + menuButton.addEventListener("click", function () { + navLinks.classList.toggle("show"); + + // Toggle the icon + if (navLinks.classList.contains("show")) { + menuButton.innerHTML = '✕'; // Unicode for X + } else { + menuButton.innerHTML = '☰'; // Unicode for ☰ + } + }); + } else { + console.log('Menu button or navigation links not found.'); + } + } + + function enhanceSidebar() { + const currentLocation = window.location.href; + + document.querySelectorAll('.sidebar a').forEach(link => { + if (link.href === currentLocation) { + link.classList.add('active'); + } + }); + + const headings = document.querySelectorAll('.content h2'); + const currentPageLinks = document.createElement('ul'); + + headings.forEach(heading => { + const listItem = document.createElement('li'); + const link = document.createElement('a'); + link.href = `#${heading.id}`; + link.textContent = heading.textContent; + listItem.appendChild(link); + currentPageLinks.appendChild(listItem); + }); + + const activeLink = document.querySelector('.sidebar a.active'); + if (activeLink && currentPageLinks.childElementCount > 0) { + activeLink.parentElement.appendChild(currentPageLinks); + } + } +}); \ No newline at end of file diff --git a/src/assets/static/managing.html b/src/assets/static/managing.html new file mode 100644 index 00000000000..52275fb6fde --- /dev/null +++ b/src/assets/static/managing.html @@ -0,0 +1,176 @@ + + + + + + + Managing Works with Deep Blue Documents + + + + + + + + + + +
+ + +
+
+ +
+
+

Managing Works with Deep Blue Documents

+ + +
+

Managing Works

+

Getting Statistics for Your Works

+
    +
  1. Log in to Deep Blue Documents +
  2. Navigate to your Works
    • Click the profile icon in the top right corner and then select ‘My Works’Deep Blue Documents homepage showing the user profile icon in the top right corner. The dropdown is expanded, highlighting the 'My Works' option for submitting documents.
      • +
    +
  3. On your My Works page, all of your deposited (flagged “Deposited” in green) and draft (flagged “Draft” in orange) Works will appear.
      +
    • If you’d like to receive monthly download statistics about your deposited Works, click the checkbox near the top.
      • +
    • Please note: While we attempt to filter out activity by automated web crawlers, it is not possible to completely exclude them. Therefore, download counts may reflect both human and crawler activity. +
      • +
    + Screenshot of the 'My Works' page in Deep Blue Documents, showing all deposited and drafted Works. +
  4. After a Work is deposited, you can no longer edit or delete it (including metadata). Please keep Works as drafts until you are certain that you’ve included all of necessary metadata and files.
    • If you need to edit your Work after deposit, please Contact Us and together we will determine the best course of action. +
    +
+ +

Restricting Access to Works

+

Since the Work you deposit is complete and ready for distribution (see the About page for more information), immediate and worldwide access is the default (and preferred) status for all material in Deep Blue Documents. However, if your Work is subject to the U.S. Department of Justice’s Bulk Sensitive Data Rule (“DOJ Bulk Data Rule”), it will not be made available to users located in China (including Hong Kong and Macau), Russia, Cuba, Iran, North Korea, and Venezuela (collectively, “Countries of Concern”). See the About pagefor more information.

+

We know situations exist where you won't want to offer immediate access. So, legal requirements U-M is bound to honor (such as FOIA requests) notwithstanding, you can limit access to Works in Deep Blue Documents Collections for a period of time defined by the community or Collection into which you're depositing your Work. In general, you can restrict access to U-M users only. While access to the Work’s full content is limited, the descriptive metadata will remain available publicly, allowing others to find the Work through searches. The length of the embargo can be customized based on the needs and agreements related to the depositing of the Work, in collaboration with the Collection's Administrator(s) and Deep Blue Documents staff. There are other embargo options available but they are only used in specific cases. Please Contact Us or your Collection Administrator to discuss options.

+ +

Withdrawing A Work

+

Depositing a Work permanently locks both its files and metadata, making any future updates require administrative support. If you anticipate needing to make changes, it's best to save your Work as a draft using the "Save for Later" option instead of depositing the Work. Draft Works can be saved, updated, and withdrawn at any time before depositing, giving you the flexibility to revise and finalize your Work before making it permanent.

+

Withdrawals of deposited Works can be made, but only under extenuating circumstances. Deep Blue Documents is designed to provide permanent access to the Works you deposit. However, we know circumstances can arise where a Work will need to be removed from view. When this becomes necessary, please Contact Us and together we will determine the best course of action to take. +

+

Since any Work in Deep Blue Documents may have been cited via its permanent, unique Digital Object Identifier (DOI), we will always supply a "tombstone" whenever the Work is requested. The tombstone will contain the metadata for the Work, with one of the following messages indicating why the Work was removed: +

+
    +
  • "Removed from view by legal order."
    • +
  • "Removed from view by the University of Michigan."
    • +
  • "Removed from view at request of the author."
    • +
+

The tombstone metadata will be visible to those who already have its permanent, unique Digital Object Identifier (DOI), but your Work and its metadata will no longer be searchable and we will make these Works unavailable to services such as search engines.

+ +

Removing a File From Existing Work

+

Though it is possible under certain circumstances, to preserve the historical record of your scholarship, and because others may have cited the old version, the preferred way to handle this is to clearly mark the old, out-of-date version as "Superceded" in both the 'Description' field for the file and add a coversheet (or its equivalent) to the file itself. Please Contact Us for help with this.

+

Managing Permissions

+

Collection Administrator Responsibilities

+

Each Collection can have one or more Collection Administrators who will help Deep Blue Documents staff define specific procedures that best suit its needs. This Collection Administrator can be a faculty or staff member from a school, college, department, research institute, etc. or can be a Library liaison to that school, college or department. We are happy to help you set up Collections and work with you to set up access, membership, and other parameters. The Collection structure is intended to be flexible and adaptable to the needs of individuals and their colleagues, and the U-M Library commits to making Deep Blue Documents responsive to the changing needs and nature of the creative, intellectual, and artistic Works done here. Please Contact Us to get started.

+

For more information, see Collection Rights and Responsibilities.

+

+

A Collection Administrator can also customize your Collection's interface so you can ensure more than Deep Blue Documents minimum metadata are required. If this is something you would like to explore, please Contact Us. +

+ +

How to Add Depositor as a Collection Administrator

+

If you are a Collection Administrator, you can add a depositor to that Collection in Deep Blue Documents by following these easy steps:

+
    + +
  1. Edit Collection: +
    • + To access the Collection you administer, click Edit → Collection and select the appropriate Collection in the pop-up window.
      • +
    • Then click on the "Assign Roles" tab.
    +
    2. +
  2. Add Depositor: +
    • Click the "COLLECTION_X_SUBMIT" link next to "Depositors" (X, the Collection number, will vary).
      • +
    • Search for the person using their uniqname. Click the + icon next to their name. They will be automatically saved as a Depositor.
      • +
    • If the person isn't found, ensure they are added as an E-Person first.
    +
    3. +
  3. Remove Depositor: +
    • Follow the steps above. Click the trash icon to remove them as a Depositor.
    +
    4. +
+
+
+

Roles and Responsibilities of Deep Blue Documents Partners

+

Deep Blue Documents is a partnership between University of Michigan (U-M) communities, the University Library and University administration. Deep Blue Documents content consists of Works and Collections produced by members of U-M communities, which are managed, preserved and distributed by the U-M Library through Deep Blue Documents. Some of the Collections may be subject to institutional guidelines defined by the University of Michigan Standard Practice Guide, particularly section 601.08 regarding electronic records. +

+

As in all partnerships, it is important that all Deep Blue Documents stakeholders understand and agree to the policies, guidelines and procedures required to build the repository. +

+
+
+

Collection Rights and Responsibilities

+

Deep Blue Documents Collection

+

A Deep Blue Documents Collection is an academic or administrative unit at U-M that produces creative, intellectual, or artistic Works, has a defined leader, has long-term stability, and can assume responsibility for setting Collection policies. Groups wishing to establish a Deep Blue Documents Collection that do not fall into this definition will be considered on a case-by-case basis. The U-M Library will also assist individuals in locating or establishing Collections to host their Work. +

+ +

Deep Blue Documents Collection Responsibilities

+

A Deep Blue Documents Collection agrees to:

+
    +
  • understand and observe University policies relevant to Deep Blue Documents, and educate depositors regarding these policies
    • +
  • clear copyright for Works deposited when copyright owner is other than author(s) or U-M
    • +
  • make decisions about Collection definitions
    • +
  • notify Deep Blue Documents of organizational changes affecting submissions
    • +
  • arrange for deposit and description of content
    • +
  • establish a deposit workflow for each Collection
    • + +
+ + +

Deep Blue Documents Collection Rights

+

A Deep Blue Documents Collection retains the right to:

+
    +
  • decide policy regarding content to be deposited (within Deep Blue Documents guidelines, as outlined on the About page)
    • +
  • limit access to content at the Work level to U-M only for a period of time
    • +
  • decide who may deposit content within the Collection
    • +
  • remove Works
    • +
  • remove an entire Collection
    • +
  • receive a copy of deposited content upon request
    • +
  • control the organization and presentation of Collection contents
    • +
  • customize interfaces to collection contents using existing Deep Blue Documents functionality
    • +
+
+
+

University Rights and Responsibilities

+

University Library Responsibilities

+

The University Library agrees to:

+
    +
  • retain and maintain content deposited to Deep Blue Documents
    • +
  • maintain the system that supports a persistent identifier (a Digital Object Identifier, DOI)
    • +
  • distribute content according to Community decisions
    • +
  • preserve content using accepted preservation techniques per the Preservation page.
    • +
  • provide access to Deep Blue Documents content
    • +
  • notify Communities of significant preservation actions, e.g. format migration
    • +
  • if a Community ceases to exist, offer their Collections for transfer to the University Archives
    • +
  • if content deposited in Deep Blue Documents is deemed to be official University records, it may transfer the control of that content to University Archives, housed at the Bentley Historical Library.
    • +
+

See Deep Blue Documents Services for additional information about support available to Deep Blue Documents users.

+ +

University Library Rights

+

The University Library retains the right to:

+
    +
  • amend and/or redistribute descriptive information (metadata) for Works in Deep Blue Documents
    • +
  • refuse or withdraw Works or Collections under certain circumstances
    • +
  • renegotiate terms of deposit agreements with Communities
    • +
  • perform appraisal for transfer or other disposition when Communities cease to exist
    • +
  • institute pre-deposit selection or appraisal if financial constraints require that limits be placed on the repository’s operations
    • +
  • move Collections to reflect changing agreements between Deep Blue Documents and Communities
    • +
  • migrate Works if the format is in danger of obsolescence
    • +
  • set quotas for size of files and/or number of Works
    • + +
+ + +

University Responsibilities

+

U-M is responsible for setting policy at the University level regarding issues that affect Deep Blue Documents, e.g. copyright rules, thesis requirements, etc. and providing technical and financial support for the repository.

+
+ + +
+
+ +
+ + + + + diff --git a/src/assets/static/policies.html b/src/assets/static/policies.html new file mode 100644 index 00000000000..64e6063bd65 --- /dev/null +++ b/src/assets/static/policies.html @@ -0,0 +1,158 @@ + + + + + + + Policies + + + + + + + + + + +
+ + +
+
+ +
+
+

Policies

+ +
+

Author's Deposit Agreement

+

Version 1.0, created on 2005-03-22

+

Last reviewed on 2025-04-10

+

I hereby grant to the Regents of the University of Michigan the non-exclusive right to retain, reproduce and distribute the deposited work (the Work) in whole or in part, in and from its electronic format. This agreement does not represent a transfer of copyright to the University of Michigan.

+

The University of Michigan may make and keep more than one copy of the Work for purposes of security, backup, preservation and access, and may migrate the Work to any medium or format for the purpose of preservation and access in the future. The University of Michigan will not make any alteration, other than as allowed by this agreement, to the Work.

+

I represent and warrant to the University of Michigan that the Work is my original work. I also represent that the Work does not, to the best of my knowledge, infringe or violate any rights of others.

+

I further represent and warrant that I have obtained all necessary rights to permit the University of Michigan to reproduce and distribute the Work and that any third-party owned content is clearly identified and acknowledged within the Work.

+

By granting this license, I acknowledge that I have read and agreed to the terms of this agreement and all related Deep Blue Documents and University of Michigan policies.

+
+ +
+

Intellectual Property Policy

+

Version 1.1, updated on 2025-04-10

+

Deep Blue Documents, the University of Michigan Institutional Repository (referred to hereafter as the Repository), is a service of the University of Michigan Library, provided to lower access barriers and offer the widest possible dissemination for the intellectual and creative output of the University (the Works). The Repository also provides appropriate long-term preservation services for the Works to ensure continuing access over time. Works are made available through a non-exclusive license granted by the author; there is no transfer of intellectual property rights accompanying submission of Works to the Repository. + +

+

The authors or their designees grant to the Repository a non-exclusive right to:

+
    +
  • display and distribute the Work including its abstract and descriptive information in electronic format in accordance with the Repository's policies +
    • +
  • copy, convert or migrate the Work to any medium or format for the purpose of preservation and access +
    • +
  • keep more than one copy of the Work for purposes of security, back-up, and preservation +
    • +
+

When depositing a Work, depositors or their designees should represent the Work's copyright status in a manner consistent with the University's copyright policy, Ownership Of Copyrighted Works Created At Or In Affiliation With The University Of Michigan (June 6, 2002, approved by the Regents on November 14, 2002). The Repository is committed to open access and prefers that Works be deposited without access restriction. However, it will make reasonable efforts to limit access to authorized Michigan users or specific users, if restrictions are associated with a Work at the time of deposit. +

+

The Repository will collaborate with the depositor or their designee to allow submissions to be added to, replaced or removed, to comply with subsequent changes to a Work's access policy or to reflect a revision to the Work. In the event a published submission is replaced or removed, the Repository will retain a descriptive record for citation purposes. +

+

Although the depositor or their designee has the right to remove Works from the Repository, we recommend they be deposited in perpetuity, to ensure continuity of access and citation and to facilitate long-term preservation. +

+

In addition, the depositor or their designee grants to the Repository the right to:

+
    +
  • share the descriptive information and abstract for the Works in a variety of settings to encourage access +
    • +
  • enhance descriptive information about the Works to support access
    • +
+

The Repository shall obtain express written permission from the author or their designee to use the Work for any commercial purpose. +

+

In the event of the dissolution of a research group, center, institute, or any other unit that is represented in the Repository, Works will continue to be held by the Repository unless individual copyright holders request removal or access restriction. +

+

In the case of joint authorship, if the individual copyright holders disagree on whether or how their Work is represented in the Repository, the Work will continue to be held by the Repository in the manner in which it existed at the time of the disagreement until the copyright holders jointly request a change to that status. +

+

Content deemed to be official University records will be transferred to the control of the University Archives. +

+
+ +
+

Click-Through Agreement: Designee Submitting on Behalf of Author +

+

Version 1.2, updated on 2025-04-10

+

This Agreement would be substituted for the standard click-through license in a customized submission workflow where we know that the Designee will be submitting content on behalf of Collection members. +

+

As the designated coordinator for this Deep Blue Documents Collection, I am authorized by the Collection members to serve as their representative in all dealings with the Repository. As the designee, I ensure that I have read the Deep Blue Documents policies. Furthermore, I have conveyed to the Collection members the terms and conditions outlined in those policies, including the language of the standard deposit license quoted below and that the community members have granted me the authority to deposit content on their behalf. +

The standard deposit licenses states:

+

I hereby grant to the Regents of the University of Michigan the non-exclusive right to retain, reproduce and distribute the deposited work (the Work) in whole or in part, in and from its electronic format. This agreement does not represent a transfer of copyright to the University of Michigan.

+

The University of Michigan may make and keep more than one copy of the Work for purposes of security, backup, preservation and access, and may migrate the Work to any medium or format for the purpose of preservation and access in the future. The University of Michigan will not make any alteration, other than as allowed by this agreement, to the Work.

+

I represent and warrant to the University of Michigan that the Work is my original work. I also represent that the Work does not, to the best of my knowledge, infringe or violate any rights of others. +

+

I further represent and warrant that I have obtained all necessary rights to permit the University of Michigan to reproduce and distribute the Work and that any third-party owned content is clearly identified and acknowledged within the Work. +

+

By granting this license, I acknowledge that I have read and agreed to the terms of this agreement and all related University of Michigan and Deep Blue Documents policies. +

+
+ +
+

Blanket Agreement for Batch Deposits +

+

Version 1.3, updated on 2025-04-14 +

+

This Agreement would be associated with each deposit that is batch prepared by a designee (Collection Coordinator), since the batch deposit process bypasses the standard click-through license in the deposit workflow. It assumes that the designee, not the author, will prepare the batch deposit and the Deep Blue staff member will upload the batch into Deep Blue Documents. +

+

This Agreement is made by and between the [Collection name]____________ of the University of Michigan (hereinafter called the [Collection]), represented by_____________, the Collection Coordinator (hereinafter called the Designee) and the University of Michigan Library's Deep Blue Documents Institutional Repository (hereinafter called the Repository) and is entered into on this ______day of ________, 20__.

+

This agreement allows the Designee to act on behalf of individual depositors and/or the Collection and authorizes the Designee to batch load content to the Repository.

+

On behalf of the Collection, the Designee acknowledges having read all policies of the Repository and agrees to abide by the terms and conditions therein. For content entrusted or gifted to the Designee, the Designee agrees that making the content available in the Repository is an appropriate and acceptable extension of its agreement with the Collection, and is consistent with the Designee's charge to provide access to this content. In addition, the Designee has conveyed to appropriate Collection representatives the terms and conditions outlined in those policies, including the language of the standard deposit license quoted below and that the Collection members have granted the Designee the authority to deposit content on their behalf.

+

The standard deposit license states:

+

I hereby grant to the Regents of the University of Michigan the non-exclusive right to retain, reproduce and distribute the deposited work (the Work) in whole or in part, in and from its electronic format. This agreement does not represent a transfer of copyright to the University of Michigan.

+

The University of Michigan may make and keep more than one copy of the Work for purposes of security, backup, preservation and access, and may migrate the Work to any medium or format for the purpose of preservation and access in the future. The University of Michigan will not make any alteration, other than as allowed by this agreement, to the Work. +

+

I represent and warrant to the University of Michigan that the Work is my original work. I also represent that the Work does not, to the best of my knowledge, infringe or violate any rights of others.

+

I further represent and warrant that I have obtained all necessary rights to permit the University of Michigan to reproduce and distribute the Work and that any third-party owned content is clearly identified and acknowledged within the Work.

+

By granting this license, I acknowledge that I have read and agreed to the terms of this agreement and all related University of Michigan and Deep Blue policies.

+

This document will be stored in the Repository attached to each Work submitted by the Collection.

+ +

Signatures for Designee and Repository Agreement

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Designee and Repository Agreement
DesigneeRepository
Signature: (Designee's agreement to the policies)Signature: (Repository's agreement to the policies)
Name:Name:
Title:Title:
Date:Date:
Email:Email:
+ + + + + + +
+
+ +
+ + + + diff --git a/src/assets/static/preservation.html b/src/assets/static/preservation.html new file mode 100644 index 00000000000..c16eb730402 --- /dev/null +++ b/src/assets/static/preservation.html @@ -0,0 +1,127 @@ + + + + + + + Deep Blue Documents Preservation + + + + + + + + + + +
+ + +
+
+ +
+
+

Deep Blue Documents Preservation

+ +
+

Overview

+

Deep Blue Documents follows the U-M Library’s Digital Preservation Policy to ensure the long-term accessibility and usability of deposited materials. File formats are classified into three levels based on their preservation support, as outlined in the U-M Library Registered Formats and Support Levels Document. For more information on ensuring your documents are accessible, see Creating Accessible Works.

+
+ +
+

Preservation Services

+

For all content you deposit, Deep Blue Documents will provide secure storage, backup, management, fixity checks, and periodic refreshment by copying Works to new storage media. We will also undertake appropriate format monitoring and provide adequate staffing and other resources to support the services offered. Further, Deep Blue Documents provides a permanent, unique Digital Object Identifier (DOI) for all Works. +

+
+ +
+

Different Levels of Format Support

+

You may deposit a Work in any digital format in Deep Blue Documents, but not all formats can receive the same level of preservation commitment. Deep Blue Documents has designated three levels of support we can offer, based on criteria such as the wide deployment of the format, availability of publicly-documented specifications, and the expectation that tools will be available to undertake controlled transformation or migration. They are described in detail in the U-M Library Registered Formats and Support Levels Document. + +

+

Below are examples of common file formats for each of the levels of support offered:

+
    +
  • Level 1 +
      +
    • Example file format: TIFF (.tiff, .tif) +
        +
      • Why is this file format Level 1? It’s widely used and an open standard.
        • +
      +
      • +
    • Example file format: PDF/A (“A" stands for archive) +
        +
      • + Why is this file format Level 1? This file format has been developed as an international preservation standard, + ISO 19005-1 for PDF/A-1. +
        • +
      +
      • +
    +
    • + +
  • Level 2 +
      +
    • Example file format: Microsoft Word Document (.doc, .docx) +
        +
      • + Why is this file format Level 2? Microsoft owns and controls the specifications for this format, but doesn't publish them. + Some features like macros may not operate between versions, regardless of our best preservation efforts. +
        • +
      +
      • +
    • Example file format: PDF +
        +
      • + Why is this file format Level 2? Adobe Systems, Inc. owns and controls the specifications for this format, but doesn't publish them. +
        • +
      +
      • +
    +
    • + +
  • Level 3 +
      +
    • Example file format: Windows Media Audio (.wma) +
        +
      • + Why is this file format Level 3? Microsoft owns and controls the specifications for this format, but doesn't publish them. + It’s also far less common than other audio formats (such as MP3 and WAV). We can only commit to preserving Level 3 file formats + at the bit level. In other words, in the future you will be able to download an exact copy of the deposited file, + but it may be difficult to open and use it without legacy hardware and/or software. +
        • +
      +
      • +
    +
    • +
+ +

For a list of all recognized Deep Blue Documents formats and their current support levels, see Creating Accessible Works. We expect to add to and revise the support levels as standards emerge for digital preservation of additional formats.

+
+ + + +
+

Preserving Relationships in Works with Multiple Files

+

At present, the three levels of preservation commitment are made at the individual file level. We will need to evaluate complex content -- Works composed of files in various formats that interact with each other -- to determine whether the operational relationships between the files can be maintained.

+

For example, when preserving a website in Deep Blue Documents, you must consolidate all web pages into a single directory and update any internal links to reflect this new, flattened structure. This includes renaming files and adjusting link references to ensure the website functions properly as a self-contained entity.

Executables and some files that rely on a specific hardware/software environment will also require additional evaluation because not only the format but the access environment must be considered in determining preservation issues. Please Contact Us if you wish to deposit any of these content types.

+
+ +
+

Digitizing Print Documents for Deposit

+

Deep Blue Documents focuses on new digital materials.

+

That said, we encourage Collection Administrators and individuals (including Library selectors and departmental liaisons) to continue to identify historical materials, both in digital and non-digital form. Members of the U-M community have produced a tremendous amount of interesting Works, and that will require prioritization, especially when each Work must be digitized to make it available through Deep Blue Documents. Please Contact Us if you have Works of this nature and we will work with you to make them available.

+

The Deep Blue Documents staff, in collaboration with the Library’s Digital Conversion Unit, may be able to help you digitize print documents and deposit them into Deep Blue Documents, making them accessible in a digital format. The Library doesn’t have the capacity to digitize microfilm.

+

FFor smaller batches of print documents (fewer than 100 items or 12 linear feet), the turnaround time is typically 6–8 weeks. Larger batches may be sent to a vendor and could take 6–9 months for scanning and quality review. Processing times may vary depending on batch size and current capacity.

+

If you're interested or have any questions about the process, please Contact Us.

+
+
+
+ + +
+ + + + diff --git a/src/assets/static/searching.html b/src/assets/static/searching.html new file mode 100755 index 00000000000..687dd171fd6 --- /dev/null +++ b/src/assets/static/searching.html @@ -0,0 +1,237 @@ + + + + + + + Searching Deep Blue Documents + + + + + + + + + + +
+ + +
+
+
+

Finding Works in Deep Blue Documents

+ + +
+

Browsing Deep Blue Documents

+

Most Works on Deep Blue Documents can be browsed by issue date, author, title, or subject. Where Search looks for the targeted character string at any position within many different metadata fields, Browse matches input only to a specific metadata field, and only to the beginning of the value string (also known as being “left-anchored”). This means that Browse only looks at the beginning of the author name, title, etc. To browse for Works, you can navigate to the top right of the homepage and hover over “Browse,” then select one of the four options in the dropdown menu:

+
+ Screenshot of Deep Blue Documents header with 'Browse' dropdown menu opened and circled in red, showing options. 'Issue Date', 'Author', 'Title', and 'Subject.' +
Deep Blue Documents homepage with “Browse” menu dropdown selected and circled in red.
+
+
+

Browsing by Issue Date

+

Browsing by issue date allows you to search for Works that were published in a specific year, month, or date. To filter by year, select the “(Choose year)” box and choose a year from the dropdown menu. To filter by month, select the “(Choose month)” box and choose a month from the dropdown menu. The results will automatically populate after selecting the Year, Month, or both. You can also search for an exact date (format: YYYY-MM-DD) in the “Filter results by date” box. Select “Browse” to see results:

+
+ Screenshot of Deep Blue Documents 'Browse by Date' interface with 'Browse' dropdown menu opened and circled in red, showing 'Issue Date' option selected. +
Deep Blue Documents “Browse by Date” page with “Browse” menu dropdown selected and circled in red.
+
+
+ +
+

Browsing by Author

+

To browse Works by an author's name, type the last name of the author into the box that says “Enter first few letters:”. To search for all authors whose last names begin with a single letter, type that letter (e.g., typing “A” and selecting “Browse” will result in all authors whose last names start with the letter A). In the list of authors’ names, the dark circle with the number on the right-hand side of the name denotes the number of Works that the author has published in Deep Blue Documents. Select the author’s name to view a list of all published works by the author. Please note that there may be variations in an author’s name. For example, Jacob Carlson could also appear in the record as J. Carlson or Jake Carlson, which is why we recommend searching by the author’s last name (family name or surname):

+
+ Screenshot of Deep Blue Documents 'Browse by Author' interface with field for entry of last name. +
Deep Blue Documents “Browse by Author” page showing first entries in the repository and a search bar (“Enter first few letters:”).
+
+
+ +
+

Browsing by Title

+

To browse Works by Title, type the title into the box that says “Enter first few letters:” and select “Browse”. Typing a keyword into the search box will provide a list of Work titles that start with that keyword. Select a Title to view the corresponding Work.

+
+ Screenshot of Deep Blue Documents 'Browse by Title' interface with field for entry of title's first word(s). +
Deep Blue Documents “Browse by Title” page showing first entries in the repository and a search bar (“Enter first few letters:”)
+
+ +
+ +
+

Browsing by Subject

+

To browse Works by Subject, review the list of Subjects on the page and choose the Subject that most closely aligns with your interest. In the list of Subjects, the dark circle with the number on the right-hand side of the Subject name denotes the number of Works included within each Subject at Deep Blue Documents. Select a Subject to view the Works within each category:

+
+ Screenshot of Deep Blue Documents 'Browse by Subject' interface with field for entry of first word(s) of subject. +
Deep Blue Documents “Browse by Subject” page showing first entries in the repository and a search bar (“Enter first few letters:”)
+
+

After selecting your desired Subject, you can browse titles within the Subject by typing word(s) in the text box and selecting “Browse.” The image below depicts some of the Works within the Subject “Health Sciences” that have a title starting with the word “Genetics”. Select the title of the Work to access the Work:

+
+ Screenshot of Deep Blue Documents 'Browse by Subject' results interface showing results for title browse within subject, where titles start with 'Genetics.' +
Deep Blue Documents “Browse by Subject” results, showing title sub-browse for items that have titles starting with “Genetics”.
+
+
+
+ +
+

Finding a University of Michigan Dissertation

+ +
+

The easiest way to find a University of Michigan dissertation in Deep Blue Documents for which you know the author and/or title is to browse the Dissertations and Theses (Ph.D and Master’s) collection using the instructions above on “Browsing by Title” or “Browsing by Author.”

+

If you can’t find the dissertation you are looking for that way, you can also expand your search to the entire Library, since not all dissertations held by the Library are in Deep Blue Documents. Note that while some dissertations are publicly accessible online, if you do not have current University of Michigan login credentials, physical dissertations (paper or microfilm) are restricted to on-campus use or request through Interlibrary Loan at your local library.

+

Some digital dissertations in Deep Blue Documents are also restricted to on-campus use (i.e., on specific computers in the Library) or to those signed in with current University of Michigan credentials. This is usually done in cases where we have not been able to secure author permissions to share the dissertations publicly.

+

To find a dissertation for which you know the author and/or title in the Library:

+

+

    +
  1. Go to the library's homepage (lib.umich.edu) and search for the dissertation title (do not include a period at the end) or the author's name in the "What can we help you find" box:
    2. +
    + Screenshot of U-M Library homepage with search for 'Worthy of hire: Discourse, ideology, and collective action among English working class trade groups, 1800-1830. (Volumes I and II)'. +
    U-M Library homepage with “What can we help you find?” search box outlined in red. +
    +
    +
  2. If you see results that match your searched title or author, the Library has a copy of this dissertation! (See example below). To determine whether the library has physical, digital, or both types of formats, review the relevant search results (you may notice that there is more than one result, which means there is more than one copy or format):
    3. +
      +
    1. Each result in the "Catalog" section represents a physical copy (paper and/or microfilm) held by the Library.
      2. +
    2. Each result in the "Articles" section represents a digital copy. This could be located in Deep Blue Documents, ProQuest Dissertations (requires U-M or other SSO to search), and/or Hathitrust.
      3. +
    3. Select an individual result to see additional information, including which format(s) it represents and which Library buildings it's held at. You may need to explore multiple results to determine if there is a publicly available digital copy.
      4. +
    +
    + Screenshot of search results in Library search, showing both Catalog and Articles results for the dissertation 'Worthy of hire: Discourse, ideology, and collective action among English working class trade groups, 1800-1830. (Volumes I and II) +
    Example results from Library Search. The Library has one physical copy of this dissertation as shown by the results in the "Catalog" pane, and two digital copies shown as results in the “Articles” pane (reviewing the records individually reveals that one of these is held in ProQuest, and the other in Deep Blue Documents).
    +
    +
+ +
+

Your University of Michigan dissertation

+ +
+

If you are a graduate of the University of Michigan and wrote/submitted a dissertation, some additional options are available to you even if your dissertation is not publicly available: +

    +
  • If the Library has a digital copy of your dissertation hosted on Deep Blue Documents that is restricted to U-M access only (see instructions for "Finding a dissertation" above and screenshot below), and you would like a copy, please fill out our Contact us form, select the “Unable to access Work” > “Dissertation or Thesis restricted to U-M users” option, and follow the instructions given.
    • +
  • If the Library has a digital copy of your dissertation hosted on Deep Blue Documents that is restricted to U-M access only (see example below), and you would like to make it publicly available, please fill out our Contact us form, select the “Changes to my Work” > “I want to make my work publicly available" option, and follow the instructions given.
    • +
    + Image of 'Files' section of a Deep Blue Documents record, with PDF and padlock icons. Underneath linked file title is the text, 'Access Restricted to UM users only.' +
    Screenshot of a “UM-only” file listing on a Work page.
    +
    +
  • If the library only has a physical copy of your dissertation (refer to the step 2 screenshot of Library Search above), and you would like to make a digital copy publicly available via Deep Blue Documents*, please go to our Contact us form and select the “Other” option. Make sure to include your name, the title of your dissertation, and a link to the record for the physical copy of your dissertation in the library catalog: +
    + Screenshot of a Library Search catalog results page, showing the location of the 'Copy link' option (at the top right of the record). +
    Screenshot of where to find a link to a library catalog record. The “Copy link” option is circled in red.
    +
    +

    *Please be aware that the minimum timeframe for getting material digitized is about 8 weeks, as this depends on the capacity of our partner units.

    • +
+

+

Need more help? If you run into trouble or are not sure whether the Library has your dissertation after following the instructions above, please go to our Contact us form, select the “Other” option and include a message explaining the issue. Make sure to include your name, date of graduation and the title of your dissertation.

+
+
+
+
+
+ +
+ + + + diff --git a/src/assets/static/services.html b/src/assets/static/services.html new file mode 100644 index 00000000000..67bc16c987c --- /dev/null +++ b/src/assets/static/services.html @@ -0,0 +1,120 @@ + + + + + + + Deep Blue Documents Services + + + + + + + + + + +
+ + +
+
+ +
+
+

Deep Blue Documents Services

+ +
+

Overview

+

The University of Michigan (U-M) Library offers deposit, access, and preservation services to support Deep Blue Documents and its users. Additionally, the U-M Library provides community management, end-user support, and system management services to provide ongoing support for Deep Blue Documents communities, respond to user inquiries, and supply system monitoring, back-up, and recovery.

+
+ +
+

Deposit Services

+

Deep Blue Documents offers a flexible, easy-to-use deposit process. A depositor completes a brief online deposit form and grants non-exclusive permission for Deep Blue Documents to distribute and preserve the Work (see Terms of Deposit) The deposit process includes the following:

+
    +
  • Register with Deep Blue Documents and edit their user profile
    • +
  • Select a Collection in which to deposit a new Work
    • +
  • Enter required descriptive information (metadata) for the Work
    • +
  • Include additional optional metadata to describe the Work
    • +
  • Upload multiple files of various formats in the single Work
    • +
  • Specify formats of deposited files
    • +
  • Grant a non-exclusive license to allow U-M the right to distribute the Work in accordance with the specified distribution policy and to migrate its content to new file formats for the purposes of preservation (see Terms of Deposit)
    • +
+
+ +
+

Access Services

+

Deep Blue Documents gives users the ability to browse, search, and discover Works of interest, request one or more Works from the system, and take delivery of the requested Works. Those interested in accessing the contents of Deep Blue Documents can:

+
    +
  • Locate Works via online search engines and the U-M Library’s Articles Search
    • +
  • Browse Deep Blue Documents contents by date, author, title, subject, Collection or community
    • +
  • Search for Works anywhere in Deep Blue Documents, or within a particular community or Collection
    • +
  • Search for matches within author, title, or full text and view results
    • +
  • View a Work overview, including: Deep Blue Documents core metadata, list of Collections that contain this Work, and links to each of the files (text, image, etc.) that comprise the Work
    • +
  • Download an individual Work to view it within a web browser or save the file (if the Work doesn’t have any access restrictions)
    • +
+

However, if a Work is subject to the U.S. Department of Justice’s Bulk Sensitive Data Rule (“DOJ Bulk Data Rule”), it will not be made available to users located in China (including Hong Kong and Macau), Russia, Cuba, Iran, North Korea, and Venezuela (collectively, “Countries of Concern”).

+
+ +
+

Preservation Services

+

Deep Blue Documents provides storage and preservation services to ensure the longevity of deposited Works. Users should be assured that Works deposited in many formats (see Preservation) will be accessible even when the original application in which it was created is obsolete and the means to access it are inoperable. For each Work, Deep Blue Documents:

+
    +
  • Provides persistent storage, including appropriate back-up and recovery procedures
    • +
  • Assigns a permanent, unique Digital Object Identifier (DOI) that will not change and is appropriate to cite in other works
    • +
  • Supports a range of service levels for preservation and notifies users of Deep Blue Documents’ preservation constraints
    • +
  • Stores information about the Work’s origin and any updates, if applicable
    • +
  • Maintains an auditable history and record of changes to the Work
    • +
+
+ +
+

Collection Management Services

+

Deep Blue Documents’ Collection Management Services are a set of consultative and applied services designed to meet the needs of individual Collections. U-M Library staff will provide guidance in developing a Collection's workflow process, metadata requirements, and distribution policies as well as creating a Deep Blue Documents community homepage.

+

The U-M Library manages all aspects of the Collection set-up process, including:

+
    +
  • Planning and scheduling new Collection set-ups
    • +
  • At the request of a user, facilitating an initial Collection discussion and explaining set-up requirements
    • +
  • Assisting in training Collection Administrators
    • +
  • Implementing a custom workflow for the depositing process including metadata defaults, if needed
    • +
  • Assisting in customizing Deep Blue Documents Collection home pages
    • +
  • Specifying a Collection's distribution policy and license requirements
    • +
  • Coordinating batch uploads of Works
    • +
+
+ +
+

End-User Support Services

+

The U-M Library will provide support to all Deep Blue Documents users. Support will be provided Monday through Friday, 9:00am to 5:00pm Eastern time (excluding University holidays). Inquiries will typically receive a return response via email within five business days.

+

The Deep Blue Documents web page provides documentation in the About and Help sections to answer routine questions and user support contact information for more complex questions. +

+
+ +
+

System Management Services

+

System Management Services are the back-office support for Deep Blue Documents, working to ensure optimal system performance and high availability. +

+

The U-M Library will provide a comprehensive set of technical services for Deep Blue Documents system operations, including:

+
    +
  • Performing system monitoring, testing, and debugging
    • +
  • Performing system administration
    • +
  • Ensuring the Deep Blue Documents system adheres to applicable U-M Information Technology policies and standards
    • +
  • Monitoring and upgrading Deep Blue Documents utility programs and middleware
    • +
  • Developing approved system enhancements
    • +
  • Performing batch uploads of Works
    • +
  • Maintaining a registry of known content and metadata formats for preservation purposes.
    • +
+

Deep Blue Documents will provide System Management Services with support from the U-M Library Information Technology Division. The U-M Library provides continuing support for Deep Blue Documents’ server, storage, and network operations. +

+
+
+
+ + +
+ + + + diff --git a/src/assets/static/terms-of-deposit.html b/src/assets/static/terms-of-deposit.html new file mode 100755 index 00000000000..046f7228aba --- /dev/null +++ b/src/assets/static/terms-of-deposit.html @@ -0,0 +1,101 @@ + + + + + + + Terms of Use + + + + + + + + + + +
+ + +
+
+ +
+
+

Terms of Use

+

Version 3.0, created on 2026-06-25

+

FOR USERS

+

By viewing or downloading a Work(s) into Deep Blue Documents, I agree that:

+ +
+
    +
  • The services and content therein are provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties of merchantability or fitness for a particular purpose. Use of Deep Blue Documents is at my own risk.
    • +
  • I will not disrupt or attempt to disrupt the access to or the functioning of Deep Blue Documents. Machine crawling of the Works in Deep Blue Documents may be "Fair Uses" as allowed by law. Consequently, these activities are not restricted unless the nature of use contradicts these Terms of Use or the licenses placed on particular Works.
    • +
  • I will use Works in ways that are consistent with Deep Blue Document’s current Terms of Use, copyright laws, and the terms of any applicable license(s) (e.g., a Creative Commons license), whether the end user is human or machine. Unless otherwise noted in Deep Blue Documents or on the Work itself, I will treat the Work like any other copyrighted material, and may make "Fair Uses" or other uses of it as allowed by law. I am responsible for making my own legal assessment.
    • +
  • I am responsible for determining whether license terms or other conditions permit reuse of the Work in my jurisdiction.
    • +
  • I will contact the author(s) directly if I need to secure permissions to reuse all or part of a Work.
    • +
+
+ +
These Terms of Use will be reviewed regularly and may be updated by Deep Blue Documents staff. Your use of Deep Blue Documents must always be consistent with the current policies and terms.
+
+

FOR DEPOSITORS

+ I represent and warrant to the University of Michigan that: +
    +
  • the Work is my original work and does not, to the best of my knowledge, infringe or violate the law or any rights of others.
    • +
  • I have reviewed the Work to determine whether it is subject to the U.S. Department of Justice’s Bulk Sensitive Data regulations, and I confirm that the Work is not subject to those regulations.
    • +
  • the Work does not include content that’s under the purview of University of Michigan Research Compliance Programs that are subject to export controls, present a conflict of interest for the University or the depositor(s), or whose distribution would otherwise constitute a violation of research ethics or compliance.
    • +
  • I have made my Work as accessible as possible, per Deep Blue Documents’ requirements for creating accessible Works.
    • +
  • I have acknowledged my use of generative artificial intelligence (genAI) tools or large language models (LLMs) by citing the tools used as a contributor or as a source in my Work.
    • +
  • the Work deposited was produced or sponsored by a University of Michigan affiliate or unit.
    • +
  • the Work can be made publicly available, unless specific access restrictions are requested from Deep Blue Documents prior to the time of deposit.
    • +
  • I have obtained all necessary rights or permissions to permit the University of Michigan to retain, reproduce, display, perform, and distribute the Work and that any third-party content is clearly identified and acknowledged within the Work.
    • +
  • I acknowledge that Deep Blue Documents will continue to hold Works in the event of the dissolution of a research group, center, institute, or any other unit at University of Michigan, unless individual copyright holders request removal or access restriction.
    • +
  • I acknowledge that jointly authored Works will be preserved as is until all copyright holders jointly request a change in whether or how their Work is represented in Deep Blue Documents.
    • +
+
+ +
+ By depositing a Work into Deep Blue Documents, I hereby grant to the Regents of the University of Michigan a non-exclusive license to: +
    +
  • retain, reproduce, display, perform, and distribute the Work in whole or in part, including its abstract and descriptive information in and from its electronic format;
    • +
  • keep more than one copy of the Work for purposes of security, back-up, preservation, and/or access;
    • +
  • copy, convert, remediate, or migrate the Work to any medium or format for the purpose of accessibility;
    • +
  • allow others to access, view, and download the Work, unless access restrictions are in place;
    • +
  • and enhance descriptive information about the Works to support access.
    • +
+ +

These Terms of Deposit do not transfer copyright to the University of Michigan or others.

+
+ +
+

By granting this license, I acknowledge that I have read and agreed to the Terms of Use and all related Deep Blue Documents and University of Michigan policies.

+
+ +
+

If I’m a proxy depositing on behalf of a University of Michigan affiliate, in addition to the standard Terms above, note that the following Terms apply:

+
    +
  • I represent and warrant that the affiliate has granted me the authority to deposit a Work on their behalf;
    • +
  • I have notified the affiliate of these Terms of Use and they have agreed to them.
    • +
+
+ +
+

If I’m requesting a batch deposit of Works into Deep Blue Documents, in addition to the standard Terms above, note that the following Terms apply:

+

In this situation, a designee, not one of the authors, will prepare the Works for batch deposit and the Deep Blue Documents staff member will upload the batch of Works into Deep Blue Documents.

+
    +
  • I represent and warrant that at least one author of each Work has granted me the authority to prepare the Work for deposit and granted Deep Blue Documents staff the authority to deposit the Work into the Repository;
    • +
  • I have notified at least one of the authors of these Terms of Use and they have agreed to them;
    • +
  • For Works where I cannot get this agreement from one of the authors (such as when Works are entrusted or gifted to a University of Michigan department, unit, institute, etc.), I represent and warrant that making these Works available in the Repository is an appropriate and acceptable extension of its agreement with the originating unit or person, including providing public access to these Works.
    • +
+
+ +
+
+ +
+ + + + diff --git a/src/clockss.txt.ejs b/src/clockss.txt.ejs new file mode 100644 index 00000000000..fb494d1227e --- /dev/null +++ b/src/clockss.txt.ejs @@ -0,0 +1 @@ +CLOCKSS system has permission to ingest, preserve, and serve this Archival Unit. diff --git a/src/config/auth-config.interfaces.ts b/src/config/auth-config.interfaces.ts index 59ebda12da3..734c92d7df2 100644 --- a/src/config/auth-config.interfaces.ts +++ b/src/config/auth-config.interfaces.ts @@ -20,4 +20,10 @@ export interface AuthConfig extends Config { // This is independent from the idle warning. timeLeftBeforeTokenRefresh: number; }; + + // When true, the username/password login form is rendered and non-password authentication methods are hidden. + // Set to false (default) to show non-password authentication methods instead of the password form + // (for example OIDC in production/workshop environments). + // Set to true for environments where password auth is required and non-password methods should not be shown (demo). + showPasswordLogin?: boolean; } diff --git a/src/config/build-config.interface.ts b/src/config/build-config.interface.ts index beb8097c9e5..7f315351218 100644 --- a/src/config/build-config.interface.ts +++ b/src/config/build-config.interface.ts @@ -2,5 +2,6 @@ import { AppConfig } from './app-config.interface'; import { UniversalConfig } from './universal-config.interface'; export interface BuildConfig extends AppConfig { + serverLocation: string; universal: UniversalConfig; } diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index a6e9e092e46..38ccf843aa3 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -115,7 +115,8 @@ export class DefaultAppConfig implements AppConfig { // If the rest token expires in less than this amount of time, it will be refreshed automatically. // This is independent from the idle warning. timeLeftBeforeTokenRefresh: 2 * 60 * 1000 // 2 minutes - } + }, + showPasswordLogin: false, }; // Form settings @@ -249,7 +250,7 @@ export class DefaultAppConfig implements AppConfig { // The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items) defaultLowerLimit: 1900, // Whether to add item thumbnail images to BOTH browse and search result lists. - showThumbnails: true, + showThumbnails: false, // The number of entries in a paginated browse results list. // Rounded to the nearest size in the list of selectable sizes on the // settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. @@ -257,7 +258,7 @@ export class DefaultAppConfig implements AppConfig { }; communityList: CommunityListConfig = { - pageSize: 20 + pageSize: 500 }; homePage: HomeConfig = { @@ -284,7 +285,8 @@ export class DefaultAppConfig implements AppConfig { // Rounded to the nearest size in the list of selectable sizes on the // settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. pageSize: 5 - } + }, + showAltmetricBadge: true, }; // Collection Page Config @@ -361,7 +363,7 @@ export class DefaultAppConfig implements AppConfig { tagName: 'link', attributes: { 'rel': 'icon', - 'href': 'assets/dspace/images/favicons/favicon.svg', + 'href': 'assets/dspace/images/favicons/favicon.ico', 'type': 'image/svg+xml', } }, @@ -405,8 +407,8 @@ export class DefaultAppConfig implements AppConfig { // - A 404 page if you manually try to navigate to the privacy policy page at info/privacy // - All mentions of the privacy policy being removed from the UI (e.g. in the footer) info: InfoConfig = { - enableEndUserAgreement: true, - enablePrivacyStatement: true + enableEndUserAgreement: false, + enablePrivacyStatement: false }; // Whether to enable Markdown (https://commonmark.org/) and MathJax (https://www.mathjax.org/) diff --git a/src/config/item-config.interface.ts b/src/config/item-config.interface.ts index 35cb5260aea..d0ca671b9d3 100644 --- a/src/config/item-config.interface.ts +++ b/src/config/item-config.interface.ts @@ -13,4 +13,6 @@ export interface ItemConfig extends Config { // settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. pageSize: number; } + + showAltmetricBadge: boolean; } diff --git a/src/config/ui-server-config.interface.ts b/src/config/ui-server-config.interface.ts index 70e2fa3e262..6d152129a4f 100644 --- a/src/config/ui-server-config.interface.ts +++ b/src/config/ui-server-config.interface.ts @@ -12,5 +12,6 @@ export class UIServerConfig extends ServerConfig { }; // Trust X-FORWARDED-* headers from proxies - useProxies: boolean; + // useProxies: boolean; +useProxies: boolean = true; } diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts index 09b5f19ade6..2c93be870d2 100644 --- a/src/environments/environment.production.ts +++ b/src/environments/environment.production.ts @@ -3,6 +3,8 @@ import { BuildConfig } from '../config/build-config.interface'; export const environment: Partial = { production: true, + serverLocation: ' https://backend.production.deepblue-documents.lib.umich.edu/server', + // Angular Universal settings universal: { preboot: true, diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index cb9d2c71303..661dd323e5e 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -6,6 +6,8 @@ import { NotificationAnimationsType } from '../app/shared/notifications/models/n export const environment: BuildConfig = { production: false, + serverLocation: 'http://localhost:8080/server', + // Angular Universal settings universal: { preboot: true, @@ -255,7 +257,8 @@ export const environment: BuildConfig = { // Rounded to the nearest size in the list of selectable sizes on the // settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. pageSize: 5 - } + }, + showAltmetricBadge: true, }, collection: { edit: { @@ -295,8 +298,8 @@ export const environment: BuildConfig = { video: true }, info: { - enableEndUserAgreement: true, - enablePrivacyStatement: true, + enableEndUserAgreement: false, + enablePrivacyStatement: false, }, markdown: { enabled: false, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index dc0e808be0d..06342a371e4 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -8,6 +8,8 @@ import { BuildConfig } from '../config/build-config.interface'; export const environment: Partial = { production: false, + serverLocation: 'http://localhost:8080/server', + // Angular Universal settings universal: { preboot: false, diff --git a/src/index.html b/src/index.html index 565fc0439d4..581f14db622 100644 --- a/src/index.html +++ b/src/index.html @@ -1,15 +1,33 @@ + + + + + + + + + + + + + + - DSpace + Deep Blue Documents + + + + diff --git a/src/robots.txt.ejs b/src/robots.txt.ejs index cd5e228b3a0..6900ffd62fd 100644 --- a/src/robots.txt.ejs +++ b/src/robots.txt.ejs @@ -33,6 +33,8 @@ Disallow: /workflowitems # Disallow: /login # Disallow: /register +User-agent: * +Crawl-delay: 5 ############################## # Section for misbehaving bots diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss index 5dfc03fbd36..fbbe545c7de 100644 --- a/src/styles/_bootstrap_variables.scss +++ b/src/styles/_bootstrap_variables.scss @@ -27,7 +27,7 @@ $cyan: #006666 !default; $yellow: #ec9433 !default; $red: #CF4444 !default; $dark: darken($blue, 17%) !default; - +$umanchors: #1d7491 !default; $theme-colors: ( @@ -35,7 +35,7 @@ $theme-colors: ( secondary: $gray-700, success: $green, info: $cyan, - warning: $yellow, + warning: #ad6110, danger: $red, light: $gray-100, dark: $dark diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index ddf490c7a7a..8bca6ee5bbe 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -26,8 +26,8 @@ --ds-header-icon-color-hover: #{$link-hover-color}; --ds-header-navbar-border-top-color: #{$white}; --ds-header-navbar-border-bottom-color: #{$gray-400}; - --ds-navbar-link-color: #{$cyan}; - --ds-navbar-link-color-hover: #{darken($cyan, 15%)}; + --ds-navbar-link-color: #{$white}; + --ds-navbar-link-color-hover: #{$white}; $admin-sidebar-bg: darken(#2B4E72, 17%); $admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%); @@ -76,8 +76,8 @@ --ds-home-news-link-hover-color: #{darken($home-news-link-color, 15%)}; --ds-home-news-background-color: #{$gray-200}; - --ds-breadcrumb-bg: #{$gray-200} !important; - --ds-breadcrumb-link-color: #{$cyan}; + --ds-breadcrumb-bg: #F7F8F9 !important; + --ds-breadcrumb-link-color: #1D7491; --ds-breadcrumb-link-active-color: #{darken($cyan, 30%)}; --ds-breadcrumb-max-length: 200px; diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss index b714d399a08..14eeab57727 100644 --- a/src/styles/_global-styles.scss +++ b/src/styles/_global-styles.scss @@ -1,3 +1,4 @@ + html { position: relative; min-height: 100%; @@ -5,6 +6,54 @@ html { body { overflow-x: hidden; + font-family: "Muli", sans-serif; + color: #212b36; +} + +h1 { + font-size: 2.5rem; + font-weight: 400; + line-height: var(--line-height-heading); +} + +h2 { + font-size: 1.25rem; +} + +h3 { + font-size: 1.5rem; + font-weight: normal; + line-height: var(--line-height-heading); +} + +h4 { + font-size: 1.25rem; + line-height: var(--line-height-heading); +} + +h5, +h6 { + font-size: 1rem; + line-height: var(--line-height-heading); +} + +a { + text-decoration: underline; + &:focus, &:hover{ + text-decoration: underline; + } +} + +a.nav-link:hover { + text-decoration: underline; +} + +.list-group-item +{ + text-decoration: none; + &:hover{ + text-decoration: none; + } } // Sticky Footer @@ -209,6 +258,10 @@ ds-dynamic-form-control-container.d-none { } } +.btn { + text-decoration: none; +} + .btn.btn-link.btn-link-inline { display: inline; padding: 0; diff --git a/src/themes/custom/app/login-page/login-page.component.html b/src/themes/custom/app/login-page/login-page.component.html index 84059877f4b..96fbf96c999 100644 --- a/src/themes/custom/app/login-page/login-page.component.html +++ b/src/themes/custom/app/login-page/login-page.component.html @@ -1,7 +1,6 @@
-

{{"login.form.header" | translate}}

diff --git a/src/themes/custom/app/logout-page/logout-page.component.html b/src/themes/custom/app/logout-page/logout-page.component.html index b5012ed53bc..ffc4dc64ec0 100644 --- a/src/themes/custom/app/logout-page/logout-page.component.html +++ b/src/themes/custom/app/logout-page/logout-page.component.html @@ -1,7 +1,6 @@
-

{{"logout.form.header" | translate}}

diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html index dbc98098ae5..e5c6ebd5253 100644 --- a/src/themes/dspace/app/header/header.component.html +++ b/src/themes/dspace/app/header/header.component.html @@ -1,25 +1,18 @@ + + + + + + +
- - + + +
+ diff --git a/src/themes/dspace/app/header/header.component.scss b/src/themes/dspace/app/header/header.component.scss index 2fc857826f9..dc10876ec73 100644 --- a/src/themes/dspace/app/header/header.component.scss +++ b/src/themes/dspace/app/header/header.component.scss @@ -1,6 +1,6 @@ @media screen and (min-width: map-get($grid-breakpoints, md)) { nav.navbar { - display: none; + } .header { background-color: var(--ds-header-bg); @@ -24,3 +24,24 @@ color: var(--ds-header-icon-color-hover); } } + +.skip-links { + background: var(--color-blue-400); + padding: var(--space-small); + margin: 0 auto; +} + +.skip-links a { + color: #fff; + padding: var(--space-x-small); +} + +.skip-links:not(:focus-within) { + position: absolute; + left: -10000px; + top: auto; + width: 1px; + height: 1px; + overflow: hidden; +} + diff --git a/src/themes/dspace/app/header/header.component.ts b/src/themes/dspace/app/header/header.component.ts index 6da89b47d57..de00531df46 100644 --- a/src/themes/dspace/app/header/header.component.ts +++ b/src/themes/dspace/app/header/header.component.ts @@ -1,6 +1,11 @@ -import { Component } from '@angular/core'; +import { Component, OnInit, OnDestroy } from '@angular/core'; import { HeaderComponent as BaseComponent } from '../../../../app/header/header.component'; +import { Router, NavigationEnd } from '@angular/router'; +import { MenuService } from '../../../../app/shared/menu/menu.service'; +import { Subscription } from 'rxjs'; +import { filter } from 'rxjs/operators'; + /** * Represents the header with the logo and simple navigation */ @@ -10,4 +15,39 @@ import { HeaderComponent as BaseComponent } from '../../../../app/header/header. templateUrl: 'header.component.html', }) export class HeaderComponent extends BaseComponent { + +skipLinkPath: string; + private routerSubscription: Subscription; + + constructor( + router: Router, + menuService: MenuService + ) { + super(router, menuService); + } + + ngOnInit() { + this.setSkipLinkPath(); + + this.routerSubscription = this.router.events + .pipe(filter(event => event instanceof NavigationEnd)) + .subscribe(() => { + this.setSkipLinkPath(); + }); + } + + private setSkipLinkPath() { + const fragment = '#maincontent'; + const urlWithoutFragment = this.router.url.split('#')[0]; + this.skipLinkPath = this.router.url.includes(fragment) + ? this.router.url + : `${urlWithoutFragment}${fragment}`; + } + + ngOnDestroy() { + if (this.routerSubscription) { + this.routerSubscription.unsubscribe(); + } + } + } diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.html b/src/themes/dspace/app/home-page/home-news/home-news.component.html index ef576ed99cd..fd6fdfb5edd 100644 --- a/src/themes/dspace/app/home-page/home-news/home-news.component.html +++ b/src/themes/dspace/app/home-page/home-news/home-news.component.html @@ -1,39 +1,24 @@ +
-

DSpace 7

-

DSpace is the world leading open source repository platform that enables - organisations to:

+

Deep Blue Documents

+

Deep Blue Documents provides access to the work that makes the University of Michigan a leader in research, teaching, and creativity.

+

To find works by U-M authors, browse or search the contents of Deep Blue Documents, then link to what you find using a URL that will always work (available to all).

+

To deposit your work, please log in and then select Create New, then Work on the left-side dashboard. For more information on how to deposit a work, see Depositing Your Work in the Help documentatation. For additional questions, please Contact Us. +

-
    -
  • easily ingest documents, audio, video, datasets and their corresponding Dublin Core - metadata -
    • -
  • open up this content to local and global audiences, thanks to the OAI-PMH interface and - Google Scholar optimizations -
    • -
  • issue permanent urls and trustworthy identifiers, including optional integrations with - handle.net and DataCite DOI -
    • -
-

Join an international community of leading institutions using DSpace.

-

The test user accounts below have their password set to the name of this - software in lowercase.

-
    -
  • Demo Site Administrator = dspacedemo+admin@gmail.com
    • -
  • Demo Community Administrator = dspacedemo+commadmin@gmail.com
    • -
  • Demo Collection Administrator = dspacedemo+colladmin@gmail.com
    • -
  • Demo Submitter = dspacedemo+submit@gmail.com
    • -
+
- - - + + Photo by @inspiredimages
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.scss b/src/themes/dspace/app/home-page/home-news/home-news.component.scss index 93ec1763f34..2279f4bca8c 100644 --- a/src/themes/dspace/app/home-page/home-news/home-news.component.scss +++ b/src/themes/dspace/app/home-page/home-news/home-news.component.scss @@ -3,11 +3,13 @@ margin-top: calc(var(--ds-content-spacing) * -1); div.background-image-container { + background: rgba(0,39,76,0.8); color: white; position: relative; + .background-image > img { - background-color: var(--bs-info); + position: absolute; z-index: -1; top: 0; @@ -19,30 +21,6 @@ } .container { - position: relative; - text-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6); - - &:before, &:after { - content: ''; - display: block; - width: var(--ds-banner-background-gradient-width); - height: 100%; - top: 0; - position: absolute; - } - - &:before { - background: linear-gradient(to left, var(--ds-banner-text-background), transparent); - left: calc(-1 * var(--ds-banner-background-gradient-width)); - - } - - &:after { - background: linear-gradient(to right, var(--ds-banner-text-background), transparent); - right: calc(-1 * var(--ds-banner-background-gradient-width)); - } - - background-color: var(--ds-banner-text-background); } @@ -60,6 +38,7 @@ .jumbotron { background-color: transparent; + padding: 1rem 1rem; } a { @@ -71,4 +50,8 @@ } } +.h1home { + font-size: 2.5rem; +} + diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html index 05afac7d7e9..2a18650bb0c 100644 --- a/src/themes/dspace/app/navbar/navbar.component.html +++ b/src/themes/dspace/app/navbar/navbar.component.html @@ -1,24 +1,33 @@ + + + diff --git a/src/themes/dspace/app/navbar/navbar.component.scss b/src/themes/dspace/app/navbar/navbar.component.scss index d3aea9f0780..74311720682 100644 --- a/src/themes/dspace/app/navbar/navbar.component.scss +++ b/src/themes/dspace/app/navbar/navbar.component.scss @@ -1,17 +1,20 @@ nav.navbar { - border-top: 1px var(--ds-header-navbar-border-top-color) solid; - border-bottom: 5px var(--ds-header-navbar-border-bottom-color) solid; + align-items: baseline; } +.navbar-section-sup-help { + display: flex; + align-items: center; + height: 100%; +} + /** Mobile menu styling **/ @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) { .navbar { - width: 100%; - background-color: var(--bs-white); - position: absolute; - overflow: hidden; - height: 0; + width: 100%; + overflow: hidden; + height: auto !important; &.open { height: 100vh; //doesn't matter because wrapper is sticky } @@ -34,7 +37,7 @@ nav.navbar { display: none; } .navbar-collapsed { - display: none; + /* display: none; This is so that the Login shows up when the page is made smaller */ } } padding: 0; @@ -49,8 +52,8 @@ a.navbar-brand img { .navbar-nav { ::ng-deep a.nav-link { color: var(--ds-navbar-link-color); - } - ::ng-deep a.nav-link:hover { - color: var(--ds-navbar-link-color-hover); + &:hover, &:focus { + color: var(--ds-navbar-link-color-hover); + } } } diff --git a/src/themes/dspace/assets/images/doc_icons/audio_icon18x18.png b/src/themes/dspace/assets/images/doc_icons/audio_icon18x18.png new file mode 100644 index 00000000000..d7e18cf76f7 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/audio_icon18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/audio_icon32x32.png b/src/themes/dspace/assets/images/doc_icons/audio_icon32x32.png new file mode 100644 index 00000000000..dabee6bd71c Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/audio_icon32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/droplet.jpg b/src/themes/dspace/assets/images/doc_icons/droplet.jpg new file mode 100644 index 00000000000..c39ede37a25 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/droplet.jpg differ diff --git a/src/themes/dspace/assets/images/doc_icons/excel_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/excel_icon-18x18.png new file mode 100644 index 00000000000..6360fc3e4ae Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/excel_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/excel_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/excel_icon-32x32.png new file mode 100644 index 00000000000..cc34dbeed72 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/excel_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/feed-icon-14x14.png b/src/themes/dspace/assets/images/doc_icons/feed-icon-14x14.png new file mode 100644 index 00000000000..b3c949d2244 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/feed-icon-14x14.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/feed-icon-28x28.png b/src/themes/dspace/assets/images/doc_icons/feed-icon-28x28.png new file mode 100644 index 00000000000..d64c669c758 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/feed-icon-28x28.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/fulcrum_icon.png b/src/themes/dspace/assets/images/doc_icons/fulcrum_icon.png new file mode 100644 index 00000000000..5f32708008d Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/fulcrum_icon.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/generic_bitstream18x18.png b/src/themes/dspace/assets/images/doc_icons/generic_bitstream18x18.png new file mode 100644 index 00000000000..924aaae452f Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/generic_bitstream18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/generic_bitstream32x32.png b/src/themes/dspace/assets/images/doc_icons/generic_bitstream32x32.png new file mode 100644 index 00000000000..58ab3bba707 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/generic_bitstream32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/generic_image_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/generic_image_icon-18x18.png new file mode 100644 index 00000000000..e4e4d7187ad Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/generic_image_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/generic_image_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/generic_image_icon-32x32.png new file mode 100644 index 00000000000..c8190d65dce Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/generic_image_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/hathi_trust_icon18x18.png b/src/themes/dspace/assets/images/doc_icons/hathi_trust_icon18x18.png new file mode 100644 index 00000000000..f3eb2f3d97e Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/hathi_trust_icon18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/html_icon-18x18.PNG b/src/themes/dspace/assets/images/doc_icons/html_icon-18x18.PNG new file mode 100644 index 00000000000..cc24f6af865 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/html_icon-18x18.PNG differ diff --git a/src/themes/dspace/assets/images/doc_icons/icons_for_deep_blue b/src/themes/dspace/assets/images/doc_icons/icons_for_deep_blue new file mode 100644 index 00000000000..22b6a34d37c --- /dev/null +++ b/src/themes/dspace/assets/images/doc_icons/icons_for_deep_blue @@ -0,0 +1,82 @@ +ICONS TO USE FOR DEEP BLUE FORMATS + + + +pdf_icon-18x18.png +pdf-icon32x32.png + .pdf + +text_icon-18x18.png +text_icon-32x32.png + .txt + .rtf + +word_icon-18x18.png +word-icon32x32.png + .doc + .docx + +excel_icon-18x18.png +excel_icon-32x32.png + .xls + .xlsx + +powerpoint_icon-18x18.png +powerpoint_icon-32x32.png + .ppt + .pptx + +jpeg_icon-18x18.png +jpeg_icon-32x32.png + .jpg + .jpeg + +tiff_icon-18x18.png +tiff_icon-32x32.png + .tiff + .tif + +generic_image_icon-18x18.png +generic_image_icon-32x32.png + .png + .bmp + .gif + .pcd + .psd + +audio_icon18x18.png +audio_icon32x32.png + .aif + .aiff + .wav + .au + .snd + .mp3 + .m4a + .mp4 + .ra + .rm + .ram + .wma + +video_icon18x18.png +video_icon32x32.png + .avi + .mov + .mp1 + .mp2 + .mp4 + .wmv + +zip_icon-18x18.png +zip_icon-32x32.png + .zip + .gz + .tar.gz + +generic_bitstream18x18.png +generic_bitstream32x32.png + [everything else] + +u-m_campus_only_access_icon.png + [added when we know an item/bitstream has campus-only restrictions] \ No newline at end of file diff --git a/src/themes/dspace/assets/images/doc_icons/jpeg_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/jpeg_icon-18x18.png new file mode 100644 index 00000000000..35d24e736d9 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/jpeg_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/jpeg_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/jpeg_icon-32x32.png new file mode 100644 index 00000000000..c2792138501 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/jpeg_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/lock.gif b/src/themes/dspace/assets/images/doc_icons/lock.gif new file mode 100644 index 00000000000..d2fa3241ed8 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/lock.gif differ diff --git a/src/themes/dspace/assets/images/doc_icons/pdf-icon32x32.png b/src/themes/dspace/assets/images/doc_icons/pdf-icon32x32.png new file mode 100644 index 00000000000..7c93b3342bf Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/pdf-icon32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/pdf_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/pdf_icon-18x18.png new file mode 100644 index 00000000000..92fce52311f Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/pdf_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/powerpoint_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/powerpoint_icon-18x18.png new file mode 100644 index 00000000000..e80a14f1be8 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/powerpoint_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/powerpoint_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/powerpoint_icon-32x32.png new file mode 100644 index 00000000000..e1c8b886bd7 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/powerpoint_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/text_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/text_icon-18x18.png new file mode 100644 index 00000000000..fcc918760cd Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/text_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/text_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/text_icon-32x32.png new file mode 100644 index 00000000000..f474e416e56 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/text_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/tiff_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/tiff_icon-18x18.png new file mode 100644 index 00000000000..33f8b0a70df Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/tiff_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/tiff_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/tiff_icon-32x32.png new file mode 100644 index 00000000000..340d2cc94d3 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/tiff_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/u-m_campus_only_access_icon.png b/src/themes/dspace/assets/images/doc_icons/u-m_campus_only_access_icon.png new file mode 100644 index 00000000000..c0f8a70f621 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/u-m_campus_only_access_icon.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/video_icon18x18.png b/src/themes/dspace/assets/images/doc_icons/video_icon18x18.png new file mode 100644 index 00000000000..16aaf3222f5 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/video_icon18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/video_icon32x32.png b/src/themes/dspace/assets/images/doc_icons/video_icon32x32.png new file mode 100644 index 00000000000..8e29926d7c7 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/video_icon32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/word-icon32x32.png b/src/themes/dspace/assets/images/doc_icons/word-icon32x32.png new file mode 100644 index 00000000000..1810c3e3b87 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/word-icon32x32.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/word_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/word_icon-18x18.png new file mode 100644 index 00000000000..fcc918760cd Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/word_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/zip_icon-18x18.png b/src/themes/dspace/assets/images/doc_icons/zip_icon-18x18.png new file mode 100644 index 00000000000..a7fa8f3cfe9 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/zip_icon-18x18.png differ diff --git a/src/themes/dspace/assets/images/doc_icons/zip_icon-32x32.png b/src/themes/dspace/assets/images/doc_icons/zip_icon-32x32.png new file mode 100644 index 00000000000..362fcc90f43 Binary files /dev/null and b/src/themes/dspace/assets/images/doc_icons/zip_icon-32x32.png differ diff --git a/src/themes/dspace/assets/images/favicons/favicon.ico b/src/themes/dspace/assets/images/favicons/favicon.ico index a5dfd5e3226..f63946943e4 100644 Binary files a/src/themes/dspace/assets/images/favicons/favicon.ico and b/src/themes/dspace/assets/images/favicons/favicon.ico differ diff --git a/src/themes/dspace/assets/images/favicons/favicon.svg b/src/themes/dspace/assets/images/favicons/favicon.svg deleted file mode 100644 index 8ea65cb72f0..00000000000 --- a/src/themes/dspace/assets/images/favicons/favicon.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/themes/dspace/eager-theme.module.ts b/src/themes/dspace/eager-theme.module.ts index 63dff9da317..fb080ed2d3d 100644 --- a/src/themes/dspace/eager-theme.module.ts +++ b/src/themes/dspace/eager-theme.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SharedModule } from '../../app/shared/shared.module'; import { HomeNewsComponent } from './app/home-page/home-news/home-news.component'; @@ -10,6 +10,7 @@ import { NavbarModule } from '../../app/navbar/navbar.module'; import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module'; import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module'; + /** * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS. * This will ensure that decorator gets picked up when the app loads @@ -34,6 +35,7 @@ const DECLARATIONS = [ NavbarModule, ], declarations: DECLARATIONS, + schemas: [ CUSTOM_ELEMENTS_SCHEMA ], providers: [ ...ENTRY_COMPONENTS.map((component) => ({provide: component})) ], diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts index cdaae815ada..be168af216c 100644 --- a/src/themes/dspace/lazy-theme.module.ts +++ b/src/themes/dspace/lazy-theme.module.ts @@ -116,7 +116,7 @@ const DECLARATIONS = [ SearchModule, FormsModule, ResourcePoliciesModule, - ComcolModule, + ComcolModule ], declarations: DECLARATIONS, }) diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss index 516eff9f7e9..52ce4b0dd63 100644 --- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss +++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss @@ -7,5 +7,6 @@ --ds-home-news-link-color: #{$green}; --ds-home-news-link-hover-color: #{darken($green, 15%)}; --ds-header-navbar-border-bottom-color: #{$green}; + --ds-anchors-color: #{$umanchors}; } diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss index b5799c97496..71a814d336e 100644 --- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss +++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss @@ -11,11 +11,13 @@ $navbar-dark-color: #FFFFFF; /* Reassign color vars to semantic color scheme */ $blue: #2b4e72 !default; -$green: #92C642 !default; +$green: #198539 !default; $cyan: #207698 !default; -$yellow: #ec9433 !default; +$yellow: #c74e1a !default; $red: #CF4444 !default; $dark: #43515f !default; +$umblue: #00274c !default; +$umanchors: #1d7491 !default; $gray-800: #343a40 !default; $gray-700: #495057 !default; @@ -30,7 +32,7 @@ $table-hover-bg: $gray-400 !default; // Bootstrap $gray-400 $yiq-contrasted-threshold: 170 !default; $theme-colors: ( - primary: $dark, + primary: $umblue, secondary: $gray-700, success: $green, info: $cyan, diff --git a/this_is_76 b/this_is_76 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tsconfig.app.json b/tsconfig.app.json index c89834db4ab..9860e2e33a5 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -10,7 +10,8 @@ ], "include": [ "src/**/*.d.ts", - "src/themes/**/*.module.ts" + "src/themes/**/*.module.ts", + "src/app/external-redirect/**/*.ts" ], "exclude": [ "src/test.ts", diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts index 1a1ecfd6efe..8d2328aaa50 100644 --- a/webpack/webpack.common.ts +++ b/webpack/webpack.common.ts @@ -49,6 +49,10 @@ export const copyWebpackOptions = { { from: path.join(__dirname, '..', 'src', 'robots.txt.ejs'), to: 'assets/robots.txt.ejs' + }, + { + from: path.join(__dirname, '..', 'src', 'clockss.txt.ejs'), + to: 'assets/clockss.txt.ejs' } ] };