Project

General

Profile

« Previous | Next » 

Revision 58565

Added by Argiro Kokogiannaki almost 4 years ago

[Connect Trunk]

customization.css: remove border radius css
connect css: add border radius for subscribe buttons

Zenodo Communities:
add breadcrumb
use communityId for helptexts

View differences:

modules/uoa-connect-portal/trunk/src/app/deposit/zenodo/shareInZenodo.module.ts
16 16 
import {PiwikServiceModule} from "../../openaireLibrary/utils/piwik/piwikService.module";
17 17 
import {Schema2jsonldModule} from "../../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
18 18 
import {SEOServiceModule} from "../../openaireLibrary/sharedComponents/SEO/SEOService.module";
19 
import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
19 20 

  		




  20
  21
  
    
@NgModule({


  		




  21
  22
  
    
  imports: [


  		




  22
  
  
    
    CommonModule,ShareInZenodoRoutingModule, ZenodoCommunitiesServiceModule, SearchZenodoCommunitiesServiceModule,


  		




  
  23
  
    
    CommonModule, ShareInZenodoRoutingModule, ZenodoCommunitiesServiceModule, SearchZenodoCommunitiesServiceModule,


  		




  23
  24
  
    
    RouterModule, HelperModule,


  		




  24
  
  
    
    PiwikServiceModule, Schema2jsonldModule, SEOServiceModule


  		




  
  25
  
    
    PiwikServiceModule, Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule


  		




  25
  26
  
    
  ],


  		




  26
  27
  
    
  declarations: [


  		




  27
  28
  
    
    ShareInZenodoComponent


  		












  

    
      modules/uoa-connect-portal/trunk/src/app/deposit/zenodo/shareInZenodo.component.html
    
  





  2
  2
  
    
  <div class="uk-section uk-padding-remove-bottom uk-padding-remove-top">


  		




  3
  3
  
    
      <div class="communityPanelBackground uk-margin-top uk-padding-small">


  		




  4
  4
  
    
        <div class="uk-container uk-container-large uk-margin-top uk-margin-bottom">


  		




  5
  
  
    
          <ul class="uk-breadcrumb">


  		




  
  5
  
    
         <!-- <ul class="uk-breadcrumb">


  		




  6
  6
  
    
            <li><a class="breadcrumb" routerLinkActive="router-link-active" routerLink="{{depositLearnHowPage}}"


  		




  7
  7
  
    
                   [queryParams]="properties.environment!='development'?{}:routerHelper.createQueryParam('communityId',communityId)">


  		




  8
  8
  
    
              Deposit


  		




  9
  9
  
    
            </a></li>


  		




  10
  10
  
    
            <li><span class="active">Deposit in Zenodo</span></li>


  		




  11
  
  
    
          </ul>


  		




  
  11
  
    
          </ul>-->


  		




  
  12
  
    
          <breadcrumbs [light]="true" [breadcrumbs]="breadcrumbs"></breadcrumbs>


  		




  12
  13
  
    
        </div>


  		




  13
  14
  
    
      </div>


  		




  14
  15
  
    
    </div>


  		




  15
  
  
    

  		




  16
  
  
    
    <div class=" uk-section  uk-margin-small-top tm-middle uk-container uk-container-large" id="tm-main">


  		




  
  16
  
    
  <div class="communityBackground">


  		




  
  17
  
    
    <div class=" uk-section  uk-margin-small-top tm-middle uk-container uk-container-large " id="tm-main">


  		




  17
  18
  
    
      <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" [texts]="pageContents['top']"></helper>


  		




  18
  19
  
    
      <div class="uk-container uk-container-large uk-margin-bottom">


  		




  19
  20
  
    
          <div class="uk-h2">


  		




  ......




  55
  56
  
    
<!--                          </a>-->


  		




  56
  57
  
    
<!--                    </div>-->


  		




  57
  58
  
    
        <span class="uk-width-expand uk-flex uk-flex-bottom uk-flex-right">


  		




  58
  
  
    
          <a [href]="depositLink + masterZenodoCommunity.id " target="_blank" type="submit" class="uk-float-right uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-small-left">


  		




  
  59
  
    
          <a [href]="depositLink + masterZenodoCommunity.id " target="_blank" type="submit"


  		




  
  60
  
    
             class=" zenodoButton uk-float-right uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-small-left">


  		




  59
  61
  
    
            <span><span>New upload</span><span uk-icon="arrow-right"></span></span>


  		




  60
  62
  
    
          </a>


  		




  61
  63
  
    
        </span>


  		




  ......




  108
  110
  
    
<!--                          </a>-->


  		




  109
  111
  
    
<!--                    </div>-->


  		




  110
  112
  
    
        <span class="uk-width-expand uk-flex uk-flex-bottom uk-flex-right">


  		




  111
  
  
    
          <a [href]="depositLink + item.id " target="_blank" type="submit" class="uk-float-right uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-small-left">


  		




  
  113
  
    
          <a [href]="depositLink + item.id " target="_blank" type="submit"


  		




  
  114
  
    
             class=" zenodoButton uk-float-right uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-small-left">


  		




  112
  115
  
    
            <span><span>New upload</span><span uk-icon="arrow-right"></span></span>


  		




  113
  116
  
    
          </a>


  		




  114
  117
  
    
        </span>


  		




  ......




  122
  125
  
    
      </div>


  		




  123
  126
  
    
      <helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0" [texts]="pageContents['bottom']"></helper>


  		




  124
  127
  
    
    </div>


  		




  
  128
  
    
</div>


  		












  

    
      modules/uoa-connect-portal/trunk/src/app/deposit/zenodo/shareInZenodo.component.ts
    
  





  16
  16
  
    
import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service";


  		




  17
  17
  
    
import {PiwikService} from "../../openaireLibrary/utils/piwik/piwik.service";


  		




  18
  18
  
    
import {PiwikHelper} from "../../utils/piwikHelper";


  		




  
  19
  
    
import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";


  		




  19
  20
  
    

  		




  20
  21
  
    
@Component({


  		




  21
  22
  
    
  selector: 'share-in-zenodo',


  		




  ......




  50
  51
  
    
  depositLink = "https://zenodo.org/deposit/new?c=";


  		




  51
  52
  
    
  depositLearnHowPage: string = null;


  		




  52
  53
  
    
  public routerHelper:RouterHelper = new RouterHelper();


  		




  53
  
  
    

  		




  
  54
  
    
  breadcrumbs:Breadcrumb[] = [];


  		




  54
  55
  
    
  constructor(private  route: ActivatedRoute,


  		




  55
  56
  
    
              private _router: Router,


  		




  56
  57
  
    
              private _meta: Meta,


  		




  ......




  76
  77
  
    
        this.updateDescription("Zenodo, repository, deposit, share");


  		




  77
  78
  
    

  		




  78
  79
  
    
        this.properties = data.envSpecific;


  		




  79
  
  
    

  		




  80
  80
  
    
        this.route.queryParams.subscribe(params => {


  		




  81
  81
  
    
          this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain);


  		




  82
  82
  
    
          if (!this.communityId) {


  		




  ......




  90
  90
  
    
          }


  		




  91
  91
  
    

  		




  92
  92
  
    
          this.depositLearnHowPage = this.properties.depositLearnHowPage;


  		




  
  93
  
    
          this.breadcrumbs.push({name: 'home', route: '/'}, {name: "Deposit", route: this.depositLearnHowPage},{name:"Deposit in zenodo",route:null});


  		




  
  94
  
    

  		




  93
  95
  
    
          //this.getDivContents();


  		




  94
  96
  
    
          this.getPageContents();


  		




  95
  97
  
    
          if (this.communityId && this.communityId != '') {


  		




  ......




  162
  164
  
    
  }


  		




  163
  165
  
    

  		




  164
  166
  
    
  private getPageContents() {


  		




  165
  
  
    
    this.helper.getPageHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {


  		




  
  167
  
    
    this.helper.getPageHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {


  		




  166
  168
  
    
      this.pageContents = contents;


  		




  167
  169
  
    
    })


  		




  168
  170
  
    
  }


  		




  169
  171
  
    

  		




  170
  172
  
    
  private getDivContents() {


  		




  171
  
  
    
    this.helper.getDivHelpContents(this.properties, 'connect', this._router.url).subscribe(contents => {


  		




  
  173
  
    
    this.helper.getDivHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {


  		




  172
  174
  
    
      this.divContents = contents;


  		




  173
  175
  
    
    })


  		




  174
  176
  
    
  }


  		












  

    
      modules/uoa-connect-portal/trunk/src/assets/connect-custom.css
    
  





  257
  257
  
    

  		




  258
  258
  
    
#subscribeBtn > * > button, #inviteBtn > * > button {


  		




  259
  259
  
    
    border-right: none;


  		




  260
  
  
    
    border-top-right-radius: 0;


  		




  261
  
  
    
    border-bottom-right-radius: 0;


  		




  
  260
  
    
    /*border-top-right-radius: 0;*/


  		




  
  261
  
    
    /*border-bottom-right-radius: 0;*/


  		




  
  262
  
    
    border-radius: 4px 0px 0px 4px;


  		




  262
  263
  
    
    box-shadow: 0px 2px 6px #00000038;


  		




  263
  264
  
    
    /*background-color: var(--portal-main-color);*/


  		




  264
  265
  
    
}


  		












  

    
      modules/uoa-connect-portal/trunk/src/assets/customization.css
    
  





  113
  113
  
    
}


  		




  114
  114
  
    

  		




  115
  115
  
    
.uk-button:not(.uk-button-text) {


  		




  116
  
  
    
    border-radius: 4px;


  		




  
  116
  
    
    /*border-radius: 4px;*/


  		




  117
  117
  
    
}


  		




  118
  118
  
    

  		




  119
  119
  
    
/*.uk-button:not(.uk-button-text):not(.uk-button-default):not(.uk-button-primary),


  		




  ......




  135
  135
  
    

  		




  136
  136
  
    
.communityPanelBackground .uk-button:not(.ignoreCommunityPanelBackground) {


  		




  137
  137
  
    
    background-color: #ffffff !important;


  		




  138
  
  
    
    color: #4C9CD5 !important;


  		




  
  138
  
    
    /*color: #4C9CD5 !important;*/


  		




  
  139
  
    
    color: black !important;


  		




  139
  140
  
    
    border-color: #ffffff !important;


  		




  140
  141
  
    
    border-style: solid !important;


  		




  141
  142
  
    
    border-width: 1px !important;


  		




  142
  
  
    
    border-radius: 4px !important;


  		




  
  143
  
    
    /*border-radius: 4px !important;*/


  		




  143
  144
  
    
}


  		




  144
  145
  
    

  		




  145
  146
  
    
.communityPanelBackground .uk-button:not(.ignoreCommunityPanelBackground):hover {


  		




  146
  147
  
    
    background-color: #eeeeee !important;


  		




  147
  
  
    
    color: #4C9CD5 !important;


  		




  
  148
  
    
    /*color: #4C9CD5 !important;*/


  		




  
  149
  
    
    color: black !important;


  		




  148
  150
  
    
    border-color: #eeeeee !important;


  		




  149
  151
  
    
}


  		




  150
  152
  
    

  		












Also available in:  Unified diff