From 5e186ee612e7f2239d253cae0dd8103cec81176b Mon Sep 17 00:00:00 2001 From: Chad Birch Date: Tue, 26 Mar 2013 16:39:05 -0600 Subject: [PATCH] Add some info and link to wiki in formatting help --- r2/r2/lib/strings.py | 1 + r2/r2/public/static/css/reddit.less | 24 +++--- r2/r2/templates/usertext.compact | 4 +- r2/r2/templates/usertext.html | 126 ++++++++++++++-------------- 4 files changed, 82 insertions(+), 73 deletions(-) diff --git a/r2/r2/lib/strings.py b/r2/r2/lib/strings.py index ba15189d38..ac87411f20 100644 --- a/r2/r2/lib/strings.py +++ b/r2/r2/lib/strings.py @@ -130,6 +130,7 @@ invalid_search_query = _("I couldn't understand your query, so I simplified it and searched for \"%(clean_query)s\" instead."), completely_invalid_search_query = _("I couldn't understand your search query. Please try again."), search_help = _("You may also want to check the [search help page](%(search_help)s) for more information."), + formatting_help_info = _('reddit uses a slightly-customized version of [Markdown](http://daringfireball.net/projects/markdown/syntax) for formatting. See below for some basics, or check [the commenting wiki page](/wiki/commenting) for more detailed help and solutions to common issues.'), generic_quota_msg = _("You've submitted too many links recently. Please try again in an hour."), verified_quota_msg = _("Looks like you're either a brand new user or your posts have not been doing well recently. You may have to wait a bit to post again. In the meantime feel free to [check out the reddiquette](%(reddiquette)s) or join the conversation in a different thread."), unverified_quota_msg = _("Looks like you're either a brand new user or your posts have not been doing well recently. You may have to wait a bit to post again. In the meantime feel free to [check out the reddiquette](%(reddiquette)s), join the conversation in a different thread, or [verify your email address](%(verify)s)."), diff --git a/r2/r2/public/static/css/reddit.less b/r2/r2/public/static/css/reddit.less index eaed195e1e..2da23465a2 100755 --- a/r2/r2/public/static/css/reddit.less +++ b/r2/r2/public/static/css/reddit.less @@ -3741,18 +3741,20 @@ ul.tabmenu.formtab { width: 100%; } -.usertext table.markhelp { - background-color: white; - margin: 5px 0px; - width: 100%; -} - -.usertext .markhelp, -.usertext .markhelp td, -.usertext .markhelp tr { - border: 1px solid #C0C0C0; +.usertext .markhelp { padding: 4px; - margin: 0px; + margin: 5px 0px; + border-top: 1px dotted #c0c0c0; + + table { + width: 100%; + margin: 5px 0px; + } + + tr, td { + width: 50%; + border: 1px solid #c0c0c0; + } } .usertext .markhelp .spaces {background-color: #c0c0c0} diff --git a/r2/r2/templates/usertext.compact b/r2/r2/templates/usertext.compact index 9b5a8964cc..3675491f23 100644 --- a/r2/r2/templates/usertext.compact +++ b/r2/r2/templates/usertext.compact @@ -22,11 +22,12 @@ <%! from r2.lib.filters import unsafe, safemarkdown, keep_space + from r2.lib.strings import strings from r2.lib.utils import randstr %> <%namespace file="printablebuttons.html" import="toggle_button" /> -<%namespace file="utils.html" import="error_field"/> +<%namespace file="utils.html" import="error_field, md"/> <%def name="action_button(name, btn_type, onclick, display)">