rattail/appypod-rattail
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[gen] Bugfix in RTL languages support; [pod] xhtml2odt: bugfix in management of styles applied to inner p tags added within li tags.

Browse source
This commit is contained in:
Gaetan Delannay 2012-07-03 15:00:45 +02:00
parent 1b375d387c
commit bc505b335f
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gen/ui/appyrtl.css
View file

@ -4,4 +4,4 @@ ul li { background-image: url("ui/lirtl.gif");
padding-right: 15px; padding-left: 0px} padding-right: 15px; padding-left: 0px}
.portlet { border-right: none; border-left: 1px solid #5F7983 } .portlet { border-right: none; border-left: 1px solid #5F7983 }
.lang { margin-right: 0px; margin-left: 6px; } .lang { margin-right: 0px; margin-left: 6px; }
.cellGap { padding-left: 0.4em; } .cellGap { padding-left: 0.4em; padding-right: 0;}

4
gen/ui/callMacro.pt
View file

@ -6,6 +6,10 @@
contextObj python: options['contextObj']; contextObj python: options['contextObj'];
tool contextObj/getTool; tool contextObj/getTool;
layoutType python:'view'; layoutType python:'view';
lang tool/getUserLanguage;
dir python: tool.getLanguageDirection(lang);
dleft python: (dir == 'ltr') and 'left' or 'right';
dright python: (dir == 'ltr') and 'right' or 'left';
phaseInfo python: contextObj.getAppyPhases(currentOnly=True, layoutType='view'); phaseInfo python: contextObj.getAppyPhases(currentOnly=True, layoutType='view');
phase phaseInfo/name;"> phase phaseInfo/name;">
<metal:callMacro use-macro="python: page.macros[macroName]"/> <metal:callMacro use-macro="python: page.macros[macroName]"/>

11
pod/xhtml2odt.py
View file

@ -147,8 +147,15 @@ class HtmlElement:
self.elem, classValue=self.classAttr) self.elem, classValue=self.classAttr)
if odtStyle and (odtStyle.name == 'podItemKeepWithNext'): if odtStyle and (odtStyle.name == 'podItemKeepWithNext'):
itemStyle += '_kwn' itemStyle += '_kwn'
env.dumpString(' %s:style-name="%s"' % (env.textNs, styleName = env.itemStyles[itemStyle]
env.itemStyles[itemStyle])) else:
# Check if a style must be applied on 'p' tags
odtStyle = env.parser.caller.findStyle('p')
if odtStyle:
styleName = odtStyle.name
else:
styleName = env.itemStyles[itemStyle]
env.dumpString(' %s:style-name="%s"' % (env.textNs, styleName))
env.dumpString('>') env.dumpString('>')
self.tagsToClose.append(HtmlElement('p',{})) self.tagsToClose.append(HtmlElement('p',{}))