-
Notifications
You must be signed in to change notification settings - Fork 3
/
canadensys_ipt_2.3.6.patch
997 lines (962 loc) · 61.9 KB
/
canadensys_ipt_2.3.6.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
From a6e5a15b8c41573f3b5debb1c9ae06a971a6c723 Mon Sep 17 00:00:00 2001
From: Canadensys Support <[email protected]>
Date: Tue, 20 Nov 2018 15:37:58 -0500
Subject: [PATCH] New ipt
---
WEB-INF/pages/admin/organisations.ftl | 38 +-
WEB-INF/pages/admin/users.ftl | 24 +-
WEB-INF/pages/inc/footer.ftl | 153 ++++++--
WEB-INF/pages/inc/header.ftl | 54 +--
WEB-INF/pages/inc/menu.ftl | 371 +++++++++++++-----
WEB-INF/pages/macros/resourcesTable.ftl | 11 +-
WEB-INF/pages/macros/versionsTable.ftl | 2 +-
webapp/WEB-INF/pages/manage/eml/basic.ftl | 2 +-
WEB-INF/pages/manage/home.ftl | 4 +-
webapp/WEB-INF/pages/manage/mapping.ftl | 4 +-
webapp/WEB-INF/pages/manage/overview.ftl | 3 +-
WEB-INF/pages/portal/home.ftl | 7 +-
WEB-INF/pages/portal/resource_new.ftl | 31 +-
13 files changed, 506 insertions(+), 198 deletions(-)
diff --git a/WEB-INF/pages/admin/organisations.ftl b/WEB-INF/pages/admin/organisations.ftl
index 3d829fa..877151d 100644
--- a/WEB-INF/pages/admin/organisations.ftl
+++ b/WEB-INF/pages/admin/organisations.ftl
@@ -4,21 +4,21 @@
<script type="text/javascript">
$(document).ready(function(){
- $('#organisation\\.key').click(function() {
- $('#organisation\\.name').val($('#organisation\\.key :selected').text());
- });
- //Hack needed for Internet Explorer X.*x
- $('#add').click(function() {
- window.location='organisation.do';
- });
- $('#cancel').click(function() {
- window.location='organisations.do?cancel=true';
- });
- $('.edit').each(function() {
- $(this).click(function() {
- window.location = $(this).parent('a').attr('href');
- });
- });
+ $('#organisation\\.key').click(function() {
+ $('#organisation\\.name').val($('#organisation\\.key :selected').text());
+ });
+ //Hack needed for Internet Explorer X.*x
+ $('#add').click(function() {
+ window.location='organisation.do';
+ });
+ $('#cancel').click(function() {
+ window.location='organisations.do?cancel=true';
+ });
+ $('.edit').each(function() {
+ $(this).click(function() {
+ window.location = $(this).parent('a').attr('href');
+ });
+ });
});
</script>
<#assign currentMenu = "admin"/>
@@ -28,13 +28,13 @@ $(document).ready(function(){
<h1 class="rtableTitle"><@s.text name="admin.home.editOrganisations"/></h1>
-<@organisationsTable numOrganisationsShown=20 sEmptyTable="dataTables.sEmptyTable.organisations" columnToSortOn=0 sortOrder="asc" />
+<@organisationsTable numOrganisationsShown=999 sEmptyTable="dataTables.sEmptyTable.organisations" columnToSortOn=0 sortOrder="asc" />
<div id="tableContainer"></div>
<div class="grid_24">
<p>
- <button id="add"><@s.text name="button.add"/></button>
- <button id="cancel"><@s.text name="button.cancel"/></button>
+ <button id="add"><@s.text name="button.add"/></button>
+ <button id="cancel"><@s.text name="button.cancel"/></button>
</p>
</div>
@@ -45,4 +45,4 @@ $(document).ready(function(){
<!-- DataTables v1.9.4 -->
<script type="text/javascript" language="javascript" src="${baseURL}/js/jquery/jquery.dataTables.js"></script>
-</#escape>
\ No newline at end of file
+</#escape>
diff --git a/WEB-INF/pages/admin/users.ftl b/WEB-INF/pages/admin/users.ftl
index ee3ccc3..8e44b3e 100644
--- a/WEB-INF/pages/admin/users.ftl
+++ b/WEB-INF/pages/admin/users.ftl
@@ -4,28 +4,28 @@
<script type="text/javascript">
$(document).ready(function(){
- //Hack needed for Internet Explorer
- $('#create').click(function() {
- window.location='user.do';
- });
- $('#cancel').click(function() {
- window.location='home.do';
- });
+ //Hack needed for Internet Explorer
+ $('#create').click(function() {
+ window.location='user.do';
+ });
+ $('#cancel').click(function() {
+ window.location='home.do';
+ });
});
-</script>
+</script>
<#assign currentMenu = "admin"/>
<#include "/WEB-INF/pages/inc/menu.ftl">
<#include "/WEB-INF/pages/macros/usersTable.ftl"/>
<h1 class="rtableTitle"><@s.text name="admin.home.manageUsers"/></h1>
-<@usersTable numUsersShown=20 sEmptyTable="dataTables.sEmptyTable.users" columnToSortOn=0 sortOrder="asc" />
+<@usersTable numUsersShown=999 sEmptyTable="dataTables.sEmptyTable.users" columnToSortOn=0 sortOrder="asc" />
<div id="tableContainer"></div>
<div class="grid_24">
<p>
- <button id="create"><@s.text name="button.create"/></button>
- <button id="cancel"><@s.text name="button.cancel"/></button>
+ <button id="create"><@s.text name="button.create"/></button>
+ <button id="cancel"><@s.text name="button.cancel"/></button>
</p>
</div>
@@ -36,4 +36,4 @@ $(document).ready(function(){
<!-- DataTables v1.9.4 -->
<script type="text/javascript" language="javascript" src="${baseURL}/js/jquery/jquery.dataTables.js"></script>
-</#escape>
\ No newline at end of file
+</#escape>
diff --git a/WEB-INF/pages/inc/footer.ftl b/WEB-INF/pages/inc/footer.ftl
index 6c591f3..169fcd2 100644
--- a/WEB-INF/pages/inc/footer.ftl
+++ b/WEB-INF/pages/inc/footer.ftl
@@ -1,32 +1,123 @@
-<#ftl output_format="HTML">
-</div>
- </div>
- </section>
- <footer id="section-footer" class="section section-footer">
- <div id="zone-footer-wrapper" class="zone-wrapper zone-footer-wrapper clearfix">
- <div id="zone-footer" class="zone zone-footer clearfix container_24">
- <ul>
- <li>IPT <@s.text name="footer.version"/> ${cfg.version!"???"}</li>
- <li><a href="http://www.gbif.org/ipt"><@s.text name="footer.projectHome"/></a></li>
- <li><a href="https://github.com/gbif/ipt/wiki/IPT2ManualNotes.wiki" target="_blank"><@s.text name="footer.useManual"/></a></li>
- <li><a href="https://github.com/gbif/ipt/issues/new" target="_blank"><@s.text name="footer.bugReport"/></a></li>
- <li><a href="https://github.com/gbif/ipt/issues/new" target="_blank"><@s.text name="footer.featureRequest"/></a></li>
- </ul>
- </div>
- </div>
-
- <div id="zone-credit-wrapper" class="zone-wrapper zone-footer-wrapper clearfix">
- <div id="zone-credit" class="zone zone-credit clearfix container_24">
- <aside class="grid_16 region region-credit-first" id="region-credit-first">
- <div class="region-inner region-credit-first-inner">
- <p>©2018 <a href="http://www.gbif.org">Global Biodiversity Information Facility</a>.</p>
- </div>
- </aside>
- </div>
- </div>
- </footer>
- </div>
-
- <div id="modalbox"><div id="modalback"></div><div id="modalcontainer"><div id="modalcontent"></div></div></div>
- </body>
+ <#ftl output_format="HTML">
+ </div>
+ </div>
+ </section>
+ <footer id="section-footer" class="section section-footer">
+ <!-- Custom footer START -->
+ <div id="footer" class="col-xs-12">
+ <div class="col-xs-10 col-xs-offset-1 ">
+ <div class="container-fluid">
+ <div class="row-fluid">
+ <div id="fConnect" class="col-sm-2 col-xs-12">
+ <div class="emptyspace span12"></div>
+ <div class="col-xs-12">
+ <a href="https://github.com/canadensys/" target="_blank"><img class="img-responsive icon-footer" src="https://layout.canadensys/common/images/icons/github_black_white_64.png" alt="GitHub"></a>
+ </div>
+ <div class="col-xs-12">
+ <a href="https://www.facebook.com/canadensys/" target="_blank"><img class="img-responsive icon-footer" src="https://layout.canadensys/common/images/icons/facebook_black_white_64.png" alt="Facebook"></a>
+ </div>
+ <div class="col-xs-12">
+ <a href="https://twitter.com/Canadensys" target="_blank"><img class="img-responsive icon-footer" src="https://layout.canadensys/common/images/icons/twitter_black_white_64.png" alt="Twitter"></a>
+ </div>
+ <div class="emptyspace col-xs-12"></div>
+ </div>
+ <div id="fLicense" class="col-sm-10 col-xs-12">
+ <div class="col-left-center">
+ <span class="col-left-center-p">
+ <div class="row-fluid">
+ <div class="emptyspace col-xs-12"></div>
+ <div class="col-xs-12">
+ <div class="row-fluid fr">
+ <div class="col-xs-6 text-center">
+ <a class="fr" href="https://community.canadensys.net/about/norms?lang=fr">
+ <img class="img-responsive icon-footer" src="https://layout.canadensys/common/images/icons/cite_us_black_white_64_2.png" alt="Cite us">
+ <p>Comment nous citer</p>
+ </a>
+ </div>
+ <div class="col-xs-6 text-center">
+ <a class="fr" href="https://community.canadensys.net/about/contact?lang=fr">
+ <img class="img-responsive icon-footer" src="https://layout.canadensys/common/images/icons/mail_black_white_64.png" alt="Contact us">
+ <p>Contactez nous</p>
+ </a>
+ </div>
+ </div>
+ <div class="row-fluid en">
+ <div class="col-xs-6 text-center">
+ <a class="en" href="https://community.canadensys.net/about/norms?lang=en">
+ <img class="img-responsive icon-footer" src="https://layout.canadensys/common/images/icons/cite_us_black_white_64_2.png" alt="Cite us">
+ <p>How to cite us</p>
+ </a>
+ </div>
+ <div class="col-xs-6 text-center">
+ <a class="en" href="https://community.canadensys.net/about/contact?lang=en">
+ <img class="img-responsive icon-footer" src="https://layout.canadensys/common/images/icons/mail_black_white_64.png" alt="Contact us">
+ <p>Contact us</p>
+ </a>
+ </div>
+ </div>
+ </div>
+ <div class="emptyspace col-xs-12"></div>
+ <div class="row-fluid fr">
+ <div class="col-sm-6 col-xs-12">
+ <div class="col-md-4 col-xs-12">
+ <a class="cc_logo" href="http://creativecommons.org/publicdomain/zero/1.0/deed.fr" title="CC0 1.0 universel Transfert au domaine public"><img src="https://layout.canadensys/common/images/icons/cc0-logo.png" alt="cc0-logo"></a>
+ </div>
+ <div class="col-md-8 col-xs-12 center">
+ <p>La plupart des participants de Canadensys ont transféré leurs données au <a href="http://creativecommons.org/publicdomain/zero/1.0/deed.fr">domaine public</a>.</p>
+ </div>
+ </div>
+ <div class="col-sm-6 col-xs-12">
+ <div class="col-md-4 col-xs-12">
+ <a rel="license" class="cc_logo" href="http://creativecommons.org/licenses/by/4.0/deed.fr" title="Creative Commons Attribution 4.0 international"><img src="https://layout.canadensys/common/images/icons/cc-by-logo.png" alt="cc-by-logo"></a>
+ </div>
+ <div class="col-md-8 col-xs-12">
+ <p>Tous les autres contenus de ce site opèrent sous <a rel="license" href="http://creativecommons.org/licenses/by/4.0/deed.fr">CC-BY</a>, sauf pour le <a href="https://community.canadensys.net/about/documents?lang=fr">logo de Canadensys</a>, qui est sous copyright.</p>
+ </div>
+ </div>
+ </div>
+ <div class="row-fluid en">
+ <div class="col-sm-6 col-xs-12">
+ <div class="col-md-4 col-xs-12">
+ <a class="cc_logo" href="http://creativecommons.org/publicdomain/zero/1.0/deed.en" title="CC0 1.0 universel Transfert au domaine public"><img src="https://layout.canadensys/common/images/icons/cc0-logo.png" alt="cc0-logo"></a>
+ </div>
+ <div class="col-md-8 col-xs-12 center">
+ <p>Most Canadensys participants have dedicated their data to the <a href="http://creativecommons.org/publicdomain/zero/1.0/">public domain</a>.</p>
+ </div>
+ </div>
+ <div class="col-sm-6 col-xs-12">
+ <div class="col-md-4 col-xs-12">
+ <a rel="license" class="cc_logo" href="http://creativecommons.org/licenses/by/4.0/" title="Creative Commons Attribution 4.0 international"><img src="https://layout.canadensys/common/images/icons/cc-by-logo.png" alt="cc-by-logo"></a>
+ </div>
+ <div class="col-md-8 col-xs-12">
+ <p>All other content on this website is licensed under <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">CC-BY</a>, except for the copyrighted <a href="https://community.canadensys.net/about/documents?lang=en">Canadensys logo</a>.</p>
+ </div>
+ </div>
+ </div>
+ <div class="emptyspace col-xs-12"></div>
+ </div>
+ </span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div><!--/#footer -->
+ <!-- Custom footer END -->
+ </footer>
+ </div>
+ <div id="modalbox">
+ <div id="modalback"></div>
+ <div id="modalcontainer">
+ <div id="modalcontent"></div>
+ </div>
+ </div>
+ <script type="text/javascript" src="${baseURL}/js/modernizr.js"></script>
+ <script type="text/javascript" src="${baseURL}/js/jquery/jquery-3.2.1.min.js"></script>
+ <script type="text/javascript" src="${baseURL}/js/jquery/jquery-ui.min-1.12.1.js"></script>
+ <script type="text/javascript" src="${baseURL}/js/global.js"></script>
+ <script type="text/javascript" src="https://layout.canadensys/common/bootstrap3/js/bootstrap.js"/></script>
+ <script type="text/javascript" src="https://layout.canadensys/common/js/js.cookie-2.1.4.min.js"/></script>
+ <script type="text/javascript" src="https://layout.canadensys/common/js/change_lang_ipt.js"/></script>
+ <script type="text/javascript" src="https://layout.canadensys/common/js/change_active_menu.js"></script>
+ </body>
</html>
diff --git a/WEB-INF/pages/inc/header.ftl b/WEB-INF/pages/inc/header.ftl
index 916f3df..09dee8b 100644
--- a/WEB-INF/pages/inc/header.ftl
+++ b/WEB-INF/pages/inc/header.ftl
@@ -10,35 +10,35 @@
xmlns:foaf="http://xmlns.com/foaf/0.1/">
<head>
- <link rel="stylesheet" type="text/css" media="all" href="${baseURL}/styles/reset.css" />
- <link rel="stylesheet" type="text/css" media="all" href="${baseURL}/styles/text.css" />
- <link rel="stylesheet" type="text/css" media="all" href="${baseURL}/styles/960_24_col.css" />
- <link rel="stylesheet" type="text/css" href="${baseURL}/styles/main.css" />
- <link rel="stylesheet" type="text/css" media="all" href="${baseURL}/styles/jquery/dataTable.css"/>
- <link rel="shortcut icon" href="${baseURL}/images/icons/favicon-16x16.png" type="image/x-icon" />
- <link href="${baseURL}/rss.do" title="Latest Resources" rel="alternate" type="application/rss+xml" />
- <link media="all" type="text/css" href="${baseURL}/styles/jquery/jquery-ui.min-1.12.1.css" rel="stylesheet" />
- <link rel="stylesheet" type="text/css" href="${baseURL}/styles/font-awesome.min.css" media="all" />
- <!-- for css overrides needed for customizations -->
- <link rel="stylesheet" type="text/css" href="${baseURL}/styles/custom.css" />
- <!-- for support of old browsers, like IE8. See http://modernizr.com/docs/#html5inie -->
- <script type="text/javascript" src="${baseURL}/js/modernizr.js"></script>
- <script type="text/javascript" src="${baseURL}/js/jquery/jquery-3.2.1.min.js"></script>
- <script type="text/javascript" src="${baseURL}/js/jquery/jquery-ui.min-1.12.1.js"></script>
- <script type="text/javascript" src="${baseURL}/js/global.js"></script>
-
+ <link rel="stylesheet" type="text/css" media="all" href="${baseURL}/styles/reset.css" />
+ <link rel="stylesheet" type="text/css" media="all" href="${baseURL}/styles/text.css" />
+ <link rel="stylesheet" type="text/css" media="all" href="${baseURL}/styles/960_24_col.css" />
+ <link rel="stylesheet" type="text/css" href="${baseURL}/styles/main.css" />
+ <link rel="stylesheet" type="text/css" media="all" href="${baseURL}/styles/jquery/dataTable.css"/>
+ <link rel="shortcut icon" href="https://layout.canadensys/common/images/favicon.ico" type="image/x-icon" />
+ <link href="${baseURL}/rss.do" title="Latest Resources" rel="alternate" type="application/rss+xml" />
+ <link media="all" type="text/css" href="${baseURL}/styles/jquery/jquery-ui.min-1.12.1.css" rel="stylesheet" />
+ <link rel="stylesheet" type="text/css" href="${baseURL}/styles/font-awesome.min.css" media="all" />
+ <!-- for css overrides needed for customizations -->
+ <link rel="stylesheet" type="text/css" media="all" href="https://layout.canadensys/common/css/common.css"/>
+ <link rel="stylesheet" type="text/css" media="all" href="https://layout.canadensys/common/bootstrap3/css/bootstrap.css"/>
+ <link rel="stylesheet" type="text/css" media="all" href="https://layout.canadensys/commonui-bs3/css/ala-styles.css"/>
+ <link rel="stylesheet" type="text/css" media="all" href="https://layout.canadensys/common/css/alc-styles-bs3.css" />
+ <link rel="stylesheet" type="text/css" media="all" href="https://layout.canadensys/common/css/canadensys-ipt.css" />
+ <!-- for support of old browsers, like IE8. See http://modernizr.com/docs/#html5inie -->
+
[#-- GOOGLE ANALYTICS - asynchroneous: http://code.google.com/apis/analytics/docs/tracking/asyncTracking.html --]
[#if cfg.gbifAnalytics || (cfg.analyticsKey!"")?length>1]
<script type="text/javascript">
var _gaq = _gaq || [];
- [#if (cfg.analyticsKey!"")?length>1]
- _gaq.push(['_setAccount', '${cfg.analyticsKey}']);
- _gaq.push(['_trackPageview']);
- [/#if]
- [#if cfg.gbifAnalytics]
- _gaq.push(['gbif._setAccount', '${cfg.getProperty("dev.analytics.gbif")}']);
- _gaq.push(['gbif._trackPageview']);
- [/#if]
+ [#if (cfg.analyticsKey!"")?length>1]
+ _gaq.push(['_setAccount', '${cfg.analyticsKey}']);
+ _gaq.push(['_trackPageview']);
+ [/#if]
+ [#if cfg.gbifAnalytics]
+ _gaq.push(['gbif._setAccount', '${cfg.getProperty("dev.analytics.gbif")}']);
+ _gaq.push(['gbif._trackPageview']);
+ [/#if]
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
@@ -48,7 +48,7 @@
[/#if]
[#-- Metadata used by browsers (title in browser toolbar, bookmark when added to favorites), search engines (keywords) --]
- [#assign metaKeywords = "GBIF, Global Biodiversity Information Facility, IPT, Integrated Publishing Toolkit, checklist, occurrence, metadata, DwC-A, Darwin Core, Darwin Core Archive, biodiversity data, data paper, EML" /]
+ [#assign metaKeywords = "Canadensys, integrated publishing toolkit, IPT, repository, checklist, occurrence, specimen, DwC-A, Darwin Core, Darwin Core Archive, biodiversity data, data paper, EML" /]
[#assign registeredIpt = action.getRegisteredIpt()!""/]
[#if resource?? && eml??]
<meta name="description" content="${eml.description!}" charset="UTF-8" />
@@ -76,4 +76,4 @@ $(document).ready(function(){
});
</script>
-[#assign currentMenu = "home"]
\ No newline at end of file
+[#assign currentMenu = "home"]
diff --git a/WEB-INF/pages/inc/menu.ftl b/WEB-INF/pages/inc/menu.ftl
index 3fe4cf8..c71cabf 100644
--- a/WEB-INF/pages/inc/menu.ftl
+++ b/WEB-INF/pages/inc/menu.ftl
@@ -1,104 +1,295 @@
[#ftl output_format="HTML"]
</head>
- <body>
- <div class="page clearfix" id="page">
- <header id="section-header" class="section section-header">
- <div id="zone-user-wrapper" class="zone-wrapper zone-user-wrapper clearfix">
- <div id="zone-user" class="zone zone-user clearfix container_24">
- <div class="region-inner region-branding-inner">
- <div class="branding-data clearfix">
- <div class="logo-img">
- <a href="${baseURL}" rel="home" title="GBIF Logo" class="active">
- <img src="${baseURL}/images/GBIF-2015-standard-ipt.png" />
+ <body>
+ <div id="feedback_bar">
+ <a href="https://github.com/Canadensys/Canadensys-Website-Issues/issues/new" title="[#if localeLanguage=='fr']Signaler un problème[#else]Report a problem[/#if]">
+
+ </a>
+ </div>
+ <!-- Navbar start -->
+ <div id="general-header" class="clearfix">
+ <div class="text-center no-margin-bottom">
+ <div id="" class="col-xs-8 col-xs-offset-2 hidden-xs">
+ <div class="col-xs-6 text-left">
+ <a href="http://www.canadensys.net">
+ <img class="img-responsive image-header" src="https://layout.canadensys/common/images/canadensys_logo_simple_white.png" alt="Canadensys">
+ <span id="header-canadensys">Canadensys</span>
</a>
- </div>
- <hgroup class="site-name-slogan">
- <h1 class="site-name"><a href="${baseURL}" rel="home" title="Home" class="active">Integrated Publishing Toolkit</a><span class="logoSuperscript">(IPT)</span></h1>
- <h6 class="site-slogan">free and open access to biodiversity data</h6>
- [#if !cfg.devMode() && cfg.getRegistryType()?has_content && cfg.getRegistryType()=='PRODUCTION']
- [#else]
- <img class="testmode" src="${baseURL}/styles/testmode.png" />
- [/#if]
- </hgroup>
- <div id="region-user-second" class="region-inner region-user-second-inner">
- <ul id="language-menu">
- [#if (Session.curr_user)??]
- <li>[@s.text name="menu.loggedin"][@s.param]${Session.curr_user.email}[/@s.param][/@s.text]</li>
- <li[#if currentMenu=="account"] class="current"[/#if] ><a href="${baseURL}/account.do">[@s.text name="menu.account"/]</a></li>
- <li[#if currentMenu=="logout"] class="current"[/#if]><a href="${baseURL}/logout.do">[@s.text name="menu.logout"/]</a></li>
- [#else]
- <li>
- <form id="login-form" action="${baseURL}/login.do" method="post">
- <input type="text" size="25" name="email" class="form-reset" placeholder="email" />
- <input type="password" size="20" name="password" class="form-reset" placeholder="password" />
- <input name="csrfToken" type="hidden" value="${newCsrfToken!}">
- [@s.submit key="portal.login" name="login-submit"/]
- </form>
- </li>
- [/#if]
- <li>
- [#include "/WEB-INF/pages/inc/languages.ftl"/]
- </li>
- </ul>
- </div>
</div>
- </div>
+ <div class="col-xs-4">
+ <!--
+ <h3 class="en">Make Canadian biodiversity information free and open to everyone</h3>
+ <h3 class="fr">Rendre accessible à tous l'information sur la biodiversité canadienne</h3>
+ -->
+ </div>
+ <div class="col-xs-1">
+ <div id="lang-selector">
+ <button id="en-lang" type="button" class="btn btn-default btn-lang noshadow fr">English</button>
+ <button id="fr-lang" type="button" class="btn btn-default btn-lang noshadow en">Français</button>
+ </div>
+ </div>
+ </div>
+ <div id="header-xs" class="col-xs-12 visible-xs">
+ <a class="navbar-brand visible-xs" href="http://www.canadensys.net">
+ <img class="img-responsive image-header-xs" src="https://layout.canadensys/common/images/canadensys_logo_simple_white.png" alt="Canadensys">
+ <span id="header-canadensys-xs">Canadensys</span>
+ </a>
+ </div>
+ <div id="menu-nav" class="col-xs-8 col-xs-offset-2 ">
+ <nav class="navbar navbar-default">
+ <div class="">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <div class="col-xs-1 visible-xs">
+ <div id="lang-selector-xs">
+ <button id="en-lang-xs" type="button" class="btn btn-default btn-lang noshadow fr">En</button>
+ <button id="fr-lang-xs" type="button" class="btn btn-default btn-lang noshadow en">Fr</button>
+ </div>
+ </div>
+ </div>
+ <div class="collapse navbar-collapse" id="navbar-collapse">
+ <ul class="nav navbar-nav navbar-right hidden-xs">
+ <li>
+ <div class="btn-group navbar-btn">
+ <a class="btn btn-subgroup1 en" href="https://community.canadensys.net/" role="button">community</a>
+ <a class="btn btn-subgroup1 fr" href="https://community.canadensys.net/?lang=fr" role="button">communauté</a>
+ <button data-toggle="dropdown" class="btn dropdown-toggle btn-subgroup2"><span class="caret"></span></button>
+ <ul class="dropdown-menu">
+ <li>
+ <a class="en" href="https://community.canadensys.net/about?lang=en">about</a>
+ <a class="fr" href="https://community.canadensys.net/about?lang=fr">à propos</a>
+ </li>
+ <li>
+ <a class="en" href="https://community.canadensys.net/about/contact?lang=en">contact us</a>
+ <a class="fr" href="https://community.canadensys.net/about/contact?lang=fr">contactez-nous</a>
+ </li>
+ <li>
+ <a class="en" href="https://community.canadensys.net/digitization?lang=en">digitization</a>
+ <a class="fr" href="https://community.canadensys.net/digitization?lang=fr">numérisation</a>
+ </li>
+ <li>
+ <a class="en" href="https://community.canadensys.net/publication?lang=en">publication</a>
+ <a class="fr" href="https://community.canadensys.net/publication?lang=fr">publication</a>
+ </li>
+ <li>
+ <a class="en" href="https://community.canadensys.net/activities?lang=en">activities</a>
+ <a class="fr" href="https://community.canadensys.net/activities?lang=fr">activité</a>
+ </li>
+ <li>
+ <a class="en" href="https://community.canadensys.net/blog?lang=en">blog</a>
+ <a class="fr" href="https://community.canadensys.net/blog?lang=fr">blogue</a>
+ </li>
+ </ul>
+ </div>
+ </li>
+ </ul>
+ <ul class="nav navbar-nav">
+<!--
+ <li id="nav_data">
+ <a class="en" href="https://data.canadensys.net/?lang=en">data</a>
+ <a class="fr" href="https://data.canadensys.net/?lang=fr">données</a>
+ </li>
+-->
+ <li id="nav_explorer" class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="en">explorer</span><span class="fr">explorateur</span> <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li id="nav_explorer_ala">
+ <a class="en" href="https://data.canadensys.net/explorer/occurrences/search?lang=en&q=#tab_mapView">explorer</a>
+ <a class="fr" href="https://data.canadensys.net/explorer/occurrences/search?lang=fr&q=#tab_mapView">explorateur</a>
+ </li>
+ <li id="nav_collections">
+ <a class="en" href="https://data.canadensys.net/collections/?lang=en">collections</a>
+ <a class="fr" href="https://data.canadensys.net/collections/?lang=fr">collections</a>
+ </li>
+ <li id="nav_datasets">
+ <a class="en" href="https://data.canadensys.net/collections/datasets?lang=en">datasets</a>
+ <a class="fr" href="https://data.canadensys.net/collections/datasets?lang=fr">jeux de données</a>
+ </li>
+ <li id="nav_images">
+ <a class="en" href="https://data.canadensys.net/images/?lang=en">images</a>
+ <a class="fr" href="https://data.canadensys.net/images/?lang=fr">images</a>
+ </li>
+ <li class="en"> -- Web services -- </li>
+ <li class="fr"> -- Services web -- </li>
+ <li id="nav_explorer_ala_ws">
+ <a class="en" href="https://data.canadensys.net/explorer-ws/">explorer ws</a>
+ <a class="fr" href="https://data.canadensys.net/explorer-ws/">sw pour l'explorateur</a>
+ </li>
+ <li id="nav_collections_ws">
+ <a class="en" href="https://data.canadensys.net/collections/ws">collections & datasets</a>
+ <a class="fr" href="https://data.canadensys.net/collections/ws">collections & jeux de données</a>
+ </li>
+ </ul>
+ </li>
+ <li id="nav_repository">
+ <a class="en" href="https://data.canadensys.net/ipt/?request_locale=en">repository</a>
+ <a class="fr" href="https://data.canadensys.net/ipt/?request_locale=fr">dépôt</a>
+ </li>
+ <li id="nav_tools">
+ <a class="en" href="https://data.canadensys.net/tools/coordinates?lang=en">tools</a>
+ <a class="fr" href="https://data.canadensys.net/tools/coordinates?lang=fr">outils</a>
+ </li>
+ <li id="nav_vascan">
+ <a class="en" href="https://data.canadensys.net/vascan/search?lang=en">vascan</a>
+ <a class="fr" href="https://data.canadensys.net/vascan/search?lang=fr">vascan</a>
+ </li>
+
+ </ul>
+ <ul class="nav navbar-nav navbar-right visible-xs">
+ <li>
+ <div class="btn-group navbar-btn">
+ <a class="btn btn-subgroup1 en" href="https://community.canadensys.net/" role="button">community</a>
+ <a class="btn btn-subgroup1 fr" href="https://community.canadensys.net/?lang=fr" role="button">communauté</a>
+ <button data-toggle="dropdown" class="btn dropdown-toggle btn-subgroup2"><span class="caret"></span></button>
+ <ul class="dropdown-menu">
+ <li>
+ <a class="en" href="https://community.canadensys.net/about?lang=en">about</a>
+ <a class="fr" href="https://community.canadensys.net/about?lang=fr">à propos</a>
+ </li>
+ <li>
+ <a class="en" href="https://community.canadensys.net/about/contact?lang=en">contact us</a>
+ <a class="fr" href="https://community.canadensys.net/about/contact?lang=fr">contactez-nous</a>
+ </li>
+ <li>
+ <a class="en" href="https://community.canadensys.net/digitization?lang=en">digitization</a>
+ <a class="fr" href="https://community.canadensys.net/digitization?lang=fr">numérisation</a>
+ </li>
+ <li>
+ <a class="en" href="https://community.canadensys.net/publication?lang=en">publication</a>
+ <a class="fr" href="https://community.canadensys.net/publication?lang=fr">publication</a>
+ </li>
+ <li>
+ <a class="en" href="https://community.canadensys.net/activities?lang=en">activities</a>
+ <a class="fr" href="https://community.canadensys.net/activities?lang=fr">activité</a>
+ </li>
+ <li>
+ <a class="en" href="https://community.canadensys.net/blog?lang=en">blog</a>
+ <a class="fr" href="https://community.canadensys.net/blog?lang=fr">blogue</a>
+ </li>
+ </ul>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </nav>
</div>
</div>
- <!-- show production logo only if ipt 1) .war was not built in test mode and 2) run in production mode -->
+ </div>
+ <!-- End Navbar -->
+ <div class="page clearfix" id="page">
+ <header id="section-header" class="section section-header">
+ <!-- show production logo only if ipt 1) .war was not built in test mode and 2) run in production mode -->
<div id="zone-branding-wrapper" class="zone-wrapper zone-branding-wrapper clearfix">
- <div id="zone-branding" class="zone zone-branding clearfix container_24">
- <div class="grid_13 region region-menu" id="region-menu">
- <nav>
- <ul>
- <li[#if currentMenu=='home'] class="current"[/#if]><a href="${baseURL}/">[@s.text name="menu.home"/]</a></li>
- [#if managerRights]
- <li[#if currentMenu=='manage'] class="current"[/#if]><a href="${baseURL}/manage/">[@s.text name="menu.manage"/]</a></li>
- [/#if]
- [#if adminRights]
- <li[#if currentMenu=='admin'] class="current"[/#if]><a href="${baseURL}/admin/">[@s.text name="menu.admin"/]</a></li>
- [/#if]
- <li[#if currentMenu=='about'] class="current"[/#if]><a href="${baseURL}/about.do">[@s.text name="menu.about"/]</a></li>
- </ul>
- </nav>
- </div>
- </div>
- <div id="search"></div>
+ <div id="zone-branding" class="zone zone-branding clearfix container_24">
+ <div class="container_24 region region-menu" id="region-menu">
+ <nav>
+ <ul id="mainNav" class="grid_12">
+ [#if managerRights]
+ <li[#if currentMenu=='manage'] class="current"[/#if]><a href="${baseURL}/manage/">[@s.text name="menu.manage"/]</a></li>
+ [/#if]
+ [#if adminRights]
+ <li[#if currentMenu=='admin'] class="current"[/#if]><a href="${baseURL}/admin/">[@s.text name="menu.admin"/]</a></li>
+ [/#if]
+ </ul>
+ </nav>
+ <div id="zone-user-wrapper" class="zone-wrapper zone-user-wrapper clearfix">
+ <div id="zone-user" class="zone zone-user clearfix container_24">
+ <div class="region-inner region-branding-inner">
+ <div class="branding-data clearfix">
+ <div id="region-user-second" class="region-inner region-user-second-inner">
+ <ul id="language-menu">
+ [#if (Session.curr_user)??]
+ <li>[@s.text name="menu.loggedin"][@s.param]${Session.curr_user.email}[/@s.param][/@s.text]</li>
+ <li[#if currentMenu=="account"] class="current"[/#if] ><a href="${baseURL}/account.do">[@s.text name="menu.account"/]</a></li>
+ <li[#if currentMenu=="logout"] class="current"[/#if]><a href="${baseURL}/logout.do">[@s.text name="menu.logout"/]</a></li>
+ [#else]
+ <li>
+ <form id="login-form" action="${baseURL}/login.do" method="post">
+ <!--<input type="text" size="25" name="email" value="email" class="form-reset" />-->
+ <!--<input type="password" size="20" name="password" value="password" class="form-reset" />-->
+ <!--<input name="csrfToken" type="hidden" value="${newCsrfToken!}">-->
+ [@s.submit key="portal.login" name="login-submit"/]
+ </form>
+ </li>
+ [/#if]
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="search"></div>
</div>
- </header>
- <section id="section-content" class="section section-content">
+ </header>
+ <section id="section-content" class="section section-content">
<div id="zone-content-wrapper" class="zone-wrapper zone-content-wrapper clearfix">
<div id="zone-content" class="zone zone-content clearfix container_24">
-[#if sideMenuEml!false]
-
- <aside class="grid_6 push_18">
- <div class="clearfix" id="sidebar">
- <h2>[@s.text name='manage.metadata.section' /]</h2>
- <ul class="sidebar">
- [#list ["basic", "geocoverage", "taxcoverage","tempcoverage", "keywords", "parties", "project", "methods", "citations", "collections", "physical", "additional"] as it]
- <li[#if currentSideMenu?? && currentSideMenu==it] class="current"[#else] class="sidebar"[/#if]><a href="metadata-${it}.do?r=${resource.shortname!r!}">[@s.text name="submenu.${it}"/]</a></li>
- [/#list]
- </ul>
- </div>
- </aside>
-
- <div class="grid_18 pull_6 region region-content" id="region-content">
-
-[#else]
+ [#if sideMenuEml!false]
- <div class="grid_24 region region-content" id="region-content">
-[/#if]
+ <aside class="grid_6 push_18">
+ <div class="clearfix" id="sidebar">
+ <h2>[@s.text name='manage.metadata.section' /]</h2>
+ <ul class="sidebar round">
+ [#list ["basic", "geocoverage", "taxcoverage","tempcoverage", "keywords", "parties", "project", "methods", "citations", "collections", "physical", "additional"] as it]
+ <li[#if currentSideMenu?? && currentSideMenu==it] class="current"[#else] class="sidebar"[/#if]><a href="metadata-${it}.do?r=${resource.shortname!r!}">[@s.text name="submenu.${it}"/]</a></li>
+ [/#list]
+ </ul>
+ </div>
+ </aside>
-
- [@s.actionmessage/]
- [#if warnings?size>0]
- <ul class="warnMessage">
- [#list warnings as w]
- <li><span>${w!}</span></li>
- [/#list]
- </ul>
+ <div class="grid_18 pull_6 region region-content" id="region-content">
+
+ [#elseif sideMenuResource!false]
+
+ <div id="side_bar">
+ [#if resource.lastPublished??]
+ [#if (resource.recordsPublished>0)]
+ <p><a class="round big_button no_margin" id="dwc_archive" href="${baseURL}/archive.do?r=${resource.shortname}" onClick="_gaq.push(['_trackEvent', 'Archive', 'Download', '${resource.shortname}']);">[#if localeLanguage=='fr']Télécharger données[#else]Download dataset[/#if]</a></p>
+ [/#if]
+ <p><a class="round big_button multi_line" id="eml_file" href="${baseURL}/eml.do?r=${resource.shortname}" onClick="_gaq.push(['_trackEvent', 'EML', 'Download', '${resource.shortname}']);">[#if localeLanguage=='fr']Télécharger metadonnées en format EML[#else]Download metadata as an EML file[/#if]</a></p>
+ [#if rtfFileExisting]
+ <p><a class="round big_button multi_line" id="rtf_file" href="${baseURL}/rtf.do?r=${resource.shortname}" onClick="_gaq.push(['_trackEvent', 'RTF', 'Download', '${resource.shortname}']);">[#if localeLanguage=='fr']Télécharger metadonnées en format RTF[#else]Download metadata as an RTF file[/#if]</a></p>
+ [/#if]
+ [#if eml.physicalData?has_content]
+ [#list eml.physicalData as item]
+ [#if item.distributionUrl?starts_with('http://explorer.canadensys.net/')]
+ <p><a class="round big_button[#if localeLanguage=='en'] multi_line[/#if]" id="explorer_link" href="${item.distributionUrl}" target="_blank" onClick="_gaq.push(['_trackEvent', 'Canadensys explorer', 'Outbound link', '${resource.shortname}']);">[#if localeLanguage=='fr']Voir données sur Canadensys[#else]Explore this dataset on Canadensys[/#if]</a></p>
[/#if]
- [@s.actionerror/]
-
- <div id="dialog-confirm" title="[@s.text name="basic.confirm"/]" style="display: none;"></div>
+ [/#list]
+ [#list eml.physicalData as item]
+ [#if item.distributionUrl?starts_with('http://www.gbif.org/dataset/')]
+ <p><a class="round big_button" id="gbif_link" href="${item.distributionUrl}" target="_blank" onClick="_gaq.push(['_trackEvent', 'GBIF data portal', 'Outbound link', '${resource.shortname}']);">[#if localeLanguage=='fr']Voir données sur GBIF[#else]Explore this dataset on GBIF[/#if]</a></p>
+ [/#if]
+ [/#list]
+ [/#if]
+ [#if eml.citation.identifier?has_content]
+ [#assign doi = eml.citation.identifier?matches(r".*(10[.][0-9]{4,}(?:[.][0-9])*/\S)")]
+ [#if doi]
+ <p><span class="doi"><a href="http://doi.org/${doi?groups[1]}">doi:${doi?groups[1]}</a></p>
+ [/#if]
+ [/#if]
+ [/#if]
+ </div>
+
+ <div class="grid_18 region region-content" id="region-content">
+ [#else]
+ <div class="grid_24 region region-content" id="region-content">
+ [/#if]
+ [@s.actionmessage/]
+ [#if warnings?size>0]
+ <ul class="warnMessage">
+ [#list warnings as w]
+ <li><span>${w!}</span></li>
+ [/#list]
+ </ul>
+ [/#if]
+ [@s.actionerror/]
+ <div id="dialog-confirm" title="[@s.text name="basic.confirm"/]" style="display: none;"></div>
diff --git a/WEB-INF/pages/macros/resourcesTable.ftl b/WEB-INF/pages/macros/resourcesTable.ftl
index 6b4c438..13fd5bb 100644
--- a/WEB-INF/pages/macros/resourcesTable.ftl
+++ b/WEB-INF/pages/macros/resourcesTable.ftl
@@ -8,7 +8,8 @@ resourcesTable macro: Generates a data table that has searching, pagination, and
-->
<#macro resourcesTable shownPublicly numResourcesShown sEmptyTable columnToSortOn sortOrder>
-<script type="text/javascript" charset="utf-8">
+<!--<script type="text/javascript" charset="utf-8">-->
+<script type="text/javascript">
<#assign emptyString="--">
<#assign dotDot="..">
<#assign deletedString><@s.text name="manage.home.visible.deleted"/></#assign>
@@ -45,7 +46,7 @@ resourcesTable macro: Generates a data table that has searching, pagination, and
<#if r.recordsByExtension?? && r.recordsByExtension?size gt 1>'<a target="_blank" href="${baseURL}/resource?r=${r.shortname}#dataRecords">${r.recordsPublished!0}</a>'<#else>'${r.recordsPublished!0}'</#if>,
'${r.modified?date}',
<#if r.published>'${(r.lastPublished?date)!}'<#else>'<@s.text name="portal.home.not.published"/>'</#if>,
- '${(r.nextPublished?date?string("yyyy-MM-dd HH:mm:ss"))!'${emptyString}'}',
+ <!--'${(r.nextPublished?date?string("yyyy-MM-dd HH:mm:ss"))!'${emptyString}'}',-->
<#if r.status=='PRIVATE'>'<@s.text name="manage.home.visible.private"/>'<#elseif r.status=='DELETED'>'${deletedString}'<#else>'<@s.text name="manage.home.visible.public"/>'</#if>,
<#if r.creator??>'${r.creator.firstname?replace("\'", "\\'")?replace("\"", '\\"')!} ${r.creator.lastname?replace("\'", "\\'")?replace("\"", '\\"')!}'<#else>'${emptyString}'</#if>]<#if r_has_next>,</#if>
</#list>
@@ -57,6 +58,7 @@ resourcesTable macro: Generates a data table that has searching, pagination, and
"aaData": aDataSet,
"iDisplayLength": ${numResourcesShown},
"bLengthChange": false,
+ "bPaginate": false,
"bAutoWidth": false,
"oLanguage": {
"sEmptyTable": "<@s.text name="${sEmptyTable}"/>",
@@ -78,9 +80,8 @@ resourcesTable macro: Generates a data table that has searching, pagination, and
{ "sTitle": "<@s.text name="manage.home.type"/>"},
{ "sTitle": "<@s.text name="manage.home.subtype"/>"},
{ "sTitle": "<@s.text name="portal.home.records"/>", "bSearchable": false, "sType": "number"},
- { "sTitle": "<@s.text name="manage.home.last.modified"/>", "bSearchable": false},
+ { "sTitle": "<@s.text name="manage.home.last.modified"/>", "bSearchable": false, "bVisible": <#if shownPublicly>false<#else>true</#if>},
{ "sTitle": "<@s.text name="manage.home.last.publication" />", "bSearchable": false},
- { "sTitle": "<@s.text name="manage.home.next.publication" />", "bSearchable": false},
{ "sTitle": "<@s.text name="manage.home.visible"/>", "bSearchable": false, "bVisible": <#if shownPublicly>false<#else>true</#if>},
{ "sTitle": "<@s.text name="portal.home.author"/>", "bVisible": <#if shownPublicly>false<#else>true</#if>}
],
@@ -108,4 +109,4 @@ resourcesTable macro: Generates a data table that has searching, pagination, and
} );
} );
</script>
-</#macro>
\ No newline at end of file
+</#macro>
diff --git a/WEB-INF/pages/macros/versionsTable.ftl b/WEB-INF/pages/macros/versionsTable.ftl
index 1d43d65..695a837 100644
--- a/WEB-INF/pages/macros/versionsTable.ftl
+++ b/WEB-INF/pages/macros/versionsTable.ftl
@@ -15,7 +15,7 @@ versionsTable macro: Generates a data table that has pagination.
<#list resource.getVersionHistory() as v>
/* only show released versions. The version must be public unless user has manager rights in which case they can see all released versions */
<#if v.released?? && ((v.publicationStatus == 'PUBLIC' || v.publicationStatus == 'REGISTERED') || managerRights) >
- [<#if (version?? && v.version == version.toPlainString()) || (!version?? && v.version == resource.emlVersion.toPlainString())>'<img class="latestVersion" src="${baseURL}/images/dataTables/forward_enabled_hover.png"/>${v.version!}'<#else>'<img class="latestVersionHidden" src="${baseURL}/images/dataTables/forward_enabled_hover.png"/><a href="${baseURL}/resource?r=${shortname}&v=${v.version!}">${v.version!}</a>'</#if>,
+ [<#if (version?? && v.version == version.toPlainString()) || (!version?? && v.version == resource.emlVersion.toPlainString())>'<img class="latestVersion" src="https://layout.canadensys/common/images/dataTables/forward_enabled_hover_red.png"/>${v.version!}'<#else>'<img class="latestVersionHidden" src="https://layout.canadensys/common/images/dataTables/forward_enabled_hover_red.png"/><a href="${baseURL}/resource?r=${shortname}&v=${v.version!}">${v.version!}</a>'</#if>,
'${v.released?date}',
'${v.recordsPublished}',
<#if v.changeSummary?has_content>"${v.changeSummary?replace("\'", "\\'")?replace("\"", '\\"')} <#if managerRights><a href='${baseURL}/manage/history.do?r=${resource.shortname}&v=${v.version}'><@s.text name='button.edit'/></a></#if>"<#else>"<@s.text name="publishing.changeSummary.default"/> <#if managerRights><a href='${baseURL}/manage/history.do?r=${resource.shortname}&v=${v.version}'><@s.text name='button.edit'/></a></#if>"</#if>,
diff --git a/WEB-INF/pages/manage/eml/basic.ftl b/WEB-INF/pages/manage/eml/basic.ftl
index 358bfe3..d504176 100644
--- a/WEB-INF/pages/manage/eml/basic.ftl
+++ b/WEB-INF/pages/manage/eml/basic.ftl
@@ -132,7 +132,7 @@
<#include "/WEB-INF/pages/macros/forms.ftl"/>
<h1><span class="superscript"><@s.text name='manage.overview.title.label'/></span>
- <a class="tooltip" href="resource.do?r=${resource.shortname}" title="${resource.title!resource.shortname}">${resource.title!resource.shortname}</a>
+ <a href="resource.do?r=${resource.shortname}" title="${resource.title!resource.shortname}">${resource.title!resource.shortname}</a>
</h1>
<div class="grid_17 suffix_1">
<h2 class="subTitle"><@s.text name='manage.metadata.basic.title'/></h2>
diff --git a/WEB-INF/pages/manage/home.ftl b/WEB-INF/pages/manage/home.ftl
index 2b6c1f5..d8a0f66 100644
--- a/WEB-INF/pages/manage/home.ftl
+++ b/WEB-INF/pages/manage/home.ftl
@@ -12,7 +12,7 @@
initHelp();
});
</script>
- <@resourcesTable shownPublicly=false numResourcesShown=10 sEmptyTable="manage.home.resources.none" columnToSortOn=6 sortOrder="desc"/>
+ <@resourcesTable shownPublicly=false numResourcesShown=999 sEmptyTable="manage.home.resources.none" columnToSortOn=6 sortOrder="desc"/>
<h1 class="rtableTitle"><@s.text name="manage.home.title"/></h1>
<div id="tableContainer"></div>
@@ -24,4 +24,4 @@
</div>
- <#include "/WEB-INF/pages/inc/footer.ftl">
\ No newline at end of file
+ <#include "/WEB-INF/pages/inc/footer.ftl">
diff --git a/WEB-INF/pages/manage/mapping.ftl b/WEB-INF/pages/manage/mapping.ftl
index d7e446f..9a25eed 100644
--- a/WEB-INF/pages/manage/mapping.ftl
+++ b/WEB-INF/pages/manage/mapping.ftl
@@ -92,7 +92,7 @@ $(document).ready(function(){
};
var showAllGroups=${Parameters.showAllGroups!"false"};
if (!showAllGroups){
- hideRedundantGroups();
+ //hideRedundantGroups();
};
$('.confirm').jConfirmAction({question : "<@s.text name="basic.confirm"/>", yesAnswer : "<@s.text name="basic.yes"/>", cancelAnswer : "<@s.text name="basic.no"/>"});
@@ -520,4 +520,4 @@ $(document).ready(function(){
</form>
<#include "/WEB-INF/pages/inc/footer.ftl">
-</#escape>
\ No newline at end of file
+</#escape>
diff --git a/WEB-INF/pages/manage/overview.ftl b/WEB-INF/pages/manage/overview.ftl
index a3080fe..2b0ac64 100644
--- a/WEB-INF/pages/manage/overview.ftl
+++ b/WEB-INF/pages/manage/overview.ftl
@@ -106,7 +106,8 @@ $(document).ready(function(){
$('.confirmPublishMajorVersionWithoutDOI').jConfirmAction({question : "<@s.text name='manage.overview.publishing.withoutDoi.majorVersion.confirm'/></br></br><@s.text name='manage.overview.publishing.doi.summary'/></br></br><@s.text name='manage.overview.publishing.doi.confirm.end'/>", yesAnswer : "<@s.text name='basic.yes'/>", summary : "<@s.text name='manage.overview.publishing.doi.summary.placeholder'/>", cancelAnswer : "<@s.text name='basic.no'/>"});
var showReport=false;
- $("#toggleReport").click(function() {
+ $("#toggleReport").click(function(e) {
+ e.preventDefault();
if(showReport){
showReport=false;
$("#toggleReport").text("<@s.text name='basic.show'/>");
diff --git a/WEB-INF/pages/portal/home.ftl b/WEB-INF/pages/portal/home.ftl
index f152c41..b4a4e64 100644
--- a/WEB-INF/pages/portal/home.ftl
+++ b/WEB-INF/pages/portal/home.ftl
@@ -5,17 +5,18 @@
<#include "/WEB-INF/pages/macros/resourcesTable.ftl"/>
<script type="text/javascript" language="javascript" src="${baseURL}/js/jquery/jquery-3.2.1.min.js"></script>
<script type="text/javascript" language="javascript" src="${baseURL}/js/jquery/jquery.dataTables.js"></script>
- <@resourcesTable shownPublicly=true numResourcesShown=20 sEmptyTable="dataTables.sEmptyTable.resources" columnToSortOn=1 sortOrder="asc" />
+ <@resourcesTable shownPublicly=true numResourcesShown=999 sEmptyTable="dataTables.sEmptyTable.resources" columnToSortOn=1 sortOrder="asc" />
<h1 class="rtableTitle"><@s.text name="portal.home.title"/></h1>
+<p><#if localeLanguage=='fr'>Suivez <a href="https://community.canadensys.net/publication/data-publication-guide?lang=fr">notre guide en 7 étapes</a> pour publier votre propre jeu de données sur ce dépôt.<#else>Follow <a href="https://community.canadensys.net/publication/data-publication-guide?lang=en">our 7-step guide</a> to publish your own dataset on this repository.</#if></p>
<div id="tableContainer"></div>
<!-- RSS Feed shown if there are resources -->
<#if (resources?size>0)>
<p>
- <@s.text name="portal.home.feed"><@s.param>${baseURL}/rss.do</@s.param></@s.text> <img id="rssImage" src="${baseURL}/images/rss.png"/>.
+ <@s.text name="portal.home.feed"><@s.param>${baseURL}/rss.do</@s.param></@s.text> <img id="rssImage" src="${baseURL}/images/rss.png" alt="RSS"/>.
</p>
<#else>
<p><@s.text name="portal.home.no.public"/></p>
</#if>
- <#include "/WEB-INF/pages/inc/footer.ftl">
\ No newline at end of file
+ <#include "/WEB-INF/pages/inc/footer.ftl">
diff --git a/WEB-INF/pages/portal/resource_new.ftl b/WEB-INF/pages/portal/resource_new.ftl
index 0de1fc0..6c3143f 100644
--- a/WEB-INF/pages/portal/resource_new.ftl
+++ b/WEB-INF/pages/portal/resource_new.ftl
@@ -118,9 +118,9 @@
<#assign anchor_citation>#citation</#assign>
<!-- Sidebar -->
-<div id="sidebar-wrapper">
+<div id="sidebar-wrapper hidden">
- <ul class="sidebar-nav">
+ <ul class="sidebar-nav hidden">
<li>
<input class="contract" type="button" id="menu-toggle" name="contract-sidebar" value=""/>
</li>
@@ -301,16 +301,22 @@
<#if eml.distributionUrl?has_content || resource.lastPublished??>
<ul class="horizontal-list">
+ <!--
<#if eml.distributionUrl?has_content>
<li class="box"><a href="${eml.distributionUrl}" class="icon icon-homepage"><@s.text name='eml.distributionUrl.short'/></a></li>
</#if>
<#if resource.status=="REGISTERED" && resource.key??>
<li class="box"><a href="${cfg.portalUrl}/dataset/${resource.key}" class="icon icon-gbif"><@s.text name='portal.resource.gbif.page.short'/></a></li>
</#if>
+ -->
<#if metadataOnly == false>
+ <!--
<li class="box"><a href="${download_dwca_url}" class="icon icon-download"><@s.text name='portal.resource.published.dwca'/></a></li>
+ -->
+ <li class="box round big_button"><a href="${download_dwca_url}" id="dwc_archive" class="icon icon-download"><@s.text name='portal.resource.published.dwca'/></a></li>
</#if>
<#if resource.lastPublished??>
+ <!--
<li class="box"><a href="${download_eml_url}" class="icon icon-download"><@s.text name='portal.resource.published.eml'/></a></li>
<li class="box"><a href="${download_rtf_url}" class="icon icon-download"><@s.text name='portal.resource.published.rtf'/></a></li>
<#if resource.versionHistory??>
@@ -320,6 +326,25 @@
<#if eml.citation?? && (eml.citation.citation?has_content || eml.citation.identifier?has_content)>
<li class="box"><a href="${anchor_citation}" class="icon icon-book"><@s.text name='portal.resource.cite'/></a></li>
</#if>
+ -->
+ <li class="box round big_button"><a href="${download_eml_url}" id="eml_file" class="icon icon-download"><@s.text name='portal.resource.published.eml'/></a></li>
+ <li class="box round big_button"><a href="${download_rtf_url}" id="rtf_file" class="icon icon-download"><@s.text name='portal.resource.published.rtf'/></a></li>
+ <#if eml.physicalData?has_content>
+ <#list eml.physicalData as item>
+ <#if item.distributionUrl?starts_with('http://explorer.canadensys.net/')>
+ <li class="box round big_button"><a href="${item.distributionUrl}" id="explorer_link" class="icon icon-canadensys multi_line" onClick="_gaq.push(['_trackEvent', 'GBIF data portal', 'Outbound link', '${resource.shortname}']);"><#if localeLanguage=='fr']Voir données sur Canadensys<#else>Explore this dataset on Canadensys</#if></a></li>
+ </#if>
+ </#list>
+ </#if>
+ <#if resource.status=="REGISTERED" && resource.key??>
+ <li class="box round big_button"><a href="${cfg.portalUrl}/dataset/${resource.key}" id="gbif_link" class="icon icon-gbif"><@s.text name='portal.resource.gbif.page.short'/></a></li>
+ </#if>
+ <#if eml.citation?has_content && eml.citation.identifier?has_content>
+ <#assign doi = eml.citation.identifier?matches(r".*(10[.][0-9]{4,}(?:[.][0-9])*/\S)")>
+ <#if doi>
+ <p><span class="doi"><a href="http://doi.org/${doi?groups[1]}">doi:${doi?groups[1]}</a></p>
+ </#if>
+ </#if>
</#if>
</ul>
</#if>
@@ -903,5 +928,3 @@
</script>
</#escape>
-
-
--
2.17.1