From: root Date: Mon, 20 Jan 2014 12:02:21 +0000 Subject: 2.1/ssl rss feed fixes X-Git-Url: https://maxious.lambdacomplex.org/git/?p=ckanext-datagovau.git&a=commitdiff&h=b364d0186cfa52e7b34adb417ae84481476e926d --- 2.1/ssl rss feed fixes --- --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,6 +3,7 @@ + --- a/README.rst +++ b/README.rst @@ -2,13 +2,12 @@ It comprises: -* A CKAN Extension "plugin" at ``ckanext/datagovau/plugin.py`` which, when - loaded, overrides various settings in the core ``ini``-file to provide: - * A path to local customisations of the core templates - * A custom Package edit form that defaults to cc-by licence - * A custom n3/rdf output format +* A custom Package edit form that defaults to cc-by licence +* Replaces links with http/https protocol independent versions +* Provides HTML to users to embed data previews on their own website +* A cut down licenses.json file -* A cut down licenses.json file +This extension is complemented by ckanext-agls for AGLS metadata, ckanext-googleanalytics for Google Analytics tracking of API usage and ckanext-dga-stats for the customised site statistics page. Installation ============ --- a/admin/data.gov.au +++ b/admin/data.gov.au @@ -19,6 +19,11 @@ ExpiresDefault "access plus 1 week" +AddType application/octet-stream .woff + + SetEnvIf Origin "^http(s)?://(.+\.)?(data.gov.au)$" origin_is=$0 + Header set Access-Control-Allow-Origin %{origin_is}e env=origin_is + Options FollowSymLinks --- a/admin/default.vcl +++ b/admin/default.vcl @@ -8,45 +8,147 @@ .host = "127.0.0.1"; .port = "8080"; } +backend geoserver { + .host = "172.31.18.207"; + .port = "8983"; +} sub vcl_fetch { set beresp.grace = 1h; - - if (beresp.http.content-type ~ "(text|application)") { + unset beresp.http.Server; + # These status codes should always pass through and never cache. + if ( beresp.status >= 500 ) { + set beresp.ttl = 0s; + } + if (beresp.http.content-type ~ "(text|javascript|json|xml|html)") { set beresp.do_gzip = true; } + # CKAN cache headers are used by Varnish cache, but should not be propagated to + # the Internet. Tell browsers and proxies not to cache. This means Varnish always + # gets the responsibility to server the right content at all times. + if (beresp.http.Cache-Control ~ "max-age") { + unset beresp.http.set-cookie; + set beresp.http.Cache-Control = "no-cache"; + } + + # Encourage assets to be cached by proxies and browsers + # JS and CSS may be gzipped depending on headers + # see https://developers.google.com/speed/docs/best-practices/caching + if (req.url ~ "\.(css|js)") { + set beresp.http.Vary = "Accept-Encoding"; + } + + # Encourage assets to be cached by proxies and browsers for 1 day + if (req.url ~ "\.(png|gif|jpg|swf|css|js)") { + unset beresp.http.set-cookie; + set beresp.http.Cache-Control = "public, max-age=86400"; + set beresp.ttl = 1d; + } + + # Encourage CKAN vendor assets (which are versioned) to be cached by + # by proxies and browsers for 1 year + if (req.url ~ "^/scripts/vendor/") { + unset beresp.http.set-cookie; + set beresp.http.Cache-Control = "public, max-age=31536000"; + set beresp.ttl = 12m; + } +} +sub vcl_recv { + if (req.http.user-agent ~ "Ezooms" || req.http.user-agent ~ "Ahrefs") { + error 403; + } +if (req.url ~ "^/geoserver/") { + set req.backend = geoserver; + } else { + set req.backend = default; + #redirect secure traffic to https + if ( (req.http.Cookie ~ "auth_tkt" || req.http.Cookie ~ "ckan" || req.url ~ "user/(reset|login)") && req.http.X-Forwarded-Proto !~ "(?i)https") { + set req.http.x-Redir-Url = "https://data.gov.au" + req.url; + error 753 req.http.x-Redir-Url; + } + # remove locale links + if (req.url ~ "/((?!js)..|.._..|sr_Latn)/") { + set req.http.x-Redir-Url = regsub(req.url, "/((?!js)..|.._..|sr_Latn)/", "/"); + error 751 req.http.x-Redir-Url; + } + # rewrite broken resources + if (req.url ~ "leaflet") { + set req.url = regsub(req.url, "fanstatic/ckanext-spatial/:version:2013-09-13T02:32:17.87/:bundle:js/vendor/leaflet/images", "js/vendor/leaflet/images"); + } + # remove old hostnames + if (req.http.host ~ "data.australia.gov.au") { + set req.http.x-Redir-Url = "http://data.gov.au" + req.url; + error 751 req.http.x-Redir-Url; + } + + if (req.url ~ "^/_tracking") { + // exclude web spiders from statistics + if (req.http.user-agent ~ "Googlebot" || req.http.user-agent ~ "baidu" || req.http.user-agent ~ "bing") { + error 200; + } else { + return (pass); + } + } if (req.url ~ "\.(png|gif|jpg|jpeg|swf|css|js|woff|eot)$") { - unset beresp.http.set-cookie; + //Varnish to deliver content from cache even if the request othervise indicates that the request should be passed + return(lookup); } } -sub vcl_recv { - if (req.url ~ "^/_tracking") { - return (pass); - } - if (req.url ~ "\.(png|gif|jpg|jpeg|swf|css|js|woff|eot)$") { - return(lookup); - } + // Remove has_js and Google Analytics cookies. Evan added sharethis cookies + set req.http.Cookie = regsuball(req.http.Cookie, "(^|;\s*)(__[a-z]+|has_js|cookie-agreed-en|_csoot|_csuid|_chartbeat2)=[^;]*", ""); + + // Remove a ";" prefix, if present. + set req.http.Cookie = regsub(req.http.Cookie, "^;\s*", ""); + // Remove empty cookies. + if (req.http.Cookie ~ "^\s*$") { + unset req.http.Cookie; + } + + remove req.http.X-Forwarded-For; + set req.http.X-Forwarded-For = req.http.X-Real-IP; +} +sub vcl_hash { + # http://serverfault.com/questions/112531/ignoring-get-parameters-in-varnish-vcl + set req.url = regsub(req.url, "(?:(.com|.au))/((?!js)..|.._..|sr_Latn)/", "/"); + hash_data(req.url); + if (req.http.host) { + hash_data(req.http.host); + } else { + hash_data(server.ip); + } if (req.http.Cookie) { - set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__utm.=[^;]+;? *", "\1"); # removes all cookies named __utm? (utma, utmb...) - tracking thing - - if (req.http.Cookie == "") { - remove req.http.Cookie; - } - } -} + hash_data(req.http.Cookie); +} +} sub vcl_deliver { if (!resp.http.Vary) { set resp.http.Vary = "Accept-Encoding"; } else if (resp.http.Vary !~ "(?i)Accept-Encoding") { set resp.http.Vary = resp.http.Vary + ",Accept-Encoding"; } - if (obj.hits > 0) { - set resp.http.X-Cache = "HIT"; - } else { - set resp.http.X-Cache = "MISS"; - } + remove resp.http.X-Varnish; + remove resp.http.Via; + remove resp.http.Age; + remove resp.http.X-Powered-By; +if (req.url ~ "^/geoserver/") { + set resp.http.Access-Control-Allow-Origin = "*"; + set resp.http.Access-Control-Allow-Methods = "GET, POST, PUT, DELETE"; + set resp.http.Access-Control-Allow-Headers = "Origin, X-Requested-With, Content-Type, Accept"; +} } - +sub vcl_error { + remove obj.http.Server; + if (obj.status == 751) { + set obj.http.Location = obj.response; + set obj.status = 301; + return (deliver); + } + if (obj.status == 753) { + set obj.http.Location = obj.response; + set obj.status = 301; + return (deliver); + } +} # # Below is a commented-out copy of the default VCL logic. If you # redefine any of these subroutines, the built-in logic will be --- /dev/null +++ b/admin/development.ini @@ -1,1 +1,365 @@ - +# +# ckan - Pylons configuration +# +# The %(here)s variable will be replaced with the parent directory of this file +# +[DEFAULT] + +# Change debug to true when doing CKAN development, it enables Pylons' +# interactive debugging tool, makes Fanstatic serve unminified JS and CSS +# files, and enables CKAN templates' debugging features. +# +# WARNING: *THIS SETTING MUST BE SET TO FALSE ON A PRODUCTION ENVIRONMENT* +# Debug mode will enable the interactive debugging tool, allowing ANYONE to +# execute malicious code after an exception is raised. +debug = False + +email_to = ddg@alert.links.com.au +error_email_from = data.gov@finance.gov.au + +# The SMTP server to connect to when sending emails to users, with optional +# port (default: 25). For example: lavabit.com, or smtp.gmail.com:587. To +# connect to a local sendmail process enter 'localhost'. +#smtp.server = localhost +smtp.server = smtp.gmail.com:587 + +# Whether or not to use STARTTLS when connecting to the SMTP server. +#smtp.starttls = False +smtp.starttls = True + +# The username and password to use to authenticate with the SMTP server. +# Optional, if these are left commented-out then CKAN will try to send email +# to the SMTP server without logging in first. +#smtp.user = your_username@gmail.com +#smtp.password = your_password +smtp.user = datagovau@gmail.com +smtp.password = *** +googleanalytics.id = *** +# The email address that emails sent by CKAN to users should appear to come +# from. Optional (default: None, note that the SMTP server may insert its own +# from address). +smtp.mail_from = data.gov@finance.gov.au + +[server:main] +use = egg:Paste#http +host = 0.0.0.0 +port = 5000 + +[app:main] +use = egg:ckan +ckan.tracking_enabled = true +full_stack = true +cache_dir = %(here)s/data +beaker.session.key = ckan +beaker.session.secret = *** +app_instance_uuid = *** +# Auth + +ckan.auth.anon_create_dataset = false +ckan.auth.create_unowned_dataset = false +ckan.auth.create_dataset_if_not_in_organization = false +ckan.auth.user_create_organizations = false +ckan.auth.user_delete_organizations = true +ckan.auth.user_create_groups = false +ckan.auth.user_delete_groups = true +ckan.auth.create_user_via_api = true + +# List the names of CKAN extensions to activate. +# Note: This line is required to be here for packaging, even if it is empty. +# Note: Add ``pdf_preview`` to enable the resource preview for PDFs +# Add the ``resource_proxy`` plugin to enable resorce proxying and get around the same origin policy +# Add ``datastore`` to enable the CKAN DataStore extension +ckan.plugins = qa disqus stats json_preview recline_preview datastore datastorer googleanalytics resource_proxy wms_preview kml_preview geojson_preview datagovau + +disqus.name = datagovau + +# If you'd like to fine-tune the individual locations of the cache data dirs +# for the Cache data, or the Session saves, un-comment the desired settings +# here: +#beaker.cache.data_dir = %(here)s/data/cache +#beaker.session.data_dir = %(here)s/data/sessions + +# Specify the database for SQLAlchemy to use: +# * Postgres is currently required for a production CKAN deployment +# * Sqlite (memory or file) can be used as a quick alternative for testing +#sqlalchemy.url = postgresql://ckanuser:pass@localhost/ckantest +sqlalchemy.url = *** +#sqlalchemy.url = sqlite:/// +#sqlalchemy.url = sqlite:///%(here)s/somedb.db + +# Un-comment and specify the URLs for the DataStore database. +# * Postgres is required +#ckan.datastore.write_url = postgresql://ckanuser:pass@localhost/datastore +#ckan.datastore.read_url = postgresql://readonlyuser:pass@localhost/datastore +ckan.datastore.write_url = *** +ckan.datastore.read_url = *** + +# repoze.who config +who.config_file = %(here)s/who.ini +who.log_level = warning +who.log_file = %(cache_dir)s/who_log.ini + +# Location of RDF versions of datasets +#rdf_packages = http://semantic.ckan.net/record/ + +# Location of licenses group (defaults to cached local version of ckan group) +#licenses_group_url = http://licenses.opendefinition.org/licenses/groups/ckan.json +licenses_group_url = file://%(here)s/licenses.json + +# Dataset form to use +package_form = standard + +# Hide certain extras fields from dataset read form: +# package_hide_extras = for_search_index_only + +# API configuration +#apikey_header_name = X-CKAN-API-Key + +## extra places to look for templates and public files (comma separated lists) +## any templates/files found will override correspondingly named ones in +## ckan/templates/ and ckan/public +## (e.g. to override main layout template layout.html or add extra css files) +# extra_template_paths = %(here)s/my-templates +# extra_public_paths = %(here)s/my-public + +# Dataset form integration +#package_edit_return_url = http://another.frontend/dataset/ +#package_new_return_url = http://another.frontend/dataset/ + + +# Turn on messaging with carrot, default to false +#ckan.async_notifier = true +# Messaging module used by carrot: +# * pyamqplib - AMQP (e.g. for RabbitMQ) +# * queue - native Python Queue (debugging and tests only) +#carrot_messaging_library = pyamqplib + +## Perform search just using database (rather than use e.g. solr). +## In this setup search is crude and limited .e.g no full-text search, no faceting ... +## However, very useful for getting up and running quickly with CKAN +# ckan.simple_search = 1 + +## Title of site (using in several places including templates and tag +ckan.site_title = data.gov.au + +## Logo image to use on the home page +ckan.site_logo = /base/images/ckan-logo.png + +## Site tagline / description (used on front page) +ckan.site_description = Australian Government Open Data Catalogue + +## Used in creating some absolute urls (such as rss feeds, css files) and +## dump filenames +ckan.site_url = http://data.gov.au + +## Favicon (default is the CKAN software favicon) +ckan.favicon = /images/icons/ckan.ico + +## The gravatar default to use. This can be any of the pre-defined strings +## as defined on http://en.gravatar.com/site/implement/images/ (e.g. "identicon" +## or "mm"). Or it can be a url, e.g. "http://example.com/images/avatar.jpg" +ckan.gravatar_default = identicon + +## Solr support +solr_url = http://solr.data.gov.au:8983/solr + +## Automatic indexing. Make all changes immediately available via the search +## after editing or creating a dataset. Default is true. If for some reason +## you need the indexing to occur asynchronously, set this option to 0. +# ckan.search.automatic_indexing = 1 + +## An 'id' for the site (using, for example, when creating entries in a common search index) +## If not specified derived from the site_url +ckan.site_id = data.gov.au + +## API url to use (e.g. in AJAX callbacks) +## Enable if the API is at a different domain +# ckan.api_url = http://www.ckan.net + +## html content to be inserted just before </head> tag (e.g. extra stylesheet) +## NB: can use html e.g. <strong>blah</strong> +## NB: can have multiline strings just indent following lines +# ckan.template_head_end = <link rel="stylesheet" href="http://mysite.org/css/custom.css" type="text/css"> + +## html content to be inserted just before </body> tag (e.g. google analytics code) +## NB: can use html e.g. <strong>blah</strong> +## NB: can have multiline strings just indent following lines +# ckan.template_footer_end = + +# These three settings (ckan.log_dir, ckan.dump_dir and ckan.backup_dir) are +# all used in cron jobs, not in CKAN itself. CKAN logging is configured +# in the logging configuration below +# Directory for logs (produced by cron scripts associated with ckan) +ckan.log_dir = %(here)s/log +# Directory for JSON/CSV dumps (must match setting in apache config) +ckan.dump_dir = %(here)s/dump +# Directory for SQL database backups +ckan.backup_dir = %(here)s/backup + +# Default authorizations for new domain objects +#ckan.default_roles.Package = {"visitor": ["reader"], "logged_in": ["reader"]} +#ckan.default_roles.Group = {"visitor": ["reader"], "logged_in": ["reader"]} +#ckan.default_roles.System = {"visitor": ["reader"], "logged_in": ["editor"]} +#ckan.default_roles.AuthorizationGroup = {"visitor": ["reader"], "logged_in": ["reader"]} + +## Ckan public and private recaptcha keys [localhost] +#ckan.recaptcha.publickey = 6LcL-94SAAAAAKCHKLIgCYNJczalehF4a3GHlPyR +#ckan.recaptcha.privatekey = 6LcL-94SAAAAADCsq995yBsNl7lHEgJ3Ukqf4Ykq + +# Locale/languages +ckan.locale_default = en_GB +ckan.locales_offered = en_GB +# Languages are grouped by percentage of strings in CKAN 1.8 translated +# (those with 100% first, then those with >=80%, then >=50%, then <50%) and +# within these groups roughly sorted by number of worldwide native speakers +# according to Wikipedia. +ckan.locale_order = en_GB pt_BR ja it cs_CZ ca es fr el sv sr sr@latin no sk fi ru de pl nl bg ko_KR hu sa sl lv +ckan.locales_filtered_out = en + +## Atom Feeds +# +# Settings for customising the metadata provided in +# atom feeds. +# +# These settings are used to generate the <id> tags for both feeds +# and entries. The unique <id>s are created following the method +# outlined in http://www.taguri.org/ ie - they generate tagURIs, as specified +# in http://tools.ietf.org/html/rfc4151#section-2.1 : +# +# <id>tag:thedatahub.org,2012:/feeds/group/933f3857-79fd-4beb-a835-c0349e31ce76</id> +# +# Each component has the corresponding settings: +# +# "thedatahub.org" is ckan.feeds.authority_name +# "2012" is ckan.feeds.date +# + +# Leave blank to use the ckan.site_url config value, otherwise set to a +# domain or email address that you own. e.g. thedatahub.org or +# admin@thedatahub.org +ckan.feeds.authority_name = + +# Pick a date of the form "yyyy[-mm[-dd]]" during which the above domain was +# owned by you. +ckan.feeds.date = 2012 + +# If not set, then the value in `ckan.site_id` is used. +ckan.feeds.author_name = + +# If not set, then the value in `ckan.site_url` is used. +ckan.feeds.author_link = + +## File Store +# +# CKAN allows users to upload files directly to file storage either on the local +# file system or to online ‘cloud’ storage like Amazon S3 or Google Storage. +# +# If you are using local file storage, remember to set ckan.site_url. +# +# To enable cloud storage (Google or S3), first run: pip install boto +# +# @see http://docs.ckan.org/en/latest/filestore.html + +# 'Bucket' to use for file storage +ckan.storage.bucket = ckandga + +# To enable local file storage: +ofs.impl = pairtree +ofs.storage_dir = /srv/ckan/dga + +# To enable Google cloud storage: +#ofs.impl = google +#ofs.gs_access_key_id = +#ofs.gs_secret_access_key = + +# To enable S3 cloud storage: +#ofs.impl = s3 +#ofs.aws_access_key_id = .... +#ofs.aws_secret_access_key = .... + + +## Previews +# +# Set the file types that should be previewed inline (e.g. images) or directly in an iframe. + +ckan.preview.direct = png jpg gif +ckan.preview.loadable = html htm rdf+xml owl+xml xml n3 n-triples turtle plain atom csv tsv rss txt json + + +# Activity Streams +# +# Default maximum number of activities to show in an activity stream. +# ckan.activity_list_limit = 31 + + +# Activity Streams Email Notifications +# +# Uncomment this line to enable activity streams email notifications. +# You also need to setup a cron job to send the emails, see the documentation. +#ckan.activity_streams_email_notifications = True + +# Email notifications for events older than this time delta will not be sent. +# Accepted formats: '2 days', '14 days', '4:35:00' (hours, minutes, seconds), +# '7 days, 3:23:34', etc. +# ckan.email_notifications_since = 2 days + +ckan.cache_expires = 2592000 +#ckan.page_cache_enabled = True +ckan.static_max_age = 2592000 +ckan.cache_enabled = True +# DEBUGGING + +# ckan.debug_supress_header This option can be set to suppress the debug +# information showing the controller and action recieving the request being +# shown in the header. Note: This info only shows if debug is set to true. +ckan.debug_supress_header = false + +## =================================== +## Extensions + +## Config option to enable the (1 day) cache for stats +## Default (if not defined) is True as stats computations are intensive +# ckanext.stats.cache_enabled = True + +# Logging configuration +[loggers] +keys = root, ckan, ckanext + +[handlers] +keys = console, file + +[formatters] +keys = generic + +[logger_root] +level = WARNING +handlers = console, file + +[logger_ckan] +level = ERROR +handlers = console, file +qualname = ckan +propagate = 0 + +[logger_ckanext] +level = WARNING +handlers = console, file +qualname = ckanext +propagate = 0 + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[handler_file] +class = logging.handlers.RotatingFileHandler +formatter = generic +level = NOTSET +#args = ("ckan.log", "a", 20000000, 9) +args = ("/var/log/ckan/dga/ckan.log", "a", 20000000, 9) + +[formatter_generic] +format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s + --- /dev/null +++ b/admin/reset.sh @@ -1,1 +1,17 @@ +paster --plugin=ckan db clean --config=development.ini +echo "drop extension postgis cascade;" | psql -d ckantest +paster --plugin=ckan db clean --config=development.ini +#to initiate for first time instead of load from dump +#paster --plugin=ckan db init --config=development.in +#paster --plugin=ckan user add maxious password=snmc email=maxious@gmail.com +#paster --plugin=ckan sysadmin add maxious +#paster --plugin=ckan db dump dump.db + +#paster --plugin=ckan db load --config=development.ini dump.db +paster --plugin=ckan db load --config=development.ini dump.harvest.db +echo "create extension postgis;" | psql -d ckantest +#sleep 2 +paster --plugin=ckan search-index rebuild --config=development.ini +#rm -r /tmp/pairtree_* + --- a/ckanext/datagovau/plugin.py +++ b/ckanext/datagovau/plugin.py @@ -7,25 +7,20 @@ import ckan.model as model from pylons import config -#parse the activity feed for last active non-system user -def get_last_active_user(id): - system_user = lib.helpers.get_action('user_show',{'id': config.get('ckan.site_id', 'ckan_site_user')}) - user_list = [x for x in lib.helpers.get_action('package_activity_list',{'id':id}) if x['user_id'] != system_user['id']] - user = None - if len(user_list) > 0: - user = user_list[0].get('user_id', None) - if user is None: - return system_user - else: - return lib.helpers.get_action('user_show',{'id':user}) +from sqlalchemy import orm +import ckan.model # get user created datasets and those they have edited def get_user_datasets(user_dict): created_datasets_list = user_dict['datasets'] active_datasets_list = [x['data']['package'] for x in lib.helpers.get_action('user_activity_list',{'id':user_dict['id']}) if x['data'].get('package')] - return created_datasets_list + active_datasets_list - + raw_list = created_datasets_list + active_datasets_list + filtered_dict = {} + for dataset in raw_list: + if dataset['id'] not in filtered_dict.keys(): + filtered_dict[dataset['id']] = dataset + return filtered_dict.values() class DataGovAuPlugin(plugins.SingletonPlugin, tk.DefaultDatasetForm): @@ -35,16 +30,7 @@ ''' plugins.implements(plugins.IConfigurer, inherit=False) - plugins.implements(plugins.IDatasetForm, inherit=False) plugins.implements(plugins.ITemplateHelpers, inherit=False) - plugins.implements(plugins.IAuthFunctions) - - def datastore_search(context, data_dict): - return {'success': True} # allow all - - def get_auth_functions(self): - return {'datastore_search': datastore_search} - def update_config(self, config): # Add this plugin's templates dir to CKAN's extra_template_paths, so @@ -58,112 +44,6 @@ # config['licenses_group_url'] = 'http://%(ckan.site_url)/licenses.json' def get_helpers(self): - return {'get_last_active_user': get_last_active_user, 'get_user_datasets': get_user_datasets} - - def is_fallback(self): - # Return True to register this plugin as the default handler for - # package types not handled by any other IDatasetForm plugin. - return True - - def package_types(self): - # This plugin doesn't handle any special package types, it just - # registers itself as the default (above). - return [] + return {'get_user_datasets': get_user_datasets} - def create_package_schema(self): - schema = super(ExampleIDatasetFormPlugin, self).create_package_schema() - schema = self._modify_package_schema(schema) - return schema - - def update_package_schema(self): - schema = super(ExampleIDatasetFormPlugin, self).update_package_schema() - schema = self._modify_package_schema(schema) - return schema - - def show_package_schema(self): - schema = super(ExampleIDatasetFormPlugin, self).show_package_schema() - - # Don't show vocab tags mixed in with normal 'free' tags - # (e.g. on dataset pages, or on the search page) - schema['tags']['__extras'].append(tk.get_converter('free_tags_only')) - - # Add our custom_text field to the dataset schema. - # ignore_missing == optional - # ignore_empty == mandatory but not for viewing - # !!! always convert_from_extras first - schema.update({ - 'agency_program': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_missing')], - 'contact_point': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')], - 'spatial_coverage': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')], - 'granularity': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')], - 'jurisdiction': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')], - 'temporal_coverage': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')], - 'data_state': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')], - 'update_freq': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')] - }) - return schema - - def _modify_package_schema(self, schema): - # Add our custom_test metadata field to the schema, this one will use - # convert_to_extras instead of convert_to_tags. - # ignore_missing == optional - # not_empty == mandatory, enforced here while modifying - - schema.update({ - 'agency_program': [tk.get_validator('ignore_missing'), - tk.get_converter('convert_to_extras')], - 'contact_point': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')], - 'spatial_coverage': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')], - 'granularity': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')], - 'jurisdiction': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')], - 'temporal_coverage': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')], - 'data_state': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')], - 'update_freq': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')] - }) - return schema - - # These methods just record how many times they're called, for testing - # purposes. - # TODO: It might be better to test that custom templates returned by - # these methods are actually used, not just that the methods get - # called. - - def setup_template_variables(self, context, data_dict): - return super(ExampleIDatasetFormPlugin, self).setup_template_variables( - context, data_dict) - - def new_template(self): - return super(ExampleIDatasetFormPlugin, self).new_template() - - def read_template(self): - return super(ExampleIDatasetFormPlugin, self).read_template() - - def edit_template(self): - return super(ExampleIDatasetFormPlugin, self).edit_template() - - def search_template(self): - return super(ExampleIDatasetFormPlugin, self).search_template() - - def history_template(self): - return super(ExampleIDatasetFormPlugin, self).history_template() - - def package_form(self): - return super(ExampleIDatasetFormPlugin, self).package_form() - - --- /dev/null +++ b/ckanext/datagovau/templates/base.html @@ -1,1 +1,7 @@ +{% ckan_extends %} + {% block meta %} + {{ super() }} +<meta name="google-site-verification" content="B8scmW2_LMm4IW_ogXK9lojznO57GBpYlWrFjfGz3X8" /> + {% endblock %} + --- /dev/null +++ b/ckanext/datagovau/templates/dataviewer/base.html @@ -1,1 +1,11 @@ +{% ckan_extends %} +{% block scripts %} + {{ super() }} + <script> + preload_resource.url = preload_resource.url.replace("https:","").replace("http:",""); + preload_resource.original_url = preload_resource.original_url.replace("https:","").replace("http:",""); + </script> +{% endblock %} + + --- /dev/null +++ b/ckanext/datagovau/templates/dataviewer/snippets/data_preview.html @@ -1,1 +1,32 @@ +<div class="module-content ckanext-datapreview"> + {% if embed %} + {# images can be embedded directly #} + <img src="{{ resource_url }}"></img> + {% else %} + <div class="data-viewer-error js-hide"> + <p class="text-error"> + <i class="icon-info-sign"></i> + {{ _('This resource can not be previewed at the moment.') }} + <a href="#" data-toggle="collapse" data-target="#data-view-error"> + {{ _('Click here for more information.') }} + </a> + </p> + <p id="data-view-error" class="collapse"></p> + <p> + <a href="{{ raw_resource_url }}" class="btn btn-large resource-url-analytics" target="_blank"> + <i class="icon-large icon-download"></i> + {{ _('Download resource') }} + </a> + </p> + </div> + <iframe src="{{ resource_url }}" frameborder="0" width="100%" data-module="data-viewer"> + <p>{{ _('Your browser does not support iframes.') }}</p> + </iframe> + {% endif %} +</div> +<div class="embedhint" style="padding-left: 15px;"> +<h4>Embed this visualisation in your own website...</h4> +Copy the HTML in the box below and you can display this visualisation on your own website.<br/> +<textarea style="width:97%"><iframe src="{{ resource_url }}" frameborder="0" width="100%" height="600px"></iframe></textarea> +</div> --- /dev/null +++ b/ckanext/datagovau/templates/header.html @@ -1,1 +1,18 @@ +{% ckan_extends %} +{% block header_site_navigation %} + <nav class="section navigation"> + <ul class="nav nav-pills"> + {% block header_site_navigation_tabs %} + {{ h.build_nav_main( + ('search', _('Datasets')), + ('organizations_index', _('Organizations')), + ('about', _('About')) + ) }} + <li><a href="//data.gov.au/stats">Site Statistics</a></li> + <li><a href="https://datagovau.ideascale.com/">Feedback/Request Data</a></li> + {% endblock %} + </ul> + </nav> +{% endblock %} + --- /dev/null +++ b/ckanext/datagovau/templates/home/index.html @@ -1,1 +1,62 @@ +{% ckan_extends %} + {% block home_search %} +<div class="hero-secondary-inner"> +<script type="text/javascript" src="//www.google.com/jsapi"> +</script> +<script type="text/javascript"> +google.load("feeds", "1") //Load Google Ajax Feed API (version 1) +</script> + + <div id="feeddiv" style="padding-bottom: 66px;"> +</div> +</div> + + + +<script type="text/javascript"> + +var feedcontainer=document.getElementById("feeddiv") +var feedurl="http://www.finance.gov.au/taxonomy/term/1274/feed" +var feedlimit=3 +var rssoutput="<div class='module module-shallow module-narrow module-dark info box' style='color:black'><h2>Latest data.gov.au News</h2><i class='ckan-icon ckan-icon-feed'></i><a href='http://www.finance.gov.au/taxonomy/term/1274/feed/'> Subscribe to the blog </a></div>" + + +function rssfeedsetup(){ +var feedpointer=new google.feeds.Feed(feedurl) //Google Feed API method +feedpointer.setNumEntries(feedlimit) //Google Feed API method +feedpointer.load(displayfeed) //Google Feed API method +} + +function displayfeed(result){ +if (!result.error){ +var thefeeds=result.feed.entries +for (var i=0; i<thefeeds.length; i++) { +rssoutput+="<div class='module module-shallow module-narrow module-dark info box'><h3><a href='" + thefeeds[i].link + "'>" + thefeeds[i].title + "</a></h3>" +rssoutput+= " <font color='black'>Posted on " + new Date(thefeeds[i].publishedDate).toDateString() + "</font></div>" +} +rssoutput+="" +feedcontainer.innerHTML=rssoutput +} +else +alert("Error fetching feeds!") +} + +window.onload=function(){ +rssfeedsetup() +} + +</script> + + <form class="module-content search-form" method="get" action="{% url_for controller='package', action='search' %}"> + <h3 class="heading">{{ _("Search Your Data") }}</h3> + <div class="search-input control-group search-giant"> + <input type="text" class="search" name="q" value="{{ c.q }}" autocomplete="off" placeholder="{{ _('eg. Gold Prices') }}" /> + <button type="submit"> + <i class="icon-search"></i> + <span>{{ _('Search') }}</span> + </button> + </div> + </form> + {% endblock %} + --- /dev/null +++ b/ckanext/datagovau/templates/home/snippets/search.html @@ -1,1 +1,70 @@ +<div class="hero-secondary-inner"> +<script type="text/javascript" src="//www.google.com/jsapi"> +</script> +<script type="text/javascript"> +google.load("feeds", "1") //Load Google Ajax Feed API (version 1) +</script> + + <div id="feeddiv"> +</div> +</div> + + + +<script type="text/javascript"> + +var feedcontainer=document.getElementById("feeddiv") +var feedurl="http://www.finance.gov.au/taxonomy/term/1274/feed" +var feedlimit=4 +var rssoutput="<div class='module module-shallow module-narrow module-dark info box' style='color:black'><h2>Latest data.gov.au News</h2><i class='ckan-icon ckan-icon-feed'></i><a href='http://www.finance.gov.au/taxonomy/term/1274/feed/'> Subscribe to the blog </a></div>" + + +function rssfeedsetup(){ +var feedpointer=new google.feeds.Feed(feedurl) //Google Feed API method +feedpointer.setNumEntries(feedlimit) //Google Feed API method +feedpointer.load(displayfeed) //Google Feed API method +} + +function displayfeed(result){ +if (!result.error){ +var thefeeds=result.feed.entries +for (var i=0; i<thefeeds.length; i++) { +rssoutput+="<div class='module module-shallow module-narrow module-dark info box'><h3><a href='" + thefeeds[i].link + "'>" + thefeeds[i].title + "</a></h3>" +rssoutput+= " <font color='black'>Posted on " + new Date(thefeeds[i].publishedDate).toDateString() + "</font></div>" +} +rssoutput+="" +feedcontainer.innerHTML=rssoutput +} +else +alert("Error fetching feeds!") +} + +window.onload=function(){ +rssfeedsetup() +} + +</script> + +{% set tags = h.get_facet_items_dict('tags', limit=3) %} +{% set placeholder = _('eg. Gold Prices') %} + +<div class="module module-search module-narrow module-shallow box"> + <form class="module-content search-form" method="get" action="{% url_for controller='package', action='search' %}"> + <h3 class="heading">{{ _("Search Your Data") }}</h3> + <div class="search-input control-group search-giant"> + <input type="text" class="search" name="q" value="" autocomplete="off" placeholder="{{ placeholder }}" /> + <button type="submit"> + <i class="icon-search"></i> + <span>{{ _('Search') }}</span> + </button> + </div> + </form> + <div class="tags"> + <h3>{{ _('Popular Tags') }}</h3> + {% for tag in tags %} + <a class="tag" href="{% url_for controller='package', action='search', tags=tag.name %}">{{ h.truncate(tag.display_name, 22) }}</a> + {% endfor %} + </div> +</div> + --- a/ckanext/datagovau/templates/package/read.html +++ b/ckanext/datagovau/templates/package/read.html @@ -1,130 +1,18 @@ {% ckan_extends %} {% block primary_content_inner %} {{ super() }} - <div class="module-content"> {{ h.disqus_comments() }} </div> {% endblock %} -{% block package_additional_info %} -<section class="additional-info" prefix="dc: http://purl.org/dc/elements/1.1/ dcat: http://www.w3.org/ns/dcat# - dcam: http://purl.org/dc/dcam/ - aglsterms: http://www.agls.gov.au/agls/terms/ - agentterms: http://www.agls.gov.au/agls/agentterms/ - availterms: http://www.agls.gov.au/agls/availterms/ - adminterms: http://www.agls.gov.au/agls/adminterms/ - dct: http://purl.org/dc/terms/"> - <h3>{{ _('Additional Info') }}</h3> - <table class="table table-striped table-bordered table-condensed"> - <thead> - <tr> - <th scope="col">{{ _('Field') }}</th> - <th scope="col">{{ _('Value') }}</th> - </tr> - </thead> - <tbody> +{% block secondary_content %} + {{ super() }} - {# Add our custom field to the dataset read page. #} - {% if pkg.get('metadata_created') %} - <tr> - <th scope="row" class="dataset-label">Date Published</th> - <td class="dataset-details" property="dct:issued">{{ pkg.metadata_created.split("T")[0] }}</td> - </tr> - {% endif %} - {% if pkg.get('metadata_updated') %} - <tr> - <th scope="row" class="dataset-label">Date Updated</th> - <td class="dataset-details" property="dct:updated">{{ pkg.metadata_updated.split("T")[0] }}</td> - </tr> - {% endif %} - {% if pkg.get('agency_program') %} - <tr> - <th scope="row" class="dataset-label">Agency Program</th> - <td class="dataset-details"> {{ pkg.agency_program }}</td> - </tr> - {% endif %} - {% if pkg.get('url') %} - <tr> - <th scope="row" class="dataset-label">{{ _('Source') }}</th> - <td class="dataset-details" property="dct:source">{{ h.link_to(pkg.get('url'), - pkg.get('url'), rel='dct:source', target='_blank') }} - </td> - </tr> - {% endif %} - - {% if pkg.get('contact_point') %} - <tr> - <th scope="row" class="dataset-label">Contact Point</th> - <td class="dataset-details" property="dcat:contactPoint"> {{ h.mail_to(email_address=pkg.contact_point, - name=pkg.contact_point) }}</td> - </tr> - {% endif %} - {% if pkg.get('spatial_coverage') %} - - <tr> - <th scope="row" class="dataset-label">Geospatial Coverage</th> - <td class="dataset-details" property="dct:spatial"> {{ pkg.spatial_coverage }}</td> - </tr> - {% endif %} - {% if pkg.get('granularity') %} - - <tr> - <th scope="row" class="dataset-label">Data Granularity</th> - <td class="dataset-details"> {{ pkg.granularity }}</td> - </tr> - {% endif %} - {% if pkg.get('jurisdiction') %} - <tr> - <th scope="row" class="dataset-label">Government Jurisdiction</th> - <td class="dataset-details" property="aglsterms:AglsJuri"> {{ pkg.jurisdiction }}</td> - </tr> - {% endif %} - {% if pkg.get('temporal_coverage') %} - <tr> - <th scope="row" class="dataset-label">Temporal Coverage</th> - <td class="dataset-details" property="dct:temporal"> {{ pkg.temporal_coverage }}</td> - </tr> - {% endif %} - {% if pkg.get('data_state') %} - <tr> - <th scope="row" class="dataset-label">Data State</th> - <td class="dataset-details"> {{ pkg.data_state }}</td> - </tr> - {% endif %} - {% if pkg.get('update_freq') %} - - <tr> - <th scope="row" class="dataset-label">Update Frequency</th> - <td class="dataset-details"> {{ pkg.update_freq }}</td> - </tr> - {% endif %} - -{% set email =h.get_last_active_user(c.pkg_dict['id']).get('email','') %} - <tr> - <th scope="row" class="dataset-label">{{ _('Maintainer') }}</th> - <td class="dataset-details" property="dc:contributor">{{ - h.mail_to(email_address=(email or ' '), name=h.get_last_active_user(c.pkg_dict['id']).get("display_name",'')) }} - </td> - </tr> - <tr> - <th scope="row" class="dataset-label">Publisher/Agency</th> - <td class="dataset-details" property="dc:publisher">{{ c.pkg_dict['organization']['title']}} - </td> - </tr> - <tr> - <th scope="row" class="dataset-label">Type</th> - <td class="dataset-details" property="dc:type">Dataset</td> - </tr> - <tr> - <th scope="row" class="dataset-label">Language</th> - <td class="dataset-details" property="dc:language">English</td> - </tr> - - </tbody> - </table> -</section> - + {% set dataset_extent = h.get_pkg_dict_extra(c.pkg_dict, 'spatial', '') %} + {% if dataset_extent %} + {% snippet "spatial/snippets/dataset_map_sidebar.html", extent=dataset_extent %} + {% endif %} {% endblock %} --- a/ckanext/datagovau/templates/package/read.n3 +++ /dev/null @@ -1,45 +1,1 @@ -@prefix : <http://www.w3.org/2000/01/rdf-schema#> . -@prefix dcat: <http://www.w3.org/ns/dcat#> . -@prefix dct: <http://purl.org/dc/terms/> . -@prefix foaf: <http://xmlns.com/foaf/0.1/> . -@prefix owl: <http://www.w3.org/2002/07/owl#> . -@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . -<${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}> -a dcat:Dataset; - dct:description "${c.pkg_dict['notes']}"; - dct:identifier "${c.pkg_dict['name']}"; - dct:relation [ - rdf:value ""; - :label "change_note" ], - [ - rdf:value ""; - :label "definition_note" ], - [ - rdf:value ""; - :label "editorial_note" ], - [ - rdf:value ""; - :label "example_note" ], - [ - rdf:value ""; - :label "history_note" ], - [ - rdf:value ""; - :label "scope_note" ], - [ - rdf:value ""; - :label "skos_note" ], - [ - rdf:value ""; - :label "temporal_granularity" ], - [ - rdf:value ""; - :label "type_of_dataset" ], - [ - rdf:value ""; - :label "update_frequency" ]; - dct:title "${c.pkg_dict['title']}"; - :label "${c.pkg_dict['name']}"; - = <urn:uuid:${c.pkg_dict['id']}>; - foaf:homepage <http://127.0.0.1:5000/dataset/testt> . --- a/ckanext/datagovau/templates/package/read.rdf +++ /dev/null @@ -1,130 +1,1 @@ -<?xml version="1.0" encoding="utf-8"?> -<rdf:RDF - xmlns:py="http://genshi.edgewall.org/" - xmlns:foaf="http://xmlns.com/foaf/0.1/" - xmlns:owl="http://www.w3.org/2002/07/owl#" - xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dcat="http://www.w3.org/ns/dcat#" - xmlns:dcam="http://purl.org/dc/dcam/" - xmlns:aglsterms="http://www.agls.gov.au/agls/terms/" - xmlns:agentterms="http://www.agls.gov.au/agls/agentterms/" - xmlns:availterms="http://www.agls.gov.au/agls/availterms/" - xmlns:adminterms="http://www.agls.gov.au/agls/adminterms/" - xmlns:dct="http://purl.org/dc/terms/" - > - <dcat:Dataset rdf:about="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}"> - <dct:identifier>${c.pkg_dict['name']}</dct:identifier> - <dct:title>${c.pkg_dict['title']}</dct:title> - <dct:landingPage - rdf:resource="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True) }"/> - <owl:sameAs rdf:resource="urn:uuid:${c.pkg_dict['id']}"/> - <dct:type>Dataset</dct:type> - <dct:description>${c.pkg_dict['notes']}</dct:description> - <dct:issued>${c.pkg_dict['metadata_created']}</dct:issued> - <dct:modified>${c.pkg_dict['metadata_modified']}</dct:modified> - <dct:language>en</dct:language> -<py:choose> - <py:when test="c.pkg_dict.get('license_url',None)"> - <dct:license>${c.pkg_dict['license_url']}</dct:license> - <dct:rights rdf:resource="${c.pkg_dict['license_url']}"/> - </py:when> - <py:otherwise> - <dct:license>${c.pkg_dict['license_id']}</dct:license> - <dct:rights rdf:resource="${c.pkg_dict['license_id']}"/> - </py:otherwise> -</py:choose> - <py:for each="tag_dict in c.pkg_dict.get('tags',[])"> - <dcat:keyword>${ tag_dict["name"] }</dcat:keyword> - </py:for> - <py:for each="group_dict in c.pkg_dict.get('groups',[])"> - <dcat:theme>${ group_dict["title"] }</dcat:theme> - </py:for> - - <foaf:homepage - rdf:resource="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}"/> - <rdfs:label>${c.pkg_dict['name']}</rdfs:label> - - - <py:for each="rsc_dict in c.pkg_dict['resources']"> - <dcat:distribution> - <dcat:Distribution> - <dct:title>${rsc_dict.get('name')}</dct:title> - <owl:sameAs rdf:resource="urn:uuid:${rsc_dict.get('id')}"/> - <dct:description>${rsc_dict.get('description')}</dct:description> - <dcat:accessURL rdf:resource="${ rsc_dict.get('url') }"/> - <dct:created>${rsc_dict.get('created')}</dct:created> - <dct:modified>${rsc_dict.get('revision_timestamp')}</dct:modified> - <dcat:byteSize py:if="rsc_dict.get('size')">${rsc_dict.get('size')}</dcat:byteSize> - <dcat:mediaType py:if="rsc_dict.get('mimetype')">${rsc_dict.get('mimetype')}</dcat:mediaType> - <dct:extent py:if="rsc_dict.get('size')">${rsc_dict.get('size')} bytes</dct:extent> - <dct:format py:if="rsc_dict.get('format')"> - <dct:IMT> - <rdf:value>${rsc_dict.get('format')}</rdf:value> - <rdfs:label>${rsc_dict.get('format')}</rdfs:label> - </dct:IMT> - </dct:format> - <dct:title py:if="rsc_dict.get('name')">${rsc_dict.get('name')}</dct:title> - </dcat:Distribution> - </dcat:distribution> - </py:for> - <dct:publisher py:if="c.pkg_dict.get('organization', None)"> - <rdf:Description> - <foaf:name>${ c.pkg_dict['organization']['title'] }</foaf:name> - </rdf:Description> - </dct:publisher> - <dct:creator py:if="c.pkg_dict.get('organization', None)"> - <rdf:Description> - <foaf:name>${ c.pkg_dict['organization']['title'] }</foaf:name> - </rdf:Description> - </dct:creator> - <dct:contributor> - <rdf:Description> - <foaf:name>${h.get_last_active_user(c.pkg_dict['id'])["display_name"]}</foaf:name> - <foaf:mbox py:if="h.get_last_active_user(c.pkg_dict['id']).get('email', None)" - rdf:resource="mailto:${h.get_last_active_user(c.pkg_dict['id'])['email']}"/> - </rdf:Description> - </dct:contributor> - - - <foaf:homepage py:if="c.pkg_dict.get('url')">${c.pkg_dict.get('url')}</foaf:homepage> - <dcat:contactPoint py:if="c.pkg_dict.get('contact_point')">${c.pkg_dict.contact_point }</dcat:contactPoint> - <dct:spatial py:if="c.pkg_dict.get('spatial_coverage')">${ c.pkg_dict.spatial_coverage }</dct:spatial> - <aglsterms:AglsJuri py:if="c.pkg_dict.get('jurisdiction')">${ c.pkg_dict.jurisdiction }</aglsterms:AglsJuri> - <dct:temporal py:if="c.pkg_dict.get('temporal_coverage')">${ c.pkg_dict.get('temporal_coverage') }</dct:temporal> - <dct:relation py:if="c.pkg_dict.get('data_state')"> - <rdf:Description> - <rdfs:label>Data State</rdfs:label> - <rdf:value>${ c.pkg_dict.get('data_state') }</rdf:value> - </rdf:Description> - </dct:relation> - <dct:relation py:if="c.pkg_dict.get('update_freq')"> - <rdf:Description> - <rdfs:label>Update Frequency</rdfs:label> - <rdf:value>${ c.pkg_dict.get('update_freq') }</rdf:value> - </rdf:Description> - </dct:relation> - <dct:relation py:if="c.pkg_dict.get('agency_program')"> - <rdf:Description> - <rdfs:label>Agency Program</rdfs:label> - <rdf:value>${ c.pkg_dict.get('agency_program') }</rdf:value> - </rdf:Description> - </dct:relation> - <dct:relation py:if="c.pkg_dict.get('granularity')"> - <rdf:Description> - <rdfs:label>Data Granularity</rdfs:label> - <rdf:value>${ c.pkg_dict.get('granularity') }</rdf:value> - </rdf:Description> - </dct:relation> - <py:for each="extra_dict in c.pkg_dict.get('extras',[])"> - <dct:relation> - <rdf:Description> - <rdfs:label>${extra_dict.get('key','')}</rdfs:label> - <rdf:value>${extra_dict.get('value','')}</rdf:value> - </rdf:Description> - </dct:relation> - </py:for> - </dcat:Dataset> -</rdf:RDF> - --- a/ckanext/datagovau/templates/package/read_base.html +++ /dev/null @@ -1,47 +1,1 @@ -{% ckan_extends %} -{% block links -%} -{{ super() }} -<link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" /> -<link rel="schema.AGLSTERMS" href="http://www.agls.gov.au/agls/terms/" /> - -{% endblock -%} - -{% block head_extras -%} -{{ super() }} -<meta name="DCTERMS.Language" scheme="RFC3066" content="en" /> -<meta name="DCTERMS.Type" scheme="AGLSTERMS.Document" content="dataset" /> -<meta name="DCTERMS.Creator" scheme="AGLSTERMS.AglsAgent" content="{{ pkg['organization']['title'] }}" /> -<meta name="DCTERMS.Modified" scheme="DCTERMS.ISO8601" content="{{pkg['metadata_modified']}}" /> -<meta name="DCTERMS.Published" scheme="DCTERMS.ISO8601" content="{{pkg['metadata_created']}}" /> -<meta name="DCTERMS.Source.URI" content="{{pkg.url}}" /> -<meta name="DCTERMS.License" content="{{pkg['license_url']}}" /> -<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage}}" /> -<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage}}" /> -<meta name="AGLSTERMS.Jurisdiction" scheme="AGLSTERMS.AglsJuri" content="{{pkg.jurisdiction}}" /> -<meta name="DCAT.Theme" scheme="VO" content="{% for x in pkg.groups %}{{x['title']}},{% endfor %}" /> -<meta name="DCTERMS.Identifier" content="{{h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}}" /> -<meta name="DCTERMS.Title" content="{{pkg['title']}}" /> -<meta name="DCTERMS.Description" scheme="" content="{{pkg['notes']}}" /> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - -{% endblock -%} - -{% block package_info %} -<div class="module context-info"> - <div class="module-content"> - <h1 class="heading" property="dc:title">{{ pkg.title or pkg.name }}</h1> - <div class="nums"> - <dl> - <dt>{{ _('Followers') }}</dt> - <dd>{{ h.SI_number_span(h.get_action('dataset_follower_count', {'id': pkg.id})) }}</dd> - </dl> - </div> - <div class="follow_button"> - {{ h.follow_button('dataset', pkg.name) }} - </div> - </div> -</div> -{% endblock %} - - --- a/ckanext/datagovau/templates/package/resource_read.html +++ /dev/null @@ -1,35 +1,1 @@ -{% ckan_extends %} -{% block links -%} -{{ super() }} -<link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" /> -<link rel="schema.AGLSTERMS" href="http://www.agls.gov.au/agls/terms/" /> - -{% endblock -%} - -{% block head_extras -%} -{{ super() }} -<meta name="DCTERMS.Language" scheme="RFC3066" content="en" /> -<meta name="DCTERMS.Type" scheme="AGLSTERMS.Document" content="dataset" /> -<meta name="DCTERMS.Creator" scheme="AGLSTERMS.AglsAgent" content="{{ pkg['organization']['title'] }}" /> -<meta name="DCTERMS.Modified" scheme="DCTERMS.ISO8601" content="{{res['revision_timestamp']}}" /> -<meta name="DCTERMS.Published" scheme="DCTERMS.ISO8601" content="{{res['created']}}" /> -<meta name="DCTERMS.Source.URI" content="{{pkg.url}}" />{% endif %} -<meta name="DCTERMS.License" content="{{pkg['license_url']}}" /> -<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage}}" /> -<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage}}" /> -<meta name="AGLSTERMS.Jurisdiction" scheme="AGLSTERMS.AglsJuri" content="{{pkg.jurisdiction}}" /> -<meta name="DCAT.Theme" scheme="VO" content="{% for x in pkg.groups %}{{x['title']}},{% endfor %}" /> -<meta name="DCAT.byteSize" content="{{res.get('size')}}" /> -<meta name="DCAT.mediaType" content="{{res.get('mimetype')}}" /> -<meta name="DCTERMS.Identifier" content="{{res.get('url')}}" /> -<meta name="DCTERMS.Title" content="{{res['name']}}" /> -<meta name="DCTERMS.Description" scheme="" content="{{res['description']}}" /> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="DCTERMS.Format" content="{{res.format}}" /> -<meta name="DCTERMS.File.Size" content="{{res.size}}" /> - -{% endblock -%} - - - --- /dev/null +++ b/ckanext/datagovau/templates/package/search.html @@ -1,1 +1,7 @@ +{% ckan_extends %} +{% block secondary_content %} +{{ super() }} + {% snippet "spatial/snippets/spatial_query.html", default_extent="[[-11, 114], [-42, 154]]" %} +{% endblock %} + --- a/ckanext/datagovau/templates/package/snippets/package_basic_fields.html +++ b/ckanext/datagovau/templates/package/snippets/package_basic_fields.html @@ -1,42 +1,4 @@ {% ckan_extends %} - -{% block package_basic_fields_org %} - -{{ super() }} - - -{{ form.input('agency_program', label=_('Agency Program'), id='field-agency_program', -placeholder=_('Name of the Agency Program that generated the data if relevant'), -value=data.agency_program, error=errors.agency_program, classes=['control-medium']) }} - -{{ form.input('contact_point', label=_('Contact Point'), id='field-contact_point', -placeholder=_('Email address for questions about content of dataset'), -value=data.contact_point, error=errors.contact_point, classes=['control-medium']) }} - -{{ form.input('spatial_coverage', label=_('Geospatial Coverage'), id='field-spatial_coverage', -placeholder=_('The geographical area covered by the data. Eg: Whole of Australia, New South Wales, Canberra'), -value=data.spatial_coverage, error=errors.spatial_coverage, classes=['control-medium']) }} - -{{ form.input('granularity', label=_('Data Granularity'), id='field-granularity', -placeholder=_('Granularity in time, place etc. Eg: incidents reports on daily basis by location.'), -value=data.granularity, error=errors.granularity, classes=['control-medium']) }} - -{{ form.input('jurisdiction', label=_('Government Jurisdiction'), id='field-jurisdiction', -placeholder=_('New South Wales, Glenorchy City Council, Federal'), -value=data.jurisdiction, error=errors.jurisdiction, classes=['control-medium']) }} - -{{ form.input('temporal_coverage', label=_('Temporal Coverage'), id='field-temporal_coverage', -placeholder=_('The timespan the dataset relates to: Current, 2008, 2008-2012, Jan 2012'), -value=data.temporal_coverage, error=errors.temporal_coverage, classes=['control-medium']) }} - -{{ form.select('data_state', label=_('Data State'), options= [{'value': 'active', 'text': 'Active'}, {'value': 'inactive', 'text': 'Inactive'}], -selected='Active', error=errors.data_state) }} - -{{ form.input('update_freq', label=_('Update Frequency'), id='field-update_freq', -placeholder=_('How often the dataset is updated. Eg: Daily, Weekly, Never'), -value=data.update_freq, error=errors.update_freq, classes=['control-medium']) }} - -{% endblock %} {% block package_basic_fields_license %} @@ -61,3 +23,4 @@ </div> </div> {% endblock %} + --- a/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html +++ b/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html @@ -8,20 +8,6 @@ {% endblock %} {# https://github.com/okfn/ckan/blob/master/ckan/templates/macros/form.html documents the macros for fields #} - -{% block package_metadata_fields %} -{{ form.input('url', label=_('Source URL'), id='field-url', -placeholder=_('URL where dataset came from or more information can be obtained'), -value=data.url, error=errors.url, classes=['control-medium']) }} -{{ super() }} - -{% endblock %} - -{% block package_metadata_author %} -{% endblock %} - -{% block package_metadata_fields_maintainer %} -{% endblock %} {% block dataset_fields %} {% if data.groups %} @@ -41,3 +27,4 @@ {% set group_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/group/autocomplete?q=?', 'data-module-key': 'id', 'data-module-label': 'title'} %} {{ form.input(group_name, label=_('Add Group/Theme'), id="field-group", value=data[group_name], classes=['control-medium'], attrs=group_attrs) }} {% endblock %} + --- a/ckanext/datagovau/templates/package/snippets/resource_item.html +++ /dev/null @@ -1,54 +1,1 @@ -{% ckan_extends %} -{% set url = h.url_for(controller='package', action='resource_read', id=pkg.name, resource_id=res.id) %} -<li class="resource-item" vocab="http://www.w3.org/ns/dcat#" - typeof="Distribution"> - {% block resource_item_title %} - <a class="heading" href="{{ url }}" title="{{ res.name or res.description }}" property="title"> - {{ h.resource_display_name(res) | truncate(50) }}<span class="format-label" property="dc:format" data-format="{{ res.format.lower() or 'data' }}">{{ res.format }}</span> - {{ h.popular('views', res.tracking_summary.total, min=10) }} - </a> - {% endblock %} - <p class="description" property="description"> - {% if res.description %} - {{ h.markdown_extract(res.description, extract_length=80) }} - {% else %} - <span class="empty">{{ _('No description for this resource') }}</span> - {% endif %} - </p> - {% block resource_item_explore %} - <div class="dropdown btn-group"> - <a href="#" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"> - <i class="icon-share-alt"></i> - {{ _('Explore') }} - <span class="caret"></span> - </a> - <ul class="dropdown-menu"> - {% block resource_item_explore_links %} - <li> - <a href="{{ url }}" property="accessURL"> - {% if res.can_be_previewed %} - <i class="icon-bar-chart"></i> - {{ _('Preview') }} - {% else %} - <i class="icon-info-sign"></i> - {{ _('More information') }} - {% endif %} - </a> - </li> - <li> - <a href="{{ res.url }}" class="resource-url-analytics" target="_blank" property="accessURL"> - {% if res.can_be_previewed %} - <i class="icon-download"></i> - {{ _('Download') }} - {% else %} - <i class="icon-external-link"></i> - {{ _('Go to resource') }} - {% endif %} - </a> - </li> - {% endblock %} - </ul> - </div> - {% endblock %} -</li>