Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #1

Open
wants to merge 146 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
405ebd8
Fix merge conflict
blagojabozinovski Mar 19, 2024
c9d2ef9
Add translations
blagojabozinovski Mar 15, 2024
a7d2fa4
fix translations
TomeCirun Dec 19, 2022
02c2a90
Update MANIFEST.in
Filip3mac Dec 19, 2022
506995e
translations
TomeCirun Dec 19, 2022
ed8ec09
Update MANIFEST.in
Filip3mac Dec 19, 2022
eba3d53
Update MANIFEST.in
Filip3mac Dec 20, 2022
3731cfd
new favicon
TomeCirun Dec 21, 2022
a95708f
add missing translations to the footer
blagojabozinovski Feb 1, 2023
8899bbc
Links and language switch to footer fix
blagojabozinovski Feb 1, 2023
7a1328c
toponymes accordion removed
Feb 1, 2023
21b0eba
translations and dataset info fix
blagojabozinovski Feb 2, 2023
fc32882
translation Corrections
blagojabozinovski Feb 6, 2023
234de18
homepage changes and breadcrumbs
Feb 6, 2023
8d82626
translation fixes
blagojabozinovski Feb 6, 2023
dc544c4
ui changes
Feb 6, 2023
7241b67
fixed application slider
Feb 6, 2023
e9b9d10
resource page ui fix
Feb 7, 2023
801c3d3
Another translation fix
blagojabozinovski Feb 7, 2023
e69e4e8
Remove the css added in PR35
blagojabozinovski Feb 7, 2023
5861ddb
fixed resource aside bar and translations
Feb 8, 2023
2055b54
Resource read
blagojabozinovski Mar 15, 2024
c40bfd2
ckanext-pagesfix
blagojabozinovski Feb 8, 2023
5480ad8
changes to the Manifest.in
blagojabozinovski Feb 8, 2023
d2b789a
commment the pages-admin.html extends
blagojabozinovski Feb 8, 2023
6b77567
Footer Links fix
blagojabozinovski Feb 8, 2023
f12cc19
Footer link and translation fix
blagojabozinovski Feb 9, 2023
c6c3532
fixed homepage translations of buttons
Feb 9, 2023
7a5fe70
Translation fix
blagojabozinovski Feb 9, 2023
1c9a66f
searchbar fix and group page changed template design
Feb 9, 2023
4ab7d03
Dataset ui changes and translations
Feb 13, 2023
e9149d5
fixed homepage button translation and routing
Feb 9, 2023
82bebb4
Showcase tags fix
blagojabozinovski Feb 11, 2023
791eb94
tooltip datetime fixed
Feb 13, 2023
b6e4b42
minor changes for the tooltip
Feb 13, 2023
424b692
changed dataset title on every page
Feb 13, 2023
d95b93f
fixed blog pages
Feb 13, 2023
d39c8aa
fixed markdown content on showcase
Feb 13, 2023
17936b2
group routing fixed and error with tooltip
Feb 14, 2023
9331e14
fixed dataset table and changed organization page layout
Feb 14, 2023
7b409b4
fixed dataset table
Feb 14, 2023
8f59738
minor changes tooltip
Feb 14, 2023
66b253a
fixed the placeholder when searching org
Feb 14, 2023
986539a
fixed resousrce api info data module
Feb 15, 2023
0ae50e9
news page changes
Feb 15, 2023
4b398ee
Footer link change
blagojabozinovski Feb 15, 2023
fb1cf00
fixed all organizations page
Feb 15, 2023
3e0d47d
Translation fix
blagojabozinovski Mar 15, 2024
bbf5130
recent datasets homepage fix
Feb 15, 2023
53dd01f
fixed header for the administrator
Feb 16, 2023
a68954e
fixed issues for admin page
Feb 16, 2023
a471bf8
fixed layout of pages
Feb 16, 2023
c4ad935
url changed for license
Feb 16, 2023
ac0ac2d
Dataset old data frontend fix
blagojabozinovski Feb 16, 2023
8abc2cf
Added teritories to map js with long nad short name
blagojabozinovski Feb 16, 2023
e10cb26
Territory select fix
blagojabozinovski Feb 16, 2023
49b20ed
layout changes
Feb 17, 2023
229868e
Dataset error 500 fix
blagojabozinovski Feb 17, 2023
1326c45
Dataset error fix
blagojabozinovski Feb 17, 2023
e0dccff
Dataset map fix
blagojabozinovski Feb 17, 2023
a5b35b4
admin panel dataset page layout changed
Feb 17, 2023
719f55e
Include old data for territory
blagojabozinovski Feb 17, 2023
482d596
Prints for debug
blagojabozinovski Feb 17, 2023
beb35a2
Old data on map fix
blagojabozinovski Feb 17, 2023
4d5c36d
admin panel dataset mget methodology for old datasets
Feb 17, 2023
a7b4877
Bug fix
blagojabozinovski Feb 17, 2023
4c35910
Contact Us form change
blagojabozinovski Feb 18, 2023
070f2a0
Dataset time created and temporal info fix
blagojabozinovski Feb 19, 2023
c535ed7
style changes
Feb 20, 2023
1a81a31
update pkg_dict
Feb 20, 2023
1fe874a
changed printing
Feb 20, 2023
6f5ceed
suggestion comment for next steps
Feb 20, 2023
e0caf33
Change map style
blagojabozinovski Feb 20, 2023
96f1a8b
adding territoire to the pkg_dict schema instead of reading from extras
Feb 20, 2023
356e540
testing pkg_dict fields
Feb 21, 2023
c78b984
remove printing pkg_dict
Feb 21, 2023
b34aee4
various changes in style
Feb 21, 2023
c933877
organization search and sorting fixed
Feb 22, 2023
4e96276
Blog translations
blagojabozinovski Feb 22, 2023
9bc1d1c
Additional translations
blagojabozinovski Feb 23, 2023
2f21d74
Remove double login button and link change
blagojabozinovski Feb 23, 2023
1294232
fixed X button for removing input text on the search bar
Feb 24, 2023
2c3de05
fixed link for our approach in french
Feb 24, 2023
30481ba
fixed line height and paragraph spacing
Feb 24, 2023
0543bcd
changed translations for contact page
Feb 24, 2023
cdca0ab
Remove double pagination
blagojabozinovski Feb 24, 2023
906a857
Removes double pagination on organisations
blagojabozinovski Feb 24, 2023
1779698
fixed routing for showcase and search by tags
Feb 24, 2023
796ced0
fixed title on blog list page
Feb 24, 2023
c5534b1
fixed methodology translation on dataset edit
Feb 24, 2023
0a06246
fixed various styling issues
Feb 27, 2023
d89397c
Transaltions and frontpage fixes
blagojabozinovski Feb 27, 2023
d1feab9
Translation and admin base nav overwrite
blagojabozinovski Feb 27, 2023
5b7af85
Additional translations admin nav
blagojabozinovski Feb 27, 2023
a48c45d
Translation typos corrections
blagojabozinovski Feb 28, 2023
be3579d
fixed translations, styles and added helper for checking if the user …
Feb 28, 2023
2a80095
fixed nonetype error for user editor
Feb 28, 2023
edcbf92
removed isEditor functionality
Feb 28, 2023
d19181f
Translations fix
blagojabozinovski Feb 28, 2023
6248d3e
fixed breadcrumbs and blog list layout
Feb 28, 2023
482a147
showcase dataset title changed
Feb 28, 2023
bf68070
Custom style settings change
blagojabozinovski Feb 28, 2023
009429a
fixed fonts on showcases and blog
Mar 1, 2023
1762a92
fixed the editor helpers
Mar 1, 2023
7704d1f
fixed the helpers for retrieving user role info
Mar 1, 2023
4d15e34
Contact Form and share on social form fix
blagojabozinovski Mar 1, 2023
d37486d
fixed dataset size translations
Mar 2, 2023
0f51971
fixed sorting when there is no data while searching
Mar 2, 2023
4c8fa0d
Translation typos fix
blagojabozinovski Mar 6, 2023
7e10371
Fix share social link
blagojabozinovski Mar 6, 2023
7c45b59
changed layout for editor and admin of organization
Mar 7, 2023
5ac92e7
Contact form modifications
blagojabozinovski Mar 8, 2023
600146f
fixed dataset layout for editor of organization
Mar 8, 2023
3f36a0a
Remove title contact form
blagojabozinovski Mar 8, 2023
41083b4
Change show more on search page and translate it
blagojabozinovski Mar 8, 2023
b926dc8
New dataset fix
blagojabozinovski Mar 9, 2023
7e04385
Access token for map change
blagojabozinovski Mar 24, 2023
cedd367
fixed text in mail sending for reset password
Mar 24, 2023
c30250f
Tranlation to the reset email text
blagojabozinovski Mar 24, 2023
9349189
Password reset email translation
blagojabozinovski Mar 27, 2023
c0a52f1
bug fixes on production
Apr 6, 2023
4807fd2
Change map style whithout mapbox api
blagojabozinovski Apr 25, 2023
26f8aa9
Map style change no API
blagojabozinovski Apr 25, 2023
2314055
Additional translations
blagojabozinovski May 3, 2023
bfd7e4a
Showcase notes read change
blagojabozinovski May 4, 2023
90cc89a
Resource download link html tag update
blagojabozinovski May 18, 2023
9af8f57
Img tag lazy load attr setup
blagojabozinovski Jul 3, 2023
6588727
Footer image error fix
blagojabozinovski Jul 11, 2023
eac189f
add scheming files
blagojabozinovski Jul 11, 2023
4694e52
Migrate contact form
blagojabozinovski Jul 17, 2023
1c7a6d0
Newsletter migrated from ckanext-montreal
blagojabozinovski Jul 18, 2023
4c8fc96
Migrate translations
blagojabozinovski Jul 19, 2023
4024170
Add template for locked user
blagojabozinovski Aug 21, 2023
7bc7355
Translation of user locked messages
blagojabozinovski Aug 21, 2023
6025699
Translation fix
blagojabozinovski Aug 22, 2023
813e565
Translation of error message
blagojabozinovski Aug 22, 2023
83b8ad6
Translation corrections
blagojabozinovski Aug 23, 2023
ee083e2
Translation correction
blagojabozinovski Aug 24, 2023
10046ea
Add cookie consent
blagojabozinovski Oct 17, 2023
54d64a3
Cookie consent via GTM
blagojabozinovski Oct 24, 2023
3851aa3
CookieYes script add
blagojabozinovski Oct 24, 2023
48b707b
Remove cookieyes script
blagojabozinovski Oct 26, 2023
79e9de8
Add coockie menu and helper for gtag
blagojabozinovski Oct 26, 2023
205df8b
Add google tag scripts
blagojabozinovski Oct 26, 2023
950f7c0
Card board sytle fix
blagojabozinovski Nov 6, 2023
7031c66
Time fix
blagojabozinovski Feb 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include README.rst
include LICENSE
include requirements.txt
recursive-include ckanext/montreal_theme *.html *.json *.js *.less *.css *.mo *.yml
recursive-include ckanext/montreal_theme *.html *.json *.js *.less *.css *.mo *.yml *.yaml *.ico *.svg *.gif *.eot *.ttf *.woff *.png *.config *.cfg *.map
recursive-include ckanext/montreal_theme/migration *.ini *.py *.mako
42 changes: 42 additions & 0 deletions ckanext/montreal_theme/assets/css/custom.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#login-form{
margin-top: -25px;
padding-top: 0px;
}

