home » zplus/clif.git
Author zPlus <zplus@peers.community> 2022-07-29 12:12:33
Committer zPlus <zplus@peers.community> 2022-07-29 12:12:33
Commit d006c2a (patch)
Tree 7f82d07
Parent(s)

Fix some UI display issues. This is only a small patch for fixing some minor issues with how repositories names are shown on the UI.


commits diff: d358548..d006c2a
4 files changed, 11 insertions, 8 deletionsdownload


Diffstat
-rw-r--r-- templates/about.html 3
-rw-r--r-- templates/mailing_list/emails.html 2
-rw-r--r-- templates/mailing_list/mailing_list.html 4
-rw-r--r-- web.py 10

Diff options
View
Side
Whitespace
Context lines
Inter-hunk lines
+2/-1 M   templates/about.html
index 3be41ba..845559d
old size: 821B - new size: 828B
@@ -8,6 +8,8 @@
8 8 <i>Welcome!</i> You have reached a public instance of the <i>CLI Forge</i>.
9 9 </p>
10 10
11 + <br />
12 +
11 13 <p>
12 14 This is a place for collaborative software development. It offers hosting for
13 15 Git repositories and mailing lists, while aiming at being entirely usable from
@@ -20,7 +22,6 @@
20 22 Documentation about using CLIF is available for both users and administrators
21 23 in the <a href="https://clif.peers.community/zplus/clif.git">CLIF repository</a>.
22 24 </p>
23 -
24 25 <p>
25 26 This instance is still under testing and it is not currently open for public
26 27 registration, but you can still get an account by asking in #peers at irc.libera.chat.

+1/-1 M   templates/mailing_list/emails.html
index 0b55ebf..25166b2
old size: 473B - new size: 474B
@@ -6,7 +6,7 @@
6 6 {% for thread in threads %}
7 7 <div>
8 8 <div class="title">
9 - <a href="{{ url('thread', repository=repository[:-4], thread_id=thread.id) }}">{{ thread.title }}</a>
9 + <a href="{{ url('thread', repository=repository[:-10], thread_id=thread.id) }}">{{ thread.title }}</a>
10 10 </div>
11 11 <div class="subtitle">
12 12 Created {{ thread.datetime|ago }}

+2/-2 M   templates/mailing_list/mailing_list.html
index d2611f4..8de2765
old size: 242B - new size: 244B
@@ -1,8 +1,8 @@
1 1 {% extends "layout.html" %}
2 2
3 3 {% block path %}
4 - <a href="/">home</a> /
5 - <a href="{{ url('threads', repository=repository[:-4]) }}">{{ list_address }}</a>
4 + <a href="/">home</a> »
5 + <a href="{{ url('threads', repository=repository[:-10]) }}">{{ list_address }}</a>
6 6 {% endblock %}
7 7
8 8 {% block context %}

+6/-4 M   web.py
index ed063da..dfdc1f7
old size: 21K - new size: 21K
@@ -586,8 +586,9 @@ def threads(repository):
586 586 :param repository: Match repository name NOT ending with ".git"
587 587 """
588 588
589 - path = os.path.join(GITOLITE_REPOSITORIES_ROOT, repository + '.mlist.git')
590 - list_address = '{}@{}'.format(repository, INSTANCE_DOMAIN)
589 + repository += '.mlist.git'
590 + path = os.path.join(GITOLITE_REPOSITORIES_ROOT, repository)
591 + list_address = '{}@{}'.format(repository[:-10], INSTANCE_DOMAIN)
591 592
592 593 if not os.path.isdir(path):
593 594 bottle.abort(404, 'No repository at this path.')
@@ -624,8 +625,9 @@ def thread(repository, thread_id):
624 625 Show a single email thread.
625 626 """
626 627
627 - path = os.path.join(GITOLITE_REPOSITORIES_ROOT, repository + '.mlist.git')
628 - list_address = '{}@{}'.format(repository, INSTANCE_DOMAIN)
628 + repository += '.mlist.git'
629 + path = os.path.join(GITOLITE_REPOSITORIES_ROOT, repository)
630 + list_address = '{}@{}'.format(repository[:-10], INSTANCE_DOMAIN)
629 631
630 632 if not os.path.isdir(path):
631 633 bottle.abort(404, 'No repository at this path.')