ciclos

commit ca9e834d2251b1a28db3ddb64d5c0c22a7e088c3

Author: Pedro Lucas Porcellis <pedrolucasporcellis@gmail.com>

Introduce a little more responsiveness into cycles listings

 core/templates/cycle.html | 4 +-
 core/templates/cycles.html | 50 ++++++++++++++++++++++++----------------


diff --git a/core/templates/cycle.html b/core/templates/cycle.html
index e934b27ebdc0961d98337b89c7ef13d7b9166de3..c851f4b0ac48d0b4941b058f2fcc226ceb86c76b 100644
--- a/core/templates/cycle.html
+++ b/core/templates/cycle.html
@@ -15,7 +15,7 @@   Você não tem um pedido nesse ciclo. Abrir um
   {% endif %}
 </section>
 
-<section class="products">
+<section class="products pb-5">
   <form action="{{url_for('orders.update', id = current_order.id)}}" method="POST">
     <table>
       <thead>
@@ -61,7 +61,7 @@       
</section> {% endif %} - <div class="form-action"> + <div class="form-action pb-5"> {% if current_order %} {# TODO: There's gotta a simpler way to this. diff --git a/core/templates/cycles.html b/core/templates/cycles.html index 6c44eef9bba549ce23d715b8a0b53e0df8d4a1d5..984cdcd15201d18b340faef630a96e39c37c7f20 100644 --- a/core/templates/cycles.html +++ b/core/templates/cycles.html @@ -2,27 +2,37 @@ {% extends "layout.html" %} {% block body %} {% if current_cycle or closed_cycles %} <section class="cycles"> - <h1>Ciclo em aberto</h1> - <section> - <div class="{{ "box" if current_cycle.status.value == 'published' }}"> - <strong>Compras:</strong> {{ current_cycle.start_at.strftime("%A, %d/%m") }} até {{ current_cycle.end_at.strftime("%A, %d/%m") }} - {% if current_cycle.status.value == 'published' %} - <strong class="pl-5 f-right"> ACONTECENDO </strong> - {% endif %} - </div> - <div class="{{ "box" if current_cycle.status.value == 'delivery' }}"> - <strong>Entrega:</strong> {{ current_cycle.delivery_start_at.strftime("%d/%m/%Y ") }} até {{ current_cycle.delivery_end_at.strftime("%d/%m/%Y") }} - {% if current_cycle.status.value == 'delivery' %} - <strong class="pl-5 f-right"> ACONTECENDO </strong> - {% endif %} + <h1>Ciclo em aberto</h1> + <section> + <div class="{{ "box" if current_cycle.status.value == 'published' }} row"> + <div class="col-xs-12 col-md-8 col-lg-8 col-xl-8"> + <strong>Compras:</strong> {{ current_cycle.start_at.strftime("%A, %d/%m") }} até {{ current_cycle.end_at.strftime("%A, %d/%m") }} + </div> + <div class="col-xs-12 col-md-4 col-lg-4 col-xl-4"> + {% if current_cycle.status.value == 'published' %} + <strong class="pl-5 center-xs center-sm end-md end-lg end-xl d-inline-block w-100"> ACONTECENDO </strong> + {% endif %} + </div> + </div> + <div class="{{ "box" if current_cycle.status.value == 'delivery' }} row"> + <div class="col-xs-12 col-md-8 col-lg-8 col-xl-8"> + <strong>Entrega:</strong> {{ current_cycle.delivery_start_at.strftime("%d/%m/%Y ") }} até {{ current_cycle.delivery_end_at.strftime("%d/%m/%Y") }} + </div> + + <div class="col-xs-12 col-md-8 col-lg-8 col-xl-8"> + {% if current_cycle.status.value == 'delivery' %} + <strong class="pl-5 center-xs center-sm end-md end-lg end-xl d-inline-block w-100"> ACONTECENDO </strong> + {% endif %} + </div> + </div> + </section> + + <div class="cycle"> + <h2>{{ current_cycle.title }}</h2> + <p class="white-space-pre">{{ current_cycle.description }}</p> + <a href="{{url_for('cycles.show', id = current_cycle.id)}}">Ver ciclo</a> + <a href="{{url_for('cycles.close', id = current_cycle.id)}}">Fechar ciclo</a> </div> - </section> - <div class="cycle"> - <h2>{{ current_cycle.title }}</h2> - <p class="white-space-pre">{{ current_cycle.description }}</p> - <a href="{{url_for('cycles.show', id = current_cycle.id)}}">Ver ciclo</a> - <a href="{{url_for('cycles.close', id = current_cycle.id)}}">Fechar ciclo</a> - </div> </section> <section class="closed-cycles">