This commit is contained in:
Haoming 2025-07-28 17:10:35 +08:00
parent c066f0d703
commit 15c07579fb
14 changed files with 67 additions and 108 deletions

BIN
html/card-no-preview.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

View File

@ -1,5 +1,3 @@
<div class="copy-path-button card-button"
title="Copy path to clipboard"
onclick="extraNetworksCopyCardPath(event)"
<div class="copy-path-button card-button" title="Copy path to clipboard" onclick="extraNetworksCopyCardPath(event)"
data-clipboard-text="{filename}">
</div>
</div>

View File

@ -1,4 +1,3 @@
<div class="edit-button card-button"
title="Edit metadata"
<div class="edit-button card-button" title="Edit metadata"
onclick="extraNetworksEditUserMetadata(event, '{tabname}', '{extra_networks_tabname}')">
</div>
</div>

View File

@ -1,4 +1,3 @@
<div class="metadata-button card-button"
title="Show internal metadata"
<div class="metadata-button card-button" title="Show internal metadata"
onclick="extraNetworksRequestMetadata(event, '{extra_networks_tabname}')">
</div>
</div>

View File

@ -1,8 +1,7 @@
<div class='nocards'>
<h1>Nothing here. Add some content to the following directories:</h1>
<h1>Nothing here. Add some content to the following directories:</h1>
<ul>
{dirs}
</ul>
<ul>
{dirs}
</ul>
</div>

View File

@ -1,8 +1,8 @@
<div class="extra-network-pane-content-dirs">
<div id='{tabname}_{extra_networks_tabname}_dirs' class='extra-network-dirs'>
{dirs_html}
</div>
<div id='{tabname}_{extra_networks_tabname}_cards' class='extra-network-cards'>
{items_html}
</div>
<div class="extra-network-pane-content-dirs">
<div id='{tabname}_{extra_networks_tabname}_dirs' class='extra-network-dirs'>
{dirs_html}
</div>
<div id='{tabname}_{extra_networks_tabname}_cards' class='extra-network-cards'>
{items_html}
</div>
</div>

View File

@ -1,8 +1,9 @@
<div class="extra-network-pane-content-tree resize-handle-row">
<div id='{tabname}_{extra_networks_tabname}_tree' class='extra-network-tree' style='flex-basis: {extra_networks_tree_view_default_width}px'>
{tree_html}
</div>
<div id='{tabname}_{extra_networks_tabname}_cards' class='extra-network-cards' style='flex-grow: 1;'>
{items_html}
</div>
</div>
<div class="extra-network-pane-content-tree resize-handle-row">
<div id='{tabname}_{extra_networks_tabname}_tree' class='extra-network-tree'
style='flex-basis: {extra_networks_tree_view_default_width}px'>
{tree_html}
</div>
<div id='{tabname}_{extra_networks_tabname}_cards' class='extra-network-cards' style='flex-grow: 1;'>
{items_html}
</div>
</div>

View File

