From c94b5381926ce2d70530964c3fdf4b17b563450d Mon Sep 17 00:00:00 2001 From: mka Date: Tue, 2 Apr 2013 12:09:46 +0000 Subject: [PATCH] Readers section is improved. --- .../Siman-Common/src/test/labels.properties | 9 +++++++ .../src/test/labels_en.properties | 9 +++++++ Workspace/Siman-WS/src/labels.properties | 13 ++++++++-- Workspace/Siman-WS/src/labels_en.properties | 9 +++++++ .../study/displayStudyProperties.jsp | 26 +++++++++++++++++++ .../WebContent/study/editStudyProperties.jsp | 8 +++--- Workspace/Siman/src/labels.properties | 3 ++- Workspace/Siman/src/labels_en.properties | 3 ++- 8 files changed, 73 insertions(+), 7 deletions(-) diff --git a/Workspace/Siman-Common/src/test/labels.properties b/Workspace/Siman-Common/src/test/labels.properties index 257e025..eaf2630 100644 --- 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 1ddcf16..3f2c96e 100644 --- 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 257e025..ef0ad79 100644 --- 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 1ddcf16..3f2c96e 100644 --- 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 d8554e2..b1a6708 100644 --- a/Workspace/Siman/WebContent/study/displayStudyProperties.jsp +++ b/Workspace/Siman/WebContent/study/displayStudyProperties.jsp @@ -49,6 +49,32 @@ + + + + + " border="none"/> + + + + + + + + + + " border="none" + title=""/> + + + + + + , + + + + diff --git a/Workspace/Siman/WebContent/study/editStudyProperties.jsp b/Workspace/Siman/WebContent/study/editStudyProperties.jsp index 49cbda8..7ade4c7 100644 --- a/Workspace/Siman/WebContent/study/editStudyProperties.jsp +++ b/Workspace/Siman/WebContent/study/editStudyProperties.jsp @@ -181,10 +181,10 @@ " border="none"/> - + - + @@ -205,7 +205,7 @@ - + @@ -238,6 +238,8 @@ + +
diff --git a/Workspace/Siman/src/labels.properties b/Workspace/Siman/src/labels.properties index cd9194a..eaf2630 100644 --- 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 081f908..3f2c96e 100644 --- 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 -- 2.39.2