From ba9a0ff95af71ea578356765e7c2bda3daf78c0e Mon Sep 17 00:00:00 2001 From: toskrip Date: Tue, 18 Feb 2020 15:41:50 +0100 Subject: [PATCH] Remove the help icon, adapt documentation links and remove the dead links to legacy portal --- .../akaza/openclinica/i18n/notes.properties | 2 +- .../openclinica/i18n/page_messages.properties | 2 +- .../install-docs/linux/linux-install.rtf | 20 ---- .../install-docs/linux/linux-upgrade.rtf | 22 ---- web/src/main/config/install-docs/linux/tomcat | 99 ------------------ .../config/install-docs/windows/install.doc | Bin 56320 -> 0 bytes .../config/install-docs/windows/upgrade.doc | Bin 31744 -> 0 bytes .../control/admin/UpdateCRFServlet.java | 7 +- .../akaza/openclinica/i18n/notes.properties | 2 +- .../openclinica/i18n/page_messages.properties | 2 +- .../webapp/WEB-INF/jsp/admin/createCRF.jsp | 3 +- .../main/webapp/WEB-INF/jsp/admin/index.jsp | 4 +- .../main/webapp/WEB-INF/jsp/admin/listCRF.jsp | 13 +-- .../webapp/WEB-INF/jsp/admin/listSubject.jsp | 2 +- .../WEB-INF/jsp/admin/listuseraccounts.jsp | 2 +- .../WEB-INF/jsp/admin/studyAuditLog.jsp | 5 - .../webapp/WEB-INF/jsp/admin/viewAllJobs.jsp | 2 +- .../main/webapp/WEB-INF/jsp/admin/viewCRF.jsp | 5 +- .../WEB-INF/jsp/admin/viewFullStudy.jsp | 2 +- .../WEB-INF/jsp/admin/viewImportJobs.jsp | 2 +- .../webapp/WEB-INF/jsp/admin/viewJobs.jsp | 2 +- .../WEB-INF/jsp/admin/viewSingleJob.jsp | 2 +- .../WEB-INF/jsp/extract/applyFilter.jsp | 2 +- .../jsp/extract/createDatasetBegin.jsp | 2 +- .../jsp/extract/createDatasetStep2.jsp | 15 +-- .../jsp/extract/createDatasetStep3.jsp | 5 +- .../jsp/extract/createDatasetStep4.jsp | 6 +- .../jsp/extract/createFilterScreen1.jsp | 2 +- .../jsp/extract/createFilterScreen2.jsp | 2 +- .../jsp/extract/createFilterScreen3.jsp | 2 +- .../jsp/extract/createFilterScreen3_1.jsp | 2 +- .../jsp/extract/createFilterScreen3_2.jsp | 2 +- .../jsp/extract/createFilterScreen4.jsp | 2 +- .../jsp/extract/createFilterScreen5.jsp | 2 +- .../WEB-INF/jsp/extract/editDataset.jsp | 2 +- .../WEB-INF/jsp/extract/exportDatasets.jsp | 2 +- .../jsp/extract/extractDatasetsMain.jsp | 2 +- .../jsp/extract/generateMetadataFile.jsp | 4 +- .../jsp/extract/generatedDatasetHtml.jsp | 2 +- .../webapp/WEB-INF/jsp/extract/itemDetail.jsp | 2 +- .../WEB-INF/jsp/extract/viewDatasets.jsp | 2 +- .../WEB-INF/jsp/extract/viewSelected.jsp | 5 +- .../WEB-INF/jsp/extract/viewSelectedHtml.jsp | 4 +- .../webapp/WEB-INF/jsp/include/breadcrumb.jsp | 1 - .../WEB-INF/jsp/include/footer-inactive.jsp | 4 +- .../webapp/WEB-INF/jsp/include/footer.jsp | 2 +- .../WEB-INF/jsp/include/home-header.jsp | 6 -- .../webapp/WEB-INF/jsp/include/navBar.jsp | 1 - .../webapp/WEB-INF/jsp/include/sideIcons.jsp | 2 - .../jsp/include/sideIconsDataEntry.jsp | 2 - .../WEB-INF/jsp/include/sideIconsSubject.jsp | 2 - .../jsp/login-include/login-footer.jsp | 2 +- .../jsp/login-include/login-sidebar.jsp | 8 +- .../jsp/login-include/request-sidebar.jsp | 5 - .../jsp/login-include/resetpwd-sidebar.jsp | 11 +- .../webapp/WEB-INF/jsp/login/changeStudy.jsp | 2 +- .../webapp/WEB-INF/jsp/login/requestStudy.jsp | 2 +- .../WEB-INF/jsp/login/updateProfile.jsp | 4 +- .../jsp/managestudy/chooseCRFVersion.jsp | 6 +- .../managestudy/confirmCRFVersionChange.jsp | 7 +- .../jsp/managestudy/createSubStudy.jsp | 2 +- .../managestudy/createSubjectGroupClass.jsp | 2 +- .../WEB-INF/jsp/managestudy/findSubjects.jsp | 6 +- .../webapp/WEB-INF/jsp/managestudy/index.jsp | 2 +- .../jsp/managestudy/listStudySubject.jsp | 4 +- .../jsp/managestudy/listSubjectDiscNote.jsp | 20 +--- .../jsp/managestudy/listUserInStudy.jsp | 2 +- .../jsp/managestudy/managestudy_body.jsp | 2 +- .../WEB-INF/jsp/managestudy/siteList.jsp | 3 +- .../managestudy/studyEventDefinitionList.jsp | 3 +- .../WEB-INF/jsp/managestudy/studyList.jsp | 2 +- .../WEB-INF/jsp/managestudy/studyUserList.jsp | 2 - .../jsp/managestudy/subjectGroupClassList.jsp | 7 +- .../viewEventDefinitionNoSidebar.jsp | 2 - .../WEB-INF/jsp/managestudy/viewNotes.jsp | 20 ++-- .../jsp/managestudy/viewNotesPrint.jsp | 6 +- .../jsp/managestudy/viewStudyEvents.jsp | 35 ++----- .../jsp/managestudy/viewStudySubject.jsp | 12 +-- web/src/main/webapp/WEB-INF/jsp/menu.jsp | 16 ++- .../main/webapp/WEB-INF/jsp/studymodule.jsp | 10 +- .../WEB-INF/jsp/submit/addExistingSubject.jsp | 4 +- .../WEB-INF/jsp/submit/addNewSubject.jsp | 7 +- .../jsp/submit/createNewStudyEvent.jsp | 10 +- .../WEB-INF/jsp/submit/discrepancyNote.jsp | 1 - .../jsp/submit/enterDataForStudyEvent.jsp | 4 +- .../main/webapp/WEB-INF/jsp/submit/import.jsp | 4 +- .../webapp/WEB-INF/jsp/submit/importRules.jsp | 23 +--- .../main/webapp/WEB-INF/jsp/submit/index.jsp | 4 +- .../jsp/submit/instructionsEnrollSubject.jsp | 2 +- .../WEB-INF/jsp/submit/listDNotesForCRF.jsp | 7 +- .../jsp/submit/listEventsForSubject.jsp | 5 +- .../WEB-INF/jsp/submit/listRuleSets.jsp | 11 +- .../WEB-INF/jsp/submit/listRuleSets2.jsp | 11 +- .../jsp/submit/listRuleSetsDesigner.jsp | 11 +- .../WEB-INF/jsp/submit/tableOfContents.jsp | 2 +- .../WEB-INF/jsp/submit/verifyImportRule.jsp | 14 +-- .../webapp/WEB-INF/jsp/techadmin/index.jsp | 4 +- .../WEB-INF/jsp/viewAllSubjectSDVtmp.jsp | 6 +- .../WEB-INF/jsp/viewSubjectAggregate.jsp | 6 +- web/src/main/webapp/WEB-INF/tags/footer.tag | 7 +- web/src/main/webapp/css/app.css | 10 +- web/src/main/webapp/decorator.jsp | 2 +- web/src/main/webapp/images/popup_OC.gif | Bin 1035 -> 0 bytes web/src/main/webapp/structure.html | 12 +-- .../install-docs/linux/linux-install.rtf | 20 ---- .../install-docs/linux/linux-upgrade.rtf | 22 ---- ws/src/main/config/install-docs/linux/tomcat | 99 ------------------ .../config/install-docs/windows/install.doc | Bin 56320 -> 0 bytes .../config/install-docs/windows/upgrade.doc | Bin 31744 -> 0 bytes .../akaza/openclinica/i18n/notes.properties | 4 +- .../openclinica/i18n/page_messages.properties | 2 +- .../webapp/WEB-INF/jsp/admin/createCRF.jsp | 3 +- .../WEB-INF/jsp/admin/createCRFVersion.jsp | 3 - .../main/webapp/WEB-INF/jsp/admin/index.jsp | 4 +- .../main/webapp/WEB-INF/jsp/admin/listCRF.jsp | 9 +- .../webapp/WEB-INF/jsp/admin/listSubject.jsp | 2 +- .../WEB-INF/jsp/admin/listuseraccounts.jsp | 2 +- .../webapp/WEB-INF/jsp/admin/viewAllJobs.jsp | 2 +- .../WEB-INF/jsp/admin/viewImportJobs.jsp | 2 +- .../webapp/WEB-INF/jsp/admin/viewJobs.jsp | 2 +- .../WEB-INF/jsp/admin/viewSingleJob.jsp | 2 +- .../WEB-INF/jsp/extract/applyFilter.jsp | 2 +- .../jsp/extract/createDatasetBegin.jsp | 2 +- .../jsp/extract/createDatasetStep2.jsp | 15 +-- .../jsp/extract/createDatasetStep3.jsp | 5 +- .../jsp/extract/createDatasetStep4.jsp | 6 +- .../jsp/extract/createFilterScreen1.jsp | 2 +- .../jsp/extract/createFilterScreen2.jsp | 2 +- .../jsp/extract/createFilterScreen3.jsp | 2 +- .../jsp/extract/createFilterScreen3_1.jsp | 2 +- .../jsp/extract/createFilterScreen3_2.jsp | 2 +- .../jsp/extract/createFilterScreen4.jsp | 2 +- .../jsp/extract/createFilterScreen5.jsp | 2 +- .../WEB-INF/jsp/extract/editDataset.jsp | 2 +- .../WEB-INF/jsp/extract/exportDatasets.jsp | 2 +- .../jsp/extract/extractDatasetsMain.jsp | 2 +- .../jsp/extract/generateMetadataFile.jsp | 4 +- .../jsp/extract/generatedDatasetHtml.jsp | 2 +- .../webapp/WEB-INF/jsp/extract/itemDetail.jsp | 2 +- .../WEB-INF/jsp/extract/viewDatasets.jsp | 2 +- .../WEB-INF/jsp/extract/viewSelected.jsp | 5 +- .../WEB-INF/jsp/extract/viewSelectedHtml.jsp | 4 +- .../webapp/WEB-INF/jsp/include/breadcrumb.jsp | 16 +-- .../WEB-INF/jsp/include/footer-inactive.jsp | 4 +- .../webapp/WEB-INF/jsp/include/footer.jsp | 2 +- .../WEB-INF/jsp/include/home-header.jsp | 6 -- .../webapp/WEB-INF/jsp/include/navBar.jsp | 7 -- .../webapp/WEB-INF/jsp/include/sideIcons.jsp | 2 - .../jsp/include/sideIconsDataEntry.jsp | 2 - .../WEB-INF/jsp/include/sideIconsSubject.jsp | 2 - .../jsp/login-include/login-footer.jsp | 2 +- .../jsp/login-include/login-sidebar.jsp | 23 +--- .../jsp/login-include/request-sidebar.jsp | 13 --- .../jsp/login-include/resetpwd-sidebar.jsp | 11 +- .../webapp/WEB-INF/jsp/login/changeStudy.jsp | 2 +- .../webapp/WEB-INF/jsp/login/requestStudy.jsp | 2 +- .../WEB-INF/jsp/login/updateProfile.jsp | 2 +- .../managestudy/createSubjectGroupClass.jsp | 2 +- .../WEB-INF/jsp/managestudy/findSubjects.jsp | 5 +- .../webapp/WEB-INF/jsp/managestudy/index.jsp | 2 +- .../jsp/managestudy/listStudySubject.jsp | 4 +- .../jsp/managestudy/listSubjectDiscNote.jsp | 20 +--- .../jsp/managestudy/listUserInStudy.jsp | 2 +- .../jsp/managestudy/managestudy_body.jsp | 2 +- .../WEB-INF/jsp/managestudy/siteList.jsp | 3 +- .../managestudy/studyEventDefinitionList.jsp | 2 +- .../WEB-INF/jsp/managestudy/studyList.jsp | 2 +- .../jsp/managestudy/subjectGroupClassList.jsp | 4 +- .../WEB-INF/jsp/managestudy/viewNotes.jsp | 19 ++-- .../jsp/managestudy/viewNotesPrint.jsp | 6 +- .../jsp/managestudy/viewStudyEvents.jsp | 35 ++----- .../jsp/managestudy/viewStudySubject.jsp | 28 +---- ws/src/main/webapp/WEB-INF/jsp/menu.jsp | 14 +-- .../main/webapp/WEB-INF/jsp/studymodule.jsp | 4 +- .../WEB-INF/jsp/submit/addExistingSubject.jsp | 4 +- .../WEB-INF/jsp/submit/addNewSubject.jsp | 6 +- .../jsp/submit/createNewStudyEvent.jsp | 4 +- .../jsp/submit/enterDataForStudyEvent.jsp | 2 +- .../main/webapp/WEB-INF/jsp/submit/import.jsp | 4 +- .../webapp/WEB-INF/jsp/submit/importRules.jsp | 12 +-- .../main/webapp/WEB-INF/jsp/submit/index.jsp | 4 +- .../jsp/submit/instructionsEnrollSubject.jsp | 2 +- .../WEB-INF/jsp/submit/listDNotesForCRF.jsp | 7 +- .../jsp/submit/listEventsForSubject.jsp | 5 +- .../WEB-INF/jsp/submit/listRuleSets.jsp | 11 +- .../WEB-INF/jsp/submit/tableOfContents.jsp | 2 +- .../WEB-INF/jsp/submit/verifyImportRule.jsp | 12 +-- .../webapp/WEB-INF/jsp/techadmin/index.jsp | 4 +- .../WEB-INF/jsp/viewAllSubjectSDVtmp.jsp | 5 +- .../WEB-INF/jsp/viewSubjectAggregate.jsp | 4 +- ws/src/main/webapp/WEB-INF/tags/footer.tag | 7 +- ws/src/main/webapp/decorator.jsp | 2 +- ws/src/main/webapp/images/popup_OC.gif | Bin 1035 -> 0 bytes .../includes/global_functions_javascript.js | 7 -- ws/src/main/webapp/index.html | 5 +- ws/src/main/webapp/structure.html | 12 +-- 196 files changed, 250 insertions(+), 1029 deletions(-) delete mode 100644 web/src/main/config/install-docs/linux/linux-install.rtf delete mode 100644 web/src/main/config/install-docs/linux/linux-upgrade.rtf delete mode 100644 web/src/main/config/install-docs/linux/tomcat delete mode 100644 web/src/main/config/install-docs/windows/install.doc delete mode 100644 web/src/main/config/install-docs/windows/upgrade.doc delete mode 100755 web/src/main/webapp/images/popup_OC.gif delete mode 100644 ws/src/main/config/install-docs/linux/linux-install.rtf delete mode 100644 ws/src/main/config/install-docs/linux/linux-upgrade.rtf delete mode 100644 ws/src/main/config/install-docs/linux/tomcat delete mode 100644 ws/src/main/config/install-docs/windows/install.doc delete mode 100644 ws/src/main/config/install-docs/windows/upgrade.doc delete mode 100755 ws/src/main/webapp/images/popup_OC.gif diff --git a/core/src/main/resources/org/akaza/openclinica/i18n/notes.properties b/core/src/main/resources/org/akaza/openclinica/i18n/notes.properties index b359754605f..859317088dc 100644 --- a/core/src/main/resources/org/akaza/openclinica/i18n/notes.properties +++ b/core/src/main/resources/org/akaza/openclinica/i18n/notes.properties @@ -122,7 +122,7 @@ extract_dataset_side_info2=Data are available in multiple formats - browsable on extract_dataset_side_info3=Listed below are the five most recently created Datasets. Click 'View All' to see all the datasets for this study. The icons next to each dataset allow you to view information about the dataset, edit its properties, delete it, and download new or archived versions of the data. fill_out_form_to_contact=Please fill out the following form to contact your Administrator with questions about LibreClinica. This form will be sent internally within your organization. fill_out_form_to_request_study=The information in the form below will be sent to your LibreClinica Administrator. The Administrator will be the decision maker on whether or not you are allowed access to a particular study or site. Please contact your LibreClinica Administrator with any questions. -fill_to_add_click_help=Fill out the form to add a subject to the study. Click on the help icon for assistance. +fill_to_add_click_help=Fill out the form to add a subject to the study. Click on the Documentation link for assistance for assistance. filter_data_selecting_range=Filter your data by subject enrollment date by selecting a date range below. find_an_existing_study_event_by=Find an Existing Study Event by find_an_existing_study_event=Find an Existing Study Event diff --git a/core/src/main/resources/org/akaza/openclinica/i18n/page_messages.properties b/core/src/main/resources/org/akaza/openclinica/i18n/page_messages.properties index 586f80bad56..774bedca58a 100644 --- a/core/src/main/resources/org/akaza/openclinica/i18n/page_messages.properties +++ b/core/src/main/resources/org/akaza/openclinica/i18n/page_messages.properties @@ -99,7 +99,7 @@ br_create_new_CRF_uploading =
Create a new CRF version by uploading an Excel br_download_blank_CRF_spreadsheet_from =
Download a blank CRF Excel spreadsheet template here. -br_download_example_CRF_instructions_from =
Download example CRFs and instructions from the OpenClinica.org portal (OpenClinica.org user account required). +br_download_example_CRF_instructions_from =
Download example CRFs from the Medical Data Models (MDM) Portal (MDM-Portal user account required). br_if_you_owner_CRF_version =
If you are the owner of a CRF version, and the CRF version has not been used in a Study, you can overwrite the CRF version by uploading a new Excel spreadsheet with same version name. In this case, the system will ask you if you want to delete the previous contents and upload a new version. diff --git a/web/src/main/config/install-docs/linux/linux-install.rtf b/web/src/main/config/install-docs/linux/linux-install.rtf deleted file mode 100644 index 64acc567129..00000000000 --- a/web/src/main/config/install-docs/linux/linux-install.rtf +++ /dev/null @@ -1,20 +0,0 @@ -{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\f4\fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Helvetica;}{\f232\froman\fcharset238\fprq2 Times New Roman CE;}{\f233\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f235\froman\fcharset161\fprq2 Times New Roman Greek;} -{\f236\froman\fcharset162\fprq2 Times New Roman Tur;}{\f237\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f238\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f239\froman\fcharset186\fprq2 Times New Roman Baltic;} -{\f240\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f272\fswiss\fcharset238\fprq2 Helvetica CE;}{\f273\fswiss\fcharset204\fprq2 Helvetica Cyr;}{\f275\fswiss\fcharset161\fprq2 Helvetica Greek;}{\f276\fswiss\fcharset162\fprq2 Helvetica Tur;} -{\f277\fswiss\fcharset177\fprq2 Helvetica (Hebrew);}{\f278\fswiss\fcharset178\fprq2 Helvetica (Arabic);}{\f279\fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f280\fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}}{\colortbl;\red0\green0\blue0; -\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128; -\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;} -{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv -\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\*\cs15 \additive \ul\cf2 \sbasedon10 \styrsid14758892 Hyperlink;}} -{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid3355758\rsid14758892}{\*\generator Microsoft Word 11.0.6359;}{\info{\author }{\operator }{\creatim\yr2011\mo11\dy1\hr14\min36}{\revtim\yr2011\mo11\dy1\hr14\min36}{\version2}{\edmins0} -{\nofpages1}{\nofwords18}{\nofchars105}{\*\company MS User}{\nofcharsws122}{\vern24703}}\margl1440\margr1440 \widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701 -\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\nolnhtadjtbl\rsidroot14758892 \fet0\sectd \linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang -{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang -{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain -\ql \li0\ri0\nowidctlpar\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\faauto\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f4\insrsid14758892 Please see }{\field{\*\fldinst { -\b\f4\insrsid14758892 HYPERLINK "}{\b\f4\insrsid14758892\charrsid14758892 https://docs.openclinica.com/3.1/installation}{\b\f4\insrsid14758892 " }{\b\f4\insrsid14758892\charrsid10697289 {\*\datafield -00d0c9ea79f9bace118c8200aa004ba90b02000000170000002e000000680074007400700073003a002f002f0064006f00630073002e006f00700065006e0063006c0069006e006900630061002e0063006f006d002f0033002e0031002f0069006e007300740061006c006c006100740069006f006e000000e0c9ea79f9ba -ce118c8200aa004ba90b74000000680074007400700073003a002f002f0064006f00630073002e006f00700065006e0063006c0069006e006900630061002e0063006f006d002f0033002e0031002f0069006e007300740061006c006c006100740069006f006e000000795881f43b1d7f48af2c825dc485276300000000a5 -ab0000}}}{\fldrslt {\cs15\b\f4\ul\cf2\insrsid14758892\charrsid10697289 https://docs.openclinica.com/3.1/installation}}}{\b\f4\insrsid14758892 . }{\b\f4\insrsid14758892\charrsid14758892 -\par }} \ No newline at end of file diff --git a/web/src/main/config/install-docs/linux/linux-upgrade.rtf b/web/src/main/config/install-docs/linux/linux-upgrade.rtf deleted file mode 100644 index 2e8e97dee4a..00000000000 --- a/web/src/main/config/install-docs/linux/linux-upgrade.rtf +++ /dev/null @@ -1,22 +0,0 @@ -{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\f4\fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Helvetica;}{\f232\froman\fcharset238\fprq2 Times New Roman CE;}{\f233\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f235\froman\fcharset161\fprq2 Times New Roman Greek;} -{\f236\froman\fcharset162\fprq2 Times New Roman Tur;}{\f237\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f238\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f239\froman\fcharset186\fprq2 Times New Roman Baltic;} -{\f240\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f272\fswiss\fcharset238\fprq2 Helvetica CE;}{\f273\fswiss\fcharset204\fprq2 Helvetica Cyr;}{\f275\fswiss\fcharset161\fprq2 Helvetica Greek;}{\f276\fswiss\fcharset162\fprq2 Helvetica Tur;} -{\f277\fswiss\fcharset177\fprq2 Helvetica (Hebrew);}{\f278\fswiss\fcharset178\fprq2 Helvetica (Arabic);}{\f279\fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f280\fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}}{\colortbl;\red0\green0\blue0; -\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128; -\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 -\snext0 \styrsid9973094 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\* -\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv -\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\*\cs15 \additive \ul\cf2 \sbasedon10 \styrsid9973094 Hyperlink;}} -{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid6754473\rsid9973094\rsid14707116}{\*\generator Microsoft Word 11.0.6359;}{\info{\author }{\operator }{\creatim\yr2011\mo5\dy3\min17}{\revtim\yr2011\mo11\dy1\hr14\min37}{\version3}{\edmins4} -{\nofpages1}{\nofwords18}{\nofchars106}{\*\company MS User}{\nofcharsws123}{\vern24703}}\margl1440\margr1440 \widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701 -\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale105\nolnhtadjtbl\rsidroot14707116 \fet0\sectd \linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang -{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang -{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain -\ql \li0\ri0\nowidctlpar\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\faauto\rin0\lin0\itap0\pararsid9973094 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f4\insrsid9973094 Please see } -{\field\flddirty{\*\fldinst {\b\f4\insrsid9973094 HYPERLINK "}{\b\f4\insrsid9973094\charrsid14758892 https://docs.openclinica.com/3.1/installation}{\b\f4\insrsid9973094 " }{\b\f4\insrsid9973094\charrsid10697289 {\*\datafield -00d0c9ea79f9bace118c8200aa004ba90b02000000170000002e000000680074007400700073003a002f002f0064006f00630073002e006f00700065006e0063006c0069006e006900630061002e0063006f006d002f0033002e0031002f0069006e007300740061006c006c006100740069006f006e000000e0c9ea79f9ba -ce118c8200aa004ba90b74000000680074007400700073003a002f002f0064006f00630073002e006f00700065006e0063006c0069006e006900630061002e0063006f006d002f0033002e0031002f0069006e007300740061006c006c006100740069006f006e000000795881f43b1d7f48af2c825dc485276300000000a5 -ab0000}}}{\fldrslt {\cs15\b\f4\ul\cf2\insrsid9973094\charrsid10697289 https://docs.openclinica.com/3.1/installation}}}{\b\f4\insrsid9973094 . }{\b\f4\insrsid9973094\charrsid14758892 -\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9973094 {\insrsid14707116\charrsid9973094 -\par }} \ No newline at end of file diff --git a/web/src/main/config/install-docs/linux/tomcat b/web/src/main/config/install-docs/linux/tomcat deleted file mode 100644 index 5a479dd5a77..00000000000 --- a/web/src/main/config/install-docs/linux/tomcat +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash -# -# tomcat -# -# chkconfig: 2345 90 15 -# description: Tomcat start script for OpenClinica. -# -# -# -# Change the variables below if they do not mee your environment. - -RETVAL=$? -export INIT_NAME="tomcat" -export CATALINA_HOME="/usr/local/tomcat" -export JAVA_HOME="/usr/local/java" -#please note that -#XX:ParallelGCThreads need to be equivalent of number of cores -export JAVA_OPTS="$JAVA_OPTS -Xmx1280m -XX:+UseParallelGC -XX:ParallelGCThreads=1 -XX:MaxPermSize=180m -XX:+CMSClassUnloadingEnabled" - - -case "$1" in - start) - ps ax | grep "$CATALINA_HOME" | grep "$JAVA_HOME" |grep -v grep | awk '{printf $1 " "}' | wc | awk '{print $2}' > /tmp/$INIT_NAME_process_count.txt - read line < /tmp/$INIT_NAME_process_count.txt - if [ $line -gt 0 ]; then - echo "Tomcat is already running with a PID of `ps ax | grep "$CATALINA_HOME" | grep "$JAVA_HOME" | awk '{printf $1 " "}'`" - else - if [ -f $CATALINA_HOME/bin/startup.sh ]; - then - echo $"Starting Tomcat" - /bin/su tomcat $CATALINA_HOME/bin/startup.sh - fi - /etc/init.d/$INIT_NAME status - fi - ;; - stop) - ps ax | grep "$CATALINA_HOME" | grep "$JAVA_HOME" |grep -v grep | awk '{printf $1 " "}' | wc | awk '{print $2}' > /tmp/$INIT_NAME_process_count.txt - read line < /tmp/$INIT_NAME_process_count.txt - if [ $line -gt 0 ]; then - if [ -f $CATALINA_HOME/bin/shutdown.sh ]; - then - echo $"Stopping Tomcat" - /bin/su tomcat $CATALINA_HOME/bin/shutdown.sh - fi - sleep 10 - /etc/init.d/$INIT_NAME status - else - echo - echo "Tomcat was not running" - echo - fi - ;; - - restart) - /etc/init.d/$INIT_NAME stop - /etc/init.d/$INIT_NAME start - ;; - - status) - ps ax | grep "$CATALINA_HOME" | grep "$JAVA_HOME" |grep -v grep | awk '{printf $1 " "}' | wc | awk '{print $2}' > /tmp/$INIT_NAME_process_count.txt - read line < /tmp/$INIT_NAME_process_count.txt - if [ $line -gt 0 ]; then - echo - echo -n "Tomcat is running with a PID of "` - ps ax | grep "$CATALINA_HOME" | grep "$JAVA_HOME" | awk '{printf $1 " "}'` - echo -n "" - echo - else - echo - echo "Tomcat is not running" - echo - fi - ;; - kill) - PID=`ps aux | grep "$CATALINA_HOME" | grep "$JAVA_HOME" | awk '{printf $2 " "}'` - echo - echo "Killing Tomcat process running on PID $PID" - echo - kill $PID - sleep 10 - echo "Confirming tomcat is killed" - /etc/init.d/$INIT_NAME status - ;; - forcekill) - PID=`ps ax | grep "$CATALINA_HOME" | grep "$JAVA_HOME" |awk '{printf $1 " "}'` - echo - echo "Killing Tomcat process running on PID $PID" - echo - kill -9 $PID - sleep 10 - echo "Confirming tomcat is killed" - /etc/init.d/$INIT_NAME status - ;; - *) - echo $"Usage: $0 {start|stop|restart|status|kill|forcekill}" - exit 1 - ;; -esac - -exit $RETVAL \ No newline at end of file diff --git a/web/src/main/config/install-docs/windows/install.doc b/web/src/main/config/install-docs/windows/install.doc deleted file mode 100644 index 21da42a3fd86dd7e026859297476ac68e41576bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56320 zcmeHQ3v`slz5jok&1REq$U+`0A%rC$BE=9MYQzW2Lku7gK_pThh7d?FB#{IS_#j|- zwB@w;>P6(*fY{o{>7~@$%e9`X_F=VBOMA4J-g;Z~dOftqwy|<-ZH2wR-}mioz75|( zvKth=GdaJVZ(hHd`Okl5XXcyi9Q}F!3V*Gh_<4yTL9=5OG+PPzRex8a$7 zr^Deey=wtHYV!$_z&lSoFPm;ncZ>XOz_V;b5wt7}8vb#wNIzMzX2qJfx4*sJ^o{vQ zcjwC##BTqig}Wo6BV%H9Il|%Ws3YF9ig3VuC`z~7wC&IIb#mug(aq2CDs7hKS!A=z z;B_GMd?&8YgTe7gn9>nInR^^9_<_~f-4#iwjlPZfvm(J3PDAsyv1 ze}EOz-6nq}g1Yl`cT+xgqj>CoJ$Y93iN{CYeh|b1_lTT;Tva)g-IF|=;*5@zU&*Nf z@}WKjw>>fY$GeYkU^I==yR!b4TsF3eR7ApP-3^|rVW&gyN?}v~Xnxuza%-x{Z=eS> zyO4ejY`QyOtNihplp)VZFsOVKnUYTh!pFc<$ywQ|y_8$oDt$a##p`Y>eN=Y5^veJ5 z5qTDY=y_Y~meN9z!O|ZG9CYTc}zop{3`8Uj*J3Clh+tSk1JZbFMm5tTS zC5=rr4b}B^4RzI3CDn~<$4)32H@2>!xuvSUzN)3Jv7tC<t-|Pnzc0^Zjj$Bw)y|ysI8s_U<;i8<>lZ$c?}f z@8)H& zcD)yEz;@jXuwB~$w(E9)?aH=%0APEv?K%K^`yIE7{x^2VuRkKk&+Pg9$nJP(VX`rJLn?2^rb&+_~7YR`tRH#-;mi~&!kce1WJHf zX~AEUG|MCzi@%l9DAjP4z;2QnX@IL9+lmc9wN$~s8X;>Da{`{n!Dd)9II0k@9-l4n zX@nn^q}}puInViRsN8(=sv(=o|7FaUr9awwaW%4&C%(x~ZL|cm1hfRS1hfRS1hfRS z1hfRS1hfRS1hfP$XbEg{4aFv)A$uj;JS|`q7Tb&3^tl8|vDcc6Nj7~ld7tmJAslvi zH|&y-_@I2;+2#?Xx!CAghs_{v{aB}I0y1q@K$e#q?kd=8%hTP>Knt)~jF16cUMxO; zw!ARvaimC>a%?eGVbh75NUJ4?4J96MGQ=~&$T`p{xd*P6&`2rbYm;fSf-)Oh@ z@Uq5by{vIb6}*?=ZM%U}Kuf^wkIOyY=$O)D~|6;&++pG9~nv@ILJI`EaJhGWl@T$STNZJ>=U0=~Uo( z9kAN`Y{KSUP-d8$ZQNSJnIEYOy%+v2>@F6c+=LV>z)*wOu`O081K-E%u8F_$h>?*} zZ#|^Kr;6S#$pq&pxh-@u{5))lmMqQW3Cay1Y~BlawhVf zhO)BkT~Cx(38Z73*{%j9Wa&^aMu(Qk>FoX37GDN-*IC)w)}>^>oEg|#)>!Jb@fXJM zSDK~oZ&ZRm<*fYF)6rJx?QLsgE{I_sFF7G-s4*VQI8U^320l~KGV>rAOY2?e8=2G= zrQg_)%|)8=#w5oytYL=aNOpUtECYP#dAU(Fn=Zpmowf9-pSfqAU#Umm7_VW(nAur5^U#4d&MHI_MPp?QKYxF4vAWnrd;tRKUqr zsxoFoQ}N_gZA?!ehizm_BY1kwR%`Rcr%M{4ZZpv1_RH<$!I)#|Qh!t5xzXGxcY<-H zV`+RW&D7DprrI`XlZg_99JjC*Q67)U(+J(ILEZ6^P6BvQ=M~p+|8v6(ZjhJAC8+!T zMu{y|rr85mBMp1fdW?K4BI(hIWGHgk-z^t4zNuUay5&+XkD#3n8Rce=ZCuA!pFWw2 zzGBsp8|gu`TaC0v`q^N#(6m{8w2>Rbpj(y!RdAO;jvS>*Bn$m?)2f%j)TLqUZ5dJs zZ8>f%1MtRJYEa%^8at3*k<45>4Q<;W(!5FLpkH&Wp-!xdj_`aff5@8`M!aG5F%}B^P&&ZZ8Rp|JG%pD-k!=u;kRyRFpgwB~L}kbEVAG zmp60;1PlYnm^18QAUFJQ8_v*o9)S;tJA?RiAqmS!PL3%ApD9{m zvKXE06DuUGa|CRUXWoX4r?ytUv~~BJ9a&$jJK+h-laczXv!z{e_dYyl#_+PiudVyR z6S)uHxc&=a`74Kdm^0%ZYdY}A&(~ejupo8c&dMP#z8jXhiLr4*QuMChOlvYoTU(p_ zm1AqRxH>;XX@lbJgnZ0Oc-%N@B`KYI;E%;=C&ge$dM63G8<%95>9~fa&>4RP(v6S! zlZ&Hpijmn_1b+?~ZVVTtH3kL@ezqAD+GgX?=fiTJF}dw$veQ@zpIwN(Se`Wu)!9n%f^~nNbTBl3-U5Y@yRY1N_^iB{{!)#MO%c>d;v^z46I^y^I3z7 zWa8@Y$)SaxFAisS|MSb+Lsq4ft^UI$-9y6JewpO|R?6}FA6xDewyNMB&(ULta-71R zzOg*_Xx*qePGNsqE_ojw-gt*oSo`9F!A0LM{H9abtIIAPI&%8c3!TD74rva~zop#c z6!xa~s$m)L&%ebfY*Wowi?97w{}v*_9{bo3Y`BpwvQ~zGk4;{nCKH60N%b!*{h5halZ|lapSDbbVo3pW^ z_3|gSOmPbP&*tN;t*_*N-YKlUb>W7IYhOrr3LBpHrHz&UQ|xmJE8MX3u4k6Mv(G7v zWB5RaZ|tG~#`E^0uKw-2Pv^amD#lTlXBphL!aa2~7GVaKa0Zv@T=YwLJ3nPdIlqdY z>@-<9jpjGeKnKD+lkix2l<-(O2#=*( zglQl=gY0W@OJ|Wi>5Gy*=>yr5K8q|`VSCB`EiRc=)z<7NS!*`PTC~UI?KTVok z%i$Ep8k5W1(QZ-ZMz<()vs?6jOjfLYHYO{=J{gl^$&wtC6r2EQ=rN1DZS8Shmqc@^D|wui)T2ycqZA|#mU9$LkgeX>z=7k+3Gm>lz7FHD0$!sH*Y0MZ#5$*EP;oRR^8x15I`q z^(;-+E55`Rw@J<}tf?bjvYRXABxe_jtj}f_its$lF7)1o-n&pcQs>&H>4SN))?~d4 zht0+WHXQYstoM_9I#B8T>Q`Im!Lx*iNg*)+;`};_K-|>QlVpa~SFME}TAhfiErVc+R;_)AZ>)S&zwj zOje5bN!x`hb6XR=zI`*ISgkSHxqtNP9iJk!rnd2xkY`&P*j9Y8Wbu}dJzViAGOMcb zmXE!7@udi@s>WMFCREjU%g2PO8gKcSa8=_iATdhxZCjR0}pXxm8;`aQk`1CwE z8~=eCJv*TPBej?RXRP0h=>M%&6M}R78@WE!sZVt(T{+h>NRP>hPo(sitjA>4&-9p# z-4MN>tlx~p{(R24zJBysxSsz8k;B3?@we4+$r3rA>_BF{1WI&v;Xr6rHIcoGxMYdU zlO4#cswS$*4un=!FPzzhLlN~mKK+jG<9Ww-e)f~&{X9j&Z-e6fM8(-oP3=-Il)7wd zD2VqH6+Jv4rs%9r8}H{S60T~zpQuQvs_}lJBB83r`+16lt9s%5a*Knm=rLK3$sf;{ ztlw7ax7BJR(RDtj}E}{<L?&j@R zb~kScv%7hllikgmwCrx)uw-}hrY5_aH&fZ&yh+XO=3R{!o}s4qoe77@H$bL7zW*C3 zlI~6ga9yO^=~>58QqhvolIY%3E>xY+y}N5P`{>)qCEJP~!zHv4gFEb9^4sP=)+rA$ zeNy4%&l-7w|BVFEz1TBEezIto)V2Dbv`@ z9Avr(^=pvTvNB>fBSkS(c${}fKst}Q-f~+vRQ>*elOvzV{Kt&v_q_DgRA>YTBatP=@h2nl0gw_&#S{J;l&fa6X zZV}m*+xQ{A@%P=%cJj)Hr{cF%c_rhfcZRdk@>mAF#qkXW6YNb+cwrPqAH+FiMYDZ| z!_*dx5O|yN7 z=Y!t*a9O+$#qr^aY#+jX7zur-u}{*03?LKWUl!00$OimCe_#NR1LOjEKt3=K2mphC z0$?yu2n+#=fT2JT7zPvr!+{ZiHWz>dPUDLW-#cfNgzA5M>sS8r!Ms}kH}Ch#XD>aRK4t7LdIbR6OY-nz&s;{qWSRI_# zRMRjGPj%H*L9^d54$DcSo`be$yT5v7dFD2*TU%9Mva+$oIUSemZ;c@HaD(n z3C>%!s;;^wxTta6O8AEW*}3g{S|NTs_Wriof|m^Qd2Xrucc)&qo=bjl&5w5K$O!MCTwFSVOr1s1110%2UI)&g9kHv!xO*a2`4U>DFI;GV%ipabAq|4D#r z`GWx0@`r(Z;5mS6{}%yr{}HgS@tJ03bK@N~>#D{CXEs!qz-?bEt2Hw>2kCz-kZI;_X0C zfNS2dKq)W|;7k1pz(j!W;4cSw+@9<1D}hPCRlwB%{|(?;0Oxkh_4pLnQ-Ns!_cyKs zW&nIaUk=O!W&yK-8-O{$Twoqh0o(}82NnP~0X&9(Gq4DtY;J+gLzABcmH_-Wi)Fxa zfZV{ zU1svcRq`wX=KOJ^84nXplDBGc@rU3a<;;BGS^C$Ndc3zlN zXfAW*QB<})kD;wH%S0a@{`o^t!Zd6kL}G_z_V@eGW!&tOH_DCnVh`xP+#i0(pzo!jRgJ= D0eIzu diff --git a/web/src/main/config/install-docs/windows/upgrade.doc b/web/src/main/config/install-docs/windows/upgrade.doc deleted file mode 100644 index 234c4d39539f11a91ff0b05cb691dbcd998dbfe3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31744 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 diff --git a/web/src/main/java/org/akaza/openclinica/control/admin/UpdateCRFServlet.java b/web/src/main/java/org/akaza/openclinica/control/admin/UpdateCRFServlet.java index 75f031e0cab..0095e7b6456 100755 --- a/web/src/main/java/org/akaza/openclinica/control/admin/UpdateCRFServlet.java +++ b/web/src/main/java/org/akaza/openclinica/control/admin/UpdateCRFServlet.java @@ -86,10 +86,9 @@ public void processRequest() throws Exception { * contents and upload a new version."); setToPanel("CRF Spreadsheet *
Template", "
Download a blank CRF Excel spreadsheet " + * "template here."); - * setToPanel( "Example CRF
Spreadsheets", "
Download example - * CRFs and instructions from the" + " OpenClinica.org - * portal " + "(OpenClinica.org user account required)."); + * setToPanel( "Example CRF
Spreadsheets", "
Download example CRFs from the + * Medical Data Models (MDM) Portal + * (MDM-Portal user account required)."); */ FormProcessor fp = new FormProcessor(request); diff --git a/web/src/main/resources/org/akaza/openclinica/i18n/notes.properties b/web/src/main/resources/org/akaza/openclinica/i18n/notes.properties index a84a8cf0e82..8b924ecabac 100644 --- a/web/src/main/resources/org/akaza/openclinica/i18n/notes.properties +++ b/web/src/main/resources/org/akaza/openclinica/i18n/notes.properties @@ -249,7 +249,7 @@ fill_out_form_to_contact = Please fill out the following form to contact your Ad fill_out_form_to_request_study = The information in the form below will be sent to your LibreClinica Administrator. The Administrator will be the decision maker on whether or not you are allowed access to a particular study or site. Please contact your LibreClinica Administrator with any questions. -fill_to_add_click_help = Fill out the form to add a subject to the study. Click on the help icon for assistance. +fill_to_add_click_help = Fill out the form to add a subject to the study. Click on the Documentation link for assistance. filter_data_selecting_range = Filter your data by subject enrollment date by selecting a date range below. diff --git a/web/src/main/resources/org/akaza/openclinica/i18n/page_messages.properties b/web/src/main/resources/org/akaza/openclinica/i18n/page_messages.properties index 49bfb0ced05..24cb070370a 100644 --- a/web/src/main/resources/org/akaza/openclinica/i18n/page_messages.properties +++ b/web/src/main/resources/org/akaza/openclinica/i18n/page_messages.properties @@ -99,7 +99,7 @@ br_create_new_CRF_uploading =
Create a new CRF version by uploading an Excel br_download_blank_CRF_spreadsheet_from =
Download a blank CRF Excel spreadsheet template here. -br_download_example_CRF_instructions_from =
Download example CRFs and instructions from the OpenClinica.org portal (OpenClinica.org user account required). +br_download_example_CRF_instructions_from =
Download example CRFs from the Medical Data Models (MDM) Portal (MDM-Portal user account required). br_if_you_owner_CRF_version =
If you are the owner of a CRF version, and the CRF version has not been used in a Study, you can overwrite the CRF version by uploading a new Excel spreadsheet with same version name. In this case, the system will ask you if you want to delete the previous contents and upload a new version. diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/createCRF.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/createCRF.jsp index 52b9594a193..f54ef4d761a 100755 --- a/web/src/main/webapp/WEB-INF/jsp/admin/createCRF.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/admin/createCRF.jsp @@ -53,8 +53,7 @@

.

-

. -

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/index.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/index.jsp index c3a89183667..027833cab74 100755 --- a/web/src/main/webapp/WEB-INF/jsp/admin/index.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/admin/index.jsp @@ -40,9 +40,7 @@ -

- <fmt:message key=" title=""> -

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/listCRF.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/listCRF.jsp index 37d4f7b7af9..bb89327f31e 100755 --- a/web/src/main/webapp/WEB-INF/jsp/admin/listCRF.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/admin/listCRF.jsp @@ -51,23 +51,14 @@ -

- - <fmt:message key=" title=""> -

+

-

- - <fmt:message key=" title=""> -

+

-<%-- -

.

---%> diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/listSubject.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/listSubject.jsp index a4641699dc8..b73ca3b1b18 100755 --- a/web/src/main/webapp/WEB-INF/jsp/admin/listSubject.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/admin/listSubject.jsp @@ -60,7 +60,7 @@ -

<fmt:message key=" title="">

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/listuseraccounts.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/listuseraccounts.jsp index 7ca0bc24571..be503a13fca 100755 --- a/web/src/main/webapp/WEB-INF/jsp/admin/listuseraccounts.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/admin/listuseraccounts.jsp @@ -38,7 +38,7 @@ -

<fmt:message key=" title="">

+



diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/studyAuditLog.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/studyAuditLog.jsp index b9e383ec083..735768212b2 100644 --- a/web/src/main/webapp/WEB-INF/jsp/admin/studyAuditLog.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/admin/studyAuditLog.jsp @@ -61,11 +61,6 @@

- - - <fmt:message key=" title=""> - <fmt:message key=" title=""> -

diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/viewAllJobs.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/viewAllJobs.jsp index cc47b2dd841..be251c6ff36 100644 --- a/web/src/main/webapp/WEB-INF/jsp/admin/viewAllJobs.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/admin/viewAllJobs.jsp @@ -41,7 +41,7 @@ -

<fmt:message key=" title="">

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/viewCRF.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/viewCRF.jsp index 87476f7453d..1bf79e336bc 100755 --- a/web/src/main/webapp/WEB-INF/jsp/admin/viewCRF.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/admin/viewCRF.jsp @@ -69,10 +69,7 @@ -

- - <fmt:message key=" title=""> -

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/viewFullStudy.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/viewFullStudy.jsp index 1d6cf2a78db..ae71f9d5c17 100755 --- a/web/src/main/webapp/WEB-INF/jsp/admin/viewFullStudy.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/admin/viewFullStudy.jsp @@ -74,7 +74,7 @@ -

<fmt:message key=" title="">

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/viewImportJobs.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/viewImportJobs.jsp index ce9dcc3ae60..66e60c5f520 100644 --- a/web/src/main/webapp/WEB-INF/jsp/admin/viewImportJobs.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/admin/viewImportJobs.jsp @@ -41,7 +41,7 @@ -

<fmt:message key=" title="">

+

<%--
Create a new Export Data Job
--%>
diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/viewJobs.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/viewJobs.jsp index c06e8e46058..f81d24bd5ec 100644 --- a/web/src/main/webapp/WEB-INF/jsp/admin/viewJobs.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/admin/viewJobs.jsp @@ -41,7 +41,7 @@ -

<fmt:message key=" title="">

+

Create a new Export Data Job
<%--
Create a new Import Data Job
--%> diff --git a/web/src/main/webapp/WEB-INF/jsp/admin/viewSingleJob.jsp b/web/src/main/webapp/WEB-INF/jsp/admin/viewSingleJob.jsp index 35b579d8bb2..e324f3ba17e 100644 --- a/web/src/main/webapp/WEB-INF/jsp/admin/viewSingleJob.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/admin/viewSingleJob.jsp @@ -45,7 +45,7 @@ -

View Job:   <fmt:message key=" title="">

+

View Job:

.

<%-- set up table here --%> diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/applyFilter.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/applyFilter.jsp index d76f7ddc1e5..6b8cc690da1 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/applyFilter.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/applyFilter.jsp @@ -14,7 +14,7 @@ -

: <fmt:message key=" title="">

+

:

diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetBegin.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetBegin.jsp index d6f818166e0..87194cb8eb8 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetBegin.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetBegin.jsp @@ -43,7 +43,7 @@ -

: <fmt:message key=" title="">

+

:

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep2.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep2.jsp index 4fbfe298b6d..81b0905b410 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep2.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep2.jsp @@ -71,18 +71,7 @@ function notSelectAll() {

    - - - - - - <fmt:message key=" title=""> - - - - <fmt:message key=" title=""> - - - : + - :

    @@ -90,8 +79,6 @@ function notSelectAll() {

    : - - <fmt:message key=" title="">

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep3.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep3.jsp index a4a3e397fdc..e8f5b22144c 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep3.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep3.jsp @@ -68,11 +68,10 @@ -

    - <fmt:message key=" title=""> -:

    +

    - :

    -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep4.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep4.jsp index c2431176442..cae604b4bef 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep4.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep4.jsp @@ -90,10 +90,10 @@ -

    - <fmt:message key=" title=""> -:

    +

    - :

    -

    : <fmt:message key=" title="">

    + +

    :

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen1.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen1.jsp index d8611f14a1a..4902947d504 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen1.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen1.jsp @@ -11,7 +11,7 @@ -

    <fmt:message key=" title="">

    +

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen2.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen2.jsp index 05f26401779..16e89f6f626 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen2.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen2.jsp @@ -13,7 +13,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3.jsp index 4626c2d6bca..f34d0615c7e 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3.jsp @@ -13,7 +13,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_1.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_1.jsp index 8dc0d23717f..5b17f7af546 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_1.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_1.jsp @@ -16,7 +16,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_2.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_2.jsp index 6d69d58b545..5d7af37f7bd 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_2.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_2.jsp @@ -13,7 +13,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen4.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen4.jsp index e718c4b5e58..68adaec175e 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen4.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen4.jsp @@ -13,7 +13,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen5.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen5.jsp index 61e24ecb5b9..e9cc84f2563 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen5.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen5.jsp @@ -35,7 +35,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/editDataset.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/editDataset.jsp index 4ea9c9fc999..b275ed0612a 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/editDataset.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/editDataset.jsp @@ -38,7 +38,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/exportDatasets.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/exportDatasets.jsp index 4102a1e76d4..bed00b40d13 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/exportDatasets.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/exportDatasets.jsp @@ -41,7 +41,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/extractDatasetsMain.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/extractDatasetsMain.jsp index ea5212258e6..18cb6e558e9 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/extractDatasetsMain.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/extractDatasetsMain.jsp @@ -50,7 +50,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    1. diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/generateMetadataFile.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/generateMetadataFile.jsp index 0f4196dbc8d..5057f654960 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/generateMetadataFile.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/generateMetadataFile.jsp @@ -56,7 +56,7 @@ function refreshMe() { -

      : <fmt:message key=" title="">

      +

      :

      @@ -121,7 +121,7 @@ function refreshMe() {
-

: <fmt:message key=" title=""> +

: diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/generatedDatasetHtml.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/generatedDatasetHtml.jsp index 83ef464ea19..6f703cf67ca 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/generatedDatasetHtml.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/generatedDatasetHtml.jsp @@ -51,7 +51,7 @@ --%> -

: <fmt:message key=" title="">

+

:

diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/itemDetail.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/itemDetail.jsp index dcf734dfc25..2316c65a7fe 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/itemDetail.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/itemDetail.jsp @@ -40,7 +40,7 @@
- + diff --git a/web/src/main/webapp/WEB-INF/jsp/include/footer-inactive.jsp b/web/src/main/webapp/WEB-INF/jsp/include/footer-inactive.jsp index 30587d95cf3..b02b4e42173 100644 --- a/web/src/main/webapp/WEB-INF/jsp/include/footer-inactive.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/include/footer-inactive.jsp @@ -27,9 +27,7 @@ document.write('
diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/viewDatasets.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/viewDatasets.jsp index 27c86e65cb2..f402e759e1d 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/viewDatasets.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/viewDatasets.jsp @@ -45,7 +45,7 @@ -

: <fmt:message key=" title="">

+

:

<%--

">Show Only My Datasets | diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/viewSelected.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/viewSelected.jsp index 2fd8b87a9c0..abd490b2681 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/viewSelected.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/viewSelected.jsp @@ -43,11 +43,10 @@ function notSelectAll() { -

- <fmt:message key=" title=""> -:

+

- :

-

: <fmt:message key=" title="">

+

:

diff --git a/web/src/main/webapp/WEB-INF/jsp/extract/viewSelectedHtml.jsp b/web/src/main/webapp/WEB-INF/jsp/extract/viewSelectedHtml.jsp index f3aa058020a..82d461e73db 100755 --- a/web/src/main/webapp/WEB-INF/jsp/extract/viewSelectedHtml.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/extract/viewSelectedHtml.jsp @@ -29,10 +29,10 @@

-: <fmt:message key=" title=""> +: -: <fmt:message key=" title=""> +:

diff --git a/web/src/main/webapp/WEB-INF/jsp/include/breadcrumb.jsp b/web/src/main/webapp/WEB-INF/jsp/include/breadcrumb.jsp index e663b0c0ebb..147b1cb66b8 100755 --- a/web/src/main/webapp/WEB-INF/jsp/include/breadcrumb.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/include/breadcrumb.jsp @@ -27,7 +27,6 @@ <fmt:message key=" title="" style="margin-top: 2px; margin-left: 2px; margin-right: 2px; margin-bottom: 2px">--%>
- ')">
      - -       - +                   diff --git a/web/src/main/webapp/WEB-INF/jsp/include/footer.jsp b/web/src/main/webapp/WEB-INF/jsp/include/footer.jsp index cb7e2e457a2..60b9119e61b 100755 --- a/web/src/main/webapp/WEB-INF/jsp/include/footer.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/include/footer.jsp @@ -17,7 +17,7 @@ -

- H<fmt:message key=" title="">

+

-

diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/listDNotesForCRF.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/listDNotesForCRF.jsp index 53488456f57..6802a24aeb1 100644 --- a/web/src/main/webapp/WEB-INF/jsp/submit/listDNotesForCRF.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/listDNotesForCRF.jsp @@ -84,15 +84,14 @@ - <fmt:message key=" title=""> + - -<fmt:message key=" title=""> + - +
: diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/listEventsForSubject.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/listEventsForSubject.jsp index 109bd53bc4d..64c34010a1d 100755 --- a/web/src/main/webapp/WEB-INF/jsp/submit/listEventsForSubject.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/listEventsForSubject.jsp @@ -60,13 +60,12 @@ - <fmt:message key=" title=""> + - -<fmt:message key=" title=""> + diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/listRuleSets.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/listRuleSets.jsp index 34d564f6068..8ad1a3acde6 100755 --- a/web/src/main/webapp/WEB-INF/jsp/submit/listRuleSets.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/listRuleSets.jsp @@ -41,15 +41,8 @@ - - -

<fmt:message key=" title=""> - - -

<fmt:message key=" title=""> - - -

+ +

diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/listRuleSets2.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/listRuleSets2.jsp index 5e01c15b262..51d4496e267 100755 --- a/web/src/main/webapp/WEB-INF/jsp/submit/listRuleSets2.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/listRuleSets2.jsp @@ -68,15 +68,8 @@ - - -

<fmt:message key=" title=""> - - -

<fmt:message key=" title=""> - - -

+ +

diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/listRuleSetsDesigner.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/listRuleSetsDesigner.jsp index 5da983d2a73..b6e92bce2c9 100755 --- a/web/src/main/webapp/WEB-INF/jsp/submit/listRuleSetsDesigner.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/listRuleSetsDesigner.jsp @@ -50,15 +50,8 @@ - - -

<fmt:message key=" title=""> - - -

<fmt:message key=" title=""> - - -

+ +

diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/tableOfContents.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/tableOfContents.jsp index 16a9e882c50..6301f8e6f5c 100755 --- a/web/src/main/webapp/WEB-INF/jsp/submit/tableOfContents.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/tableOfContents.jsp @@ -61,7 +61,7 @@ -

<fmt:message key=" title="">

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/verifyImportRule.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/verifyImportRule.jsp index 165ba5f2a5e..e2e86c64ab3 100644 --- a/web/src/main/webapp/WEB-INF/jsp/submit/verifyImportRule.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/verifyImportRule.jsp @@ -63,19 +63,7 @@ - - -

- - -

- - - - - ${study.name} -<fmt:message key=" title=""> -

+

${study.name}

"> diff --git a/web/src/main/webapp/WEB-INF/jsp/techadmin/index.jsp b/web/src/main/webapp/WEB-INF/jsp/techadmin/index.jsp index fc8282982a7..889c2def7ed 100755 --- a/web/src/main/webapp/WEB-INF/jsp/techadmin/index.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/techadmin/index.jsp @@ -35,9 +35,7 @@ -

- <fmt:message key=" title=""> -

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/viewAllSubjectSDVtmp.jsp b/web/src/main/webapp/WEB-INF/jsp/viewAllSubjectSDVtmp.jsp index 821d59b58ad..410c6afc8d7 100644 --- a/web/src/main/webapp/WEB-INF/jsp/viewAllSubjectSDVtmp.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/viewAllSubjectSDVtmp.jsp @@ -58,11 +58,7 @@ }

-

- - - <fmt:message key=" title=""> -

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/viewSubjectAggregate.jsp b/web/src/main/webapp/WEB-INF/jsp/viewSubjectAggregate.jsp index 808179e10db..2140c4ee3cb 100644 --- a/web/src/main/webapp/WEB-INF/jsp/viewSubjectAggregate.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/viewSubjectAggregate.jsp @@ -55,11 +55,7 @@ } -

- - - <fmt:message key=" title=""> -

+

| - + | <%--> --%> diff --git a/web/src/main/webapp/WEB-INF/jsp/include/home-header.jsp b/web/src/main/webapp/WEB-INF/jsp/include/home-header.jsp index f6cbc34bb6f..d0d5ecd923b 100755 --- a/web/src/main/webapp/WEB-INF/jsp/include/home-header.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/include/home-header.jsp @@ -44,12 +44,6 @@ + diff --git a/web/src/main/webapp/WEB-INF/jsp/login/changeStudy.jsp b/web/src/main/webapp/WEB-INF/jsp/login/changeStudy.jsp index 5d8b5d9cfeb..34af692ab5d 100755 --- a/web/src/main/webapp/WEB-INF/jsp/login/changeStudy.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/login/changeStudy.jsp @@ -40,7 +40,7 @@ -

<fmt:message key=" title="">

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/login/requestStudy.jsp b/web/src/main/webapp/WEB-INF/jsp/login/requestStudy.jsp index 2d4e0435072..b3ea8e420ca 100755 --- a/web/src/main/webapp/WEB-INF/jsp/login/requestStudy.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/login/requestStudy.jsp @@ -40,7 +40,7 @@ -

<fmt:message key=" title="" >

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/login/updateProfile.jsp b/web/src/main/webapp/WEB-INF/jsp/login/updateProfile.jsp index fb558843ca0..6d2e860f9ac 100755 --- a/web/src/main/webapp/WEB-INF/jsp/login/updateProfile.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/login/updateProfile.jsp @@ -44,9 +44,7 @@ -

- - <fmt:message key=" title="">

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/managestudy/chooseCRFVersion.jsp b/web/src/main/webapp/WEB-INF/jsp/managestudy/chooseCRFVersion.jsp index 6ac7112764f..ee3094f4772 100644 --- a/web/src/main/webapp/WEB-INF/jsp/managestudy/chooseCRFVersion.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/managestudy/chooseCRFVersion.jsp @@ -42,11 +42,7 @@ -

- -<fmt:message key=" title=""> - -

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/managestudy/confirmCRFVersionChange.jsp b/web/src/main/webapp/WEB-INF/jsp/managestudy/confirmCRFVersionChange.jsp index fb90c3a058f..59e16fb21f7 100644 --- a/web/src/main/webapp/WEB-INF/jsp/managestudy/confirmCRFVersionChange.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/managestudy/confirmCRFVersionChange.jsp @@ -42,12 +42,7 @@ -

- - - <fmt:message key=" title=""> - -

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/managestudy/createSubStudy.jsp b/web/src/main/webapp/WEB-INF/jsp/managestudy/createSubStudy.jsp index fe3feb979e9..60d3293f441 100755 --- a/web/src/main/webapp/WEB-INF/jsp/managestudy/createSubStudy.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/managestudy/createSubStudy.jsp @@ -125,7 +125,7 @@ function updateThis(multiSelEle, count) { } -

<fmt:message key=" title="">

+

*
diff --git a/web/src/main/webapp/WEB-INF/jsp/managestudy/createSubjectGroupClass.jsp b/web/src/main/webapp/WEB-INF/jsp/managestudy/createSubjectGroupClass.jsp index 4b8460cce82..0baee775082 100755 --- a/web/src/main/webapp/WEB-INF/jsp/managestudy/createSubjectGroupClass.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/managestudy/createSubjectGroupClass.jsp @@ -53,7 +53,7 @@ } //--> -

<fmt:message key=" title="">

+

*
diff --git a/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp b/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp index a7bac65ad06..764d134f4c9 100755 --- a/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp @@ -74,11 +74,7 @@ -

- - - <fmt:message key=" title=""> -

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/managestudy/index.jsp b/web/src/main/webapp/WEB-INF/jsp/managestudy/index.jsp index fb07059d54a..28bc81b807e 100755 --- a/web/src/main/webapp/WEB-INF/jsp/managestudy/index.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/managestudy/index.jsp @@ -52,7 +52,7 @@ -

<fmt:message key=" title="">

+

<%-- 3057 removed this: --%>

${studyIdentifier}

diff --git a/web/src/main/webapp/WEB-INF/jsp/managestudy/listStudySubject.jsp b/web/src/main/webapp/WEB-INF/jsp/managestudy/listStudySubject.jsp index 0cebfcd7c78..4aedce31ec9 100755 --- a/web/src/main/webapp/WEB-INF/jsp/managestudy/listStudySubject.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/managestudy/listStudySubject.jsp @@ -50,9 +50,7 @@ -

- <fmt:message key=" title=""> -

+

: diff --git a/web/src/main/webapp/WEB-INF/jsp/managestudy/listUserInStudy.jsp b/web/src/main/webapp/WEB-INF/jsp/managestudy/listUserInStudy.jsp index 00e453cfb35..58478fa82d9 100755 --- a/web/src/main/webapp/WEB-INF/jsp/managestudy/listUserInStudy.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/managestudy/listUserInStudy.jsp @@ -41,7 +41,7 @@ -

<fmt:message key=" title="">

+

<%--
diff --git a/web/src/main/webapp/WEB-INF/jsp/managestudy/managestudy_body.jsp b/web/src/main/webapp/WEB-INF/jsp/managestudy/managestudy_body.jsp index c1fa1b03223..c4ce12c05e1 100644 --- a/web/src/main/webapp/WEB-INF/jsp/managestudy/managestudy_body.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/managestudy/managestudy_body.jsp @@ -41,7 +41,7 @@ -

<fmt:message key=" title="">

+

- - +
-

-
- - - <fmt:message key=" title=""> - -
-

-

<%--

diff --git a/web/src/main/webapp/WEB-INF/jsp/menu.jsp b/web/src/main/webapp/WEB-INF/jsp/menu.jsp index ddb57473d40..bc3ba5f1b88 100755 --- a/web/src/main/webapp/WEB-INF/jsp/menu.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/menu.jsp @@ -82,16 +82,14 @@

- - - - - - - + + + + + + + - - <fmt:message key=" title="">

diff --git a/web/src/main/webapp/WEB-INF/jsp/studymodule.jsp b/web/src/main/webapp/WEB-INF/jsp/studymodule.jsp index 8f1faebd1f6..63bc1c5c081 100644 --- a/web/src/main/webapp/WEB-INF/jsp/studymodule.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/studymodule.jsp @@ -140,9 +140,7 @@
-

  - Help -

+

@@ -721,9 +719,6 @@

- - Help -

@@ -750,9 +745,6 @@

- - Help -


diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/addExistingSubject.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/addExistingSubject.jsp index b024f35a0b4..dc8e19eab1e 100755 --- a/web/src/main/webapp/WEB-INF/jsp/submit/addExistingSubject.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/addExistingSubject.jsp @@ -97,9 +97,7 @@ -

-: <fmt:message key=" title=""> -

+

:


diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/addNewSubject.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/addNewSubject.jsp index 5a0f4e1143e..527e7a7c660 100755 --- a/web/src/main/webapp/WEB-INF/jsp/submit/addNewSubject.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/addNewSubject.jsp @@ -83,12 +83,7 @@ -

-: - - - <fmt:message key=" title=""> -

+

:


diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/createNewStudyEvent.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/createNewStudyEvent.jsp index 6b783a67c91..e9edce2fd66 100755 --- a/web/src/main/webapp/WEB-INF/jsp/submit/createNewStudyEvent.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/createNewStudyEvent.jsp @@ -107,16 +107,10 @@

- - - - <fmt:message key=" title=""> + - - - -<fmt:message key=" title=""> +

diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/discrepancyNote.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/discrepancyNote.jsp index ac59a8b4005..f2904b7110b 100644 --- a/web/src/main/webapp/WEB-INF/jsp/submit/discrepancyNote.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/discrepancyNote.jsp @@ -192,7 +192,6 @@ function setYPos(id) {
- <fmt:message key=" title=""> ');javascript:addText('a0','');"><fmt:message key=" src="images/bt_Remove.gif" class="icon_dnBox"> diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/enterDataForStudyEvent.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/enterDataForStudyEvent.jsp index ef94773f0a2..60700fb3bbc 100755 --- a/web/src/main/webapp/WEB-INF/jsp/submit/enterDataForStudyEvent.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/enterDataForStudyEvent.jsp @@ -69,9 +69,7 @@ -

- - <fmt:message key=" title="">

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/import.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/import.jsp index 25df18f5e89..256308675e7 100644 --- a/web/src/main/webapp/WEB-INF/jsp/submit/import.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/import.jsp @@ -63,9 +63,7 @@ - - <fmt:message key=" title=""> - +

diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/importRules.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/importRules.jsp index a7685575568..b6faff969a8 100644 --- a/web/src/main/webapp/WEB-INF/jsp/submit/importRules.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/importRules.jsp @@ -55,19 +55,7 @@ - - -

- - -

- - - - - ${study.name} -<fmt:message key=" title=""> -

+

${study.name}

@@ -96,14 +84,7 @@
" class="button_long">

- - - - - -
 
-

- +
 
diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/index.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/index.jsp index c9ae1d7119d..7236730bb5e 100755 --- a/web/src/main/webapp/WEB-INF/jsp/submit/index.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/index.jsp @@ -46,9 +46,7 @@ -

- -<fmt:message key=" title="">

+

diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/instructionsEnrollSubject.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/instructionsEnrollSubject.jsp index 7994bfd98a8..3eff9ab9ff5 100755 --- a/web/src/main/webapp/WEB-INF/jsp/submit/instructionsEnrollSubject.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/instructionsEnrollSubject.jsp @@ -38,7 +38,7 @@

diff --git a/web/src/main/webapp/WEB-INF/tags/footer.tag b/web/src/main/webapp/WEB-INF/tags/footer.tag index 70d06e6f16a..23b395565b5 100644 --- a/web/src/main/webapp/WEB-INF/tags/footer.tag +++ b/web/src/main/webapp/WEB-INF/tags/footer.tag @@ -4,12 +4,9 @@
- +       - - -       - +             diff --git a/web/src/main/webapp/css/app.css b/web/src/main/webapp/css/app.css index 9c1137286d8..891c044d7d2 100644 --- a/web/src/main/webapp/css/app.css +++ b/web/src/main/webapp/css/app.css @@ -9,19 +9,19 @@ table.item-row { } h1 { - font-weight:normal + font-weight:normal; font-size: 12px; } h2 { - font-weight:normal + font-weight:normal; font-size: 11px; } h3 { - font-weight:normal + font-weight:normal; font-size: 10px; } h4 { - font-weight:normal + font-weight:normal; font-size: 9px; } @@ -151,7 +151,7 @@ a:active { display:inline-block; margin-top:0px; margin-bottom:0px; - margin-left:5x; + margin-left:5px; } diff --git a/web/src/main/webapp/decorator.jsp b/web/src/main/webapp/decorator.jsp index d14bf0db036..41ecc73469b 100644 --- a/web/src/main/webapp/decorator.jsp +++ b/web/src/main/webapp/decorator.jsp @@ -42,7 +42,7 @@
- | +
diff --git a/web/src/main/webapp/images/popup_OC.gif b/web/src/main/webapp/images/popup_OC.gif deleted file mode 100755 index 143473b65c626e08ae699d1fb1e4b13c8b634637..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1035 zcmbu)i&N4E0KoCzPtYG)T#OkyJrq4LT3)xSlcjCv4%D~1nzBEwYhc@iMtgNe5-cKr?e{sEu6@5Rf}=R%UQ0Y6|K z05szKbb8D|>S0^-^^IHAlnjx3_rl3VpDi|*nj8(NOt6wPVyQaClDsInQ>wvm# zP~HA&;l-#=j1bvV`JOM5aS#9Q}Ag^i#pFWx%`fOT| zLu#jXXrA90-)0Q0h;y%=Zk$S}Whig=>8w5ZUw158?EODYS^jnuGFe5%4@&6X7&hAz zEX@GD%Gq9NZ12E_n4Blo=`L;%uZ7phMf3T{K>yZ26y%m8MsR8Vh!!_wa|;(EI>LX< z!4>jOjlEB#=M2`Cej8v zG=U(yN`A4TNg z&ah(0eiiQns4SKM?H7H4^BFsGp^Mykp$Uf;5nOx`6!-BzO&}PtPE;^(!`FuJrxR@< z`?At*$j4q`B*w=KW`Pa2aItlZXn52&gjJPz4F=@S69Uj~n;Z zH;Z&}`_16eA$=uj(vf;(dpKgBkPLvzpSjtogd2ZFry+NShlsMMpHUu=o4zoisR z+G!BEhI#YHX>fWB_`G)7u>wqdU;u_)HJum8QPONn@Q*OO8iQC5G+ zuMUHa+YD%M_!9B`C$vRjUy2`<0ovpwCgv;aaJer+e>_9pyy@}X_s6$xl!nbDQ*OB; zfR@6a6YvW^2oFbIW#qLM ztUe%+@&evoB(Vff;Kv+`>crl zc*#&^9IH7y&?_=i1NU%u<=4|hLT5e|fZFIdl5+rm%pepoG7argMiULhtr(0QQZ?gK zNa&RIyz`T?7+L28(P-+L_9-9fR>fVRIrB8sZOPId
@@ -111,17 +111,13 @@
- OpenClinica Website + LibreClinica Website       - Help - -       - - Support + Help       Contact       - OpenClinica Enterprise + LibreClinica                                                                                                              diff --git a/ws/src/main/config/install-docs/linux/linux-install.rtf b/ws/src/main/config/install-docs/linux/linux-install.rtf deleted file mode 100644 index 64acc567129..00000000000 --- a/ws/src/main/config/install-docs/linux/linux-install.rtf +++ /dev/null @@ -1,20 +0,0 @@ -{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\f4\fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Helvetica;}{\f232\froman\fcharset238\fprq2 Times New Roman CE;}{\f233\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f235\froman\fcharset161\fprq2 Times New Roman Greek;} -{\f236\froman\fcharset162\fprq2 Times New Roman Tur;}{\f237\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f238\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f239\froman\fcharset186\fprq2 Times New Roman Baltic;} -{\f240\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f272\fswiss\fcharset238\fprq2 Helvetica CE;}{\f273\fswiss\fcharset204\fprq2 Helvetica Cyr;}{\f275\fswiss\fcharset161\fprq2 Helvetica Greek;}{\f276\fswiss\fcharset162\fprq2 Helvetica Tur;} -{\f277\fswiss\fcharset177\fprq2 Helvetica (Hebrew);}{\f278\fswiss\fcharset178\fprq2 Helvetica (Arabic);}{\f279\fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f280\fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}}{\colortbl;\red0\green0\blue0; -\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128; -\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;} -{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv -\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\*\cs15 \additive \ul\cf2 \sbasedon10 \styrsid14758892 Hyperlink;}} -{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid3355758\rsid14758892}{\*\generator Microsoft Word 11.0.6359;}{\info{\author }{\operator }{\creatim\yr2011\mo11\dy1\hr14\min36}{\revtim\yr2011\mo11\dy1\hr14\min36}{\version2}{\edmins0} -{\nofpages1}{\nofwords18}{\nofchars105}{\*\company MS User}{\nofcharsws122}{\vern24703}}\margl1440\margr1440 \widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701 -\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\nolnhtadjtbl\rsidroot14758892 \fet0\sectd \linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang -{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang -{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain -\ql \li0\ri0\nowidctlpar\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\faauto\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f4\insrsid14758892 Please see }{\field{\*\fldinst { -\b\f4\insrsid14758892 HYPERLINK "}{\b\f4\insrsid14758892\charrsid14758892 https://docs.openclinica.com/3.1/installation}{\b\f4\insrsid14758892 " }{\b\f4\insrsid14758892\charrsid10697289 {\*\datafield -00d0c9ea79f9bace118c8200aa004ba90b02000000170000002e000000680074007400700073003a002f002f0064006f00630073002e006f00700065006e0063006c0069006e006900630061002e0063006f006d002f0033002e0031002f0069006e007300740061006c006c006100740069006f006e000000e0c9ea79f9ba -ce118c8200aa004ba90b74000000680074007400700073003a002f002f0064006f00630073002e006f00700065006e0063006c0069006e006900630061002e0063006f006d002f0033002e0031002f0069006e007300740061006c006c006100740069006f006e000000795881f43b1d7f48af2c825dc485276300000000a5 -ab0000}}}{\fldrslt {\cs15\b\f4\ul\cf2\insrsid14758892\charrsid10697289 https://docs.openclinica.com/3.1/installation}}}{\b\f4\insrsid14758892 . }{\b\f4\insrsid14758892\charrsid14758892 -\par }} \ No newline at end of file diff --git a/ws/src/main/config/install-docs/linux/linux-upgrade.rtf b/ws/src/main/config/install-docs/linux/linux-upgrade.rtf deleted file mode 100644 index 2e8e97dee4a..00000000000 --- a/ws/src/main/config/install-docs/linux/linux-upgrade.rtf +++ /dev/null @@ -1,22 +0,0 @@ -{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\f4\fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Helvetica;}{\f232\froman\fcharset238\fprq2 Times New Roman CE;}{\f233\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f235\froman\fcharset161\fprq2 Times New Roman Greek;} -{\f236\froman\fcharset162\fprq2 Times New Roman Tur;}{\f237\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f238\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f239\froman\fcharset186\fprq2 Times New Roman Baltic;} -{\f240\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f272\fswiss\fcharset238\fprq2 Helvetica CE;}{\f273\fswiss\fcharset204\fprq2 Helvetica Cyr;}{\f275\fswiss\fcharset161\fprq2 Helvetica Greek;}{\f276\fswiss\fcharset162\fprq2 Helvetica Tur;} -{\f277\fswiss\fcharset177\fprq2 Helvetica (Hebrew);}{\f278\fswiss\fcharset178\fprq2 Helvetica (Arabic);}{\f279\fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f280\fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}}{\colortbl;\red0\green0\blue0; -\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128; -\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 -\snext0 \styrsid9973094 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\* -\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv -\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\*\cs15 \additive \ul\cf2 \sbasedon10 \styrsid9973094 Hyperlink;}} -{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid6754473\rsid9973094\rsid14707116}{\*\generator Microsoft Word 11.0.6359;}{\info{\author }{\operator }{\creatim\yr2011\mo5\dy3\min17}{\revtim\yr2011\mo11\dy1\hr14\min37}{\version3}{\edmins4} -{\nofpages1}{\nofwords18}{\nofchars106}{\*\company MS User}{\nofcharsws123}{\vern24703}}\margl1440\margr1440 \widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701 -\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale105\nolnhtadjtbl\rsidroot14707116 \fet0\sectd \linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang -{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang -{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain -\ql \li0\ri0\nowidctlpar\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\faauto\rin0\lin0\itap0\pararsid9973094 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f4\insrsid9973094 Please see } -{\field\flddirty{\*\fldinst {\b\f4\insrsid9973094 HYPERLINK "}{\b\f4\insrsid9973094\charrsid14758892 https://docs.openclinica.com/3.1/installation}{\b\f4\insrsid9973094 " }{\b\f4\insrsid9973094\charrsid10697289 {\*\datafield -00d0c9ea79f9bace118c8200aa004ba90b02000000170000002e000000680074007400700073003a002f002f0064006f00630073002e006f00700065006e0063006c0069006e006900630061002e0063006f006d002f0033002e0031002f0069006e007300740061006c006c006100740069006f006e000000e0c9ea79f9ba -ce118c8200aa004ba90b74000000680074007400700073003a002f002f0064006f00630073002e006f00700065006e0063006c0069006e006900630061002e0063006f006d002f0033002e0031002f0069006e007300740061006c006c006100740069006f006e000000795881f43b1d7f48af2c825dc485276300000000a5 -ab0000}}}{\fldrslt {\cs15\b\f4\ul\cf2\insrsid9973094\charrsid10697289 https://docs.openclinica.com/3.1/installation}}}{\b\f4\insrsid9973094 . }{\b\f4\insrsid9973094\charrsid14758892 -\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9973094 {\insrsid14707116\charrsid9973094 -\par }} \ No newline at end of file diff --git a/ws/src/main/config/install-docs/linux/tomcat b/ws/src/main/config/install-docs/linux/tomcat deleted file mode 100644 index 5a479dd5a77..00000000000 --- a/ws/src/main/config/install-docs/linux/tomcat +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash -# -# tomcat -# -# chkconfig: 2345 90 15 -# description: Tomcat start script for OpenClinica. -# -# -# -# Change the variables below if they do not mee your environment. - -RETVAL=$? -export INIT_NAME="tomcat" -export CATALINA_HOME="/usr/local/tomcat" -export JAVA_HOME="/usr/local/java" -#please note that -#XX:ParallelGCThreads need to be equivalent of number of cores -export JAVA_OPTS="$JAVA_OPTS -Xmx1280m -XX:+UseParallelGC -XX:ParallelGCThreads=1 -XX:MaxPermSize=180m -XX:+CMSClassUnloadingEnabled" - - -case "$1" in - start) - ps ax | grep "$CATALINA_HOME" | grep "$JAVA_HOME" |grep -v grep | awk '{printf $1 " "}' | wc | awk '{print $2}' > /tmp/$INIT_NAME_process_count.txt - read line < /tmp/$INIT_NAME_process_count.txt - if [ $line -gt 0 ]; then - echo "Tomcat is already running with a PID of `ps ax | grep "$CATALINA_HOME" | grep "$JAVA_HOME" | awk '{printf $1 " "}'`" - else - if [ -f $CATALINA_HOME/bin/startup.sh ]; - then - echo $"Starting Tomcat" - /bin/su tomcat $CATALINA_HOME/bin/startup.sh - fi - /etc/init.d/$INIT_NAME status - fi - ;; - stop) - ps ax | grep "$CATALINA_HOME" | grep "$JAVA_HOME" |grep -v grep | awk '{printf $1 " "}' | wc | awk '{print $2}' > /tmp/$INIT_NAME_process_count.txt - read line < /tmp/$INIT_NAME_process_count.txt - if [ $line -gt 0 ]; then - if [ -f $CATALINA_HOME/bin/shutdown.sh ]; - then - echo $"Stopping Tomcat" - /bin/su tomcat $CATALINA_HOME/bin/shutdown.sh - fi - sleep 10 - /etc/init.d/$INIT_NAME status - else - echo - echo "Tomcat was not running" - echo - fi - ;; - - restart) - /etc/init.d/$INIT_NAME stop - /etc/init.d/$INIT_NAME start - ;; - - status) - ps ax | grep "$CATALINA_HOME" | grep "$JAVA_HOME" |grep -v grep | awk '{printf $1 " "}' | wc | awk '{print $2}' > /tmp/$INIT_NAME_process_count.txt - read line < /tmp/$INIT_NAME_process_count.txt - if [ $line -gt 0 ]; then - echo - echo -n "Tomcat is running with a PID of "` - ps ax | grep "$CATALINA_HOME" | grep "$JAVA_HOME" | awk '{printf $1 " "}'` - echo -n "" - echo - else - echo - echo "Tomcat is not running" - echo - fi - ;; - kill) - PID=`ps aux | grep "$CATALINA_HOME" | grep "$JAVA_HOME" | awk '{printf $2 " "}'` - echo - echo "Killing Tomcat process running on PID $PID" - echo - kill $PID - sleep 10 - echo "Confirming tomcat is killed" - /etc/init.d/$INIT_NAME status - ;; - forcekill) - PID=`ps ax | grep "$CATALINA_HOME" | grep "$JAVA_HOME" |awk '{printf $1 " "}'` - echo - echo "Killing Tomcat process running on PID $PID" - echo - kill -9 $PID - sleep 10 - echo "Confirming tomcat is killed" - /etc/init.d/$INIT_NAME status - ;; - *) - echo $"Usage: $0 {start|stop|restart|status|kill|forcekill}" - exit 1 - ;; -esac - -exit $RETVAL \ No newline at end of file diff --git a/ws/src/main/config/install-docs/windows/install.doc b/ws/src/main/config/install-docs/windows/install.doc deleted file mode 100644 index 21da42a3fd86dd7e026859297476ac68e41576bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56320 zcmeHQ3v`slz5jok&1REq$U+`0A%rC$BE=9MYQzW2Lku7gK_pThh7d?FB#{IS_#j|- zwB@w;>P6(*fY{o{>7~@$%e9`X_F=VBOMA4J-g;Z~dOftqwy|<-ZH2wR-}mioz75|( zvKth=GdaJVZ(hHd`Okl5XXcyi9Q}F!3V*Gh_<4yTL9=5OG+PPzRex8a$7 zr^Deey=wtHYV!$_z&lSoFPm;ncZ>XOz_V;b5wt7}8vb#wNIzMzX2qJfx4*sJ^o{vQ zcjwC##BTqig}Wo6BV%H9Il|%Ws3YF9ig3VuC`z~7wC&IIb#mug(aq2CDs7hKS!A=z z;B_GMd?&8YgTe7gn9>nInR^^9_<_~f-4#iwjlPZfvm(J3PDAsyv1 ze}EOz-6nq}g1Yl`cT+xgqj>CoJ$Y93iN{CYeh|b1_lTT;Tva)g-IF|=;*5@zU&*Nf z@}WKjw>>fY$GeYkU^I==yR!b4TsF3eR7ApP-3^|rVW&gyN?}v~Xnxuza%-x{Z=eS> zyO4ejY`QyOtNihplp)VZFsOVKnUYTh!pFc<$ywQ|y_8$oDt$a##p`Y>eN=Y5^veJ5 z5qTDY=y_Y~meN9z!O|ZG9CYTc}zop{3`8Uj*J3Clh+tSk1JZbFMm5tTS zC5=rr4b}B^4RzI3CDn~<$4)32H@2>!xuvSUzN)3Jv7tC<t-|Pnzc0^Zjj$Bw)y|ysI8s_U<;i8<>lZ$c?}f z@8)H& zcD)yEz;@jXuwB~$w(E9)?aH=%0APEv?K%K^`yIE7{x^2VuRkKk&+Pg9$nJP(VX`rJLn?2^rb&+_~7YR`tRH#-;mi~&!kce1WJHf zX~AEUG|MCzi@%l9DAjP4z;2QnX@IL9+lmc9wN$~s8X;>Da{`{n!Dd)9II0k@9-l4n zX@nn^q}}puInViRsN8(=sv(=o|7FaUr9awwaW%4&C%(x~ZL|cm1hfRS1hfRS1hfRS z1hfRS1hfRS1hfP$XbEg{4aFv)A$uj;JS|`q7Tb&3^tl8|vDcc6Nj7~ld7tmJAslvi zH|&y-_@I2;+2#?Xx!CAghs_{v{aB}I0y1q@K$e#q?kd=8%hTP>Knt)~jF16cUMxO; zw!ARvaimC>a%?eGVbh75NUJ4?4J96MGQ=~&$T`p{xd*P6&`2rbYm;fSf-)Oh@ z@Uq5by{vIb6}*?=ZM%U}Kuf^wkIOyY=$O)D~|6;&++pG9~nv@ILJI`EaJhGWl@T$STNZJ>=U0=~Uo( z9kAN`Y{KSUP-d8$ZQNSJnIEYOy%+v2>@F6c+=LV>z)*wOu`O081K-E%u8F_$h>?*} zZ#|^Kr;6S#$pq&pxh-@u{5))lmMqQW3Cay1Y~BlawhVf zhO)BkT~Cx(38Z73*{%j9Wa&^aMu(Qk>FoX37GDN-*IC)w)}>^>oEg|#)>!Jb@fXJM zSDK~oZ&ZRm<*fYF)6rJx?QLsgE{I_sFF7G-s4*VQI8U^320l~KGV>rAOY2?e8=2G= zrQg_)%|)8=#w5oytYL=aNOpUtECYP#dAU(Fn=Zpmowf9-pSfqAU#Umm7_VW(nAur5^U#4d&MHI_MPp?QKYxF4vAWnrd;tRKUqr zsxoFoQ}N_gZA?!ehizm_BY1kwR%`Rcr%M{4ZZpv1_RH<$!I)#|Qh!t5xzXGxcY<-H zV`+RW&D7DprrI`XlZg_99JjC*Q67)U(+J(ILEZ6^P6BvQ=M~p+|8v6(ZjhJAC8+!T zMu{y|rr85mBMp1fdW?K4BI(hIWGHgk-z^t4zNuUay5&+XkD#3n8Rce=ZCuA!pFWw2 zzGBsp8|gu`TaC0v`q^N#(6m{8w2>Rbpj(y!RdAO;jvS>*Bn$m?)2f%j)TLqUZ5dJs zZ8>f%1MtRJYEa%^8at3*k<45>4Q<;W(!5FLpkH&Wp-!xdj_`aff5@8`M!aG5F%}B^P&&ZZ8Rp|JG%pD-k!=u;kRyRFpgwB~L}kbEVAG zmp60;1PlYnm^18QAUFJQ8_v*o9)S;tJA?RiAqmS!PL3%ApD9{m zvKXE06DuUGa|CRUXWoX4r?ytUv~~BJ9a&$jJK+h-laczXv!z{e_dYyl#_+PiudVyR z6S)uHxc&=a`74Kdm^0%ZYdY}A&(~ejupo8c&dMP#z8jXhiLr4*QuMChOlvYoTU(p_ zm1AqRxH>;XX@lbJgnZ0Oc-%N@B`KYI;E%;=C&ge$dM63G8<%95>9~fa&>4RP(v6S! zlZ&Hpijmn_1b+?~ZVVTtH3kL@ezqAD+GgX?=fiTJF}dw$veQ@zpIwN(Se`Wu)!9n%f^~nNbTBl3-U5Y@yRY1N_^iB{{!)#MO%c>d;v^z46I^y^I3z7 zWa8@Y$)SaxFAisS|MSb+Lsq4ft^UI$-9y6JewpO|R?6}FA6xDewyNMB&(ULta-71R zzOg*_Xx*qePGNsqE_ojw-gt*oSo`9F!A0LM{H9abtIIAPI&%8c3!TD74rva~zop#c z6!xa~s$m)L&%ebfY*Wowi?97w{}v*_9{bo3Y`BpwvQ~zGk4;{nCKH60N%b!*{h5halZ|lapSDbbVo3pW^ z_3|gSOmPbP&*tN;t*_*N-YKlUb>W7IYhOrr3LBpHrHz&UQ|xmJE8MX3u4k6Mv(G7v zWB5RaZ|tG~#`E^0uKw-2Pv^amD#lTlXBphL!aa2~7GVaKa0Zv@T=YwLJ3nPdIlqdY z>@-<9jpjGeKnKD+lkix2l<-(O2#=*( zglQl=gY0W@OJ|Wi>5Gy*=>yr5K8q|`VSCB`EiRc=)z<7NS!*`PTC~UI?KTVok z%i$Ep8k5W1(QZ-ZMz<()vs?6jOjfLYHYO{=J{gl^$&wtC6r2EQ=rN1DZS8Shmqc@^D|wui)T2ycqZA|#mU9$LkgeX>z=7k+3Gm>lz7FHD0$!sH*Y0MZ#5$*EP;oRR^8x15I`q z^(;-+E55`Rw@J<}tf?bjvYRXABxe_jtj}f_its$lF7)1o-n&pcQs>&H>4SN))?~d4 zht0+WHXQYstoM_9I#B8T>Q`Im!Lx*iNg*)+;`};_K-|>QlVpa~SFME}TAhfiErVc+R;_)AZ>)S&zwj zOje5bN!x`hb6XR=zI`*ISgkSHxqtNP9iJk!rnd2xkY`&P*j9Y8Wbu}dJzViAGOMcb zmXE!7@udi@s>WMFCREjU%g2PO8gKcSa8=_iATdhxZCjR0}pXxm8;`aQk`1CwE z8~=eCJv*TPBej?RXRP0h=>M%&6M}R78@WE!sZVt(T{+h>NRP>hPo(sitjA>4&-9p# z-4MN>tlx~p{(R24zJBysxSsz8k;B3?@we4+$r3rA>_BF{1WI&v;Xr6rHIcoGxMYdU zlO4#cswS$*4un=!FPzzhLlN~mKK+jG<9Ww-e)f~&{X9j&Z-e6fM8(-oP3=-Il)7wd zD2VqH6+Jv4rs%9r8}H{S60T~zpQuQvs_}lJBB83r`+16lt9s%5a*Knm=rLK3$sf;{ ztlw7ax7BJR(RDtj}E}{<L?&j@R zb~kScv%7hllikgmwCrx)uw-}hrY5_aH&fZ&yh+XO=3R{!o}s4qoe77@H$bL7zW*C3 zlI~6ga9yO^=~>58QqhvolIY%3E>xY+y}N5P`{>)qCEJP~!zHv4gFEb9^4sP=)+rA$ zeNy4%&l-7w|BVFEz1TBEezIto)V2Dbv`@ z9Avr(^=pvTvNB>fBSkS(c${}fKst}Q-f~+vRQ>*elOvzV{Kt&v_q_DgRA>YTBatP=@h2nl0gw_&#S{J;l&fa6X zZV}m*+xQ{A@%P=%cJj)Hr{cF%c_rhfcZRdk@>mAF#qkXW6YNb+cwrPqAH+FiMYDZ| z!_*dx5O|yN7 z=Y!t*a9O+$#qr^aY#+jX7zur-u}{*03?LKWUl!00$OimCe_#NR1LOjEKt3=K2mphC z0$?yu2n+#=fT2JT7zPvr!+{ZiHWz>dPUDLW-#cfNgzA5M>sS8r!Ms}kH}Ch#XD>aRK4t7LdIbR6OY-nz&s;{qWSRI_# zRMRjGPj%H*L9^d54$DcSo`be$yT5v7dFD2*TU%9Mva+$oIUSemZ;c@HaD(n z3C>%!s;;^wxTta6O8AEW*}3g{S|NTs_Wriof|m^Qd2Xrucc)&qo=bjl&5w5K$O!MCTwFSVOr1s1110%2UI)&g9kHv!xO*a2`4U>DFI;GV%ipabAq|4D#r z`GWx0@`r(Z;5mS6{}%yr{}HgS@tJ03bK@N~>#D{CXEs!qz-?bEt2Hw>2kCz-kZI;_X0C zfNS2dKq)W|;7k1pz(j!W;4cSw+@9<1D}hPCRlwB%{|(?;0Oxkh_4pLnQ-Ns!_cyKs zW&nIaUk=O!W&yK-8-O{$Twoqh0o(}82NnP~0X&9(Gq4DtY;J+gLzABcmH_-Wi)Fxa zfZV{ zU1svcRq`wX=KOJ^84nXplDBGc@rU3a<;;BGS^C$Ndc3zlN zXfAW*QB<})kD;wH%S0a@{`o^t!Zd6kL}G_z_V@eGW!&tOH_DCnVh`xP+#i0(pzo!jRgJ= D0eIzu diff --git a/ws/src/main/config/install-docs/windows/upgrade.doc b/ws/src/main/config/install-docs/windows/upgrade.doc deleted file mode 100644 index 234c4d39539f11a91ff0b05cb691dbcd998dbfe3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31744 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 diff --git a/ws/src/main/resources/org/akaza/openclinica/i18n/notes.properties b/ws/src/main/resources/org/akaza/openclinica/i18n/notes.properties index e0da9a08745..77e6411deea 100644 --- a/ws/src/main/resources/org/akaza/openclinica/i18n/notes.properties +++ b/ws/src/main/resources/org/akaza/openclinica/i18n/notes.properties @@ -248,9 +248,9 @@ fill_out_form_to_contact = Please fill out the following form to contact your Ad fill_out_form_to_request_study = The information in the form below will be sent to your OpenClinica Administrator. The Administrator will be the decision maker on whether or not you are allowed access to a particular study or site. Please contact your OpenClinica Administrator with any questions. -fill_to_add_click_help = Fill out the form to add a subject to the study. Click on the help icon for assistance. +fill_to_add_click_help = Fill out the form to add a subject to the study. Click on the Documentation link for assistance. -filter_data_selecting_range = Filter your data by subject enrollement date by selecting a date range below. +filter_data_selecting_range = Filter your data by subject enrollment date by selecting a date range below. find_an_existing_study_event = Find an Existing Study Event diff --git a/ws/src/main/resources/org/akaza/openclinica/i18n/page_messages.properties b/ws/src/main/resources/org/akaza/openclinica/i18n/page_messages.properties index 20b7ba36eaf..3310b858390 100644 --- a/ws/src/main/resources/org/akaza/openclinica/i18n/page_messages.properties +++ b/ws/src/main/resources/org/akaza/openclinica/i18n/page_messages.properties @@ -32,7 +32,7 @@ br_create_new_CRF_uploading =
Create a new CRF version by uploading an excel br_download_blank_CRF_spreadsheet_from =
Download a blank CRF Excel spreadsheet template here. -br_download_example_CRF_instructions_from =
Download example CRFs and instructions from the OpenClinica.org portal (OpenClinica.org user account required). +br_download_example_CRF_instructions_from =
Download example CRFs from the Medical Data Models (MDM) Portal (MDM-Portal user account required). br_if_you_owner_CRF_version =
If you are the owner of a CRF version, and the CRF version has not been used in a study, you can overwrite the CRF version by uploading a new excel spreadsheet with same version name. In this case, system will ask you whether you want to delete the previous contents and upload a new version. diff --git a/ws/src/main/webapp/WEB-INF/jsp/admin/createCRF.jsp b/ws/src/main/webapp/WEB-INF/jsp/admin/createCRF.jsp index 52b9594a193..f54ef4d761a 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/admin/createCRF.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/admin/createCRF.jsp @@ -53,8 +53,7 @@

.

-

. -

+

diff --git a/ws/src/main/webapp/WEB-INF/jsp/admin/createCRFVersion.jsp b/ws/src/main/webapp/WEB-INF/jsp/admin/createCRFVersion.jsp index cff9caf6ebc..e8e0015d2af 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/admin/createCRFVersion.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/admin/createCRFVersion.jsp @@ -94,9 +94,6 @@
-<%-- -

.

---%> diff --git a/ws/src/main/webapp/WEB-INF/jsp/admin/index.jsp b/ws/src/main/webapp/WEB-INF/jsp/admin/index.jsp index cde6c8826e2..027833cab74 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/admin/index.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/admin/index.jsp @@ -40,9 +40,7 @@ -

- <fmt:message key=" title=""> -

+

diff --git a/ws/src/main/webapp/WEB-INF/jsp/admin/listCRF.jsp b/ws/src/main/webapp/WEB-INF/jsp/admin/listCRF.jsp index 99934364a12..bb89327f31e 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/admin/listCRF.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/admin/listCRF.jsp @@ -51,19 +51,14 @@ -

<fmt:message key=" title=""> -

+

-

<fmt:message key=" title=""> -

+

-<%-- -

.

---%> diff --git a/ws/src/main/webapp/WEB-INF/jsp/admin/listSubject.jsp b/ws/src/main/webapp/WEB-INF/jsp/admin/listSubject.jsp index b12e6079b58..ef7f8eb0fda 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/admin/listSubject.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/admin/listSubject.jsp @@ -58,7 +58,7 @@ -

<fmt:message key=" title="">

+

diff --git a/ws/src/main/webapp/WEB-INF/jsp/admin/listuseraccounts.jsp b/ws/src/main/webapp/WEB-INF/jsp/admin/listuseraccounts.jsp index 89d9b0b5d97..4458ba1a7ee 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/admin/listuseraccounts.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/admin/listuseraccounts.jsp @@ -38,7 +38,7 @@ -

<fmt:message key=" title="">

+



diff --git a/ws/src/main/webapp/WEB-INF/jsp/admin/viewAllJobs.jsp b/ws/src/main/webapp/WEB-INF/jsp/admin/viewAllJobs.jsp index fd9a27b4464..bd87d83dfb2 100644 --- a/ws/src/main/webapp/WEB-INF/jsp/admin/viewAllJobs.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/admin/viewAllJobs.jsp @@ -41,7 +41,7 @@ -

<fmt:message key=" title="">

+

diff --git a/ws/src/main/webapp/WEB-INF/jsp/admin/viewImportJobs.jsp b/ws/src/main/webapp/WEB-INF/jsp/admin/viewImportJobs.jsp index 0df85d3eeca..874e0f7508d 100644 --- a/ws/src/main/webapp/WEB-INF/jsp/admin/viewImportJobs.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/admin/viewImportJobs.jsp @@ -41,7 +41,7 @@ -

View Scheduled Import Data Jobs <fmt:message key=" title="">

+

View Scheduled Import Data Jobs

<%--
Create a new Export Data Job
--%>
Create a new Import Data Job
diff --git a/ws/src/main/webapp/WEB-INF/jsp/admin/viewJobs.jsp b/ws/src/main/webapp/WEB-INF/jsp/admin/viewJobs.jsp index 4a5720bd4c9..329f221472a 100644 --- a/ws/src/main/webapp/WEB-INF/jsp/admin/viewJobs.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/admin/viewJobs.jsp @@ -41,7 +41,7 @@ -

View Scheduled Jobs <fmt:message key=" title="">

+

View Scheduled Jobs

Create a new Export Data Job
<%--
Create a new Import Data Job
--%> diff --git a/ws/src/main/webapp/WEB-INF/jsp/admin/viewSingleJob.jsp b/ws/src/main/webapp/WEB-INF/jsp/admin/viewSingleJob.jsp index 4e4dfbdb07b..94c6ddcb41e 100644 --- a/ws/src/main/webapp/WEB-INF/jsp/admin/viewSingleJob.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/admin/viewSingleJob.jsp @@ -45,7 +45,7 @@ -

View Job:   <fmt:message key=" title="">

+

View Job:

.

<%-- set up table here --%> diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/applyFilter.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/applyFilter.jsp index 6e36882dca7..6b8cc690da1 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/applyFilter.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/applyFilter.jsp @@ -14,7 +14,7 @@ -

: <fmt:message key=" title="">

+

:

diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetBegin.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetBegin.jsp index 38b87fcb533..87194cb8eb8 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetBegin.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetBegin.jsp @@ -43,7 +43,7 @@ -

: <fmt:message key=" title="">

+

:

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep2.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep2.jsp index 50a8caec854..81b0905b410 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep2.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep2.jsp @@ -71,18 +71,7 @@ function notSelectAll() {

    - - - - - - <fmt:message key=" title=""> - - - - <fmt:message key=" title=""> - - - : + - :

    @@ -90,8 +79,6 @@ function notSelectAll() {

    : - - <fmt:message key=" title="">

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep3.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep3.jsp index f53947bd4e3..e8f5b22144c 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep3.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep3.jsp @@ -68,11 +68,10 @@ -

    - <fmt:message key=" title=""> -:

    +

    - :

    -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep4.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep4.jsp index 3fc08996cac..cae604b4bef 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep4.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/createDatasetStep4.jsp @@ -90,10 +90,10 @@ -

    - <fmt:message key=" title=""> -:

    +

    - :

    -

    : <fmt:message key=" title="">

    + +

    :

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen1.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen1.jsp index 0f23bb456c1..4902947d504 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen1.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen1.jsp @@ -11,7 +11,7 @@ -

    <fmt:message key=" title="">

    +

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen2.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen2.jsp index e96bc1f1098..16e89f6f626 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen2.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen2.jsp @@ -13,7 +13,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3.jsp index b0c3fb8ab63..f34d0615c7e 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3.jsp @@ -13,7 +13,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_1.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_1.jsp index deeb1c8a4c3..5b17f7af546 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_1.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_1.jsp @@ -16,7 +16,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_2.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_2.jsp index 589272f840c..5d7af37f7bd 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_2.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen3_2.jsp @@ -13,7 +13,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen4.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen4.jsp index 4b433e753d2..68adaec175e 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen4.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen4.jsp @@ -13,7 +13,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen5.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen5.jsp index a76c63ca494..e9cc84f2563 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen5.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/createFilterScreen5.jsp @@ -35,7 +35,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/editDataset.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/editDataset.jsp index 965a4ee573a..b275ed0612a 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/editDataset.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/editDataset.jsp @@ -38,7 +38,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/exportDatasets.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/exportDatasets.jsp index 358fc74b334..47f325d371d 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/exportDatasets.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/exportDatasets.jsp @@ -40,7 +40,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/extractDatasetsMain.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/extractDatasetsMain.jsp index e87faf27ee6..18cb6e558e9 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/extractDatasetsMain.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/extractDatasetsMain.jsp @@ -50,7 +50,7 @@ -

    : <fmt:message key=" title="">

    +

    :

    1. diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/generateMetadataFile.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/generateMetadataFile.jsp index c77ce30fcce..5057f654960 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/generateMetadataFile.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/generateMetadataFile.jsp @@ -56,7 +56,7 @@ function refreshMe() { -

      : <fmt:message key=" title="">

      +

      :

      @@ -121,7 +121,7 @@ function refreshMe() {
-

: <fmt:message key=" title=""> +

: diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/generatedDatasetHtml.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/generatedDatasetHtml.jsp index 3b417d8d9fa..6f703cf67ca 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/generatedDatasetHtml.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/generatedDatasetHtml.jsp @@ -51,7 +51,7 @@ --%> -

: <fmt:message key=" title="">

+

:

diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/itemDetail.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/itemDetail.jsp index dcf734dfc25..2316c65a7fe 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/itemDetail.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/itemDetail.jsp @@ -40,7 +40,7 @@
- + + <%--
diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/viewDatasets.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/viewDatasets.jsp index 6a98c25c0ec..f402e759e1d 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/viewDatasets.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/viewDatasets.jsp @@ -45,7 +45,7 @@ -

: <fmt:message key=" title="">

+

:

<%--

">Show Only My Datasets | diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/viewSelected.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/viewSelected.jsp index 96a929c620a..abd490b2681 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/viewSelected.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/viewSelected.jsp @@ -43,11 +43,10 @@ function notSelectAll() { -

- <fmt:message key=" title=""> -:

+

- :

-

: <fmt:message key=" title="">

+

:

diff --git a/ws/src/main/webapp/WEB-INF/jsp/extract/viewSelectedHtml.jsp b/ws/src/main/webapp/WEB-INF/jsp/extract/viewSelectedHtml.jsp index e5c59906206..82d461e73db 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/extract/viewSelectedHtml.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/extract/viewSelectedHtml.jsp @@ -29,10 +29,10 @@

-: <fmt:message key=" title=""> +: -: <fmt:message key=" title=""> +:

diff --git a/ws/src/main/webapp/WEB-INF/jsp/include/breadcrumb.jsp b/ws/src/main/webapp/WEB-INF/jsp/include/breadcrumb.jsp index f19de71ee27..bd1d55101b8 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/include/breadcrumb.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/include/breadcrumb.jsp @@ -8,16 +8,6 @@ - - @@ -36,9 +26,9 @@ function reportBug() { <fmt:message key=" title="" style="margin-top: 2px; margin-left: 2px; margin-right: 2px; margin-bottom: 2px">--%> -
- | ')"> - + ')"> +
')">       - -       - +             diff --git a/ws/src/main/webapp/WEB-INF/jsp/include/footer.jsp b/ws/src/main/webapp/WEB-INF/jsp/include/footer.jsp index 85b2182bfca..c666fbf4d5d 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/include/footer.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/include/footer.jsp @@ -17,7 +17,7 @@ | - + diff --git a/ws/src/main/webapp/WEB-INF/jsp/include/home-header.jsp b/ws/src/main/webapp/WEB-INF/jsp/include/home-header.jsp index 5474634ae06..bde1d820979 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/include/home-header.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/include/home-header.jsp @@ -40,12 +40,6 @@
@@ -32,18 +24,9 @@ function reportBug(versionNumber) {   - <%-- - --%> - diff --git a/ws/src/main/webapp/WEB-INF/jsp/login-include/request-sidebar.jsp b/ws/src/main/webapp/WEB-INF/jsp/login-include/request-sidebar.jsp index 6afda713f2c..9c9f0522081 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/login-include/request-sidebar.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/login-include/request-sidebar.jsp @@ -5,14 +5,6 @@ -
@@ -36,11 +28,6 @@ function reportBug(versionNumber) {
  diff --git a/ws/src/main/webapp/WEB-INF/jsp/login-include/resetpwd-sidebar.jsp b/ws/src/main/webapp/WEB-INF/jsp/login-include/resetpwd-sidebar.jsp index 2ac47200099..1d56b0c3d39 100644 --- a/ws/src/main/webapp/WEB-INF/jsp/login-include/resetpwd-sidebar.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/login-include/resetpwd-sidebar.jsp @@ -4,16 +4,7 @@ <%@page import="org.akaza.openclinica.dao.core.SQLInitServlet"%> - - - +
<fmt:message key=" title="" style="margin-top: 2px; margin-left: 2px; margin-right: 2px; margin-bottom: 2px"> - - Report Issue |
- - - - + <%----%> + 		+
- - - - - | ')">
diff --git a/ws/src/main/webapp/WEB-INF/jsp/login/changeStudy.jsp b/ws/src/main/webapp/WEB-INF/jsp/login/changeStudy.jsp index de38bd8f38c..49443cf67b6 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/login/changeStudy.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/login/changeStudy.jsp @@ -39,7 +39,7 @@ -

<fmt:message key=" title="">

+

diff --git a/ws/src/main/webapp/WEB-INF/jsp/login/requestStudy.jsp b/ws/src/main/webapp/WEB-INF/jsp/login/requestStudy.jsp index 9e3cb546307..b3ea8e420ca 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/login/requestStudy.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/login/requestStudy.jsp @@ -40,7 +40,7 @@ -

<fmt:message key=" title="" >

+

diff --git a/ws/src/main/webapp/WEB-INF/jsp/login/updateProfile.jsp b/ws/src/main/webapp/WEB-INF/jsp/login/updateProfile.jsp index a9d6eefdf35..18a08adb680 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/login/updateProfile.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/login/updateProfile.jsp @@ -41,7 +41,7 @@ -

<fmt:message key=" title="">

+

diff --git a/ws/src/main/webapp/WEB-INF/jsp/managestudy/createSubjectGroupClass.jsp b/ws/src/main/webapp/WEB-INF/jsp/managestudy/createSubjectGroupClass.jsp index e8be02795c7..0baee775082 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/managestudy/createSubjectGroupClass.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/managestudy/createSubjectGroupClass.jsp @@ -53,7 +53,7 @@ } //--> -

<fmt:message key=" title="">

+

*
diff --git a/ws/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp b/ws/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp index 1e6dd0ae165..113f37a715f 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp @@ -74,10 +74,7 @@ -

- -<fmt:message key=" title=""> -

+

diff --git a/ws/src/main/webapp/WEB-INF/jsp/managestudy/index.jsp b/ws/src/main/webapp/WEB-INF/jsp/managestudy/index.jsp index 977aa34a437..28bc81b807e 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/managestudy/index.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/managestudy/index.jsp @@ -52,7 +52,7 @@ -

<fmt:message key=" title="">

+

<%-- 3057 removed this: --%>

${studyIdentifier}

diff --git a/ws/src/main/webapp/WEB-INF/jsp/managestudy/listStudySubject.jsp b/ws/src/main/webapp/WEB-INF/jsp/managestudy/listStudySubject.jsp index b3942f2e68b..4aedce31ec9 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/managestudy/listStudySubject.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/managestudy/listStudySubject.jsp @@ -50,9 +50,7 @@ -

- <fmt:message key=" title=""> -

+

: diff --git a/ws/src/main/webapp/WEB-INF/jsp/managestudy/listUserInStudy.jsp b/ws/src/main/webapp/WEB-INF/jsp/managestudy/listUserInStudy.jsp index 69dc84f990b..58478fa82d9 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/managestudy/listUserInStudy.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/managestudy/listUserInStudy.jsp @@ -41,7 +41,7 @@ -

<fmt:message key=" title="">

+

<%--
diff --git a/ws/src/main/webapp/WEB-INF/jsp/managestudy/managestudy_body.jsp b/ws/src/main/webapp/WEB-INF/jsp/managestudy/managestudy_body.jsp index a0cd19de8a3..73a366df76c 100644 --- a/ws/src/main/webapp/WEB-INF/jsp/managestudy/managestudy_body.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/managestudy/managestudy_body.jsp @@ -40,7 +40,7 @@ -

<fmt:message key=" title="">

+

- - +
-

- - -
- - - - - -
- - -
- - - - - - -
-

- - -

<%--

diff --git a/ws/src/main/webapp/WEB-INF/jsp/menu.jsp b/ws/src/main/webapp/WEB-INF/jsp/menu.jsp index 494d7f1fd2f..348d877baa1 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/menu.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/menu.jsp @@ -82,13 +82,13 @@

- - - - - - - + + + + + + +

diff --git a/ws/src/main/webapp/WEB-INF/jsp/studymodule.jsp b/ws/src/main/webapp/WEB-INF/jsp/studymodule.jsp index 4d0f60869ae..0c96780ddc1 100644 --- a/ws/src/main/webapp/WEB-INF/jsp/studymodule.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/studymodule.jsp @@ -78,9 +78,7 @@
-

  - Help -

+

diff --git a/ws/src/main/webapp/WEB-INF/jsp/submit/addExistingSubject.jsp b/ws/src/main/webapp/WEB-INF/jsp/submit/addExistingSubject.jsp index a715e6488bd..31ec1f7dc13 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/submit/addExistingSubject.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/submit/addExistingSubject.jsp @@ -105,9 +105,7 @@ -

-: <fmt:message key=" title=""> -

+

:


diff --git a/ws/src/main/webapp/WEB-INF/jsp/submit/addNewSubject.jsp b/ws/src/main/webapp/WEB-INF/jsp/submit/addNewSubject.jsp index 999a6956351..fe8027770cc 100755 --- a/ws/src/main/webapp/WEB-INF/jsp/submit/addNewSubject.jsp +++ b/ws/src/main/webapp/WEB-INF/jsp/submit/addNewSubject.jsp @@ -92,11 +92,7 @@ -

-: - - <fmt:message key=" title=""> -

+

: