voussoir/etiquette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use update_dynamic_elements for user name, clipboard count.

Browse source
This commit is contained in:
voussoir 2021-01-07 20:18:07 -08:00
parent 02ed3dff92
commit ea5a02f8b6
5 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frontends/etiquette_flask/static/js/photo_clipboard.js
View file

@ -379,16 +379,6 @@ function open_full_clipboard_tab()
window.open("/clipboard"); window.open("/clipboard");
} }
photo_clipboard.update_clipboard_count =
function update_clipboard_count()
{
const elements = document.getElementsByClassName("clipboard_count");
for (const element of elements)
{
element.innerText = photo_clipboard.clipboard.size;
}
}
photo_clipboard.on_storage_event = photo_clipboard.on_storage_event =
function on_storage_event() function on_storage_event()
{ {
@ -405,7 +395,7 @@ function update_pagestate()
/* /*
Update all relevant DOM elements to match internal state. Update all relevant DOM elements to match internal state.
*/ */
photo_clipboard.update_clipboard_count(); common.update_dynamic_elements("dynamic_clipboard_count", photo_clipboard.clipboard.size);
photo_clipboard.update_clipboard_tray(); photo_clipboard.update_clipboard_tray();
photo_clipboard.apply_check_all(); photo_clipboard.apply_check_all();
} }

2
frontends/etiquette_flask/templates/clipboard.html
View file

@ -95,7 +95,7 @@
{{header.make_header(session=session)}} {{header.make_header(session=session)}}
<div id="content_body" class="sticky_side_right sticky_bottom_right"> <div id="content_body" class="sticky_side_right sticky_bottom_right">
<div id="left"> <div id="left">
<div class="panel">The clipboard contains <span class="clipboard_count">0</span> items. <div class="panel">The clipboard contains <span class="dynamic_clipboard_count">0</span> items.
<button id="clear_clipboard_button" class="red_button" onclick="return photo_clipboard.clear_clipboard();">Clear it.</button> <button id="clear_clipboard_button" class="red_button" onclick="return photo_clipboard.clear_clipboard();">Clear it.</button>
</div> </div>

2
frontends/etiquette_flask/templates/clipboard_tray.html
View file

@ -4,7 +4,7 @@
id="clipboard_tray_expandbutton" id="clipboard_tray_expandbutton"
class="yellow_button" class="yellow_button"
onclick="return photo_clipboard.clipboard_tray_collapse_toggle();" onclick="return photo_clipboard.clipboard_tray_collapse_toggle();"
>Clipboard: <span class="clipboard_count">0</span> items</button> >Clipboard: <span class="dynamic_clipboard_count">0</span> items</button>
<div id="clipboard_tray_body" class="hidden"> <div id="clipboard_tray_body" class="hidden">
<div id="clipboard_tray_toolbox"> <div id="clipboard_tray_toolbox">
<span id="clipboard_tray_toolbox_firstline"> <span id="clipboard_tray_toolbox_firstline">

2
frontends/etiquette_flask/templates/header.html
View file

@ -4,7 +4,7 @@
<a class="header_element" href="/search">Search</a> <a class="header_element" href="/search">Search</a>
<a class="header_element" href="/tags">Tags</a> <a class="header_element" href="/tags">Tags</a>
{% if session.user %} {% if session.user %}
<a class="header_element" href="/user/{{session.user.username}}">{{session.user.display_name}}</a> <a class="header_element dynamic_user_display_name" href="/user/{{session.user.username}}">{{session.user.display_name}}</a>
<button class="header_element" onclick="return api.users.logout(common.refresh);" style="flex:0">Logout</button> <button class="header_element" onclick="return api.users.logout(common.refresh);" style="flex:0">Logout</button>
{% else %} {% else %}
<a class="header_element" href="/login">Log in</a> <a class="header_element" href="/login">Log in</a>

6
frontends/etiquette_flask/templates/user.html
View file

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
{% import "header.html" as header %} {% import "header.html" as header %}
<title>{{user.display_name}}</title> <title class="dynamic_user_display_name">{{user.display_name}}</title>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<link rel="stylesheet" href="/static/css/common.css"> <link rel="stylesheet" href="/static/css/common.css">
@ -36,7 +36,7 @@ h2, h3
<p>User since <span title="{{user.created|int|timestamp_to_8601}}">{{user.created|timestamp_to_naturaldate}}.</span></p> <p>User since <span title="{{user.created|int|timestamp_to_8601}}">{{user.created|timestamp_to_naturaldate}}.</span></p>
</div> </div>
<div class="panel"> <div class="panel">
<h3><a href="/search?author={{user.username}}">Photos by {{user.display_name}}</a></h3> <h3><a href="/search?author={{user.username}}">Photos by <span class="dynamic_user_display_name">{{user.display_name}}</span></a></h3>
<iframe <iframe
class="embedded_search" class="embedded_search"
src="/search_embed?author={{user.username}}&orderby=created-desc&yield_albums=no&limit=10" src="/search_embed?author={{user.username}}&orderby=created-desc&yield_albums=no&limit=10"
@ -72,7 +72,7 @@ function profile_ed_on_save(ed)
// The data that comes back from the server will have been normalized. // The data that comes back from the server will have been normalized.
const new_display_name = response.data.display_name; const new_display_name = response.data.display_name;
document.title = new_display_name; common.update_dynamic_elements("dynamic_user_display_name", new_display_name);
ed.elements["display_name"].edit.value = new_display_name; ed.elements["display_name"].edit.value = new_display_name;