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

dcat json-rpc #29

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5483a80
dcat json-rpc
steveoni Nov 20, 2023
99a462b
change frequency
steveoni Mar 22, 2024
004040a
fix created date
steveoni Mar 22, 2024
9e106c9
update created
steveoni Mar 22, 2024
558aea1
remove comment
steveoni Mar 22, 2024
5eff5ac
updated frequency value
steveoni Mar 22, 2024
d973332
update readme
steveoni Mar 26, 2024
3f39d8f
udpate contact name, update tags and categrory
steveoni Mar 27, 2024
bae7c6a
add government statistics to Topics category
steveoni Mar 27, 2024
101e11e
add multiple list fetch
steveoni May 21, 2024
c977a05
add new metadata
steveoni May 23, 2024
6d60401
transform markup syntax to markdown
steveoni May 27, 2024
84a1a09
add new metadata
steveoni May 29, 2024
228ef50
update schema and add new meta
steveoni Jun 12, 2024
85a495e
update json format
steveoni Jun 12, 2024
8a231e1
update type
steveoni Jun 13, 2024
0e62b04
comment out
steveoni Jul 5, 2024
c3dc375
fix api token regeneration
steveoni Aug 29, 2024
6642c6a
fix ckanext-pages edit button
steveoni Aug 29, 2024
e889bff
fix edit button in organization and also updat tab to have icons
steveoni Aug 29, 2024
9529cff
update nav to have the right icon and fix the edit settings button link
steveoni Aug 29, 2024
f7bf133
fix: change groups layout via bootstrap v3
AlmubdyMutaikhan Aug 29, 2024
16cfe22
add default values and new method from parent
steveoni Aug 30, 2024
a13e403
fix: search input design
AlmubdyMutaikhan Aug 31, 2024
5bd45f6
fix: footer responsive
AlmubdyMutaikhan Aug 31, 2024
d718fd9
fix: posts ui
AlmubdyMutaikhan Aug 31, 2024
b74fb10
fix: news cards
AlmubdyMutaikhan Aug 31, 2024
77acc8a
fix: mobile view
AlmubdyMutaikhan Aug 31, 2024
d663e66
fix: datasets header
AlmubdyMutaikhan Sep 4, 2024
0aec285
fix: hover dark color bug
AlmubdyMutaikhan Sep 4, 2024
a27b164
Merge branch 'json-rpc' into fixes2.9
steveoni Sep 6, 2024
08a2e45
Merge pull request #35 from datopian/fixes2.9
steveoni Sep 6, 2024
63919b1
fix: style news page
AlmubdyMutaikhan Sep 6, 2024
e838769
fix: change old icons and add contacts icon and functionality
AlmubdyMutaikhan Sep 6, 2024
499fe3b
fix: remove glyphicons and add fontawesome
AlmubdyMutaikhan Sep 6, 2024
be0bfb0
Merge pull request #36 from datopian/fix/bootstrap-cards
steveoni Sep 9, 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
22 changes: 22 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,25 @@ To publish a new version to PyPI follow these steps:

git tag 0.0.2
git push --tags

--------------------------------------
NSIRA Json (Restful) Harvester Mapping
--------------------------------------

The following is a mapping of the NSIRA Json to the DCAT schema before it is ingested into CKAN.

```
title <-- label
name <-- extension.matrix
description <-- note[0]
identifier <-- extension.matrix
modified <-- updated
language <-- en
distribution <-- link.alternate
distribution.title <-- link.alternate[i].type.split("/")[1]
distribution.accessURL <-- link.alternate[i].href
distribution.downloadURL <-- link.alternate[i].href
distribution.format <-- link.alternate[i].type
```


93 changes: 86 additions & 7 deletions ckanext/opendatani/assets/css/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,17 @@ body,
background-image: none;
background-color: inherit;
}
.masthead .nav-collapse,

.navbar {
border: none; /* Overriden main.css */
}

