Readers section is improved.

diff --git a/Workspace/Siman-Common/src/test/labels.properties b/Workspace/Siman-Common/src/test/labels.properties
index 257e0255f469e9e95ac2e9e518126c491d165652..eaf2630c0697a84ea21f065f68666b9057f3799e 100644 (file)
--- a/Workspace/Siman-Common/src/test/labels.properties
+++ b/Workspace/Siman-Common/src/test/labels.properties
@@ -151,6 +151,10 @@ label.APPROVAL        = Approuv
 label.skipped         = Ne s'applique pas
 label.bytheauthor     = Auteur du document
 label.me              = Moi
+label.readers.section = Reader(s) of the study
+label.readers            = Reader(s)
+label.readers.present = Current reader(s)
+label.readers.absents = Other possible readers
 
 
 field.username      = Nom utilisateur
@@ -181,6 +185,9 @@ field.code          = Code interne
 field.step          = Activité concernée
 field.label         = Nom en
 field.context.value = Valeur
+field.fromStudy     = Source study
+field.fromScenario  = Source scenario
+field.finalStep     = Up to the step
 
 
 criterion.study          = Les études
@@ -244,6 +251,7 @@ tooltip.edit.study     = Modifier cette 
 tooltip.edit.document  = Modifier ce document...
 tooltip.edit.context   = Modifier ce contexte de simulation...
 tooltip.edit.members   = Inscrire les contributeurs
+tooltip.edit.readers   = Register readers
 tooltip.version        = Versionner ce document
 tooltip.refresh        = Actualiser
 tooltip.close          = Fermer
@@ -321,6 +329,7 @@ message.error.reference.mismatch  = Ce document porte une r
 message.error.format.version      = Ce document porte un numéro de version illicite.
 message.error.format.date         = Ce document porte une date illicite ou définie dans un format non supporté.
 message.error.version.mismatch    = Ce document porte un numéro de version illicite ou incorrect.
+message.error.comparison                 = Invalid comparison input data. Select at least one document; all selected documents should have compatible format.
 
 #Validation errors
 message.error.noenteredvalue=The field ''{0}'' must be filled
\ No newline at end of file

diff --git a/Workspace/Siman-Common/src/test/labels_en.properties b/Workspace/Siman-Common/src/test/labels_en.properties
index 1ddcf16e9a2d5139aa71325de5ceda3f610316db..3f2c96e8caadb1710a7a14036421b2997cf64fbf 100644 (file)
--- a/Workspace/Siman-Common/src/test/labels_en.properties
+++ b/Workspace/Siman-Common/src/test/labels_en.properties
@@ -152,6 +152,10 @@ label.APPROVAL        = Approved by
 label.skipped         = Not Applicable
 label.bytheauthor     = Author of document
 label.me              = Me
+label.readers.section = Reader(s) of the study
+label.readers            = Reader(s)
+label.readers.present = Current reader(s)
+label.readers.absents = Other possible readers
 
 
 field.username      = Username
@@ -182,6 +186,9 @@ field.code          = Internal code
 field.step          = Involved activity
 field.label         = Name in
 field.context.value = Value
+field.fromStudy     = Source study
+field.fromScenario  = Source scenario
+field.finalStep     = Up to the step
 
 
 criterion.study          = All studies
@@ -245,6 +252,7 @@ tooltip.edit.study     = Edit this study...
 tooltip.edit.document  = Edit this document...
 tooltip.edit.context   = Edit this simulation context
 tooltip.edit.members   = Register contributors
+tooltip.edit.readers   = Register readers
 tooltip.version        = Version this document
 tooltip.refresh        = Refresh
 tooltip.close          = Close
@@ -322,6 +330,7 @@ message.error.reference.mismatch  = The reference of this document does not matc
 message.error.format.version      = The revision number of this document is illicit.
 message.error.format.date         = The date of this document is illicit or is defined in an unsupported format.
 message.error.version.mismatch    = The revision number of this document is illicit or incorrect.
+message.error.comparison                 = Invalid comparison input data. Select at least one document; all selected documents should have compatible format.
 
 #Validation errors
 message.error.noenteredvalue=The field ''{0}'' must be filled
\ No newline at end of file

diff --git a/Workspace/Siman-WS/src/labels.properties b/Workspace/Siman-WS/src/labels.properties
index 257e0255f469e9e95ac2e9e518126c491d165652..ef0ad79bfcb1f2585f0407c212456faa74c5f142 100644 (file)
--- a/Workspace/Siman-WS/src/labels.properties
+++ b/Workspace/Siman-WS/src/labels.properties
@@ -151,6 +151,10 @@ label.APPROVAL        = Approuv
 label.skipped         = Ne s'applique pas
 label.bytheauthor     = Auteur du document
 label.me              = Moi
+label.readers.section = Reader(s) of the study
+label.readers            = Reader(s)
+label.readers.present = Current reader(s)
+label.readers.absents = Other possible readers
 
 
 field.username      = Nom utilisateur
