From cca69def7196749e8db0d0e5da6843601c6d8f4f Mon Sep 17 00:00:00 2001 From: Terrtia Date: Wed, 15 May 2019 17:23:58 +0200 Subject: [PATCH] chg: [decoded items] bootstrap 4 migration --- .../modules/hashDecoded/Flask_hashDecoded.py | 10 +- .../hashDecoded/templates/hashDecoded.html | 493 +++++++++--------- .../hashDecoded/templates/showHash.html | 322 ++++++------ var/www/templates/decoded/menu_sidebar.html | 30 ++ var/www/templates/nav_bar.html | 2 +- 5 files changed, 449 insertions(+), 408 deletions(-) create mode 100644 var/www/templates/decoded/menu_sidebar.html diff --git a/var/www/modules/hashDecoded/Flask_hashDecoded.py b/var/www/modules/hashDecoded/Flask_hashDecoded.py index 8a7945d2..1c5f8e89 100644 --- a/var/www/modules/hashDecoded/Flask_hashDecoded.py +++ b/var/www/modules/hashDecoded/Flask_hashDecoded.py @@ -66,13 +66,13 @@ def get_file_icon(estimated_type): if file_type == 'application': file_icon = 'fa-file ' elif file_type == 'audio': - file_icon = 'fa-file-video-o ' + file_icon = 'fa-file-audio ' elif file_type == 'image': - file_icon = 'fa-file-image-o' + file_icon = 'fa-file-image' elif file_type == 'text': - file_icon = 'fa-file-text-o' + file_icon = 'fa-file-alt' else: - file_icon = 'fa-file-o' + file_icon = 'fa-sticky-note' return file_icon @@ -88,7 +88,7 @@ def get_file_icon_text(estimated_type): elif file_type == 'text': file_icon_text = '\uf15c' else: - file_icon_text = '\uf15b' + file_icon_text = '\uf249' return file_icon_text diff --git a/var/www/modules/hashDecoded/templates/hashDecoded.html b/var/www/modules/hashDecoded/templates/hashDecoded.html index 19ddcdaf..bf0a12bf 100644 --- a/var/www/modules/hashDecoded/templates/hashDecoded.html +++ b/var/www/modules/hashDecoded/templates/hashDecoded.html @@ -1,157 +1,147 @@ - - - + + Decoded - AIL + - HashesDecoded - AIL + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - {% include 'navbar.html' %} + + + + + {% include 'nav_bar.html' %} + +
+
+ + {% include 'decoded/menu_sidebar.html' %} + +
-
-
-

Hashed Files

-
- -
-
- - -
-
-
-
-
- -
-
-
- Select a date range : -
-
- - -
-
- - -
- Encoding : - - File Type : - -
- -
- - -
-
-
-
-
-
-
+
+
- - {% if l_64|length != 0 %} - {% if date_from|string == date_to|string %} -

{{ date_from }} Hashed files:

- {% else %} -

{{ date_from }} to {{ date_to }} Hashed files:

- {% endif %} - - +
+ +
+
+
Select a date range :
+ +
+
+ +
+
+
+ +
+
Encoding :
+ +
File Type :
+ +
+ + +
+ + +
+
+ +
+
+
+
+
+ + + {% if l_64|length != 0 %} + {% if date_from|string == date_to|string %} +

{{ date_from }} Decoded files:

+ {% else %} +

{{ date_from }} to {{ date_to }} Decoded files:

+ {% endif %} +
+ @@ -162,121 +152,136 @@ - - - {% for b64 in l_64 %} - - - - - - - - + {% for b64 in l_64 %} + + + + + + + + - - - {% endfor %} - -
estimated type hashVirus Total Sparkline
  {{ b64[1] }}{{ b64[2] }}{{ b64[5] }}{{ b64[6] }}{{ b64[3] }}{{ b64[4] }} - {% if vt_enabled %} - {% if not b64[7] %} - - - - {% else %} - VT Report - {% endif %} -
  {{ b64[1] }}{{ b64[2] }}{{ b64[5] }}{{ b64[6] }}{{ b64[3] }}{{ b64[4] }} + {% if vt_enabled %} + {% if not b64[7] %} + + - {% else %} - Virus Total submission is disabled - {% endif %} + + {% else %} +  VT Report + {% endif %} + + {% else %} + Virus Total submission is disabled + {% endif %} - -
- {% else %} - {% if show_decoded_files %} - {% if date_from|string == date_to|string %} -

{{ date_from }}, No Hashes

- {% else %} -

{{ date_from }} to {{ date_to }}, No Hashes

- {% endif %} + + + + {% endfor %} + + + {% else %} + {% if show_decoded_files %} + {% if date_from|string == date_to|string %} +

{{ date_from }}, No Hashes

+ {% else %} +

{{ date_from }} to {{ date_to }}, No Hashes

{% endif %} {% endif %} -
- + {% endif %}
- - - chart.onResize(); - $(window).on("resize", function() { - chart.onResize(); - }); - }); - - + diff --git a/var/www/modules/hashDecoded/templates/showHash.html b/var/www/modules/hashDecoded/templates/showHash.html index b0bcaa50..45faf5c8 100644 --- a/var/www/modules/hashDecoded/templates/showHash.html +++ b/var/www/modules/hashDecoded/templates/showHash.html @@ -3,27 +3,20 @@ - Hash Information - AIL + - - - - - + + + - - - - - - - - - + + + +