#info-header-login{
margin-left: -1em ;
margin-bottom: 1em;
}
#register-account-button{
padding-top: 1em;
padding-bottom: 1em;
}

#forgot-password-button{
padding-top: 1em;
}

#contact-us-container{
float: left;
margin-right: 3em;
background-color: white;
}

.contact-us-social {
margin: 0;
padding: 10px 17px;
font-size: 20px;
font-weight: 700;
color: #5a5a5a;
line-height: 1.3;
background-color: #e9ecef;
}

#contact-us-sidebar {
margin-top: 45px;

}

.facet-title {
text-transform: capitalize;
}
164 changes: 154 additions & 10 deletions ckanext/montreal_theme/assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -4615,6 +4615,10 @@ video {
border-width: 0;
}

.border-half{
border-width: 0.5px;
}

.border-1{
border-width: 1px;
}
Expand Down Expand Up @@ -13136,8 +13140,9 @@ div.card-body:hover{
}

footer{
background:url(/img/b-logo-light.svg) no-repeat 1.75em center #091f2f;
padding:1.75em 0 1.75em 6em;
/*background:url(/img/b-logo-light.svg) no-repeat 1.75em center #091f2f;*/
/*padding:1.75em 0 1.75em 6em;*/
padding:0;
color:#fff
}

