umap-project 2.8.2__py3-none-any.whl → 2.9.0b0__py3-none-any.whl

umap/static/umap/locale/pt_PT.js

@@ -19,7 +19,6 @@ const locale = {
     "Add a new property": "Adicionar uma nova propriedade",
     "Add a polygon to the current multi": "Adicionar um polígono para o multi atual",
     "Add image URL": "Adicionar URL da imagem",
-    "Add": "Adicionar",
     "Advanced actions": "Ações avançadas",
     "Advanced properties": "Propriedades avançadas",
     "All data and settings of the map": "Todos os dados e definições do mapa",
@@ -120,7 +119,6 @@ const locale = {
     "Display the locate control": "Mostrar o controlo de localizar",
     "Display the measure control": "Mostrar o controlo de medição",
     "Display the search control": "Mostrar o controlo de pesquisa",
-    "Display the star map button": "Mostrar o botão de marcar como favorito",
     "Display the tile layers control": "Mostrar o controlo de camadas de telas",
     "Display the zoom control": "Mostrar o controlo de aproximar e afastar (zoom)",
     "Do you want to display a caption bar?": "Mostrar uma barra de cabeçalho?",
@@ -516,11 +514,21 @@ const locale = {
     "show/hide all layers": "show/hide all layers",
     "zoom to data extent": "zoom to data extent",
     "download visible data": "download visible data",
-    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} peer(s) currently connected to this map",
     "Import helpers": "Import helpers",
     "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
     "Wikipedia": "Wikipedia",
-    "Save draft": "Save draft"
+    "Save draft": "Save draft",
+    "No data has been found for import": "No data has been found for import",
+    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)",
+    "Disconnected": "Disconnected",
+    "You must be logged in": "You must be logged in",
+    "Created at {date}": "Created at {date}",
+    "Modified at {date}": "Modified at {date}",
+    "on hover": "on hover",
+    "Cannot load remote data for layer \"{layer}\" with url \"{url}\"": "Cannot load remote data for layer \"{layer}\" with url \"{url}\"",
+    "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"",
+    "Import failed: invalid data": "Import failed: invalid data",
+    "Anonymous": "Anonymous"
 }
 L.registerLocale("pt_PT", locale)
 L.setLocale("pt_PT")

umap/static/umap/locale/pt_PT.json

@@ -19,7 +19,6 @@
     "Add a new property": "Adicionar uma nova propriedade",
     "Add a polygon to the current multi": "Adicionar um polígono para o multi atual",
     "Add image URL": "Adicionar URL da imagem",
-    "Add": "Adicionar",
     "Advanced actions": "Ações avançadas",
     "Advanced properties": "Propriedades avançadas",
     "All data and settings of the map": "Todos os dados e definições do mapa",
@@ -120,7 +119,6 @@
     "Display the locate control": "Mostrar o controlo de localizar",
     "Display the measure control": "Mostrar o controlo de medição",
     "Display the search control": "Mostrar o controlo de pesquisa",
-    "Display the star map button": "Mostrar o botão de marcar como favorito",
     "Display the tile layers control": "Mostrar o controlo de camadas de telas",
     "Display the zoom control": "Mostrar o controlo de aproximar e afastar (zoom)",
     "Do you want to display a caption bar?": "Mostrar uma barra de cabeçalho?",
@@ -516,9 +514,19 @@
     "show/hide all layers": "show/hide all layers",
     "zoom to data extent": "zoom to data extent",
     "download visible data": "download visible data",
-    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} peer(s) currently connected to this map",
     "Import helpers": "Import helpers",
     "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
     "Wikipedia": "Wikipedia",
-    "Save draft": "Save draft"
+    "Save draft": "Save draft",
+    "No data has been found for import": "No data has been found for import",
+    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)",
+    "Disconnected": "Disconnected",
+    "You must be logged in": "You must be logged in",
+    "Created at {date}": "Created at {date}",
+    "Modified at {date}": "Modified at {date}",
+    "on hover": "on hover",
+    "Cannot load remote data for layer \"{layer}\" with url \"{url}\"": "Cannot load remote data for layer \"{layer}\" with url \"{url}\"",
+    "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"",
+    "Import failed: invalid data": "Import failed: invalid data",
+    "Anonymous": "Anonymous"
 }

umap/static/umap/locale/th_TH.js

