Skip to content

Commit 65a9839

Browse files
aaronwmorrisaaronwmorris
authored
Merge pull request #1044 from aaronwmorris/dev
New logo and favicons
2 parents 7f8348a + a020279 commit 65a9839

8 files changed

Lines changed: 254 additions & 8 deletions

File tree

‎content/logo_inkscape.svg‎

Lines changed: 239 additions & 0 deletions
Loading

‎indi_allsky/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class IndiAllSkyConfigBase(object):
252252
"TIMEOUT" : 60.0,
253253
"CERT_BYPASS" : True,
254254
"REMOTE_IMAGE_NAME" : "image.{0}",
255-
"REMOTE_IMAGE_FOLDER" : "allsky",
255+
"REMOTE_IMAGE_FOLDER" : "/home/allsky/upload",
256256
"REMOTE_METADATA_NAME" : "latest_metadata.json",
257257
"REMOTE_METADATA_FOLDER" : "allsky",
258258
"REMOTE_VIDEO_FOLDER" : "allsky/videos",

‎indi_allsky/flask/forms.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2100,13 +2100,13 @@ class IndiAllskyConfigForm(FlaskForm):
21002100

21012101
FILETRANSFER__CLASSNAME_choices = (
21022102
('pycurl_sftp', 'PycURL SFTP [22]'),
2103-
('paramiko_sftp', 'Paramiko SFTP [22]'),
21042103
('pycurl_ftpes', 'PycURL FTPES [21]'),
21052104
('pycurl_ftps', 'PycURL FTPS [990]'),
21062105
('pycurl_ftp', 'PycURL FTP [21] *no encryption*'),
2106+
('pycurl_webdav_https', 'PycURL WebDAV HTTPS [443]'),
2107+
('paramiko_sftp', 'Paramiko SFTP [22]'),
21072108
('python_ftp', 'Python FTP [21] *no encryption*'),
21082109
('python_ftpes', 'Python FTPES [21]'),
2109-
('pycurl_webdav_https', 'PycURL WebDAV HTTPS [443]'),
21102110
)
21112111

21122112
S3UPLOAD__CLASSNAME_choices = (

‎indi_allsky/flask/static/images/favicon_128.png‎

3.95 KB
Loading

‎indi_allsky/flask/static/images/favicon_32.png‎

823 Bytes
Loading

‎indi_allsky/flask/static/images/logo_outline_full.png‎

33.1 KB
Loading

‎indi_allsky/flask/templates/base.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<html>
33
<head>
44
<title>{% block title %}{% endblock %}</title>
5-
<link rel="shortcut icon" href="favicon.ico">
5+
<link rel="icon" type="image/png" href="{{ url_for('indi_allsky.static', filename='images/favicon_32.png') }}" sizes="32x32">
6+
<link rel="icon" type="image/png" href="{{ url_for('indi_allsky.static', filename='images/favicon_128.png') }}" sizes="128x128">
67
<link href="{{ url_for('indi_allsky.static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
78
<link href="{{ url_for('indi_allsky.static', filename='css/style.css') }}" rel="stylesheet">
89
<script src="{{ url_for('indi_allsky.static', filename='js/jquery-3.6.3.min.js') }}"></script>
@@ -14,8 +15,10 @@
1415
<div class="row vh-100 overflow-auto">
1516
<div class="col-12 col-sm-3 col-xl-2 px-sm-2 px-0 bg-dark d-flex sticky-top">
1617
<div class="d-flex flex-sm-column flex-row flex-grow-1 align-items-center align-items-sm-start px-3 pt-2 text-white">
17-
<a id="indi_allsky_anchor" class="d-flex align-items-center pb-sm-3 mb-md-0 me-md-auto text-white text-decoration-none">
18-
<span class="fs-5 d-none d-sm-inline">INDI-</span><span class="fs-5">AllSky</span>
18+
<a id="indi_allsky_anchor" class="d-flex align-items-center pb-sm-3 mb-md-0 me-md-auto text-white text-decoration-none" href="https://github.com/aaronwmorris/indi-allsky" target="_blank">
19+
<div class="fs-5 d-none d-sm-inline">
20+
<img src="{{ url_for('indi_allsky.static', filename='images/logo_outline_full.png') }}" height="100" alt="indi-allsky">
21+
</div>
1922
</a>
2023
<ul class="nav nav-pills flex-sm-column flex-row flex-nowrap flex-shrink-1 flex-sm-grow-0 flex-grow-1 mb-sm-auto mb-0 justify-content-center align-items-center align-items-sm-start" id="menu">
2124
<li class="nav-item">

‎indi_allsky/flask/templates/login.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<!doctype html>
22
<html>
3-
<title>Login</title>
43
<head>
4+
<title>Login</title>
5+
<link rel="icon" type="image/png" href="{{ url_for('indi_allsky.static', filename='images/favicon_32.png') }}" sizes="32x32">
6+
<link rel="icon" type="image/png" href="{{ url_for('indi_allsky.static', filename='images/favicon_128.png') }}" sizes="128x128">
57
<link href="{{ url_for('indi_allsky.static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
68
<link href="{{ url_for('indi_allsky.static', filename='css/style.css') }}" rel="stylesheet">
79
<script src="{{ url_for('indi_allsky.static', filename='js/jquery-3.6.3.min.js') }}"></script>
@@ -17,7 +19,9 @@
1719
<div class="row h-100 justify-content-center">
1820
<div class="col-4 align-self-center">
1921
<div class="card card-block bg-dark bg-opacity-25">
20-
<div class="text-center text-white pt-2 fs-5">INDI-AllSky Login</div>
22+
<div class="text-center text-white pt-2 fs-5">
23+
<img src="{{ url_for('indi_allsky.static', filename='images/logo_outline_full.png') }}" height="200" alt="indi-allsky">
24+
</div>
2125

2226
<form id="form_login" onSubmit="return false;">
2327
{{ form_login.csrf_token }}

0 commit comments

Comments
 (0)