branch develop updated (1646081 -> 0edd7fe)
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 1646081 add links to search on referential in cloud tags new 0edd7fe Modification de la saisie des mots clés sur tous les écrans concernés 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 0edd7fe2adee1fc0ce62996d370116c9639e9772 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Feb 4 11:35:47 2016 +0100 Modification de la saisie des mots clés sur tous les écrans concernés Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 5 ++- .../main/webapp/views/documents/editDocument.html | 37 +++++++++---------- .../webapp/views/documents/modalDocumentEdit.html | 41 +++++++++------------ .../main/webapp/views/documents/newdocument.html | 42 ++++++++++------------ .../main/webapp/views/questions/editquestion.html | 4 --- 5 files changed, 56 insertions(+), 73 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 0edd7fe2adee1fc0ce62996d370116c9639e9772 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Feb 4 11:35:47 2016 +0100 Modification de la saisie des mots clés sur tous les écrans concernés --- coselmar-ui/src/main/webapp/css/coselmar.css | 5 ++- .../main/webapp/views/documents/editDocument.html | 37 +++++++++---------- .../webapp/views/documents/modalDocumentEdit.html | 41 +++++++++------------ .../main/webapp/views/documents/newdocument.html | 42 ++++++++++------------ .../main/webapp/views/questions/editquestion.html | 4 --- 5 files changed, 56 insertions(+), 73 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 8a08bf2..8ccaa98 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -419,7 +419,6 @@ dl > dd { display: inline-block; width: auto; background: transparent; - margin-top: 1px; box-shadow: none; } .tag-input input[type="text"]:focus { @@ -517,6 +516,10 @@ body .container { width: 80%; } +.btn { + outilne: none !important; +} + .btn-primary { background-color: #39a0a8; border-color: #3a8a8a; diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 2b14a6d..e8d7152 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -186,34 +186,29 @@ <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'document.message.info.keywords' | translate }}"></span> </label> - <div class="col-md-2"> - <input type="text" class="form-control" name="keywords" - placeholder="Validate with add" + <div class="col-md-10"> + <div class="form-control tag-input"> + <span ng-repeat="keyword in document.keywords" class="tag" aria-hidden="true"> + {{keyword}} + <button type="button" class="close" title="remove" ng-click="removeKeyword(keyword);"> + × + </button> + </span> + <input type="text" class="form-control" name="keywords" + placeholder="Add a keyword" ng-model="toAddKeyword" list="existingKeywords" /> + <button type="button" class="btn btn-primary tag-input-add" value="{{ 'common.button.add' | translate}}" + ng-click="addKeyword(toAddKeyword); toAddKeyword=''"><span class="fa fa-plus"></span></button> + <datalist id="existingKeywords"> + <option data-ng-repeat="keyword in existing.keywords" value="{{keyword}}"> + </datalist> + </div> <p ng-show="(document.keywords.length < 1 && !documentForm.keywords.$pristine) || keywordsError" class="help-block">{{ 'document.message.requiredKeywords' | translate }}</p> </div> - <datalist id="existingKeywords"> - <option data-ng-repeat="keyword in existing.keywords" value="{{keyword}}"> - </datalist> </div> - <div class="col-md-1"> - <button type="button" class="btn btn-primary" value="{{ 'common.button.add' | translate}}" - ng-click="addKeyword(toAddKeyword); toAddKeyword=''">{{ 'common.button.add' | translate }}</button> - </div> - - - <div class="col-md-7"> - <span ng-repeat="keyword in document.keywords" class="tag" aria-hidden="true"> - {{keyword}} - <button type="button" class="close" title="remove" ng-click="removeKeyword(keyword);"> - × - </button> - </span> - - </div> </div> <!-- Line with copyright & License --> diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index cdb224a..d94e040 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -158,33 +158,26 @@ <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'document.message.info.keywords' | translate }}"></span> </label> - <div class="col-md-2"> - <input type="text" class="form-control" name="keywords" - placeholder="Validate with add" - data-ng-model="modalToAddKeyword" list="modalExistingKeywords"/> - + <div class="col-md-10"> + <div class="form-control tag-input"> + <span ng-repeat="keyword in document.keywords" class="tag" aria-hidden="true"> + {{keyword}} + <button type="button" class="close" title="remove" ng-click="removeKeyword(keyword);"> + × + </button> + </span> + <input type="text" class="form-control" name="keywords" + placeholder="Add a keyword" + data-ng-model="modalToAddKeyword" list="modalExistingKeywords"/> + <button class="btn btn-primary tag-input-add" value="add" + ng-click="addKeyword(modalToAddKeyword); modalToAddKeyword=''"><span class="fa fa-plus"></span></button> + <datalist id="modalExistingKeywords"> + <option data-ng-repeat="keyword in modalExisting.keywords" value="{{keyword}}"> + </datalist> + </div> <p ng-show="(document.keywords.length < 1 && !documentForm.keywords.$pristine) || keywordsError" class="help-block">{{ 'document.message.requiredKeywords' | translate }}</p> </div> - <datalist id="modalExistingKeywords"> - <option data-ng-repeat="keyword in modalExisting.keywords" value="{{keyword}}"> - </datalist> - </div> - - <div class="col-md-1"> - <button class="btn btn-primary" value="add" - ng-click="addKeyword(modalToAddKeyword); modalToAddKeyword=''">{{ 'common.button.add' | translate }}</button> - </div> - - - <div class="col-md-7"> - <span ng-repeat="keyword in document.keywords" class="tag" aria-hidden="true"> - {{keyword}} - <button type="button" class="close" title="remove" ng-click="removeKeyword(keyword);"> - × - </button> - </span> - </div> </div> <!-- End Line with keywords --> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 9f578c6..c373536 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -178,34 +178,30 @@ <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'document.message.info.keywords' | translate }}"></span> </label> - <div class="col-md-2"> - <input type="text" class="form-control" name="keywords" - placeholder="Validate with add" - ng-model="toAddKeyword" list="existingKeywords" /> - + <div class="col-md-10"> + <div class="form-control tag-input"> + <span ng-repeat="keyword in document.keywords" class="tag" aria-hidden="true"> + {{keyword}} + <button type="button" class="close" title="remove" ng-click="removeKeyword(keyword);"> + × + </button> + </span> + + <input type="text" class="form-control" name="keywords" + placeholder="Add a keyword" + ng-model="toAddKeyword" list="existingKeywords" /> + <button type="button" class="btn btn-primary tag-input-add" + ng-click="addKeyword(toAddKeyword); toAddKeyword='';"><span class="fa fa-plus"></span></button> + + <datalist id="existingKeywords"> + <option data-ng-repeat="keyword in existing.keywords" value="{{keyword}}"> + </datalist> + </div> <p ng-show="(document.keywords.length < 1 && !documentForm.keywords.$pristine) || keywordsError" class="help-block">{{ 'document.message.requiredKeywords' | translate }}</p> </div> - <datalist id="existingKeywords"> - <option data-ng-repeat="keyword in existing.keywords" value="{{keyword}}"> - </datalist> - </div> - - <div class="col-md-1"> - <button type="button" class="btn btn-primary" - ng-click="addKeyword(toAddKeyword); toAddKeyword='';">{{ 'common.button.add' | translate }}</button> </div> - - <div class="col-md-7"> - <span ng-repeat="keyword in document.keywords" class="tag" aria-hidden="true"> - {{keyword}} - <button type="button" class="close" title="remove" ng-click="removeKeyword(keyword);"> - × - </button> - </span> - - </div> </div> <!-- Line with copyright & License --> diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 93e008e..670c2f2 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -139,13 +139,9 @@ <option data-ng-repeat="theme in existing.themes" value="{{theme}}"> </datalist> </div> - </div> - - <div class="col-md-2" > <p ng-show="(question.themes.length < 1 && !questionForm.themes.$pristine) || themesError == true" class="help-block">{{ 'question.message.requiredThemes' | translate }}</p> </div> - </div> <!-- End Line with Themes --> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm