diff --git a/vipra-ui/app/html/directives/entity-menu.html b/vipra-ui/app/html/directives/entity-menu.html index bd253dcdcf664d891f130c759964fc27cbf16cac..c90b918be016a2a0b17e8a8a21b54d8ba4dafbc0 100644 --- a/vipra-ui/app/html/directives/entity-menu.html +++ b/vipra-ui/app/html/directives/entity-menu.html @@ -3,6 +3,8 @@ <i class="fa fa-caret-down"></i> </a> <ul class="dropdown-menu" ng-class="{'dropdown-menu-right':dropdownRight}"> + <li><a ui-sref="entities.show({id:entity.id})">Show</a></li> + <li role="separator" class="divider"></li> <li><a ui-sref="entities.show.articles({id:entity.id})">Articles</a></li> <li role="separator" class="divider"></li> <li><a ng-href="{{entity.url}}" target="_blank"><span class="dbpedia-logo"></span> DBPedia</a></li> diff --git a/vipra-ui/app/html/directives/topic-menu.html b/vipra-ui/app/html/directives/topic-menu.html index 024975240650e681dbff49b8279d5ae6e580d53a..7cd58bbc48c8fc09a18a00d903440da12070e3ff 100644 --- a/vipra-ui/app/html/directives/topic-menu.html +++ b/vipra-ui/app/html/directives/topic-menu.html @@ -3,9 +3,10 @@ <i class="fa fa-caret-down"></i> </a> <ul class="dropdown-menu" ng-class="{'dropdown-menu-right':dropdownRight}"> + <li><a ui-sref="topics.show({id:topic.id})">Show</a></li> + <li><a ng-click="renameTopic()">Rename...</a></li> + <li role="separator" class="divider"></li> <li><a ui-sref="network({type:'topics',id:topic.id})">Network</a></li> <li><a ui-sref="topics.show.articles({id:topic.id})">Articles</a></li> - <li role="separator" class="divider"></li> - <li><a ng-click="renameTopic()">Rename...</a></li> </ul> </div> diff --git a/vipra-ui/app/html/directives/word-evolution.html b/vipra-ui/app/html/directives/word-evolution.html index 22939158ec1a00faa332f84f71ca9b0ec784c941..3ec5b9fb205eeb3bfe42d995db915d06b7a9b2c8 100644 --- a/vipra-ui/app/html/directives/word-evolution.html +++ b/vipra-ui/app/html/directives/word-evolution.html @@ -18,7 +18,7 @@ <div class="panel-body"> <div class="topic-list sidebar"> <ul class="list-unstyled item-choice"> - <li ng-repeat="word in topic.words"> + <li ng-repeat="word in topic.words" ng-mouseenter="highlightSeries(word.id, true)" ng-mouseleave="highlightSeries(word.id, false)"> <div class="checkbox checkbox-condensed" ng-class="{selected:word.selected}"> <input tabindex="0" type="checkbox" ng-model="word.selected" ng-attr-id="{{::word.id}}" ng-change="redrawWordEvolutionChart()"> <label class="check" ng-attr-for="{{::word.id}}"> diff --git a/vipra-ui/app/html/directives/word-menu.html b/vipra-ui/app/html/directives/word-menu.html index 103531b1bdf35424d72d8e2f229ec0b716aac5f8..69fc83b46bc1909a6280eefaf8266becca3c2f7e 100644 --- a/vipra-ui/app/html/directives/word-menu.html +++ b/vipra-ui/app/html/directives/word-menu.html @@ -3,6 +3,8 @@ <i class="fa fa-caret-down"></i> </a> <ul class="dropdown-menu" ng-class="{'dropdown-menu-right':dropdownRight}"> + <li><a ui-sref="words.show({id:word.id})">Show</a></li> + <li role="separator" class="divider"></li> <li><a ui-sref="words.show.topics({id:word.id})">Topics</a></li> <li><a ui-sref="words.show.articles({id:word.id})">Articles</a></li> </ul> diff --git a/vipra-ui/app/js/controllers.js b/vipra-ui/app/js/controllers.js index 6977ff318dc1e0ae981b3ddd852058e72113c60a..0303126f12d89eb96861f27871bdbf5cdc8c587a 100644 --- a/vipra-ui/app/js/controllers.js +++ b/vipra-ui/app/js/controllers.js @@ -1432,6 +1432,7 @@ probs.push([new Date($scope.topic.sequences[j].window.startDate).getTime(), prob]); } evolutions.push({ + id: word.id, name: word.id, color: word.color, data: probs @@ -1443,6 +1444,25 @@ $scope.wordsSelected = evolutions.length; }; + $scope.highlightSeries = function(id, toggle) { + if (!$scope.wordsSelected) return; + var highcharts = $('#' + $scope.chartId).highcharts(); + if (!highcharts) return; + var series = highcharts.get(id); + if (!series) return; + + if (toggle) { + series.onMouseOver(); + series.group.zIndexOrig = series.group.zIndex; + series.group.zIndexSetter(9999, 'zIndex'); + series.graph.attr('stroke', '#000000').attr('stroke-dasharray', '5,5'); + } else { + series.onMouseOut(); + series.group.zIndexSetter(series.group.zIndexOrig, 'zIndex'); + series.graph.attr('stroke', series.color).attr('stroke-dasharray', ''); + } + }; + $scope.$watchGroup(['wordSeqstyle', 'wordChartstyle', 'topic'], $scope.redrawWordEvolutionChart); $scope.$watch('topic', function() {