Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Point users to commercial solution for their private repositories #5849

Merged
merged 6 commits into from Jul 22, 2019

Conversation

@Abhi-khandelwal
Copy link
Contributor

@Abhi-khandelwal Abhi-khandelwal commented Jun 26, 2019

Fix #5770


{% blocktrans %}
Here only public repositories are listed, If you want to find your private
repositories, you can find on <a href="https://travis-ci.com/">trvais-ci.com</a>
Copy link
Member

@saadmk11 saadmk11 Jun 26, 2019

The URL should point to readthedocs.com the commercial service of ReadtheDocs. Also we need to make sure the message does not appear on the commercial website.

Copy link
Contributor Author

@Abhi-khandelwal Abhi-khandelwal Jun 26, 2019

Ohk sir , I will change the url from travis-ci.com to readthedocs.com and second thing , Can you please tell me that where can I access commercial website? in source code so that I can fix this.

Copy link
Member

@stsewd stsewd Jun 26, 2019

The source code from the commercial site is private, you can add an named block like https://github.com/rtfd/readthedocs.org/blob/c0bcb243b14b465695cacf9aab644da23c411ca7/readthedocs/templates/projects/project_import.html#L216 so we can override that value in the other template

Copy link
Contributor Author

@Abhi-khandelwal Abhi-khandelwal Jun 26, 2019

Ohk thanks @stsewd

@@ -70,7 +70,10 @@
</span>

<h1>{% trans "Import a Repository" %}</h1>

{% block non-commercial %}
Copy link
Member

@stsewd stsewd Jun 26, 2019

The translation block shouldn't be removed. And the block name could be something like import-tip or something like that

Copy link
Contributor Author

@Abhi-khandelwal Abhi-khandelwal Jun 26, 2019

Can I use? {% blocktrans import-public-repo %} ?

@Abhi-khandelwal
Copy link
Contributor Author

@Abhi-khandelwal Abhi-khandelwal commented Jun 29, 2019

Hello @saadmk11 , Do I have to make more changes?

Copy link
Member

@saadmk11 saadmk11 left a comment

Thank you for your contribution. 💯
Looks good. what do you think? @stsewd

<p>
{% blocktrans trimmed %}
Here only public repositories are listed, If you want to find your private
repositories, you can find on <a href="https://readthedocs.com/">readthedocs.com</a>.
Copy link
Member

@saadmk11 saadmk11 Jun 29, 2019

Suggested change
repositories, you can find on <a href="https://readthedocs.com/">readthedocs.com</a>.
repositories, you can find them on <a href="https://readthedocs.com/">readthedocs.com</a>.

@@ -70,7 +70,16 @@
</span>

<h1>{% trans "Import a Repository" %}</h1>

{% block import-repo %}
Copy link
Member

@saadmk11 saadmk11 Jun 29, 2019

I think you should put your code inside

{% if has_connected_accounts %}
    .....
{% endif %}

Copy link
Contributor Author

@Abhi-khandelwal Abhi-khandelwal Jun 29, 2019

ohk

Copy link
Contributor Author

@Abhi-khandelwal Abhi-khandelwal Jun 29, 2019

What message should I put in else condition ?

Copy link
Member

@saadmk11 saadmk11 Jun 29, 2019

just wrap your code with the condition.

{% if has_connected_accounts %}
    <your code>
{% endif %}

Copy link
Contributor Author

@Abhi-khandelwal Abhi-khandelwal Jul 2, 2019

Hi @stsewd , Do I have to make more changes?

Copy link
Member

@humitos humitos left a comment

This looks good. I think we can improve the block name before merging.

Also, I'd like @davidfischer to take a look at the copy of the message since he will probably have some suggestions on how to communicate this better.

@@ -70,7 +70,18 @@
</span>

<h1>{% trans "Import a Repository" %}</h1>

{% if has_connected_accounts %}
{% block import-repo %}
Copy link
Member

@humitos humitos Jul 11, 2019

The block name could be a little more descriptive, like "private-repo-tip" or similar.

@davidfischer
Copy link
Contributor

@davidfischer davidfischer commented Jul 16, 2019

How about something like:

We're only showing your public repositories. For private projects and many of features, please use <a href="#">Read the Docs for Business</a>.

Copy link
Contributor

@davidfischer davidfischer left a comment

Copy looks great!

Copy link
Member

@saadmk11 saadmk11 left a comment

Good Work Thanks 💯

@Abhi-khandelwal
Copy link
Contributor Author

@Abhi-khandelwal Abhi-khandelwal commented Jul 17, 2019

Thank you @saadmk11

@Abhi-khandelwal
Copy link
Contributor Author

@Abhi-khandelwal Abhi-khandelwal commented Jul 19, 2019

@humitos , Do I need to make some changes ?

@humitos
Copy link
Member

@humitos humitos commented Jul 22, 2019

No! This is great! Thanks for your collaboration!

@Abhi-khandelwal
Copy link
Contributor Author

@Abhi-khandelwal Abhi-khandelwal commented Jul 22, 2019

No! This is great! Thanks for your collaboration!

your welcome :)

@humitos humitos merged commit 42a46a4 into readthedocs:master Jul 22, 2019
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

5 participants