github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github/dev' into dev

pull/1068/head
ibuler 2018-03-14 18:36:22 +08:00
parent 93895b6b92 4d7fbcc49b
commit 7e087ad5c6
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/static/css/jumpserver.css
View File

@ -432,4 +432,10 @@ div.dataTables_wrapper div.dataTables_filter {
font-size: 12px !important; font-size: 12px !important;
} }
.ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

11
apps/templates/index.html
View File

@ -125,9 +125,9 @@
{% for data in week_asset_hot_ten %} {% for data in week_asset_hot_ten %}
<div class="timeline-item"> <div class="timeline-item">
<div class="row"> <div class="row">
<div class="col-xs-5 date"> <div class="col-xs-5 date ellipsis">
<i class="fa fa-info-circle"></i> <i class="fa fa-info-circle"></i>
<strong>{{ data.asset }}</strong> <strong data-toggle="tooltip" title="{{ data.asset }}">{{ data.asset }}</strong>
<br/> <br/>
<small class="text-navy">{{ data.total }}次</small> <small class="text-navy">{{ data.total }}次</small>
</div> </div>
@ -213,9 +213,9 @@
{% for data in week_user_hot_ten %} {% for data in week_user_hot_ten %}
<div class="timeline-item"> <div class="timeline-item">
<div class="row"> <div class="row">
<div class="col-xs-5 date"> <div class="col-xs-5 date ellipsis">
<i class="fa fa-info-circle"></i> <i class="fa fa-info-circle"></i>
<strong>{{ data.user }}</strong> <strong data-toggle="tooltip" title="{{ data.user }}">{{ data.user }}</strong>
<br/> <br/>
<small class="text-navy">{{ data.total }}次</small> <small class="text-navy">{{ data.total }}次</small>
</div> </div>
@ -245,7 +245,8 @@ $(document).ready(function(){
$('#show').click(function(){ $('#show').click(function(){
$('#show').css('display', 'none'); $('#show').css('display', 'none');
$('#more').css('display', 'block'); $('#more').css('display', 'block');
}) });
$("[data-toggle='tooltip']").tooltip();
}); });
require.config({ require.config({
paths: { paths: {