Project

General

Profile

« Previous | Next » 

Revision 50361

Styling changes for the validation job details page

View differences:

modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/client/browsehistory/ViewJobDetailsWidget.java
41 41
    private String parentToken = "";
42 42
    private String restToken = "";
43 43

  
44
    private HTML title = new HTML();
44 45
    private FlowPanel viewJobDetailsBoxContent = new FlowPanel();
45 46

  
46 47
    private Alert errorAlert = new Alert();
......
59 60

  
60 61
        super();
61 62

  
62
        HTML title = new HTML("<h1 class=\"uk-article-title\">Job details</h1>");
63

  
63 64
        title.addStyleName("uk-margin-medium-bottom");
64 65
        contentPanel.add(title);
66
//        HTML title = new HTML("<h1 class=\"uk-article-title\">Validation results for</h1>");
67
//        title.addStyleName("uk-margin-medium-bottom");
68
//        contentPanel.add(title);
65 69

  
66 70
        contentPanel.add(viewJobDetailsBoxContent);
67 71

  
......
111 115

  
112 116
                ViewJobDetailsWidget.this.storedJob = storedJob;
113 117

  
118
//                title.setHTML("<h1 class=\"uk-article-title\">Validation results for " + storedJob.getOfficialName() + "</h1>");
119
                title.setHTML("<h1 class=\"uk-article-title\">Validation results for</h1>");
120

  
114 121
                viewJobDetailsBoxContent.removeStyleName("loading-big");
115 122
                viewJobDetailsBoxContent.remove(loadingWheel);
116 123

  
......
140 147

  
141 148
        String content = "<h4 class=\"uk-h4 uk-text-primary uk-scrollspy-inview uk-animation-slide-top-medium\"" +
142 149
                "uk-scrollspy-class=\"\"><span>" + storedJob.getBaseUrl() + "</span></h4>" +
143
                "<div class=\"uk-margin\">by " + storedJob.getUserEmail() + "</div>";
150
                "<div class=\"uk-margin-small\">by " + storedJob.getUserEmail() + "</div>";
144 151

  
145 152

  
146 153
        generalInfoItem.add(new HTML(content));
......
152 159
        FlowPanel generalInfoTags = new FlowPanel();
153 160

  
154 161
        String content = "<hr class=\"uk-scrollspy-inview uk-animation-slide-bottom-small\" uk-scrollspy-class=\"\">" +
155
                "<div class=\"tags\">" +
156
                "<span class=\"label label-primary\">" + storedJob.getJobType() + "</span>" +
157
                "<span class=\"label label-primary\">" + storedJob.getGuidelinesShortName() + "</span>" +
158
                "<span class=\"label label-primary\">Validation set: " + storedJob.getValidationSet() + "</span>" +
159
                "<span class=\"label label-primary\">Started: " + storedJob.getStarted() + "</span>" +
160
                "<span class=\"label label-primary\">Ended: " + storedJob.getEnded() + "</span>" +
161
                "<span class=\"label label-primary\">Duration: " + storedJob.getDuration() + "</span>" +
162
                "<span class=\"label label-primary\">Records tested: " + storedJob.getRecordsTested() + "</span>" +
163
                "<span class=\"label label-primary\">Score for content: " + storedJob.getContentJobScore() + "</span>" +
162
                "<div>" +
163
                "<span class=\"\">" + storedJob.getJobType() + "</span> | " +
164
                "<span class=\"\">" + storedJob.getGuidelinesShortName() + "</span> | " +
165
                "<span class=\"\">Validation set: " + storedJob.getValidationSet() + "</span>" +
166
                "</div>" +
167
                "<div>" +
168
                "<span class=\"\">Started: " + storedJob.getStarted() + "</span>, " +
169
                "<span class=\"\">Ended: " + storedJob.getEnded() + "</span>, " +
170
                "<span class=\"\">Duration: " + storedJob.getDuration() + "</span>" +
171
                "</div>" +
172
                "<div style=\"font-size: 120%\">" +
173
                "<span class=\"\">Records tested: " + storedJob.getRecordsTested() + "</span>" +
174
                "</div>" +
