From 299b135129583456c5fd69c9323a682999a6f5b2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 28 Nov 2019 17:35:32 +0000
Subject: [PATCH] Less message box height for media instance

---
 daemon.py       |  7 ++++---
 webinterface.py | 12 +++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/daemon.py b/daemon.py
index b2d0a116..77d42189 100644
--- a/daemon.py
+++ b/daemon.py
@@ -2192,7 +2192,8 @@ class PubServer(BaseHTTPRequestHandler):
                 self.path.endswith('/newreport') or \
                 self.path.endswith('/newquestion') or \
                 self.path.endswith('/newshare')):
-                msg=htmlNewPost(self.server.translate, \
+                msg=htmlNewPost(self.server.mediaInstance, \
+                                self.server.translate, \
                                 self.server.baseDir, \
                                 self.path,inReplyToUrl, \
                                 replyToList, \
@@ -4914,7 +4915,7 @@ class PubServer(BaseHTTPRequestHandler):
                 if self.server.debug:
                     print('Sending DM to '+optionsActor)
                 reportPath=self.path.replace('/personoptions','')+'/newdm'
-                msg=htmlNewPost(self.server.translate, \
+                msg=htmlNewPost(False,self.server.translate, \
                                 self.server.baseDir, \
                                 reportPath,None, \
                                 [optionsActor],None, \
@@ -4955,7 +4956,7 @@ class PubServer(BaseHTTPRequestHandler):
                 if self.server.debug:
                     print('Reporting '+optionsActor)
                 reportPath=self.path.replace('/personoptions','')+'/newreport'
-                msg=htmlNewPost(self.server.translate, \
+                msg=htmlNewPost(False,self.server.translate, \
                                 self.server.baseDir, \
                                 reportPath,None,[], \
                                 postUrl,pageNumber).encode()
diff --git a/webinterface.py b/webinterface.py
index 1b7fa3b8..b8d99418 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -913,7 +913,7 @@ def htmlSuspended(baseDir: str) -> str:
         suspendedForm+=htmlFooter()
     return suspendedForm
 
-def htmlNewPost(translate: {},baseDir: str, \
+def htmlNewPost(mediaInstance: bool,translate: {},baseDir: str, \
                 path: str,inReplyTo: str, \
                 mentions: [], \
                 reportUrl: str,pageNumber: int) -> str:
@@ -1108,10 +1108,12 @@ def htmlNewPost(translate: {},baseDir: str, \
     newPostForm+='    <input type="text" name="subject">'
     newPostForm+=''
     newPostForm+='    <br><label class="labels">'+placeholderMessage+'</label>'
-    if endpoint!='newquestion':
-        newPostForm+='    <textarea id="message" name="message" style="height:400px">'+mentionsStr+'</textarea>'
-    else:
-        newPostForm+='    <textarea id="message" name="message" style="height:100px">'+mentionsStr+'</textarea>'
+    messageBoxHeight=400
+    if mediaInstance:
+        messageBoxHeight=200
+    if endpoint=='newquestion':
+        messageBoxHeight=100
+    newPostForm+='    <textarea id="message" name="message" style="height:'+str(messageBoxHeight)+'px">'+mentionsStr+'</textarea>'
     newPostForm+=extraFields+dateAndLocation
     newPostForm+='    <div class="container">'
     newPostForm+='      <label class="labels">'+translate['Image description']+'</label>'