[ckan-changes] commit/ckanext-datano: 3 new changesets
Bitbucket
commits-noreply at bitbucket.org
Tue Jun 21 09:30:26 UTC 2011
3 new changesets in ckanext-datano:
http://bitbucket.org/okfn/ckanext-datano/changeset/990c772b2ddc/
changeset: 990c772b2ddc
user: sebbacon
date: 2011-06-21 11:28:44
summary: disable mi.difi.no logout call (by commenting out; left in for easy renabling in future)
affected #: 1 file (100 bytes)
--- a/ckanext/datano/plugin.py Fri Jun 10 16:28:41 2011 +0100
+++ b/ckanext/datano/plugin.py Tue Jun 21 10:28:44 2011 +0100
@@ -54,5 +54,7 @@
class CustomUserController(UserController):
def custom_logged_out(self):
logout_url = "https://mi.difi.no/?logout=393ca412-6233-475a-a229-002c3349"
- urllib2.urlopen(logout_url)
+ # XXX uncomment the following if and when mi.difi.no activate
+ # a logout API call
+ # urllib2.urlopen(logout_url)
return self.logged_out()
http://bitbucket.org/okfn/ckanext-datano/changeset/371808b9a536/
changeset: 371808b9a536
user: sebbacon
date: 2011-06-21 11:29:16
summary: profile edit form shouldn't allow password reset as logins are controlled exclusively via mi.difi.no oauth service
affected #: 1 file (1.4 KB)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ckanext/datano/theme/templates/user/edit.html Tue Jun 21 10:29:16 2011 +0100
@@ -0,0 +1,44 @@
+<html xmlns:py="http://genshi.edgewall.org/"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ py:strip="">
+
+ <py:def function="page_title">${c.user} - Edit - User</py:def>
+
+ <py:def function="optional_head">
+ <link rel="stylesheet" href="${g.site_url}/css/forms.css" type="text/css" media="screen, print" />
+ </py:def>
+
+ <div py:match="content">
+ <h2>
+ Edit User: ${c.user}
+ <a href="#preview" py:if="c.preview">(skip to preview)</a>
+ </h2>
+
+ <form id="user-edit" action="" method="post" class="simple-form"
+ xmlns:py="http://genshi.edgewall.org/"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ >
+ <label for="about">About user:</label>
+ <textarea id="about" rows="5" name="about" cols="60">${c.user_about}</textarea>
+ <p class="small" i18n:msg="">You can use <a href="http://daringfireball.net/projects/markdown/syntax">Markdown formatting</a> here.</p>
+
+ <div>
+ <input name="preview" type="submit" value="Preview" />
+ ${h.submit('save', _('Save'))}
+ </div>
+ </form>
+
+
+ <div id="preview" style="margin-left: 20px;" py:if="c.preview">
+ <hr />
+ <h2>Preview</h2>
+ <h4>Full name: ${c.user_fullname}</h4>
+ <div style="border: 2px dashed red; padding: 5px;">
+ ${c.preview}
+ </div>
+ </div>
+ </div>
+
+ <xi:include href="layout.html" />
+</html>
http://bitbucket.org/okfn/ckanext-datano/changeset/ad09c48a8283/
changeset: ad09c48a8283
user: sebbacon
date: 2011-06-21 11:30:13
summary: merge from default
affected #: 5 files (6.6 KB)
--- a/ckanext/datano/__init__.py Tue Jun 21 10:29:16 2011 +0100
+++ b/ckanext/datano/__init__.py Tue Jun 21 10:30:13 2011 +0100
@@ -0,0 +1,1 @@
+
\ No newline at end of file
--- a/ckanext/datano/package_datano.py Tue Jun 21 10:29:16 2011 +0100
+++ b/ckanext/datano/package_datano.py Tue Jun 21 10:30:13 2011 +0100
@@ -102,15 +102,28 @@
builder.add_field(common.TextExtraField('taxonomy_url'))
builder.add_field(common.TextExtraField('title_en'))
builder.add_field(common.TextExtraField('notes_en'))
+ builder.add_field(common.TextExtraField('external_rss'))
# Labels and instructions
builder.set_field_text('national_statistic', _('National Statistic'))
+ builder.set_field_text('external_rss', _('External RSS'), instructions=_('Link to the data owner\'s external RSS feed.'))
+ builder.set_field_text('title_en', _('Title EN'), instructions=_('Title in English. Translate what you wrote in the previous field to English.'))
+ builder.set_field_text('notes_en', _('Notes EN'), instructions=_('Description in English. Translate what you wrote in the previous field to English.'))
+ builder.set_field_text('date_released', _('Date released'), instructions=_('Date when data source was made available.'), hints=_('Format: DD/MM/YYYY'))
+ builder.set_field_text('update_frequency', _('Update frequency'), instructions=_('How often will the data be updated.'), hints=_('e.g. annually, monthly'))
+ builder.set_field_text('geographic_coverage', _('Geographic coverage'), instructions=_('Select geographic coverage for your data set.'))
+ builder.set_field_text('temporal_coverage', _('Temporal coverage'), instructions=_('Temporal coverage for the data set.'), hints=_('Format: DD/MM/YYYY'))
+ builder.set_field_text('author_email', _('Author email'), instructions=_('Email of the main contact for this data source.'))
+ builder.set_field_text('maintainer_email', _('Maintainer email'), instructions=_('Email of a person that can be contacted for questions regarding this data source.'))
+
# Options/settings
builder.set_field_option('tags', 'with_renderer', SuggestTagRenderer)
builder.set_field_option('notes_en', 'textarea', {'size':'60x15'})
builder.set_field_option('title', 'validate', required)
+ builder.set_field_option('notes', 'validate', required)
+
if restrict:
for field_name in ('name', 'department', 'national_statistic'):
@@ -126,7 +139,7 @@
'author', 'author_email',
'maintainer', 'maintainer_email',
'license_id',
- 'url']),
+ 'url', 'external_rss']),
(_('Resources'), ['resources']),
(_('More details'), []),
])
@@ -140,6 +153,7 @@
_('Geographic coverage'), _('Temporal granularity'),
_('Temporal coverage'), _('Categories'), _('National Statistic'),
_('Precision'), _('Taxonomy URL'), _('Department'), _('Agency'),
+ _('External RSS'),
]
def get_datano_fieldset(is_admin=False, user_editable_groups=None, **kwargs):
--- a/ckanext/datano/plugin.py Tue Jun 21 10:29:16 2011 +0100
+++ b/ckanext/datano/plugin.py Tue Jun 21 10:30:13 2011 +0100
@@ -29,7 +29,7 @@
config.get('extra_template_paths', '')])
config['googleanalytics.id'] = ''
config['ckan.site_title'] = "data.norge.no datakatalog"
- config['ckan.site_logo'] = "http://drupal1.computas.no/ckan/img/fad_logo_ckan.png"
+ config['ckan.site_logo'] = "http://drupal1.computas.no/ckan/img/fad_logo_ckan.png" # XXX change. Currently not in use.
config['ckan.favicon'] = "http://drupal1.computas.no/ckan/img/favicon.ico"
config['package_form'] = "datano_package_form" # XXX change
--- a/ckanext/datano/theme/public/css/extra.css Tue Jun 21 10:29:16 2011 +0100
+++ b/ckanext/datano/theme/public/css/extra.css Tue Jun 21 10:30:13 2011 +0100
@@ -1,1 +1,198 @@
+#menu {
+ background: url("/sites/all/themes/danland/images/menu_dnn.png") repeat-x scroll 0 0 transparent;
+ height: 35px;
+ margin: 10px auto;
+ width: 943px;
+}
+#header-middle {
+ float: left;
+ padding-top: 5px;
+}
+
+#header-first {
+ float: left;
+}
+
+.logo-text {
+ display: inline;
+ color: #336699;
+ font-family: Verdana,Tahoma;
+ font-size: 14px;
+ font-weight: bold;
+ padding-left: 15px;
+ position: relative;
+}
+
+.logo-name {
+ background: url("/sites/all/themes/danland/datano/images/gradient-bak-overskrift.png") no-repeat scroll 0 0 transparent;
+ display: block;
+ font-family: Cambria,"Times New Roman";
+ font-size: 34px;
+ line-height: 50px;
+ padding-left: 15px;
+ padding-top: 0;
+ position: relative;
+}
+.logo-name a {
+ color: #FF6600 !important;
+ font-family: Cambria,"Times New Roman";
+ font-style: normal;
+ font-weight: normal !important;
+}
+
+.logo-name a:hover {
+ text-decoration: none;
+}
+
+.logo IMG {
+ height: 75px;
+}
+
+/*
+a:link {
+ color: #005A8C;
+ font-weight: bold;
+ text-decoration: none;
+}
+
+a:visited {
+ color: #005A8C;
+ font-weight: bold;
+ text-decoration: none;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+*/
+
+#fad-header {
+ color: #000000;
+ font-family: Verdana,Arial,Helvetica,sans-serif;
+ line-height: 1.5em;
+ clear: both;
+ margin: 0 auto;
+ position: relative;
+}
+
+#rounded-menu-left {
+ background: url("/sites/all/themes/danland/images/menu_dnn.png") no-repeat scroll 0 0 transparent;
+ float: left;
+ font-size: 0;
+ height: 35px;
+ line-height: 0;
+ width: 1px;
+}
+
+#rounded-menu-right {
+ background: url("/sites/all/themes/danland/images/menu_dnn.png") no-repeat scroll 0 0 transparent;
+ float: right;
+ font-size: 0;
+ height: 35px;
+ line-height: 0;
+ width: 14px;
+}
+
+#nav {
+ background: url("/sites/all/themes/danland/images/menu_dnn.png") repeat-x scroll 0 0 transparent;
+ float: left;
+ height: 35px;
+}
+
+
+#nav li:first-child {
+ background: url("/sites/all/themes/danland/images/menu_dnn.png") repeat-x scroll 0 0 transparent;
+ float: left;
+ height: 35px;
+ padding: 0 1px 0 0;
+}
+
+
+#nav li {
+ background: url("/sites/all/themes/danland/images/menu_dnn_separator.png") no-repeat scroll left top transparent;
+ float: left;
+ height: 35px;
+ padding: 0 1px 0 0;
+}
+
+#nav li a:hover {
+ color: #FF6600;
+}
+
+/*
+#nav li.active-trail a {
+ color: #FF6600;
+}
+*/
+
+#nav li a {
+ font-family: Arial,Helvetica,sans-serif;
+ color: #000000;
+ display: inline-block;
+ font-size: 12px;
+ font-weight: bold;
+ height: 25px;
+ padding: 7px 29px 0;
+ text-decoration: none;
+}
+
+ul.links {
+ margin: 0;
+ padding: 0;
+}
+
+ul.links li.first {
+ border: medium none;
+}
+
+ul.links li, ul.inline li {
+ background-image: none;
+}
+
+ul.inline li, ul.links li {
+ background: none repeat scroll 0 0 transparent;
+ margin: 0;
+ padding: 0 1em 0 0;
+}
+
+ul.links li {
+ display: inline;
+ list-style-type: none;
+ padding: 0 0.5em;
+}
+
+.links li {
+ margin: 0;
+ padding: 0;
+}
+
+ul.links li, ul.menu li, .item-list ul.links li, li.leaf {
+ background: url("/sites/all/themes/danland/images/menu-leaf.gif") no-repeat scroll 1px 0.35em transparent;
+ list-style-image: none;
+ list-style-type: none;
+ padding: 0 0 0.2em 1.5em;
+}
+
+body {
+ font-size: 84%;
+}
+
+div.header-first {
+ width: 73px;
+}
+
+#top-bar {
+position: relative;
+top: -130px;
+white-space: nowrap;
+}
+
+#top-bar-login {
+max-width: 200px;
+}
+
+#access {
+position: relative;
+top: -38px;
+}
--- a/ckanext/datano/theme/templates/layout.html Tue Jun 21 10:29:16 2011 +0100
+++ b/ckanext/datano/theme/templates/layout.html Tue Jun 21 10:30:13 2011 +0100
@@ -23,7 +23,61 @@
<a href="${g.site_url}/user/login?oauth_login=1">Login</a></span></py:match>
-
+
+<!-- ! override header div: add data.norge.no header and tabs -->
+ <py:match path="//div[@id='branding']">
+
+ <div id="fad-header">
+ <div id="header-wrapper">
+ <div id="header-first">
+ <div class="logo">
+ <a title="Hjem" href="/"><img height="50" alt="Hjem" src="${g.site_url}/../sites/all/themes/danland/datano/images/FAD_logo.gif" /></a>
+ </div>
+ </div>
+ <!-- /header-first -->
+ <div id="header-middle">
+ <div class="logo-text">FORNYINGS-, ADMINISTRASJONS- OG KIRKEDEPARTEMENTET</div>
+ <div class="logo-name">
+ <a title="Hjem" href="/">data.norge.no</a>
+ </div>
+ </div>
+ <!-- /header-wrapper -->
+ </div>
+ <div style="clear: both"></div>
+ <div id="menu">
+ <div id="rounded-menu-left"></div>
+ <!-- PRIMARY -->
+ <div id="nav">
+ <ul class="links">
+ <li class="menu-2620"><a title="Hjem" href="/">Hjem</a>
+ </li>
+ <li class="menu-2574"><a title="Data" href="/data">Data</a>
+ </li>
+ <li class="menu-2575"><a title="Apps" href="/apps">Apps</a>
+ </li>
+ <li class="menu-2560"><a title="" href="/blogg">Blogg</a>
+ </li>
+ <li class="menu-2563"><a title="Ideer" href="/ideer">Ideer</a>
+ </li>
+ <li class="menu-2565"><a title="Forespørsler" href="/foresporsler">Forespørsler</a>
+ </li>
+ <li class="menu-1309"><a title="Ressurser" href="/ressurser">Ressurser</a>
+ </li>
+ <li class="menu-2566"><a title="" href="/oppdrag">Oppdrag</a>
+ </li>
+ <li class="menu-548 last"><a title="Om" href="/om">Om</a>
+ </li>
+ </ul>
+ </div>
+ <!-- /primary -->
+ <div id="rounded-menu-right"></div>
+ </div>
+ <div style="clear: both"></div>
+ </div>
+
+ </py:match>
+
+<!-- ! override language links (remove them) --><py:match path="//div[@id='footer-widget-area']/div/ul[4]"><!-- this comment replaces the language selector --></py:match>
Repository URL: https://bitbucket.org/okfn/ckanext-datano/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the ckan-changes
mailing list