From 19d5ac54d46d57a47ae789f40b4583d34e02a8cb Mon Sep 17 00:00:00 2001
From: unknown <adithya14255@gmail.com>
Date: Thu, 13 Jun 2024 10:53:30 +0530
Subject: [PATCH] movebuttons

---
 saythanks/core.py                     |  5 ++++-
 saythanks/templates/inbox.htm.j2      | 12 ++----------
 saythanks/templates/share_note.htm.j2 |  5 ++++-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/saythanks/core.py b/saythanks/core.py
index 8bf04f6a..1a6c0c73 100644
--- a/saythanks/core.py
+++ b/saythanks/core.py
@@ -232,7 +232,10 @@ def share_note(uuid):
         abort(404)
 
     note = storage.Note.fetch(uuid)
-    return render_template('share_note.htm.j2', note=note)
+    note_body = note.body
+    for i in ['<div>','<p>','</div>','</p>']:
+        note_body = note_body.replace(i,'')
+    return render_template('share_note.htm.j2', note=note,note_body=note_body)
 
 
 @app.route('/inbox/archive/note/<uuid>', methods=['GET'])
diff --git a/saythanks/templates/inbox.htm.j2 b/saythanks/templates/inbox.htm.j2
index f67df0a7..123bb5c6 100644
--- a/saythanks/templates/inbox.htm.j2
+++ b/saythanks/templates/inbox.htm.j2
@@ -79,7 +79,7 @@
 <table>
   <thead>
     <tr>
-      <th id="share">Share URL</th>
+      <th id="share">&nbsp</th>
       <th id="message">Message</th>
       <th id="from">From</th>
       <th id="timestamp">Timestamp</th>
@@ -88,15 +88,7 @@
   <tbody>
   {% for note in notes %}
     <tr>
-      <td class="ellipsis">
-        <span>
-          <a class="share" href="{{ url_for('share_note', uuid=note.uuid)}}">🔗</a>
-          <a class="twitter-share-button" target="_blank" href="https://twitter.com/intent/tweet?text={{ note.body|quote + "%0A%0A- " + note.byline + "%0A%0A" + request.base_url[0:-6] + url_for('share_note', uuid=note.uuid) + "%0A" }}" data-url=" "></a> </br>
-          <iframe src="https://www.facebook.com/plugins/share_button.php?href={{ request.base_url[0:-6] + url_for('share_note', uuid=note.uuid) }}&layout=button&size=small&width=67&height=20&appId" width="67" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowfullscreen="true" allow="autoplay; clipboard-write; encrypted-media; picture-in-picture; web-share">
-          </iframe> 
-        </span>  
-      </td>
-      
+      <td class="ellipsis">&nbsp</td> 
       <td class="ellipsis"><a href="{{ url_for('share_note', uuid=note.uuid)}}"><span>{{ note.body }}</span></a></td> 
       <td class="ellipsis"><span>— {{ note.byline }}</span></td>
       <td class="ellipsis">{{  note.timestamp.strftime('%d-%h-%Y %H:%M:%S') }}</td>
diff --git a/saythanks/templates/share_note.htm.j2 b/saythanks/templates/share_note.htm.j2
index 77648eac..e4ac00a1 100644
--- a/saythanks/templates/share_note.htm.j2
+++ b/saythanks/templates/share_note.htm.j2
@@ -35,7 +35,10 @@
 <h2>🝐</h2>
 </fieldset>
 </form>
-
+ <a class="share" href="{{ url_for('share_note', uuid=note.uuid)}}">🔗</a>
+          <br><a class="twitter-share-button" target="_blank" href="https://twitter.com/intent/tweet?text={{ note_body|quote + "%0A%0A- " + note.byline + "%0A%0A" + request.root_url + url_for('share_note', uuid=note.uuid)[1:] + "%0A" }}" data-url=" "></a> </br>
+          <iframe src="https://www.facebook.com/plugins/share_button.php?href={{ request.root_url + url_for('share_note', uuid=note.uuid)[1:] }}&layout=button&size=small&width=67&height=20&appId" width="67" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowfullscreen="true" allow="autoplay; clipboard-write; encrypted-media; picture-in-picture; web-share">
+          </iframe> 
 {# Have body auto-grow as users type. #}
 <script>
   $("#body").autoGrow();