From 4e5dede6421eb0ade1d883245c7454f5cf461e14 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Apr 12 2019 12:11:58 +0000 Subject: [PATCH 1/6] Make the side-bar a 2 units column Otherwise the width of the column is unset/flexible and when we add something that is a little too large, the column ends up taking the entire screen which doesn't look nice. Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/templates/commits.html b/pagure/templates/commits.html index a0735b2..faaf4ee 100644 --- a/pagure/templates/commits.html +++ b/pagure/templates/commits.html @@ -9,7 +9,7 @@ {% block repo %}
-
+
{% block overviewtabs %}{{ super() }}{% endblock %}
diff --git a/pagure/templates/file.html b/pagure/templates/file.html index 6a16801..520b03b 100644 --- a/pagure/templates/file.html +++ b/pagure/templates/file.html @@ -16,7 +16,7 @@ {% block repo %}
-
+
{% block overviewtabs %}{{ super() }}{% endblock %}
diff --git a/pagure/templates/releases.html b/pagure/templates/releases.html index efa7071..8d57109 100644 --- a/pagure/templates/releases.html +++ b/pagure/templates/releases.html @@ -6,7 +6,7 @@ {% block repo %}
-
+
{% block overviewtabs %}{{ super() }}{% endblock %}
diff --git a/pagure/templates/repo_branches.html b/pagure/templates/repo_branches.html index acb8776..4057b35 100644 --- a/pagure/templates/repo_branches.html +++ b/pagure/templates/repo_branches.html @@ -6,7 +6,7 @@ {% block repo %}
-
+
{% block overviewtabs %}{{ super() }}{% endblock %}
diff --git a/pagure/templates/repo_forks.html b/pagure/templates/repo_forks.html index 94f8ee6..5700d16 100644 --- a/pagure/templates/repo_forks.html +++ b/pagure/templates/repo_forks.html @@ -6,7 +6,7 @@ {% block repo %}
-
+
{% block overviewtabs %}{{ super() }}{% endblock %}
diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index b0ab2ce..ba61e59 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -24,7 +24,7 @@ {% block repo %}
-
+
{% block overviewtabs %}{{ super() }}{% endblock %}
diff --git a/pagure/themes/srcfpo/templates/repo_branches.html b/pagure/themes/srcfpo/templates/repo_branches.html index 929990a..529978a 100644 --- a/pagure/themes/srcfpo/templates/repo_branches.html +++ b/pagure/themes/srcfpo/templates/repo_branches.html @@ -17,7 +17,7 @@ {% block repo %}
-
+
{% block overviewtabs %}{{ super() }}{% endblock %}
diff --git a/pagure/themes/srcfpo/templates/repo_info.html b/pagure/themes/srcfpo/templates/repo_info.html index f0c1efe..c93a8a7 100644 --- a/pagure/themes/srcfpo/templates/repo_info.html +++ b/pagure/themes/srcfpo/templates/repo_info.html @@ -53,7 +53,7 @@ {% block repo %}
-
+
{% block overviewtabs %}{{ super() }}{% endblock %}
From a19da372af8a3e45004701606bc12e0da5bb9023 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Apr 12 2019 12:11:58 +0000 Subject: [PATCH 2/6] Move the side-bar of the repo_master into its own template This allows easier overriding of the template in other themes. Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index 355fe82..0c238c3 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -433,71 +433,5 @@ $("#pr-button").one("click", {% endblock %} {% block overviewtabs %} - +{% include 'repo_master_sidebar.html' %} {% endblock %} diff --git a/pagure/templates/repo_master_sidebar.html b/pagure/templates/repo_master_sidebar.html new file mode 100644 index 0000000..4790666 --- /dev/null +++ b/pagure/templates/repo_master_sidebar.html @@ -0,0 +1,67 @@ + From 2d13587196253861795f02031a061102f2be9eff Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Apr 12 2019 12:11:58 +0000 Subject: [PATCH 3/6] Only show settings for blueprints having a settings endpoint Otherwise 3rd party extensions that do not provide this settings endpoint ends up breaking the settings page. Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html index f7fc247..5c93c25 100644 --- a/pagure/templates/settings.html +++ b/pagure/templates/settings.html @@ -105,8 +105,7 @@ {% endif %} {% for blueprint in main_app.blueprints %} - {% if blueprint not in [ - 'api_ns', 'ui_ns', 'internal_ns', 'theme'] %} + {% if blueprint | hasattr('settings') %} + +  Overview + + +  Files + + +  Commits + + +  Branches + + +  Forks + + +  Releases + + + {% if 'distgit_ns' in main_app.blueprints and not repo.is_fork %} +
+

Monitoring status:

+
+ + + + +
+ +
+
+ +
+
+ No-Monitoring +
+
+ + +
+
+ +
+
+ Monitoring +
+
+ + +
+
+ +
+
+ monitoring and scratch builds +
+
+ +
+
+ + + {% endif %} + + From 012be929a6a088fd085dd46bcd2f2e834fdeb73a Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Apr 12 2019 12:11:58 +0000 Subject: [PATCH 5/6] Make the main_app variable accessible to all templates This way both the settings page and the sidebar can rely on it being available. Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/flask_app.py b/pagure/flask_app.py index b6dbcd3..8c31e08 100644 --- a/pagure/flask_app.py +++ b/pagure/flask_app.py @@ -241,6 +241,7 @@ def set_request(): flask.current_app.config["DB_URL"] ) + flask.g.main_app = flask.current_app flask.g.version = pagure.__version__ flask.g.confirmationform = pagure.forms.ConfirmationForm() diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html index 5c93c25..24ee38d 100644 --- a/pagure/templates/settings.html +++ b/pagure/templates/settings.html @@ -104,7 +104,7 @@ href="#deleteproject-tab" role="tab" aria-controls="deleteproject">Delete Project {% endif %} - {% for blueprint in main_app.blueprints %} + {% for blueprint in g.main_app.blueprints %} {% if blueprint | hasattr('settings') %}  Releases - {% if 'distgit_ns' in main_app.blueprints and not repo.is_fork %} + {% if 'distgit_ns' in g.main_app.blueprints and not repo.is_fork %}

Monitoring status:

diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index db1b3c6..40fc975 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -1262,7 +1262,6 @@ def view_settings(repo, username=None, namespace=None): plugins=plugins, branchname=branchname, pagure_admin=pagure.utils.is_admin(), - main_app=flask.current_app, ) From 8de16f07707eff63873352abf7e5198fd28d0779 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Apr 12 2019 12:11:58 +0000 Subject: [PATCH 6/6] Fix tests for the change in indentation in the html Signed-off-by: Pierre-Yves Chibon --- diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 7759e40..b23643d 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -2835,20 +2835,20 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '\n \n  Commits' - '\n ', output_text) + '\n ', output_text) #View the commit when branch name is wrong, show the commit output = self.app.get('/test/c/%s?branch=abcxyz' % commit.oid.hex) self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '\n \n  Commits' - '\n ', output_text) + '\n \n', output_text) # Add a fork of a fork item = pagure.lib.model.Project( @@ -2899,21 +2899,21 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '\n ' + '\n ' ' Commits' - '\n ', output_text) + '\n \n', output_text) #View the commit of the fork when branch name is wrong output = self.app.get('/fork/pingou/test3/c/%s?branch=abcxyz' % commit.oid.hex) self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '\n \n  Commits' - '\n ', output_text) + '\n ', output_text) def test_view_commit_with_full_link(self): """ Test the view_commit endpoint when the commit message includes