Skip to content
Browse files

repositioned notifications

furthermore: tabs are cocksuckers.
  • Loading branch information...
1 parent 6612632 commit 1bb673d39c90b4105f3c6b38522c5d7127556295 @mrreynolds mrreynolds committed May 23, 2012
Showing with 66 additions and 67 deletions.
  1. +44 −44 mittach/templates/index.html
  2. +22 −23 mittach/templates/layout.html
View
88 mittach/templates/index.html
@@ -2,49 +2,49 @@
{% block body %}
<div class="row">
- <div class="span8">
- <h2>Aktuelle Termine</h2>
- <div class="well">
- <table class="table">
- <thead>
- <tr>
- <th>Titel</th>
- <th>Datum</th>
- <th>Freie Slots</th>
- <th>Status</th>
- </tr>
- </thead>
- <tbody>
- {% for event in events %}
- <tr>
- <td data-popover-title="Teilnehmer" data-popover-content="{{ event.bookings|join(', ')|default('Es haben sich noch keine Teilnehmer angemeldet', true) }}">
- {{ event.title }}
- </td>
- <td>{{ event.date|format_date }}</td>
- <td>{{ event.slots - event.bookings|length }}</td>
- <td>
- {% if g.current_user in event.bookings %}
- <form method="post" action="{{ url_for("handle_booking", event_id=event.id) }}">
- <input type="hidden" name="_method" value="delete">
- <input type="submit" class="btn btn-danger" value="Stornieren">
- </form>
- {% elif event.slots > event.bookings|length %}
- <form method="post" action="{{ url_for("handle_booking", event_id=event.id) }}">
- <input type="hidden" name="_method" value="put">
- <input type="submit" class="btn btn-success" value="Buchen">
- </form>
- {% else %}
- allet voll
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
- </div>
- </div>
- <div class="span4">
- {% include "create_event.html" %}
- </div>
+ <div class="span8">
+ <h2>Aktuelle Termine</h2>
+ <div class="well">
+ <table class="table">
+ <thead>
+ <tr>
+ <th>Titel</th>
+ <th>Datum</th>
+ <th>Freie Slots</th>
+ <th>Status</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for event in events %}
+ <tr>
+ <td data-popover-title="Teilnehmer" data-popover-content="{{ event.bookings|join(', ')|default('Es haben sich noch keine Teilnehmer angemeldet', true) }}">
+ <a href="#">{{ event.title }}</a>
+ </td>
+ <td>{{ event.date|format_date }}</td>
+ <td>{{ event.slots - event.bookings|length }}</td>
+ <td>
+ {% if g.current_user in event.bookings %}
+ <form method="post" action="{{ url_for("handle_booking", event_id=event.id) }}">
+ <input type="hidden" name="_method" value="delete">
+ <input type="submit" class="btn btn-danger" value="Stornieren">
+ </form>
+ {% elif event.slots > event.bookings|length %}
+ <form method="post" action="{{ url_for("handle_booking", event_id=event.id) }}">
+ <input type="hidden" name="_method" value="put">
+ <input type="submit" class="btn btn-success" value="Buchen">
+ </form>
+ {% else %}
+ allet voll
+ {% endif %}
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="span4">
+ {% include "create_event.html" %}
+ </div>
</div>
{% endblock %}
View
45 mittach/templates/layout.html
@@ -2,30 +2,29 @@
<html>
<head>
- <meta charset="utf-8">
- <title>innoMittach</title>
- <link rel="shortcut icon" href="{{ url_for("static", filename="favicon.ico") }}">
- <link rel="stylesheet" href="{{ url_for("static", filename="css/bootstrap.min.css") }}">
- <link rel="stylesheet" href="{{ url_for("static", filename="css/bootstrap-responsive.min.css") }}">
- <link rel="stylesheet" href="{{ url_for("static", filename="css/main.css") }}">
- <link rel="stylesheet" href="{{ url_for("static", filename="css/kalendae.css") }}">
+ <meta charset="utf-8">
+ <title>innoMittach</title>
+ <link rel="shortcut icon" href="{{ url_for("static", filename="favicon.ico") }}">
+ <link rel="stylesheet" href="{{ url_for("static", filename="css/bootstrap.min.css") }}">
+ <link rel="stylesheet" href="{{ url_for("static", filename="css/bootstrap-responsive.min.css") }}">
+ <link rel="stylesheet" href="{{ url_for("static", filename="css/main.css") }}">
+ <link rel="stylesheet" href="{{ url_for("static", filename="css/kalendae.css") }}">
</head>
-
- {% for category, message in get_flashed_messages(true) %}
- <div class="alert alert-{{ category }}">{{ message }}</div>
- {% endfor %}
<body>
- <div class="container">
- <header>
- <img src="{{ url_for("static", filename="images/logo.png") }}">
- <p>Mahlzeit, {{ g.current_user }}</p>
- </header>
- {% block body %}{% endblock %}
- </div>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-tooltip.js"></script>
- <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-popover.js"></script>
- <script src="{{ url_for("static", filename="js/kalendae.min.js") }}"></script>
- <script src="{{ url_for("static", filename="js/application.js") }}"></script>
+ <div class="container">
+ <header>
+ <img src="{{ url_for("static", filename="images/logo.png") }}">
+ <p>Mahlzeit, {{ g.current_user }}</p>
+ </header>
+ {% for category, message in get_flashed_messages(true) %}
+ <div class="alert alert-{{ category }}">{{ message }}</div>
+ {% endfor %}
+ {% block body %}{% endblock %}
+ </div>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.js"></script>
+ <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-tooltip.js"></script>
+ <script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-popover.js"></script>
+ <script src="{{ url_for("static", filename="js/kalendae.min.js") }}"></script>
+ <script src="{{ url_for("static", filename="js/application.js") }}"></script>
</body>
</html>

1 comment on commit 1bb673d

@FND
innoQ Deutschland GmbH member
FND commented on 1bb673d May 24, 2012

furthermore: tabs are cocksuckers.

Be that as it may, please Don't Fuck the Diff.

Please sign in to comment.
Something went wrong with that request. Please try again.