fixed tabs after merge error
This commit is contained in:
parent
2c41a8dc6a
commit
644ed7d621
@ -14,7 +14,6 @@
|
||||
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
||||
<![endif]-->
|
||||
<link rel="stylesheet" href="/static/css/style.css">
|
||||
<link rel="stylesheet" href="/static/js/jquery-ui-1.12.1.custom/jquery-ui.css">
|
||||
<link rel="stylesheet" href="/static/js/jquery-ui-1.12.1.custom/jquery-ui.js">
|
||||
{% block css %} {% endblock%}
|
||||
</head>
|
||||
|
@ -3,7 +3,7 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css"/>
|
||||
|
||||
<style>
|
||||
#scape_container {
|
||||
zoom: 1;
|
||||
|
@ -677,7 +677,7 @@ def import_csv():
|
||||
year_published = int(row['year_published'])
|
||||
else:
|
||||
year_published = None;
|
||||
book = Book(row['title'], row['file'], cover, row['fileformat'], row['category'],year_published)
|
||||
book = Book(row['title'], row['file'], cover, row['fileformat'], row['category'],year_published, None, None, None, None, None, None)
|
||||
book.scapeX = float(row['scapeX'])
|
||||
book.scapeY = float(row['scapeY'])
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user