diff --git a/pagure/static/koji.css b/pagure/static/koji.css index ad592f6..08b268f 100644 --- a/pagure/static/koji.css +++ b/pagure/static/koji.css @@ -1,3 +1,8 @@ +html +{ + font-size:14px; +} + .nav-tabs { border-bottom:none; @@ -9,6 +14,43 @@ border-bottom:1px solid #DDD; } -.highlighted-line { - background-color: #FFFABA; +.repo-name +{ + +} + +.code_table { + background: #FDF6E3; + min-width: 100%; +} + +.code_table tr td{ + padding: 0; +} + +.code_table tr td pre{ + padding: 0; + margin: 0; +} + +.code_table tr .cell1{ + width: 20px; + background: #eee8d5; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + text-align:center; +} + +.code_table tr .cell2{ + padding-left:15px; +} + +.code_table tr .cell1 a::before { + content: attr(data-line-number); + color:#91a1a1!important; + font-family: Hack; + padding-left:3px; + padding-right:3px; } diff --git a/pagure/static/pagure-logo.png b/pagure/static/pagure-logo.png index bdb3705..e3a2eea 100644 Binary files a/pagure/static/pagure-logo.png and b/pagure/static/pagure-logo.png differ diff --git a/pagure/templates/file.html b/pagure/templates/file.html index c7c74ca..54106f7 100644 --- a/pagure/templates/file.html +++ b/pagure/templates/file.html @@ -5,43 +5,45 @@ {% block repo %} - -

- {{ branchname }}/{% - for file in filename.split('/') %} - {% if loop.first %} - {% set path = file %} - {% else %} - {% set path = path + '/' + file %} - {% endif %} - {% if loop.index != loop.length %}{{ file }}/{% else %}{{ file }}{% endif %} - {% endfor %} -

+
+
+ {{ branchname }}/{% + for file in filename.split('/') %} + {% if loop.first %} + {% set path = file %} + {% else %} + {% set path = path + '/' + file %} + {% endif %} + {% if loop.index != loop.length %}{{ file }}/{% else %}{{ file }}{% endif %} + {% endfor %} + {% if content %} + {% if output_type == 'file' or output_type == 'binary' or output_type == 'image' %} +
+ {% if output_type=='file' and repo_admin %} + Edit + {% endif %} + Blob + Raw +
+ {% endif %} + {% endif %} +
{% if content %} {% if output_type == 'file' or output_type == 'binary' or output_type == 'image' %} -
-
-
    - {% if output_type=='file' and repo_admin %} -
  • Edit
    • - {% endif %} -
  • Blob
    • -
  • Raw
    • -
-
+
{% if output_type=='file' %} {% autoescape false %} {{ content | format_loc}} @@ -60,12 +62,8 @@

{% endif %} -
+
{% else %} -
-
- Current Tree -
@@ -90,11 +88,11 @@
-
{% endif %} {% else %} No content found in this repository {% endif %} + {% endblock %} diff --git a/pagure/templates/master.html b/pagure/templates/master.html index 2115790..6c55977 100644 --- a/pagure/templates/master.html +++ b/pagure/templates/master.html @@ -18,7 +18,7 @@
- +
@@ -98,6 +98,7 @@ pagure -- {{version}}

+

SSH Hostkey/Fingerprint

diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index bf5bcd2..719f834 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -24,143 +24,126 @@
-
- Admins -
-
-
{% for user in repo.users %} -
  • +
    - {{ user.user | avatar(32) | safe }} + {{ user.user | avatar(20) | safe }} {{ user.fullname }} ({{ user.user }}) -
    • +
    {% endfor %} {% for group in repo.groups %} -
  • +
    @{{ group.group_name }} -
    • +
    {% endfor %} - +

    - Recent Commits + GIT URLs
    -
    - {% for commit in last_commits %} -
  • - {{ commit.author | author2avatar(20) | safe }} - - {{ commit.hex|short }} - {% if diff_commits and commit.oid.hex in diff_commits %} - * - {% endif %} - {{ commit.message.split('\n')[0] }} - - {{ commit.commit_time|humanize }} - - -
    • - {% endfor %} -
    -
    +
    +
    +
    +
    SSH
    + +
    +
    +
    +
    +
    GIT
    + +
    +
    -
    -
    - Branches -
    -
    - {% for branch in branches %} -
  • - - {{ branch }} - - (commits) +
    + {% if config['DOC_APP_URL'] and repo and repo.settings.get('project_documentation', True) %} +

    Docs

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

    Tickets

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

    Requests

    +
    +
    +
    SSH
    + +
    +
    +
    +
    +
    GIT
    + +
    +
    +
    + -
    • - {% endfor %}
    - Branches + Recent Commits
    - - - - - - - - - - - - - - {% if config['DOC_APP_URL'] and repo and repo.settings.get('project_documentation', True) %} - - - - - - - {% endif %} - {% if config.get('ENABLE_TICKETS', True) %} - - - - - - - {% endif %} - - - - - - -
    Git URLsmore | - - SSH Hostkey/Fingerprint - -
    Project: - {{ config.get('GIT_URL_SSH') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git - - {{ config.get('GIT_URL_GIT') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git -
    Docs: - {{ config.get('GIT_URL_SSH') }}docs/{{ repo.fullname }}.git - - {{ config.get('GIT_URL_GIT') }}docs/{{ repo.fullname }}.git -
    Tickets: - {{ config.get('GIT_URL_SSH') }}tickets/{{ repo.fullname }}.git - - {{ config.get('GIT_URL_GIT') }}tickets/{{ repo.fullname }}.git -
    Requests: - {{ config.get('GIT_URL_SSH') }}requests/{{ repo.fullname }}.git - - {{ config.get('GIT_URL_GIT') }}requests/{{ repo.fullname }}.git -
    +
    + {% for commit in last_commits %} + +
    + {{ commit.message.split('\n')[0] }} + {% if diff_commits and commit.oid.hex in diff_commits %} + * + {% endif %} +
    +
    + {{ commit.commit_time|humanize }} +
    +     + {% endfor %} +
    -
    {% endif %} @@ -196,10 +179,35 @@ {% 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 %} -