change erasure report and public link html templates

This commit is contained in:
jordi.nadeu 2019-10-22 15:54:39 +02:00
parent 83d9d12afb
commit b99a332cd8
6 changed files with 93 additions and 53 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

View File

@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="297mm"
height="210mm"
viewBox="0 0 297 210"
version="1.1"
id="svg8"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="logo-v4.svg">
<defs
id="defs2"/>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.7"
inkscape:cx="393.78942"
inkscape:cy="411.36487"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1600"
inkscape:window-height="877"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"/>
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-87)">
<rect
style="fill:#24b7a4;fill-opacity:1;stroke-width:0.31316903"
id="rect3725"
width="219.98215"
height="146.65475"
x="32.127975"
y="115.94943"/>
<flowRoot
xml:space="preserve"
id="flowRoot3713"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
transform="matrix(0.26458333,0,0,0.26458333,44.60119,98.339286)"
inkscape:export-xdpi="31.933075"
inkscape:export-ydpi="31.933075"><flowRegion
id="flowRegion3715"><rect
id="rect3717"
width="860"
height="342.85715"
x="134.28572"
y="236.55795" /></flowRegion>
<flowPara
id="flowPara3719"
style="font-size:144px;-inkscape-font-specification:Calibri;font-family:Calibri;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"><flowSpan
style="fill:#ffffff"
id="flowSpan3721">USO</flowSpan>
<flowSpan
style="fill:#993366;fill-opacity:1"
id="flowSpan3723">dy</flowSpan></flowPara></flowRoot>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -10,30 +10,17 @@
crossorigin="anonymous">
<script src="https://use.fontawesome.com/7553aecc27.js"></script>
<title>Devicehub | {{ device.__format__('t') }}</title>
<style>
/*Sticky footer*/
html {
position: relative;
min-height: 100%;
}
body {
margin-bottom: 60px; /* Margin bottom by footer height */
}
.footer {
position: absolute;
bottom: 0;
width: 100%;
height: 6em;
}
</style>
</head>
<body>
<nav class="navbar navbar-default" style="background-color: gainsboro; margin: 0 !important">
<div class="container-fluid text-center">
<h1><em>LoT Bcn</em> — Library of Things Barcelona</h1>
<div class="container-fluid">
<a href="https://www.usody.com/" target="_blank">
<img alt="Brand"
class="center-block"
style="height: 4em; padding-bottom: 0.1em"
src="{{ url_for('Device.static', filename='usody-logo-v4.svg') }}">
</a>
</div>
</nav>
<div class="container-fluid">
@ -46,23 +33,8 @@
</div>
<div class="row">
<div class="col-md-3">
{% if device.image %}
<a href="{{ device.image.to_text() }}" class="thumbnail" target="_blank">
<img src="{{ device.image.to_text() }}"
alt="Cykel.JPG">
</a>
{% endif %}
</div>
<div class="col-md-6">
{% if device.trading == states.Trading.Available %}
<div class="alert alert-success">
<i class="fa fa-check-circle"></i> {{ device.trading }}
</div>
{% else %}
<div class="alert alert-warning">
<i class="fa fa-exclamation-circle"></i> Not available.
</div>
{% endif %}
<ul>
{% for key, value in device.physical_properties.items() %}
<li>{{ key }}: {{ value }}
@ -218,22 +190,5 @@
</div>
</div>
</div>
<footer class="container-fluid footer">
<div class="row">
<div class="col-md-4">
Un projecte de:<br>
<img style="height: 4em" src="{{ url_for('Device.static', filename='rezero.logo.png') }}">
<img style="height: 3em" src="{{ url_for('Device.static', filename='nusos.logo.png') }}">
</div>
<div class="col-md-4">
Amb la col.laboració de:<br>
<img style="height: 4em" src="{{ url_for('Device.static', filename='ereuse-logo.svg') }}">
</div>
<div class="col-md-4">
Activitat subvencionada per:<br>
<img style="height: 4em" src="{{ url_for('Device.static', filename='amb.logo.jpg') }}">
</div>
</div>
</footer>
</body>
</html>

View File

@ -1,7 +1,7 @@
{% extends "documents/layout.html" %}
{% block body %}
<div>
<h2>Resumé</h2>
<h2>Summary</h2>
<table class="table table-bordered">
<thead>
<tr>