@@ -181,6 +185,9 @@ field.code          = Code interne
 field.step          = Activité concernée
 field.label         = Nom en
 field.context.value = Valeur
+field.fromStudy     = Source study
+field.fromScenario  = Source scenario
+field.finalStep     = Up to the step
 
 
 criterion.study          = Les études
@@ -244,6 +251,7 @@ tooltip.edit.study     = Modifier cette 
 tooltip.edit.document  = Modifier ce document...
 tooltip.edit.context   = Modifier ce contexte de simulation...
 tooltip.edit.members   = Inscrire les contributeurs
+tooltip.edit.readers   = Register readers
 tooltip.version        = Versionner ce document
 tooltip.refresh        = Actualiser
 tooltip.close          = Fermer
@@ -268,7 +276,7 @@ message.noindex           = Aucune 
 message.nocontext         = Aucun contexte de simulation n''est en attente d''approbation.
 message.emptydocument     = Aucun document n''a été créé à cette étape.
 message.accept.document   = Voulez-vous accepter les modifications des documents utilisés ?
-message.publish.study     = All knowledge attached to the study will also be published. Did you review these knowledge ?
+message.publish.study     = Voulez-vous publier l’étude ?
 message.protect.study     = Do you really want to protect the study ?
 message.promote.document  = Voulez-vous promouvoir ce document ?
 message.promote.knowledge = Voulez-vous avancer l’état de cette connaissance ?
@@ -276,7 +284,7 @@ message.review.document   = Voulez-vous valider ce document ?
 message.approve.document  = Voulez-vous approuver ce document ?
 message.demote.document   = Voulez-vous reculer l’état de ce document ?
 message.demote.knowledge  = Voulez-vous reculer l’état de cette connaissance ?
-message.delete.study      = The study will no more exist in the database. Do you really want to continue ?
+message.delete.study      = Voulez-vous placer l’étude dans la Corbeille ?
 message.delete.context    = Voulez-vous retirer ce contexte de simulation ?
 message.delete.document   = Voulez-vous supprimer ce document ?
 message.delete.knowledge  = Voulez-vous supprimer cette connaissance ?
@@ -321,6 +329,7 @@ message.error.reference.mismatch  = Ce document porte une r
 message.error.format.version      = Ce document porte un numéro de version illicite.
 message.error.format.date         = Ce document porte une date illicite ou définie dans un format non supporté.
 message.error.version.mismatch    = Ce document porte un numéro de version illicite ou incorrect.
+message.error.comparison                 = Invalid comparison input data. Select at least one document; all selected documents should have compatible format.
 
 #Validation errors
 message.error.noenteredvalue=The field ''{0}'' must be filled
\ No newline at end of file

diff --git a/Workspace/Siman-WS/src/labels_en.properties b/Workspace/Siman-WS/src/labels_en.properties
index 1ddcf16e9a2d5139aa71325de5ceda3f610316db..3f2c96e8caadb1710a7a14036421b2997cf64fbf 100644 (file)
--- a/Workspace/Siman-WS/src/labels_en.properties
+++ b/Workspace/Siman-WS/src/labels_en.properties
@@ -152,6 +152,10 @@ label.APPROVAL        = Approved by
 label.skipped         = Not Applicable
 label.bytheauthor     = Author of document
 label.me              = Me
+label.readers.section = Reader(s) of the study
+label.readers            = Reader(s)
+label.readers.present = Current reader(s)
+label.readers.absents = Other possible readers
 
 
 field.username      = Username
@@ -182,6 +186,9 @@ field.code          = Internal code
 field.step          = Involved activity
 field.label         = Name in
 field.context.value = Value
+field.fromStudy     = Source study
+field.fromScenario  = Source scenario
+field.finalStep     = Up to the step
 
 
 criterion.study          = All studies
@@ -245,6 +252,7 @@ tooltip.edit.study     = Edit this study...
 tooltip.edit.document  = Edit this document...
 tooltip.edit.context   = Edit this simulation context
 tooltip.edit.members   = Register contributors
+tooltip.edit.readers   = Register readers
 tooltip.version        = Version this document
 tooltip.refresh        = Refresh
 tooltip.close          = Close
@@ -322,6 +330,7 @@ message.error.reference.mismatch  = The reference of this document does not matc
 message.error.format.version      = The revision number of this document is illicit.
 message.error.format.date         = The date of this document is illicit or is defined in an unsupported format.
 message.error.version.mismatch    = The revision number of this document is illicit or incorrect.
+message.error.comparison                 = Invalid comparison input data. Select at least one document; all selected documents should have compatible format.
 
 #Validation errors
 message.error.noenteredvalue=The field ''{0}'' must be filled
\ No newline at end of file

