CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

modify navbar + decompress file password

pull/208/head
Terrtia 2018-06-11 10:21:11 +02:00
parent c64588f60e
commit 8522d50308
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
6 changed files with 95 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/submit_paste.py
View File

@ -226,7 +226,7 @@ if __name__ == "__main__":
#print(files.children) #print(files.children)
else: else:
try: try:
files = unpack(file_full_path.encode(), password) files = unpack(file_full_path.encode(), password=password.encode())
#print(files.children) #print(files.children)
except sflock.exception.IncorrectUsageException: except sflock.exception.IncorrectUsageException:
abord_file_submission(uuid, "Wrong Password") abord_file_submission(uuid, "Wrong Password")

13
var/www/modules/PasteSubmit/templates/PasteSubmit.html
View File

@ -19,6 +19,7 @@
<script src="{{ url_for('static', filename='js/jquery.flot.js') }}"></script> <script src="{{ url_for('static', filename='js/jquery.flot.js') }}"></script>
<script src="{{ url_for('static', filename='js/jquery.flot.pie.js') }}"></script> <script src="{{ url_for('static', filename='js/jquery.flot.pie.js') }}"></script>
<script src="{{ url_for('static', filename='js/jquery.flot.time.js') }}"></script> <script src="{{ url_for('static', filename='js/jquery.flot.time.js') }}"></script>
<script src="/static//js/bootstrap.min.js"></script>
<script src="{{ url_for('static', filename='js/tags.js') }}"></script> <script src="{{ url_for('static', filename='js/tags.js') }}"></script>
</head> </head>
@ -110,13 +111,12 @@
</div> </div>
</form> </form>
<div>
</div>
<!-- /.row --> <!-- /.row -->
</div> </div>
<!-- /#page-wrapper --> <!-- /#page-wrapper -->
</div>
</body> </body>
@ -125,9 +125,6 @@
var ltagsgalaxies var ltagsgalaxies
$(document).ready(function(){ $(document).ready(function(){
activePage = "page-PasteSubmit"
$("#"+activePage).addClass("active");
$.getJSON('/Tags/get_all_tags_taxonomies', $.getJSON('/Tags/get_all_tags_taxonomies',
function(data) { function(data) {
@ -147,6 +144,11 @@
name: 'ltagsgalaxies' name: 'ltagsgalaxies'
}); });
}); });
activePage = "page-PasteSubmit"
$("#"+activePage).addClass("active");
$('#modalsubmit').modal({backdrop: 'static'})
}); });
</script> </script>
@ -195,5 +197,4 @@ function submitPaste(){
{% endfor %} {% endfor %}
</script> </script>
</html> </html>

2
var/www/modules/PasteSubmit/templates/header_PasteSubmit.html
View File

@ -1 +1 @@
<li id='page-PasteSubmit'><a href="{{ url_for('PasteSubmit.PasteSubmit_page') }}"><i class="glyphicon glyphicon-new-window"></i> PasteSubmit </a></li> <li id='page-PasteSubmit'><a href="{{ url_for('PasteSubmit.PasteSubmit_page') }}"><i class="glyphicon glyphicon-new-window white"></i> PasteSubmit </a></li>

2
var/www/modules/dashboard/templates/index.html
View File

@ -36,7 +36,7 @@
<body> <body>
<div id="wrapper"> <div id="wrapper">
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0"> <nav class="navbar navbar-inverse navbar-static-top nav">
{% include 'header.html' %} {% include 'header.html' %}
<!-- /.navbar-top-links --> <!-- /.navbar-top-links -->
<div class="navbar-default sidebar" role="navigation"> <div class="navbar-default sidebar" role="navigation">

10
var/www/templates/header_base.html
View File

@ -1,11 +1,13 @@
<div class="navbar-header"> <div class="navbar-header">
<ul class="nav navbar-nav"> <div class="nav navbar-nav">
<!--dashboard--> <!--dashboard-->
<!--PasteSubmit-->
<!--Tags-->
<!--terms-->
<!--browsepastes-->
<!--trendingcharts--> <!--trendingcharts-->
<!--trendingmodules--> <!--trendingmodules-->
<!--browsepastes-->
<!--sentiment--> <!--sentiment-->
<!--terms-->
<!--insert here--> <!--insert here-->
</ul> </div>
</div> </div>

4
var/www/templates/navbar.html
View File

@ -1,5 +1,5 @@
<div id="wrapper"> <div id="wrapper">
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0"> <div class="navbar navbar-inverse navbar-static-top nav">
{% include 'header.html' %} {% include 'header.html' %}
<!-- /.navbar-top-links --> <!-- /.navbar-top-links -->
<div class="navbar-default sidebar" role="navigation"> <div class="navbar-default sidebar" role="navigation">
@ -15,5 +15,5 @@
<a href="{{ url_for('dashboard.index') }}"><img src="{{ url_for('static', filename='image/AIL.png') }}" /></a> <a href="{{ url_for('dashboard.index') }}"><img src="{{ url_for('static', filename='image/AIL.png') }}" /></a>
</div> </div>
<!-- /.navbar-static-side --> <!-- /.navbar-static-side -->
</nav> </div>
</div> </div>