Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Egi brand v2 #531

Merged
merged 68 commits into from
Mar 28, 2024
Merged
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
a33540d
merge master
micafer Feb 29, 2024
9c3489b
Merge pull request #513 from grycap/devel
micafer Mar 7, 2024
c44f00d
Merge pull request #514 from grycap/devel
micafer Mar 7, 2024
5097075
Update to BS5
micafer Mar 8, 2024
5a42eb4
Update to BS
micafer Mar 8, 2024
184364e
Update to BS
micafer Mar 8, 2024
08010a2
Update to BS
micafer Mar 8, 2024
aa13316
Update to BS
micafer Mar 8, 2024
b726ccc
Update to BS
micafer Mar 8, 2024
5e90fce
Update to BS
micafer Mar 8, 2024
4b08664
Update to BS
micafer Mar 8, 2024
0b0f6e4
Merge branch 'devel' into egi_brand_v2
micafer Mar 8, 2024
3af69fe
Update to BS
micafer Mar 8, 2024
32716ae
Update to BS
micafer Mar 8, 2024
201fff6
Merge branch 'bs5' into egi_brand_v2
micafer Mar 8, 2024
cfb2d4a
Improve footes
micafer Mar 11, 2024
7cffa2e
Merge branch 'egi_brand_v2' of github.com:grycap/im-dashboard into eg…
micafer Mar 11, 2024
95ac178
Merge branch 'bs5' into egi_brand_v2
micafer Mar 11, 2024
da0fef0
Minor change
micafer Mar 11, 2024
eac4600
Merge branch 'bs5' into egi_brand_v2
micafer Mar 11, 2024
f77d70b
Minor changes
micafer Mar 11, 2024
dcb4c0f
Minor changes and delete unused
micafer Mar 11, 2024
a76c266
merge bs5
micafer Mar 11, 2024
7a9fb1b
Merge pull request #515 from grycap/bs5
micafer Mar 11, 2024
03aa5b9
Minor changes
micafer Mar 11, 2024
12b040d
Use local fontawsome
micafer Mar 11, 2024
56ed29f
Merge pull request #516 from grycap/devel
micafer Mar 11, 2024
775145e
Minro fix
micafer Mar 12, 2024
22f7832
Merge pull request #517 from grycap/devel
micafer Mar 12, 2024
9edb89a
Minor fix
micafer Mar 12, 2024
1bcd38b
Merge pull request #518 from grycap/devel
micafer Mar 12, 2024
6baa0a9
merge master
micafer Mar 12, 2024
70a11b0
Minor change
micafer Mar 12, 2024
20e262b
Minor change
micafer Mar 12, 2024
c7b596a
Minor change
micafer Mar 12, 2024
db36240
Minor change
micafer Mar 12, 2024
509a938
Update ver num
micafer Mar 12, 2024
da96aef
Update ver num
micafer Mar 12, 2024
802f5c2
Fix lists
micafer Mar 12, 2024
cfa4df6
Fix lists
micafer Mar 12, 2024
cf5a3a1
Merge pull request #521 from grycap/devel
micafer Mar 12, 2024
7da4d16
Minor change
micafer Mar 12, 2024
01018d1
Minor change
micafer Mar 12, 2024
46df34a
Disable inf table order
micafer Mar 12, 2024
980bf61
Disable inf table order
micafer Mar 12, 2024
a216053
Merge pull request #522 from grycap/devel
micafer Mar 12, 2024
3c91f57
Do not get appdb vos
micafer Mar 12, 2024
6d12927
Do not get appdb vos
micafer Mar 12, 2024
7aaa3ed
Do not get appdb vos
micafer Mar 12, 2024
865d2a0
Merge branch 'devel' into egi_brand_v2
micafer Mar 12, 2024
29d9d91
Merge pull request #523 from grycap/devel
micafer Mar 12, 2024
9ec4fc3
Fix getvos
micafer Mar 12, 2024
356dbdd
Merge pull request #524 from grycap/devel
micafer Mar 12, 2024
6266b2a
Fix getvos
micafer Mar 12, 2024
e8462ef
Merge pull request #525 from grycap/devel
micafer Mar 12, 2024
7b7f59c
Fix getvos
micafer Mar 12, 2024
025b8a0
Merge pull request #526 from grycap/devel
micafer Mar 12, 2024
f1d8779
Fix getvos
micafer Mar 12, 2024
a2189cc
Merge pull request #527 from grycap/devel
micafer Mar 12, 2024
fd0f1af
merge
micafer Mar 13, 2024
b067f0d
Implements #283
micafer Mar 13, 2024
175750e
Fix issues
micafer Mar 13, 2024
77c9195
Merge pull request #529 from grycap/github_info
micafer Mar 13, 2024
5a9dd76
Revert "Fix issues"
micafer Mar 13, 2024
ed647a5
Revert "Implements #283"
micafer Mar 13, 2024
ce32920
Fix issues
micafer Mar 27, 2024
4453ba0
Minro change
micafer Mar 27, 2024
dbec31e
Merge devel
micafer Mar 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update to BS
micafer committed Mar 8, 2024
commit 32716ae15b8db0da3f77654e3a47cba63f68abc8
10 changes: 5 additions & 5 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -309,7 +309,7 @@ def showvminfo():
if cont > 0:
nets += Markup('<br/>')
nets += Markup('<i class="fa fa-network-wired"></i>')
nets += Markup(' <span class="badge badge-secondary">%s</span>' % cont)
nets += Markup(' <span class="badge bg-secondary">%s</span>' % cont)
nets += ": %s" % vminfo["net_interface.%s.ip" % cont]
del vminfo["net_interface.%s.ip" % cont]
if "net_interface.%s.dns_name" % cont in vminfo:
@@ -337,7 +337,7 @@ def showvminfo():
while "disk.%s.size" % cont in vminfo or "disk.%s.image.url" % cont in vminfo:
if cont > 0:
disks += Markup('<br/>')
disks += Markup('<i class="fa fa-database"></i> <span class="badge badge-secondary">'
disks += Markup('<i class="fa fa-database"></i> <span class="badge bg-secondary">'
'%s</span><br/>' % cont)

prop_map = {"size": "Size", "image.url": "URL", "device": "Device", "mount_path": "Mount Path",
@@ -367,14 +367,14 @@ def showvminfo():
if port.get_remote_cidr() != "0.0.0.0/0":
remote_cidr = "%s-" % port.get_remote_cidr()
str_outports += Markup('<i class="fas fa-project-diagram"></i> <span class="badge '
'badge-secondary">%s%s</span>' % (remote_cidr, port.get_remote_port()))
'bg-secondary">%s%s</span>' % (remote_cidr, port.get_remote_port()))
if not port.is_range():
if port.get_remote_port() != port.get_local_port():
str_outports += Markup(' <i class="fas fa-long-arrow-alt-right">'
'</i> <span class="badge badge-secondary">%s</span>' %
'</i> <span class="badge bg-secondary">%s</span>' %
port.get_local_port())
else:
str_outports += Markup(' : </i> <span class="badge badge-secondary">%s</span>' %
str_outports += Markup(' : </i> <span class="badge bg-secondary">%s</span>' %
port.get_local_port())
str_outports += Markup('<br/>')