add preference whether the user prefers to send markdown messages.

diff --git a/webcit/messages.c b/webcit/messages.c
index 7ac906d62f6e5a673990cdeca684c58e1778d50f..3c3c92f6dd2f3b1aced34d0a484c81cfeee63278 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1366,6 +1366,10 @@ void display_enter(void)
        int i = 0;
        long replying_to;
 
+       int prefer_md;
+
+       get_pref_yesno("markdown", &prefer_md, 0);
+
        if (havebstr("force_room")) {
                gotoroom(sbstr("force_room"));
        }
@@ -1695,7 +1699,7 @@ void display_enter(void)
 
        begin_burst();
        output_headers(1, 0, 0, 0, 1, 0);
-       if (WCC->CurRoom.defview == VIEW_WIKIMD) 
+       if ((WCC->CurRoom.defview == VIEW_WIKIMD) || prefer_md)
                DoTemplate(HKEY("edit_markdown_epic"), NULL, &NoCtx);
        else
                DoTemplate(HKEY("edit_message"), NULL, &NoCtx);
@@ -2056,6 +2060,8 @@ InitModule_MSG
                           PRF_STRING, 
                           NULL);
        RegisterPreference("mailbox",_("Mailbox view mode"), PRF_STRING, NULL);
+       RegisterPreference("markdown",_("Prefer markdown editing"), PRF_YESNO, NULL);
+
 
        WebcitAddUrlHandler(HKEY("readnew"), "", 0, h_readnew, ANONYMOUS|NEED_URL);
        WebcitAddUrlHandler(HKEY("readold"), "", 0, h_readold, ANONYMOUS|NEED_URL);

diff --git a/webcit/static/t/prefs/box.html b/webcit/static/t/prefs/box.html
index ae7f1eb829b0869467f7423f1d96112f5f177f62..bb8758ef423b0322510c28d50ac430473dc02763 100644 (file)
--- a/webcit/static/t/prefs/box.html
+++ b/webcit/static/t/prefs/box.html
@@ -6,9 +6,9 @@
 <td>
   <input type="radio" name="roomlistview" VALUE="folders" 
         <?%("COND:PREF", 1, :"roomlistview", "folders", "checked", "")> 
-        ><?_("Tree (folders) view")></input>
+        ><?_("Tree (folders) view")>
   &nbsp;&nbsp;&nbsp;
-  <input type="radio" name="roomlistview" VALUE="rooms" <?%("COND:PREF", 1, :"roomlistview", "folders", "", "checked")><?%("COND:PREF", 1, :"roomlistview", "", "checked", "")>><?_("Table (rooms) view")></input>
+  <input type="radio" name="roomlistview" VALUE="rooms" <?%("COND:PREF", 1, :"roomlistview", "folders", "", "checked")><?%("COND:PREF", 1, :"roomlistview", "", "checked", "")>><?_("Table (rooms) view")>
 </td>
 </tr>
 
@@ -17,13 +17,11 @@
   <td>
        <input type="radio" name="calhourformat" VALUE="12" 
                <?%("COND:PREF", 1, :"calhourformat", "24", "", "checked")>
-               ><?_("12 hour (am/pm)")>
-       </input>
+               ><label><?_("12 hour (am/pm)")></label>
        &nbsp;&nbsp;&nbsp;
        <input type="radio" name="calhourformat" VALUE="24"
                <?%("COND:PREF", 1, :"calhourformat", "24", "checked", "")>
-               ><?_("24 hour")>
-       </input>
+               ><label><?_("24 hour")></label>
   </td>
 </tr>
 
@@ -171,18 +169,16 @@
 
        <input type="radio" id="no_sig" name="use_sig" VALUE="no" onChange="show_or_hide_sigbox();" 
 <?%("COND:PREF", 1, "use_sig", "yes", "", "checked")> >
-         <?_("No signature")>
-        </input>
-       &nbsp,&nbsp;&nbsp;
+         <label><?_("No signature")></label>
+       &nbsp;&nbsp;&nbsp;
        <input type="radio" id="yes_sig" name="use_sig" VALUE="yes" onChange="show_or_hide_sigbox();" 
               <?%("COND:PREF", 1, "use_sig", "yes", "checked", "")> >
                <div id="signature_box"><br>
                  <textarea name="signature" cols="40" rows="5"><?PREF:VALUE("signature")></textarea>
                </div>
