From bcc2e4fcec619078059102dbd5c8172010390a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
Date: Mon, 15 Apr 2013 00:59:59 +0200
Subject: Some reorganizing

---
 templates/pages/add.jinja       | 25 -----------------
 templates/pages/cats.jinja      | 22 ---------------
 templates/pages/const.jinja     | 39 --------------------------
 templates/pages/constadd.jinja  | 12 --------
 templates/pages/constedit.jinja | 13 ---------
 templates/pages/constlist.jinja | 23 ---------------
 templates/pages/edit.jinja      | 10 -------
 templates/pages/show.jinja      | 62 -----------------------------------------
 8 files changed, 206 deletions(-)
 delete mode 100644 templates/pages/add.jinja
 delete mode 100644 templates/pages/cats.jinja
 delete mode 100644 templates/pages/const.jinja
 delete mode 100644 templates/pages/constadd.jinja
 delete mode 100644 templates/pages/constedit.jinja
 delete mode 100644 templates/pages/constlist.jinja
 delete mode 100644 templates/pages/edit.jinja
 delete mode 100644 templates/pages/show.jinja

(limited to 'templates/pages')

diff --git a/templates/pages/add.jinja b/templates/pages/add.jinja
deleted file mode 100644
index 4728e99..0000000
--- a/templates/pages/add.jinja
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "page.jinja" %}
-
-{% block heading %}
-    Neue Ausgabe hinzufügen
-{% endblock %}
-
-{% block js %}
-    {{ super() }}
-    <script type="text/javascript" src="{{ "jqueryui/jquery-ui-1.8.2.js" | static_url }}"></script>
-    <script type="text/javascript" src="{{ "js/add.js" | static_url }}"></script>
-{% endblock %}
-
-{% block style %}
-    {{ super() }}
-    <link href="{{ "jqueryui/css/ui-darkness/jquery-ui-1.8.2.custom.css" | static_url }}" rel="stylesheet" type="text/css">
-{% endblock %}
-
-{% block content %}
-    <form name="add_expense" method="post">
-        {{ render_form(form) }}
-        {% block form_buttons %}
-            <input type="submit" name="changeB">
-        {% endblock %}
-    </form>
-{% endblock %}
diff --git a/templates/pages/cats.jinja b/templates/pages/cats.jinja
deleted file mode 100644
index 1a3d88e..0000000
--- a/templates/pages/cats.jinja
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "page.jinja" %}
-
-{% block heading %} Kategorien {% endblock %}
-
-{% block js %}
-    {{ super() }}
-    <script type="text/javascript" src="{{ "js/cats.js" | static_url }}"></script>
-{% endblock %}
-
-{% block content %}
-    <form name="categories" method="post">
-        <ul class="arrow">
-            {% for c in cats %}
-                <li><span>{{c.name}}</span><input name="{{c.id}}" type="text" value="{{c.name}}" style="display:none;"></li> 
-            {%- endfor %}
-            <div><img id="add" src="{{ "images/add.png" | static_url }}"></div>
-        </ul>
-        <input type="submit">
-    </form>
-    <input id="new" name="n-" style="display:none;" >
-{% endblock %}
-
diff --git a/templates/pages/const.jinja b/templates/pages/const.jinja
deleted file mode 100644
index 13e8008..0000000
--- a/templates/pages/const.jinja
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "page.jinja" %}
-
-{% set fmt="%m.%Y" %}
-
-{% block heading %}
-    Konstante Kosten
-{% endblock %}
-
-{% block content %}
-    <ul class="arrow">
-        <li><span class="heading">Beschreibung:</span> {{exp.description}}</li>
-        <li><span class="heading">Kategorie:</span> {{exp.category.name}}</li>
-        <li><span class="heading">Betrag:</span> {{exp.expense | eur}}</li>
-        <li><span class="heading">Betrag pro Monat:</span> {{exp.monthly | eur}}</li>
-        <li><span class="heading">Start:</span> {{exp.start | date(format=fmt)}}</li>
-        <li><span class="heading">Ende:</span> {{exp.end | date(format=fmt)}}</li>
-        <li><span class="heading">Zahlungsrhythmus:</span> 
-        {% if exp.months == 1 %}
-            monatlich
-        {% elif exp.months == 6 %}
-            halbjährlich
-        {% elif exp.months == 12 %}
-            jährlich
-        {% else %}
-            alle {{exp.months}} Monate
-        {% endif %}
-    </ul>
-    <p>
-        <a href="{{ url_for(".edit", id = exp.id) }}">Bearbeiten</a>&nbsp;
-        <a href="{{ url_for(".add_from", other = exp.id) }}">Erstelle neuen auf dem jetzigen basierenden Eintrag</a>
-    </p>
-    {% if exp.prev %} {{ left_arrow(url_for(".show", id = exp.prev.id), target(exp.prev)) }} {% endif %}
-    {% if exp.next %} {{ right_arrow(url_for(".show", id = exp.next.id), target(exp.next)) }} {% endif %}
-{% endblock %}
-
-{% macro target(p) -%}
-    {{ p.description }} ({{ p.start | date(fmt) ~ "-" ~ p.end | date(fmt) }})<br>
-    {{ p.expense | eur }}
-{%- endmacro %}
diff --git a/templates/pages/constadd.jinja b/templates/pages/constadd.jinja
deleted file mode 100644
index 8f878b4..0000000
--- a/templates/pages/constadd.jinja
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "page.jinja" %}
-
-{% block heading %}
-    Füge neue konstante Ausgabe hinzu
-{% endblock %}
-
-{% block content %}
-    <form name="add_const_expense" method="post" action="{{ url_for(".add") }}">
-        {{ render_form(form) }}
-        <input type="submit" name="changeB">
-    </form>
-{% endblock %}
diff --git a/templates/pages/constedit.jinja b/templates/pages/constedit.jinja
deleted file mode 100644
index c440ecb..0000000
--- a/templates/pages/constedit.jinja
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "page.jinja" %}
-
-{% block heading %}
-    Konstante Ausgabe bearbeiten
-{% endblock %}
-
-{% block content %}
-    <form name="edit_const_expense" method="post">
-        {{ render_form(form) }}
-        <input type="submit" name="changeB">
-        <input type="submit" name="deleteB" value="Eintrag löschen" />
-    </form>
-{% endblock %}
diff --git a/templates/pages/constlist.jinja b/templates/pages/constlist.jinja
deleted file mode 100644
index ffe121f..0000000
--- a/templates/pages/constlist.jinja
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "page.jinja" %}
-
-{% block heading %}
-    Konstante Kosten
-{% endblock %}
-
-{% block content %}
-    <p><a href="{{ url_for(".add") }}">Neuen Eintrag hinzufügen</a></p>
-
-    {{ list(current, "Aktuell") }}
-
-    {% if future %} {{ list(future, "Zukünftige") }} {% endif %}
-    {% if old %} {{ list(old, "Veraltet") }} {% endif %}
-{% endblock %}
-
-{% macro list(list, h) %}
-    <h2>{{ h }}</h2>
-    <ul class="arrow">
-        {% for c in list -%}
-            <li><a href="{{ url_for(".show", id = c.id) }}">{{c.description}} ({{c.expense | eur}})</a></li>
-        {% endfor %}
-    </ul>
-{% endmacro %}
diff --git a/templates/pages/edit.jinja b/templates/pages/edit.jinja
deleted file mode 100644
index c1f4d5b..0000000
--- a/templates/pages/edit.jinja
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "pages/add.jinja" %}
-
-{% block heading %}
-    Bearbeite Kosteneintrag
-{% endblock %}
-
-{% block form_buttons %}
-    <input type="submit" name="changeB" />
-    <input type="submit" name="deleteB" value="Eintrag löschen" />
-{% endblock %}
diff --git a/templates/pages/show.jinja b/templates/pages/show.jinja
deleted file mode 100644
index 4b5170f..0000000
--- a/templates/pages/show.jinja
+++ /dev/null
@@ -1,62 +0,0 @@
-{% extends "page.jinja" %}
-
-{% block heading %}
-    {% if exps | length > 1 %}
-        Aktuelle Kosten
-    {% else %}
-        Kosten für {{exps[0]|date}}
-    {% endif %}
-{% endblock %}
-
-{% block js %}
-    {{ super() }}
-    <script type="text/javascript" src="{{ "js/show.js" | static_url }}"></script>
-{% endblock %}
-
-{% block content %}
-    {% for e in exps %}
-        {% if exps | length > 1 %}<h2>{{e|date}}</h2>{% endif %}
-        {% for c in e.catexps | sort(attribute="cat.name") %}
-            {% call(exp) detail(name=c.cat.name, sum=c.expense, set=c.all) %}
-                <a href="{{ url_for(".edit", id = exp.id) }}">{{exp.day}}.{{exp.month}}. -- {{exp.description}}: {{exp.expense | eur }}</a>
-            {% endcall %}
-        {% endfor %}
-
-        {% call(exp) detail(name="Constant", sum=e.constsum, set=e.consts) %}
-            <a href="{{ url_for("consts.show", id = exp.id) }}">{{exp.monthly}} -- {{exp.description}}</a>
-        {% endcall %}
-    
-        {% call(exp) detail(name="In Summa", sum=e.sum, set=e.all, color="#ff2d2d") %}
-            <a href="{{ url_for(".edit", id = exp.id) }}">{{exp.day}}.{{exp.month}}. -- {{exp.description}}: {{exp.expense | eur}}</a>
-        {% endcall %}
-        <br>
-    {% endfor %}
-
-    {# Note: exps are given _reversed_, i.e. "exps | last" is
-       the _first_ on the timeline #}
-    {% set d = exps | last | prev_date | date %}
-    {{ left_arrow(url_for(".show_date_str", p = d), d) }}
-
-    {% set first = exps | first %}
-    {% if not first is last_date %}
-        {% set d = first | next_date | date %}
-        {{ right_arrow(url_for(".show_date_str", p = d), d) }}
-    {% endif %}
-{% endblock content %}
-
-{% macro detail(name, sum, set, color=None) %}
-    <div class="detail">
-        <img class="mark" src="{{ "images/closed.png" | static_url }}">
-        {% call colorize(fgcolor=color) %}
-            <span class="heading">{{name}}:</span> <span class="sum">{{sum | eur}}</span><br>
-        {% endcall %}
-        <div class="details">
-            <ul>
-                {% for exp in set %}
-                    <li class="expense">{{ caller(exp) }}</li>
-                {% endfor %}
-            </ul>
-        </div>
-    </div>
-{% endmacro %}
-
-- 
cgit v1.2.3