diff --git a/pagure/default_config.py b/pagure/default_config.py index f783cb4..21046b1 100644 --- a/pagure/default_config.py +++ b/pagure/default_config.py @@ -311,9 +311,9 @@ ADMIN_API_ACLS = [ # Bootstrap URLS BOOTSTRAP_URLS_CSS = 'https://apps.fedoraproject.org/global/' \ - 'fedora-bootstrap-1.0.1/fedora-bootstrap.css' + 'fedora-bootstrap-1.1.1/fedora-bootstrap.css' BOOTSTRAP_URLS_JS = 'https://apps.fedoraproject.org/global/' \ - 'fedora-bootstrap-1.0.1/fedora-bootstrap.js' + 'fedora-bootstrap-1.1.1/fedora-bootstrap.js' # List of the type of CI service supported by this pagure instance PAGURE_CI_SERVICES = [] diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css index 4b5e156..2286633 100644 --- a/pagure/static/pagure.css +++ b/pagure/static/pagure.css @@ -384,54 +384,6 @@ color: #bbb; /* Added */ -.nav { - list-style: outside none none; -} -.nav-pills > li.active > a, .nav-pills > li.active > a:focus, .nav-pills > li.active > a:hover { - background-color: #337ab7; - color: #fff; -} -.nav > li { - display: block; - position: relative; -} -.nav-pills > li { - float: left; -} -.nav-pills > li > a { - border-radius: 4px; -} -.nav > li > a { - display: block; - padding: 10px 15px; - position: relative; -} - -btn-group-vertical > .btn-group::after, .btn-group-vertical > .btn-group::before, .btn-toolbar::after, .btn-toolbar::before, .clearfix::after, .clearfix::before, .container-fluid::after, .container-fluid::before, .container::after, .container::before, .dl-horizontal dd::after, .dl-horizontal dd::before, .form-horizontal .form-group::after, .form-horizontal .form-group::before, .modal-footer::after, .modal-footer::before, .modal-header::after, .modal-header::before, .nav::after, .nav::before, .navbar-collapse::after, .navbar-collapse::before, .navbar-header::after, .navbar-header::before, .navbar::after, .navbar::before, .pager::after, .pager::before, .panel-body::after, .panel-body::before, .row::after, .row::before { - content: " "; - display: table; -} -*::after, *::before { - box-sizing: border-box; -} -.btn-group-vertical > .btn-group::after, .btn-toolbar::after, .clearfix::after, .container-fluid::after, .container::after, .dl-horizontal dd::after, .form-horizontal .form-group::after, .modal-footer::after, .modal-header::after, .nav::after, .navbar-collapse::after, .navbar-header::after, .navbar::after, .pager::after, .panel-body::after, .row::after { - clear: both; -} -.btn-group-vertical > .btn-group::after, .btn-group-vertical > .btn-group::before, .btn-toolbar::after, .btn-toolbar::before, .clearfix::after, .clearfix::before, .container-fluid::after, .container-fluid::before, .container::after, .container::before, .dl-horizontal dd::after, .dl-horizontal dd::before, .form-horizontal .form-group::after, .form-horizontal .form-group::before, .modal-footer::after, .modal-footer::before, .modal-header::after, .modal-header::before, .nav::after, .nav::before, .navbar-collapse::after, .navbar-collapse::before, .navbar-header::after, .navbar-header::before, .navbar::after, .navbar::before, .pager::after, .pager::before, .panel-body::after, .panel-body::before, .row::after, .row::before { - content: " "; - display: table; -} -*::after, *::before { - box-sizing: border-box; -} -.bs-example > .alert:last-child, .bs-example > .form-control:last-child, .bs-example > .jumbotron:last-child, .bs-example > .list-group:last-child, .bs-example > .navbar:last-child, .bs-example > .panel:last-child, .bs-example > .progress:last-child, .bs-example > .table-responsive:last-child > .table, .bs-example > .table:last-child, .bs-example > .well:last-child, .bs-example > blockquote:last-child, .bs-example > ol:last-child, .bs-example > p:last-child, .bs-example > ul:last-child { - margin-bottom: 0; -} -.nav { - list-style: outside none none; - margin-bottom: 0; - padding-left: 0; -} #pr-tabs { diff --git a/pagure/templates/_browseheader.html b/pagure/templates/_browseheader.html index f50becb..b2e7dab 100644 --- a/pagure/templates/_browseheader.html +++ b/pagure/templates/_browseheader.html @@ -1,7 +1,7 @@ {% macro browse_header(select) -%} -
-
-
+
+
+ - - {% for item in field.data or [] %} - - {% endfor %} - - {% else %} - +
+ + {% for field in repo.issue_keys %} +
+ +
+

+ {% if field.name in knowns_keys %} + {% if field.key_type == 'link' %} + {% for link in knowns_keys[field.name].value.split(',') %} + {{ link }} +
+ {% endfor %} + {% else %} + {{ knowns_keys[field.name].value }} {% endif %} - {%- endif -%} /> - {% endif %} + {% endif %} +

+
- {% endif %} - {% endfor %} + {% if g.authenticated and g.repo_user %} +
+ + {% if field.key_type == 'list' %} + + {% else %} + + {% endif %} +
+ {% endif %} + {% endfor %} - - - cancel - - {% if g.authenticated and g.repo_user %} - - Edit Metadata + + + cancel - {% endif %} + {% if g.authenticated and g.repo_user %} + + Edit Metadata + + {% endif %} +
-
+ {% endif %}
- {% endif %} - -
+ + + + {% endblock %} @@ -591,7 +585,7 @@ function setup_reply_btns() { $( ".reply" ).click( function() { if ($(this).attr('data-toggle')){ - var _section = $(this).closest('.card-block'); + var _section = $(this).closest('.card-body'); } else { var _section = $(this).closest('.clearfix'); } diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html index c2e0cc7..4be0e5b 100644 --- a/pagure/templates/issues.html +++ b/pagure/templates/issues.html @@ -18,18 +18,18 @@ {% else %} {{ issues|count }} Issues (of {{ issues_cnt }}) {% endif %} -
+
{% if repo.milestones %} Roadmap + class="btn btn-outline-dark btn-sm">Roadmap {% endif %} {% if g.repo_admin %} - Add milestone @@ -37,7 +37,7 @@ {% if g.repo.reports %}
@@ -53,7 +53,7 @@
{% if oth_issues_cnt %} -
-
+
Open Closed All - Stats - +
- +
-
+
@@ -139,7 +139,7 @@ {% for tag in tag_list %} - - +
+
#{{ issue.id }} + #{{ issue.id }} {% if status != 'Open' %} - {{issue.close_status if issue.status == 'Closed' else issue.status }} {% endif %} {% if issue.private %} @@ -251,7 +251,7 @@ {% endif %} {% for tag in issue.tags %} - - +
+ Save report
diff --git a/pagure/templates/master.html b/pagure/templates/master.html index 93c15b5..9e75c06 100644 --- a/pagure/templates/master.html +++ b/pagure/templates/master.html @@ -29,85 +29,79 @@
-
+
- - -
+ {% endif %} + + -
+
{% with messages = get_flashed_messages(with_categories=true) %} {% if messages %}
-
+
{% for category, message in messages %}
-
+
-
+

Copyright © 2014-2018 Red Hat diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html index 1e0cb0f..f7931b5 100644 --- a/pagure/templates/new_issue.html +++ b/pagure/templates/new_issue.html @@ -18,7 +18,6 @@ {% block repo %} -

{% if not type or type == 'new' %}
{% endif %} +
@@ -43,7 +43,7 @@ Edit issue #{{ issueid }} {% endif %}
-
+
{{ render_bootstrap_field(form.title, field_description="Gist of your issue") }} {% if type == 'edit' %} {{ render_bootstrap_field(form.status, field_description="bug status") }} @@ -51,7 +51,7 @@ {% if types %}
- {% for type in types %} {% endfor %} @@ -111,7 +111,7 @@ {% if g.repo_user and not type or type == 'new' %}
-
+
@@ -135,6 +135,7 @@
{% endif %} +
{% if g.authenticated and g.repo_committer and type and type == 'edit' %} @@ -153,9 +154,6 @@ {{ form.csrf_token }} {% endif %} - -
- {% endblock %} {% block jscripts %} @@ -264,6 +262,10 @@ $(document).ready(function() { searchField: ["item"], }); + $("#priority").selectize({ + create: true + }); + $("#milestone").selectize(); {% endif %} }); diff --git a/pagure/templates/new_project.html b/pagure/templates/new_project.html index f89d9e4..4c1bdc4 100644 --- a/pagure/templates/new_project.html +++ b/pagure/templates/new_project.html @@ -7,13 +7,13 @@ {% block content %}
-
-
-
+
+
+
Create new Project
-
+
{{ render_bootstrap_field(form.name, field_description="the name of your project") }} {{ render_bootstrap_field(form.description, field_description="short description of the project") }} @@ -25,7 +25,7 @@ {% endif %} {{ render_bootstrap_field(form.create_readme, field_description="Create a README file automatically") }} - {{ form.csrf_token }}
diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html index 8c17f82..c0bf088 100644 --- a/pagure/templates/pull_request.html +++ b/pagure/templates/pull_request.html @@ -259,7 +259,7 @@ Files Changed  - + {{ diff|length if diff else 0}} @@ -267,7 +267,7 @@
  • Commits  - + {{ diff_commits|length }} diff --git a/pagure/templates/releases.html b/pagure/templates/releases.html index 47ebb3e..6f77943 100644 --- a/pagure/templates/releases.html +++ b/pagure/templates/releases.html @@ -54,7 +54,7 @@ namespace=repo.namespace, identifier=tag['object'].oid) }}">
    {{tag['date'] | humanize}} - + {{ tag['object'].oid | short }}
    diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index aca0684..3e02ec8 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -40,7 +40,7 @@ git push -u origin master {% else %}
    -
    +
    The {{repo.name}} project's README file is empty or unavailable.
    @@ -121,8 +121,12 @@ git push -u origin master {% endif %}
    • +
    +
    +
    +
    Contributors
    -
    +
    Branches
    -
    +
    {% if head %} - {% endblock %} {% block jscripts %} diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index 3925c68..55fe4f0 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -18,10 +18,10 @@ {% endif %} {% block content %} -
    +
    -

    +

    {% if repo.private %} @@ -42,7 +42,7 @@ namespace=repo.namespace) }}">{{ repo.name }} {% if g.authenticated %} -
    +
    {% if repo.settings.get('issue_tracker', True) and config.get('ENABLE_TICKETS', True)%} {{ g.forkbuttonform.csrf_token }} - + namespace=repo.namespace) }}" class="btn btn-sm btn-outline-dark"> View Fork @@ -112,7 +112,7 @@ namespace=repo.namespace) }}"> {{ g.forkbuttonform.csrf_token }} - {% endif %} @@ -172,6 +172,10 @@ {% if repo.description %}{{ repo.description | safe }}{% else %}-{% endif -%} {%- if repo.url %}  |  {{ repo.url }}{% endif %}
    +
    + {% if repo.description %}{{ repo.description | safe }}{% else %}-{% endif -%} + {%- if repo.url %}  |  {{ repo.url }}{% endif %} +

      @@ -184,8 +188,8 @@ repo=repo.name, username=username, namespace=repo.namespace) }}"> - - Overview + + Overview {% if config['DOC_APP_URL'] and repo and repo.settings.get('project_documentation', True) %} @@ -198,8 +202,8 @@ repo=repo.name, username=username, namespace=repo.namespace) }}"> - - Docs + + Docs {% endif %} @@ -215,8 +219,8 @@ username=username, namespace=repo.namespace, branchname=branchname) }}"> - - Commits + + Commits @@ -231,8 +235,8 @@ username=username, namespace=repo.namespace, identifier=branchname) }}"> - - Files + + Files @@ -245,8 +249,8 @@ repo=repo.name, username=username, namespace=repo.namespace) }}"> - - Releases + + Releases @@ -266,9 +270,9 @@ repo=repo.name, username=username, namespace=repo.namespace) }}"{% endif %}> - - Issues  - + + Issues  + {{ repo.open_tickets if g.repo_committer else repo.open_tickets_public }} @@ -285,9 +289,9 @@ repo=repo.name, username=username, namespace=repo.namespace) }}"> - - Pull Requests  - + + Pull Requests  + {{ repo.open_requests }} @@ -303,14 +307,14 @@ repo=repo.name, username=username, namespace=repo.namespace) }}"> - - Stats  + + Stats  {% if g.authenticated %} {% if g.repo_admin %} -
    • +
    • - Settings + Settings
      • {% endif %} @@ -342,9 +346,9 @@
    -
    +
    {% if repo.read_only %} -
    +
    {% endif %} {% if g.authenticated and repo.settings.get('pull_request_access_only') %} -
    +