moved themes to separate folder

src/app/+home-page/home-news/home-news.component.ts

@@ -2,8 +2,8 @@ import { Component } from '@angular/core';
 
 @Component({
   selector: 'ds-home-news',
-  styleUrls: ['./$themePath$/home-news.component.$theme$.scss'],
-  templateUrl: './$themePath$/home-news.component.$theme$.html'
+  styleUrls: ['./home-news.component.scss'],
+  templateUrl: './home-news.component.html'
 })
 
 /**

src/app/+home-page/home-news/themes/home-news.component.mantis.html

@@ -1,20 +0,0 @@
-<div class="background-image">
-    <div class="container">
-        <div class="jumbotron jumbotron-fluid">
-            <div class="d-flex flex-wrap">
-                <div>
-                    <h1 class="display-3">DSpace 7</h1>
-                    <p class="lead">DSpace is the world leading open source repository platform that enables organisations to:</p>
-                </div>
-            </div>
-            <ul>
-                <li>easily ingest documents, audio, video, datasets and their corresponding Dublin Core metadata
-                </li>
-                <li>open up this content to local and global audiences, thanks to the OAI-PMH interface and Google Scholar optimizations
-                </li>
-                <li>issue permanent urls and trustworthy identifiers, including optional integrations with handle.net and DataCite DOI</li>
-            </ul>
-        </div>
-    </div>
-    <small class="credits">Photo by <a href="https://www.pexels.com/@inspiredimages">Anthony</a></small>
-</div>

src/app/+home-page/home-news/themes/home-news.component.mantis.scss

@@ -1,4 +0,0 @@
-@import '../home-news.component.scss';
-.jumbotron {
-    background-color: transparent;
-}

src/app/+home-page/home-page.component.ts

@@ -2,8 +2,8 @@ import { Component } from '@angular/core';
 
 @Component({
   selector: 'ds-home-page',
-  styleUrls: ['./$themePath$/home-page.component.$theme$.scss'],
-  templateUrl: './$themePath$/home-page.component.$theme$.html'
+  styleUrls: ['./home-page.component.scss'],
+  templateUrl: './home-page.component.html'
 })
 export class HomePageComponent {
 }

src/app/+home-page/themes/home-page.component.mantis.html

@@ -1,5 +0,0 @@
-<ds-home-news></ds-home-news>
-<div class="container">
-  <ds-search-form class="d-block pt-4 pb-3"></ds-search-form>
-  <ds-top-level-community-list></ds-top-level-community-list>
-</div>

src/app/+home-page/themes/home-page.component.mantis.scss

@@ -1,50 +0,0 @@
-div.background-image {
-    color: white;
-    background-color: $info;
-    position: relative;
-    background-position-y: -200px;
-    background-image: url('/assets/images/banner.jpg');
-    background-size: cover;
-    @media screen and (max-width: map-get($grid-breakpoints, lg)) {
-        background-position-y: 0;
-    }
-
-    .container {
-        position: relative;
-        text-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
-
-        &:before, &:after {
-            content: '';
-            display: block;
-            width: $banner-background-gradient-width;
-            height: 100%;
-            top: 0;
-            position: absolute;
-        }
-
-        &:before {
-            background: linear-gradient(to left, $banner-text-background, transparent);
-            left: -$banner-background-gradient-width;
-
-        }
-
-        &:after {
-            background: linear-gradient(to right, $banner-text-background, transparent);
-            right: -$banner-background-gradient-width;
-        }
-
-        background-color: $banner-text-background;
-    }
-
-
-    small.credits {
-        a {
-            color: inherit;
-        }
-
-        opacity: 0.3;
-        position: absolute;
-        right: $spacer;
-        bottom: 0;
-    }
-}

src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts

@@ -14,7 +14,7 @@ import { FilterType } from '../../../../search-service/filter-type.model';
   selector: 'ds-search-facet-option',
   styleUrls: ['./search-facet-option.component.scss'],
   // templateUrl: './search-facet-option.component.html',
-  templateUrl: './$themePath$/search-facet-option.component.$theme$.html',
+  templateUrl: './search-facet-option.component.html',
 })
 
 /**

src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/themes/search-facet-option.component.mantis.html

@@ -1,9 +0,0 @@
-<a *ngIf="isVisible | async" class="d-flex flex-row"
-                                                           [routerLink]="[getSearchLink()]"
-                                                           [queryParams]="addQueryParams" queryParamsHandling="merge">
-    <input type="checkbox" [checked]="false" class="my-1 align-self-stretch"/>
-    <span class="filter-value px-1">{{filterValue.value}}</span>
-    <span class="float-right filter-value-count ml-auto">
-                        <span class="badge badge-primary badge-pill">{{filterValue.count}}</span>
-                    </span>
-</a>

src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts

@@ -19,7 +19,7 @@ const rangeDelimiter = '-';
   selector: 'ds-search-facet-range-option',
   styleUrls: ['./search-facet-range-option.component.scss'],
   // templateUrl: './search-facet-range-option.component.html',
-  templateUrl: './$themePath$/search-facet-range-option.component.$theme$.html',
+  templateUrl: './search-facet-range-option.component.html',
 })
 
 /**

src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/themes/search-facet-range-option.component.mantis.html

@@ -1,8 +0,0 @@
-<a *ngIf="isVisible | async" class="d-flex flex-row"
-   [routerLink]="[getSearchLink()]"
-   [queryParams]="changeQueryParams" queryParamsHandling="merge">
-    <span class="filter-value px-1">{{filterValue.value}}</span>
-    <span class="float-right filter-value-count ml-auto">
-                        <span class="badge badge-primary badge-pill">{{filterValue.count}}</span>
-                    </span>
-</a>

src/app/+search-page/search-filters/search-filter/search-filter.component.ts

@@ -13,8 +13,8 @@ import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.c
 
 @Component({
   selector: 'ds-search-filter',
-  styleUrls: ['./$themePath$/search-filter.component.$theme$.scss'],
-  templateUrl: './$themePath$/search-filter.component.$theme$.html',
+  styleUrls: ['./search-filter.component.scss'],
+  templateUrl: './search-filter.component.html',
   animations: [slide],
 })
 

src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.ts

@@ -41,7 +41,7 @@ const dateFormats = ['YYYY', 'YYYY-MM', 'YYYY-MM-DD'];
  */
 @Component({
   selector: 'ds-search-range-filter',
-  styleUrls: ['./$themePath$/search-range-filter.component.$theme$.scss'],
+  styleUrls: ['./search-range-filter.component.scss'],
   templateUrl: './search-range-filter.component.html',
   animations: [facetLoad]
 })