diff --git a/Workspace/Siman/WebContent/study/displayStudyProperties.jsp b/Workspace/Siman/WebContent/study/displayStudyProperties.jsp
index d8554e271d0642407376a8fa609177d5dd62be34..b1a6708545cc70b880b9e10c48ba81b3b872daa6 100644 (file)
--- a/Workspace/Siman/WebContent/study/displayStudyProperties.jsp
+++ b/Workspace/Siman/WebContent/study/displayStudyProperties.jsp
@@ -49,6 +49,32 @@
               </td>
               <td><s:property value="%{author.toString()}"/></td>
             </tr>
+            
+        <!-- Readers functionality -->
+            <tr height=10><td width=20></td></tr>
+            <tr>
+              <td><img src="<s:url value="/skin/image.downarrow.png"/>" border="none"/></td>
+              <td><b><s:text name="label.readers.section"/></b></td>
+            </tr>
+            <tr height=5><td></td></tr>
+            
+            <tr><td/><td><s:text name="label.readers"/></td></tr>
+            <tr height=1 bgcolor=#AAAAAA><td colspan=6></td></tr>
+            <tr>
+                <td>
+                  <s:if test="#todo == 'display'"> <s:a namespace="/study" action="init-edit-readers" >
+                      <img src="<s:url value="/skin/icon.ed.png"/>" border="none" 
+                            title="<s:text name="tooltip.edit.readers"/>"/>
+                  </s:a> </s:if>
+                </td>
+                <td colspan="4">
+                  <s:iterator value="readers" status="counter">
+                    <s:if test="#counter.last"><s:property value="%{displayName}"/></s:if>
+                    <s:else><s:property value="%{displayName}"/>,</s:else>
+                  </s:iterator>
+                </td>
+            </tr>
+            
 
             <tr height=15><td width=20></td></tr>
             <tr>

diff --git a/Workspace/Siman/WebContent/study/editStudyProperties.jsp b/Workspace/Siman/WebContent/study/editStudyProperties.jsp
index 49cbda8e2889ebb1e0071327ac84e34bc1ca651d..7ade4c75bb1fdfd658ac4e8954abb3a719e325fd 100644 (file)
--- a/Workspace/Siman/WebContent/study/editStudyProperties.jsp
+++ b/Workspace/Siman/WebContent/study/editStudyProperties.jsp
@@ -181,10 +181,10 @@
             <tr height=10><td width=20></td></tr>
             <tr>
               <td><img src="<s:url value="/skin/image.downarrow.png"/>" border="none"/></td>
-              <td><b><s:text name="label.readers"/></b></td>
+              <td><b><s:text name="label.readers.section"/></b></td>
             </tr>
             <tr height=5><td></td></tr>
-
+            
             <s:if test="actionType eq 'editReaders'">
                  <tr>
                      <td>
@@ -205,7 +205,7 @@
             
               <tr>
                 <td></td>
-                <td>
+                <td valign="top">
                   <table border="0" cellpadding="0" cellspacing="0">
                   <s:iterator value="readers">
                     <tr>
@@ -238,6 +238,8 @@
               </tr>
             </s:if>
             <s:else>
+              <tr><td/><td><s:text name="label.readers"/></td></tr>
+              <tr height=1 bgcolor=#AAAAAA><td colspan=6></td></tr>
               <tr>
                 <td>
                   <s:if test="#todo == 'display'"> <s:a namespace="/study" action="init-edit-readers" >

diff --git a/Workspace/Siman/src/labels.properties b/Workspace/Siman/src/labels.properties
index cd9194ad789873271da19d89ff6dd79f4b8af20d..eaf2630c0697a84ea21f065f68666b9057f3799e 100644 (file)
--- a/Workspace/Siman/src/labels.properties
+++ b/Workspace/Siman/src/labels.properties
@@ -151,7 +151,8 @@ label.APPROVAL        = Approuv
 label.skipped         = Ne s'applique pas
 label.bytheauthor     = Auteur du document
 label.me              = Moi
-label.readers            = Reader(s) of the study
+label.readers.section = Reader(s) of the study
+label.readers            = Reader(s)
 label.readers.present = Current reader(s)
 label.readers.absents = Other possible readers
 

diff --git a/Workspace/Siman/src/labels_en.properties b/Workspace/Siman/src/labels_en.properties
index 081f9086e2119641bed0ea5547bdc370ade22dc3..3f2c96e8caadb1710a7a14036421b2997cf64fbf 100644 (file)
--- a/Workspace/Siman/src/labels_en.properties
+++ b/Workspace/Siman/src/labels_en.properties
@@ -152,7 +152,8 @@ label.APPROVAL        = Approved by
 label.skipped         = Not Applicable
 label.bytheauthor     = Author of document
 label.me              = Me
-label.readers            = Reader(s) of the study
+label.readers.section = Reader(s) of the study
+label.readers            = Reader(s)
 label.readers.present = Current reader(s)
 label.readers.absents = Other possible readers