175
                "<div>" +
176
                "<span class=\"label label-primary uk-margin-right\">Score for content: " + storedJob.getContentJobScore() + "</span>" +
164 177
                "<span class=\"label label-primary\">Score for usage: " + storedJob.getUsageJobScore() + "</span>" +
165 178
                "</div>" +
166 179
                "<hr class=\"uk-scrollspy-inview uk-animation-slide-bottom-small\" uk-scrollspy-class=\"\">";
......
253 266
        String content = "<table class=\"uk-table uk-table-striped uk-table-middle rules-table\">" +
254 267
                "<thead><tr><th>Rule Name</th><th class=\"uk-text-nowrap\">Rule Description</th>" +
255 268
                "<th class=\"uk-text-nowrap\">Rule Weight</th><th class=\"uk-text-nowrap\"># of records</th>" +
256
                "<th class=\"uk-text-nowrap\">Success</th></tr></thead>";
269
                "<th class=\"uk-text-nowrap\">Status</th></tr></thead>";
257 270

  
258 271
        content += "<tbody>";
259 272

  
......
283 296
                        "<td class=\"uk-table-shrink\">\n";
284 297

  
285 298
                if (jobResults.get(i).isHasErrors() && jobResults.get(i).isMandatory()) {
286
                    content += "<img src=\"img/icon_colours-x.jpg\" alt=\"Error\" class=\"el-image uk-preserve-width\" width=\"20\">" +
299

  
300
                    content += "<span uk-icon=\"icon: close\" style=\"color: #cd242b\"></span>" +
287 301
                            "<a href=\"javascript:;\" class=\"errorlink viewErrors uk-display-block\" id=\"" + jobResults.get(i).getType() + "#" + i + "\"><span>View Errors</span></a>";
302
//                    content += "<img src=\"img/icon_colours-x.jpg\" alt=\"Error\" class=\"el-image uk-preserve-width\" width=\"20\">" +
303
//                            "<a href=\"javascript:;\" class=\"errorlink viewErrors uk-display-block\" id=\"" + jobResults.get(i).getType() + "#" + i + "\"><span>View Errors</span></a>";
304

  
288 305
                } else if (jobResults.get(i).isHasErrors() && !jobResults.get(i).isMandatory()) {
289
                    content += "<img src=\"img/icon_colours-warning.jpg\" alt=\"Warning\" class=\"el-image uk-preserve-width\" width=\"20\">" +
306

  
307
                    content += "<span uk-icon=\"icon: warning\" style=\"color: #e9d60d\"></span>" +
290 308
                            "<a href=\"javascript:;\" class=\"warninglink viewErrors uk-display-block\" id=\"" + jobResults.get(i).getType() + "#" + i + "\"><span>View Warnings</span></a>";
309
//                    content += "<img src=\"img/icon_colours-warning.jpg\" alt=\"Warning\" class=\"el-image uk-preserve-width\" width=\"20\">" +
310
//                            "<a href=\"javascript:;\" class=\"warninglink viewErrors uk-display-block\" id=\"" + jobResults.get(i).getType() + "#" + i + "\"><span>View Warnings</span></a>";
311

  
291 312
                } else
292
                    content += "<img src=\"img/icon_colours-check.jpg\" alt=\"Success\" class=\"el-image uk-preserve-width\" width=\"20\">";
313
                    content += "<span uk-icon=\"icon: check\" style=\"color: #4b991f\"></span>" ;
314
//                    content += "<img src=\"img/icon_colours-check.jpg\" alt=\"Success\" class=\"el-image uk-preserve-width\" width=\"20\">";
293 315

  
294 316
                content += "</td>" +
295 317
                        "</tr>";
modules/uoa-repository-manager-gui/trunk/src/main/webapp/RepositoryManager.html
47 47
            integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
48 48
    <script src="uikit-3/js/uikit.min.js"></script>
49 49

  
50
    <script src="uikit-3/js/uikit-icons.min.js"></script>
51

  
50 52
    <script src="js/theme.js"></script>
51 53

  
52 54
    <link rel="icon" type="image/png" href="img/favicon.ico">

Also available in: Unified diff