From c0bcb243b14b465695cacf9aab644da23c411ca7 Mon Sep 17 00:00:00 2001 From: Abhi-khandelwal Date: Wed, 26 Jun 2019 11:24:45 +0530 Subject: [PATCH 1/6] Point users to commercial solution for their private repositories --- readthedocs/templates/projects/project_import.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/readthedocs/templates/projects/project_import.html b/readthedocs/templates/projects/project_import.html index be3c351480d..9e9181d7cfc 100644 --- a/readthedocs/templates/projects/project_import.html +++ b/readthedocs/templates/projects/project_import.html @@ -70,7 +70,10 @@

{% trans "Import a Repository" %}

- + {% blocktrans %} + Here only public repositories are listed, If you want to find your private + repositories, you can find on trvais-ci.com + {% endblocktrans %}
From 04f0e338e81dd6635b953bd47249d2e858e6f777 Mon Sep 17 00:00:00 2001 From: Abhi-khandelwal Date: Wed, 26 Jun 2019 22:36:17 +0530 Subject: [PATCH 2/6] change block-name --- readthedocs/templates/projects/project_import.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readthedocs/templates/projects/project_import.html b/readthedocs/templates/projects/project_import.html index 9e9181d7cfc..79d0c94299c 100644 --- a/readthedocs/templates/projects/project_import.html +++ b/readthedocs/templates/projects/project_import.html @@ -70,10 +70,10 @@

{% trans "Import a Repository" %}

- {% blocktrans %} + {% block non-commercial %} Here only public repositories are listed, If you want to find your private - repositories, you can find on trvais-ci.com - {% endblocktrans %} + repositories, you can find on readthedocs.com. + {% endblock %}
From 5e7e9013f5dad84c9b014e4ebe07e6a350c9eec4 Mon Sep 17 00:00:00 2001 From: Abhi-khandelwal Date: Wed, 26 Jun 2019 22:52:03 +0530 Subject: [PATCH 3/6] add translation block --- readthedocs/templates/projects/project_import.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readthedocs/templates/projects/project_import.html b/readthedocs/templates/projects/project_import.html index 79d0c94299c..0f0395c45d7 100644 --- a/readthedocs/templates/projects/project_import.html +++ b/readthedocs/templates/projects/project_import.html @@ -70,10 +70,10 @@

{% trans "Import a Repository" %}

- {% block non-commercial %} + {% blocktrans import-tip %} Here only public repositories are listed, If you want to find your private repositories, you can find on readthedocs.com. - {% endblock %} + {% endblocktrans %}
From fd0568f13bf6569d00bea81c230b2ba3c1a8a206 Mon Sep 17 00:00:00 2001 From: Abhi-khandelwal Date: Wed, 26 Jun 2019 23:50:24 +0530 Subject: [PATCH 4/6] add block --- readthedocs/templates/projects/project_import.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/readthedocs/templates/projects/project_import.html b/readthedocs/templates/projects/project_import.html index 0f0395c45d7..dd83cbd52dc 100644 --- a/readthedocs/templates/projects/project_import.html +++ b/readthedocs/templates/projects/project_import.html @@ -70,10 +70,16 @@

{% trans "Import a Repository" %}

- {% blocktrans import-tip %} - Here only public repositories are listed, If you want to find your private - repositories, you can find on readthedocs.com. - {% endblocktrans %} + {% block import-repo %} +
+

+ {% blocktrans trimmed %} + Here only public repositories are listed, If you want to find your private + repositories, you can find on readthedocs.com. + {% endblocktrans %} +

+
+ {% endblock %}
From 6b1e2ddb825fa5ce2f48f8f681dca3c738159bcb Mon Sep 17 00:00:00 2001 From: Abhi-khandelwal Date: Sat, 29 Jun 2019 15:33:51 +0530 Subject: [PATCH 5/6] add an condition for connected_accounts --- .../templates/projects/project_import.html | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/readthedocs/templates/projects/project_import.html b/readthedocs/templates/projects/project_import.html index dd83cbd52dc..6e85a1846c1 100644 --- a/readthedocs/templates/projects/project_import.html +++ b/readthedocs/templates/projects/project_import.html @@ -70,16 +70,18 @@

{% trans "Import a Repository" %}

- {% block import-repo %} -
-

- {% blocktrans trimmed %} - Here only public repositories are listed, If you want to find your private - repositories, you can find on readthedocs.com. - {% endblocktrans %} -

-
- {% endblock %} + {% if has_connected_accounts %} + {% block import-repo %} +
+

+ {% blocktrans trimmed %} + Here only public repositories are listed, If you want to find your private + repositories, you can find them on readthedocs.com. + {% endblocktrans %} +

+
+ {% endblock %} + {% endif %}
From d5411a5e09d7a52ac5c0ccaaf06f7b96dfd57b85 Mon Sep 17 00:00:00 2001 From: Abhi-khandelwal Date: Wed, 17 Jul 2019 16:42:39 +0530 Subject: [PATCH 6/6] change paragraph message --- readthedocs/templates/projects/project_import.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/readthedocs/templates/projects/project_import.html b/readthedocs/templates/projects/project_import.html index 6e85a1846c1..5fc099fe3be 100644 --- a/readthedocs/templates/projects/project_import.html +++ b/readthedocs/templates/projects/project_import.html @@ -70,13 +70,14 @@

{% trans "Import a Repository" %}

+ {% if has_connected_accounts %} - {% block import-repo %} + {% block private-repo-tip %}

{% blocktrans trimmed %} - Here only public repositories are listed, If you want to find your private - repositories, you can find them on readthedocs.com. + We're only showing public repositories. For private projects and many of features, + please use Read the Docs for Business. {% endblocktrans %}