src/app/+search-page/search-filters/search-filter/search-range-filter/themes/search-range-filter.component.mantis.scss

@@ -1,5 +0,0 @@
-@import '../search-range-filter.component';
-
-::ng-deep .noUi-connect {
-    background: $info;
-}

src/app/+search-page/search-filters/search-filter/themes/search-filter.component.mantis.html

@@ -1,7 +0,0 @@
-<div class="facet-filter d-block mb-3 px-3 py-2" *ngIf="active$ | async">
-    <div (click)="toggle()" class="filter-name"><h5 class="d-inline-block mb-0">{{'search.filters.filter.' + filter.name + '.head'| translate}}</h5> <span class="filter-toggle fas float-right text-info"
-                                                                      [ngClass]="(collapsed$ | async) ? 'fa-caret-down' : 'fa-caret-up'"></span></div>
-    <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"  (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)" class="search-filter-wrapper" [ngClass]="{'closed' : closed}">
-        <ds-search-facet-filter-wrapper [filterConfig]="filter"></ds-search-facet-filter-wrapper>
-    </div>
-</div>

src/app/+search-page/search-filters/search-filter/themes/search-filter.component.mantis.scss

@@ -1,10 +0,0 @@
-@import '../search-filter.component';
-
-.facet-filter {
-    background-color: map-get($theme-colors, light);
-    border-radius: $border-radius;
-
-    h5 {
-       font-size: 1.1rem
-    }
-}

src/app/+search-page/search-filters/search-filters.component.ts

