Changeset 1703

Timestamp:

03/23/10 13:51:51 (23 months ago)

Author:

stp

Message:

Changement code "res" en "img" dans les textes illustrés pour pouvoir copier images normales en images de texte illustrés et inversement.

Location:

trunk/model/sources/academic

Files:

• gen/_od/transf/Re/txtRes.transf (modified) (3 diffs)
• gen/_web/transf/@credits/txtRes@credits.transf (modified) (1 diff)
• gen/_web/transf/Re/txtRes.transf (modified) (3 diffs)
• model/Re/txtRes.model (modified) (4 diffs)

trunk/model/sources/academic/gen/_od/transf/Re/txtRes.transf

@@ -6 +6 @@
                 <sm:WParagraph globalStyle="spaceBeforeKeep" display="always"/>
                 <!--# copyright-->
-                <sm:for codes="res">
+                <sm:for codes="img">
                         <sm:dataBlock category="cprRes">
                                 <sm:blockId>
@@ -25 +25 @@
                         <sm:choose>
                                 <sm:when xpath="op:txtResM/sp:pos='rgt'">
-                                        <sm:for codes="res">
+                                        <sm:for codes="img">
                                                 <sm:dataBlock category="res">
                                                         <sm:overrideContentDeclaration>
@@ -54 +54 @@
                                 </sm:when>
                                 <sm:otherwise>
-                                        <sm:for codes="res">
+                                        <sm:for codes="img">
                                                 <sm:dataBlock category="res">
                                                         <sm:overrideContentDeclaration>

trunk/model/sources/academic/gen/_web/transf/@credits/txtRes@credits.transf

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?><sm:compositionXhtmlTransf xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core">
+<?xml version="1.0" encoding="UTF-8"?>
+<sm:compositionXhtmlTransf xmlns:sc="http://www.utc.fr/ics/scenari/v3/core" xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling">
         <sm:model sc:refUri="/academic/model/Re/txtRes.model"/>
         <sm:axis code="credits"/>
         <sm:content format="xhtml">
                 <sm:inDataOrder>
-                        <sm:for codes="res">
+                        <sm:for codes="img">
                                 <sm:callSubModel axis="credits"/>
                         </sm:for>

trunk/model/sources/academic/gen/_web/transf/Re/txtRes.transf

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?><sm:compositionXhtmlTransf xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core">
+<?xml version="1.0" encoding="UTF-8"?>
+<sm:compositionXhtmlTransf xmlns:sc="http://www.utc.fr/ics/scenari/v3/core" xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling">
         <sm:model sc:refUri="/academic/model/Re/txtRes.model"/>
         <sm:content format="xhtml">
@@ -14 +15 @@
                                                 </sm:WTableCell>
                                                 <sm:WTableCell widgetClass="op_txtRes_cellResRgt">
-                                                        <sm:for codes="res">
+                                                        <sm:for codes="img">
                                                                 <sm:callSubModel axis="txtRes"/>
                                                         </sm:for>
@@ -21 +22 @@
                                         <sm:otherwise>
                                                 <sm:WTableCell widgetClass="op_txtRes_cellResLft">
-                                                        <sm:for codes="res">
+                                                        <sm:for codes="img">
                                                                 <sm:callSubModel axis="txtRes"/>
                                                         </sm:for>

trunk/model/sources/academic/model/Re/txtRes.model

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?><sm:compositionPrim xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core" name=";Texte illustré">
+<?xml version="1.0" encoding="UTF-8"?>
+<sm:compositionPrim xmlns:sc="http://www.utc.fr/ics/scenari/v3/core" xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" name=";Texte illustré">
         <sm:help quickHelp=";Insérer un texte accompagné d'une illustration (à droite ou à gauche)"/>
         <sm:identification targetNamespace="utc.fr:ics/opale3" targetPrefix="op" code="txtRes" itemExtension="xml"/>
@@ -7 +8 @@
                         <sm:allowedModel sc:refUri="/academic/model/Re/txt.model"/>
                 </sm:part>
-                <sm:part code="res" name=";Image d'illustration" family="content" internalized="never" usage="required">
+                <sm:part code="img" name=";Image d'illustration" family="content" internalized="never" usage="required">
                         <sm:help quickHelp=";Insérer une image à une résolution de 300 dpi"/>
                         <sm:allowedModel sc:refUri="/binaries/png/png.model"/>
@@ -44 +45 @@
                                 </sm:stylableWidget>
                         </sm:part>
-                        <sm:part refCode="res">
+                        <sm:part refCode="img">
                                 <sm:stylableWidget>
                                         <sm:styles>
@@ -67 +68 @@
                 <sm:htmlPreview>
                         <sm:block refCode="txt" display="true" displayLevel="false" displayPartName="false"/>
-                        <sm:block refCode="res" display="true" displayLevel="false" displayPartName="false"/>
+                        <sm:block refCode="img" display="true" displayLevel="false" displayPartName="false"/>
                 </sm:htmlPreview>
         </sm:authoring>