From cfc59653488593e59223775edd06d27fa0c3cdbf Mon Sep 17 00:00:00 2001
From: Eike Cochu <eike@cochu.com>
Date: Fri, 24 Jun 2016 14:00:40 +0200
Subject: [PATCH] fixed topimodel popover
---
.../app/html/partials/topicmodel-popover.html | 32 +++++++++----------
vipra-ui/app/index.html | 2 +-
vipra-ui/app/less/app.less | 2 +-
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/vipra-ui/app/html/partials/topicmodel-popover.html b/vipra-ui/app/html/partials/topicmodel-popover.html
index cbdc8737..eef91754 100644
--- a/vipra-ui/app/html/partials/topicmodel-popover.html
+++ b/vipra-ui/app/html/partials/topicmodel-popover.html
@@ -1,34 +1,34 @@
<table class="popover-table">
<tr>
- <td>Article count</td>
- <td ng-bind="rootModels.topicModel.articleCount"></td>
+ <th>Article count</th>
+ <td ng-bind="rootModels.topicModel.articleCount || 0"></td>
</tr>
<tr>
- <td>Topic count</td>
- <td ng-bind="rootModels.topicModel.topicCount"></td>
+ <th>Topic count</th>
+ <td ng-bind="rootModels.topicModel.topicCount || 0"></td>
</tr>
<tr>
- <td>Entity count</td>
- <td ng-bind="rootModels.topicModel.entityCount"></td>
+ <th>Entity count</th>
+ <td ng-bind="rootModels.topicModel.entityCount || 0"></td>
</tr>
<tr>
- <td>Word count</td>
- <td ng-bind="rootModels.topicModel.wordCount"></td>
+ <th>Word count</th>
+ <td ng-bind="rootModels.topicModel.wordCount || 0"></td>
</tr>
<tr>
- <td>Window count</td>
- <td ng-bind="rootModels.topicModel.windowCount"></td>
+ <th>Window count</th>
+ <td ng-bind="rootModels.topicModel.windowCount || 0"></td>
</tr>
<tr>
- <td>Last generated</td>
- <td ng-bind-template="{{$root.Vipra.formatDateTime(rootModels.topicModel.lastGenerated)}}"></td>
+ <th>Last generated</th>
+ <td ng-bind-template="{{$root.Vipra.formatDateTime(rootModels.topicModel.lastGenerated) || 'never'}}"></td>
</tr>
<tr>
- <td>Last indexed</td>
- <td ng-bind-template="{{$root.Vipra.formatDateTime(rootModels.topicModel.lastIndexed)}}"></td>
+ <th>Last indexed</th>
+ <td ng-bind-template="{{$root.Vipra.formatDateTime(rootModels.topicModel.lastIndexed) || 'never'}}"></td>
</tr>
<tr>
- <td>Last modified</td>
- <td ng-bind-template="{{$root.Vipra.formatDateTime(rootModels.topicModel.modified)}}"></td>
+ <th>Last modified</th>
+ <td ng-bind-template="{{$root.Vipra.formatDateTime(rootModels.topicModel.modified) || 'never'}}"></td>
</tr>
</table>
\ No newline at end of file
diff --git a/vipra-ui/app/index.html b/vipra-ui/app/index.html
index 1947dd26..a303f682 100644
--- a/vipra-ui/app/index.html
+++ b/vipra-ui/app/index.html
@@ -54,7 +54,7 @@
</form>
<ul class="nav navbar-nav navbar-right">
<li ng-class="{'text-italic active':rootModels.topicModel}" bs-popover popover-template="partials/topicmodel-popover.html" popover-delay="500" popover-placement="bottom">
- <a class="active-topicmodel" tabindex="0" ng-click="chooseTopicModel()" ng-bind-template="{{rootModels.topicModel ? rootModels.topicModel.name : 'Models'}}" ng-attr-title="{{rootModels.topicModel.name}} {{rootModels.topicModel.modelConfig.description}}" analytics-on analytics-event="Menu Item (Topic Models)" analytics-category="Menu actions"></a>
+ <a class="active-topicmodel" tabindex="0" ng-click="chooseTopicModel()" ng-bind-template="{{rootModels.topicModel ? rootModels.topicModel.name : 'Models'}}" analytics-on analytics-event="Menu Item (Topic Models)" analytics-category="Menu actions"></a>
</li>
<li ng-class="{disabled:!rootModels.helpEnabled}" ng-attr-title="{{ rootModels.helpEnabled ? 'Help' : 'No help available' }}">
<a ng-click="showHelp()">
diff --git a/vipra-ui/app/less/app.less b/vipra-ui/app/less/app.less
index 2a9aacec..bca7d311 100644
--- a/vipra-ui/app/less/app.less
+++ b/vipra-ui/app/less/app.less
@@ -1086,7 +1086,7 @@ entity-menu {
}
.popover-table {
- td + td {
+ th + td {
padding-left: 5px;
}
}
--
GitLab