From a848f024500d284958d972bfcff02ab671ab2eb3 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Dec 24 2015 09:22:01 +0000 Subject: Update the repo_info template to what it should be and got lost over the rebase --- diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index 390e8e0..06f1e90 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -75,36 +75,74 @@ {% endfor %} {% endif %} - -
-
-
- {%- if repo.url %} -

Project Website

-

{{ repo.url }}

- {% endif %} -

Admins

-

-

- {{ repo.user.user | avatar(20) | safe }} - {{ repo.user.fullname }} ({{ repo.user.user }}) - creator -
- {% for user in repo.users %} -
- - {{ user.user | avatar(20) | safe }} - {{ user.fullname }} ({{ user.user }}) + + {% if total_page %} +
- {% endfor %} - {% for group in repo.groups %} -
- - @{{ group.group_name }} + +
  • page {{ page }} of {{total_page}}
    • +
  • = total_page %}class="disabled"{%endif%}> + + + Older -
    • - {% endfor %} -

    + + + + {% endif %} + {% endif %} + + {% if origin == 'view_repo' or origin == 'view_repo_branch' %} + + {% if readme %} +
    +
    + {% if safe %} + {{ readme | noJS |safe }} + {% else %} + {{ readme | noJS }} + {% endif %} +
    +
    + {% endif %} + +
    +
    +
    + {%- if repo.url %} +

    Project Website

    +

    {{ repo.url }}

    + {% endif %} +

    Admins

    +

    +

    + {% for user in repo.users %} + + {% endfor %} + {% for group in repo.groups %} + + {% endfor %} +

    @@ -125,57 +163,58 @@
    - -
    - {% if config['DOC_APP_URL'] and repo and repo.settings.get('project_documentation', True) %} -

    Docs

    -
    -
    -
    SSH
    - + {% if authenticated and repo_admin %} +
    + {% if config['DOC_APP_URL'] and repo and repo.settings.get('project_documentation', True) %} +

    Docs

    +
    +
    +
    SSH
    + +
    -
    -
    -
    -
    GIT
    - +
    +
    +
    GIT
    + +
    -
    - {%endif%} - {% if config.get('ENABLE_TICKETS', True) %} -

    Tickets

    -
    -
    -
    SSH
    - + {%endif%} + {% if config.get('ENABLE_TICKETS', True) %} +

    Tickets

    +
    +
    +
    SSH
    + +
    -
    -
    -
    -
    GIT
    - +
    +
    +
    GIT
    + +
    -
    - {%endif%} -

    Requests

    -
    -
    -
    SSH
    - + {%endif%} +

    Requests

    +
    +
    +
    SSH
    + +
    -
    -
    -
    -
    GIT
    - +
    +
    +
    GIT
    + +
    -
    - - + + {% endif %}
    + {% if repo_obj and not repo_obj.is_empty %}
    Recent Commits @@ -204,87 +243,6 @@ {% endif %}
    - -{% if repo_obj and repo_obj.is_empty %} - -
    -

    This repo is brand new!

    - -

    If you already have a git repo:

    - 
    -      git remote add origin {{ config.get('GIT_URL_SSH') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
-      git push -u origin master
-
    - -

    If you have not created your git repo yet:

    - 
    -      git clone {{ config.get('GIT_URL_SSH') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
-      cd {{ repo.name }}
-      touch README.rst
-      git add README.rst
-      git commit -m "Add README file"
-      git push -u origin master
-
    - - -

    - Note, you may want to checkout out the - SSH Hostkey/Fingerprint - information page -

    -
    - -{% else %} - {% if origin == 'view_commits' %} -
    - {% for commit in last_commits %} - - {% if diff_commits and commit.oid.hex in diff_commits %} -
    - {% endif %} -
    - {{ commit.message.split('\n')[0] }} -
    - - - {{ commit.commit_time|humanize }} - -
    -
    - {{ commit.author | author2avatar(20) | safe }} {{ commit.author.name }} -
    - {{ commit.hex|short }} -
    -     - {% endfor %} -
    - {% endif %} - - {% if total_page %} - - - {% endif %} - -{% endif %} - {% endblock %} {% block jscripts %}