From 8667993b8a940d50275728ed546a2ed8296376cf Mon Sep 17 00:00:00 2001
From: Damien Pobel <dp@ez.no>
Date: Mon, 17 Feb 2014 17:13:41 +0100
Subject: [PATCH] Fix EZP-22124: inline image alignment is not respected

---
 .../ezwebin/override/templates/embed-inline/image.tpl  |  3 ++-
 .../ezwebin/design/ezwebin/stylesheets/core.css        | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/override/templates/embed-inline/image.tpl b/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/override/templates/embed-inline/image.tpl
index e8955dd0..98bf180c 100644
--- a/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/override/templates/embed-inline/image.tpl
+++ b/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/override/templates/embed-inline/image.tpl
@@ -7,5 +7,6 @@
 {/if}
 
 {if is_set( $link_parameters.href )}<a href={$link_parameters.href|ezurl} target="{$link_parameters.target|wash}"{if is_set($link_parameters.class)} class="{$link_parameters.class|wash}"{/if}{if is_set($link_parameters['xhtml:id'])} id="{$link_parameters['xhtml:id']|wash}"{/if}{if is_set($link_parameters['xhtml:title'])} title="{$link_parameters['xhtml:title']|wash}"{/if}>{/if}
-<img src={$image_variation.full_path|ezroot} alt="{$object.data_map.image.content.alternative_text|wash(xhtml)}" />
+<img src={$image_variation.full_path|ezroot} alt="{$object.data_map.image.content.alternative_text|wash(xhtml)}"
+    {cond( $attribute_parameters.align, concat( ' class="embed-inline-', $attribute_parameters.align, '"' ), '' )} />
 {if is_set( $link_parameters.href )}</a>{/if}
\ No newline at end of file
diff --git a/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/stylesheets/core.css b/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/stylesheets/core.css
index 9ec88557..2fe50baf 100644
--- a/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/stylesheets/core.css
+++ b/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/stylesheets/core.css
@@ -502,6 +502,16 @@ div.object-center, table.object-center
     margin: 0.25em auto 0.25em auto;
 }
 
+.embed-inline-left
+{
+    float: left;
+}
+
+.embed-inline-right
+{
+    float: right;
+}
+
 .float-break
 {
     height: 1%; /* Fix for IE */