Index: kernel/classes/datatypes/ezmedia/ezmediatype.php
===================================================================
--- kernel/classes/datatypes/ezmedia/ezmediatype.php	(wersja 21823)
+++ kernel/classes/datatypes/ezmedia/ezmediatype.php	(kopia robocza)
@@ -232,6 +232,9 @@
             case 'real_player' :
                 $pluginPage = "http://www.real.com/";
             break;
+            case 'silverlight':
+                $pluginPage = "http://go.microsoft.com/fwlink/?LinkID=108182";
+            break;
             case 'windows_media_player' :
                 $pluginPage = "http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,4,7,1112" ;
             break;
Index: design/standard/templates/content/datatype/edit/ezmedia.tpl
===================================================================
--- design/standard/templates/content/datatype/edit/ezmedia.tpl	(wersja 21823)
+++ design/standard/templates/content/datatype/edit/ezmedia.tpl	(kopia robocza)
@@ -9,6 +9,7 @@
     {case match=flash}{'Flash'|i18n( 'design/standard/content/datatype' )}{/case}
     {case match=quick_time}{'QuickTime'|i18n( 'design/standard/content/datatype' )}{/case}
     {case match=real_player}{'RealPlayer'|i18n( 'design/standard/content/datatype' )}{/case}
+    {case match=silverlight}{'Silverlight'|i18n( 'design/standard/content/datatype' )}{/case}
     {case match=windows_media_player}{'Windows Media Player'|i18n( 'design/standard/content/datatype' )}{/case}
     {case}{'Unknown'|i18n( 'design/standard/content/datatype' )}{/case}
     {/switch}
@@ -269,9 +270,31 @@
 </div>
 {/case}
 
+{* Silverlight media. *}
+{case match=silverlight}
+<div class="block">
+    <input type="hidden" name="MAX_FILE_SIZE" value="{$attribute.contentclass_attribute.data_int1|mul( 1024, 1024 )}" />
+    <label>{'New file for upload'|i18n( 'design/standard/content/datatype' )}:</label>
+    <input class="box" name="{$attribute_base}_data_mediafilename_{$attribute.id}" type="file" />
+</div>
 
+<div class="block">
 
+<div class="element">
+    <label>{'Width'|i18n( 'design/standard/content/datatype' )}:</label>
+    <input id="ezcoa-{if ne( $attribute_base, 'ContentObjectAttribute' )}{$attribute_base}-{/if}{$attribute.contentclassattribute_id}_{$attribute.contentclass_attribute_identifier}_width" type="text" name="{$attribute_base}_data_media_width_{$attribute.id}" size="5" value="{$attribute.content.width}" />
+</div>
 
+<div class="element">
+    <label>{'Height'|i18n( 'design/standard/content/datatype' )}:</label>
+    <input id="ezcoa-{if ne( $attribute_base, 'ContentObjectAttribute' )}{$attribute_base}-{/if}{$attribute.contentclassattribute_id}_{$attribute.contentclass_attribute_identifier}_height" type="text" name="{$attribute_base}_data_media_height_{$attribute.id}" size="5" value="{$attribute.content.height}" />
+</div>
+
+<div class="break"></div>
+
+</div>
+{/case}
+
 {* Windows media. *}
 {case match=windows_media_player}
 <div class="block">
Index: design/standard/templates/content/datatype/diff/ezmedia.tpl
===================================================================
--- design/standard/templates/content/datatype/diff/ezmedia.tpl	(wersja 21823)
+++ design/standard/templates/content/datatype/diff/ezmedia.tpl	(kopia robocza)
@@ -10,6 +10,7 @@
             {case match=flash}{'Flash'|i18n( 'design/standard/content/datatype' )}{/case}
             {case match=quick_time}{'QuickTime'|i18n( 'design/standard/content/datatype' )}{/case}
             {case match=real_player}{'RealPlayer'|i18n( 'design/standard/content/datatype' )}{/case}
