Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,22 @@
"inject": false,
"bundleName": "custom-theme"
},
{
"input": "src/themes/papyrus/styles/theme.scss",
"inject": false,
"bundleName": "papyrus-theme"
},
{
"input": "src/themes/dspace/styles/theme.scss",
"inject": false,
"bundleName": "dspace-theme"
}
],
"scripts": [],
"scripts": [
"src/themes/papyrus/assets/scripts-udem/jquery.slim.min.js",
"src/themes/papyrus/assets/scripts-udem/popper.min.js",
"src/themes/papyrus/assets/scripts-udem/bootstrap.bundle.min.js"
],
"baseHref": "/"
},
"configurations": {
Expand Down
2 changes: 1 addition & 1 deletion src/app/admin/admin-sidebar/admin-sidebar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="sidebar-section">
<div href="javascript:void(0);" class="nav-item d-flex flex-row flex-nowrap py-0">
<div class="shortcut-icon navbar-brand logo-wrapper">
<img class="admin-logo" src="assets/images/udem/udem-logo-mini.png"
<img class="admin-logo" src="assets/papyrus/images/udem/udem-logo-mini.png"
[alt]="('menu.header.image.logo') | translate">
</div>
<div class="sidebar-collapsible navbar-brand">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<div class="container">
<h2>{{ 'communityList.title' | translate }}</h2>
<div class="d-flex flex-row border-bottom mb-4 titre-udem-decoration"></div>
<ds-themed-community-list></ds-themed-community-list>
</div>
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<ng-container *ngVar="(itemRD$ | async) as itemRD">
<div class="mt-3" [ngClass]="placeholderFontClass" *ngIf="itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0" @fadeIn>
<div class="d-flex flex-row border-bottom mb-4"></div>
<h4 class="text-uppercase f-titre"> {{'home.recent-submissions.head' | translate}}</h4>
<h3 class="text-uppercase f-titre mt-2"> {{'home.recent-submissions.head' | translate}}</h3>
<div class="d-flex flex-row border-bottom mb-4 titre-udem-decoration"></div>
<div class="my-4" *ngFor="let item of itemRD?.payload?.page">
<ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
</ds-listable-object-component-loader>
</div>
<button (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-left ng-tns-c290-40">Load
more...</button>
<button (click)="onLoadMore()" class="btn btn-outline-dark btn-sm mt-2 search-button mt-4 float-left ng-tns-c290-40">
{{'action.load.more' | translate}}</button>
</div>
<ds-error *ngIf="itemRD?.hasFailed" message="{{'error.recent-submissions' | translate}}"></ds-error>
<ds-loading *ngIf="!itemRD || itemRD.isLoading" message="{{'loading.recent-submissions' | translate}}">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ng-container *ngVar="(communitiesRD$ | async) as communitiesRD">
<div *ngIf="communitiesRD?.hasSucceeded " class="mt-4">
<h4 class="text-uppercase f-titre">{{'home.top-level-communities.head' | translate}}</h4>
<div class="d-flex flex-row border-bottom mb-4"></div>
<h3 class="text-uppercase f-titre">{{'home.top-level-communities.head' | translate}}</h3>
<div class="d-flex flex-row border-bottom mb-4 titre-udem-decoration"></div>
<p class="lead">{{'home.top-level-communities.help' | translate}}</p>
<ds-viewable-collection
[config]="config"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="col-xs-12 col-sm-12 col-md-9 main-content">
<form class="primary" [formGroup]="feedbackForm" (ngSubmit)="createFeedback()">
<h2 class="t-white">{{ 'info.feedback.head' | translate }}</h2>
<p class="t-white">{{ 'info.feedback.info' | translate }}</p>
<p class="text-lite-gray">{{ 'info.feedback.info' | translate }}</p>
<fieldset class="col p-0">
<div class="row">
<div class="control-group col-sm-12 mt-2">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="col-md-4 col-sm-12">
<div class="item-media-udem">
<ng-container *ngIf="afficherImageEmbargo()">
<img src="assets/images/udem/doc-lock.png" class="img-thumbnail mb-3 p-5 h-220">
<img src="assets/papyrus/images/udem/doc-lock.png" class="img-thumbnail mb-3 p-5 h-220">
</ng-container>
<ng-container *ngIf="(!mediaViewer.image && !afficherImageEmbargo())">
<ds-metadata-field-wrapper [hideIfNoTextContent]="false">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="facet-filter d-block mb-3 p-3" *ngIf="active$ | async"
<div class="facet-filter d-block mb-3 p-3 bg-light " *ngIf="active$ | async"
[id]="regionId" [attr.aria-labelledby]="toggleId" [ngClass]="{ 'focus': focusBox }" role="region">
<button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId"
class="filter-name d-flex " [attr.aria-controls]="regionId" [id]="toggleId"
[attr.aria-expanded]="false"
[attr.aria-label]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate"
[attr.data-test]="'filter-toggle' | dsBrowserOnly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
id="{{ scope.id }}">
{{ 'statistics.header' | translate: { scope: getName(scope) } }}
</h2>
<div class="d-flex flex-row border-bottom mb-4 titre-udem-decoration"></div>
</ng-container>
<ng-container *ngVar="reports$ | async as reports">
<ng-container *ngIf="!reports">
Expand Down
Loading