mirror
/
OpenDroneMap-WebODM
kopia lustrzana https://github.com/OpenDroneMap/WebODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Mudar WebODM para cara Global

pull/1488/head
Fabioomega 2024-02-14 19:14:54 -03:00
rodzic f7009126af
commit 93b5bc3070
7 zmienionych plików z 15 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
app/boot.py
Wyświetl plik

@ -83,7 +83,8 @@ def boot():
if Setting.objects.all().count() == 0:
s = Setting.objects.create(
app_name=settings.APP_NAME,
theme=default_theme)
theme=default_theme,
organization_website=settings.ORG_WEBSITE)
s.app_logo.save(os.path.basename(settings.APP_DEFAULT_LOGO), File(open(settings.APP_DEFAULT_LOGO, 'rb')))
logger.info("Created settings")

8
app/models/setting.py
Wyświetl plik

@ -20,16 +20,16 @@ class Setting(models.Model):
app_name = models.CharField(max_length=255, blank=False, null=False, help_text=_("The name of your application"), verbose_name=_("App name"))
app_logo = models.ImageField(upload_to="settings/", blank=False, null=False, help_text=_("A 512x512 logo of your application (.png or .jpeg)"), verbose_name=_("App logo"))
app_logo_36 = ImageSpecField(source='app_logo',
processors=[ResizeToFit(36, 36)],
processors=[ResizeToFit(79, 36)],
format='PNG',
options={'quality': 90})
app_logo_favicon = ImageSpecField(source='app_logo',
processors=[ResizeToFit(48, 48)],
processors=[ResizeToFit(118, 48)],
format='PNG',
options={'quality': 90})
organization_name = models.CharField(default='WebODM', max_length=255, blank=True, null=True, help_text=_("The name of your organization"), verbose_name=_("Organization name"))
organization_website = models.URLField(default='https://github.com/OpenDroneMap/WebODM/', max_length=255, blank=True, null=True, help_text=_("The website URL of your organization"), verbose_name=_("Organization website"))
organization_name = models.CharField(default='Global Drones', max_length=255, blank=True, null=True, help_text=_("The name of your organization"), verbose_name=_("Organization name"))
organization_website = models.URLField(default='https://www.globaldrones.com.br', max_length=255, blank=True, null=True, help_text=_("The website URL of your organization"), verbose_name=_("Organization website"))
theme = models.ForeignKey(Theme, blank=False, null=False, on_delete=models.DO_NOTHING, verbose_name=_("Theme"),
help_text=_("Active theme"))

4
app/models/theme.py
Wyświetl plik

@ -26,8 +26,8 @@ class Theme(models.Model):
button_default = ColorField(default='#95a5a6', help_text=_("Default button color."), verbose_name=_("Button Default"))
button_danger = ColorField(default='#e74c3c', help_text=_("Delete button color."), verbose_name=_("Button Danger"))
header_background = ColorField(default='#3498db', help_text=_("Background color of the site's header."), verbose_name=_("Header Background"))
header_primary = ColorField(default='#ffffff', help_text=_("Text and icons in the site's header."), verbose_name=_("Header Primary"))
header_background = ColorField(default='#59D2FE', help_text=_("Background color of the site's header."), verbose_name=_("Header Background"))
header_primary = ColorField(default='#2B0504', help_text=_("Text and icons in the site's header."), verbose_name=_("Header Primary"))
border = ColorField(default='#e7e7e7', help_text=_("The color of most borders."), verbose_name=_("Border"))
highlight = ColorField(default='#f7f7f7', help_text=_("The background color of panels and some borders."), verbose_name=_("Highlight"))

3
app/static/app/css/main.scss
Wyświetl plik

@ -241,7 +241,8 @@ button i.glyphicon{
.navbar-text {
position: absolute;
top: 0px;
left: 50px;
left: 96px;
font-size: 110%;
}
footer{

BIN
app/static/app/img/logo512.png
Wyświetl plik

Plik binarny nie jest wyświetlany.
Side by Side Swipe Nakładka

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 19 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 308 KiB

6
app/templates/app/base.html
Wyświetl plik

@ -24,7 +24,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="author" content="WebODM Contributors">
<link rel="icon" type="image/png" href="{% settings_image_url 'app_logo_favicon' %}" sizes="32x32">
<link rel="icon" type="image/png" href="{% settings_image_url 'app_logo_favicon' %}" sizes="79x32">
<link rel="stylesheet" type="text/css" href="{% static 'app/css/bootstrap.min.css' %}" />
@ -96,8 +96,8 @@
{% block navbar-top-links %}{% endblock %}
{% if '/public/task/' in request.path and request.user.is_anonymous and SETTINGS.organization_website %}
<a class="navbar-brand" href="{{ SETTINGS.organization_website }}"><img src="{% settings_image_url 'app_logo_36' %}" alt="{{ SETTINGS.app_name }}" /></a>
<a class="navbar-link" href="{{ SETTINGS.organization_website }}"><p class="navbar-text">{{ SETTINGS.app_name }}</p></a>
<a class="navbar-brand" href="{{ SETTINGS.organization_website }}" target=""><img src="{% settings_image_url 'app_logo_36' %}" alt="{{ SETTINGS.app_name }}" /></a>
<a class="navbar-link" href="{{ SETTINGS.organization_website }}" target=""><p class="navbar-text">{{ SETTINGS.app_name }}</p></a>
{% else %}
<a class="navbar-brand" href="/"><img src="{% settings_image_url 'app_logo_36' %}" alt="{{ SETTINGS.app_name }}" /></a>
<a class="navbar-link" href="/"><p class="navbar-text">{{ SETTINGS.app_name }}</p></a>

3
webodm/settings.py
Wyświetl plik

@ -62,8 +62,9 @@ INTERNAL_IPS = ['127.0.0.1']
ALLOWED_HOSTS = ['*']
# Branding
APP_NAME = "WebODM"
APP_NAME = "Global Drones"
APP_DEFAULT_LOGO = os.path.join('app', 'static', 'app', 'img', 'logo512.png')
ORG_WEBSITE = "https://www.globaldrones.com.br"
# In single user mode, a default admin account is created and automatically
# used so that no login windows are displayed