Merge branch 'master' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot

This commit is contained in:
annampak 2017-11-07 18:08:47 +02:00
commit 42f002af40
6 changed files with 39 additions and 24 deletions

View File

@ -33,7 +33,10 @@ const appRoutes: Routes = [
imports: [
RouterModule.forRoot(
appRoutes
// { enableTracing: true } // <-- debugging purposes only
,{
useHash: true
//,enableTracing: true <-- debugging purposes only
}
)
],
exports: [

View File

@ -81,19 +81,25 @@
padding-bottom: 500px;
*/
z-index: 1;
overflow-x: hidden;
height: 100%;
width: 0px;
top: 0px;
left: 0px;
background-color: #111;
background-color: #f8f8f8;
transition: 0.5s;
padding-top: 60px;
}
.sidenav.expanded{
width: 15%;
border-style: solid;
border-width: thin;
}
#appBody {
@ -116,7 +122,7 @@
}
.sidenav a:hover {
color: #f1f1f1;
color: #000;
}
.sidenav .closebtn {

View File

@ -46,8 +46,12 @@
<!--<a href="javascript:void(0)" class="closebtn" (click)='slideNav()'>&times;</a>-->
<a class="cursor">My Workspace</a>
<a class="cursor">Orphan Datasets</a>
<a class="cursor">Clients</a>
<a class="cursor">Contact</a>
<a class="cursor">...</a>
<a class="cursor">Basically</a>
<a class="cursor">George</a>
<a class="cursor">tell us</a>
<a class="cursor">what to</a>
<a class="cursor">put here</a>
</div>
<div id="appBody" class="child_div">
@ -58,8 +62,8 @@
-->
<!--this should be invisible -->
<!--
<app-main-sign-in [ngClass]="'invisible'"></app-main-sign-in>
<!--
-->
</div>

View File

@ -167,7 +167,7 @@ updateDMP(){
}
cloneDMP(dmp){
dmp = {"id": dmp.id};
dmp = {"id": dmp.id, "label": dmp.label};
this.serverService.cloneDmp(dmp).subscribe(
response => {
simple_notifier("success",null,"Successfully cloned the DMP");

View File

@ -1,4 +1,4 @@
import { Component, OnInit, ElementRef, AfterViewInit, VERSION } from '@angular/core';
import { Component, OnInit, ElementRef, AfterViewInit, VERSION, Injectable } from '@angular/core';
import { TokenService, TokenProvider } from '../../services/login/token.service';
import {Router} from '@angular/router';
@ -14,15 +14,31 @@ declare function simple_notifier(type: string, title: string, message:string): a
templateUrl: './googgle-sign-in.component.html',
styleUrls: ['./googgle-sign-in.component.css']
})
export class GooggleSignInComponent implements OnInit, AfterViewInit {
export class GooggleSignInComponent implements OnInit, AfterViewInit, Injectable {
fixedRendering : boolean = false;
constructor(private element: ElementRef, private tokenService : TokenService, private router : Router) {
}
ngOnInit() {
//this.googleInit();
}
ngAfterViewInit() {
/*
$( window ).on( "load", function(){
if($("#googleBtn").length == 0) {
alert("GoogleButton found");
}
});
*/
this.googleInit();
}
@ -70,21 +86,7 @@ export class GooggleSignInComponent implements OnInit, AfterViewInit {
ngAfterViewInit() {
/*
$( window ).on( "load", function(){
if($("#googleBtn").length == 0) {
alert("GoogleButton found");
}
});
*/
this.googleInit();
}
}