Commit 6153b346 authored by Paul Hoekman's avatar Paul Hoekman

Improve layout 30

parent f1502db8
......@@ -4,7 +4,6 @@
<head>
<title>{% block title %}{%endblock %} | {{ SITE_NAME }}</title>
{% include 'multiplicity/includes/head.html' %}
<link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.5.0/css/all.css" integrity="sha384-j8y0ITrvFafF4EkV1mPW0BKm6dp3c+J9Fky22Man50Ofxo2wNe5pT1oZejDH9/Dt" crossorigin="anonymous">
{% if select2 %}
<link rel="stylesheet" href="{% static 'ie/css/select2.min.css' %}" />
{% endif %}
......
......@@ -8,13 +8,11 @@
<link href="{% static 'ie/css/themes/type-a/theme-dust.min.css' %}" rel="stylesheet">
<link href="{% static 'ie/premium/icon-sets/icons/line-icons/premium-line-icons.min.css' %}" rel="stylesheet">
<link href="{% static 'ie/premium/icon-sets/icons/solid-icons/premium-solid-icons.min.css' %}" rel="stylesheet">
<link href="{% static 'ie/css/fontawesome-all.min.css' %}" rel="stylesheet">
<link href="{% static 'ie/css/styles.general.css' %}" rel="stylesheet">
<link href="{% static 'ie/css/datatables.css' %}" rel="stylesheet"/>
<link href="{% static 'ie/css/style.css' %}" rel="stylesheet">
<link rel="shortcut icon" type="image/ico" href="{% static 'ie/img/favicon.ico' %}"/>
<!--<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous"> -->
<link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.5.0/css/all.css" integrity="sha384-j8y0ITrvFafF4EkV1mPW0BKm6dp3c+J9Fky22Man50Ofxo2wNe5pT1oZejDH9/Dt" crossorigin="anonymous">
{% if SITE_ID == 1 %}
<link href="{% static 'ie/css/styles.1.css' %}?sep092018" rel="stylesheet">
......
......@@ -27,17 +27,17 @@
<th></th>
<th>Coverage</th>
<th>Smallest scale</th>
<th>Work done</th>
<th></th>
<th>Upload</th>
</tr>
</thead>
{% for item in details.datasettype_set.all %}
<tr>
<td><a href="">{{ item }}</a></td>
<td><a href="">{{ item.name }}</a></td>
<td><div class="data-available" available="4" total="7"></div></td>
<td class="expand"><i class="fas fa-caret-down"></i></td>
<td>1 year</td>
<td>City-wide</td>
{% if False %}
<td>
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;">
......@@ -45,6 +45,9 @@
</div>
</div>
</td>
{% else %}
<td><a href="{% url 'multiplicity:upload_flow_file' info.slug item.id %}"><i class="fa fa-upload"></i> Upload</a></td>
{% endif %}
</tr>
<tr class="extra-info">
<td></td>
......
......@@ -29,7 +29,7 @@
<li class="list-header">Materials</li>
<li{% if menu == "dashboard" %} class="active-sub"{% endif %}><a href="{% url 'multiplicity:city' info.slug %}">
<i class="pli-home"></i>
<i class="fal fa-home fa-fw"></i>
<span class="menu-title">
Overview
</span>
......@@ -38,7 +38,7 @@
<li{% if menu == "materials" %} class="active-sub"{% endif %}>
<a href="./">
<i class="fa fa-blubber"></i>
<i class="far fa-fw fa-exchange fa-fw"></i>
<span class="menu-title">Material flows</span> <i class="arrow"></i>
</a>
......@@ -50,7 +50,7 @@
<li{% if menu == "materials" %} class="active-sub"{% endif %}>
<a href="./">
<i class="fa fa-blubber"></i>
<i class="fal fa-building fa-fw"></i>
<span class="menu-title">Material stocks</span> <i class="arrow"></i>
</a>
......@@ -65,7 +65,7 @@
<li{% if menu == "infrastructure" %} class="active-sub"{% endif %}>
<a href="#">
<i class="pli-factory"></i>
<i class="fal fa-industry fa-fw"></i>
<span class="menu-title">Infrastructure</span>
<i class="arrow"></i>
</a>
......@@ -79,7 +79,7 @@
<li{% if menu == "materials" %} class="active-sub"{% endif %}>
<a href="./">
<i class="fa fa-blubber"></i>
<i class="fal fa-user-friends fa-fw"></i>
<span class="menu-title">Socio-economic</span> <i class="arrow"></i>
</a>
......@@ -91,7 +91,7 @@
<li{% if menu == "materials" %} class="active-sub"{% endif %}>
<a href="./">
<i class="fa fa-blubber"></i>
<i class="fal fa-tree-alt fa-fw"></i>
<span class="menu-title">Environment</span> <i class="arrow"></i>
</a>
......@@ -104,7 +104,7 @@
<li>
<a href="{% url 'multiplicity:map_home' info.slug %}">
<i class="pli-map"></i>
<i class="fal fa-map fa-fw"></i>
<span class="menu-title">Maps</span>
<i class="arrow"></i>
</a>
......@@ -133,9 +133,9 @@
<li{% if menu == "resources" %} class="active-sub"{% endif %}>
<a href="#">
<i class="pli-paper"></i>
<span class="menu-title">Resources</span>
<i class="arrow"></i>
<i class="fal fa-file fa-fw"></i>
<span class="menu-title">Resources</span>
<i class="arrow"></i>
</a>
<ul class="collapse {% if menu == "resources" %}in{%endif %}">
......@@ -149,7 +149,7 @@
</li>
<li{% if menu == "upload" %} class="active-sub"{% endif %}><a href="{% url 'multiplicity:upload' info.slug %}">
<i class="pli-upload"></i>
<i class="fal fa-upload fa-fw"></i>
<span class="menu-title">
Upload data
</span>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment