From: Jan Szejko Date: Fri, 9 Dec 2016 15:06:15 +0000 (+0100) Subject: minor fixes X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/db06ae78aac8e159e731524fc8588e7ad6945e20?ds=sidebyside minor fixes --- diff --git a/apps/catalogue/models/document.py b/apps/catalogue/models/document.py index 5fa6242e..70f50f25 100755 --- a/apps/catalogue/models/document.py +++ b/apps/catalogue/models/document.py @@ -38,8 +38,7 @@ class Document(Ref): def meta(self): from lxml import etree - # Wrong! should be metadata - d = {} + metadata = {} data = self.materialize() data = data.replace(u'\ufeff', '') @@ -53,7 +52,7 @@ class Document(Ref): header = t.find('.//header') if header is None: header = etree.fromstring(data).find('.//{http://nowoczesnapolska.org.pl/sst#}header') - d['title'] = getattr(header, 'text', ' ') or ' ' + metadata['title'] = getattr(header, 'text', ' ') or ' ' #print 'meta', d['title'] m = t.find('metadata') @@ -62,12 +61,12 @@ class Document(Ref): if m is not None: c = m.find('{http://purl.org/dc/elements/1.1/}relation.coverimage.url') if c is not None: - d['cover_url'] = c.text + metadata['cover_url'] = c.text c = m.find('{http://purl.org/dc/elements/1.1/}audience') if c is not None: - d['audience'] = c.text + metadata['audience'] = c.text - return d + return metadata def can_edit(self, user): if self.owner_user: diff --git a/apps/wiki/static--wiki--editor--node_modules--grunt-contrib-less--node_modules--less--test/css/css.css b/apps/wiki/static--wiki--editor--node_modules--grunt-contrib-less--node_modules--less--test/css/css.css index b011a7e3..ee1d48eb 100644 --- a/apps/wiki/static--wiki--editor--node_modules--grunt-contrib-less--node_modules--less--test/css/css.css +++ b/apps/wiki/static--wiki--editor--node_modules--grunt-contrib-less--node_modules--less--test/css/css.css @@ -11,7 +11,7 @@ div { h1, h2 > a > p, h3 { - color: none; + color: unset; } div.class { color: blue; @@ -72,7 +72,6 @@ p + h1 { width: .1em; background-color: #009998; background: -webkit-gradient(linear, left top, left bottom, from(#ff0000), to(#0000ff)); - margin: ; filter: alpha(opacity=100); width: auto\9; } diff --git a/apps/wiki/static--wiki--editor--node_modules--grunt-contrib-less--node_modules--less--test/less/css.less b/apps/wiki/static--wiki--editor--node_modules--grunt-contrib-less--node_modules--less--test/less/css.less index 766bdd4d..90b354c4 100644 --- a/apps/wiki/static--wiki--editor--node_modules--grunt-contrib-less--node_modules--less--test/less/css.less +++ b/apps/wiki/static--wiki--editor--node_modules--grunt-contrib-less--node_modules--less--test/less/css.less @@ -7,7 +7,7 @@ div { width: 99%; } } h1, h2 > a > p, h3 { - color: none; + color: unset; } div.class { @@ -67,7 +67,7 @@ p + h1 { } #more-shorthands { - margin: 0; + margin: 0.1%; padding: 1px 0 2px 0; font: normal small/20px 'Trebuchet MS', Verdana, sans-serif; font: 0/0 a; @@ -80,7 +80,6 @@ p + h1 { width: .1em; background-color: #009998; background: -webkit-gradient(linear, left top, left bottom, from(red), to(blue)); - margin: ; .nested-multiple { multiple-semi-colons: yes;;;;;; };