diff --git a/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html b/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html index 425eea4bcfc..e6f41c63bf2 100644 --- a/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html +++ b/web-ui/src/main/resources/catalog/components/search/mdview/partials/contact.html @@ -9,12 +9,12 @@ >
-
+
{{c.role | translate}}
{{c.organisation}}
@@ -29,17 +29,19 @@
+
{{c.address}}
- call {{c.phone}} + + {{c.phone}}
@@ -56,20 +58,16 @@ gn-popover gn-popover-dismiss=".content" > -
-
-
{{cnts[0].role | translate}}
-
-
-
-
-
{{c.organisation}}
-
-
+
+
+
+
+
{{cnts[0].role | translate}}
+
{{c.organisation}}
@@ -78,6 +76,9 @@
+ {{c.organisation}} @@ -86,17 +87,19 @@
+
{{c.address}}
- call {{c.phone}} + + {{c.phone}}
@@ -118,12 +121,12 @@ >
-
+
{{c.organisation}}
@@ -142,17 +145,19 @@
+
{{c.address}}
- call {{c.phone}} + + {{c.phone}}
@@ -171,29 +176,41 @@ data-ng-if="mode == 'default'" data-ng-repeat="c in mdContacts track by $index" > -

- - {{c.role | translate}} -

-
-
+
+
+

+ + {{c.role | translate}} +

+
+
+
- - {{c.organisation}}
-
- {{c.organisation}}
+ +
+ + {{c.organisation}} +
-
{{c.address}}
+
+ + {{c.address}} +
- call {{c.phone}} + + + {{c.phone}}
-
- -
@@ -203,37 +220,55 @@

data-ng-if="mode == 'role'" data-ng-repeat="(roles, contactByRole) in mdContactsByRole" > -

- - {{translateRoles(roles)}} -

-
-
-
- - {{c.organisation}}
-
- {{c.organisation}}
+
+
+

+ + {{translateRoles(roles)}} +

+
+
+
+ +
+ +
+
+ +
+ + {{c.organisation}} +
- -
-
+
+
+
- - -
{{c.address}}
- - call {{c.phone}} - -
-
-
- -
- + +
+
+ + {{c.address}} +
+ +
+ + + + {{c.phone}} + +
+
+
+
@@ -244,32 +279,42 @@

data-ng-if="mode == 'org-role'" data-ng-repeat="(org, contactByOrgRole) in mdContactsByOrgRole" > -
- - - {{org}}
-
- {{org}} +
+
+
+
+ + + + {{org}} + +
+
+ + {{org}} +
-
- - - {{key}}
-
-
    -
  • - {{translateRoles(roles)}}:
    - -
    -
    + + + {{key}}
    -
  • -
+
    +
  • + {{translateRoles(roles)}}:
    +
    +
    +
    +
    +
  • +
+
+
-
+

