Skip to content

Commit a812018

Browse files
lbr38lbr38
committed
patch
1 parent e22f39f commit a812018

6 files changed

Lines changed: 51 additions & 44 deletions

File tree

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ on:
33
push:
44
branches:
55
- main
6+
# TODO debug
7+
- devel
68

79
permissions:
810
contents: write

‎documentation/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ charset-normalizer==3.4.6
55
click==8.3.1
66
colorama==0.4.6
77
ghp-import==2.1.0
8-
idna==3.11
8+
idna==3.15
99
Jinja2==3.1.6
1010
Markdown==3.10.2
1111
MarkupSafe==3.0.3

‎www/public/resources/styles/components/button.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
/* All buttons */
33
[class^="btn-"], [class*=" btn-"], input::file-selector-button {
4-
padding: 10px 5px 10px 5px;
4+
padding: 10px;
55
border: none;
66
border-radius: 60px;
77
color: white;

‎www/views/includes/containers/hosts/list.inc.php‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
<?php
3535
endif;
3636

37-
if (HostPermission::allowedAction('edit-groups')) : ?>
37+
if (HostPermission::allowedAction('edit-groups') and $totalHosts > 0) : ?>
3838
<div class="slide-btn get-panel-btn mediumopacity" panel="hosts/groups/list" title="Manage hosts groups">
3939
<img src="/assets/icons/folder.svg" />
4040
<span>Groups</span>
4141
</div>
4242
<?php
4343
endif;
4444

45-
if (HostPermission::allowedAction('edit-settings')) : ?>
45+
if (HostPermission::allowedAction('edit-settings') and $totalHosts > 0) : ?>
4646
<div class="slide-btn get-panel-btn mediumopacity" panel="hosts/settings" title="Edit display settings">
4747
<img src="/assets/icons/cog.svg" />
4848
<span>Settings</span>
@@ -54,8 +54,14 @@
5454

5555
<?php
5656
if ($totalHosts == 0) : ?>
57-
<p class="note">No host registered yet!</p>
58-
<p class="note">Install <a href="https://github.com/lbr38/linupdate" target="_blank" rel="noopener noreferrer" class="font-size-13"><b>linupdate</b> <img src="/assets/icons/external-link.svg" class="icon-small margin-left-5" /></a> on your hosts to register them to Repomanager. This page will display dashboards and informations about the hosts and their packages (installed, available, updated...). See <a href="https://github.com/lbr38/linupdate/wiki/Module:-reposerver#quick-setup-example" class="font-size-13"><b>quick setup example</b> <img src="/assets/icons/external-link.svg" class="icon-small margin-left-5" /></a>
57+
<div class="empty-state">
58+
<p class="empty-state-title">No host registered yet.</p>
59+
<p class="note">Install <b>linupdate</b> on your hosts to register them to Repomanager. This page will display dashboards and informations about the hosts and their packages (installed, available, updated...).</p>
60+
<div class="empty-state-actions">
61+
<a href="https://github.com/lbr38/linupdate" target="_blank" rel="noopener noreferrer"><button type="button" class="btn-medium-blue">Linupdate GitHub</button></a>
62+
<a href="https://github.com/lbr38/linupdate/wiki/Module:-reposerver#quick-setup-example" target="_blank" rel="noopener noreferrer"><button type="button" class="btn-large-tr">Linupdate quick setup</button></a>
63+
</div>
64+
</div>
5965
<?php
6066
endif;
6167

‎www/views/includes/tables/repos/sources/gpgkeys.inc.php‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
<div class="reloadable-table" table="<?= $table ?>" offset="<?= $reloadableTableOffset ?>">
2-
<h6>CURRENT GPG SIGNING KEYS</h6>
3-
4-
<p class="note">All keys imported in Repomanager keyring.</p>
5-
62
<?php
7-
if (empty($reloadableTableContent)) : ?>
8-
<div class="empty-state">
9-
<p class="empty-state-title">No GPG key imported yet.</p>
10-
<p class="note">Keys are imported automatically when source repository lists define fingerprints or key URLs.</p>
11-
<div class="empty-state-actions">
12-
<button type="button" class="btn-medium-blue get-panel-btn" panel="repos/sources/import">Import sources</button>
3+
if (!empty($reloadableTableContent)) : ?>
4+
<div class="flex justify-space-between align-flex-end margin-top-30 margin-bottom-15 margin-right-15">
5+
<div>
6+
<h6 class="margin-top-0">CURRENT GPG SIGNING KEYS</h6>
7+
<p class="note">All keys imported in Repomanager keyring.</p>
138
</div>
14-
</div>
15-
<?php
16-
endif;
179

18-
if (!empty($reloadableTableContent)) : ?>
19-
<div class="flex justify-end margin-bottom-10 margin-right-15">
2010
<input type="checkbox" class="select-all-checkbox lowopacity" checkbox-id="gpg-key" title="Select all GPG keys" />
2111
</div>
2212

‎www/views/includes/tables/repos/sources/list.inc.php‎

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,43 @@
11
<div class="reloadable-table" table="<?= $table ?>" offset="<?= $reloadableTableOffset ?>">
2-
<h6>ADD</h6>
3-
<p class="note">Add a new source repository manually or import from a predefined or custom list.</p>
2+
<?php
3+
if (!empty($reloadableTableContent)) : ?>
4+
<h6>ADD</h6>
5+
<p class="note">Import a predefined list or add a source repository manually.</p>
46

5-
<div class="flex column-gap-10 margin-top-5 margin-bottom-30">
6-
<button type="button" class="btn-medium-blue get-panel-btn" panel="repos/sources/new">Manually add</button>
7-
<button type="button" class="btn-medium-blue get-panel-btn" panel="repos/sources/import">Import</button>
8-
</div>
7+
<div class="flex column-gap-10 margin-top-5 margin-bottom-30">
8+
<button type="button" class="btn-medium-blue get-panel-btn" panel="repos/sources/import">Import</button>
9+
<button type="button" class="btn-medium-tr get-panel-btn" panel="repos/sources/new">Manually add</button>
10+
</div>
11+
<?php
12+
endif; ?>
913

10-
<h6>CURRENT SOURCE REPOSITORIES</h6>
11-
<p class="note">Source repositories to be mirrored.</p>
14+
<div class="flex justify-space-between align-flex-end margin-top-40 margin-bottom-15 margin-right-15">
15+
<div>
16+
<h6 class="margin-top-0">CURRENT SOURCE REPOSITORIES</h6>
17+
<p class="note">Source repositories to be mirrored.</p>
18+
</div>
1219

13-
<?php
14-
if (empty($reloadableTableContent)) {
15-
echo '<div class="empty-state">';
16-
echo '<p class="empty-state-title">No source repository configured yet.</p>';
17-
echo '<p class="note">Import a predefined list to get started quickly, or add a custom source repository manually.</p>';
18-
echo '<div class="empty-state-actions">';
19-
echo '<button type="button" class="btn-medium-blue get-panel-btn" panel="repos/sources/import">Import</button>';
20-
echo '<button type="button" class="btn-medium-tr get-panel-btn" panel="repos/sources/new">Manually add</button>';
21-
echo '</div>';
22-
echo '</div>';
23-
} ?>
20+
<?php
21+
if (!empty($reloadableTableContent)) : ?>
22+
<input type="checkbox" class="select-all-checkbox lowopacity" checkbox-id="source-repo" title="Select all source repositories" />
23+
<?php
24+
endif ?>
25+
</div>
2426

2527
<?php
26-
if (!empty($reloadableTableContent)) : ?>
27-
<div class="flex justify-end margin-bottom-10 margin-right-15">
28-
<input type="checkbox" class="select-all-checkbox lowopacity" checkbox-id="source-repo" title="Select all source repositories" />
28+
if (empty($reloadableTableContent)) : ?>
29+
<div class="empty-state">
30+
<p class="empty-state-title">No source repository configured yet.</p>
31+
<p class="note">Import a predefined list to get started quickly, or add a source repository manually.</p>
32+
<div class="empty-state-actions">
33+
<button type="button" class="btn-medium-blue get-panel-btn" panel="repos/sources/import">Import</button>
34+
<button type="button" class="btn-medium-tr get-panel-btn" panel="repos/sources/new">Manually add</button>
35+
</div>
2936
</div>
30-
3137
<?php
38+
endif;
39+
40+
if (!empty($reloadableTableContent)) :
3241
foreach ($reloadableTableContent as $item) :
3342
$distAndComponent = null;
3443
$releasevers = null;

0 commit comments

Comments
 (0)