branch feature/8004-new-way-input-themes-keywords updated (2c65895 -> d7206b6)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8004-new-way-input-themes-keywords in repository coselmar. See http://git.forge.codelutin.com/coselmar.git discards 2c65895 refs-80 #8004 try new way to input document keywords discards d1602f7 refs-40 #8004 try new way to input project themes adds 0339661 make citation field mandatory adds dde0ee9 Fixes i18n placeholder issue adds c81c165 Meilleur gestion des liens externes d'un document pour éviter les liens corrompus adds a0245ce Suppression d'un message d'avertissement de saisie en anglais qui ne fonctionnait pas correctement adds 7a5a5cf Affichage du nombre de résultats sur les pages de recherche adds 971345e Fixes #7974 : Affichage responsive du nuage de mots et modification des couleur en harmonie avec le reste de l'appli adds c82e753 fix the transfer to contributor when we clear the list of experts in project adds 28c3062 fix advanced search on users, clean some code new e39572f refs-40 #8004 try new way to input project themes new 6b45567 refs-80 #8004 try new way to input document keywords new d7206b6 fix bad merge This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2c65895) \ N -- N -- N refs/heads/feature/8004-new-way-input-themes-keywords (d7206b6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 3 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 d7206b6cab35337ddb524d524d8777709935f2bb Author: Yannick Martel <martel@©odelutin.com> Date: Mon Feb 29 14:13:55 2016 +0100 fix bad merge commit 6b45567e0e81e362bb3110d2b55d18f5471815ba Author: Yannick Martel <martel@©odelutin.com> Date: Wed Feb 17 16:39:00 2016 +0100 refs-80 #8004 try new way to input document keywords commit e39572fc5a484daedeadeb00cc0a90f0853d568a Author: Yannick Martel <martel@©odelutin.com> Date: Wed Feb 17 15:26:02 2016 +0100 refs-40 #8004 try new way to input project themes Summary of changes: .../coselmar/services/v1/QuestionsWebService.java | 23 ++----- coselmar-ui/src/main/webapp/css/coselmar.css | 55 ++++++++++++---- coselmar-ui/src/main/webapp/i18n/en.js | 2 + coselmar-ui/src/main/webapp/i18n/fr.js | 2 + .../src/main/webapp/js/coselmar-controllers.js | 77 ++++++++++++++-------- .../main/webapp/views/documents/editDocument.html | 27 ++++---- .../webapp/views/documents/modalDocumentEdit.html | 49 +++++++------- .../main/webapp/views/documents/newdocument.html | 25 ++++--- .../main/webapp/views/documents/viewDocument.html | 2 +- coselmar-ui/src/main/webapp/views/home.html | 2 +- .../src/main/webapp/views/links/modalLinkEdit.html | 9 +-- .../src/main/webapp/views/paginationTemplate.html | 5 +- .../main/webapp/views/questions/editquestion.html | 2 +- .../main/webapp/views/questions/viewquestion.html | 3 +- .../src/main/webapp/views/users/newPassword.html | 2 +- 15 files changed, 166 insertions(+), 119 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 feature/8004-new-way-input-themes-keywords in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit e39572fc5a484daedeadeb00cc0a90f0853d568a Author: Yannick Martel <martel@©odelutin.com> Date: Wed Feb 17 15:26:02 2016 +0100 refs-40 #8004 try new way to input project themes --- coselmar-ui/src/main/webapp/css/coselmar.css | 11 ++++++++ .../src/main/webapp/js/coselmar-controllers.js | 16 +++++++++-- .../main/webapp/views/questions/editquestion.html | 32 ++++++++++++++++------ 3 files changed, 49 insertions(+), 10 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 2859437..df35e09 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -439,6 +439,17 @@ dl > dd { .tag-input input[type="text"]:focus { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6) inset; } +/*FIXME #CSS Leo pour l'utilisation d'ui-select */ +.tag-input .input-zone { + border: 0; + display: inline-block; + width: auto; + background: transparent; + box-shadow: none; +} +.tag-input .input-zone:focus { + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6) inset; +} .tag-input .tag-input-add { display: inline; diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index fa89666..39eeb3f 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -1257,7 +1257,10 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam 'links' : []}; $scope.existing = {'types' : [], 'themes' : []}; $scope.topWords = [{text:"coselmar", weight: 10}, {text: "Ifremer", weight: 5}]; - $scope.cloudColors = ["#2f8389", "#349198", "#39A0A8", "#3eaeb6", "#48b8c0"]; + //$scope.cloudColors = ["#2f8389", "#349198", "#39A0A8", "#3eaeb6", "#48b8c0"]; + //FIXME Leo #CSS si tu veux trouver de belles couleurs pour le nuage, c'est là :) + $scope.cloudColors = []; + $scope.toAddTheme = {}; // Preload exiting types and themes questionsService.findAllTypes(function(results) { @@ -1559,6 +1562,14 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam } }; + $scope.getExistingThemes = function(search) { + var newThemes = $scope.existing.themes.slice(); + if (search && newThemes.indexOf(search) === -1) { + newThemes.unshift(search); + } + return newThemes; + } + $scope.addTheme = function(themeList) { if (!$scope.question.themes) { $scope.question.themes = []; @@ -1573,6 +1584,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam } } $scope.keywordsError = false; + $scope.toAddTheme = {};// reset field }; $scope.removeTheme = function(theme) { @@ -2264,4 +2276,4 @@ coselmarControllers.directive('paginationTool', function() { // restrict: 'E', templateUrl: 'views/paginationTemplate.html' }; -}); \ No newline at end of file +}); diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 4f0a779..bc0bf20 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -135,15 +135,31 @@ </button> </span> - <input type="text" class="form-control" name="themes" - placeholder="{{ 'placeholder.project.addTag' | translate }}" - data-ng-model="toAddTheme" list="existingThemes" /> - <button type="button" class="btn btn-primary tag-input-add" value="add" ng-click="addTheme(toAddTheme); toAddTheme=''"><span class="fa fa-plus"></span></button> - - <datalist id="existingThemes"> - <option data-ng-repeat="theme in existing.themes" value="{{theme}}"> - </datalist> + <!--<input type="text" class="form-control" name="themes"--> + <!--placeholder="{{ 'placeholder.project.addTag' | translate }}"--> + <!--data-ng-model="toAddTheme" list="existingThemes" />--> + <!--FIXME #CSS Leo--> + <span class="input-zone"> + <ui-select ng-model="toAddTheme.selected" + theme="bootstrap" reset-search-input="true" ng-change="addTheme(toAddTheme.selected)"> + + <ui-select-match placeholder="{{ 'placeholder.project.addTag' | translate }}"> + {{$select.selected}} + </ui-select-match> + + <ui-select-choices repeat="theme in getExistingThemes($select.search) | filter : $select.search" > + {{theme}} + </ui-select-choices> + </ui-select> + </span> + + <!--<button type="button" class="btn btn-primary tag-input-add" value="add" ng-click="addTheme(toAddTheme); toAddTheme=''"><span class="fa fa-plus"></span></button>--> + + <!--<datalist id="existingThemes">--> + <!--<option data-ng-repeat="theme in existing.themes" value="{{theme}}">--> + <!--</datalist>--> </div> + {{toAddTheme.selected}} <p ng-show="(question.themes.length < 1 && !questionForm.themes.$pristine) || themesError == true" class="help-block">{{ 'question.message.requiredThemes' | translate }}</p> </div> -- 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 feature/8004-new-way-input-themes-keywords in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit 6b45567e0e81e362bb3110d2b55d18f5471815ba Author: Yannick Martel <martel@©odelutin.com> Date: Wed Feb 17 16:39:00 2016 +0100 refs-80 #8004 try new way to input document keywords --- .../src/main/webapp/js/coselmar-controllers.js | 20 ++++++++++++++ .../main/webapp/views/documents/editDocument.html | 32 ++++++++++++++++------ .../main/webapp/views/documents/newdocument.html | 24 ++++++++++++---- 3 files changed, 62 insertions(+), 14 deletions(-) diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 39eeb3f..b4f8a56 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -311,6 +311,7 @@ coselmarControllers.controller("NewDocumentCtrl", ['$scope', '$location', 'notif $scope.upload = {}; $scope.existing = {'types' : [], 'keywords' : []}; $scope.users = []; + $scope.toAddKeywords = {}; documentService.findAllTypes(function(results) { $scope.existing.types = results; @@ -408,6 +409,14 @@ coselmarControllers.controller("NewDocumentCtrl", ['$scope', '$location', 'notif $location.path('/documents'); } + $scope.getExistingKeywords = function(search) { + var newKeywords = $scope.existing.keywords.slice(); + if (search && newKeywords.indexOf(search) === -1) { + newKeywords.unshift(search); + } + return newKeywords; + } + $scope.addKeyword = function(keywordList) { if (keywordList) { var keywords = keywordList.split( /,\s*/ ); @@ -419,6 +428,7 @@ coselmarControllers.controller("NewDocumentCtrl", ['$scope', '$location', 'notif } } $scope.keywordsError = false; + $scope.toAddKeywords = {};// reset field }; $scope.removeKeyword = function(keyword) { @@ -479,6 +489,7 @@ coselmarControllers.controller("DocumentViewCtrl", $scope.upload = {}; $scope.users = []; $scope.hasErrors = false; + $scope.toAddKeywords = {}; $scope.editSession = $routeParams.edit ? $routeParams.edit : false; @@ -615,6 +626,14 @@ coselmarControllers.controller("DocumentViewCtrl", $location.search(""); } + $scope.getExistingKeywords = function(search) { + var newKeywords = $scope.existing.keywords.slice(); + if (search && newKeywords.indexOf(search) === -1) { + newKeywords.unshift(search); + } + return newKeywords; + } + $scope.addKeyword = function(keywordList) { if (keywordList) { var keywords = keywordList.split( /,\s*/ ); @@ -626,6 +645,7 @@ coselmarControllers.controller("DocumentViewCtrl", } } $scope.keywordsError = false; + $scope.toAddKeywords = {};// reset field }; $scope.removeKeyword = function(keyword) { diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 916d246..04143b4 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -200,15 +200,29 @@ × </button> </span> - <input type="text" class="form-control" name="keywords" - placeholder="{{ 'placeholder.addKeyword' | translate }}" - 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> + <!--<input type="text" class="form-control" name="keywords"--> + <!--placeholder="{{ 'placeholder.addKeyword' | translate }}"--> + <!--ng-model="toAddKeyword" list="existingKeywords" />--> + <!--FIXME #CSS Leo--> + <span class="input-zone"> + <ui-select ng-model="toAddKeywords.selected" + theme="bootstrap" reset-search-input="true" ng-change="addKeyword(toAddKeywords.selected)"> + + <ui-select-match placeholder="{{ 'placeholder.addKeyword' | translate }}"> + {{$select.selected}} + </ui-select-match> + + <ui-select-choices repeat="keyword in getExistingKeywords($select.search) | filter : $select.search" > + {{keyword}} + </ui-select-choices> + </ui-select> + </span> + <!--<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> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index eb53280..708201d 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -194,11 +194,25 @@ </button> </span> - <input type="text" class="form-control" name="keywords" - placeholder="{{ 'placeholder.addKeyword' | translate }}" - 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> + <!--<input type="text" class="form-control" name="keywords"--> + <!--placeholder="{{ 'placeholder.addKeyword' | translate }}"--> + <!--ng-model="toAddKeyword" list="existingKeywords" />--> + <!--FIXME #CSS Leo--> + <span class="input-zone"> + <ui-select ng-model="toAddKeywords.selected" + theme="bootstrap" reset-search-input="true" ng-change="addKeyword(toAddKeywords.selected)"> + + <ui-select-match placeholder="{{ 'placeholder.addKeyword' | translate }}"> + {{$select.selected}} + </ui-select-match> + + <ui-select-choices repeat="keyword in getExistingKeywords($select.search) | filter : $select.search" > + {{keyword}} + </ui-select-choices> + </ui-select> + </span> + <!--<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}}"> -- 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 feature/8004-new-way-input-themes-keywords in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit d7206b6cab35337ddb524d524d8777709935f2bb Author: Yannick Martel <martel@©odelutin.com> Date: Mon Feb 29 14:13:55 2016 +0100 fix bad merge --- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index b4f8a56..dfbccf3 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -1277,9 +1277,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam 'links' : []}; $scope.existing = {'types' : [], 'themes' : []}; $scope.topWords = [{text:"coselmar", weight: 10}, {text: "Ifremer", weight: 5}]; - //$scope.cloudColors = ["#2f8389", "#349198", "#39A0A8", "#3eaeb6", "#48b8c0"]; - //FIXME Leo #CSS si tu veux trouver de belles couleurs pour le nuage, c'est là :) - $scope.cloudColors = []; + $scope.cloudColors = ["#2f8389", "#349198", "#39A0A8", "#3eaeb6", "#48b8c0"]; $scope.toAddTheme = {}; // Preload exiting types and themes -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm