space/scon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrading code to use dejaqt

Browse Source 
upgraded dejaqt to use folders
implemented correct folder matching
rearranged pagereply to be a resourcereply (and falling back on it)
This commit is contained in:
Gabor Körber
2014-06-25 17:10:49 +02:00
parent b6cb354446
commit ee289dc39e
7 changed files with 172 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
dj/scon/templates/scon/base.html
View File

@@ -2,7 +2,31 @@
{% block css %}
<style>
<!--
<!--
@media print {
.nobreak { page-break-inside: ''; }
tr { page-break-inside: '';
page-break-after: '';
page-break-before: ''; }
td { page-break-inside: '';
page-break-after: '';
page-break-before: ''; }
ul { page-break-inside: avoid; }
.item { page-break-inside: avoid;
page-break-after: avoid; }
.panel { page-break-inside: avoid;
page-break-after: ''; }
.item-sub { page-break-inside: avoid;
page-break-before: ''; }
.remarks { page-break-inside: avoid; }
.arrowright { page-break-inside: avoid; }
.breakable {
page-break-inside: auto !important;
page-break-before: auto !important;
page-break-after: auto !important;
}
}
.panel {
background-color: #2d2d2d;
color: #fafafa;
@@ -45,25 +69,25 @@
}
.arrowright {
background: #2C2C2C;
font-size: 12px;
position: relative;
width: 1em;
height: 1em;
margin-left: -0.7em;
color: #ffffff;
font-size: 1.1em;
}
.arrowright::before {
bottom: -0.666em;
left: 0.8em;
position: absolute;
border-left: 1.2em solid #2C2C2C;
border-top: 1.2em solid rgba(44, 44, 44, 0);
border-bottom: 1.2em solid rgba(44, 44, 44, 0);
content: "";
}
background: #2C2C2C;
font-size: 12px;
position: relative;
width: 1em;
height: 1em;
margin-left: -0.7em;
color: #ffffff;
font-size: 1.1em;
}
.arrowright::before {
bottom: -0.666em;
left: 0.8em;
position: absolute;
border-left: 1.2em solid #2C2C2C;
border-top: 1.2em solid rgba(44, 44, 44, 0);
border-bottom: 1.2em solid rgba(44, 44, 44, 0);
content: "";
}
.quality-1 {
color: #e3e3e3;
@@ -86,6 +110,33 @@ content: "";
.quality-15 {
color: #d76d39;
}
.row {
width: 800px;
}
.col1 {
width: 240px;
}
.col2 {
width: 20px;
}
.col3 {
width: 240px;
}
.col4 {
width: 240px;
}
.col {
display: inline-table;
}
-->
</style>

66
dj/scon/templates/scon/crafting/overview.html
View File

@@ -3,43 +3,40 @@
{% block context %}
<img src="{{MEDIA_URL}}scon/conflict-logo.png" style="position: absolute; float:left; top: -42px;">
<h1 style="margin-left: 160px;">Crafting Overview</h1>
<table>
<thead>
<tr>
<th>Source</th>
<th style="width: 1em;">&nbsp;</th>
<th>Crafts into</th>
<th>Also used in</th>
</tr>
</thead>
<tbody>
{% for item in items %}
{% if item.primary_recipee %}
<tr>
<td>
<div class="row">
<div class="col1 col">
<div class="panel item">
{% if item.icon %}<img src="{{ MEDIA_URL }}scon/icons/{{ item.icon }}.png">{% endif %} {{ item.name }}
{% if item.sell_price %}<br><i>Sell: {{item.sell_price}} cr</i>{% endif %}
</div>
</td>
{% with item.primary_recipee as recipee %}
<td>
<div class="arrowright">{% if recipee.amount > 1 %}{{ recipee.amount }}{% endif %}</div>
</td>
<td>
<div class="panel item">
{% if recipee.output.icon %}<img src="{{ MEDIA_URL }}scon/icons/{{ recipee.output.icon }}.png">{% endif %} {{ recipee.output.html }}
{% if recipee.output.sell_price %}<br><i>Sell: {{recipee.output.sell_price}} cr</i>{% endif %}
</div>
<div class="panel-light item-sub">
<ul>
{% for ingredient in recipee.ingredients %}
<li>{{ ingredient.amount }} x {{ ingredient.item.html }}</li>
{% endfor %}
</ul>
</div>
</td>
<td>
</div>
{% with item.primary_recipee as recipee %}
<div class="col2 col">&nbsp;
<div class="arrowright nobreak">{% if recipee.amount > 1 %}{{ recipee.amount }}{% endif %}</div>
</div>
<div class="col3 col">
<div class="nobreak">
<div class="panel item nobreak">
{% if recipee.output.icon %}<img src="{{ MEDIA_URL }}scon/icons/{{ recipee.output.icon }}.png">{% endif %} {{ recipee.output.html }}
{% if recipee.output.sell_price %}<br><i>Sell: {{recipee.output.sell_price}} cr</i>{% endif %}
</div>
<div class="panel-light item-sub nobreak">
<ul>
{% for ingredient in recipee.ingredients %}
<li>{{ ingredient.amount }} x {{ ingredient.item.html }}</li>
{% endfor %}
</ul>
</div>
</div>
</div>
<div class="col4 col">
<ul class="remarks">
{% for i1 in item.crafting_used_in %}
{% with i1.crafting.output as ci %}
@@ -52,11 +49,10 @@
{% endwith %}
{% endfor %}
</ul>
</td>
</div>
{% endwith %}
</tr>
</div>
<span class="breakable">&nbsp;</span>
{% endif %}
{% endfor %}
</tbody>
</table>
{% endblock context %}