diff --git a/src/app/core/cache/models/normalized-dspace-object.model.ts b/src/app/core/cache/models/normalized-dspace-object.model.ts index 29688d5f9d..17aa2d3d8c 100644 --- a/src/app/core/cache/models/normalized-dspace-object.model.ts +++ b/src/app/core/cache/models/normalized-dspace-object.model.ts @@ -25,6 +25,7 @@ export abstract class NormalizedDSpaceObject implements CacheableObject { /** * A string representing the kind of DSpaceObject, e.g. community, item, … */ + @autoserialize type: string; /** diff --git a/src/app/core/shared/dspace-object.model.ts b/src/app/core/shared/dspace-object.model.ts index 22769763bf..7f6e0f5ee2 100644 --- a/src/app/core/shared/dspace-object.model.ts +++ b/src/app/core/shared/dspace-object.model.ts @@ -1,4 +1,3 @@ -import { autoserialize, autoserializeAs } from "cerialize"; import { Metadatum } from "./metadatum.model" import { isEmpty, isNotEmpty } from "../../shared/empty.util"; import { CacheableObject } from "../cache/object-cache.reducer"; @@ -9,19 +8,16 @@ import { RemoteData } from "../data/remote-data"; */ export abstract class DSpaceObject implements CacheableObject { - @autoserialize self: string; /** * The human-readable identifier of this DSpaceObject */ - @autoserialize id: string; /** * The universally unique identifier of this DSpaceObject */ - @autoserialize uuid: string; /** @@ -32,13 +28,11 @@ export abstract class DSpaceObject implements CacheableObject { /** * The name for this DSpaceObject */ - @autoserialize name: string; /** * An array containing all metadata of this DSpaceObject */ - @autoserializeAs(Metadatum) metadata: Array; /** diff --git a/src/app/home/home-news/home-news.component.html b/src/app/home/home-news/home-news.component.html index 4393228e94..01210bf9fc 100644 --- a/src/app/home/home-news/home-news.component.html +++ b/src/app/home/home-news/home-news.component.html @@ -1,19 +1,16 @@ - -
-
-
-

Welcome to DSpace

-

DSpace is an open source software platform that enables organisations to:

-
    -
  • capture and describe digital material using a submission workflow module, or a variety - of - programmatic ingest options -
  • -
  • distribute an organisation's digital assets over the web through a search and retrieval - system -
  • -
  • preserve digital assets over the long term
  • -
-
+
+
+

Welcome to DSpace

+

DSpace is an open source software platform that enables organisations to:

+
    +
  • capture and describe digital material using a submission workflow module, or a variety + of + programmatic ingest options +
  • +
  • distribute an organisation's digital assets over the web through a search and retrieval + system +
  • +
  • preserve digital assets over the long term
  • +
diff --git a/src/app/home/home-news/home-news.component.scss b/src/app/home/home-news/home-news.component.scss index e69de29bb2..ac03797b06 100644 --- a/src/app/home/home-news/home-news.component.scss +++ b/src/app/home/home-news/home-news.component.scss @@ -0,0 +1,6 @@ +@import '../../../styles/mixins.scss'; + +:host { + display: block; + @include negate-gutters(); +} diff --git a/src/backend/bitstreams.ts b/src/backend/bitstreams.ts index ed47d0d94a..6d10f87fbf 100644 --- a/src/backend/bitstreams.ts +++ b/src/backend/bitstreams.ts @@ -7,6 +7,7 @@ export const BITSTREAMS = [ }, "id": "3678", "uuid": "43c57c2b-206f-4645-8c8f-5f10c84b09fa", + "type": "bitstream", "name": "do_open_access_CRL.pdf", "size": 636626, "checksum": { @@ -28,6 +29,7 @@ export const BITSTREAMS = [ }, "id": "8842", "uuid": "1a013ecc-fb25-4689-a44f-f1383ad26632", + "type": "bitstream", "name": "do_open_access_CRL.pdf.jpg", "size": 41183, "checksum": { diff --git a/src/backend/bundles.ts b/src/backend/bundles.ts index 9ec0630dbd..678b98007c 100644 --- a/src/backend/bundles.ts +++ b/src/backend/bundles.ts @@ -12,6 +12,7 @@ export const BUNDLES = [ }, "id": "2355", "uuid": "35e0606d-5e18-4f9c-aa61-74fc751cc3f9", + "type": "bundle", "name": "ORIGINAL", "metadata": [ { "key": "dc.title", "value": "ORIGINAL", "language": "en" } @@ -30,6 +31,7 @@ export const BUNDLES = [ }, "id": "5687", "uuid": "a469c57a-abcf-45c3-83e4-b187ebd708fd", + "type": "bundle", "name": "THUMBNAIL", "metadata": [ { "key": "dc.title", "value": "THUMBNAIL", "language": "en" } diff --git a/src/backend/collections.ts b/src/backend/collections.ts index 1149d244f8..c701b38ed4 100644 --- a/src/backend/collections.ts +++ b/src/backend/collections.ts @@ -9,6 +9,7 @@ export const COLLECTIONS = [ }, "id": "5179", "uuid": "9e32a2e2-6b91-4236-a361-995ccdc14c60", + "type": "collection", "name": "A Test Collection", "handle": "123456789/5179", "metadata": [ @@ -44,6 +45,7 @@ export const COLLECTIONS = [ }, "id": "6547", "uuid": "598ce822-c357-46f3-ab70-63724d02d6ad", + "type": "collection", "name": "Another Test Collection", "handle": "123456789/6547", "metadata": [ diff --git a/src/backend/items.ts b/src/backend/items.ts index dc155ff98c..80690132bd 100644 --- a/src/backend/items.ts +++ b/src/backend/items.ts @@ -23,6 +23,7 @@ export const ITEMS = [ }, "id": "8871", "uuid": "21539b1d-9ef1-4eda-9c77-49565b5bfb78", + "type": "item", "name": "Do Open-Access Articles Have a Greater Research Impact?", "handle": "123456789/8871", "lastModified": "2016-10-14 10:41:12.886", @@ -115,6 +116,7 @@ export const ITEMS = [ }, "id": "9978", "uuid": "be8325f7-243b-49f4-8a4b-df2b793ff3b5", + "type": "item", "name": "Another Test Item", "handle": "123456789/9978", "lastModified": "2016-05-27 03:00:20.063", diff --git a/src/styles/_mixins.scss b/src/styles/_mixins.scss new file mode 100644 index 0000000000..39204e1e6c --- /dev/null +++ b/src/styles/_mixins.scss @@ -0,0 +1,13 @@ +@import './variables.scss'; +@import '../../node_modules/bootstrap/scss/variables'; +@import '../../node_modules/bootstrap/scss/mixins'; + +@mixin negate-gutters($gutters: $grid-gutter-widths) { + @each $breakpoint in map-keys($gutters) { + @include media-breakpoint-up($breakpoint) { + $gutter: map-get($gutters, $breakpoint); + margin-right: ($gutter / -2); + margin-left: ($gutter / -2); + } + } +}