.masthead .navbar-collapse,
.masthead .section,
.navbar .nav {
float: none;
}
.masthead .nav-collapse {
.masthead .navbar-collapse {
padding: 0;
}
html,
Expand Down Expand Up @@ -225,6 +230,11 @@ li {
width: 223px;
}
@media (min-width: 768px) {

.module.context-info > .module-content {
padding-top: 33px;
}

[role="main"] .wrapper .media-grid .media-item {
width: 223px;
}
Expand Down Expand Up @@ -324,17 +334,18 @@ h6 {
}
.masthead {
color: #4d4d4d;
padding: 0; /* Overriden main.css */
}
.masthead .logo {
display: block;
width: 282px;
margin: 22px 0;
}
.masthead .nav-collapse {
.masthead .navbar-collapse {
background-color: #e8eaed;
clear: both;
position: static;
margin-left: -9999rem;
margin-left: -9998rem;
margin-right: -9999rem;
padding-left: 9999rem;
padding-right: 9999rem;
Expand All @@ -355,6 +366,7 @@ h6 {
text-align: center;
line-height: 30px;
color: rgba(77, 77, 77, 0.25);
left: 10px;
}
.masthead .site-search label:after {
display: none;
Expand All @@ -371,7 +383,7 @@ h6 {
}
.masthead .site-search input {
padding: 12px 50px 12px 45px;
width: 210px;
width: 300px;
background-color: #e8eaed;
border-radius: 0;
border-color: #e8eaed;
Expand Down Expand Up @@ -410,6 +422,7 @@ h6 {
font-weight: bold;
border-radius: 0;
position: relative;
text-decoration: none; /* Overriden main.css */
}
.masthead .nav > li > a:hover,
.masthead .navigation .nav-pills > li > a:hover {
Expand Down Expand Up @@ -447,8 +460,14 @@ h6 {
border-top: solid 1px #dfe2e6;
}
}

.homepage .featured-groups {
padding: 0;
}

.homepage .featured-groups li {
background-color: #25374d;
margin-bottom: 20px;
}
.homepage .featured-groups li a {
display: table;
Expand All @@ -459,7 +478,7 @@ h6 {
}
@media (min-width: 768px) {
.homepage .featured-groups li a {
height: 114px;
height: 134px;
overflow: hidden;
}
}
Expand Down Expand Up @@ -1048,11 +1067,15 @@ h6 {
/* Custom UI Homepage updates */
.latest-posts.thumbnails {
margin-top: 30px;
display: flex;
gap: 17px;
padding-left: 0;
}

.latest-posts.thumbnails li {
border: 1px solid #eee;
margin-left: 17px;
min-height: 501px;
padding: 0;
}
.latest-posts.thumbnails li .post {
padding: 10px;
Expand Down Expand Up @@ -1103,11 +1126,67 @@ h6 {
height: 160px;
overflow: hidden;
}

/* Overriden main.css */
.thumb img {
width: 100%;
height: auto;
}
@media screen and (max-width: 768px) {
.latest-posts .span4 {
width: 100%;
}
.mar-l-0 {
margin-left: 0 !important;
}

.latest-posts.thumbnails {
flex-direction: column;
}

}

@media screen and (max-width: 1000px) {
.masthead .navbar-collapse, .toolbar {
padding: 5px 0;
margin: 0;
max-width: calc(100% + 30px);
width: calc(100% + 30px);
padding-left: 15px;
margin-left: -15px;
}

.module-content.page-header {
margin: 0;
padding: 0;
}
}

.module-content.page-header {
background: none;
border: none;
}

.masthead .navigation .nav-pills li a:hover {
background-color: #dfe2e6;
}

.masthead .navigation .nav-pills li a:focus, .masthead .navigation .nav-pills li.active a {
background: transparent;
}

/* Overriding main.css of dev here */
.wrapper {
border: none;
-webkit-box-shadow: none;
box-shadow: none;
background-color: transparent;
}

.module-content {
padding: 30px 0;
}

.form-horizontal .form-group {
margin-left: 0;
}
23 changes: 23 additions & 0 deletions ckanext/opendatani/dataset_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
"validators": "scheming_required at_least_n_choices(1) scheming_multiple_choice",
"output_validators": "scheming_multiple_choice_output",
"choices": [
{
"value": "governmentstatistics",
"label": "Government statistics"
},
{
"value": "farming",
"label": "Farming"
Expand Down Expand Up @@ -205,6 +209,25 @@
"required": true,
"validators": "boolean_validator datasets_with_no_organization_cannot_be_private opendatani_private_datasets",
"form_snippet": "visibility_form_field.html"
},
{
"field_name": "source_last_updated",
"preset": "datetime",
"label": "Source last updated"
},
{
"field_name": "time_period",
"label": "Time period"
},
{
"field_name": "title_tags",
"label": "Title+Tags"
},
{
"field_name": "metatags",
"label": "Meta Tags",
"form_snippet": "markdown.html",
"form_placeholder": "Some useful json element"
}
],
"resource_fields": [
Expand Down
9 changes: 5 additions & 4 deletions ckanext/opendatani/fanstatic/css/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ body,
background-image: none;
background-color: inherit;
}
.masthead .nav-collapse,
.masthead .navbar-collapse,
.masthead .section,
.navbar .nav {
float: none;
}
.masthead .nav-collapse {
.masthead .navbar-collapse {
padding: 0;
}
html,
Expand Down Expand Up @@ -330,7 +330,7 @@ h6 {
width: 282px;
margin: 22px 0;
}
.masthead .nav-collapse {
.masthead .navbar-collapse {
background-color: #e8eaed;
clear: both;
position: static;
Expand Down Expand Up @@ -410,6 +410,7 @@ h6 {
font-weight: bold;
border-radius: 0;
position: relative;
text-decoration: none;
}
.masthead .nav > li > a:hover,
.masthead .navigation .nav-pills > li > a:hover {
Expand Down Expand Up @@ -459,7 +460,7 @@ h6 {
}
@media (min-width: 768px) {
.homepage .featured-groups li a {
height: 114px;
height: 134px;
overflow: hidden;
}
}
Expand Down
4 changes: 2 additions & 2 deletions ckanext/opendatani/fanstatic/less/_reset.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ body,
background-color:inherit;
}

.masthead .nav-collapse,
.masthead .navbar-collapse,
.masthead .section,
.navbar .nav {
float:none;
}

.masthead .nav-collapse {
.masthead .navbar-collapse {
padding:0;
}

Expand Down
Loading