+            {case match=silverlight}{'Silverlight'|i18n( 'design/standard/content/datatype' )}{/case}
             {case match=windows_media_player}{'Windows Media Player'|i18n( 'design/standard/content/datatype' )}{/case}
             {case}{'Unknown'|i18n( 'design/standard/content/datatype' )}{/case}
             {/switch}
@@ -136,6 +137,36 @@
             </table>
         </div>
         {/case}
+
+        {case match=silverlight}
+        <div class="block">
+            <label>{'Current file'|i18n( 'design/standard/content/datatype' )}:</label>
+            <table class="list" cellspacing="0">
+            <tr>
+                <th>{'Filename'|i18n( 'design/standard/content/datatype' )}</th>
+                <th>{'MIME type'|i18n( 'design/standard/content/datatype' )}</th>
+                <th>{'Size'|i18n( 'design/standard/content/datatype' )}</th>
+                <th>{'Width'|i18n( 'design/standard/content/datatype' )}</th>
+                <th>{'Height'|i18n( 'design/standard/content/datatype' )}</th>
+                <th>{'Quality'|i18n( 'design/standard/content/datatype' )}</th>
+                <th>{'Autoplay'|i18n( 'design/standard/content/datatype' )}</th>
+                <th>{'Loop'|i18n( 'design/standard/content/datatype' )}</th>
+                <th>{'Controls'|i18n( 'design/standard/content/datatype' )}</th>
+            </tr>
+            <tr>
+                <td>{$attr.content.original_filename}</td>
+                <td>{$attr.content.mime_type}</td>
+                <td>{$attr.content.filesize|si( byte )}</td>
+                <td>{if $attr.content.width|gt( 0 )}{$attr.content.width}{/if}</td>
+                <td>{if $attr.content.height|gt( 0 )}{$attr.content.height}{/if}</td>
+                <td>{$attr.content.quality}</td>
+                <td>{if $attr.content.is_autoplay}True{else}False{/if}</td>
+                <td>{if $attr.content.is_loop}True{else}False{/if}</td>
+                <td>{$attr.content.controls}</td>
+            </tr>
+            </table>
+        </div>
+        {/case}
         {/switch}
 
     {else}
Index: design/standard/templates/content/datatype/view/ezmedia.tpl
===================================================================
--- design/standard/templates/content/datatype/view/ezmedia.tpl	(wersja 21823)
+++ design/standard/templates/content/datatype/view/ezmedia.tpl	(kopia robocza)
@@ -74,6 +74,28 @@
         </embed>
     </object>
     {/case}
+    
+    {case match=silverlight}
+    {literal}
+    <script type="text/javascript">
+        function onErrorHandler(sender, args) { }
+        function onResizeHandler(sender, args) { }
+    </script>
+    {/literal}
+
+    <div id="silverlightControlHost">
+      <!-- Silverlight plug-in control -->
+        <object data="data:application/x-silverlight," type="application/x-silverlight-2-b1" {if $attribute.content.width|gt( 0 )}width="{$attribute.content.width}"{/if} {if $attribute.content.height|gt( 0 )}height="{$attribute.content.height}"{/if}>
+            <param name="source" value="{concat( "content/download/", $attribute.contentobject_id, "/", $attribute.content.contentobject_attribute_id, "/", $attribute.content.original_filename)|ezurl( 'no' )}" />
+            <param name="onError" value="onErrorHandler" />
+            <param name="onResize" value="onResizeHandler" />
+            <a href="http://go.microsoft.com/fwlink/?LinkID=108182" style="text-decoration: none;">
+                <img src="http://go.microsoft.com/fwlink/?LinkId=108181" alt="Get Microsoft Silverlight" style="border-style: none;" />
+            </a>
+        </object>
+        <iframe style="visibility: hidden; height: 0; width: 0; border: 0px;"></iframe>
+    </div>
+    {/case}
     {/switch}
 
 {section-else}
