Skip to content
This repository

Minor CLA fixes #9

Merged
merged 3 commits into from over 2 years ago

2 participants

John Kalantzis Apostolis Bessas
John Kalantzis
jkal commented

Just a couple of small fixes in the CLA related templates.

Apostolis Bessas mpessas merged commit 17cbaff into from
Apostolis Bessas mpessas closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
11 transifex/addons/cla/templates/cla/access_control_additional.html
@@ -13,11 +13,12 @@
13 13 <p id="cla_checkbox">{{ form.cla_enable }}
14 14 {{ form.cla_enable.help_text }}</p>
15 15 <div id="cla_textarea" style="display: none;margin-top:1em;">
16   - <div class="clearfix" style="float:right;margin-right:18px;">
17   - <a id="cla_facebox" title="{% trans "Show full CLA text" %}" href="{{ project.cla.get_absolute_url }}">{% trans "Show full CLA text" %}</a>
18   -
19   - <a id="cla_facebox" title="{% trans "Show a list of users who have signed the CLA" %}" href="{{ project.cla.get_users_url }}">{% trans "Show CLA signees" %}</a>
20   - </div>
  16 + {% if project.cla %}
  17 + <div class="clearfix" style="float:right;margin-right:18px;">
  18 + <a id="cla_facebox" title="{% trans "Show full CLA text" %}" href="{{ project.cla.get_absolute_url }}">{% trans "Show full CLA text" %}</a>
  19 + <a id="cla_facebox" title="{% trans "Show a list of users who have signed the CLA" %}" href="{{ project.cla.get_users_url }}">{% trans "Show CLA signees" %}</a>
  20 + </div>
  21 + {% endif %}
21 22 <label for="id_cla_license_text">{{ form.cla_license_text.help_text }}:</label>
22 23 {% if form.cla_license_text.errors %}
23 24 <p class="fielderrors">
38 transifex/addons/cla/templates/project_cla.html
... ... @@ -1,5 +1,4 @@
1   -{% extends "projects/project_menu.html" %}
2   -{% comment %}This is the view under /projects/p/PROJECT_SLUG/cla{% endcomment %}
  1 +{% extends "base.html" %}
3 2 {% load i18n %}
4 3 {% load txcommontags %}
5 4
@@ -7,19 +6,36 @@
7 6
8 7 {% block title %}{{ block.super }} | {{ project.name }} | {% trans "CLA" %}{% endblock %}
9 8
10   -{% block breadcrumb %}{{ block.super }} &raquo; <a href="{{ project.get_absolute_url }}">{{ project.name }}</a> &raquo; {% trans "CLA" %}{% endblock %}
11   -
12 9 {% block extrajs %}
13   - {{ block.super }}
14   - <script type="text/javascript">
15   - $(document).ready(function(){
16   - $("a#cla_facebox").facebox();
17   - });
18   - </script>
  10 + {{ block.super }}
  11 + <script type="text/javascript">
  12 + $(document).ready(function(){
  13 + $("a#cla_facebox").facebox();
  14 + });
  15 + </script>
19 16 {% endblock %}
20 17
21   -{% block content_main %}
  18 +{% block content_title %}
  19 +{% with project.description as short_desc %}
  20 + <div class="lastchild-emf">
  21 + <h2 class="pagetitle{% if short_desc %} with_description{% endif %}">
  22 + {% block project_header %}
  23 + <span><a href="{{ project.get_absolute_url }}">{{ project.name }}</a></span>
  24 + {% endblock %}
  25 + </h2>
  26 +</div>
22 27
  28 +{% block current_description %}
  29 + {% if short_desc %}
  30 + <div class="description">
  31 + <p>{{ project.description }}</p>
  32 + </div>
  33 + {% endif %}
  34 +{% endblock %}
  35 +{% endwith %}
  36 +{% endblock %}
  37 +
  38 +{% block content_main %}
23 39 <div class="obj_bigdetails ui-tabs-panel">
24 40 <h2 class="name">
25 41 {% blocktrans with project.name as project_name %}{{ project_name }} CLA{% endblocktrans %}
68 transifex/addons/cla/templates/user_list.html
... ... @@ -1,41 +1,33 @@
1 1 {% load i18n %}
2 2 <div class="facebox-content">
3   - <h4>{% blocktrans with project.name as project_name %}{{ project_name }} CLA{% endblocktrans %}</h4>
4   - <div id='cla_signed'>
5   -
6   - <p class="infomsg">{% trans "Users that have signed the CLA:" %}</p>
7   - {% if signed_user_list %}
8   - <hr />
9   - <ul>
10   - {% for user in signed_user_list %}
11   - <li>
12   - <a href="{% url profile_public user.username %}">
13   - {{ user.username }}
14   - </a>
15   - </li>
16   - {% endfor %}
17   - </ul>
18   - {% else %}
19   - {% trans "No user has signed the CLA yet." %}
20   - {% endif %}
21   -
22   - </div>
23   -
24   - <div id='cla_unsigned'>
25   - <h3>{% trans "Users that have NOT signed the current CLA:" %}</h3>
26   - {% if unsigned_user_list %}
27   - <hr />
28   - <ul>
29   - {% for user in unsigned_user_list %}
30   - <li>
31   - <a href="{% url profile_public user.username %}">
32   - {{ user.username }}
33   - </a>
34   - </li>
35   - {% endfor %}
36   - </ul>
37   - {% else %}
38   - {% trans "No users without signing the CLA." %}
39   - {% endif %}
40   - </div>
  3 + <h4>{% blocktrans with project.name as project_name %}{{ project_name }} CLA{% endblocktrans %}</h4>
  4 + <div id='cla_signed'>
  5 + <h3>{% trans "Users that have signed the CLA:" %}</h3>
  6 + {% if signed_user_list %}
  7 + <ul>
  8 + {% for user in signed_user_list %}
  9 + <li>
  10 + <a href="{% url profile_public user.username %}">{{ user.username }}</a>
  11 + </li>
  12 + {% endfor %}
  13 + </ul>
  14 + {% else %}
  15 + {% trans "No user has signed the CLA yet." %}
  16 + {% endif %}
  17 + </div>
  18 +
  19 + <div id='cla_unsigned'>
  20 + <h3>{% trans "Users that have NOT signed the current CLA:" %}</h3>
  21 + {% if unsigned_user_list %}
  22 + <ul>
  23 + {% for user in unsigned_user_list %}
  24 + <li>
  25 + <a href="{% url profile_public user.username %}">{{ user.username }}</a>
  26 + </li>
  27 + {% endfor %}
  28 + </ul>
  29 + {% else %}
  30 + {% trans "No users without signing the CLA." %}
  31 + {% endif %}
  32 + </div>
41 33 </div>

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.