diff --git a/i2p2www/pages/global/footer.html b/i2p2www/pages/global/footer.html index 47b3135d251d47a90ffac7550bc0cf7a2bc6242b..ecf1d420a7f926959fe1c9d1e1d78eb77c7f21ec 100644 --- a/i2p2www/pages/global/footer.html +++ b/i2p2www/pages/global/footer.html @@ -4,6 +4,7 @@ <li><a href="https://reddit.com/r/i2p"><div class="footeritem"><img class="socialfooter" src="/_static/images/social/reddit-alien-brands.png"><span>Reddit</span></div></a></li> <li><a href="https://twitter.com/i2p"><div class="footeritem"><img class="socialfooter" src="/_static/images/social/twitter-brands.png"><span>Twitter</span></div></a></li> + <li><a href="https://i2pgit.org/"><div class="footeritem"><img class="socialfooter" src="/_static/images/social/gitlab-brands.png"><span>Gitlab</span></div></a></li> </ul> </div> <div id="footermenu" class="second"> diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html index 5bdc9c00eb434f2a590746178242cfc6d1c5b0e5..533ee15ba27c5d187cfb6259762e061cfb942556 100644 --- a/i2p2www/pages/global/nav.html +++ b/i2p2www/pages/global/nav.html @@ -101,6 +101,7 @@ </li> <li class="has-sub"><div class="menuitem"><span>{{ _('Develop') }}</span></div> <ul> + <li><a href="https://i2pgit.org"><div class="menuitem"><span>{{ _('Gitlab') }}</span></div></a></li> <li class="has-sub"><div class="menuitem"><span>{{ _('Docs') }}</span></div> <ul> <li><a href="{{ site_url('docs') }}"><div class="menuitem"><span>{{ _('Documentation index') }}</span></div></a></li> diff --git a/i2p2www/pages/site/docs/applications/git.html b/i2p2www/pages/site/docs/applications/git.html index 2cb35ff513d53cf15b43a3446312d12bb82416a3..2c9e619a937b0fcc7ca844c5b228cf72a90ccadf 100644 --- a/i2p2www/pages/site/docs/applications/git.html +++ b/i2p2www/pages/site/docs/applications/git.html @@ -7,8 +7,19 @@ <p>{% trans -%} Tutorial for setting up git access through an I2P Tunnel. This tunnel will act as your access point to a single git service on I2P. {%- endtrans %}</p> <b>{% trans -%} If you intend to use the service at i2pgit.org/git.idk.i2p, then you probably already have a tunnel configured and much of this tutorial will not apply to you.{%- endtrans %}</b> -<h2 id="first-set-up-an-account-at-a-git-service">First: Set up an account at a Git service</h2> +<h2 id="first-set-up-an-account-at-a-git-service">{% trans -%}First: Set up an account at a Git service{%- endtrans %}</h2> <p>{% trans -%} To create your repositories on a remote git service, sign up for a user account at that service. Of course it’s also possible to create repositories locally and push them to a remote git service, but most will require an account and for you to create a space for the repository on the server. Gitlab has a very simple sign-up form: {%- endtrans %}</p> +<p>{% trans -%}These are generic instructions for any in-i2p Git instance with HTTP and SSH gateways. +If you intend to contribute to I2P, you should create an account at the I2P gitlab, which is open to the +community. Account registration may take a few days to complete, as the admin needs to sort through a large +number of spam registrations. You can help this by getting in touch with the admin to confirm you are human +using the instructions on the home page.{%- endtrans %}</p> +<ul> +<li><strong><a href="http://git.idk.i2p">{% trans %}Inside I2P - (http://git.idk.i2p){% endtrans %}</a></strong> +</li> +<li><strong><a href="https://i2pgit.org">{% trans %}Outside I2P - (https://i2pgit.org){% endtrans %}</a></strong> +</li> +</ul> <figure> <img src="/_static/images/git/register.png" alt="" /><figcaption>Registration is easy!</figcaption> </figure> diff --git a/i2p2www/pages/site/get-involved/index.html b/i2p2www/pages/site/get-involved/index.html index 8598cf082c3e8fdb6ce1db77d898cfcc27d91658..7398eab3425251958089a0160b6919129ebd2b1e 100644 --- a/i2p2www/pages/site/get-involved/index.html +++ b/i2p2www/pages/site/get-involved/index.html @@ -17,6 +17,13 @@ Other contact information is maintained on <a href="{{ team }}">this page</a>. If you're interested in development, <a href="{{ team }}">please get in touch as we're always looking for new contributors.</a> {%- endtrans %}</p> +<h3>{% trans %}Join us on our Gitlab{% endtrans %}</h3> +<ul> +<li><strong><a href="http://git.idk.i2p">{% trans %}Inside I2P - (http://git.idk.i2p){% endtrans %}</a></strong> +</li> +<li><strong><a href="https://i2pgit.org">{% trans %}Outside I2P - (https://i2pgit.org){% endtrans %}</a></strong> +</li> +</ul> <p>{% trans -%} We need help in many areas, and you don't need to know Java to contribute. Here's a list to help get you started. diff --git a/i2p2www/pages/site/index.html b/i2p2www/pages/site/index.html index 4d35fb96ef379265ed5188da56f6ccc7096dc458..2435aeaf3bfd845cfa005b2c4143c4dccf1b6d3f 100644 --- a/i2p2www/pages/site/index.html +++ b/i2p2www/pages/site/index.html @@ -36,7 +36,7 @@ <a href="https://geti2p.net/en/docs/transport">Read the I2P Transport Overview</a></p> <h1>Built For Communication</h1> - <p>I2P has an application layer with easy to use <a href="https://geti2p.net/en/docs/api/i2ptunnel">API’s for creating your own privacy - aware apps.</a></p> + <p>I2P has an application layer with easy to use <a href="https://geti2p.net/en/docs/api/i2ptunnel">APIs for creating your own privacy - aware apps.</a></p> </div> <div class="aside"> <a href="{{ url_for('blog_atom', lang=g.lang) }}" class="feed-icon" title="{{ _('I2P Blog ATOM Feed') }}">{{ _('I2P Blog ATOM Feed') }}</a> diff --git a/i2p2www/static/images/social/contact.png b/i2p2www/static/images/social/contact.png index 07c75305b95a6959e9879bc887db7c6b368e401e..1427fbc52641e84417f25737b5474644b344b399 100644 Binary files a/i2p2www/static/images/social/contact.png and b/i2p2www/static/images/social/contact.png differ diff --git a/i2p2www/static/images/social/forum.png b/i2p2www/static/images/social/forum.png index 0cad641e8e8a910e185c15b49d00e2e9617a01b0..1a331d9f99632a3d573a47b3f9d792fe04ecc9d8 100644 Binary files a/i2p2www/static/images/social/forum.png and b/i2p2www/static/images/social/forum.png differ diff --git a/i2p2www/static/images/social/gitlab-brands.png b/i2p2www/static/images/social/gitlab-brands.png new file mode 100644 index 0000000000000000000000000000000000000000..47fdbb47978452f50bf992614d983c20639673b7 Binary files /dev/null and b/i2p2www/static/images/social/gitlab-brands.png differ diff --git a/i2p2www/static/images/social/reddit-alien-brands.png b/i2p2www/static/images/social/reddit-alien-brands.png index c49521713d937a9125a906b69f991ce49029f735..8e2615c8e3d9f11cf182ea776a294873f2b775a8 100644 Binary files a/i2p2www/static/images/social/reddit-alien-brands.png and b/i2p2www/static/images/social/reddit-alien-brands.png differ diff --git a/i2p2www/static/images/social/twitter-brands.png b/i2p2www/static/images/social/twitter-brands.png index d25f05fc4df69232dab5e668b8bd8c7ed74eb67b..3137465c981e9b553f08d6426dc05ee2f229da77 100644 Binary files a/i2p2www/static/images/social/twitter-brands.png and b/i2p2www/static/images/social/twitter-brands.png differ