Project

General

Profile

« Previous | Next » 

Revision 51030

1. Properties file changes.
2. Aggregation details / aggregation object add.
3. Other changes from stef

View differences:

ShowEventsWidget.java
52 52
//    private FlowPanel showEventsListColPanel = new FlowPanel();
53 53
//    private FlowPanel showEventsInnerPanel = new FlowPanel();
54 54
//    private FlowPanel showEventsBox = new FlowPanel();
55
    private HTML title = new HTML();
55 56
    private FlowPanel showEventsBoxContent = new FlowPanel();
56 57

  
57 58
//    private FlowPanel showAdvancedSearchColPanel = new FlowPanel();
......
69 70

  
70 71
        super();
71 72

  
72
        HTML title = new HTML("<h1 class=\"uk-article-title\">Events for topic " + topic + "</h1>");
73 73
        title.addStyleName("uk-margin-medium-bottom");
74 74
        contentPanel.add(title);
75 75

  
......
137 137

  
138 138
        Document.get().getElementById("headerNoTransparent").removeClassName("tm-header-transparent");
139 139

  
140
        title.setHTML("<h1 class=\"uk-article-title\">" + dataSource + "</h1><div class=\"uk-text uk-text-small uk-text-secondary\">" +
141
                topic.replace("/", "  |  ") + "</div>");
142

  
140 143
        advQueryObject.setDatasource(dataSource);
141 144
        advQueryObject.setTopic(topic);
142 145

  
......
218 221

  
219 222
        final FlowPanel advancedSearch = new FlowPanel();
220 223
        advancedSearch.addStyleName("enrichContentAdvancedSearch uk-card uk-card-body uk-card-default sidemenu");
221
        advancedSearch.add(new HTML("<h4 class=\"uk-h4 uk-text-primary uk-scrollspy-inview uk-animation-slide-top-medium\"" +
222
                "uk-scrollspy-class=\"\"><span>Advanced search</span></h4>"));
224
        advancedSearch.add(new HTML("<h6 class=\"uk-h6 uk-text-primary uk-scrollspy-inview uk-animation-slide-top-medium\"" +
225
                "uk-scrollspy-class=\"\"><span>Tweak and refine events</span></h4>"));
223 226
        advancedSearch.add(enrichContentAdvancedSearchForm.asWidget());
224 227

  
225 228
        return advancedSearch;
......
300 303
                to = eventsPage.getTotal();
301 304

  
302 305
            HTML numberOfResultsLabel = new HTML("<span>Showing " + from + "-" + to + " of " + eventsPage.getTotal() + " results</span>" +
303
                    "<span class=\"uk-float-right\"><button id=\"subscribe\" style=\"\" type=\"button\" class=\"uk-button btn-success\">" +
304
                    "Subscribe to these events</button></span>");
306
                    "<span class=\"uk-float-right\"><button id=\"subscribe\" style=\"\" type=\"button\" class=\"uk-button " +
307
                    "uk-button-primary uk-button-small\">Subscribe to these events</button></span>");
305 308
            numberOfResultsLabel.addStyleName("numberOfEventsLabel");
306 309
            eventsList.add(numberOfResultsLabel);
307 310

  
......
399 402

  
400 403
        // ID
401 404
        payloadContent += "<tr class=\"el-item\">" +
402
                "<td class=\"uk-table-shrink\">" +
405
                "<td class=\"uk-table-shrink uk-width-1-4\">" +
403 406
                "<strong class=\"el-title uk-display-block\">ID</strong>" +
404 407
                "</td>" +
405 408
                "<td class=\"uk-table-shrink\">\n" +
......
409 412

  
410 413

  
411 414
        // TITLES
412
        payloadContent += "<tr class=\"el-item\"><td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
415
        payloadContent += "<tr class=\"el-item\"><td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
413 416
                "Title(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
414 417

  
415 418
        for(int i=0; i<openAireEventPayload.getPublication().getTitles().size(); i++) {
......
421 424

  
422 425

  
423 426
        // AUTHORS
424
        payloadContent += "<tr class=\"el-item\"><td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
427
        payloadContent += "<tr class=\"el-item\"><td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
425 428
                "Author(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
426 429

  
427 430
        for(int i=0; i<openAireEventPayload.getPublication().getCreators().size(); i++) {
428 431
            if(i!=0)
429
                payloadContent += "<br>";
432
                payloadContent += " | ";
430 433
            payloadContent += "<span>" + openAireEventPayload.getPublication().getCreators().get(i) + "</span>";
431 434
        }
432 435
        payloadContent += "</div></td></tr>";
......
439 442
            payloadContent += "<tr class=\"el-item\">";
440 443
        }
441 444

  
442
        payloadContent += "<td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
445
        payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
443 446
                "PID(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
444 447

  
445 448
        for(Pid pid : openAireEventPayload.getPublication().getPids()) {
......
478 481
            payloadContent += "<tr class=\"el-item\">";
479 482
        }
480 483

  
481
        payloadContent += "<td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
484
        payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
482 485
                "Abstract(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
483 486

  
484 487
        for(int i=0; i<openAireEventPayload.getPublication().getAbstracts().size(); i++) {
......
512 515
            payloadContent += "<tr class=\"el-item\">";
513 516
        }
514 517

  
515
        payloadContent += "<td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
