From 58bc5c436e743f4ae8efa9f6f795e68bfc2657fa Mon Sep 17 00:00:00 2001
From: Serghei Mihai <smihai@entrouvert.com>
Date: Thu, 19 Apr 2018 18:51:53 +0200
Subject: [PATCH] misc: use new gadjo's model to display announce infos
 (#23196)

---
 corbo/static/css/corbo.css               | 10 +---------
 corbo/templates/corbo/announce_view.html |  8 ++++----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/corbo/static/css/corbo.css b/corbo/static/css/corbo.css
index a754a2d..f19f652 100644
--- a/corbo/static/css/corbo.css
+++ b/corbo/static/css/corbo.css
@@ -166,19 +166,10 @@ form ul li label {
     text-transform: uppercase;
 }
 
-div.announce_block {
-    position: relative;
-}
-
 .announce_dashboard {
-    background: #eee;
     font-size: 1.1em;
     margin-left: 0.5em;
     padding: 0.3rem;
-    width: 15%;
-    position: absolute;
-    right: 0;
-    top: 0;
 }
 
 .announce_dashboard p {
@@ -197,4 +188,5 @@ div.announce_block {
 div.announce_preview {
     width: 84%;
     overflow: hidden;
+    clear: both;
 }
diff --git a/corbo/templates/corbo/announce_view.html b/corbo/templates/corbo/announce_view.html
index 4874c2f..a258b07 100644
--- a/corbo/templates/corbo/announce_view.html
+++ b/corbo/templates/corbo/announce_view.html
@@ -17,12 +17,13 @@
 {% endif %}
 {% endblock %}
 {% block content %}
-<div class="announce_block">
 <div class="announce_preview">
   {{ object.text|safe }}
 </div>
+{% endblock %}
 
-{% if object.publication_time or object.expiration_time or broadcasts %}
+{% block sidebar %}
+<aside id="sidebar">
 <div class="announce_dashboard">
   {% if object.publication_time %}
   <p>
@@ -47,6 +48,5 @@
   {% endfor %}
   {% endif %}
 </div>
-{% endif %}
-</div>
+</aside>
 {% endblock %}