diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py index a8b0ffa0429..acbd6fb7144 100644 --- a/ckan/lib/helpers.py +++ b/ckan/lib/helpers.py @@ -552,6 +552,34 @@ def dump_json(obj): import json return json.dumps(obj) +def markdown_editor(fieldname, value, id='', placeholder=None): + from pylons.i18n import _ + from string import Template + if not placeholder: + placeholder = _('Start with a summary sentence ...') + if not value: + value = '' + template = Template(''' +
+ +
+ +
+ + You can use Markdown formatting here. +
+ ''') + return literal(template.substitute({ + 'fieldname':fieldname, + 'placeholder':placeholder, + 'id':id, + 'value':value + })) + + def auto_log_message(context): from pylons.i18n import _ if (context.action=='new') : diff --git a/ckan/public/css/style.css b/ckan/public/css/style.css index e4c22aa3c17..8e7e7e77c3d 100644 --- a/ckan/public/css/style.css +++ b/ckan/public/css/style.css @@ -834,11 +834,11 @@ ul.datasets .openness li { overflow: auto; } .markdown-editor textarea.markdown-input { + display: block; width: 360px; height: 70px; - margin-bottom: 5px; + margin: 0 0 5px 0; padding: 5px; - display: block; } diff --git a/ckan/public/scripts/templates.js b/ckan/public/scripts/templates.js index 9cc70c25526..b1c376f12a3 100644 --- a/ckan/public/scripts/templates.js +++ b/ckan/public/scripts/templates.js @@ -58,6 +58,7 @@ CKAN.Templates.resourceEntry = ' \ \ '; +// TODO it would be nice to unify this with the markdown editor specified in helpers.py CKAN.Templates.resourceDetails = ' \