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 d0c81216409debe17a191fe35e98fa7710ec7ba5 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Jan 14 11:41:24 2016 +0100 Ajout du prefix http dans tous le champ d'édition d'un lien --- coselmar-ui/src/main/webapp/views/documents/editDocument.html | 9 ++++++--- .../src/main/webapp/views/documents/modalDocumentEdit.html | 10 ++++++---- coselmar-ui/src/main/webapp/views/documents/newdocument.html | 9 ++++++--- coselmar-ui/src/main/webapp/views/documents/viewDocument.html | 2 +- coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html | 2 +- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 58c73a6..189c022 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -162,9 +162,12 @@ <label class="col-md-2 control-label">{{ 'document.metadata.externalUrl' | translate }}</label> <div class="col-md-4"> - <input type="input" class="form-control" name="externalUrl" - placeholder="http://website" - ng-model="document.externalUrl" /> + <div class="input-group"> + <span class="input-group-addon">http://</span> + <input type="input" class="form-control" name="externalUrl" + placeholder="www.website.com" + ng-model="document.externalUrl" /> + </div> </div> </div> diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index 9c4d63f..f5e116e 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -135,10 +135,12 @@ <label class="col-md-2 control-label">{{ 'document.metadata.externalUrl' | translate }}</label> <div class="col-md-4"> - <input type="input" class="form-control" name="externalUrl" - placeholder="http://website" - ng-model="document.externalUrl" ng-minlength="6"/> - + <div class="input-group"> + <span class="input-group-addon">http://</span> + <input type="input" class="form-control" name="externalUrl" + placeholder="www.website.com" + ng-model="document.externalUrl" ng-minlength="6"/> + </div> </div> </div> <p ng-show="!document.externalUrl && !file.upload" diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index a4d59dd..460483d 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -156,9 +156,12 @@ <label class="col-md-2 control-label">{{ 'document.metadata.externalUrl' | translate }}</label> <div class="col-md-4"> - <input type="input" class="form-control" name="externalUrl" - placeholder="http://website" - ng-model="document.externalUrl" /> + <div class="input-group"> + <span class="input-group-addon">http://</span> + <input type="input" class="form-control" name="externalUrl" + placeholder="www.website.com" + ng-model="document.externalUrl" /> + </div> </div> </div> diff --git a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html index c18b944..2558437 100644 --- a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html @@ -150,7 +150,7 @@ <a href="{{container.baseUrl}}/documents/{{document.id}}/file" class="btn btn-action btn-success" ng-if="document.withFile"> <span class="fa fa-download" aria-hidden="true"></span>{{ 'document.button.download' | translate }} </a> - <a href="{{document.externalUrl}}" target="_blank" class="btn btn-action btn-success" ng-if="document.externalUrl"> + <a href="http://{{document.externalUrl}}" target="_blank" class="btn btn-action btn-success" ng-if="document.externalUrl"> <span class="fa fa-external-link" aria-hidden="true"></span>{{ 'document.button.openLink' | translate }} </a> <a class="btn btn-action btn-disable" ng-if="context.currentUser.role == 'ADMIN'" diff --git a/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html b/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html index 1d5baf7..aa6ae28 100644 --- a/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html +++ b/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html @@ -46,7 +46,7 @@ <input type="text" class="form-control" id="linkUrl" placeholder="Link Name" ng-model="link.url" required /> - </div> + </div> <p ng-show="linkForm.linkUrl.$invalid && !linkForm.linkUrl.$pristine" class="help-block">{{ 'link.message.requiredUrl' | translate }}</p> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.