@ -1,79 +1,51 @@
<div id='{tabname}_{extra_networks_tabname}_pane' class='extra-network-pane {tree_view_div_default_display_class}'>
<div class="extra-network-control" id="{tabname}_{extra_networks_tabname}_controls" style="display:none" >
<div class="extra-network-control" id="{tabname}_{extra_networks_tabname}_controls" style="display:none">
<div class="extra-network-control--search">
<input
id="{tabname}_{extra_networks_tabname}_extra_search"
class="extra-network-control--search-text"
type="search"
placeholder="Search"
>
<input id="{tabname}_{extra_networks_tabname}_extra_search" class="extra-network-control--search-text"
type="search" placeholder="Search">
</div>
<small>Sort: </small>
<div
id="{tabname}_{extra_networks_tabname}_extra_sort_path"
class="extra-network-control--sort{sort_path_active}"
data-sortkey="default"
title="Sort by path"
onclick="extraNetworksControlSortOnClick(event, '{tabname}', '{extra_networks_tabname}');"
>
<div id="{tabname}_{extra_networks_tabname}_extra_sort_path"
class="extra-network-control--sort{sort_path_active}" data-sortkey="default" title="Sort by path"
onclick="extraNetworksControlSortOnClick(event, '{tabname}', '{extra_networks_tabname}');">
<i class="extra-network-control--icon extra-network-control--sort-icon"></i>
</div>
<div
id="{tabname}_{extra_networks_tabname}_extra_sort_name"
class="extra-network-control--sort{sort_name_active}"
data-sortkey="name"
title="Sort by name"
onclick="extraNetworksControlSortOnClick(event, '{tabname}', '{extra_networks_tabname}');"
>
<div id="{tabname}_{extra_networks_tabname}_extra_sort_name"
class="extra-network-control--sort{sort_name_active}" data-sortkey="name" title="Sort by name"
onclick="extraNetworksControlSortOnClick(event, '{tabname}', '{extra_networks_tabname}');">
<i class="extra-network-control--icon extra-network-control--sort-icon"></i>
</div>
<div
id="{tabname}_{extra_networks_tabname}_extra_sort_date_created"
class="extra-network-control--sort{sort_date_created_active}"
data-sortkey="date_created"
<div id="{tabname}_{extra_networks_tabname}_extra_sort_date_created"
class="extra-network-control--sort{sort_date_created_active}" data-sortkey="date_created"
title="Sort by date created"
onclick="extraNetworksControlSortOnClick(event, '{tabname}', '{extra_networks_tabname}');"
>
onclick="extraNetworksControlSortOnClick(event, '{tabname}', '{extra_networks_tabname}');">
<i class="extra-network-control--icon extra-network-control--sort-icon"></i>
</div>
<div
id="{tabname}_{extra_networks_tabname}_extra_sort_date_modified"
class="extra-network-control--sort{sort_date_modified_active}"
data-sortkey="date_modified"
<div id="{tabname}_{extra_networks_tabname}_extra_sort_date_modified"
class="extra-network-control--sort{sort_date_modified_active}" data-sortkey="date_modified"
title="Sort by date modified"
onclick="extraNetworksControlSortOnClick(event, '{tabname}', '{extra_networks_tabname}');"
>
onclick="extraNetworksControlSortOnClick(event, '{tabname}', '{extra_networks_tabname}');">
<i class="extra-network-control--icon extra-network-control--sort-icon"></i>
</div>
<small> </small>
<div
id="{tabname}_{extra_networks_tabname}_extra_sort_dir"
class="extra-network-control--sort-dir"
data-sortdir="{data_sortdir}"
title="Sort ascending"
onclick="extraNetworksControlSortDirOnClick(event, '{tabname}', '{extra_networks_tabname}');"
>
<div id="{tabname}_{extra_networks_tabname}_extra_sort_dir" class="extra-network-control--sort-dir"
data-sortdir="{data_sortdir}" title="Sort ascending"
onclick="extraNetworksControlSortDirOnClick(event, '{tabname}', '{extra_networks_tabname}');">
<i class="extra-network-control--icon extra-network-control--sort-dir-icon"></i>
</div>
<small> </small>
<div
id="{tabname}_{extra_networks_tabname}_extra_tree_view"
class="extra-network-control--tree-view {tree_view_btn_extra_class}"
title="Enable Tree View"
onclick="extraNetworksControlTreeViewOnClick(event, '{tabname}', '{extra_networks_tabname}');"
>
<div id="{tabname}_{extra_networks_tabname}_extra_tree_view"
class="extra-network-control--tree-view {tree_view_btn_extra_class}" title="Enable Tree View"
onclick="extraNetworksControlTreeViewOnClick(event, '{tabname}', '{extra_networks_tabname}');">
<i class="extra-network-control--icon extra-network-control--tree-view-icon"></i>
</div>
<div
id="{tabname}_{extra_networks_tabname}_extra_refresh"
class="extra-network-control--refresh"
<div id="{tabname}_{extra_networks_tabname}_extra_refresh" class="extra-network-control--refresh"
title="Refresh page"
onclick="extraNetworksControlRefreshOnClick(event, '{tabname}', '{extra_networks_tabname}');"
>
onclick="extraNetworksControlRefreshOnClick(event, '{tabname}', '{extra_networks_tabname}');">
<i class="extra-network-control--icon extra-network-control--refresh-icon"></i>
</div>
</div>

