diasporadiaries

commit 61f21d7c8a8a9b9440f7807caed5298cd57ef81d
parent 60712fc069312235ef5c22e472f5526579e5cbfa
Author: parazyd <parazyd@dyne.org>
Date:   Mon, 21 Jan 2019 00:18:20 +0100

Miscellaneous style and functionality improvements.

Diffstat:
M
diaspora.py
 | 
11
++++++++++-
M
templates/country.html
 | 
28
++++++++++++++--------------
M
templates/dashboard.html
 | 
28
++++++++++++++++------------

3 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/diaspora.py b/diaspora.py
@@ -332,10 +332,19 @@ def dashboard():
                                                  ('disembark', ccto))
 
     stories = get_multiple_stories('visible', fparam[act])
+
     clist = [(i['disembark'], i['disembarkname']) for i in stories]
     clist = list(set(clist))
+
+    profiles = {}
+    for i in stories:
+        if i['email']:
+            uid = sql_select_col_where('id', 'email', i['email'],
+                                       table='users')
+            profiles['email'] = uid[0][0]
+
     return render_template('dashboard.html', stories=stories,
-                           filtered_stories=filtered,
+                           filtered_stories=filtered, profiles=profiles,
                            listtype=act, clist=clist, ccto=ccto)
 
 
diff --git a/templates/country.html b/templates/country.html
@@ -28,27 +28,27 @@
       {% endif %}
 
         <div class="col-md-4">
-          <div class="card-body">
-            <p class="card-text">
-              {{ i['abstract'] }}
-            </p>
+          <div class="card">
+            <div class="card-body">
+              <p class="card-text small">{{ i['abstract'] }}</p>
 
-            <div class="d-flex justify-content-between align-items-center">
-              <div class="btn-group">
+              <div class="card-body">
                 <a href="/view?id={{ i['id'] }}" class="btn btn-sm btn-outline-secondary">Read</a>
-              </div>
 
-               <img style="height: 1em;" src="/static/img/flags/{{ i['embark'] }}.png" alt="{{ i['embarkname'] }}" title="{{ i['embarkname' ]}}"><span class="fa fa-anchor"></span><img style="height: 1em;" src="/static/img/flags/{{ i['disembark'] }}.png" alt="{{ i['disembarkname'] }}" title="{{ i['disembarkname'] }}">
+                <img style="height: 1em;" src="/static/img/flags/{{ i['embark'] }}.png" alt="{{ i['embarkname'] }}" title="{{ i['embarkname' ]}}">
+                <span class="fa fa-anchor"></span>
+                <img style="height: 1em;" src="/static/img/flags/{{ i['disembark'] }}.png" alt="{{ i['disembarkname'] }}" title="{{ i['disembarkname'] }}">
+              </div>
 
-              <small class="text-muted">
+              <p class="text-muted small text-right">
                 {% if i['email'] %}
-                <a href="/profile?id={{ profiles['email'] }}">{{ i['name'] }}</a><br>
+                by <a href="/profile?id={{ profiles['email'] }}">{{ i['name'] }}</a><br>
                 {% else %}
-                {{ i['name'] }}<br>
+                by {{ i['name'] }}<br>
                 {% endif %}
-                {{ i['date'] }}<br>
-                {{ i['time'] }}
-              </small>
+                {{ i['date'] }} {{ i['time'] }}
+              </p>
+
             </div>
           </div>
         </div>
diff --git a/templates/dashboard.html b/templates/dashboard.html
@@ -26,28 +26,32 @@
       {% endif %}
 
         <div class="col-md-4">
-          <div class="card-body">
-            <p class="card-text">
-              {{ i['abstract'] }}
-            </p>
+          <div class="card">
+            <div class="card-body">
+              <p class="card-text small">{{ i['abstract'] }}</p>
 
-            <div class="d-flex justify-content-between align-items-center">
-              <div class="btn-group">
+              <div class="card-body">
                 <a href="/edit?id={{ i['id'] }}" class="btn btn-sm btn-outline-secondary">Edit</a>
                 {% if i['visible'] == 0 %}
                 <a href="/dashboard?approveid={{ i['id'] }}" class="btn btn-sm btn-outline-secondary">Add</a>
                 {% else %}
                 <a href="/dashboard?hideid={{ i['id'] }}" class="btn btn-sm btn-outline-secondary">Hide</a>
                 {% endif %}
+
+                <img style="height: 1em;" src="/static/img/flags/{{ i['embark'] }}.png" alt="{{ i['embarkname'] }}" title="{{ i['embarkname' ]}}">
+                <span class="fa fa-anchor" style="height: 1em;"></span>
+                <img style="height: 1em;" src="/static/img/flags/{{ i['disembark'] }}.png" alt="{{ i['disembarkname'] }}" title="{{ i['disembarkname'] }}">
               </div>
 
-               <img style="height: 1em;" src="/static/img/flags/{{ i['embark'] }}.png" alt="{{ i['embarkname'] }}" title="{{ i['embarkname' ]}}"><span class="fa fa-anchor"></span><img style="height: 1em;" src="/static/img/flags/{{ i['disembark'] }}.png" alt="{{ i['disembarkname'] }}" title="{{ i['disembarkname'] }}">
+              <p class="text-muted small text-right">
+                {% if i['email'] %}
+                by <a href="/profile?id={{ profiles['email'] }}">{{ i['name'] }}</a><br>
+                {% else %}
+                by {{ i['name'] }}<br>
+                {% endif %}
+                {{ i['date'] }} {{ i['time'] }}
+              </p>
 
-              <small class="text-muted">
-                {{ i['name'] }}<br>
-                {{ i['date'] }}<br>
-                {{ i['time'] }}
-              </small>
             </div>
           </div>
         </div>