518
        payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
516 519
                "Project(s)/Relation(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
517 520

  
518 521
        for(int i=0; i<openAireEventPayload.getPublication().getProjects().size(); i++) {
......
544 547

  
545 548
        // SUBJECTS
546 549
        if(openAireEventPayload.getHighlight().getSubjects()!=null && !openAireEventPayload.getHighlight().getSubjects().isEmpty()) {
550

  
547 551
            payloadContent += "<tr class=\"el-item success\">";
548
        } else {
549
            payloadContent += "<tr class=\"el-item\">";
550
        }
551 552

  
552
        payloadContent += "<td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
553
                "Subject(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
553
            payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
554
                    "Subject(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
554 555

  
555
        for(int i=0; i<openAireEventPayload.getPublication().getSubjects().size(); i++) {
556
            if(i!=0)
557
                payloadContent += "<br>";
558
            payloadContent += "<span>" + openAireEventPayload.getPublication().getSubjects().get(i) + "</span>";
556
            for(int i=0; i<openAireEventPayload.getPublication().getSubjects().size(); i++) {
557
                if(i!=0)
558
                    payloadContent += "<br>";
559
                payloadContent += "<span>" + openAireEventPayload.getPublication().getSubjects().get(i) + "</span>";
559 560

  
560
            if(openAireEventPayload.getHighlight().getSubjects()!=null && !openAireEventPayload.getHighlight().getSubjects().isEmpty()
561
                    && openAireEventPayload.getProvenance()!=null) {
561
                if(openAireEventPayload.getHighlight().getSubjects()!=null && !openAireEventPayload.getHighlight().getSubjects().isEmpty()
562
                        && openAireEventPayload.getProvenance()!=null) {
562 563

  
563
                payloadContent += "<span class=\"pull-right\">" +
564
                        "<b>from: </b>";
565
                if (openAireEventPayload.getProvenance().getUrl() != null) {
566
                    payloadContent += "<a href=\"" + openAireEventPayload.getProvenance().getUrl() + "\" target=\"_blank\">" +
567
                            openAireEventPayload.getProvenance().getRepositoryName() + "</a>";
564
                    payloadContent += "<span class=\"pull-right\">" +
565
                            "<b>from: </b>";
566
                    if (openAireEventPayload.getProvenance().getUrl() != null) {
567
                        payloadContent += "<a href=\"" + openAireEventPayload.getProvenance().getUrl() + "\" target=\"_blank\">" +
568
                                openAireEventPayload.getProvenance().getRepositoryName() + "</a>";
569
                    }
570
                    if (openAireEventPayload.getProvenance().getId() != null) {
571
                        payloadContent += "<span> (ID: " + openAireEventPayload.getProvenance().getId() + ")</span>";
572
                    }
573

  
574
                    payloadContent += "</span>";
568 575
                }
569
                if (openAireEventPayload.getProvenance().getId() != null) {
570
                    payloadContent += "<span> (ID: " + openAireEventPayload.getProvenance().getId() + ")</span>";
571
                }
576
            }
577
            payloadContent += "</div></td></tr>";
572 578

  
573
                payloadContent += "</span>";
579
        } else {
580

  
581
            payloadContent += "<tr class=\"el-item\">";
582

  
583
            payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
584
                    "Subject(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
585

  
586
            for(int i=0; i<openAireEventPayload.getPublication().getSubjects().size(); i++) {
587
                if(i!=0)
588
                    payloadContent += ", ";
589
                payloadContent += "<span>" + openAireEventPayload.getPublication().getSubjects().get(i) + "</span>";
590

  
574 591
            }
592
            payloadContent += "</div></td></tr>";
575 593
        }
576
        payloadContent += "</div></td></tr>";
577 594

  
578 595

  
579 596
        // PUBLICATION DATE
......
584 601
            payloadContent += "<tr class=\"el-item\">";
585 602
        }
586 603

  
587
        payloadContent += "<td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
604
        payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
588 605
                "Publication date</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">" +
589 606
                openAireEventPayload.getPublication().getPublicationdate() +
590 607
                "</div></td></tr>";
......
598 615
            payloadContent += "<tr class=\"el-item\">";
599 616
        }
600 617

  
601
        payloadContent += "<td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
618
        payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
602 619
                "Rights</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
603 620

  
604 621
        for(int i=0; i<openAireEventPayload.getPublication().getInstances().size(); i++) {
......
682 699

  
683 700
                FlowPanel modalContent = new FlowPanel();
684 701

  
685
                HTML title = new HTML("<h2 class=\"uk-modal-title\">Create subscription</h2>\n");
702
                HTML title = new HTML("<h2 class=\"uk-modal-title\">Create subscription for</h2>\n");
686 703
                modalContent.add(title);
687 704

  
688 705
                final EventsSubscriptionForm eventsSubscriptionForm = new EventsSubscriptionForm(advQueryObject);
......
727 744
                                public void onSuccess(Subscription result) {
728 745

  
729 746
                                    successAlert.setVisible(true);
730
                                    successAlert.setText("A subscription for these events was created successfully");
747
                                    successAlert.setText("Your subscription was successful");
731 748

  
732 749
                                    subscribeToEvents.hide();
733 750
                                    subscribeToEvents.removeFromParent();

Also available in: Unified diff