Skip to content

Commit 02c847f

Browse files
dshorthousedshorthouse
committed
Update patch for 2.1.1
1 parent 83c94a8 commit 02c847f

File tree

1 file changed

+41
-73
lines changed

1 file changed

+41
-73
lines changed

‎canadensys_ipt_2.1.patch renamed to ‎canadensys_ipt_2.1.1.patch

+41-73
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 77e0cd0354a49ec9d401ca126cf7565cd4cce45b Mon Sep 17 00:00:00 2001
1+
From b3d37c2416d98ca9a48d1bae387fa7ee5231a7d0 Mon Sep 17 00:00:00 2001
22
From: David Shorthouse <davidpshorthouse@gmail.com>
3-
Date: Fri, 25 Apr 2014 11:57:10 -0400
4-
Subject: [PATCH] Make customizations
3+
Date: Mon, 5 May 2014 13:42:09 -0400
4+
Subject: [PATCH] New changes
55

66
---
77
.gitignore | 1 +
@@ -17,16 +17,12 @@ Subject: [PATCH] Make customizations
1717
WEB-INF/pages/manage/mapping.ftl | 25 ++--
1818
WEB-INF/pages/manage/overview.ftl | 3 +-
1919
WEB-INF/pages/portal/home.ftl | 10 +-
20-
WEB-INF/pages/portal/resource.ftl | 7 +-
20+
WEB-INF/pages/portal/resource.ftl | 9 +-
2121
WEB-INF/pages/portal/rss.ftl | 5 +-
22-
images/dataTables/sort_asc_red.png | Bin 0 -> 266 bytes
23-
images/dataTables/sort_desc_red.png | Bin 0 -> 273 bytes
2422
js/custom.js | 18 +++
2523
styles/custom.css | 199 +++++++++++++++++++++++++++++---
26-
19 files changed, 363 insertions(+), 179 deletions(-)
24+
17 files changed, 364 insertions(+), 180 deletions(-)
2725
create mode 100644 .gitignore
28-
create mode 100644 images/dataTables/sort_asc_red.png
29-
create mode 100644 images/dataTables/sort_desc_red.png
3026
create mode 100644 js/custom.js
3127

