fnp
/
redakcja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f941f09
)
minor fixes
author
Jan Szejko
<janek37@gmail.com>
Fri, 9 Dec 2016 15:06:15 +0000
(16:06 +0100)
committer
Jan Szejko
<janek37@gmail.com>
Fri, 9 Dec 2016 15:06:15 +0000
(16:06 +0100)
apps/catalogue/models/document.py
patch
|
blob
|
history
apps/wiki/static--wiki--editor--node_modules--grunt-contrib-less--node_modules--less--test/css/css.css
patch
|
blob
|
history
apps/wiki/static--wiki--editor--node_modules--grunt-contrib-less--node_modules--less--test/less/css.less
patch
|
blob
|
history
diff --git
a/apps/catalogue/models/document.py
b/apps/catalogue/models/document.py
index
5fa6242
..
70f50f2
100755
(executable)
--- 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
def meta(self):
from lxml import etree
- # Wrong! should be metadata
- d = {}
+ metadata = {}
data = self.materialize()
data = data.replace(u'\ufeff', '')
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')
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')
#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:
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:
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:
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
b011a7e
..
ee1d48e
100644
(file)
--- 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 {
h1,
h2 > a > p,
h3 {
- color:
none
;
+ color:
unset
;
}
div.class {
color: blue;
}
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));
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;
}
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
766bdd4
..
90b354c
100644
(file)
--- 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 {
}
h1, h2 > a > p, h3 {
- color:
none
;
+ color:
unset
;
}
div.class {
}
div.class {
@@
-67,7
+67,7
@@
p + h1 {
}
#more-shorthands {
}
#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;
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));
width: .1em;
background-color: #009998;
background: -webkit-gradient(linear, left top, left bottom, from(red), to(blue));
- margin: ;
.nested-multiple {
multiple-semi-colons: yes;;;;;;
};
.nested-multiple {
multiple-semi-colons: yes;;;;;;
};