Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

images: Move /team images into landing-page directory.

This commit is contained in:
Alya Abbott 2022-07-12 23:21:48 -07:00 committed by Tim Abbott
parent 454c6db177
commit 7e3388dd9e
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
static/images/team/tim.png → static/images/landing-page/team/tim.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 174 KiB

After

Width:  |  Height:  |  Size: 174 KiB

2
templates/zerver/team.html
View File

@ -34,7 +34,7 @@
<!-- Tim --> <!-- Tim -->
<div class="profile bdfl"> <div class="profile bdfl">
<div class="profile-picture"> <div class="profile-picture">
<img src="/static/images/team/tim.png" alt="" /> <img src="/static/images/landing-page/team/tim.png" alt="" />
</div> </div>
<div class="profile-information"> <div class="profile-information">
<div class="profile-name">Tim Abbott</div> <div class="profile-name">Tim Abbott</div>

2
zerver/lib/dev_ldap_directory.py
View File

@ -24,7 +24,7 @@ def generate_dev_ldap_dir(mode: str, num_users: int = 8) -> Dict[str, Dict[str,
ldap_data.append((name, email, phone_number, birthdate)) ldap_data.append((name, email, phone_number, birthdate))
profile_images = [] profile_images = []
for path in glob.glob(os.path.join(static_path("images/team"), "*")): for path in glob.glob(os.path.join(static_path("images/landing-page/team"), "*")):
with open(path, "rb") as f: with open(path, "rb") as f:
profile_images.append(f.read()) profile_images.append(f.read())
ldap_dir = {} ldap_dir = {}

4
zerver/tests/fixtures/ldap/directory.json vendored
View File

@ -13,7 +13,7 @@
"sn": ["Hamlet"], "sn": ["Hamlet"],
"homePhone": ["123456789"], "homePhone": ["123456789"],
"birthDate": ["1900-09-08"], "birthDate": ["1900-09-08"],
"jpegPhoto": "file:static/images/team/tim.png" "jpegPhoto": "file:static/images/landing-page/team/tim.png"
}, },
"uid=cordelia,ou=users,dc=zulip,dc=com": { "uid=cordelia,ou=users,dc=zulip,dc=com": {
@ -38,7 +38,7 @@
"uid": ["newuser"], "uid": ["newuser"],
"sn": ["shortname"], "sn": ["shortname"],
"homePhone": ["a-new-number"], "homePhone": ["a-new-number"],
"jpegPhoto": "file:static/images/team/tim.png" "jpegPhoto": "file:static/images/landing-page/team/tim.png"
}, },
"uid=newuser_splitname,ou=users,dc=zulip,dc=com": { "uid=newuser_splitname,ou=users,dc=zulip,dc=com": {

4
zerver/tests/test_auth_backends.py
View File

@ -6047,7 +6047,9 @@ class TestLDAP(ZulipLDAPTestCase):
assert url is not None assert url is not None
response = self.client_get(url) response = self.client_get(url)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
with open(os.path.join(settings.DEPLOY_ROOT, "static/images/team/tim.png"), "rb") as f: with open(
os.path.join(settings.DEPLOY_ROOT, "static/images/landing-page/team/tim.png"), "rb"
) as f:
tim = f.read() tim = f.read()
self.assert_streaming_content(response, resize_avatar(tim, DEFAULT_AVATAR_SIZE)) self.assert_streaming_content(response, resize_avatar(tim, DEFAULT_AVATAR_SIZE))