Map page updates, overall footer
This commit is contained in:
parent
f7c0f7d001
commit
bbce8c6f86
@ -153,7 +153,9 @@
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{% else %}
|
||||
<div class="uk-grid-medium uk-grid-match uk-flex-center" uk-grid>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div id="spell-modal" uk-modal>
|
||||
|
BIN
acks/static/PalismaContinent.png
Normal file
BIN
acks/static/PalismaContinent.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.1 MiB |
BIN
acks/static/PalismaWorld.png
Normal file
BIN
acks/static/PalismaWorld.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 511 KiB |
BIN
acks/static/home_image.jpg
Normal file
BIN
acks/static/home_image.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 569 KiB |
@ -1,7 +1,7 @@
|
||||
{% set navigation_bar = [
|
||||
('/', 'index', 'Home'),
|
||||
('/handbook', 'handbook', 'Handbook'),
|
||||
('/worldmap', 'worldmap', 'World Map'),
|
||||
('/worldmap', 'worldmap', 'Maps'),
|
||||
('.header', 'generate', 'Generate'),
|
||||
('.header', 'other', 'Other'),
|
||||
('/npc/spells', 'spells', 'Spells'),
|
||||
@ -42,56 +42,62 @@
|
||||
<div class="uk-navbar-center uk-visible@m">
|
||||
<ul class="uk-navbar-nav">
|
||||
{% for href, id, label in navigation_bar %}
|
||||
<li {% if id == active_page %} class="uk-active" {% endif %}>
|
||||
<li {% if id == active_page %} class="uk-active" {% endif %}>
|
||||
{% if id == 'generate' %}
|
||||
<a href="">{{ label |e }}</a>
|
||||
<div class="uk-navbar-dropdown">
|
||||
<ul class="uk-nav uk-navbar-dropdown-nav">
|
||||
{% for ghref, gid, glabel in generation_bar %}
|
||||
<li>
|
||||
<a href="{{ ghref | e }}" {% if gid == 'treasure' %}target="_blank"{% endif %}>
|
||||
{{ glabel|e }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
<a href="">{{ label |e }}</a>
|
||||
<div class="uk-navbar-dropdown">
|
||||
<ul class="uk-nav uk-navbar-dropdown-nav">
|
||||
{% for ghref, gid, glabel in generation_bar %}
|
||||
<li>
|
||||
<a href="{{ ghref | e }}" {% if gid == 'treasure' %}target="_blank"{% endif %}>
|
||||
{{ glabel|e }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% else %}
|
||||
{% if href != '.header' %}
|
||||
<a href="{{ href|e }}">{{ label|e }}</a>
|
||||
<a href="{{ href|e }}">{{ label|e }}</a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</li>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
<div id="offcanvas-nav" uk-offcanvas="overlay: true">
|
||||
<div class="uk-offcanvas-bar uk-flex uk-flex-column">
|
||||
<ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical">
|
||||
{% for href, id, label in navigation_bar %}
|
||||
{% if href == '.header' %}
|
||||
<li class="uk-nav-header">{{ label|e }}</li>
|
||||
{% if id == 'generate' %}
|
||||
{% for ghref, gid, glabel in generation_bar %}
|
||||
<div id="offcanvas-nav" uk-offcanvas="overlay: true">
|
||||
<div class="uk-offcanvas-bar uk-flex uk-flex-column">
|
||||
<ul class="uk-nav uk-nav-primary uk-nav-center uk-margin-auto-vertical">
|
||||
{% for href, id, label in navigation_bar %}
|
||||
{% if href == '.header' %}
|
||||
<li class="uk-nav-header">{{ label|e }}</li>
|
||||
{% if id == 'generate' %}
|
||||
{% for ghref, gid, glabel in generation_bar %}
|
||||
<li {% if gid == active_page %} class="uk-active" {% endif %}>
|
||||
<a href="{{ ghref | e }}" {% if gid == 'treasure' %}target="_blank"{% endif %}>
|
||||
{{ glabel|e }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% else %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<li {% if id == active_page %} class="uk-active" {% endif %}>
|
||||
<a href="{{ href|e }}">{{ label|e }}</a>
|
||||
<a href="{{ href|e }}">{{ label|e }}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-container">
|
||||
{% block content %}{% endblock %}
|
||||
<div class="uk-container uk-margin-medium-top">
|
||||
{% block content %}{% endblock %}
|
||||
</div>
|
||||
<footer class="uk-flex uk-flex-top uk-flex-center uk-margin-small uk-margin-medium-top">
|
||||
<div class="uk-text-center uk-text-small">
|
||||
Made by <a href="https://binaryatrocity.name">binaryatrocity</a>.
|
||||
ACKS & related © <a href="http://www.autarch.co/">Autarch</a>.
|
||||
</div>
|
||||
</footer>
|
||||
</body>
|
||||
</html>
|
||||
|
@ -6,6 +6,26 @@
|
||||
<div class="uk-flex uk-flex-center uk-margin-bottom uk-margin-top">
|
||||
<h1 class="uk-text-center"><strong>Adventurer Conqueror King</strong>Home</h1>
|
||||
</div>
|
||||
<div class="uk-flex uk-flex-bottom uk-flex-center uk-margin-medium uk-margin-large-bottom">
|
||||
<div class="uk-container uk-container-small">
|
||||
<p>
|
||||
Welcome to the Adventurer Conqueror King toolkit for the Legends of Palisma campaign.
|
||||
You've had a long journey... three months aboard a ship to reach the new continent,
|
||||
many thousands of miles across the Immortal Sea from Branborne and any sense of familiarity.
|
||||
</p>
|
||||
<p>
|
||||
What adventures await you in an age when empires totter on the brink of war, and terrible
|
||||
monsters tear at the fragile borderlands of men; when decaying cities teem with chaos and
|
||||
corruption, where nubile maidens are sacrificed to chthonic cults and nobles live in
|
||||
decadent pleasure on the toil of slaves; when heroes, wizards, and rogues risk everything
|
||||
in pursuit of glory, fortune, and power. These are days when adventurers can become
|
||||
conquerors… and conquerors can become kings!
|
||||
</p>
|
||||
|
||||
<hr class="uk-divider-icon uk-margin-large" />
|
||||
<img src="{{ url_for('static', filename='home_image.jpg') }}" />
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block head %}
|
||||
|
@ -1,14 +1,23 @@
|
||||
{% extends "base.html" %}
|
||||
{% set active_page = "worldmap" %}
|
||||
|
||||
{% block title %}World Map{% endblock %}
|
||||
{% block title %}Maps{% endblock %}
|
||||
{% block content %}
|
||||
<div class="uk-flex uk-flex-center uk-margin-bottom uk-margin-top">
|
||||
<h1 class="uk-text-center"><strong>Adventurer Conqueror King</strong>World Map</h1>
|
||||
<h1 class="uk-text-center"><strong>Adventurer Conqueror King</strong>Maps</h1>
|
||||
</div>
|
||||
<br/>
|
||||
<div>
|
||||
<img id="worldmap-img" src="https://acks.atr0phy.net/static/WorldMap.png"/>
|
||||
<div class="uk-container uk-container-small">
|
||||
<ul class="uk-subnav uk-subnav-pill uk-flex uk-flex-center" uk-switcher>
|
||||
<li><a href="#">World Map</a></li>
|
||||
<li><a href="#">Continent Overview</a></li>
|
||||
<li><a href="#">Continent Full</a></li>
|
||||
</ul>
|
||||
<ul class="uk-switcher uk-margin" uk-lightbox>
|
||||
<li><a href="{{ url_for('static', filename='WorldMap.png') }}"><img src="{{ url_for('static', filename='WorldMap.png') }}"/></a></li>
|
||||
<li><a href="{{ url_for('static', filename='PalismaWorld.png') }}"><img src="{{ url_for('static', filename='PalismaWorld.png') }}"/></a></li>
|
||||
<li><a href="{{ url_for('static', filename='PalismaContinent.png') }}"><img src="{{ url_for('static', filename='PalismaContinent.png') }}"/></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
@ -1,5 +1,3 @@
|
||||
import requests
|
||||
from lxml import html
|
||||
from flask import current_app, Blueprint, render_template, url_for, redirect
|
||||
|
||||
|
||||
@ -17,15 +15,15 @@ def handbook():
|
||||
def worldmap():
|
||||
return render_template('worldmap.html')
|
||||
|
||||
@default_views.route('/treasure')
|
||||
@default_views.route('/treasure/<string:treasure_type>')
|
||||
#@default_views.route('/treasure')
|
||||
#@default_views.route('/treasure/<string:treasure_type>')
|
||||
def treasure(treasure_type=None):
|
||||
# import requests
|
||||
# from lxml import html
|
||||
# Unused, we can't tap into Autarch's generator, so just link to a new tab
|
||||
# in navigation bar now
|
||||
'''
|
||||
if treasure_type is not None:
|
||||
with requests.Session() as s:
|
||||
import pudb;pu.db
|
||||
# First grab the page to pull a fresh form_build_id
|
||||
treasure_page = s.get('http://autarch.co/treasure')
|
||||
dom_tree = html.fromstring(treasure_page.content)
|
||||
@ -42,5 +40,4 @@ def treasure(treasure_type=None):
|
||||
print("TG Response: {}, Payload: {}".format(response.text, payload))
|
||||
generated_treasure = response.json()[1]["data"].replace('class="form-textarea"', 'class="uk-textarea"')
|
||||
return render_template('treasure.html', generated_treasure=generated_treasure, treasure_type=treasure_type)
|
||||
'''
|
||||
return render_template('treasure.html')
|
||||
|
Loading…
x
Reference in New Issue
Block a user