add footer

src/app/app.component.html

@@ -4,9 +4,10 @@
 </div>
 <ng-container *ngIf="hasNavBar">
   <span class="navbar-toggler" [ngClass]="{opened: navbarOpened$ | async}" (click)="toggleToolbar()" [title]="'toggleToolbar' | translate">
-    <evt-icon [iconInfo]="navbarTogglerIcon$ | async"></evt-icon>
+    <evt-icon [iconInfo]="navbarTogglerIcon$ | async">
+    </evt-icon>
   </span>
-  <evt-nav-bar [ngClass]="{opened: navbarOpened$ | async}"></evt-nav-bar>
-
+  <evt-nav-bar [ngClass]="{opened: navbarOpened$ | async}">
+  </evt-nav-bar>
 </ng-container>
-<ngx-spinner #mainSpinner bdColor="rgba(51,51,51,0.8)"></ngx-spinner>
+<ngx-spinner #mainSpinner bdColor="rgba(51,51,51,0.8)"></ngx-spinner>

src/app/app.module.ts

@@ -95,6 +95,7 @@ import { HighlightDirective } from './directives/highlight.directive';
 import { HtmlAttributesDirective } from './directives/html-attributes.directive';
 import { EvtInfoComponent } from './evt-info/evt-info.component';
 import { MainHeaderComponent } from './main-header/main-header.component';
+// import { MainFooterComponent } from './main-footer/main-footer.component';
 import { MainMenuComponent } from './main-menu/main-menu.component';
 import { NavBarComponent } from './nav-bar/nav-bar.component';
 import { ImagePanelComponent } from './panels/image-panel/image-panel.component';
