Skip to content

Commit 39467b0

Browse files
dshorthousedshorthouse
committed
Update patch
1 parent c4b5d2a commit 39467b0

File tree

1 file changed

+59
-25
lines changed

1 file changed

+59
-25
lines changed

Diff for: ‎canadensys_ipt_2.3.2.patch

+59-25
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
From 32316c8cb8308bb21a37f98287f8ea277e26aa98 Mon Sep 17 00:00:00 2001
1+
From 384ec135ad9ecf254e293a0ccc9711b49882904f Mon Sep 17 00:00:00 2001
22
From: David Shorthouse <davidpshorthouse@gmail.com>
33
Date: Thu, 19 Nov 2015 09:52:25 -0500
44
Subject: [PATCH] Complete theming to match existing Canadensys theme
55

66
---
7+
WEB-INF/pages/admin/organisations.ftl | 2 +-
8+
WEB-INF/pages/admin/users.ftl | 2 +-
79
WEB-INF/pages/inc/footer.ftl | 43 ++--
810
WEB-INF/pages/inc/header.ftl | 11 +-
911
WEB-INF/pages/inc/header_setup.ftl | 4 +-
@@ -19,14 +21,40 @@ Subject: [PATCH] Complete theming to match existing Canadensys theme
1921
images/dataTables/sort_asc_red.png | Bin 0 -> 266 bytes
2022
images/dataTables/sort_desc_red.png | Bin 0 -> 273 bytes
2123
js/custom.js | 18 ++
22-
styles/custom.css | 291 ++++++++++++++++++++++--
24+
styles/custom.css | 297 ++++++++++++++++++++++--
2325
styles/main.css | 13 --
24-
17 files changed, 438 insertions(+), 255 deletions(-)
26+
19 files changed, 446 insertions(+), 257 deletions(-)
2527
create mode 100644 images/dataTables/forward_enabled_hover_red.png
2628
create mode 100644 images/dataTables/sort_asc_red.png
2729
create mode 100644 images/dataTables/sort_desc_red.png
2830
create mode 100644 js/custom.js
2931

