mgoetz/basta-server
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jinja layout border

Browse Source
This commit is contained in:
Götz 2017-09-25 15:38:08 +02:00
parent 60a7043873
commit 51e5c525ec
4 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
html/food.html
View File

@ -11,10 +11,9 @@
<body> <body>
<h1 class="text-center">Food for Students</h1> <h1 class="text-center">Food for Students</h1>
<p class="text-right">Last execute: Monday, 25.09.2017</p>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col m-2 p-3 mb-2 bg-info text-white rounded"> <div class="col m-2 p-3 border border-info rounded">
<h2>Cafeteria Erba-Insel</h2> <h2>Cafeteria Erba-Insel</h2>
<p><span>24.07.</span><span>Rinderhacksteak an Cognacsoße und Spätzle</span></p> <p><span>24.07.</span><span>Rinderhacksteak an Cognacsoße und Spätzle</span></p>
@ -26,7 +25,7 @@
<p><span>27.07.</span><span>Kaiserschmarrn mit Apfelmus</span></p> <p><span>27.07.</span><span>Kaiserschmarrn mit Apfelmus</span></p>
</div> </div>
<div class="col m-2 p-3 mb-2 bg-info text-white rounded"> <div class="col m-2 p-3 border border-info rounded">
<h2>Cafeteria Markusplatz</h2> <h2>Cafeteria Markusplatz</h2>
<p><span>24.07.</span><span>Vegetarisches Chili sin Carne</span></p> <p><span>24.07.</span><span>Vegetarisches Chili sin Carne</span></p>
@ -40,7 +39,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col m-2 m-1 p-3 mb-2 bg-info text-white rounded"> <div class="col m-2 p-3 border border-info rounded">
<h2>Speiseplan für Austraße Bamberg</h2> <h2>Speiseplan für Austraße Bamberg</h2>
<h3>Montag 18.09.</h3> <h3>Montag 18.09.</h3>
@ -93,7 +92,7 @@
</div> </div>
<div class="col m-2 p-3 mb-2 bg-info text-white rounded"> <div class="col m-2 p-3 border border-info rounded">
<h2>Speiseplan für Feldkirchenstraße Bamberg</h2> <h2>Speiseplan für Feldkirchenstraße Bamberg</h2>
<h3>Montag 18.09.</h3> <h3>Montag 18.09.</h3>
@ -154,7 +153,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col m-2 p-3 mb-2 bg-info text-white rounded"> <div class="col m-2 p-3 border border-info rounded">
<h2>Feki.de Happy Hour Guide for Food</h2> <h2>Feki.de Happy Hour Guide for Food</h2>
<h3>Sunday, 24.09.2017</h3> <h3>Sunday, 24.09.2017</h3>
@ -163,6 +162,7 @@
</div> </div>
</div> </div>
</div> </div>
<p class="text-right">Last execute: Monday, 25.09.2017</p>
</body> </body>
</html> </html>

18
ofu-food/.idea/workspace.xml generated
View File

@ -15,7 +15,7 @@
<SUITE FILE_PATH="coverage/ofu_food$fekide_happyhour_page_parser.coverage" NAME="fekide-happyhour-page-parser Coverage Results" MODIFIED="1506204094485" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/ofu_food$fekide_happyhour_page_parser.coverage" NAME="fekide-happyhour-page-parser Coverage Results" MODIFIED="1506204094485" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/ofu_food$cafete_page_parser.coverage" NAME="cafete-page-parser Coverage Results" MODIFIED="1506201552685" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/ofu_food$cafete_page_parser.coverage" NAME="cafete-page-parser Coverage Results" MODIFIED="1506201552685" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/ofu_food$ofu_food.coverage" NAME="ofu-food Coverage Results" MODIFIED="1506272180490" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/ofu_food$ofu_food.coverage" NAME="ofu-food Coverage Results" MODIFIED="1506272180490" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/ofu_food$generator_food_page.coverage" NAME="generator-food-page Coverage Results" MODIFIED="1506345916379" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/ofu_food$generator_food_page.coverage" NAME="generator-food-page Coverage Results" MODIFIED="1506346677743" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
@ -55,8 +55,8 @@
<file leaf-file-name="food.jinja" pinned="false" current-in-tab="false"> <file leaf-file-name="food.jinja" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/food.jinja"> <entry file="file://$PROJECT_DIR$/templates/food.jinja">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="460"> <state relative-caret-position="980">
<caret line="50" column="63" lean-forward="false" selection-start-line="50" selection-start-column="63" selection-end-line="50" selection-end-column="63" /> <caret line="49" column="39" lean-forward="false" selection-start-line="49" selection-start-column="39" selection-end-line="49" selection-end-column="39" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -65,8 +65,8 @@
<file leaf-file-name="generator-food-page.py" pinned="false" current-in-tab="true"> <file leaf-file-name="generator-food-page.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/food/generator-food-page.py"> <entry file="file://$PROJECT_DIR$/food/generator-food-page.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66"> <state relative-caret-position="396">
<caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#13#0" expanded="true" /> <element signature="e#0#13#0" expanded="true" />
</folding> </folding>
@ -646,16 +646,16 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/templates/food.jinja"> <entry file="file://$PROJECT_DIR$/templates/food.jinja">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="460"> <state relative-caret-position="980">
<caret line="50" column="63" lean-forward="false" selection-start-line="50" selection-start-column="63" selection-end-line="50" selection-end-column="63" /> <caret line="49" column="39" lean-forward="false" selection-start-line="49" selection-start-column="39" selection-end-line="49" selection-end-column="39" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/food/generator-food-page.py"> <entry file="file://$PROJECT_DIR$/food/generator-food-page.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66"> <state relative-caret-position="396">
<caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#13#0" expanded="true" /> <element signature="e#0#13#0" expanded="true" />
</folding> </folding>