@@ -14,7 +14,7 @@ import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.comp
 @Component({
   selector: 'ds-search-filters',
   styleUrls: ['./search-filters.component.scss'],
-  templateUrl: './$themePath$/search-filters.component.$theme$.html',
+  templateUrl: './search-filters.component.html',
 })
 
 /**

src/app/+search-page/search-filters/themes/search-filters.component.mantis.html

@@ -1,7 +0,0 @@
-<h3>{{"search.filters.head" | translate}}</h3>
-<div *ngIf="(filters | async)?.hasSucceeded">
-    <div *ngFor="let filter of (filters | async)?.payload">
-        <ds-search-filter [filter]="filter"></ds-search-filter>
-    </div>
-</div>
-<a class="btn btn-primary" [routerLink]="[getSearchLink()]" [queryParams]="clearParams | async" queryParamsHandling="merge" role="button">{{"search.filters.reset" | translate}}</a>

src/app/+search-page/search-settings/search-settings.component.ts

@@ -9,8 +9,8 @@ import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.comp
 
 @Component({
   selector: 'ds-search-settings',
-  styleUrls: ['./$themePath$/search-settings.component.$theme$.scss'],
-  templateUrl: './$themePath$/search-settings.component.$theme$.html'
+  styleUrls: ['./search-settings.component.scss'],
+  templateUrl: './search-settings.component.html'
 })
 
 /**

src/app/+search-page/search-settings/themes/search-settings.component.mantis.html

@@ -1,24 +0,0 @@
-<ng-container *ngVar="(searchOptions$ | async) as config">
-    <h3>{{ 'search.sidebar.settings.title' | translate}}</h3>
-    <div *ngIf="config?.sort" class="setting-option result-order-settings mb-3 px-3 py-2">
-    <h5 class="mb-0">{{ 'search.sidebar.settings.sort-by' | translate}}</h5>
-    <select class="form-control my-2" (change)="reloadOrder($event)">
-        <option *ngFor="let sortOption of searchOptionPossibilities"
-                [value]="sortOption.field + ',' + sortOption.direction.toString()"
-                [selected]="sortOption.field === config?.sort.field && sortOption.direction === (config?.sort.direction)? 'selected': null">
-            {{'sorting.' + sortOption.field + '.' + sortOption.direction | translate}}
-        </option>
-    </select>
-    </div>
-
-    <div class="setting-option page-size-settings mb-3 px-3 py-2">
-        <h5 class="mb-0">{{ 'search.sidebar.settings.rpp' | translate}}</h5>
-        <select class="form-control my-2" (change)="reloadRPP($event)">
-            <option *ngFor="let pageSizeOption of config?.pagination.pageSizeOptions"
-                    [value]="pageSizeOption"
-                    [selected]="pageSizeOption === +config?.pagination.pageSize ? 'selected': null">
-                {{pageSizeOption}}
-            </option>
-        </select>
-    </div>
-</ng-container>

src/app/+search-page/search-settings/themes/search-settings.component.mantis.scss

@@ -1,10 +0,0 @@
-@import '../search-settings.component';
-
-.setting-option {
-    background-color: map-get($theme-colors, light);
-    border-radius: $border-radius;
-    h5 {
-        font-size: 1.1rem
-    }
-}
-

src/app/navbar/navbar.component.ts

@@ -12,8 +12,8 @@ import { HostWindowService } from '../shared/host-window.service';
  */
 @Component({
   selector: 'ds-navbar',
-  styleUrls: ['./$themePath$/navbar.component.$theme$.scss'],
-  templateUrl: './$themePath$/navbar.component.$theme$.html',
+  styleUrls: ['./navbar.component.scss'],
+  templateUrl: './navbar.component.html',
   animations: [slideMobileNav]
 })
 export class NavbarComponent extends MenuComponent implements OnInit {

src/app/navbar/themes/navbar.component.mantis.html

@@ -1,16 +0,0 @@
-<nav [ngClass]="{'open': !(menuCollapsed | async)}"
-     [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-     class="navbar navbar-light navbar-expand-md p-md-0 navbar-container">    <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
-    <div class="container">
-        <div class="reset-padding-md w-100">
-            <div id="collapsingNav">
-                <ul class="navbar-nav mr-auto shadow-none">
-                    <ng-container *ngFor="let section of (sections | async)">
-                        <ng-container
-                                *ngComponentOutlet="sectionComponents.get(section.id); injector: sectionInjectors.get(section.id);"></ng-container>
-                    </ng-container>
-                </ul>
-            </div>
-        </div>
-    </div>
-</nav>

src/app/navbar/themes/navbar.component.mantis.scss

@@ -1,7 +0,0 @@
-@import '../navbar.component.scss';
-
-nav.navbar {
-    border-bottom: 5px $green solid;
-}
-
-

src/app/shared/search-form/search-form.component.ts

@@ -16,7 +16,7 @@ import { SearchService } from '../../+search-page/search-service/search.service'
   selector: 'ds-search-form',
   styleUrls: ['./search-form.component.scss'],
   // templateUrl: './search-form.component.html',
-  templateUrl: './$themePath$/search-form.component.$theme$.html'
+  templateUrl: './search-form.component.html'
 })
 
 /**

src/app/shared/search-form/themes/search-form.component.mantis.html

@@ -1,21 +0,0 @@
-<form #form="ngForm" (ngSubmit)="onSubmit(form.value)" class="row" action="/search">
-    <div *ngIf="isNotEmpty(scopes)" class="col-12 col-sm-3">
-        <select [(ngModel)]="scope" name="scope" class="form-control" aria-label="Search scope"
-                (change)="onScopeChange($event.target.value)">
-            <option value>{{'search.form.search_dspace' | translate}}</option>
-            <option *ngFor="let scopeOption of scopes"
-                    [value]="scopeOption.id">{{scopeOption?.name ? scopeOption.name : 'search.form.search_dspace' | translate}}</option>
-        </select>
-    </div>
-    <div [ngClass]="{'col-sm-9': isNotEmpty(scopes)}" class="col-12">
-        <div class="form-group input-group"
-             [ngClass]="{'input-group-lg': large}">
-            <input type="text" [(ngModel)]="query" name="query" class="form-control"
-                   aria-label="Search input">
-            <span class="input-group-append">
-            <button type="submit"
-                    class="search-button btn btn-{{brandColor}}">{{ ('search.form.search' | translate) }}</button>
-        </span>
-        </div>
-    </div>
-</form>

src/styles/_variables.scss

@@ -1,11 +1,13 @@
 @import '_functions.scss';
 @import '../../node_modules/bootstrap/scss/functions.scss';
 
-@import '$themePath$/bootstrap_variables.$theme$.scss';
+//@import '$themePath$/bootstrap_variables.scss';
+@import '../../themes/mantis/styles/bootstrap_variables.scss';
 
 @import 'bootstrap_variables.scss';
 @import '../../node_modules/bootstrap/scss/variables.scss';
 
-@import '$themePath$/custom_variables.$theme$.scss';
+//@import '$themePath$/custom_variables.scss';
+@import '../../themes/mantis/styles/custom_variables.scss';
 
 @import 'custom_variables.scss';

src/styles/themes/_bootstrap_variables.mantis.scss

@@ -1,19 +0,0 @@
-@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,200i,300,300i,400,400i,600,600i,700,700i,900,900i&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext,vietnamese');
-
-$font-family-sans-serif: 'Source Sans Pro', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-$gray-100: #e8ebf3 !default; // #eee
-$gray-800: #444444 !default; // #444
-
-$navbar-dark-color: #FFFFFF;
-
-/* Reassign color vars to semantic color scheme */
-$blue: #43515f !default;
-$green: #92C642 !default;
-$cyan: #2e80a3 !default;
-$yellow: #ec9433 !default;
-$red: #CF4444 !default;
-$dark: #43515f !default;
-
-$body-color: $gray-800 !default;
-
-$yiq-contrasted-threshold:  170 !default;

src/styles/themes/_custom_variables.mantis.scss

@@ -1,2 +0,0 @@
-$banner-text-background: rgba(0, 0, 0, 0.35);
-$banner-background-gradient-width: 300px;