summaryrefslogtreecommitdiffstats
path: root/templates/about.html
blob: db8c764e93ead4ab6951fbe744bc328f585904ce (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
{% extends "base_content.html" %}
<!-- template about.html -->
{% load i18n %}
{% load extra_tags %}
{% load humanize %}
{% block title %}{% spaceless %}{% trans "About" %}{% endspaceless %}{% endblock %}
{% block forejs %}
{% endblock %}
{% block content %}
<div class="headNormal">
{% trans "About" %}
</div>

<div class="content">
<<<<<<< HEAD:templates/about.html
    <!-- default text
	<p>edit file templates/about.html. Below are just suggestions of what can go here</p>
	<p>what is your site for?</p>
	<p>how does it work? what are roles of members?</p>
	<p>is there a place to find out more about this website?</p>
    -->
    <p>{% blocktrans %}<strong>CNPROG <span class="orange">Q&amp;A</span></strong> is a collaboratively edited question
            and answer site created for the <strong>CNPROG</strong> community.
    {% endblocktrans %}
    </p>
    <p>{% blocktrans %}Here you can <strong>ask</strong> and <strong>answer</strong> questions, <strong>comment</strong>
    and <strong>vote</strong> for the questions of others and their answers. Both questions and answers
    <strong>can be revised</strong> and improved. Questions can be <strong>tagged</strong> with
    the relevant keywords to simplify future access and organize the accumulated material.{% endblocktrans %}
    </p>

    <p>{% blocktrans %}This <span class="orange">Q&amp;A</span> site is moderated by its members, hopefully - including yourself!
    Moderation rights are gradually assigned to the site users based on the accumulated <strong>"reputation"</strong>
    points. These points are added to the users account when others vote for his/her questions or answers.
    These points (very) roughly reflect the level of trust of the community.{% endblocktrans %}
    </p>
    <p>{% blocktrans %}No points are necessary to ask or answer the questions - so please -
    <strong><a href="{% url user_signin %}">join us!</a></strong>{% endblocktrans %}
    </p>
    <p>
        {% blocktrans %}
            If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
        {% endblocktrans %}
=======
    <p><strong>NMR Wiki <span class="orange">Q&amp;A</span></strong> is a collaboratively edited question
            and answer site created for the <strong>Magnetic Resonance</strong> community, i.e. those people who
            work in the fields of <strong>NMR</strong>, <strong>EPR</strong>, <strong>MRI</strong></strong>, etc.
            NMR Wiki Q&amp;A is affiliated with <strong><a href="http://nmrwiki.org">NMR Wiki</a></strong> -
            the public wiki knowledge base about the Magnetic Resonance, which currently counts ~300 registered users. The most useful information collected here
            will be further distilled on the wiki site.
    </p>
    <p>Here you can <strong>ask</strong> and <strong>answer</strong> questions, <strong>comment</strong>
    and <strong>vote</strong> for the questions of others and their answers. Both questions and answers
    <strong>can be revised</strong> and improved. Questions can be <strong>tagged</strong> with
    the relevant keywords to simplify future access and organize the accumulated material.
    </p>

    <p>This <span class="orange">Q&amp;A</span> site is moderated by its members, hopefully - including yourself!
    Moderation rights are gradually assigned to the site users based on the accumulated <strong>"reputation"</strong>
    points. These points are added to the users account when others vote for his/her questions or answers.
    These points (very) roughly reflect the level of trust of the community.
    </p>
    <p>No points are necessary to ask or answer the questions - so please -
    <strong><a href="{% url user_signin %}">join us!</a></strong>
    </p>
    <p>
            If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/about.html
    </p>
</div>
{% endblock %}
<!-- end template about.html -->