diff --git a/gen/ui/appyrtl.css b/gen/ui/appyrtl.css index 634370d..fa1d7df 100644 --- a/gen/ui/appyrtl.css +++ b/gen/ui/appyrtl.css @@ -4,4 +4,4 @@ ul li { background-image: url("ui/lirtl.gif"); padding-right: 15px; padding-left: 0px} .portlet { border-right: none; border-left: 1px solid #5F7983 } .lang { margin-right: 0px; margin-left: 6px; } -.cellGap { padding-left: 0.4em; } +.cellGap { padding-left: 0.4em; padding-right: 0;} diff --git a/gen/ui/callMacro.pt b/gen/ui/callMacro.pt index f08b8e3..fbe76c6 100644 --- a/gen/ui/callMacro.pt +++ b/gen/ui/callMacro.pt @@ -6,6 +6,10 @@ contextObj python: options['contextObj']; tool contextObj/getTool; 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'); phase phaseInfo/name;"> diff --git a/pod/xhtml2odt.py b/pod/xhtml2odt.py index deb0805..e3668cc 100644 --- a/pod/xhtml2odt.py +++ b/pod/xhtml2odt.py @@ -147,8 +147,15 @@ class HtmlElement: self.elem, classValue=self.classAttr) if odtStyle and (odtStyle.name == 'podItemKeepWithNext'): itemStyle += '_kwn' - env.dumpString(' %s:style-name="%s"' % (env.textNs, - env.itemStyles[itemStyle])) + styleName = 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('>') self.tagsToClose.append(HtmlElement('p',{}))