@@ -19,7 +19,6 @@ const locale = {
     "Add a new property": "เพิ่มคุณสมบัติใหม่",
     "Add a polygon to the current multi": "เพิ่มรูปร่างให้กับปัจจุบันหลายปัจจุบัน",
     "Add image URL": "เพิ่ม URL รูปภาพ",
-    "Add": "เพิ่ม",
     "Advanced actions": "Advanced actions",
     "Advanced properties": "Advanced properties",
     "All data and settings of the map": "ข้อมูลและการตั้งค่าทั้งหมดของแผนที่",
@@ -120,7 +119,6 @@ const locale = {
     "Display the locate control": "Display the locate control",
     "Display the measure control": "Display the measure control",
     "Display the search control": "Display the search control",
-    "Display the star map button": "Display the star map button",
     "Display the tile layers control": "Display the tile layers control",
     "Display the zoom control": "Display the zoom control",
     "Do you want to display a caption bar?": "Do you want to display a caption bar?",
@@ -516,11 +514,21 @@ const locale = {
     "show/hide all layers": "show/hide all layers",
     "zoom to data extent": "zoom to data extent",
     "download visible data": "download visible data",
-    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} peer(s) currently connected to this map",
     "Import helpers": "Import helpers",
     "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
     "Wikipedia": "Wikipedia",
-    "Save draft": "Save draft"
+    "Save draft": "Save draft",
+    "No data has been found for import": "No data has been found for import",
+    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)",
+    "Disconnected": "Disconnected",
+    "You must be logged in": "You must be logged in",
+    "Created at {date}": "Created at {date}",
+    "Modified at {date}": "Modified at {date}",
+    "on hover": "on hover",
+    "Cannot load remote data for layer \"{layer}\" with url \"{url}\"": "Cannot load remote data for layer \"{layer}\" with url \"{url}\"",
+    "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"",
+    "Import failed: invalid data": "Import failed: invalid data",
+    "Anonymous": "Anonymous"
 }
 L.registerLocale("th_TH", locale)
 L.setLocale("th_TH")

umap/static/umap/locale/th_TH.json

@@ -19,7 +19,6 @@
     "Add a new property": "เพิ่มคุณสมบัติใหม่",
     "Add a polygon to the current multi": "เพิ่มรูปร่างให้กับปัจจุบันหลายปัจจุบัน",
     "Add image URL": "เพิ่ม URL รูปภาพ",
-    "Add": "เพิ่ม",
     "Advanced actions": "Advanced actions",
     "Advanced properties": "Advanced properties",
     "All data and settings of the map": "ข้อมูลและการตั้งค่าทั้งหมดของแผนที่",
@@ -120,7 +119,6 @@
     "Display the locate control": "Display the locate control",
     "Display the measure control": "Display the measure control",
     "Display the search control": "Display the search control",
-    "Display the star map button": "Display the star map button",
     "Display the tile layers control": "Display the tile layers control",
     "Display the zoom control": "Display the zoom control",
     "Do you want to display a caption bar?": "Do you want to display a caption bar?",
@@ -516,9 +514,19 @@
     "show/hide all layers": "show/hide all layers",
     "zoom to data extent": "zoom to data extent",
     "download visible data": "download visible data",
-    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} peer(s) currently connected to this map",
     "Import helpers": "Import helpers",
     "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
     "Wikipedia": "Wikipedia",
-    "Save draft": "Save draft"
+    "Save draft": "Save draft",
+    "No data has been found for import": "No data has been found for import",
+    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)",
+    "Disconnected": "Disconnected",
+    "You must be logged in": "You must be logged in",
+    "Created at {date}": "Created at {date}",
+    "Modified at {date}": "Modified at {date}",
+    "on hover": "on hover",
+    "Cannot load remote data for layer \"{layer}\" with url \"{url}\"": "Cannot load remote data for layer \"{layer}\" with url \"{url}\"",
+    "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"",
+    "Import failed: invalid data": "Import failed: invalid data",
+    "Anonymous": "Anonymous"
 }

umap/static/umap/locale/zh_TW.js

