diff --git a/content/pages/publish.json b/content/pages/publish.json
index 973c0e94e..484846398 100644
--- a/content/pages/publish.json
+++ b/content/pages/publish.json
@@ -57,7 +57,8 @@
{
"name": "copyrightHolder",
"label": "Copyright Holder",
- "placeholder": "e.g. Marine Institute of Jellyfish"
+ "placeholder": "e.g. Marine Institute of Jellyfish",
+ "help": "Add this if the holder of the copyright is different from the author."
},
{
"name": "tags",
diff --git a/src/components/organisms/AssetContent/MetaFull.module.css b/src/components/organisms/AssetContent/MetaFull.module.css
index 0f91d82dc..8a0b15204 100644
--- a/src/components/organisms/AssetContent/MetaFull.module.css
+++ b/src/components/organisms/AssetContent/MetaFull.module.css
@@ -1,5 +1,5 @@
.metaFull {
- margin-top: calc(var(--spacer) * 2);
+ margin-top: var(--spacer);
font-size: var(--font-size-small);
display: grid;
gap: var(--spacer);
diff --git a/src/components/organisms/AssetContent/MetaFull.tsx b/src/components/organisms/AssetContent/MetaFull.tsx
index a80c9da1d..be00a6e06 100644
--- a/src/components/organisms/AssetContent/MetaFull.tsx
+++ b/src/components/organisms/AssetContent/MetaFull.tsx
@@ -4,8 +4,6 @@ import MetaItem from './MetaItem'
import styles from './MetaFull.module.css'
import { MetadataMarket } from '../../../@types/MetaData'
import { DDO } from '@oceanprotocol/lib'
-import EtherscanLink from '../../atoms/EtherscanLink'
-import { useOcean, usePricing } from '@oceanprotocol/react'
export default function MetaFull({
ddo,
@@ -14,15 +12,12 @@ export default function MetaFull({
ddo: DDO
metadata: MetadataMarket
}): ReactElement {
- const { networkId } = useOcean()
- const { id, dataToken } = ddo
- const { dateCreated, datePublished, author, license } = metadata.main
- const { dtSymbol, dtName } = usePricing(ddo)
+ const { id } = ddo
+ const { dateCreated, datePublished, license } = metadata.main
return (
-
-
+
{metadata?.additionalInformation?.copyrightHolder && (
} />
-
- }
- />
-
-
- {dtName ? `${dtName} - ${dtSymbol}` : {dataToken}
}
-
- }
- />
-
+ } />
{id}} />
)
diff --git a/src/components/organisms/AssetContent/MetaSecondary.module.css b/src/components/organisms/AssetContent/MetaSecondary.module.css
index 05dec8123..b2038e114 100644
--- a/src/components/organisms/AssetContent/MetaSecondary.module.css
+++ b/src/components/organisms/AssetContent/MetaSecondary.module.css
@@ -14,3 +14,7 @@
.samples {
margin-top: var(--spacer);
}
+
+.date {
+ color: var(--color-secondary);
+}
diff --git a/src/components/organisms/AssetContent/MetaSecondary.tsx b/src/components/organisms/AssetContent/MetaSecondary.tsx
index 805058b77..6f7bba411 100644
--- a/src/components/organisms/AssetContent/MetaSecondary.tsx
+++ b/src/components/organisms/AssetContent/MetaSecondary.tsx
@@ -4,6 +4,7 @@ import styles from './MetaSecondary.module.css'
import { MetadataMarket } from '../../../@types/MetaData'
import Tags from '../../atoms/Tags'
import Button from '../../atoms/Button'
+import Time from '../../atoms/Time'
export default function MetaSecondary({
metadata
@@ -12,10 +13,6 @@ export default function MetaSecondary({
}): ReactElement {
return (
)
}
diff --git a/src/components/organisms/AssetContent/index.module.css b/src/components/organisms/AssetContent/index.module.css
index 6d3bff68c..f1023ffcb 100644
--- a/src/components/organisms/AssetContent/index.module.css
+++ b/src/components/organisms/AssetContent/index.module.css
@@ -29,13 +29,20 @@
.meta {
margin-bottom: var(--spacer);
color: var(--color-secondary);
- font-weight: var(--font-weight-bold);
}
.meta p {
margin-bottom: 0;
}
+.author {
+ font-weight: var(--font-weight-bold);
+}
+
+.datatoken a {
+ color: var(--color-secondary);
+}
+
.buttonGroup {
margin-top: var(--spacer);
margin-bottom: var(--spacer);
diff --git a/src/components/organisms/AssetContent/index.tsx b/src/components/organisms/AssetContent/index.tsx
index 99555d602..f4b948e85 100644
--- a/src/components/organisms/AssetContent/index.tsx
+++ b/src/components/organisms/AssetContent/index.tsx
@@ -10,7 +10,9 @@ import AssetActions from '../AssetActions'
import { DDO } from '@oceanprotocol/lib'
import { useUserPreferences } from '../../../providers/UserPreferences'
import Pricing from './Pricing'
-import { useOcean } from '@oceanprotocol/react'
+import { useOcean, usePricing } from '@oceanprotocol/react'
+import EtherscanLink from '../../atoms/EtherscanLink'
+import MetaItem from './MetaItem'
export interface AssetContentProps {
metadata: MetadataMarket
@@ -22,9 +24,9 @@ export default function AssetContent({
metadata,
ddo
}: AssetContentProps): ReactElement {
- const { datePublished } = metadata.main
const { debug } = useUserPreferences()
- const { accountId } = useOcean()
+ const { accountId, networkId } = useOcean()
+ const { dtSymbol, dtName } = usePricing(ddo)
const isOwner = accountId === ddo.publicKey[0].owner
const hasNoPrice = ddo.price.type === ''
@@ -37,7 +39,24 @@ export default function AssetContent({