[ckan-changes] commit/ckan: 8 new changesets
Bitbucket
commits-noreply at bitbucket.org
Thu Aug 25 10:01:16 UTC 2011
8 new changesets in ckan:
http://bitbucket.org/okfn/ckan/changeset/09af0ab49a5d/
changeset: 09af0ab49a5d
branch: refactor-1282-js-wui-cruft
user: rgrp
date: 2011-08-23 11:06:27
summary: [refactor,controller/home][s]: remove tagcloud from front page (refs #1282).
* Tag cloud of very dubious UI value (and disabled in current default)
* If tag cloud wanted should become a widget / recipe (will put up recipe based on current approach on wiki.ckan.net)
affected #: 3 files (1.1 KB)
--- a/ckan/controllers/home.py Tue Aug 23 09:47:16 2011 +0100
+++ b/ckan/controllers/home.py Tue Aug 23 10:06:27 2011 +0100
@@ -46,10 +46,9 @@
etag_cache(cache_key)
query = query_for(model.Package)
- query.run(query='*:*', facet_by=g.facets,
+ query.run(query='*:*',
limit=0, offset=0, username=c.user,
order_by=None)
- c.facets = query.facets
c.fields = []
c.package_count = query.count
c.latest_packages = get_action('current_package_list_with_resources')({'model': model,
--- a/ckan/public/scripts/jquery.tagcloud.js Tue Aug 23 09:47:16 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-// Courtesy of http://github.com/addywaddy/jquery.tagcloud.js
-// As of 2010-02-11
-(function($) {
- $.fn.tagcloud = function(options) {
- var opts = $.extend({}, $.fn.tagcloud.defaults, options);
- tagWeights = this.map(function(){
- return $(this).attr("rel");
- })
- tagWeights = jQuery.makeArray(tagWeights).sort(compareWeights);
- lowest = tagWeights[0];
- highest = tagWeights.pop();
- range = highest - lowest;
- if(range == 0) {range = 1};
- // Sizes
- if (opts.size) {
- fontIncr = (opts.size.end - opts.size.start)/range;
- }
- // Colors
- if (opts.color) {
- colorIncr = colorIncrement (opts.color, range);
- }
- return this.each(function() {
- weighting = $(this).attr("rel") - lowest;
- if (opts.size) {
- $(this).css({"font-size": opts.size.start + (weighting * fontIncr) + opts.size.unit});
- }
- if (opts.color) {
- $(this).css({"color": tagColor(opts.color, colorIncr, weighting)});
- }
- })
- }
-
- $.fn.tagcloud.defaults = {
- size: {start: 14, end: 18, unit: "pt"}
- };
-
- // Converts hex to an RGB array
- function toRGB (code) {
- if (code.length == 4) {
- code = jQuery.map(/\w+/.exec(code), function(el) {return el + el }).join("");
- }
- hex = /(\w{2})(\w{2})(\w{2})/.exec(code);
- return [parseInt("0x" + hex[1]), parseInt("0x" + hex[2]), parseInt("0x" + hex[3])];
- }
-
- // Converts an RGB array to hex
- function toHex (ary) {
- return "#" + jQuery.map(ary, function(i) {
- hex = i.toString(16);
- hex = (hex.length == 1) ? "0" + hex : hex;
- return hex;
- }).join("");
- }
-
- function colorIncrement (color, range) {
- return jQuery.map(toRGB(color.end), function(n, i) {
- return (n - toRGB(color.start)[i])/range;
- });
- }
-
- function tagColor (color, increment, weighting) {
- rgb = jQuery.map(toRGB(color.start), function(n, i) {
- ref = Math.round(n + (increment[i] * weighting));
- if (ref > 255) {
- ref = 255;
- } else {
- if (ref < 0) {
- ref = 0;
- }
- }
- return ref;
- });
- return toHex(rgb);
- }
-
- function compareWeights(a, b)
- {
- return a - b;
- }
-
-
-})(jQuery);
-
--- a/ckan/templates/home/index.html Tue Aug 23 09:47:16 2011 +0100
+++ b/ckan/templates/home/index.html Tue Aug 23 10:06:27 2011 +0100
@@ -5,39 +5,6 @@
<py:def function="page_title">Home</py:def>
- <py:def function="optional_head">
- <script src="${g.site_url}/scripts/jquery.tagcloud.js"></script>
- <script type="text/javascript" charset="utf-8">
- $(document).ready(function(){
- $.fn.tagcloud.defaults = {
- size: {start: 10, end: 32, unit: "pt"},
- color: {start: '#af8', end: '#f52'}
- };
- $("#tagcloud a").tagcloud();
- })
- </script>
- <style type="text/css">
- #tagcloud * {
- display: inline-block;
- vertical-align: middle;
- line-height: 0.9;
- }
-
- #tagcloud a {
- text-decoration: none;
- }
-
- #tagcloud a:hover {
- text-decoration: underline;
- }
-
- #tagcloud {
- margin: 25px auto;
- text-align: center;
- }
- </style>
- </py:def>
-
<div py:match="content"><h2>Welcome to ${g.site_title}</h2><p i18n:msg="title">
@@ -52,17 +19,6 @@
<xi:include href="../package/search_form.html" />
- <py:if test="len(c.facets.get('tags', {}))">
- <h4>Top Tags</h4>
- <div id="tagcloud">
- <py:for each="tag_name, count in c.facets.get('tags', {}).items()">
- <a rel="${count}" title="${count}" href="${h.url_for(controller='tag',
- action='read', id=tag_name)}">${tag_name}</a>
- </py:for>
- </div>
- <hr />
- </py:if>
-
<h4>Recently changed packages</h4>
${package_list_from_dict(c.latest_packages)}
http://bitbucket.org/okfn/ckan/changeset/139513ddf46e/
changeset: 139513ddf46e
branch: refactor-1282-js-wui-cruft
user: rgrp
date: 2011-08-23 21:41:17
summary: [scripts/vendor][s]: ([l] in change) add local version of jquery and jquery-ui.
affected #: 17 files (346.8 KB)
Diff too large to display.
http://bitbucket.org/okfn/ckan/changeset/a5427d64f549/
changeset: a5427d64f549
branch: refactor-1282-js-wui-cruft
user: rgrp
date: 2011-08-23 21:56:16
summary: [addendum][xs]: rename some of jquery ui files in previous commit.
affected #: 4 files (236.7 KB)
Diff too large to display.
http://bitbucket.org/okfn/ckan/changeset/05602c7808a8/
changeset: 05602c7808a8
branch: refactor-1282-js-wui-cruft
user: rgrp
date: 2011-08-23 22:00:27
summary: [scripts/vendor][xs]: add local versions of jquery.cookie and jquery.placeholder.
affected #: 2 files (5.0 KB)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ckan/public/scripts/vendor/jquery.cookie/jquery.cookie.min.js Tue Aug 23 21:00:27 2011 +0100
@@ -0,0 +1,6 @@
+
+jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options=options||{};if(value===null){value='';options.expires=-1;}
+var expires='';if(options.expires&&(typeof options.expires=='number'||options.expires.toUTCString)){var date;if(typeof options.expires=='number'){date=new Date();date.setTime(date.getTime()+(options.expires*24*60*60*1000));}else{date=options.expires;}
+expires='; expires='+date.toUTCString();}
+var path=options.path?'; path='+(options.path):'';var domain=options.domain?'; domain='+(options.domain):'';var secure=options.secure?'; secure':'';document.cookie=[name,'=',encodeURIComponent(value),expires,path,domain,secure].join('');}else{var cookieValue=null;if(document.cookie&&document.cookie!=''){var cookies=document.cookie.split(';');for(var i=0;i<cookies.length;i++){var cookie=jQuery.trim(cookies[i]);if(cookie.substring(0,name.length+1)==(name+'=')){cookieValue=decodeURIComponent(cookie.substring(name.length+1));break;}}}
+return cookieValue;}};
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ckan/public/scripts/vendor/jquery.placeholder/jquery.placeholder.js Tue Aug 23 21:00:27 2011 +0100
@@ -0,0 +1,104 @@
+/*
+* Placeholder plugin for jQuery
+* http://webcloud.se/code/jQuery-Placeholder/
+* ---
+* Copyright 2010, Daniel Stocks (http://webcloud.se)
+* Released under the MIT, BSD, and GPL Licenses.
+*/
+(function($) {
+ function Placeholder(input) {
+ this.input = input;
+ if (input.attr('type') == 'password') {
+ this.handlePassword();
+ }
+ // Prevent placeholder values from submitting
+ $(input[0].form).submit(function() {
+ if (input.hasClass('placeholder') && input[0].value == input.attr('placeholder')) {
+ input[0].value = '';
+ }
+ });
+ }
+ Placeholder.prototype = {
+ show : function(loading) {
+ // FF and IE saves values when you refresh the page. If the user refreshes the page with
+ // the placeholders showing they will be the default values and the input fields won't be empty.
+ if (this.input[0].value === '' || (loading && this.valueIsPlaceholder())) {
+ if (this.isPassword) {
+ try {
+ this.input[0].setAttribute('type', 'text');
+ } catch (e) {
+ this.input.before(this.fakePassword.show()).hide();
+ }
+ }
+ this.input.addClass('placeholder');
+ this.input[0].value = this.input.attr('placeholder');
+ }
+ },
+ hide : function() {
+ if (this.valueIsPlaceholder() && this.input.hasClass('placeholder')) {
+ this.input.removeClass('placeholder');
+ this.input[0].value = '';
+ if (this.isPassword) {
+ try {
+ this.input[0].setAttribute('type', 'password');
+ } catch (e) { }
+ // Restore focus for Opera and IE
+ this.input.show();
+ this.input[0].focus();
+ }
+ }
+ },
+ valueIsPlaceholder : function() {
+ return this.input[0].value == this.input.attr('placeholder');
+ },
+ handlePassword: function() {
+ var input = this.input;
+ input.attr('realType', 'password');
+ this.isPassword = true;
+ // IE < 9 doesn't allow changing the type of password inputs
+ if ($.browser.msie && input[0].outerHTML) {
+ var fakeHTML = input[0].outerHTML.replace(/type=(['"])?password\1/gi, 'type=$1text$1');
+ this.fakePassword = $(fakeHTML).val(input.attr('placeholder')).addClass('placeholder').focus(function() {
+ input.trigger('focus');
+ $(this).hide();
+ });
+ }
+ }
+ };
+ var NATIVE_SUPPORT = !!("placeholder" in document.createElement( "input" ));
+ $.fn.placeholder = function() {
+ return NATIVE_SUPPORT ? this : this.each(function() {
+ var input = $(this);
+ var placeholder = new Placeholder(input);
+ placeholder.show(true);
+ input.focus(function() {
+ placeholder.hide();
+ });
+ input.blur(function() {
+ placeholder.show(false);
+ });
+
+ // On page refresh, IE doesn't re-populate user input
+ // until the window.onload event is fired.
+ if ($.browser.msie) {
+ $(window).load(function() {
+ if(input.val()) {
+ input.removeClass("placeholder");
+ }
+ placeholder.show(true);
+ });
+ // What's even worse, the text cursor disappears
+ // when tabbing between text inputs, here's a fix
+ input.focus(function() {
+ if(this.value == "") {
+ var range = this.createTextRange();
+ range.collapse(true);
+ range.moveStart('character', 0);
+ range.select();
+ }
+ });
+ }
+ });
+ }
+})(jQuery);
+
http://bitbucket.org/okfn/ckan/changeset/31c1c17b81cd/
changeset: 31c1c17b81cd
branch: refactor-1282-js-wui-cruft
user: rgrp
date: 2011-08-23 22:02:24
summary: [templates/layout][xs]: switch to new local versions of vendor libs.
affected #: 1 file (24 bytes)
--- a/ckan/templates/layout_base.html Tue Aug 23 21:00:27 2011 +0100
+++ b/ckan/templates/layout_base.html Tue Aug 23 21:02:24 2011 +0100
@@ -22,7 +22,7 @@
</py:otherwise></py:choose>
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.11/themes/ui-lightness/jquery-ui.css" type="text/css" media="screen, print" />
+ <link rel="stylesheet" href="${g.site_url}/scripts/vendor/jqueryui/1.8.11/css/ui-lightness/jquery-ui.css" type="text/css" media="screen, print" /><link rel="stylesheet" href="${g.site_url}/css/style.css" type="text/css" media="screen, print" /><!--[if IE]>
@@ -30,10 +30,10 @@
<![endif]--><script type="text/javascript" src="${g.site_url}/language.js"></script>
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script>
- <script type="text/javascript" src="http://assets.okfn.org/ext/jquery.cookie/jquery.cookie.min.js"></script>
- <script type="text/javascript" src="http://assets.okfn.org/ext/jquery.placeholder/jquery.placeholder.js"></script>
- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.11/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="${g.site_url}/scripts/vendor/jquery/1.5.2/jquery.min.js"></script>
+ <script type="text/javascript" src="${g.site_url}/scripts/vendor/jquery.cookie/jquery.cookie.min.js"></script>
+ <script type="text/javascript" src="${g.site_url}/scripts/vendor/jquery.placeholder/jquery.placeholder.js"></script>
+ <script type="text/javascript" src="${g.site_url}/scripts/vendor/jqueryui/1.8.11/jquery-ui.min.js"></script><script type="text/javascript" src="${g.site_url}/scripts/application.js?lang=${c.locale}"></script><script type="text/javascript">
http://bitbucket.org/okfn/ckan/changeset/a370007c62ec/
changeset: a370007c62ec
branch: refactor-1282-js-wui-cruft
user: rgrp
date: 2011-08-25 11:38:33
summary: [template/group,js][s]: refactor to use jquery ui autocomplete for package autocomplete on group new/edit pages.
affected #: 4 files (2.2 KB)
--- a/ckan/public/scripts/application.js Tue Aug 23 21:02:24 2011 +0100
+++ b/ckan/public/scripts/application.js Thu Aug 25 10:38:33 2011 +0100
@@ -2,12 +2,60 @@
$(document).ready(function () {
CKAN.Utils.setupUserAutocomplete($('input.autocomplete-user'));
CKAN.Utils.setupAuthzGroupAutocomplete($('input.autocomplete-authzgroup'));
+ CKAN.Utils.setupPackageAutocomplete($('input.autocomplete-package'));
});
}(jQuery));
var CKAN = CKAN || {};
CKAN.Utils = function($, my) {
+ // Attach package autocompletion to provided elements
+ //
+ // Requires: jquery-ui autocomplete
+ my.setupPackageAutocomplete = function(elements) {
+ elements.autocomplete({
+ minLength: 0,
+ source: function(request, callback) {
+ var url = '/package/autocomplete?q=' + request.term;
+ $.ajax({
+ url: url,
+ success: function(data) {
+ // atm is a string with items broken by \n and item = title (name)|name
+ var out = [];
+ var items = data.split('\n');
+ $.each(items, function(idx, value) {
+ var _tmp = value.split('|');
+ var _newItem = {
+ label: _tmp[0],
+ value: _tmp[1]
+ };
+ out.push(_newItem);
+ });
+ callback(out);
+ }
+ });
+ }
+ , select: function(event, ui) {
+ var input_box = $(this);
+ input_box.val('');
+ var parent_dd = input_box.parent('dd');
+ var old_name = input_box.attr('name');
+ var field_name_regex = /^(\S+)__(\d+)__(\S+)$/;
+ var split = old_name.match(field_name_regex);
+
+ var new_name = split[1] + '__' + (parseInt(split[2]) + 1) + '__' + split[3]
+
+ input_box.attr('name', new_name)
+ input_box.attr('id', new_name)
+
+ parent_dd.before(
+ '<input type="hidden" name="' + old_name + '" value="' + ui.item.value + '">' +
+ '<dd>' + ui.item.label + '</dd>'
+ );
+ }
+ });
+ };
+
// Attach user autocompletion to provided elements
//
// Requires: jquery-ui autocomplete
@@ -25,7 +73,7 @@
userobj.label = label;
userobj.value = userobj.name;
});
- callback(data)
+ callback(data);
});
}
});
@@ -45,7 +93,7 @@
userobj.label = label;
userobj.value = userobj.name;
});
- callback(data)
+ callback(data);
});
}
});
--- a/ckan/templates/group/edit.html Tue Aug 23 21:02:24 2011 +0100
+++ b/ckan/templates/group/edit.html Thu Aug 25 10:38:33 2011 +0100
@@ -6,11 +6,6 @@
<py:def function="optional_head"><link rel="stylesheet" href="${g.site_url}/css/forms.css" type="text/css" media="screen, print" />
-
- <!-- Package autocomplete -->
- <script type="text/javascript" src="${g.site_url}/scripts/jquery.autocomplete.pack.js"></script>
- <script type="text/javascript" src="${g.site_url}/scripts/autocompleter.js"></script>
- <link rel="stylesheet" href="${g.site_url}/css/jquery.autocomplete.css" /></py:def><div py:match="content">
--- a/ckan/templates/group/new.html Tue Aug 23 21:02:24 2011 +0100
+++ b/ckan/templates/group/new.html Thu Aug 25 10:38:33 2011 +0100
@@ -6,11 +6,6 @@
<py:def function="optional_head"><link rel="stylesheet" href="${g.site_url}/css/forms.css" type="text/css" media="screen, print" />
-
- <!-- Package autocomplete and rack-up -->
- <script type="text/javascript" src="${g.site_url}/scripts/jquery.autocomplete.pack.js"></script>
- <script type="text/javascript" src="${g.site_url}/scripts/autocompleter.js"></script>
- <link rel="stylesheet" href="${g.site_url}/css/jquery.autocomplete.css" /></py:def><div py:match="content">
--- a/ckan/templates/group/new_group_form.html Tue Aug 23 21:02:24 2011 +0100
+++ b/ckan/templates/group/new_group_form.html Thu Aug 25 10:38:33 2011 +0100
@@ -81,7 +81,7 @@
</legend><dl><dt><label class="field_opt" for="packages__${len(data.get('packages', []))}__name">Package</label></dt>
- <dd><input class="autocomplete" id="packages__${len(data.get('packages', []))}__name" name="packages__${len(data.get('packages', []))}__name" type="text" /></dd>
+ <dd><input class="autocomplete-package" id="packages__${len(data.get('packages', []))}__name" name="packages__${len(data.get('packages', []))}__name" type="text" /></dd></dl></fieldset>
http://bitbucket.org/okfn/ckan/changeset/84d6a4cebd2b/
changeset: 84d6a4cebd2b
branch: refactor-1282-js-wui-cruft
user: rgrp
date: 2011-08-25 11:43:01
summary: [scripts][xs]: (refs #1282) remove bookmarklet and out of date test html.
affected #: 2 files (0 bytes)
--- a/ckan/public/scripts/bookmarklet.js Thu Aug 25 10:38:33 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-function add_to_ckan() {
- f='http://ckan.net/package/new?url='+encodeURIComponent(window.location.href)+'&title='+encodeURIComponent(document.title);
- // TODO: ? name=window.location.hostname
- // insert a description if it exists
- if((n = document.getElementsByName('description')[0]) && (d = n.content)) {
- f += '¬es=' + encodeURIComponent(d);
- }
- a = function() {
- if(!window.open(f)) {
- // e.g. popups are blocked.
- location.href=f;
- }
- };
- if(/Firefox/.test(navigator.userAgent)) {
- setTimeout(a,0)
- }
- else {
- a()
- }
-}
-// add_to_ckan();
--- a/ckan/public/scripts/test_bookmarklet.html Thu Aug 25 10:38:33 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<html>
- <head>
- <title>Testing Bookmarklet</title>
- <meta name="description" content="Your descriptive sentence or two goes here." />
- <script type="text/javascript" src="bookmarklet.js"></script>
- <script type="text/javascript">
-// Tried this external script method from
-// http://betterexplained.com/articles/how-to-make-a-bookmarklet-for-your-web-application/
-// Unfortunately using this method popup gets blocked by Firefox ...
-// So went back to direct method
-// To compress: http://ted.mielczarek.org/code/mozilla/bookmarklet.html
-// (Take only inside function part)
-function bm() {
- addtockan = document.createElement('script');
- addtockan.type='text/javascript';
- addtockan.src='http://ckan.net/scripts/bookmarklet.js';
- document.getElementsByTagName('head')[0].appendChild(addtockan);
-}
-</script>
-
- </head>
- <body>
- <p><strong>Test bookmarklet js (not a proper bookmarklet):</strong><a href="javascript:add_to_ckan()">Add to CKAN</a></p>
-
- <p><strong>External script bookmarklet js:</strong><a href="javascript:bm();add_to_ckan();">Add to CKAN</a></p>
-
- <p><strong>Proper bookmarklet (compressed -- need to escape &):</strong><a href="javascript:(function(){f='http://ckan.net/package/new?url='+encodeURIComponent(window.location.href)+'&title='+encodeURIComponent(document.title);if((n=document.getElementsByName('description')[0])&&(d=n.content)){f+='¬es='+encodeURIComponent(d);}a=function(){if(!window.open(f)){location.href=f;}};if(/Firefox/.test(navigator.userAgent)){setTimeout(a,0)}else{a()}})()">Add to CKAN</a>
- </body>
-</html>
http://bitbucket.org/okfn/ckan/changeset/377aefee7323/
changeset: 377aefee7323
branch: refactor-1282-js-wui-cruft
user: rgrp
date: 2011-08-25 11:56:37
summary: [templates,css][s]: (refs #1282) includes forms.css into style.css thereby obviating need to explicitly include forms.css everywhere.
affected #: 12 files (1.4 KB)
--- a/ckan/public/css/style.css Thu Aug 25 10:43:01 2011 +0100
+++ b/ckan/public/css/style.css Thu Aug 25 10:56:37 2011 +0100
@@ -4,3 +4,5 @@
@import url(buttons.css);
@import url(stars.css);
@import url(tabs.css);
+ at import url(forms.css);
+
--- a/ckan/templates/authorization_group/edit.html Thu Aug 25 10:43:01 2011 +0100
+++ b/ckan/templates/authorization_group/edit.html Thu Aug 25 10:56:37 2011 +0100
@@ -5,8 +5,6 @@
<py:def function="page_title">${c.authorization_group_name} - Edit - AuthorizationGroups</py:def><py:def function="optional_head">
- <link rel="stylesheet" href="${g.site_url}/css/forms.css" type="text/css" media="screen, print" />
-
<!-- Package autocomplete --><script type="text/javascript" src="${g.site_url}/scripts/jquery.autocomplete.pack.js"></script><script type="text/javascript" src="${g.site_url}/scripts/autocompleter.js"></script>
--- a/ckan/templates/authorization_group/new.html Thu Aug 25 10:43:01 2011 +0100
+++ b/ckan/templates/authorization_group/new.html Thu Aug 25 10:56:37 2011 +0100
@@ -5,8 +5,6 @@
<py:def function="page_title">New - Authorization Groups</py:def><py:def function="optional_head">
- <link rel="stylesheet" href="${g.site_url}/css/forms.css" type="text/css" media="screen, print" />
-
<!-- Package autocomplete and rack-up --><script type="text/javascript" src="${g.site_url}/scripts/jquery.autocomplete.pack.js"></script><script type="text/javascript" src="${g.site_url}/scripts/autocompleter.js"></script>
--- a/ckan/templates/group/edit.html Thu Aug 25 10:43:01 2011 +0100
+++ b/ckan/templates/group/edit.html Thu Aug 25 10:56:37 2011 +0100
@@ -4,10 +4,6 @@
<py:def function="page_title">${c.grouptitle or c.groupname} - Edit - Groups</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 Group: ${c.groupname}
--- a/ckan/templates/group/new.html Thu Aug 25 10:43:01 2011 +0100
+++ b/ckan/templates/group/new.html Thu Aug 25 10:56:37 2011 +0100
@@ -4,10 +4,6 @@
<py:def function="page_title">New - Groups</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>
New Group
--- a/ckan/templates/package/edit.html Thu Aug 25 10:43:01 2011 +0100
+++ b/ckan/templates/package/edit.html Thu Aug 25 10:56:37 2011 +0100
@@ -8,8 +8,6 @@
<py:def function="body_class">hide-sidebar</py:def><py:def function="optional_head">
- <link rel="stylesheet" href="${g.site_url}/css/forms.css" type="text/css" media="screen, print" />
-
<!-- Flexitable --><script type="text/javascript" src="${g.site_url}/scripts/flexitable.js"></script><link rel="stylesheet" href="${g.site_url}/css/flexitable.css" />
--- a/ckan/templates/package/new.html Thu Aug 25 10:43:01 2011 +0100
+++ b/ckan/templates/package/new.html Thu Aug 25 10:56:37 2011 +0100
@@ -8,8 +8,6 @@
<py:def function="body_class">hide-sidebar</py:def><py:def function="optional_head">
- <link rel="stylesheet" href="${g.site_url}/css/forms.css" type="text/css" media="screen, print" />
-
<!-- Reveal instructions --><script type="text/javascript" src="${g.site_url}/scripts/reveal_instructions.js"></script><link rel="stylesheet" href="${g.site_url}/css/reveal_instructions.css" />
--- a/ckan/templates/user/edit.html Thu Aug 25 10:43:01 2011 +0100
+++ b/ckan/templates/user/edit.html Thu Aug 25 10:56:37 2011 +0100
@@ -5,18 +5,12 @@
<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.display_name} (${c.user_name})
<a href="#preview" py:if="c.preview">(skip to preview)</a></h2>
-
-
<div id="preview" style="margin-left: 20px;" py:if="c.preview"><hr /><h2>Preview</h2>
@@ -28,10 +22,7 @@
</div>
${Markup(c.form)}
-
-
</div>
-
<xi:include href="layout.html" /></html>
--- a/ckan/templates/user/login.html Thu Aug 25 10:43:01 2011 +0100
+++ b/ckan/templates/user/login.html Thu Aug 25 10:56:37 2011 +0100
@@ -6,7 +6,6 @@
<py:def function="optional_head"><!-- Simple OpenID Selector --><link rel="stylesheet" href="${g.site_url}/scripts/vendor/openid-selector/css/openid.css" />
- <link rel="stylesheet" href="${g.site_url}/css/forms.css" type="text/css" media="screen, print" /><script type="text/javascript" src="${g.site_url}/scripts/vendor/openid-selector/js/openid-jquery.js"></script><script type="text/javascript">
$(document).ready(function() {
--- a/ckan/templates/user/new.html Thu Aug 25 10:43:01 2011 +0100
+++ b/ckan/templates/user/new.html Thu Aug 25 10:56:37 2011 +0100
@@ -5,10 +5,6 @@
<py:def function="page_title">Register - 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>
-
<py:match path="primarysidebar"><li class="widget-container widget_text"><h2>Have an OpenID?</h2>
--- a/ckan/templates/user/perform_reset.html Thu Aug 25 10:43:01 2011 +0100
+++ b/ckan/templates/user/perform_reset.html Thu Aug 25 10:56:37 2011 +0100
@@ -5,10 +5,6 @@
<py:def function="page_title">Reset your password</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"><form id="user-reset" action="" method="post" class="simple-form"
xmlns:py="http://genshi.edgewall.org/"
--- a/ckan/templates/user/request_reset.html Thu Aug 25 10:43:01 2011 +0100
+++ b/ckan/templates/user/request_reset.html Thu Aug 25 10:56:37 2011 +0100
@@ -5,10 +5,6 @@
<py:def function="page_title">Reset password</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>
Request a password reset
Repository URL: https://bitbucket.org/okfn/ckan/
--
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