From c5b1cbbab6a44ea2fc7cd440ee48861443a986a8 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Fri, 11 May 2018 14:38:05 +0000 Subject: [PATCH] add FAB link also in Projects | change landing page widths also for pr, org, dp | fix FAB link z-index, drop down position when scrolling | fix cookie law z-index to be behind FAB link git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52011 d315682c-612b-4755-9ff5-7f18f6832af3 --- app.component.ts | 6 ++-- app.module.ts | 2 ++ .../dataProvider/dataProvider.component.html | 4 +-- landingPages/dataset/dataset.component.html | 5 +-- .../landing-utils/tabTable.component.ts | 2 +- .../organization/organization.component.html | 4 +-- landingPages/project/project.component.html | 35 ++++++++++++++++--- .../publication/publication.component.html | 5 +-- landingPages/software/software.component.html | 5 +-- sharedComponents/cookie-law/cookie-law.css | 2 +- 10 files changed, 51 insertions(+), 19 deletions(-) diff --git a/app.component.ts b/app.component.ts index 64ae88dd..8ffb3be4 100644 --- a/app.component.ts +++ b/app.component.ts @@ -33,7 +33,7 @@ import{MenuItem,RootMenuItem} from './sharedComponents/menu'; - OpenAIRE uses cookies in order to function properly.
Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing experience possible. @@ -41,7 +41,7 @@ import{MenuItem,RootMenuItem} from './sharedComponents/menu';
- + ` @@ -53,7 +53,7 @@ export class AppComponent { constructor(private config: ConfigurationService, private route: ActivatedRoute, private propertiesService:EnvironmentSpecificService) { } - + assetsPath = "assets/"; userMenuItems:MenuItem[] = [ new MenuItem("","My profile","","",false,[],[],{}), new MenuItem("","My claims","","/myclaims",false,[],["/myclaims"],{}), new MenuItem("","Manage all claims","","/claims",true,[],["/claims"],{})] diff --git a/app.module.ts b/app.module.ts index 7dd404e0..4d4b0903 100755 --- a/app.module.ts +++ b/app.module.ts @@ -9,6 +9,7 @@ import { RouterModule } from '@angular/router'; import { AppComponent } from './app.component'; import {NavigationBarModule} from './sharedComponents/navigationBar.module'; import { CookieLawModule } from './sharedComponents/cookie-law/cookie-law.module'; +import { BottomModule } from './sharedComponents/bottom.module'; // import { ErrorModule } from './error/error.module'; import { ConfigurationService } from './utils/configuration/configuration.service'; import {MainSearchModule} from './searchPages/find/mainSearch.module'; @@ -65,6 +66,7 @@ import { AppRoutingModule } from './app-routing.module'; SharedModule, NoopAnimationsModule, CommonModule, + CookieLawModule, BottomModule, HttpModule, NavigationBarModule, CookieLawModule, diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index 82a14f24..8faa269f 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -9,7 +9,7 @@
-
+
-
+
- + diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html index a186b43b..3d7cc302 100644 --- a/landingPages/organization/organization.component.html +++ b/landingPages/organization/organization.component.html @@ -8,7 +8,7 @@
-
+
{{organizationInfo.name}}
Organization @@ -143,7 +143,7 @@
-
+
Share - Bookmark diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html index 66f2fae0..5b1f5af3 100644 --- a/landingPages/project/project.component.html +++ b/landingPages/project/project.component.html @@ -8,7 +8,7 @@
-
+

@@ -284,7 +284,7 @@

-
+
Share - Bookmark @@ -372,7 +372,7 @@
-
    +
@@ -394,6 +394,33 @@
+ +
+
+ + + +
+ +
+
+
diff --git a/landingPages/publication/publication.component.html b/landingPages/publication/publication.component.html index ed2016ce..6efb4512 100644 --- a/landingPages/publication/publication.component.html +++ b/landingPages/publication/publication.component.html @@ -581,7 +581,7 @@
-
+
-
+