diff options
| author | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-08 21:44:10 -0300 |
|---|---|---|
| committer | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-08 21:44:10 -0300 |
| commit | 0161159eb5b84d11908c16c6c86f93e1a8ac3c18 (patch) | |
| tree | 871b0856af5e2dd5b816ee419857a38f80cd6b87 /templates/answer_edit_tips.html | |
| parent | 0b80e6ba3fa528df2fc64a1a2e3a9f58dec39ec5 (diff) | |
| parent | 46da3fdbe80ea1f6b9278d2671757d5fdb8abcfb (diff) | |
| download | askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.tar.gz askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.tar.bz2 askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.zip | |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG
* Merge of Spanish translation, still missing some texts.
* Custom colors for preguntalo project
Conflicts:
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
templates/content/style/style.css
Diffstat (limited to 'templates/answer_edit_tips.html')
| -rw-r--r-- | templates/answer_edit_tips.html | 87 |
1 files changed, 43 insertions, 44 deletions
diff --git a/templates/answer_edit_tips.html b/templates/answer_edit_tips.html index 3ab63f70..31f71e34 100644 --- a/templates/answer_edit_tips.html +++ b/templates/answer_edit_tips.html @@ -1,54 +1,53 @@ -<!-- template answer_edit_tips.html --> -{% load i18n %} -<div class="boxC"> - <p class="subtitle darkred">{% trans "answer tips" %}</p> - <div> - <ul class="list-item"> - <li> <b>{% trans "please make your answer relevant to this community" %}</b> - </li> - <li> - {% trans "try to give an answer, rather than engage into a discussion" %} - </li> - <li> - {% trans "please try to provide details" %} - </li> - <li> -{% trans "be clear and concise" %} - </li> - </ul> - <a href="/faq/" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a> - <br> - </div> -</div> - -<div class="boxC"> - <p class="subtitle">{% trans "Markdown tips" %}</p> - <ul class="list-item"> - <li> - {% trans "*italic* or __italic__" %} - </li> - <li> -{% trans "**bold** or __bold__" %} - </li> - <li> - <b>{% trans "link" %}</b>:[{% trans "text" %}](http://url.com/ "{% trans "title" %}") - - </li> - +<!-- template answer_edit_tips.html --> +{% load i18n %} +<div class="boxC"> + <p class="subtitle darkred">{% trans "answer tips" %}</p> + <div> + <ul class="list-item"> + <li> <b>{% trans "please make your answer relevant to this community" %}</b> + </li> + <li> + {% trans "try to give an answer, rather than engage into a discussion" %} + </li> + <li> + {% trans "please try to provide details" %} + </li> + <li> + {% trans "be clear and concise" %} + </li> + </ul> + <a href="/faq/" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a> + <br> + </div> +</div> + +<div class="boxC"> + <p class="subtitle">{% trans "Markdown tips" %}</p> + <ul class="list-item"> + <li> + {% trans "*italic* or __italic__" %} + </li> + <li> + {% trans "**bold** or __bold__" %} + </li> + <li> + <b>{% trans "link" %}</b>:[{% trans "text" %}](http://url.com/ "{% trans "title" %}") + + </li> <li> - <b>{% trans "image" %}</b>：![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}") + <b>{% trans "image" %}</b>:![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}") </li> <li> -{% trans "numbered list:" %} - 1. Foo - 2. Bar + {% trans "numbered list:" %} + 1. Foo + 2. Bar </li> <li> -{% trans "basic HTML tags are also supported" %} + {% trans "basic HTML tags are also supported" %} </li> </ul> <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank" style="float:right;position:relative">{% trans "learn more about Markdown" %} »</a> - <br> + <br> </div> -<!-- end template answer_edit_tips.html -->
\ No newline at end of file +<!-- end template answer_edit_tips.html --> |