branch develop updated (18e9db9 -> 4931f5d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 18e9db9 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop new 4931f5d fixes #6436 use predefined values for question type The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 4931f5db97ab4613967acd0032054ba2c6b73d05 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 16:22:46 2015 +0100 fixes #6436 use predefined values for question type Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 5 ++++- coselmar-ui/src/main/webapp/i18n/en.js | 8 ++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 8 ++++++++ .../src/main/webapp/views/questions/editquestion.html | 17 ++++++++++++----- .../src/main/webapp/views/questions/viewquestion.html | 4 +++- 5 files changed, 35 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 4931f5db97ab4613967acd0032054ba2c6b73d05 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 16:22:46 2015 +0100 fixes #6436 use predefined values for question type --- coselmar-ui/src/main/webapp/css/coselmar.css | 5 ++++- coselmar-ui/src/main/webapp/i18n/en.js | 8 ++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 8 ++++++++ .../src/main/webapp/views/questions/editquestion.html | 17 ++++++++++++----- .../src/main/webapp/views/questions/viewquestion.html | 4 +++- 5 files changed, 35 insertions(+), 7 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 5e49ddb..fc74239 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -79,7 +79,10 @@ body > .container { padding: 0 15px; } - +/* to not have a too short tooltip popup */ +.tooltip-inner { + width: 500px; +} /* General -------------------------------------------------- */ diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 2d07673..1f651e6 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -120,6 +120,9 @@ var translateEN = { "question.metadata.title" : "Title", "question.metadata.type" : "Type", +"question.metadata.type.reunion" : "Meeting (seminar, roundtable, ...)", +"question.metadata.type.expertise" : "Expertise", +"question.metadata.type.project" : "Project (arrangement, brainstorming, ...)", "question.metadata.privacy" : "Visibility", "question.metadata.themes" : "Themes", "question.metadata.submissionDate" : "Submission date", @@ -156,6 +159,11 @@ var translateEN = { "question.message.notAllowedToCreate" : "You're not allowed to create question", "question.message.delete" : "Do you really want to delete this question ?", "question.message.closedOn" : "Closed on ", +"question.message.info.type" : "Type could be of three kinds : <ul>\ + <li>Meeting : seminar, roundtable, short meeting, ...</li>\ + <li>Expertise</li>\ + <li>Project : all around project life such as arrangement or brainstorming</li>\ + </ul>", //Users part diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index ff664f6..03d5b5d 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -120,6 +120,9 @@ var translateFR = { "question.metadata.title" : "Titre", "question.metadata.type" : "Type", +"question.metadata.type.reunion" : "Réunion (séminaire, table ronde, ...)", +"question.metadata.type.expertise" : "Expertise", +"question.metadata.type.project" : "Projet (montage, brainstorming, ...)", "question.metadata.privacy" : "Visibilité", "question.metadata.themes" : "Thèmes", "question.metadata.submissionDate" : "Date de soumission", @@ -156,6 +159,11 @@ var translateFR = { "question.message.notAllowedToCreate" : "Vous n'êtes pas autorisé à déposer une question", "question.message.delete" : "Êtes vous sûr de vouloir supprimer cette question ?", "question.message.closedOn" : "Fermé le ", +"question.message.info.type" : "Le type peut être l'un des trois suivants :<ul>\ + <li>Réunion : séminaire, table ronde, ...</li>\ + <li>Expertise</li>\ + <li>Projet : tout ce qui tourne autour d'un projet comme le montage ou les brainstorming</li>\ + </ul>", //Users part diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index b29f2d7..3c0044b 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -42,11 +42,18 @@ <div class="form-group row"> <div class="" ng-class="{'has-error' : questionForm.type.$invalid && !questionForm.type.$pristine}"> - <label class="col-md-2 control-label">{{ 'question.metadata.type' | translate }} *</label> + <label class="col-md-2 control-label">{{ 'question.metadata.type' | translate }} * + <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'question.message.info.type' | translate }}"></span> + </label> + + <div class="col-md-3 "> + + <select class="form-control" name="type" ng-model="question.type" required> + <option value="REUNION">{{ 'question.metadata.type.reunion' | translate }}</option> + <option value="EXPERTISE">{{ 'question.metadata.type.expertise' | translate }}</option> + <option value="PROJECT">{{ 'question.metadata.type.project' | translate }}</option> + </select> - <div class="col-md-2 "> - <input type="text" class="form-control" name="type" - data-ng-model="question.type" list="existingTypes" required/> <p ng-show="questionForm.type.$invalid && !questionForm.type.$pristine" class="help-block">{{ 'question.message.requiredType' | translate }}</p> </div> <datalist id="existingTypes"> @@ -56,7 +63,7 @@ </div> <div class=""> - <label class="col-md-2 control-label">{{ 'question.metadata.privacy' | translate }}</label> + <label class="col-md-1 control-label">{{ 'question.metadata.privacy' | translate }}</label> <div class="col-md-2"> <select class="form-control" name="privacy" ng-model="question.privacy"> diff --git a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html index a9efc6c..5837189 100644 --- a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html @@ -28,7 +28,9 @@ <div class="col-md-3"> <dl> <dt>{{ 'question.metadata.type' | translate }}</dt> - <dd>{{question.type}}</dd> + <dd ng-if="question.type == 'REUNION'">{{ 'question.metadata.type.reunion' | translate }}</dd> + <dd ng-if="question.type == 'EXPERTISE'">{{ 'question.metadata.type.expertise' | translate }}</dd> + <dd ng-if="question.type == 'PROJECT'">{{ 'question.metadata.type.project' | translate }}</dd> </dl> </div> <div class="col-md-3"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm