Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed logger view ejs templates (#9092) 

* fixed logger view ejs templates

* splittet one template into two seperates

* changelog
This commit is contained in:
Heiko 2019-05-24 13:48:13 +02:00 committed by Michael Hackstein
parent 8d1885d0cb
commit a5f1e0c18f
4 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,6 +1,8 @@
devel
-----
* fixed internal issue #3919: The web UI is now using precompiled ejs templates.
* fixed "collection not found" exception during setup of 3-way smart join queries in the
cluster

1
js/apps/system/_admin/aardvark/APP/frontend/js/templates/loadingTableView.ejs
View File

@ -12,4 +12,3 @@
<td valign="top" class="dataTables_empty">Loading...</td>
</tr>
</tbody>
</script>

68
js/apps/system/_admin/aardvark/APP/frontend/js/templates/loggerView.ejs
View File

@ -1,57 +1,29 @@
<div id="loggerContent" class="logger-content-id innerContent">
<div id="loggerContent" class="logger-content-id innerContent">
<div class="arangoToolbar arangoToolbarTop">
<div class="pull-left">
</div>
<div class="pull-right">
<button id="logTopicSelection" class="button-default filterSelect">Topic <i class="fa fa-caret-down"></i></button>
<button id="logLevelSelection" class="button-default filterSelect">Level <i class="fa fa-caret-down"></i></button>
<button style="display: none" class="button-default filterSelect" id="logFilters">
<i class="fa fa-close"></i>Clear current <a id="filterDesc"></a> filter
</button>
</div>
<div class="arangoToolbar arangoToolbarTop">
<div class="pull-left">
</div>
<div id="noLogEntries" style="display: none">
<span>No suitable log entries found </span>
</div>
<div id="logEntries">
</div>
<div class="actions">
<button id="loadMoreEntries" class="button-success">Load older entries</button>
<div class="pull-right">
<button id="logTopicSelection" class="button-default filterSelect">Topic <i class="fa fa-caret-down"></i></button>
<button id="logLevelSelection" class="button-default filterSelect">Level <i class="fa fa-caret-down"></i></button>
<button style="display: none" class="button-default filterSelect" id="logFilters">
<i class="fa fa-close"></i>Clear current <a id="filterDesc"></a> filter
</button>
</div>
</div>
</script>
<div id="noLogEntries" style="display: none">
<span>No suitable log entries found </span>
</div>
<script id="loggerViewEntries.ejs" type="text/template">
<% _.each(entries, function (entry) { %>
<div class="pure-g" level="<%=entry.status.toLowerCase()%>" topic="<%=entry.topic.toLowerCase()%>">
<div class="pure-u-1-24">
<p class="labels">
<% var lcolor = arangoHelper.statusColors[entry.status.toLowerCase()];%>
<% var tcolor = arangoHelper.alphabetColors[entry.topic.charAt(0).toLowerCase()];%>
<span class="tippy level" title="Level: <%=entry.status%>" style="background: <%=lcolor%>"></span>
<span class="tippy topic" title="Topic: <%=entry.topic%>" style="background: <%=tcolor%>"></span>
</p>
</div>
<div class="pure-u-19-24 desc">
<p class="msg"><%=entry.msg%></p>
</div>
<div class="pure-u-4-24 date">
<p>
<% var x = moment(entry.timestamp, "X").fromNow() %>
<i class="fa fa-clock-o" aria-hidden="true"></i>
<span class="tippy" title="<%=entry.date%>"><%= x %></span>
</p>
</div>
<div class="logBorder"></div>
</div>
<% }); %>
<div id="logEntries">
</div>
<div class="actions">
<button id="loadMoreEntries" class="button-success">Load older entries</button>
</div>
</div>

23
js/apps/system/_admin/aardvark/APP/frontend/js/templates/loggerViewEntries.ejs Normal file
View File

@ -0,0 +1,23 @@
<% _.each(entries, function (entry) { %>
<div class="pure-g" level="<%=entry.status.toLowerCase()%>" topic="<%=entry.topic.toLowerCase()%>">
<div class="pure-u-1-24">
<p class="labels">
<% var lcolor = arangoHelper.statusColors[entry.status.toLowerCase()];%>
<% var tcolor = arangoHelper.alphabetColors[entry.topic.charAt(0).toLowerCase()];%>
<span class="tippy level" title="Level: <%=entry.status%>" style="background: <%=lcolor%>"></span>
<span class="tippy topic" title="Topic: <%=entry.topic%>" style="background: <%=tcolor%>"></span>
</p>
</div>
<div class="pure-u-19-24 desc">
<p class="msg"><%=entry.msg%></p>
</div>
<div class="pure-u-4-24 date">
<p>
<% var x = moment(entry.timestamp, "X").fromNow() %>
<i class="fa fa-clock-o" aria-hidden="true"></i>
<span class="tippy" title="<%=entry.date%>"><%= x %></span>
</p>
</div>
<div class="logBorder"></div>
</div>
<% }); %>