5
ofu-food/food/generator-food-page.py
View File

@ -5,19 +5,17 @@ from jinja2 import Environment, FileSystemLoader
# Config global # Config global
CSSFILE_WEB = "../css/bootstrap-4.0.0-beta-dist/css/bootstrap.css" CSSFILE_WEB = "../css/bootstrap-4.0.0-beta-dist/css/bootstrap.css"
TEMPLATE_PATH = 'food.jinja'
# Config Thinkpad # Config Thinkpad
# JSON_FILES_PATH = "../json/" # JSON_FILES_PATH = "../json/"
# OUTPUT = "../html/food.html" # OUTPUT = "../html/food.html"
# JINJA_PATH = 'templates/' # JINJA_PATH = 'templates/'
TEMPLATE_PATH = 'food.jinja'
# PI # PI
JSON_FILES_PATH = "/media/data_1/www/pub-html/ofu-food/json/" JSON_FILES_PATH = "/media/data_1/www/pub-html/ofu-food/json/"
OUTPUT = "/media/data_1/www/pub-html/ofu-food/food.html" OUTPUT = "/media/data_1/www/pub-html/ofu-food/food.html"
# CSSFILE_SRC = "../bootstrap-4.0.0-beta-dist"
# CSSFILE_DEST = "/media/data_1/www/css"
JINJA_PATH = '/media/data_1/skripts/ofu-app-webskripts/ofu-food/templates/' JINJA_PATH = '/media/data_1/skripts/ofu-app-webskripts/ofu-food/templates/'
@ -51,7 +49,6 @@ def main():
"happyhours": fekideJson['happyhours'], "happyhours": fekideJson['happyhours'],
} }
# Template Vars: cssfile, executiontime, erbaCafeteTitle, erbaWeekmenu, markusCafeteTitle, markusWeekmenu, austrMensaTitle, austrWeekmenu, fekiMensaTitle, fekiWeekmenu, happyHourDay, happyhours # Template Vars: cssfile, executiontime, erbaCafeteTitle, erbaWeekmenu, markusCafeteTitle, markusWeekmenu, austrMensaTitle, austrWeekmenu, fekiMensaTitle, fekiWeekmenu, happyHourDay, happyhours
html = template.render(templateVars) html = template.render(templateVars)

12
ofu-food/templates/food.jinja
View File

@ -11,16 +11,15 @@
<body> <body>
<h1 class="text-center">Food for Students</h1> <h1 class="text-center">Food for Students</h1>
<p class="text-right">Last execute: {{ executiontime }}</p>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col m-2 p-3 mb-2 bg-info text-white rounded"> <div class="col m-2 p-3 border border-info rounded">
<h2>{{ erbaCafeteTitle }}</h2> <h2>{{ erbaCafeteTitle }}</h2>
{% for menu in erbaWeekmenu %} {% for menu in erbaWeekmenu %}
<p><span>{{ menu.date }}</span><span>{{ menu.menu[0] }}</span></p> <p><span>{{ menu.date }}</span><span>{{ menu.menu[0] }}</span></p>
{% endfor %} {% endfor %}
</div> </div>
<div class="col m-2 p-3 mb-2 bg-info text-white rounded"> <div class="col m-2 p-3 border border-info rounded">
<h2>{{ markusCafeteTitle }}</h2> <h2>{{ markusCafeteTitle }}</h2>
{% for menu in markusWeekmenu %} {% for menu in markusWeekmenu %}
<p><span>{{ menu.date }}</span><span>{{ menu.menu[0] }}</span></p> <p><span>{{ menu.date }}</span><span>{{ menu.menu[0] }}</span></p>
@ -28,7 +27,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col m-2 m-1 p-3 mb-2 bg-info text-white rounded"> <div class="col m-2 p-3 border border-info rounded">
<h2>{{ austrMensaTitle }}</h2> <h2>{{ austrMensaTitle }}</h2>
{% for dayMenu in austrWeekmenu %} {% for dayMenu in austrWeekmenu %}
<h3>{{ dayMenu.date }}</h3> <h3>{{ dayMenu.date }}</h3>
@ -37,7 +36,7 @@
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
</div> </div>
<div class="col m-2 p-3 mb-2 bg-info text-white rounded"> <div class="col m-2 p-3 border border-info rounded">
<h2>{{ fekiMensaTitle }}</h2> <h2>{{ fekiMensaTitle }}</h2>
{% for dayMenu in fekiWeekmenu %} {% for dayMenu in fekiWeekmenu %}
<h3>{{ dayMenu.date }}</h3> <h3>{{ dayMenu.date }}</h3>
@ -48,7 +47,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col m-2 p-3 mb-2 bg-info text-white rounded"> <div class="col m-2 p-3 border border-info rounded">
<h2>Feki.de Happy Hour Guide for Food</h2> <h2>Feki.de Happy Hour Guide for Food</h2>
<h3>{{ happyHourDay }}</h3> <h3>{{ happyHourDay }}</h3>
{% if happyhours %} {% if happyhours %}
@ -76,6 +75,7 @@
</div> </div>
</div> </div>
</div> </div>
<p class="text-right">Last execute: {{ executiontime }}</p>
</body> </body>
</html> </html>