theluyuan/shynet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ellipsis in multiple tables (#152)

Browse Source
This commit is contained in:
Casper Verswijvelt 2021-06-15 21:29:59 +02:00 committed by GitHub
parent 473ad93081
commit 0153b1f847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shynet/dashboard/templates/dashboard/pages/service.html
View File

@ -184,7 +184,7 @@
<td class="flex items-center truncate w-full max-w-0 relative" title="{{os.os|default:'Unknown'}}"> <td class="flex items-center truncate w-full max-w-0 relative" title="{{os.os|default:'Unknown'}}">
{% include 'dashboard/includes/bar.html' with count=os.count max=stats.operating_systems.0.count total=stats.session_count %} {% include 'dashboard/includes/bar.html' with count=os.count max=stats.operating_systems.0.count total=stats.session_count %}
<div class="relative flex items-center"> <div class="relative flex items-center">
{{os.os|iconify}}<span>{{os.os|default:"Unknown"}}</span> {{os.os|iconify}}<span class="truncate">{{os.os|default:"Unknown"}}</span>
</div> </div>
</td> </td>
<td> <td>
@ -219,7 +219,7 @@
{% include 'dashboard/includes/bar.html' with count=browser.count max=stats.browsers.0.count total=stats.session_count %} {% include 'dashboard/includes/bar.html' with count=browser.count max=stats.browsers.0.count total=stats.session_count %}
</div> </div>
<div class="relative flex items-center"> <div class="relative flex items-center">
{{browser.browser|iconify}}<span>{{browser.browser|default:"Unknown"}}</span> {{browser.browser|iconify}}<span class="truncate">{{browser.browser|default:"Unknown"}}</span>
</div> </div>
</td> </td>
<td> <td>
@ -253,7 +253,7 @@
<td class="truncate w-full max-w-0 relative"> <td class="truncate w-full max-w-0 relative">
{% include 'dashboard/includes/bar.html' with count=device_type.count max=stats.device_types.0.count total=stats.session_count %} {% include 'dashboard/includes/bar.html' with count=device_type.count max=stats.device_types.0.count total=stats.session_count %}
<div class="relative flex items-center"> <div class="relative flex items-center">
{{device_type.device_type|default:"Unknown"|title}} <span class="truncate">{{device_type.device_type|default:"Unknown"|title}}</span>
</div> </div>
</td> </td>
<td> <td>
@ -274,7 +274,7 @@
</table> </table>
</div> </div>
</div> </div>
<div class="card ~neutral !low py-2"> <div class="card ~neutral !low py-2 overflow-auto">
{% include 'dashboard/includes/session_list.html' %} {% include 'dashboard/includes/session_list.html' %}
<hr class="sep h-8 md:h-12"> <hr class="sep h-8 md:h-12">
<a href="{% contextual_url 'dashboard:service_session_list' service.uuid %}" class="button ~neutral w-auto mb-2">View more <a href="{% contextual_url 'dashboard:service_session_list' service.uuid %}" class="button ~neutral w-auto mb-2">View more

2
shynet/dashboard/templatetags/helpers.py
View File

@ -189,7 +189,7 @@ def urldisplay(url):
if url.startswith("http"): if url.startswith("http"):
display_url = url.replace("http://", "").replace("https://", "") display_url = url.replace("http://", "").replace("https://", "")
return SafeString( return SafeString(
f"<a href='{url}' title='{url}' rel='nofollow' class='flex items-center mr-1'>{iconify(url)}<span class='truncate'>{escape(display_url)}</span></a>" f"<a href='{url}' title='{url}' rel='nofollow' class='flex items-center mr-1 truncate'>{iconify(url)}<span class='truncate'>{escape(display_url)}</span></a>"
) )
else: else:
return url return url