Project

General

Profile

« Previous | Next » 

Revision 50324

Various styling and design changes in the events pages

View differences:

modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/server/services/BrokerServiceImpl.java
192 192
        }
193 193
    }
194 194

  
195
    public Map<String,Term> getDnetTopics() throws BrokerException {
196
        return brokerApi.getDnetTopics();
197
    }
198

  
195 199
    /**
196 200
     * Helper class to aggregate the datasources topic sizes by datasource name.
197 201
     *
......
226 230
        return entries;
227 231
    }
228 232

  
229
    private Map<String,Term> getDnetTopics() throws BrokerException {
230
        return brokerApi.getDnetTopics();
231
    }
232

  
233 233
}
modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/shared/broker/NotificationMode.java
6 6
 * Created by stefanos on 10-Mar-17.
7 7
 */
8 8
public enum NotificationMode implements IsSerializable {
9
    MOCK, EMAIL
9
    EMAIL
10 10
}
modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/shared/Term.java
12 12
    public String encoding;
13 13
    public String code;
14 14

  
15
    public Term() {
16
    }
17

  
15 18
    public Term(String englishName, String nativeName, String encoding, String code) {
16 19
        this.englishName = englishName;
17 20
        this.nativeName = nativeName;
modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/client/services/BrokerService.java
3 3
import com.google.gwt.user.client.rpc.RemoteService;
4 4
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
5 5
import eu.dnetlib.repo.manager.shared.BrokerException;
6
import eu.dnetlib.repo.manager.shared.Term;
6 7
import eu.dnetlib.repo.manager.shared.broker.*;
7 8
import org.json.JSONException;
8 9

  
......
32 33
    void unsubscribe(List<String> subscriptionIds) throws BrokerException;
33 34

  
34 35
    Subscription getSubscription(String subscriptionId) throws BrokerException;
36

  
37
    Map<String,Term> getDnetTopics() throws BrokerException;
35 38
}
modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/SelectTopicWidget.java
10 10
import eu.dnetlib.gwt.client.help.HelpServiceAsync;
11 11
import eu.dnetlib.repo.manager.client.AbstractRepositoryManagerWidget;
12 12
import eu.dnetlib.repo.manager.client.HelpCallback;
13
import eu.dnetlib.repo.manager.client.RepositoryManager;
13 14
import eu.dnetlib.repo.manager.client.RepositoryManagerWidget;
14 15
import eu.dnetlib.repo.manager.client.services.BrokerService;
15 16
import eu.dnetlib.repo.manager.client.services.BrokerServiceAsync;
17
import eu.dnetlib.repo.manager.shared.Term;
16 18
import eu.dnetlib.repo.manager.shared.Tuple;
17 19
import eu.dnetlib.repo.manager.shared.broker.BrowseEntry;
18 20
import org.gwtbootstrap3.client.ui.Alert;
19 21
import org.gwtbootstrap3.client.ui.constants.AlertType;
20 22

  
21 23
import java.util.ArrayList;
24
import java.util.HashMap;
22 25
import java.util.List;
26
import java.util.Map;
23 27

  
24 28
/**
25 29
 * Created by stefania on 10/31/16.
......
34 38

  
35 39
    private Alert errorAlert = new Alert();
36 40

  
41
    public static Map<String, Term> topicsVocabulary = new HashMap<>();
42

  
37 43
    private static HelpServiceAsync helpService = GWT.create(HelpService.class);
38 44
    private static BrokerServiceAsync brokerService = GWT.create(BrokerService.class);
39 45

  
......
66 72
        Document.get().getElementById("headerNoTransparent").removeClassName("tm-header-transparent");
67 73
        selectTopicBoxContent.add(errorAlert);
68 74

  
69
        title.setHTML("<h1 class=\"uk-article-title\">Topics for " + restToken + "</h1>");
75
        title.setHTML("<h1 class=\"uk-article-title\">Enrichments for " + restToken + "</h1>");
70 76

  
71 77
        helpService.getHelpById(parentToken + "_selectTopic", new HelpCallback(helpPanel, gridPanel));
72 78

  
......
89 95
            }
90 96

  
91 97
            @Override
92
            public void onSuccess(List<BrowseEntry> browseEntries) {
98
            public void onSuccess(final List<BrowseEntry> browseEntries) {
93 99

  
94
                selectTopicBoxContent.removeStyleName("loading-big");
95
                selectTopicBoxContent.remove(loadingWheel);
100
                brokerService.getDnetTopics(new AsyncCallback<Map<String, Term>>() {
96 101

  
97
                final FlowPanel topicsList = new FlowPanel();
98
                createTopicsList(browseEntries, topicsList);
99
                selectTopicBoxContent.add(topicsList);
102
                    @Override
103
                    public void onFailure(Throwable throwable) {
104

  
105
                        selectTopicBoxContent.removeStyleName("loading-big");
106
                        selectTopicBoxContent.remove(loadingWheel);
107

  
108
                        errorAlert.setText("System error retrieving topics vocabulary.");
109
                        errorAlert.setVisible(true);
110
                    }
111

  
112
                    @Override
113
                    public void onSuccess(Map<String, Term> stringTermMap) {
114

  
115
                        topicsVocabulary.putAll(stringTermMap);
116

  
117
                        selectTopicBoxContent.removeStyleName("loading-big");
118
                        selectTopicBoxContent.remove(loadingWheel);
119

  
120
                        final FlowPanel topicsList = new FlowPanel();
121
                        createTopicsList(browseEntries, topicsList);
122
                        selectTopicBoxContent.add(topicsList);
123
                    }
124
                });
125

  
100 126
            }
101 127
        });
102 128
    }
......
171 197
        for(BrowseEntry browseEntry : browseEntries) {
172 198

  
173 199
            content += "<tr class=\"el-item\">" +
174
                    "<td class=\"uk-text-nowrap uk-table-shrink\">\n" +
200
                    "<td class=\"uk-table-shrink uk-width-4-5\">\n" +
175 201
                    "<a href=\"#" + parentToken + "/" + restToken + "/" + browseEntry.getValue() + "\" class=\"el-link\">" +
176
                    browseEntry.getValue() + "</a>" +
177
                    "</td>" +
178
                    "<td class=\"uk-text-nowrap uk-table-shrink\">\n" +
202
                    browseEntry.getValue() + "</a>";
203

  
204
            if(this.topicsVocabulary.get(browseEntry.getValue())!=null)
205
                content +=   "<div class=\"uk-text uk-text-meta\">" + this.topicsVocabulary.get(browseEntry.getValue()).getEnglishName() + "</div>";
206

  
207
            content += "</td>" +
208
                    "<td class=\"uk-text-nowrap uk-table-shrink uk-width-1-5\">\n" +
179 209
                    "<div class=\"el-title\">" + browseEntry.getSize() + "</div>" +
180 210
                    "</td>" +
181 211
                    "</tr>";
......
184 214
        }
185 215

  
186 216
        content += "<tr class=\"el-item footers\">" +
187
                "<td class=\"uk-text-nowrap uk-table-shrink\">\n" +
217
                "<td class=\"uk-text-nowrap uk-table-shrink uk-width-4-5\">\n" +
188 218
                "<div class=\"el-title\">Total</div>" +
189 219
                "</td>" +
190
                "<td class=\"uk-text-nowrap uk-table-shrink\">\n" +
220
                "<td class=\"uk-text-nowrap uk-table-shrink uk-width-1-5\">\n" +
191 221
                "<div class=\"el-title\">" + total + "</div>" +
192 222
                "</td>" +
193 223
                "</tr>";
modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/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();
modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/EventsSubscriptionForm.java
41 41
        errorLabel.setDismissable(false);
42 42
        subscriptionFormPanel.add(errorLabel);
43 43

  
44
        subscriptionFormPanel.add(new HTML("<h4 class=\"uk-h4\">" + this.advQueryObject.getDatasource() + "</h4>" +
45
                "<div class=\"uk-text uk-text-small uk-text-secondary\">" + this.advQueryObject.getTopic().replace("/", "  |  ") + "</div>"));
46

  
44 47
        subscriptionFormPanel.add(subscriptionForm);
45 48

  
46 49
        HTML userEmail = new HTML(RepositoryManager.currentUser.getEmail());
......
52 55
            frequencyListBox.addItem(notificationFrequency.name(), notificationFrequency.name());
53 56
        subscriptionForm.add(frequencyListFormGroup);
54 57

  
55
        modeListBox.addItem("-- none selected --", "noneSelected");
56
        for(NotificationMode notificationMode : NotificationMode.values())
57
            modeListBox.addItem(notificationMode.name(), notificationMode.name());
58
        subscriptionForm.add(modeListFormGroup);
58
//        modeListBox.addItem("-- none selected --", "noneSelected");
59
//        for(NotificationMode notificationMode : NotificationMode.values())
60
//            modeListBox.addItem(notificationMode.name(), notificationMode.name());
61
//        subscriptionForm.add(modeListFormGroup);
59 62

  
60 63
        HTML options = new HTML();
61 64
        options.setHTML(generateOptionsContent());
......
72 75

  
73 76
        errorLabel.setVisible(false);
74 77

  
75
        if(!frequencyListBox.getSelectedValue().equals("noneSelected") &&
76
                !modeListBox.getSelectedValue().equals("noneSelected"))
78
        if(!frequencyListBox.getSelectedValue().equals("noneSelected"))
79
//                && !modeListBox.getSelectedValue().equals("noneSelected"))
77 80
            return true;
78 81
        else {
79 82
            errorLabel.setVisible(true);
......
98 101

  
99 102
        String optionsContent = "<table class=\"table table-bordered\">";
100 103

  
101
        optionsContent += "<thead><tr><th>Name</th><th>Values</th></tr></thead>";
104
//        optionsContent += "<thead><tr><th>Name</th><th>Values</th></tr></thead>";
102 105
        optionsContent += "<tbody>";
103 106

  
104
        if(advQueryObject.getDatasource()!=null && !advQueryObject.getDatasource().equals(""))
105
            optionsContent += "<tr><td>Datasource</td><td>" + advQueryObject.getDatasource() + "</td></tr>";
107
//        if(advQueryObject.getDatasource()!=null && !advQueryObject.getDatasource().equals(""))
108
//            optionsContent += "<tr><td>Datasource</td><td>" + advQueryObject.getDatasource() + "</td></tr>";
109
//
110
//        if(advQueryObject.getTopic()!=null && !advQueryObject.getTopic().equals(""))
111
//            optionsContent += "<tr><td>Topic</td><td>" + advQueryObject.getTopic() + "</td></tr>";
106 112

  
107
        if(advQueryObject.getTopic()!=null && !advQueryObject.getTopic().equals(""))
108
            optionsContent += "<tr><td>Topic</td><td>" + advQueryObject.getTopic() + "</td></tr>";
109

  
110 113
        if(advQueryObject.getTrust()!=null)
111 114
            optionsContent += "<tr><td>Trust</td><td>[" + advQueryObject.getTrust().getMin() + ", " + advQueryObject.getTrust().getMax() + "]</td></tr>";
112 115

  
modules/uoa-repository-manager-gui/trunk/src/main/webapp/RepositoryManager.css
1016 1016
  font-size: 12px;
1017 1017
}
1018 1018

  
1019
.advancedSearchForm input[type="text"]:not([class*="uk-"]) {
1020
  height: 25px;
1021
  line-height: 23px;
1022
}
1023

  
1019 1024
.advancedSearchForm .form-control {
1020 1025
  width: 90% !important;
1021 1026
  margin-bottom: 5px !important;

Also available in: Unified diff