-       </input>
+               <script type="text/javascript">show_or_hide_sigbox();</script>
   </td>
 </tr>
-<script type="text/javascript">show_or_hide_sigbox();</script>
 
 <tr class="even">
   <td><?PREF:DESCR("default_header_charset")></td>
@@ -195,16 +191,16 @@
     <td>
       <input type="radio" name="emptyfloors" VALUE="yes" 
             <?%("COND:PREF", 1, :"emptyfloors", "no", "", "checked")> 
-            ><?_("Yes")></input>
+            ><label><?_("Yes")></label>
       &nbsp;&nbsp;&nbsp;
-      <input type="radio" name="emptyfloors" VALUE="no"  <?%("COND:PREF", 1, :"emptyfloors", "no",  "checked", "")> ><?_("No")></input>
+      <input type="radio" name="emptyfloors" VALUE="no"  <?%("COND:PREF", 1, :"emptyfloors", "no",  "checked", "")> ><label><?_("No")></label>
 </td>
 </tr>
 
 <tr class="even">
   <td><?PREF:DESCR("defaultname")></td>
   <td>
-<select name="defaultname" size=1 id="from_id">
+<select name="defaultname" size=1 id="from_id_name">
 <?ITERATE("PREF:VALID:EMAIL:NAME", ="prefs_section_msg_sender_name_select")>
 </select>
 
@@ -214,7 +210,7 @@
 <tr class="odd">
   <td><?PREF:DESCR("defaulthandle")></td>
   <td>
-<select name="defaulthandle" size=1 id="from_id">
+<select name="defaulthandle" size=1 id="from_id_handle">
 <?ITERATE("PREF:VALID:EMAIL:NAME", ="prefs_section_msg_handle_select")>
 </select>
 
@@ -235,7 +231,7 @@
   <td>
      <input type="radio" id="m_client" name="mailbox" VALUE="client" 
         <?%("COND:PREF", 1, :"mailbox", "client", "checked", "")> 
-        ><label for="mailbox"><?_("Full-functionality")></label>
+        ><label for="m_client"><?_("Full-functionality")></label>
      <input type="radio" name="mailbox" id="m_cnosort" VALUE="client-nosort" 
         <?%("COND:PREF", 1, :"mailbox", "client", "", "checked")> 
         ><label for="m_cnosort"><?_("Safe mode")></label><br>
@@ -243,6 +239,16 @@
   </td>
 </tr>
 
+<tr class="even">
+  <td><?PREF:DESCR("markdown")></td>
+  <td>
+
+      <input type="radio" name="markdown" VALUE="yes" <?%("COND:PREF", 1, :"markdown", "yes", "checked", "")> ><label><?_("Yes")></label>
+      &nbsp;&nbsp;&nbsp;
+      <input type="radio" name="markdown" VALUE="no"  <?%("COND:PREF", 1, :"markdown", "no", "", "checked")> ><label><?_("No")></label>
+  </td>
+</tr>
+
 <tr class="odd">
   <td><?PREF:DESCR("icontheme")></td>
   <td>
@@ -258,3 +264,5 @@
   <input type="submit" name="change_button" value="<?_("Change")>">&nbsp;
   <input type="submit" name="cancel_button" value="<?_("Cancel")>">
 </div>
+</form>
+</div>

diff --git a/webcit/static/t/view_blog/comment_box.html b/webcit/static/t/view_blog/comment_box.html
index 1d60f40291df02e0f7183eb1e8b6f03b6288898c..d8fedefbbd2897222f7b3d1cc07d11e036add30b 100644 (file)
--- a/webcit/static/t/view_blog/comment_box.html
+++ b/webcit/static/t/view_blog/comment_box.html
@@ -11,6 +11,7 @@ function submit_comment() {
 <input type="hidden" name="postseq" value="<?DATE:NOW:NO>">
 <input type="hidden" name="nonce" value="<?NONCE>">
 <input type="hidden" name="force_room" value="<?THISROOM:NAME("X")>">
+<input type="hidden" name="markdown" value="1"/>
 <input type="hidden" name="references" id="comment_form_references" /><br>
 <input type="hidden" name="p" value="<?BSTR('p')>">
 <textarea name="msgtext" id="comment_form_msgtext" cols=80 rows=10 style="width:98%"