View File

@ -1,11 +1,7 @@
<span data-filterable-item-text hidden>{search_terms}</span>
<div class="tree-list-content {subclass}"
type="button"
<div class="tree-list-content {subclass}" type="button"
onclick="extraNetworksTreeOnClick(event, '{tabname}', '{extra_networks_tabname}');{onclick_extra}"
data-name="{action_list_item_label}"
data-path="{data_path}"
data-hash="{data_hash}"
>
data-name="{action_list_item_label}" data-path="{data_path}" data-hash="{data_hash}">
<span class='tree-list-item-action tree-list-item-action--leading'>
{action_list_item_action_leading}
</span>

View File

@ -1,15 +1,11 @@
<div>
<a href="{api_docs}">API</a>
 • 
<a href="https://github.com/lllyasviel/stable-diffusion-webui-forge">Github</a>
 • 
<a href="https://gradio.app">Gradio</a>
 • 
<a href="#" onclick="showProfile('./internal/profile-startup'); return false;">Startup profile</a>
<a href="#" onclick="showProfile('./internal/profile-startup'); return false;">Startup Profile</a>
 • 
<a href="/" onclick="javascript:gradioApp().getElementById('settings_restart_gradio').click(); return false">Reload UI</a>
</div>
<br />
<div class="versions">
{versions}
{versions}
</div>

View File

@ -407,7 +407,7 @@ onOptionsChanged(function () {
if (elem && elem.textContent != shorthash) {
elem.textContent = shorthash;
elem.title = sd_checkpoint_hash;
elem.href = "https://google.com/search?q=" + sd_checkpoint_hash;
elem.href = "https://civitai.com/search/models?query=" + sd_checkpoint_hash;
}
});

View File

@ -957,32 +957,31 @@ def create_ui():
def versions_html():
from backend.memory_management import xformers_enabled # sage_enabled, flash_enabled
import importlib.metadata
import torch
import launch
python_version = ".".join([str(x) for x in sys.version_info[0:3]])
commit = launch.commit_hash()
tag = launch.git_tag()
_versions = [f"torch: {getattr(torch, '__long_version__', torch.__version__)}"]
if shared.xformers_available:
import xformers
xformers_version = xformers.__version__
else:
xformers_version = "N/A"
# if sage_enabled():
# _versions.append(f"sage: {importlib.metadata.version('sageattention')}")
# if flash_enabled():
# _versions.append(f"flash: {importlib.metadata.version('flash_attn')}")
if xformers_enabled():
_versions.append(f"xformers: {importlib.metadata.version('xformers')}")
return f"""
version: <a href="https://github.com/lllyasviel/stable-diffusion-webui-forge/commit/{commit}">{tag}</a>
version: <a href="https://github.com/Haoming02/sd-webui-forge-classic/tree/neo">neo</a>
&#x2000;•&#x2000;
python: <span title="{sys.version}">{python_version}</span>
&#x2000;•&#x2000;
torch: {getattr(torch, '__long_version__',torch.__version__)}
&#x2000;•&#x2000;
xformers: {xformers_version}
{'&#x2000;•&#x2000;'.join(_versions)}
&#x2000;•&#x2000;
gradio: {gr.__version__}
&#x2000;•&#x2000;
checkpoint: <a id="sd_checkpoint_hash">N/A</a>
"""
"""
def setup_ui_api(app):

View File

@ -1043,7 +1043,7 @@ footer {
overflow: hidden;
cursor: pointer;
background-image: url('./file=html/card-no-preview.png')
background-image: url('./file=html/card-no-preview.jpg')
}
.extra-network-pane .card:hover{