rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Use uploaded logos in templates

Browse source
This commit is contained in:
Mouse Reeve 2021-01-04 12:47:10 -08:00
parent 7cc2dfe517
commit 0c0e9bebdf
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bookwyrm/migrations/0023_auto_20201213_0014.py → bookwyrm/migrations/0031_auto_20210104_2040.py
View file

@ -1,4 +1,4 @@
# Generated by Django 3.0.7 on 2020-12-13 00:14 # Generated by Django 3.0.7 on 2021-01-04 20:40
from django.db import migrations, models from django.db import migrations, models
@ -6,23 +6,23 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('bookwyrm', '0022_auto_20201212_1744'), ('bookwyrm', '0030_auto_20201224_1939'),
] ]
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name='sitesettings', model_name='sitesettings',
name='favicon', name='favicon',
field=models.ImageField(default='/static/images/favicon.ico', upload_to='static/images/'), field=models.ImageField(blank=True, null=True, upload_to='logos/'),
), ),
migrations.AddField( migrations.AddField(
model_name='sitesettings', model_name='sitesettings',
name='logo', name='logo',
field=models.ImageField(default='/static/images/logo.png', upload_to='static/images/'), field=models.ImageField(blank=True, null=True, upload_to='logos/'),
), ),
migrations.AddField( migrations.AddField(
model_name='sitesettings', model_name='sitesettings',
name='logo_small', name='logo_small',
field=models.ImageField(default='/static/images/logo-small.png', upload_to='static/images/'), field=models.ImageField(blank=True, null=True, upload_to='logos/'),
), ),
] ]

9
bookwyrm/models/site.py
View file

@ -18,16 +18,13 @@ class SiteSettings(models.Model):
default="Add a code of conduct here.") default="Add a code of conduct here.")
allow_registration = models.BooleanField(default=True) allow_registration = models.BooleanField(default=True)
logo = models.ImageField( logo = models.ImageField(
upload_to='static/images/', upload_to='logos/', null=True, blank=True
default='/static/images/logo.png'
) )
logo_small = models.ImageField( logo_small = models.ImageField(
upload_to='static/images/', upload_to='logos/', null=True, blank=True
default='/static/images/logo-small.png'
) )
favicon = models.ImageField( favicon = models.ImageField(
upload_to='static/images/', upload_to='logos/', null=True, blank=True
default='/static/images/favicon.ico'
) )
support_link = models.CharField(max_length=255, null=True, blank=True) support_link = models.CharField(max_length=255, null=True, blank=True)
support_title = models.CharField(max_length=100, null=True, blank=True) support_title = models.CharField(max_length=100, null=True, blank=True)

13
bookwyrm/templates/layout.html
View file

@ -8,20 +8,23 @@
<link type="text/css" rel="stylesheet" href="/static/css/format.css"> <link type="text/css" rel="stylesheet" href="/static/css/format.css">
<link type="text/css" rel="stylesheet" href="/static/css/icons.css"> <link type="text/css" rel="stylesheet" href="/static/css/icons.css">
<link rel="shortcut icon" type="image/x-icon" href="/static/images/favicon.ico"> <link rel="shortcut icon" type="image/x-icon" href="{% if site.favicon %}/images/{{ site.favicon }}{% else %}/static/images/favicon.ico{% endif %}">
<meta name="twitter:card" content="summary"> <meta name="twitter:card" content="summary">
<meta name="twitter:title" content="{{ site.name }}"> <meta name="twitter:title" content="{% if title %}{{ title }} | {% endif %}{{ site.name }}">
<meta name="og:title" content="{{ site.name }}"> <meta name="og:title" content="{% if title %}{{ title }} | {% endif %}{{ site.name }}">
<meta name="twitter:description" content="Federated Social Reading"> <meta name="twitter:description" content="Federated Social Reading">
<meta name="og:description" content="Federated Social Reading"> <meta name="og:description" content="Federated Social Reading">
<meta name="twitter:image" content="{% if site.logo %}/images/{{ site.logo }}{% else %}/static/images/logo.png{% endif %}">
<meta name="og:image" content="{% if site.logo %}/images/{{ site.logo }}{% else %}/static/images/logo.png{% endif %}">
<meta name="twitter:image:alt" content="BookWyrm Logo">
</head> </head>
<body> <body>
<nav class="navbar container" role="navigation" aria-label="main navigation"> <nav class="navbar container" role="navigation" aria-label="main navigation">
<div class="navbar-brand"> <div class="navbar-brand">
<a class="navbar-item" href="/"> <a class="navbar-item" href="/">
<img class="image logo" src="/static/images/logo-small.png" alt="Home page"> <img class="image logo" src="{% if site.logo_small %}/images/{{ site.logo_small }}{% else %}/static/images/logo-small.png{% endif %}" alt="Home page">
</a> </a>
<form class="navbar-item column" action="/search/"> <form class="navbar-item column" action="/search/">
<div class="field has-addons"> <div class="field has-addons">

2
bookwyrm/templates/snippets/about.html
View file

@ -1,7 +1,7 @@
<div class="columns"> <div class="columns">
<div class="column is-narrow is-hidden-mobile"> <div class="column is-narrow is-hidden-mobile">
<figure class="block"> <figure class="block">
<img src="/static/images/logo.png" alt="BookWyrm"> <img src="{% if site.logo_small %}/images/{{ site.logo }}{% else %}/static/images/logo.png{% endif %}" alt="BookWyrm logo">
</figure> </figure>
</div> </div>
<div class="content"> <div class="content">