diff --git a/web-ui/src/main/resources/catalog/components/search/mdview/partials/individual.html b/web-ui/src/main/resources/catalog/components/search/mdview/partials/individual.html index f37944f3e76..438ca9ae073 100644 --- a/web-ui/src/main/resources/catalog/components/search/mdview/partials/individual.html +++ b/web-ui/src/main/resources/catalog/components/search/mdview/partials/individual.html @@ -1,4 +1,5 @@
+ {{c.email}} diff --git a/web-ui/src/main/resources/catalog/locales/en-v4.json b/web-ui/src/main/resources/catalog/locales/en-v4.json index 47a3e9b58e7..5ebbaceba8d 100644 --- a/web-ui/src/main/resources/catalog/locales/en-v4.json +++ b/web-ui/src/main/resources/catalog/locales/en-v4.json @@ -409,5 +409,10 @@ "lastCreatedRecords": "Last created records", "associationType": "Association type", "initiativeType": "Initiative type", - "associatedTo": "Associated " + "associatedTo": "Associated ", + "mdEmail": "Email", + "mdWebsite": "Website", + "mdOrganization": "Organization", + "mdAddress": "Address", + "mdPhone": "Phone" } diff --git a/web-ui/src/main/resources/catalog/style/gn_metadata.less b/web-ui/src/main/resources/catalog/style/gn_metadata.less index dbe7dbaf8d8..851a6464980 100644 --- a/web-ui/src/main/resources/catalog/style/gn_metadata.less +++ b/web-ui/src/main/resources/catalog/style/gn_metadata.less @@ -1,4 +1,5 @@ @import "gn_search.less"; +@import "gn_variables.less"; .panel-body .gn-metadata-view { width: 100%; @@ -630,24 +631,46 @@ ul.container-list { } .col-md-6, .col-md-4 { - padding-left: 0px; - padding-right: 0px; + padding-left: 0; + padding-right: 0; } - .gn-contact-card-org { + .gn-contact-card-org, + .gn-contact-card-org-group { padding: 5px 0; margin-bottom: 10px; } .gn-contact-card-role { - font-style: italic; - font-weight: bolder; - } - .gn-contact-card-org-group { - font-style: italic; font-weight: bolder; } .gn-contact-card-group-role { padding: 5px; } + @media print { + svg { + max-width: 75px; + margin: 15px; + } + [gn-popover-content] { + .make-md-column-offset(3); + padding: 0 @gn-spacing-lg; + display: block !important; + label, + a { + display: block; + margin-bottom: @gn-spacing; + } + [data-label="focusOnFrom"] { + display: none; + } + .fa { + display: none; + } + [data-ng-href] { + margin-bottom: @gn-spacing; + display: inline-block; + } + } + } } } } diff --git a/web-ui/src/main/resources/catalog/style/gn_variables.less b/web-ui/src/main/resources/catalog/style/gn_variables.less new file mode 100644 index 00000000000..7d663982363 --- /dev/null +++ b/web-ui/src/main/resources/catalog/style/gn_variables.less @@ -0,0 +1,6 @@ +// variables used in custom styles +// ------------------------------- + +@gn-spacing: 10px; +@gn-spacing-sm: 5px; +@gn-spacing-lg: 15px; diff --git a/web-ui/src/main/resources/catalog/views/default/less/gn_print_default.less b/web-ui/src/main/resources/catalog/views/default/less/gn_print_default.less index 52b5c123b9f..01eecbe8eef 100644 --- a/web-ui/src/main/resources/catalog/views/default/less/gn_print_default.less +++ b/web-ui/src/main/resources/catalog/views/default/less/gn_print_default.less @@ -1,4 +1,6 @@ @import "../../../lib/style/bootstrap/less/variables.less"; +@import "../../../lib/style/bootstrap/less/mixins/grid.less"; +@import "gn_view.less"; // special print classes .gn-new-page { @@ -105,6 +107,26 @@ a[href]:after { svg { max-width: 100px; } + [gn-popover-content] { + .make-md-column-offset(3); + padding: 0 @gn-spacing-lg; + display: block !important; + label, + a { + display: block; + margin-bottom: @gn-spacing; + } + [data-label="focusOnFrom"] { + display: none; + } + .fa { + display: none; + } + [data-ng-href] { + margin-bottom: @gn-spacing; + display: inline-block; + } + } } .gn-md-side-crs { a { diff --git a/web-ui/src/main/resources/catalog/views/default/less/gn_result_default.less b/web-ui/src/main/resources/catalog/views/default/less/gn_result_default.less index 73dd6a9a6a4..d91448d7a0e 100644 --- a/web-ui/src/main/resources/catalog/views/default/less/gn_result_default.less +++ b/web-ui/src/main/resources/catalog/views/default/less/gn_result_default.less @@ -1,4 +1,5 @@ @import "../../../style/gn_search.less"; +@import "../../../style/gn_variables.less"; // variables for manipulating the theme @import "gn_variables_default.less"; // must be last @@ -97,6 +98,39 @@ background-color: @brand-danger !important; } } + // address card + .panel-address { + padding-bottom: 0; + box-shadow: none; + border: 1px solid @panel-default-border; + .panel-heading { + padding: @gn-spacing-lg; + border-bottom: 1px solid @panel-default-border; + background-color: @panel-default-heading-bg; + height: auto; + line-height: normal; + h3 { + margin: 0; + padding: 0; + font-size: 14px; + font-weight: bold; + } + } + .panel-body { + padding: 0; + address { + padding: @gn-spacing-lg; + + border-radius: @panel-border-radius; + margin: 0; + label { + min-width: 20%; + margin-right: @gn-spacing; + } + } + } + + } // card .gn-card-view-header { padding: 15px; diff --git a/web-ui/src/main/resources/catalog/views/default/less/gn_view.less b/web-ui/src/main/resources/catalog/views/default/less/gn_view.less index 7d2cbf3c9cc..65696fb2894 100644 --- a/web-ui/src/main/resources/catalog/views/default/less/gn_view.less +++ b/web-ui/src/main/resources/catalog/views/default/less/gn_view.less @@ -1,13 +1,10 @@ @import "../../../lib/style/bootstrap/less/variables.less"; +@import "../../../style/gn_variables.less"; /* Defined here any custom style for the view which has to be applied for all apps (ie. admin, search, login, editor). */ -@gn-spacing: 10px; -@gn-spacing-sm: 5px; -@gn-spacing-lg: 15px; - // padding .gn-padding-top { padding-top: @gn-spacing !important;