Expand Down Expand Up @@ -14760,15 +14765,53 @@ body{
display: none
}

.tooltip{
visibility:hidden;
position:absolute
.has-tooltip{
position: relative;
display: inline-block;
/* visibility:hidden;
position:absolute */
}

.has-tooltip:hover .tooltip{
/* local-date tooltip rounded shadow-md p-1 bg-gray-100 text-base ml-10 -mt-8 */

.has-tooltip .tooltip {
visibility: hidden;
width: 120px;
--bg-opacity: 1;
background-color: #f8f9fa;
background-color: rgba(248, 249, 250, var(--bg-opacity));
box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
color: #929eab;
text-align: center;
border-radius: 6px;
padding: 5px 0;
position: absolute;
z-index: 1;
bottom: 125%;
left: 50%;
margin-left: -60px;
opacity: 0;
transition: opacity 0.3s;
}
.has-tooltip .tooltip::after {
content: "";
position: absolute;
top: 100%;
left: 50%;
margin-left: -5px;
border-width: 5px;
border-style: solid;
border-color: #555 transparent transparent transparent;
}
.has-tooltip:hover .tooltip {
visibility: visible;
opacity: 1;
}

/* .has-tooltip:hover .tooltip{
visibility:visible;
z-index:50
}
} */

.hljs{
display:block;
Expand Down Expand Up @@ -14868,8 +14911,11 @@ body{
}

.markdown-content p{
line-height: 1.625;
font-size:1.125rem;
margin-bottom:.5rem
margin-bottom:1.5rem;
margin-top:1.5rem;
color:#868E96;
}

.markdown-content strong{
Expand All @@ -14879,13 +14925,17 @@ body{
.markdown-content ol{
margin-top:.25rem;
margin-left:1.25rem;
list-style-type:decimal
list-style-type:decimal;
color:#868E96;

}

.markdown-content ul{
margin-top:.25rem;
margin-left:1.25rem;
list-style-type:disc
list-style-type:disc;
color:#868E96;

}

.markdown-content code{
Expand Down Expand Up @@ -63208,5 +63258,99 @@ body{

.xl\:animate-bounce{
animation: bounce 1s infinite;
}

.actions{
position: relative;
}

.ckanext-datapreview > iframe {
min-height: 750px !important;
}

#content > div.container.mx-auto.md\:flex.p-gutter > main > section > div:nth-child(1) > table{
font-size:0.85rem;
}

#content > div.container.mx-auto.md\:flex.p-gutter > main > section > div:nth-child(2) > table{
font-size:0.85rem;
}

#content > div:nth-child(4) > main > section > div:nth-child(1){
padding: 1.5rem;
}

#content > div:nth-child(4) > main > section > div:nth-child(2){
padding: 1.5rem;

}

.small-padding {
padding-bottom: 10px !important;
}

.border-b{
border-bottom-width: 1px;
}

.action-columnflex{
display: flex;
flex-direction: column;
}

#field-giant-search{
color: #5a5a5a;
}

.nav-admin{
background-color: black !important;
opacity: 1 !important;
height: 30px;
text-align:right;
padding-right:15px;
color: white !important;

}

.name-uppercase{
text-transform: capitalize;
}

.nav-logout{
display:flex;
gap:10px;
}

.nav-logo-title{
display: flex;
align-items: center;
}

.nav-items-flex{
display: flex;
justify-content: space-between;
align-items: center;
}

.text-nav-name:hover{
color:#868e96;
}

.nav-line-changed{
display: block;
height: 17px;
width: 1px;
border:1px solid #ced4da;

}

#content > div.row.wrapper > section.module.module-narrow.resources > ul{
display: none;
}

#content > div.row.wrapper > section.module.module-narrow.resources > h2{
display:none;
}


}
13 changes: 8 additions & 5 deletions ckanext/montreal_theme/assets/js/teritorries.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ckanext/montreal_theme/assets/webassets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ montreal_theme-style:
contents:
- css/style.css
- css/leaflet.css
- css/custom.css
montreal_theme-js:
output: montreal_theme/%(version)s_custom.js
contents:
Expand Down
Loading