This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit efe50d4f2ac976cdb9e9e9f667fb96cab5a89eec Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jan 26 17:53:02 2015 +0100 create some predefined document types --- coselmar-ui/src/main/webapp/i18n/en.js | 13 +++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 13 +++++++++++++ .../src/main/webapp/views/documents/editDocument.html | 11 ++++++++--- .../src/main/webapp/views/documents/newdocument.html | 16 ++++++++++++++-- 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 5cda814..ba11b59 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -73,6 +73,19 @@ var translateEN = { "document.metadata.relatedQuestions" : "Related Questions", "document.metadata.view.relatedQuestions" : "Questions with this document", "document.metadata.type" : "Type", +"document.metadata.type.publication" : "Publication", +"document.metadata.type.meetingPublication" : "Publication in meeting or symposium", +"document.metadata.type.periodicalPublication" : "Publication in periodical", +"document.metadata.type.thesis" : "Thesis", +"document.metadata.type.report" : "Report", +"document.metadata.type.scientificReport" : "Scientific report", +"document.metadata.type.scientificWork" : "Scientific work", +"document.metadata.type.chapterWork" : "Work chapter", +"document.metadata.type.contractReport" : "Contract report", +"document.metadata.type.expertise" : "Expertise/Opinion", +"document.metadata.type.poster" : "Poster", +"document.metadata.type.conferenceArticle" : "Conference article", +"document.metadata.type.conferenceSummary" : "Conference summary", "document.metadata.file" : "File", "document.metadata.externalUrl" : "External URL", "document.metadata.copyright" : "Copyright", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 9400af0..62b4204 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -73,6 +73,19 @@ var translateFR = { "document.metadata.relatedQuestions" : "Questions relatives", "document.metadata.view.relatedQuestions" : "Questions utilisant ce document", "document.metadata.type" : "Type", +"document.metadata.type.publication" : "Publication", +"document.metadata.type.meetingPublication" : "Publication dans des colloques ou séminaires", +"document.metadata.type.periodicalPublication" : "Publication dans une revue", +"document.metadata.type.thesis" : "Thèse", +"document.metadata.type.report" : "Rapport", +"document.metadata.type.scientificReport" : "Rapport scientifique", +"document.metadata.type.scientificWork" : "Ouvrage scientifique", +"document.metadata.type.chapterWork" : "Chapitre d'ouvrage", +"document.metadata.type.contractReport" : "Rapport de contrat", +"document.metadata.type.expertise" : "Expertise/Avis", +"document.metadata.type.poster" : "Poster", +"document.metadata.type.conferenceArticle" : "Acte de colloque", +"document.metadata.type.conferenceSummary" : "Communication sans actes", "document.metadata.file" : "Fichier", "document.metadata.externalUrl" : "URL externe", "document.metadata.copyright" : "Copyright", diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 99c62e1..daed34c 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -50,9 +50,14 @@ ng-class="{'has-error' : documentForm.type.$invalid && !documentForm.type.$pristine}"> <label class="col-md-1 control-label">{{ 'document.metadata.type' | translate }} *</label> - <div class="col-md-2"> - <input type="text" class="form-control" name="type" - data-ng-model="document.type" list="existingTypes" required/> + <select class="form-control" name="type" ng-model="document.type" required> + <option value="Publication">{{ 'document.metadata.type.publication' | translate }}</option> + <option value="Report">{{ 'document.metadata.type.report' | translate }}</option> + <option value="Scientific report">{{ 'document.metadata.type.scientificReport' | translate }}</option> + <option value="Contract report">{{ 'document.metadata.type.contractReport' | translate }}</option> + <option value="Poster">{{ 'document.metadata.type.poster' | translate }}</option> + <option value="Conference Article">{{ 'document.metadata.type.conferenceArticle' | translate }}</option> + </select> <p ng-show="documentForm.type.$invalid && !documentForm.type.$pristine" class="help-block">{{ 'document.message.requiredType' | translate }}</p> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 05cc70b..1334a3b 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -59,8 +59,20 @@ <label class="col-md-1 control-label">{{ 'document.metadata.type' | translate }} *</label> <div class="col-md-2"> - <input type="text" class="form-control" name="type" - data-ng-model="document.type" list="existingTypes" required/> + <select class="form-control" name="type" ng-model="document.type" required> + <option value="MEETING_PUBLICATION">{{ 'document.metadata.type.meetingPublication' | translate }}</option> + <option value="PERIODICAL_PUBLICATION">{{ 'document.metadata.type.periodicalPublication' | translate }}</option> + <option value="THESIS">{{ 'document.metadata.type.thesis' | translate }}</option> + <option value="REPORT">{{ 'document.metadata.type.report' | translate }}</option> + <option value="SCIENTIFIC_REPORT">{{ 'document.metadata.type.scientificReport' | translate }}</option> + <option value="SCIENTIFIC_WORK">{{ 'document.metadata.type.scientificWork' | translate }}</option> + <option value="CHAPTER_WORK">{{ 'document.metadata.type.chapterWork' | translate }}</option> + <option value="CONTRACT_REPORT">{{ 'document.metadata.type.contractReport' | translate }}</option> + <option value="EXPERTISE">{{ 'document.metadata.type.expertise' | translate }}</option> + <option value="POSTER">{{ 'document.metadata.type.poster' | translate }}</option> + <option value="CONFERENCE_ARTICLE">{{ 'document.metadata.type.conferenceArticle' | translate }}</option> + <option value="CONFERENCE_SUMMARY">{{ 'document.metadata.type.conferenceSummary' | translate }}</option> + </select> <p ng-show="documentForm.type.$invalid && !documentForm.type.$pristine" class="help-block">{{ 'document.message.requiredType' | translate }}</p> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.