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 d37c47b3a77bec9870a50b5ef9158740b920d5f8 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Jan 14 11:28:39 2016 +0100 Refs #7867 : Ajout du prefix http dans le champ d'édition d'un lien associé --- coselmar-ui/src/main/webapp/i18n/en.js | 1 - coselmar-ui/src/main/webapp/i18n/fr.js | 1 - coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html | 5 ++++- coselmar-ui/src/main/webapp/views/questions/viewquestion.html | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index c260b58..5350e17 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -162,7 +162,6 @@ var translateEN = { "question.metadata.childrenPhrase" : "Has produced or inspired", "question.metadata.participants" : "Participants", "question.metadata.links" : "Associated Links", -"question.metadata.links.display" : "Go further", "question.metadata.hierarchy.display" : "Show tree view", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index f405e2b..6c1072f 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -162,7 +162,6 @@ var translateFR = { "question.metadata.childrenPhrase" : "A provoqué ou inspiré", "question.metadata.participants" : "Participants", "question.metadata.links" : "Liens associés", -"question.metadata.links.display" : "Pour aller plus loin", "question.metadata.hierarchy.display" : "Voir l'arborescence", diff --git a/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html b/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html index 8760f8f..1d5baf7 100644 --- a/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html +++ b/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html @@ -41,9 +41,12 @@ </label> <div class="col-md-8"> - <input type="text" class="form-control" id="linkUrl" + <div class="input-group"> + <span class="input-group-addon">http://</span> + <input type="text" class="form-control" id="linkUrl" placeholder="Link Name" ng-model="link.url" required /> + </div> <p ng-show="linkForm.linkUrl.$invalid && !linkForm.linkUrl.$pristine" class="help-block">{{ 'link.message.requiredUrl' | translate }}</p> diff --git a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html index 5c83a52..bd3ca33 100644 --- a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html @@ -128,11 +128,11 @@ </dl> <dl ng-if="question.links && question.links.length > 0"> - <dt>{{ 'question.metadata.links.display' | translate }}</dt> + <dt>{{ 'question.metadata.links' | translate }}</dt> <dd> <ul> <li ng-repeat="link in question.links"> - <a href="{{link.url}}" target="_blank"> + <a href="http://{{link.url}}" target="_blank"> <span ng-if="link.name && link.name.length > 0">{{link.name}}</span> <span ng-if="!link.name || link.name.length === ''">{{link.url}}</span> </a> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.