Index: design/standard/templates/content/datatype/view/plain/ezmedia.tpl
===================================================================
--- design/standard/templates/content/datatype/view/plain/ezmedia.tpl	(wersja 21823)
+++ design/standard/templates/content/datatype/view/plain/ezmedia.tpl	(kopia robocza)
@@ -53,4 +53,25 @@
  controls="{$attribute.content.controls}" >
 </embed> </object>
 {/case}
+    {case match=silverlight}
+    {literal}
+    <script type="text/javascript">
+        function onErrorHandler(sender, args) { }
+        function onResizeHandler(sender, args) { }
+    </script>
+    {/literal}
+
+    <div id="silverlightControlHost">
+      <!-- Silverlight plug-in control -->
+        <object data="data:application/x-silverlight," type="application/x-silverlight-2-b1" {if $attribute.content.width|gt( 0 )}width="{$attribute.content.width}"{/if} {if $attribute.content.height|gt( 0 )}height="{$attribute.content.height}"{/if}>
+            <param name="source" value="{concat( "content/download/", $attribute.contentobject_id, "/", $attribute.content.contentobject_attribute_id, "/", $attribute.content.original_filename)|ezurl( 'no' )}" />
+            <param name="onError" value="onErrorHandler" />
+            <param name="onResize" value="onResizeHandler" />
+            <a href="http://go.microsoft.com/fwlink/?LinkID=108182" style="text-decoration: none;">
+                <img src="http://go.microsoft.com/fwlink/?LinkId=108181" alt="Get Microsoft Silverlight" style="border-style: none;" />
+            </a>
+        </object>
+        <iframe style="visibility: hidden; height: 0; width: 0; border: 0px;"></iframe>
+    </div>
+    {/case}
 {/switch}
\ No newline at end of file
Index: design/standard/templates/class/datatype/edit/ezmedia.tpl
===================================================================
--- design/standard/templates/class/datatype/edit/ezmedia.tpl	(wersja 21823)
+++ design/standard/templates/class/datatype/edit/ezmedia.tpl	(kopia robocza)
@@ -5,6 +5,7 @@
     <option value="flash" {section show=eq( $class_attribute.data_text1, 'flash' )}selected="selected"{/section}>{'Flash'|i18n( 'design/standard/class/datatype' )}</option>
     <option value="quick_time" {section show=eq( $class_attribute.data_text1, 'quick_time' )}selected="selected"{/section}>{'QuickTime'|i18n( 'design/standard/class/datatype' )}</option>
     <option value="real_player" {section show=eq( $class_attribute.data_text1, 'real_player' )}selected="selected"{/section}>{'RealPlayer'|i18n( 'design/standard/class/datatype' )}</option>
+    <option value="silverlight" {section show=eq( $class_attribute.data_text1, 'silverlight' )}selected="selected"{/section}>{'Silverlight'|i18n( 'design/standard/class/datatype' )}</option>
     <option value="windows_media_player" {section show=eq( $class_attribute.data_text1, 'windows_media_player' )}selected="selected"{/section}>{'Windows Media Player'|i18n( 'design/standard/class/datatype' )}</option>
 </select>
 </div>
Index: design/standard/templates/class/datatype/view/ezmedia.tpl
===================================================================
--- design/standard/templates/class/datatype/view/ezmedia.tpl	(wersja 21823)
+++ design/standard/templates/class/datatype/view/ezmedia.tpl	(kopia robocza)
@@ -6,6 +6,7 @@
     {case match='flash'}{'Flash'|i18n( 'design/standard/class/datatype' )}{/case}
     {case match='quick_time'}{'QuickTime'|i18n( 'design/standard/class/datatype' )}{/case}
     {case match='real_player'}{'RealPlayer'|i18n( 'design/standard/class/datatype' )}{/case}
+    {case match='silverlight'}{'Silverlight'|i18n( 'design/standard/class/datatype' )}{/case}
     {case match='windows_media_player'}{'Windows Media Player'|i18n( 'design/standard/class/datatype' )}{/case}
     {case}<i>{'Empty'|i18n( 'design/standard/class/datatype' )}</i>{/case}
     {/switch}