3228
diff --git a/.gitignore b/.gitignore
@@ -598,44 +594,46 @@ index 0c92482..b5fa865 100644
598594
<#else>
599595
<p><@s.text name="portal.home.no.public"/></p>
600596
diff --git a/WEB-INF/pages/portal/resource.ftl b/WEB-INF/pages/portal/resource.ftl
601-
index 4b313dc..c3e9b1f 100644
597+
index 4b313dc..71f65de 100644
602598
--- a/WEB-INF/pages/portal/resource.ftl
603599
+++ b/WEB-INF/pages/portal/resource.ftl
604-
@@ -20,6 +20,7 @@
605-
<#include "/WEB-INF/pages/macros/forms.ftl"/>
606-
<#include "/WEB-INF/pages/inc/header.ftl">
607-
<title>${resource.title!resource.shortname!}</title>
608-
+<#assign sideMenuResource=true />
609-
<#include "/WEB-INF/pages/inc/menu.ftl">
610-
611-
<div class="grid_24">
600+
@@ -19,7 +19,8 @@
601+
</#macro>
602+
<#include "/WEB-INF/pages/macros/forms.ftl"/>
603+
<#include "/WEB-INF/pages/inc/header.ftl">
604+
- <title>${resource.title!resource.shortname!}</title>
605+
+ <title>${resource.title!resource.shortname!}</title>
606+
+ <#assign sideMenuResource=true />
607+
<#include "/WEB-INF/pages/inc/menu.ftl">
608+
609+
<div class="grid_24">
612610
@@ -33,7 +34,7 @@
613-
</div>
614-
<div id="resourcelogo">
615-
<#if eml.logoUrl?has_content>
616-
- <img src="${eml.logoUrl}" />
617-
+ <img src="${eml.logoUrl}" alt="${eml.title!resource.shortname}" />
618-
</#if>
619-
</div>
620-
<p>
611+
</div>
612+
<div id="resourcelogo">
613+
<#if eml.logoUrl?has_content>
614+
- <img src="${eml.logoUrl}" />
615+
+ <img src="${eml.logoUrl}" alt="${eml.title!resource.shortname}" />
616+
</#if>
617+
</div>
618+
<p>
621619
@@ -89,7 +90,7 @@
622-
</#if>
623-
<tr>
624-
<th><@s.text name='portal.resource.published.eml'/></th>
625-
- <td><a href="${baseURL}/eml.do?r=${resource.shortname}&v=<#if version??>${version}<#else>${resource.emlVersion}</#if>"
626-
+ <td><a href="${baseURL}/eml.do?r=${resource.shortname}&amp;v=<#if version??>${version}<#else>${resource.emlVersion}</#if>"
627-
onClick="_gaq.push(['_trackEvent', 'EML', 'Download', '${resource.shortname}']);"><@s.text name='portal.resource.download'/></a>
628-
(${emlFormattedSize})
629-
</td>
620+
</#if>
621+
<tr>
622+
<th><@s.text name='portal.resource.published.eml'/></th>
623+
- <td><a href="${baseURL}/eml.do?r=${resource.shortname}&v=<#if version??>${version}<#else>${resource.emlVersion}</#if>"
624+
+ <td><a href="${baseURL}/eml.do?r=${resource.shortname}&amp;v=<#if version??>${version}<#else>${resource.emlVersion}</#if>"
625+
onClick="_gaq.push(['_trackEvent', 'EML', 'Download', '${resource.shortname}']);"><@s.text name='portal.resource.download'/></a>
626+
(${emlFormattedSize})
627+
</td>
630628
@@ -97,7 +98,7 @@
631-
632-
<tr>
633-
<th><@s.text name='portal.resource.published.rtf'/></th>
634-
- <td><a href="${baseURL}/rtf.do?r=${resource.shortname}&v=<#if version??>${version}<#else>${resource.emlVersion}</#if>"
635-
+ <td><a href="${baseURL}/rtf.do?r=${resource.shortname}&amp;v=<#if version??>${version}<#else>${resource.emlVersion}</#if>"
636-
onClick="_gaq.push(['_trackEvent', 'RTF', 'Download', '${resource.shortname}']);"><@s.text name='portal.resource.download'/></a>
637-
(${rtfFormattedSize})
638-
</td>
629+
630+
<tr>
631+
<th><@s.text name='portal.resource.published.rtf'/></th>
632+
- <td><a href="${baseURL}/rtf.do?r=${resource.shortname}&v=<#if version??>${version}<#else>${resource.emlVersion}</#if>"
633+
+ <td><a href="${baseURL}/rtf.do?r=${resource.shortname}&amp;v=<#if version??>${version}<#else>${resource.emlVersion}</#if>"
634+
onClick="_gaq.push(['_trackEvent', 'RTF', 'Download', '${resource.shortname}']);"><@s.text name='portal.resource.download'/></a>
635+
(${rtfFormattedSize})
636+
</td>
639637
diff --git a/WEB-INF/pages/portal/rss.ftl b/WEB-INF/pages/portal/rss.ftl
640638
index f3938cc..9e8cb1d 100644
641639
--- a/WEB-INF/pages/portal/rss.ftl
@@ -663,36 +661,6 @@ index f3938cc..9e8cb1d 100644
663661
<#if res.lastPublished??>
664662
<ipt:eml>${cfg.getResourceEmlUrl(res.shortname)}</ipt:eml>
665663
<dc:publisher>${res.eml.contact.firstName!} ${res.eml.contact.lastName!} ${res.eml.contact.organisation!}<#if res.eml.contact.email??>&lt;${res.eml.contact.email}&gt;</#if></dc:publisher>
666-
diff --git a/images/dataTables/sort_asc_red.png b/images/dataTables/sort_asc_red.png
667-
new file mode 100644
668-
index 0000000000000000000000000000000000000000..44db5a6cd890a6251c3ede87783b8ed19a7ef232
669-
GIT binary patch
670-
literal 266
671-
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3HQwj^(N7a$D;Kb?2i11Zh|kH}&M
672-
z25z8IZed1-S#u<Sg6t)pzOL+d*`!1j^uKA$&jJcf_jGX#u{iy9k~ZI=00GzYu2Wi;
673-
zFvUk66*IV!=zW8MDOiYS+m1+v+ll(A@;eUNTost*InUvXT5_72dbwRuc~PdLo9`i?
674-
zsF`03R-SnHhN<L0<*LB_Woeh#DwsqK7=GXTD_WK|sUez)@yY?yr-zf@HIz-UX1pzM
675-
zW{J=a=GTEMS*j*a6HGt;<iTH6sRsgf2kPzL^2|<@{K6RAFDK&VD?b_NL<Ub+KbLh*
676-
G2~7aKoLN5r
677-
678-
literal 0
679-
HcmV?d00001
680-
681-
diff --git a/images/dataTables/sort_desc_red.png b/images/dataTables/sort_desc_red.png
682-
new file mode 100644
683-
index 0000000000000000000000000000000000000000..fb095c930adb3c4b0f7ed796cb1985687edbb64e
684-
GIT binary patch
685-
literal 273
686-
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3HQwj^(N7a$D;Kb?2i11Zh|kH}&M
687-
z25z8IZed1-S#u<Sg6t)pzOL+d*`!2e<QFqtvjhsw^K@|xu{izqiZ!2Oq5$iI_u{R!
688-
z3A)!3*u_4UzhiP)6tsb1;nj;bn*5fBuW(8FV!kfiMa0kOtc_pVGZl5$7XO9Mntx3G
689-
zdvc#+*#4<HL9dd!ypJ;Nl`*U=+iV$@ai@bf&42z(Wj~DqovC~;o_9Q6ZGU?~%_*kW
690-
zs~Strn|4i^6|tz**2*&J_q17-N$rg1B<?A%3fbIZcuT@I%f~*uFMLy(-mL?QN4^1F
691-
O%HZkh=d#Wzp$Py6l3}6%
692-
693-
literal 0
694-
HcmV?d00001
695-
696664
diff --git a/js/custom.js b/js/custom.js
697665
new file mode 100644
698666
index 0000000..1a6ff39
@@ -719,7 +687,7 @@ index 0000000..1a6ff39
719687
+}
720688
\ No newline at end of file
721689
diff --git a/styles/custom.css b/styles/custom.css
722-
index 355407d..284e5ac 100644
690+
index 355407d..a2256b8 100644
723691
--- a/styles/custom.css
724692
+++ b/styles/custom.css
725693
@@ -5,32 +5,193 @@

0 commit comments

Comments
 (0)