Add com app with first parametric texts

core/management/commands/populate.py

@@ -14,6 +14,7 @@ from accounting.models import GeneralJournal, BankAccount, ClubAccount, Operatio
 from club.models import Club, Membership
 from subscription.models import Subscription
 from counter.models import Customer, ProductType, Product, Counter
+from com.models import Sith
 
 class Command(BaseCommand):
     help = "Populate a new instance of the Sith AE"
@@ -80,6 +81,8 @@ class Command(BaseCommand):
         home_root.save()
         club_root.save()
 
+        Sith().save()
+
         p = Page(name='Index')
         p.set_lock(root)
         p.save()

core/static/core/base.css

@@ -4,13 +4,13 @@ html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
 del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
+small, strike, sub, sup, tt, var,
 b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
 	margin: 0;
@@ -21,7 +21,7 @@ time, mark, audio, video {
 	vertical-align: baseline;
 }
 /* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
+article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
 	display: block;
 }

core/static/core/style.css

@@ -14,6 +14,7 @@ a:active  { color: #007BE6; }
 /*--------------------------------HEADER-------------------------------*/
 #logo {
     margin-left: 5%;
+    display: inline-block;
 }
 header {
     display: block;
@@ -75,6 +76,29 @@ header form {
     background: #bcc;
 }
 
+#alert_box p, #info_box p {
+    margin: 0px;
+    padding: 0px;
+}
+#alert_box, #info_box {
+    font-size: smaller;
+    display: inline-block;
+    border: solid 1px grey;
+    vertical-align: top;
+    padding: 2px;
+    margin: 4px;
+    margin-top: 60px;
+    min-width: 10%;
+    max-width: 30%;
+    min-height: 20px;
+}
+#info_box {
+    background: cornsilk
+}
+#alert_box {
+    background: gold;
+}
+
 /*---------------------------------NAV---------------------------------*/
 nav {
     display: block;

core/templates/core/base.jinja

@@ -17,6 +17,17 @@
         {% if not popup %}
         <div id="logo"><a href="{{ url('core:index') }}"><img src="{{ static('core/img/logo.png') }}"
                                                               alt="{% trans %}Logo{% endtrans %}" /></a></div>
+        {% set sith = get_sith() %}
+        {% if sith.alert_msg %}
+        <div id="alert_box">
+            {{ sith.alert_msg|markdown }}
+        </div>
+        {% endif %}
+        {% if sith.info_msg %}
+        <div id="info_box">
+            {{ sith.info_msg|markdown }}
+        </div>
+        {% endif %}
         <header>
             {% if not user.is_authenticated() %}
             <a href="{{ url('core:login') }}">{% trans %}Login{% endtrans %}</a>

core/templates/core/index.jinja

@@ -3,9 +3,7 @@
 {% block title %}
 {% trans %}Welcome!{% endtrans %}
 {% endblock %}
+
 {% block content %}
-    <p>{% trans %}Welcome to the new AE's website!{% endtrans %}</p>
-    <p>Ce site supporte pour l'instant toute la gestion de l'argent, c'est à dire les comptes AE, les comptoirs,
-    l'Eboutic, et la comptabilité</p>
-    <p>Pour le reste, merci de retourner voir sur l'<a href="https://ae.utbm.fr">ancien site</a></p>
+    {{ get_sith().index_page|markdown }}
 {% endblock %}

core/templates/core/user_tools.jinja

@@ -65,7 +65,10 @@
 <hr>
 <h4>{% trans %}Communication{% endtrans %}</h4>
 <ul>
-    {% if user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %}
+    {% if user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) or user.is_root %}
+    <li><a href="{{ url('com:index_edit') }}">{% trans %}Edit index page{% endtrans %}</a></li>
+    <li><a href="{{ url('com:alert_edit') }}">{% trans %}Edit alert message{% endtrans %}</a></li>
+    <li><a href="{{ url('com:info_edit') }}">{% trans %}Edit information message{% endtrans %}</a></li>
     <li><a href="{{ url('core:file_moderation') }}">{% trans %}Moderate files{% endtrans %}</a></li>
     {% endif %}
     {% if user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) %}