32+
diff --git a/WEB-INF/pages/admin/organisations.ftl b/WEB-INF/pages/admin/organisations.ftl
33+
index 5e89c77..333cc57 100644
34+
--- a/WEB-INF/pages/admin/organisations.ftl
35+
+++ b/WEB-INF/pages/admin/organisations.ftl
36+
@@ -28,7 +28,7 @@ $(document).ready(function(){
37+
38+
<h1 class="rtableTitle"><@s.text name="admin.home.editOrganisations"/></h1>
39+
40+
-<@organisationsTable numOrganisationsShown=20 sEmptyTable="dataTables.sEmptyTable.organisations" columnToSortOn=0 sortOrder="asc" />
41+
+<@organisationsTable numOrganisationsShown=999 sEmptyTable="dataTables.sEmptyTable.organisations" columnToSortOn=0 sortOrder="asc" />
42+
<div id="tableContainer"></div>
43+
44+
<div class="grid_24">
45+
diff --git a/WEB-INF/pages/admin/users.ftl b/WEB-INF/pages/admin/users.ftl
46+
index 9947ede..81c74e6 100644
47+
--- a/WEB-INF/pages/admin/users.ftl
48+
+++ b/WEB-INF/pages/admin/users.ftl
49+
@@ -19,7 +19,7 @@ $(document).ready(function(){
50+
51+
<h1 class="rtableTitle"><@s.text name="admin.home.manageUsers"/></h1>
52+
53+
-<@usersTable numUsersShown=20 sEmptyTable="dataTables.sEmptyTable.users" columnToSortOn=0 sortOrder="asc" />
54+
+<@usersTable numUsersShown=999 sEmptyTable="dataTables.sEmptyTable.users" columnToSortOn=0 sortOrder="asc" />
55+
<div id="tableContainer"></div>
56+
57+
<div class="grid_24">
3058
diff --git a/WEB-INF/pages/inc/footer.ftl b/WEB-INF/pages/inc/footer.ftl
3159
index ea1ce94..13e1bb2 100644
3260
--- a/WEB-INF/pages/inc/footer.ftl
@@ -394,15 +422,15 @@ index ed96e1a..3ed1757 100644
394422
'${v.recordsPublished}',
395423
<#if v.changeSummary?has_content>"${v.changeSummary?replace("\'", "\\'")?replace("\"", '\\"')}&nbsp;<#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"/>&nbsp;<#if managerRights><a href='${baseURL}/manage/history.do?r=${resource.shortname}&v=${v.version}'><@s.text name='button.edit'/></a></#if>"</#if>,
396424
diff --git a/WEB-INF/pages/manage/home.ftl b/WEB-INF/pages/manage/home.ftl
397-
index f40b06d..4bd5062 100644
425+
index f40b06d..48704e4 100644
398426
--- a/WEB-INF/pages/manage/home.ftl
399427
+++ b/WEB-INF/pages/manage/home.ftl
400428
@@ -12,7 +12,7 @@
401429
initHelp();
402430
});
403431
</script>
404432
- <@resourcesTable shownPublicly=false numResourcesShown=10 sEmptyTable="manage.home.resources.none" columnToSortOn=6 sortOrder="desc"/>
405-
+ <@resourcesTable shownPublicly=false numResourcesShown=500 sEmptyTable="manage.home.resources.none" columnToSortOn=6 sortOrder="desc"/>
433+
+ <@resourcesTable shownPublicly=false numResourcesShown=999 sEmptyTable="manage.home.resources.none" columnToSortOn=6 sortOrder="desc"/>
406434

407435
<h1 class="rtableTitle"><@s.text name="manage.home.title"/></h1>
408436
<div id="tableContainer"></div>
@@ -434,15 +462,15 @@ index d8e1051..b93b2bd 100644
434462
showReport=false;
435463
$("#toggleReport").text("<@s.text name='basic.show'/>");
436464
diff --git a/WEB-INF/pages/portal/home.ftl b/WEB-INF/pages/portal/home.ftl
437-
index bc07934..40538f1 100644
465+
index bc07934..c3f725d 100644
438466
--- a/WEB-INF/pages/portal/home.ftl
439467
+++ b/WEB-INF/pages/portal/home.ftl
440468
@@ -5,14 +5,17 @@
441469
<#include "/WEB-INF/pages/macros/resourcesTable.ftl"/>
442470
<script type="text/javascript" language="javascript" src="${baseURL}/js/jquery/jquery-1.11.1.min.js"></script>
443471
<script type="text/javascript" language="javascript" src="${baseURL}/js/jquery/jquery.dataTables.js"></script>
444472
- <@resourcesTable shownPublicly=true numResourcesShown=20 sEmptyTable="dataTables.sEmptyTable.resources" columnToSortOn=1 sortOrder="asc" />
445-
+ <@resourcesTable shownPublicly=true numResourcesShown=500 sEmptyTable="dataTables.sEmptyTable.resources" columnToSortOn=1 sortOrder="asc" />
473+
+ <@resourcesTable shownPublicly=true numResourcesShown=999 sEmptyTable="dataTables.sEmptyTable.resources" columnToSortOn=1 sortOrder="asc" />
446474
<h1 class="rtableTitle"><@s.text name="portal.home.title"/></h1>
447475
+
448476
+<p><#if localeLanguage=='fr'>Suivez <a href="http://www.canadensys.net/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="http://www.canadensys.net/data-publication-guide">our 7-step guide</a> to publish your own dataset on this repository.</#if></p>
@@ -688,10 +716,10 @@ index 0000000..1a6ff39
688716
+}
689717
\ No newline at end of file
690718
diff --git a/styles/custom.css b/styles/custom.css
691-
index 355407d..7407d51 100644
719+
index 355407d..cb5acb0 100644
692720
--- a/styles/custom.css
693721
+++ b/styles/custom.css
694-
@@ -5,32 +5,285 @@
722+
@@ -5,32 +5,291 @@
695723
they can create their own modernizr.js with the desired supported elements. They only have to replace the 'default'
696724
file with their own.
697725
*/
@@ -905,9 +933,7 @@ index 355407d..7407d51 100644
905933
+}
906934
+.sorting_desc{
907935
+ background:url("../images/dataTables/sort_desc_red.png") no-repeat scroll right center transparent;
908-
}
909-
-.green{
910-
- color: #008959;
936+
+}
911937
+tr.even td.sorting_1{background-color:transparent;}
912938
+#rtable_info{display:none;}
913939
+.paginate_disabled_previous, .paginate_disabled_next{cursor:default;}
@@ -918,23 +944,21 @@ index 355407d..7407d51 100644
918944
+.container_24 .push_18{position:absolute;right:0px;left:auto;min-width:275px;}
919945
+form.half{
920946
+ width:50%;
921-
}
922-
-#region-menu nav ul li.current {
923-
- background-color: #008959;
947+
+}
924948
+.topForm label {
925949
+ display: block;
926950
+ font-size: 12px;
927951
+ line-height:1.5em;
928952
+ margin-top:10px;
929953
}
930-
-#region-content h1 {
954+
-.green{
931955
- color: #008959;
932956
+.topForm input {
933957
+ margin:0 0 0 0.5em;
934958
+ width:90%;
935959
}
936-
-div.groupmenu ul li a {
937-
- color: #008959;
960+
-#region-menu nav ul li.current {
961+
- background-color: #008959;
938962
+.topForm p {margin:0px 20px 20px;}
939963
+.topForm div.right {margin-top:0px; text-align:left;}
940964
+.topForm button{display:block;}
@@ -946,20 +970,20 @@ index 355407d..7407d51 100644
946970
+ margin-left: 0;
947971
+ margin-right: 20px;
948972
}
949-
-table#rtable thead{
950-
- background-color: #dbf0e8;
973+
-#region-content h1 {
974+
- color: #008959;
951975
+.checkbox div {display:inline;}
952976
+.checkbox input {width:5%;}
953977
+#config div.checkbox{
954978
+ padding-top:0px;
955979
}
956-
-.dataTables_filter {
957-
- background-color: #dbf0e8;
980+
-div.groupmenu ul li a {
981+
- color: #008959;
958982
+#location>label{
959983
+ display:block;
960984
}
961-
-tr.even td.sorting_1 {
962-
- background-color: #E6F5EB;
985+
-table#rtable thead{
986+
- background-color: #dbf0e8;
963987
+div.item{margin-bottom:10px;}
964988
+div.roles{width:250px;margin-top:15px;}
965989
+div.roles label{font-weight:bold;display:inline;}
@@ -973,10 +997,20 @@ index 355407d..7407d51 100644
973997
+ color: #666;
974998
+ background: #dbf0e8;
975999
}
1000+
-.dataTables_filter {
1001+
- background-color: #dbf0e8;
1002+
+
1003+
+td.separator{
1004+
+ border-right:0px;
1005+
}
1006+
-tr.even td.sorting_1 {
1007+
- background-color: #E6F5EB;
1008+
+#resourcedoi{
1009+
+ display:none;
1010+
}
9761011
-.actionMessage{
9771012
- color: #008959;
9781013
- background-color: #dbf0e8;
979-
+
9801014
+#zone-footer-wrapper{display:none;height:0px;}
9811015
+#section-footer{height:90px;}
9821016
+#footer_content{text-align:left;}

0 commit comments

Comments
 (0)