@@ -181,6 +182,7 @@ export function initializeApp(appConfig: AppConfig) {
     ImageTextComponent,
     LbComponent,
     MainHeaderComponent,
+    // MainFooterComponent,
     MainMenuComponent,
     ManuscriptThumbnailsViewerComponent,
     MsContentsComponent,

src/app/components/lemmatized-entity/lemmatized-entity-detail/lemmatized-entity-detail.component.html

@@ -31,7 +31,7 @@
                         <li *ngIf="item.key==='lemmaRef' && data.label!=='lem' && data.label!='note' && data.label==='a' && item.key!=='pos' && item.key!=='norm' && item.key!=='type'">
                             <div>
                                 <span (click)="openlinkLem()" [class.pointer]="linkLem">
-                                    <a class="icon-delete" *ngIf="linkLem" [href]="linkLem" target="_blank" class="ml-2 external-link-alt">
+                                    <a class="icon-delete" *ngIf="linkLem" [href]="linkLem" class="ml-2 external-link-alt">
                                     Definizione lemma 
                                     <evt-icon [iconInfo]="{icon: 'external-link-alt', iconSet: 'fas'}"></evt-icon>
                                     </a>

src/app/components/named-entity/named-entity.component.html

@@ -36,7 +36,7 @@
                     </div>
                 </ng-template>
             </li>
-            <li [ngbNavItem]="'relations_'+data.id">
+            <!-- <li [ngbNavItem]="'relations_'+data.id">
                 <a ngbNavLink class="ui-font">{{'Relazioni' | translate}}</a>
                 <ng-template ngbNavContent>
                     <div class="ne-detail-content" *ngIf="relations$ | async as relations">
@@ -45,7 +45,7 @@
                             [data]="relation" [inEntity]="true"></evt-named-entity-relation>
                     </div>
                 </ng-template>
-            </li>
+            </li> -->
             <li [ngbNavItem]="'xml_'+data.id">
                 <a ngbNavLink class="ui-font">{{'XMLSource' | translate}}</a>
                 <ng-template ngbNavContent>

src/app/panels/text-panel/text-panel.component.html

@@ -1,13 +1,14 @@
 <evt-panel [showSecondaryContent]="isSecondaryContentOpened()" (scrollContent)="updatePage()">
     <div header-left>
-        <evt-button
-            label="Info"
-            [iconLeft]="{icon: 'info-circle'}"
-            additionalClasses="btn-primary mr-1"
-            (btnClick)="toggleSecondaryContent('Le immagini sono pubblicate su concessione del Ministero della cultura – Archivio di Stato di Prato e sono liberamente utilizzabili per attività di studio, ricerca, libera manifestazione del pensiero o espressione creativa, promozione della conoscenza del patrimonio culturale. I diritti di riproduzione delle immagini pubblicate – ai sensi degli articoli 106, 107 e 108 del Codice dei beni culturali e del paesaggio (D.Lgs. 42/2004 e s.m.i.) – appartengono dell’Archivio di Stato di Prato, pertanto tutti gli usi di queste immagini, diversi da quelli sopra esposti, debbono essere espressamente autorizzati (https://archiviodistatoprato.cultura.gov.it/servizi/autorizzazioni-a-pubblicare).')"
-            [active]="secondaryContent === 'Info'"></evt-button>
         <evt-page-selector [pageID]="pageID" (selectionChange)="currentPage$.next($event)"></evt-page-selector>
         <evt-edition-level-selector [class.hidden]="hideEditionLevelSelector" [editionLevelID]="editionLevelID" (selectionChange)="currentEdLevel$.next($event)"></evt-edition-level-selector>
+        <evt-button
+        label="Info"
+        [iconLeft]="{icon: 'info-circle'}"
+        additionalClasses="btn-primary mr-1"
+        class="info-panel"
+        (btnClick)="toggleSecondaryContent('Le immagini sono pubblicate su concessione del Ministero della cultura – Archivio di Stato di Prato e sono liberamente utilizzabili per attività di studio, ricerca, libera manifestazione del pensiero o espressione creativa, promozione della conoscenza del patrimonio culturale. I diritti di riproduzione delle immagini pubblicate – ai sensi degli articoli 106, 107 e 108 del Codice dei beni culturali e del paesaggio (D.Lgs. 42/2004 e s.m.i.) – appartengono dell’Archivio di Stato di Prato, pertanto tutti gli usi di queste immagini, diversi da quelli sopra esposti, debbono essere espressamente autorizzati (https://archiviodistatoprato.cultura.gov.it/servizi/autorizzazioni-a-pubblicare).')"
+        [active]="secondaryContent === 'Info'"></evt-button>
     </div>
     <div content evtAnnotator #mainContent>
         <ng-container *ngIf="(currentStatus$ | async) as currentStatus">

src/app/services/themes.service.ts

@@ -9,6 +9,10 @@ export class ThemesService {
 
     constructor() {
         this.themes = [
+            {
+                value: 'restore',
+                label: 'themeRestore',
+            },
             {
                 value: 'classic',
                 label: 'themeClassic',
@@ -21,10 +25,6 @@ export class ThemesService {
                 value: 'modern',
                 label: 'themeModern',
             },
-            {
-                value: 'restore',
-                label: 'themeRestore',
-            },
         ];
         this.selectTheme(this.themes[0]);
     }

src/assets/config/edition_config.json

@@ -1,7 +1,7 @@
 {
 	"editionTitle": "Edizione Digitale - Carteggio Datini",
-	"badge": "alpha",
-	"editionHome": "http://restore.ovi.cnr.it/beta",
+	"badge": "",
+	"editionHome": "http://restore.ovi.cnr.it/",
 	"showLists": true,
 	"availableEditionLevels": [
 		{
@@ -56,7 +56,7 @@
 	],
 	"lemsSelectItems": [
 		{
-			"label": "Categorie lessicali",
+			"label": "Categorie grammaticali",
 			"items": [
 				{
 					"value": "w[pos='s.m.']",
@@ -87,11 +87,6 @@
 					"value": "w[pos='v.']",
 					"label": "Verbo",
 					"color": "rgba(148,162,173)"
-				},
-				{
-					"value": "w",
-					"label": "Forma generica",
-					"color": "#ffcdd2"
 				}
 			]
 			

src/assets/config/ui_config.json

@@ -13,8 +13,8 @@
 			"enabled": true
 		}
 	],
-	"enableNavBar": true,
-	"initNavBarOpened": true,
-	"thumbnailsButton": true,
-	"viscollButton": false
+	"enableNavBar": false,
+	"initNavBarOpened": false,
+	"thumbnailsButton": false,
+	"viscollButton": true
 }

src/assets/i18n/en.json

@@ -5,6 +5,7 @@
     "languageIt": "Italian",
     "changeTheme": "Change theme",
     "currentTheme": "Current theme",
+    "themeRestore": "Restore",
     "themeNeutral": "Neutral",
     "themeModern": "Modern",
     "themeClassic": "Classic",

src/assets/i18n/it.json

@@ -4,6 +4,7 @@
     "languageEn": "Inglese",
     "languageIt": "Italiano",
     "changeTheme": "Cambia tema",
+    "themeRestore": "Restore",
     "themeNeutral": "Neutro",
     "themeModern": "Moderno",
     "themeClassic": "Classico",

src/assets/scss/_themes.scss

@@ -1,4 +1,22 @@
 $themes: (
+    restore: (
+        baseColorDark: #891c25,
+        baseColorLight: #e9e9e9,
+        baseBorder: rgba(0, 0, 0, 0.125),
+        secondaryColorDark: rgb(120, 58, 58),
+        secondaryColorLight: #e9e9e9,
+        panelBackgroundColor: #fff,
+        panelTextColor: rgb(70, 46, 46),
+        panelSecondaryBackgroundColor: rgba(236, 239, 241, 0.95),
+        toolsBackground: #e9e9e9,
+        toolsColor: #891c25,
+        toolsBackgroundDarker: #ccc4ba,
+        toolsColorActive: white,
+        appEntryBoxBackground: #f9f7f5,
+        appEntryBoxActiveTabBg: #f2ede9,
+        mainHeaderBackground: white,
+        mainHeaderColor: #891c25
+    ),
     neutral: (
         baseColorDark: #45535a,
         baseColorLight: #fff,
@@ -46,23 +64,7 @@ $themes: (
         toolsColorActive: #ffdd00,
         appEntryBoxBackground: #f9f7f5,
         appEntryBoxActiveTabBg: #f2ede9,
-    ),
-    restore: (
-        baseColorDark: #4f1116,
-        baseColorLight: #e9e9e9,
-        baseBorder: rgba(0, 0, 0, 0.125),
-        secondaryColorDark: rgb(120, 58, 58),
-        secondaryColorLight: #e9e9e9,
-        panelBackgroundColor: #fff,
-        panelTextColor: rgb(70, 46, 46),
-        panelSecondaryBackgroundColor: rgba(236, 239, 241, 0.95),
-        toolsBackground: #e9e9e9,
-        toolsColor: rgb(63, 13, 13),
-        toolsBackgroundDarker: #ccc4ba,
-        toolsColorActive: #c41c22,
-        appEntryBoxBackground: #f9f7f5,
-        appEntryBoxActiveTabBg: #f2ede9,
-    ),
+    )
 );
 
 

src/index.html

@@ -8,6 +8,50 @@
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
 <body>
-  <evt-root></evt-root>
+  <evt-root>
+  </evt-root>
+  <footer id="footerz" class="footerz">
+      <div class="container">
+        <div class="row">
+          <div class="col-lg-3 h-100 text-center text-lg-left my-auto">
+            <p class="small mb-4 mb-lg-0">© RESTORE 2022. All Rights Reserved.</p>
+          </div>
+          <div class="col-lg-9 h-100 text-center my-auto">
+            <ul class="partner-list list-inline mb-0">
+              <li class="list-inline-item mr-3">
+                <a href="https://www.cnr.it/">
+                  <img class="img-logo" src="assets/images/logo/CNR.png">
+                </a>
+              </li>
+              <li class="list-inline-item mr-3">
+                <a href="https://www.regione.toscana.it/">
+                  <img class="img-logo" src="assets/images/logo/RegioneToscana.jpg">
+                </a>
+              </li>
+              <li class="list-inline-item mr-3">
+                <a href="https://europa.eu/">
+                  <img class="img-logo" src="assets/images/logo/European-Union.png">
+                </a>
+              </li>
+              <li class="list-inline-item mr-3">
+                <a href="http://www.governo.it/">
+                  <img class="img-logo" src="assets/images/logo/RepubblicaItaliana.png">
+                </a>
+              </li>
+              <li class="list-inline-item mr-3">
+                <a href="https://www.regione.toscana.it/por-fse-2014-2020">
+                  <img class="img-logo" src="assets/images/logo/POR-FSE-Regione-Toscana.png">
+                </a>
+              </li>
+              <li class="list-inline-item">
+                <a href="https://giovanisi.it/">
+                  <img class="img-logo" src="assets/images/logo/GiovaniSi.png">
+                </a>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+  </footer>
 </body>
 </html>

src/styles.scss

@@ -35,12 +35,12 @@
 
 html,
 body {
-    height: 100%;
+    height: 97%;
 }
 
-body {
-    overflow: hidden;
-}
+// body {
+//      overflow: visible !important;
+// }
 
 .edition-font {
     font-family: Junicode, Times, serif;
@@ -81,6 +81,13 @@ body {
             background-color: themed("toolsBackground") !important;
             color: themed("toolsColor");
         }
+    }            
+
+    html body evt-root evt-main-header nav.navbar.justify-content-between.temp-header {
+        @include themify($themes) {
+            background-color: themed("mainHeaderBackground") !important;
+            color: themed("mainHeaderColor");
+        }
     }
 
     .ng-arrow-wrapper {
@@ -276,4 +283,133 @@ evt-lemmatized-entity.ng-star-inserted div.ne-detail-content.ng-star-inserted {
 span.iperlemmatizedEntityRef.w.highlight {
     font-weight: 700;
 }
+.btn {
+    &.active {
+        @include themify($themes) {
+            background: themed("toolsColorActive") !important;
+        }
+    }
+}
+// evt-main-header {
+//     overflow: visible !important;
+// }
+
+html body evt-root evt-main-header nav.navbar.justify-content-between.temp-header div evt-button.ng-star-inserted button.btn.btn-sm.btn-no-border.viewMode-btn.btn-light.btn-inverted.btn-hovered.shadow-sm.active evt-icon.ng-star-inserted span.evt-icon-imgTxt.viewMode-selector.icon.ng-star-inserted {
+    
+    color: white;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, .4) !important;
+    // @include themify($themes) {
+    //     color: themed("toolsColorActive");
+    //     background-color: themed("toolsBackground");
+    // }
+}
+
+// .btn {
+//     outline: none;
+//     border: none;
+
+//     &[disabled]{
+//         cursor: default;
+//     }
+
+//     &.btn-sm {
+//         height: 31px;
+//     }
+
+//     &:focus {
+//         box-shadow: none;
+//     }
+
+//     @include themify($themes) {
+//         color: themed("toolsColor");
+//         background-color: themed("toolsBackground");
+//         border-color: themed("toolsBackground");
+//     }
+
+//     &:hover:not([disabled]) {
+//         @include set("box-shadow", "1px 2px 3px rgba(0, 0, 0, .4) inset !important");
+//     }
+
+//     &.active {
+//         @include themify($themes) {
+//             background: themed("toolsColorActive") !important;
+//         }
+//     }
+
+//     &.transparent {
+//         background: none !important;
+//         border-color: transparent !important;
+
+//         &.active {
+//             @include themify($themes) {
+//                 color: themed("toolsColorActive");
+//             }
+//         }
+//     }
+
+//     &.btn-inverted {
+//         background: transparent;
+//         border: none;
+//         box-shadow: none;
+
+//         @include themify($themes) {
+//             color: themed("toolsBackground");
+//             background-color: themed("toolsColor");
+//             border-color: themed("toolsColor");
+
+//             &:hover,
+//             &.btn-hovered {
+//                 background: rgba(themed("toolsBackground"), 0.2);
+//             }
+//         }
+//     }
+
+//     &.btn-floating {
+//         @include set("box-shadow", "0 2px 4px rgba(0, 0, 0, .4) !important");
+//         @include themify($themes) {
+//             color: themed("toolsBackground");
+//             background-color: themed("toolsColor");
+//             border-color: themed("toolsColor");
+//         }
+//         &:hover {
+//             @include set("box-shadow", "none !important");
+//         }
+//         &.rounded-circle {
+//             height: 40px;
+//             width: 40px;
+//         }
+//     }
+// }
 
+footer.footerz {
+    position: absolute !important;
+    width: 100%;
+    height: 3em;
+    background-color: #891c25;
+    color: white;
+    // padding-top: 2px;
+    a {
+      color: white;
+    }
+    .partner-list {
+      background-color: rgba(250,250,250,.5);
+      border-radius: 6px;
+      padding: 1px 2px;
+    }
+    .img-logo{
+        height: 2em;
+        padding: 1px;
+    }
+    .container {
+        padding: 4px;
+    }
+    
+}
+
+html body footer#footerz.footerz div.container div.row div.col-lg-9.h-100.text-center.my-auto{
+    padding-left: 400px !important;
+}
+// evt-root {
+//     position: relative !important;
+//     min-height: 100vh;
+// }