@@ -19,7 +19,6 @@ const locale = {
     "Add a new property": "新增屬性",
     "Add a polygon to the current multi": "新增多邊形",
     "Add image URL": "新增圖片URL",
-    "Add": "新增",
     "Advanced actions": "進階動作",
     "Advanced properties": "進階屬性",
     "All data and settings of the map": "地圖的所有資料與設定",
@@ -120,7 +119,6 @@ const locale = {
     "Display the locate control": "顯示定位鍵",
     "Display the measure control": "顯示比例尺鍵",
     "Display the search control": "顯示搜尋鍵",
-    "Display the star map button": "顯示星號地圖按鈕",
     "Display the tile layers control": "顯示圖層鍵",
     "Display the zoom control": "顯示縮放鍵",
     "Do you want to display a caption bar?": "您是否要顯示標題列？",
@@ -516,13 +514,21 @@ const locale = {
     "show/hide all layers": "顯示/隱藏所有圖層",
     "zoom to data extent": "切換至資料範圍",
     "download visible data": "下載可視資料",
-    "{connectedPeers} peer(s) currently connected to this map": "這份地圖已經有 {connectedPeers} 伙伴連線",
     "Import helpers": "匯入幫手",
     "Import helpers will fill the URL field for you.": "匯入幫會為你填入網址",
     "Wikipedia": "維基百科",
     "Save draft": "儲存草稿",
     "No data has been found for import": "匯入時沒有找到資料",
-    "Successfully imported {count} feature(s)": "成功匯入 {count} 圖徵"
+    "Successfully imported {count} feature(s)": "成功匯入 {count} 圖徵",
+    "Disconnected": "Disconnected",
+    "You must be logged in": "You must be logged in",
+    "Created at {date}": "Created at {date}",
+    "Modified at {date}": "Modified at {date}",
+    "on hover": "on hover",
+    "Cannot load remote data for layer \"{layer}\" with url \"{url}\"": "Cannot load remote data for layer \"{layer}\" with url \"{url}\"",
+    "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"",
+    "Import failed: invalid data": "Import failed: invalid data",
+    "Anonymous": "Anonymous"
 }
 L.registerLocale("zh_TW", locale)
 L.setLocale("zh_TW")

umap/static/umap/locale/zh_TW.json

@@ -19,7 +19,6 @@
     "Add a new property": "新增屬性",
     "Add a polygon to the current multi": "新增多邊形",
     "Add image URL": "新增圖片URL",
-    "Add": "新增",
     "Advanced actions": "進階動作",
     "Advanced properties": "進階屬性",
     "All data and settings of the map": "地圖的所有資料與設定",
@@ -120,7 +119,6 @@
     "Display the locate control": "顯示定位鍵",
     "Display the measure control": "顯示比例尺鍵",
     "Display the search control": "顯示搜尋鍵",
-    "Display the star map button": "顯示星號地圖按鈕",
     "Display the tile layers control": "顯示圖層鍵",
     "Display the zoom control": "顯示縮放鍵",
     "Do you want to display a caption bar?": "您是否要顯示標題列？",
@@ -516,11 +514,19 @@
     "show/hide all layers": "顯示/隱藏所有圖層",
     "zoom to data extent": "切換至資料範圍",
     "download visible data": "下載可視資料",
-    "{connectedPeers} peer(s) currently connected to this map": "這份地圖已經有 {connectedPeers} 伙伴連線",
     "Import helpers": "匯入幫手",
     "Import helpers will fill the URL field for you.": "匯入幫會為你填入網址",
     "Wikipedia": "維基百科",
     "Save draft": "儲存草稿",
     "No data has been found for import": "匯入時沒有找到資料",
-    "Successfully imported {count} feature(s)": "成功匯入 {count} 圖徵"
+    "Successfully imported {count} feature(s)": "成功匯入 {count} 圖徵",
+    "Disconnected": "Disconnected",
+    "You must be logged in": "You must be logged in",
+    "Created at {date}": "Created at {date}",
+    "Modified at {date}": "Modified at {date}",
+    "on hover": "on hover",
+    "Cannot load remote data for layer \"{layer}\" with url \"{url}\"": "Cannot load remote data for layer \"{layer}\" with url \"{url}\"",
+    "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"",
+    "Import failed: invalid data": "Import failed: invalid data",
+    "Anonymous": "Anonymous"
 }

umap/static/umap/map.css

@@ -134,12 +134,6 @@ html[dir="rtl"] .leaflet-tooltip-pane > * {
     background-position: -72px -144px;
     box-shadow: 0 0 4px 0 black inset;
 }
-.leaflet-control-star [type="button"] {
-    background-position: -144px -144px;
-}
-.leaflet-control-star.starred [type="button"] {
-    background-position: -108px -144px;
-}
 .leaflet-control-search [type="button"] {
     background-position: -36px -108px;
     display: block;
@@ -694,8 +688,18 @@ a.umap-control-caption,
 .datalayer-name {
     cursor: pointer;
 }
-.umap-caption .umap-map-author {
-    padding-inline-start: 31px;
+.umap-caption .dates {
+    color: var(--color-mediumGray);
+}
+.umap-caption .header {
+    display: flex;
+}
+.umap-caption .header i.icon {
+    flex-shrink: 0;
+}
+.umap-caption hgroup p,
+.umap-caption hgroup button {
+    margin: 0;
 }
 .umap-browser .main-toolbox {
     padding-left: 4px; /* Align with toolbox below  */

umap/static/umap/nav.css

@@ -41,7 +41,7 @@ footer .i18n_switch {
     display: flex;
     flex-direction: column;
 }
-.umap-nav a {
+.umap-nav a:not(.button) {
     color: var(--color-darkBlue);
     padding: .4rem;
 }
@@ -51,7 +51,7 @@ footer .i18n_switch {
 .umap-nav h1 {
     margin-bottom: 0;
 }
-.umap-nav h1 a {
+.umap-nav h1 a:not(.button) {
     background-image: url("./img/logo.svg");
     background-position: left center;
     background-repeat: no-repeat;
@@ -74,7 +74,6 @@ html[dir="rtl"] .umap-nav h1 a {
 .umap-nav .button,
 .umap-nav .button:hover {
     text-decoration: none;
-    min-width: 150px;
     margin-inline-start: 1rem;
 }
 

umap/static/umap/unittests/utils.js

@@ -54,6 +54,13 @@ describe('Utils', () => {
       )
     })
 
+    it('should handle links with another url in path', () => {
+      assert.equal(
+        Utils.toHTML('A simple https://osm.org/https://anotherurl.com link'),
+        'A simple <a href="https://osm.org/https://anotherurl.com" target="_blank">https://osm.org/https://anotherurl.com</a> link'
+      )
+    })
+
     it('should handle simple link inside parenthesis', () => {
       assert.equal(
         Utils.toHTML('A simple link (http://osm.org)'),
@@ -172,6 +179,13 @@ describe('Utils', () => {
       )
     })
 
+    it('http link with http link as in path', () => {
+      assert.equal(
+        Utils.toHTML('A phrase with a [[https://iframeurl.com/https://another.com]].'),
+        'A phrase with a <a href="https://iframeurl.com/https://another.com" target="_blank">https://iframeurl.com/https://another.com</a>.'
+      )
+    })
+
     it('simple bullet points', () => {
       assert.equal(
         Utils.toHTML('* First point\n* Second point\n* Last point'),

umap/static/umap/vars.css

@@ -24,6 +24,7 @@
     --button-primary-color: var(--color-darkBlue);
     --button-neutral-background: var(--color-lightGray);
     --button-neutral-color: var(--color-darkGray);
+    --button-padding: 8px 16px;
 
     /* Sizes and spaces */
     --gutter: 8px;
@@ -38,6 +39,7 @@
     --control-size: 36px;
     --border-radius: 4px;
     --box-padding: 20px;
+    --small-box-padding: 4px;
     --box-margin: 14px;
     --text-margin: 7px;
 

umap/sync/app.py

@@ -0,0 +1,181 @@
+import asyncio
+import logging
+
+import redis.asyncio as redis
+from django.conf import settings
+from django.core.signing import TimestampSigner
+from django.urls import path
+from pydantic import ValidationError
+
+from .payloads import (
+    JoinRequest,
+    JoinResponse,
+    ListPeersResponse,
+    OperationMessage,
+    PeerMessage,
+    Request,
+)
+
+
+async def application(scope, receive, send):
+    path = scope["path"].lstrip("/")
+    for pattern in urlpatterns:
+        if matched := pattern.resolve(path):
+            await matched.func(scope, receive, send, **matched.kwargs)
+            break
+    else:
+        await send({"type": "websocket.close"})
+
+
+async def sync(scope, receive, send, **kwargs):
+    peer = Peer(kwargs["map_id"])
+    peer._send = send
+    while True:
+        event = await receive()
+
+        if event["type"] == "websocket.connect":
+            try:
+                await peer.connect()
+                await send({"type": "websocket.accept"})
+            except ValueError:
+                await send({"type": "websocket.close"})
+
+        if event["type"] == "websocket.disconnect":
+            await peer.disconnect()
+            break
+
+        if event["type"] == "websocket.receive":
+            if event["text"] == "ping":
+                await send({"type": "websocket.send", "text": "pong"})
+            else:
+                await peer.receive(event["text"])
+
+
+class Peer:
+    def __init__(self, map_id, username=None):
+        self.username = username or ""
+        self.map_id = map_id
+        self.is_authenticated = False
+        self._subscriptions = []
+
+    @property
+    def room_key(self):
+        return f"umap:{self.map_id}"
+
+    @property
+    def peer_key(self):
+        return f"user:{self.map_id}:{self.peer_id}"
+
+    async def get_peers(self):
+        known = await self.client.hgetall(self.room_key)
+        active = await self.client.pubsub_channels(f"user:{self.map_id}:*")
+        if not active:
+            # Poor man way of deleting stale usernames from the store
+            # HEXPIRE command is not in the open source Redis version
+            await self.client.delete(self.room_key)
+            await self.store_username()
+        active = [name.split(b":")[-1] for name in active]
+        if self.peer_id.encode() not in active:
+            # Our connection may not yet be active
+            active.append(self.peer_id.encode())
+        return {k: v for k, v in known.items() if k in active}
+
+    async def store_username(self):
+        await self.client.hset(self.room_key, self.peer_id, self.username)
+
+    async def listen_to_channel(self, channel_name):
+        async def reader(pubsub):
+            await pubsub.subscribe(channel_name)
+            while True:
+                if pubsub.connection is None:
+                    # It has been unsubscribed/closed.
+                    break
+                try:
+                    message = await pubsub.get_message(ignore_subscribe_messages=True)
+                except Exception as err:
+                    print(err)
+                    break
+                if message is not None:
+                    await self.send(message["data"].decode())
+                await asyncio.sleep(0.001)  # Be nice with the server
+
+        async with self.client.pubsub() as pubsub:
+            self._subscriptions.append(pubsub)
+            asyncio.create_task(reader(pubsub))
+
+    async def listen(self):
+        await self.listen_to_channel(self.room_key)
+        await self.listen_to_channel(self.peer_key)
+
+    async def connect(self):
+        self.client = redis.from_url(settings.REDIS_URL)
+
+    async def disconnect(self):
+        await self.client.hdel(self.room_key, self.peer_id)
+        for pubsub in self._subscriptions:
+            await pubsub.unsubscribe()
+            await pubsub.close()
+        await self.send_peers_list()
+        await self.client.aclose()
+
+    async def send_peers_list(self):
+        message = ListPeersResponse(peers=await self.get_peers())
+        await self.broadcast(message.model_dump_json())
+
+    async def broadcast(self, message):
+        print("BROADCASTING", message)
+        # Send to all channels (including sender!)
+        await self.client.publish(self.room_key, message)
+
+    async def send_to(self, peer_id, message):
+        print("SEND TO", peer_id, message)
+        # Send to one given channel
+        await self.client.publish(f"user:{self.map_id}:{peer_id}", message)
+
+    async def receive(self, text_data):
+        if not self.is_authenticated:
+            print("AUTHENTICATING", text_data)
+            message = JoinRequest.model_validate_json(text_data)
+            signed = TimestampSigner().unsign_object(message.token, max_age=30)
+            user, map_id, permissions = signed.values()
+            assert str(map_id) == self.map_id
+            if "edit" not in permissions:
+                return await self.disconnect()
+            self.peer_id = message.peer
+            self.username = message.username
+            print("AUTHENTICATED", self.peer_id)
+            await self.store_username()
+            await self.listen()
+            response = JoinResponse(peer=self.peer_id, peers=await self.get_peers())
+            await self.send(response.model_dump_json())
+            await self.send_peers_list()
+            self.is_authenticated = True
+            return
+
+        try:
+            incoming = Request.model_validate_json(text_data)
+        except ValidationError as error:
+            message = (
+                f"An error occurred when receiving the following message: {text_data!r}"
+            )
+            logging.error(message, error)
+        else:
+            match incoming.root:
+                # Broadcast all operation messages to connected peers
+                case OperationMessage():
+                    await self.broadcast(text_data)
+
+                # Send peer messages to the proper peer
+                case PeerMessage():
+                    await self.send_to(incoming.root.recipient, text_data)
+
+    async def send(self, text):
+        print("  FORWARDING TO", self.peer_id, text)
+        try:
+            await self._send({"type": "websocket.send", "text": text})
+        except Exception as err:
+            print("Error sending message:", text)
+            print(err)
+
+
+urlpatterns = [path("ws/sync/<str:map_id>", name="ws_sync", view=sync)]

umap/sync/payloads.py

@@ -0,0 +1,49 @@
+from typing import Literal, Optional, Union
+
+from pydantic import BaseModel, Field, RootModel
+
+
+class JoinRequest(BaseModel):
+    kind: Literal["JoinRequest"] = "JoinRequest"
+    token: str
+    peer: str
+    username: Optional[str] = ""
+
+
+class OperationMessage(BaseModel):
+    """Message sent from one peer to all the others"""
+
+    kind: Literal["OperationMessage"] = "OperationMessage"
+    verb: Literal["upsert", "update", "delete"]
+    subject: Literal["map", "datalayer", "feature"]
+    metadata: Optional[dict] = None
+    key: Optional[str] = None
+
+
+class PeerMessage(BaseModel):
+    """Message sent from a specific peer to another one"""
+
+    kind: Literal["PeerMessage"] = "PeerMessage"
+    sender: str
+    recipient: str
+    # The message can be whatever the peers want. It's not checked by the server.
+    message: dict
+
+
+class Request(RootModel):
+    """Any message coming from the websocket should be one of these, and will be rejected otherwise."""
+
+    root: Union[PeerMessage, OperationMessage] = Field(discriminator="kind")
+
+
+class JoinResponse(BaseModel):
+    """Server response containing the list of peers"""
+
+    kind: Literal["JoinResponse"] = "JoinResponse"
+    peers: dict
+    peer: str
+
+
+class ListPeersResponse(BaseModel):
+    kind: Literal["ListPeersResponse"] = "ListPeersResponse"
+    peers: dict

umap/templates/auth/user_detail.html

@@ -2,6 +2,10 @@
 
 {% load i18n %}
 
+{% block head_title %}
+  {% blocktranslate %}{{ current_user }}’s maps{% endblocktranslate %} - {{ SITE_DESCRIPTION }}
+{% endblock head_title %}
+
 {% block maincontent %}
   <div class="col wide">
     <h2 class="section">

umap/templates/auth/user_form.html

@@ -1,7 +1,10 @@
 {% extends "umap/content.html" %}
 
-{% load i18n %}
+{% load i18n static %}
 
+{% block head_title %}
+  {% translate "My Profile" %} - {{ SITE_DESCRIPTION }}
+{% endblock head_title %}
 {% block maincontent %}
   {% include "umap/dashboard_menu.html" with selected="profile" %}
   <div class="wrapper">
@@ -28,8 +31,10 @@
         </h3>
         <ul>
           {% for name in providers %}
-            <li>
-              {{ name|title }}
+            <li class="login-grid">
+              {% with "umap/img/providers/"|add:name|add:".png" as path %}
+               <img src="{% static path %}" width="92px" height="92px" alt="{{ name }}" />
+              {% endwith %}
             </li>
           {% endfor %}
         </ul>
@@ -46,9 +51,7 @@
             {% for name in backends.backends %}
               {% if name not in providers %}
                 <li>
-                  <a href="{% url "social:begin" name %}"
-                     class="umap-login-popup login-{{ name }}"
-                     title="{{ name|title }}"></a>
+                  {% include "umap/components/provider.html" with name=name %}
                 </li>
               {% endif %}
             {% endfor %}

umap/templates/auth/user_stars.html

@@ -2,6 +2,10 @@
 
 {% load i18n %}
 
+{% block head_title %}
+  {% blocktranslate %}{{ current_user }}’s starred maps{% endblocktranslate %} - {{ SITE_DESCRIPTION }}
+{% endblock head_title %}
+
 {% block maincontent %}
   <div class="col wide">
     <h2 class="section">

umap/templates/base.html

@@ -5,7 +5,7 @@
   <head>
     <title>
       {% block head_title %}
-        {{ SITE_NAME }}
+        {{ SITE_NAME }} - {{ SITE_DESCRIPTION }}
       {% endblock head_title %}
     </title>
     <meta charset="utf-8">