From b1f93e8246773bfb6c6731bd1f1fab8b568acc05 Mon Sep 17 00:00:00 2001 From: Tom Rees Date: Tue, 21 Feb 2012 19:01:18 +0000 Subject: [PATCH] [dataset/read][l]: Notes expand/collapse ui redesigned. --- ckan/public/css/style.css | 34 ++++++++++---------- ckan/public/images/chevron-down.png | Bin 0 -> 6781 bytes ckan/public/images/chevron-up.png | Bin 0 -> 6727 bytes ckan/public/scripts/application.js | 36 ++++++++++++---------- ckan/public/scripts/templates.js | 8 ----- ckan/templates/group/read.html | 9 +++++- ckan/templates/package/read_core.html | 9 +++++- ckan/templates/package/resource_read.html | 4 ++- 8 files changed, 55 insertions(+), 45 deletions(-) create mode 100644 ckan/public/images/chevron-down.png create mode 100644 ckan/public/images/chevron-up.png diff --git a/ckan/public/css/style.css b/ckan/public/css/style.css index 5fb2a633c74..e9f5a008a57 100644 --- a/ckan/public/css/style.css +++ b/ckan/public/css/style.css @@ -1282,31 +1282,31 @@ body.package.read #sidebar li.widget-container { border: 0 } .notes { - padding: 8px; - border-left: 2px solid #eee; background: url('../images/ldquo.png') no-repeat top left #f7f7f7; + border: 1px solid #eee; + border-radius: 5px; } -.notes #notes-toggle a { - cursor: pointer; +.notes > div { + padding: 8px; } -.notes #notes-toggle a.more:after { - content: ' »'; - font-size: 150%; - position: relative; - bottom: -1px; +#notes-toggle { + padding: 0; + height: 23px; } -.notes #notes-toggle a.less:before { - content: '« '; - font-size: 150%; - position: relative; - bottom: -1px; +.notes #notes-toggle button { + cursor: pointer; + width: 100%; + height: 23px; + padding: 4px; + border-radius: 0; + border: 0; + border-top: 1px solid #eee; } - #notes-extract p { margin-bottom: 0; } -#notes-remainder { - margin-top: 1em; +#notes-remainder p:last-child { + margin-bottom: 0; } .dataset-label { font-weight: bold; diff --git a/ckan/public/images/chevron-down.png b/ckan/public/images/chevron-down.png new file mode 100644 index 0000000000000000000000000000000000000000..8d6c121eb9b113235acad95786a44f5617cf1c2d GIT binary patch literal 6781 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 1){ - var extract = notes.children(':eq(0)'); - var remainder = notes.children(':gt(0)'); - notes.html($.tmpl(CKAN.Templates.notesField)); - notes.find('#notes-extract').html(extract); - notes.find('#notes-remainder').html(remainder); - notes.find('#notes-remainder').hide(); - notes.find('#notes-toggle a').click(function(event){ - notes.find('#notes-toggle a').toggle(); - var remainder = notes.find('#notes-remainder') - if ($(event.target).hasClass('more')) { - remainder.slideDown(); - } - else { - remainder.slideUp(); + var paragraphs = notes.find('#notes-extract > *'); + if (paragraphs.length==0) { + notes.hide(); + } + else if (paragraphs.length > 1) { + var remainder = notes.find('#notes-remainder'); + $.each(paragraphs,function(i,para) { + if (i > 0) remainder.append($(para).remove()); + }); + notes.find('#notes-toggle').show(); + notes.find('#notes-toggle button').click( + function(event){ + notes.find('#notes-toggle button').toggle(); + if ($(event.target).hasClass('more')) + remainder.slideDown(); + else + remainder.slideUp(); + return false; } - return false; - }) + ); } }; diff --git a/ckan/public/scripts/templates.js b/ckan/public/scripts/templates.js index fe82805fadb..edffa21bb5d 100644 --- a/ckan/public/scripts/templates.js +++ b/ckan/public/scripts/templates.js @@ -157,11 +157,3 @@ CKAN.Templates.resourceEntry = ' \ \ '; -CKAN.Templates.notesField = ' \ -
\ -
\ -
\ -
\ - \ -'; - diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html index 3b4a3bcfdc4..7915b5fdcf2 100644 --- a/ckan/templates/group/read.html +++ b/ckan/templates/group/read.html @@ -28,7 +28,14 @@

Administrators

State: ${c.group['state']}

- ${c.description_formatted} +
+ ${c.description_formatted} +
+ +

Datasets

diff --git a/ckan/templates/package/read_core.html b/ckan/templates/package/read_core.html index fcadb6298e7..23e67663725 100644 --- a/ckan/templates/package/read_core.html +++ b/ckan/templates/package/read_core.html @@ -11,7 +11,14 @@
- ${c.pkg_notes_formatted} +
+ ${c.pkg_notes_formatted} +
+ +
diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html index a2173daf149..c2eae2bfe2c 100644 --- a/ckan/templates/package/resource_read.html +++ b/ckan/templates/package/resource_read.html @@ -30,7 +30,9 @@
- ${c.resource.get('description') or '(No description)'} +
+ ${c.resource.get('description') or '(No description)'} +