images: Move error/loading images into subdirectories.

Fixes part of #22464.
2025-11-03 13:33:24 +00:00 · 2022-07-16 23:54:50 +05:30
parent bc937168cd
commit bfd38b3297
25 changed files with 19 additions and 19 deletions
--- a/static/html/5xx.html
+++ b/static/html/5xx.html
@@ -27,7 +27,7 @@
        <div class="container">

            <div class="row-fluid">
-                <img src="/static/images/500art.svg" alt=""/>
+                <img src="/static/images/errors/500art.svg" alt=""/>
                <div class="errorbox">
                    <div class="errorcontent">
                        <h1 class="lead">Internal server error</h1>
--- a/static/images/errors/400art.svg
+++ b/static/images/errors/400art.svg
--- a/static/images/errors/500art.svg
+++ b/static/images/errors/500art.svg
--- a/static/images/errors/timeout_hourglass.png
+++ b/static/images/errors/timeout_hourglass.png
--- a/static/images/loading/loader-black.svg
+++ b/static/images/loading/loader-black.svg
--- a/static/images/loading/loader-white.svg
+++ b/static/images/loading/loader-white.svg
--- a/static/images/loading/loading-ellipsis.svg
+++ b/static/images/loading/loading-ellipsis.svg
--- a/static/images/loading/tail-spin.svg
+++ b/static/images/loading/tail-spin.svg
--- a/static/js/loading.ts
+++ b/static/js/loading.ts
@@ -70,9 +70,9 @@ export function destroy_indicator($container: JQuery): void {

 export function show_button_spinner($elt: JQuery, using_dark_theme: boolean): void {
    if (!using_dark_theme) {
-        $elt.attr("src", "/static/images/loader-black.svg");
+        $elt.attr("src", "/static/images/loading/loader-black.svg");
    } else {
-        $elt.attr("src", "/static/images/loader-white.svg");
+        $elt.attr("src", "/static/images/loading/loader-white.svg");
    }
    $elt.css("display", "inline-block");
 }
--- a/static/templates/more_topics_spinner.hbs
+++ b/static/templates/more_topics_spinner.hbs
@@ -1,3 +1,3 @@
 <li class="searching-for-more-topics">
-    <img src="/static/images/loading-ellipsis.svg" alt="" />
+    <img src="/static/images/loading/loading-ellipsis.svg" alt="" />
 </li>
--- a/static/templates/settings/image_upload_widget.hbs
+++ b/static/templates/settings/image_upload_widget.hbs
@@ -17,7 +17,7 @@
            {{ upload_text }}
        </span>
        <span class="upload-spinner-background">
-            <img class="image_upload_spinner" src="/static/images/tail-spin.svg" alt="" />
+            <img class="image_upload_spinner" src="/static/images/loading/tail-spin.svg" alt="" />
        </span>
    </div>
    <img class="image-block" src="{{ image }}"/>
--- a/templates/404.html
+++ b/templates/404.html
@@ -6,7 +6,7 @@
 <div class="error_page">
    <div class="container">
        <div class="row-fluid">
-            <img src="/static/images/400art.svg" alt=""/>
+            <img src="/static/images/errors/400art.svg" alt=""/>
            <div class="errorbox">
                <div class="errorcontent">
                    {% if status_code == 405 %}
--- a/templates/500.html
+++ b/templates/500.html
@@ -11,7 +11,7 @@
 <div class="error_page">
    <div class="container">
        <div class="row-fluid">
-            <img src="/static/images/500art.svg" alt=""/>
+            <img src="/static/images/errors/500art.svg" alt=""/>
            <div class="errorbox">
                <div class="errorcontent">
                    <h1 class="lead">Internal server error</h1>
--- a/templates/confirmation/link_does_not_exist.html
+++ b/templates/confirmation/link_does_not_exist.html
@@ -3,7 +3,7 @@
 {% block portico_content %}
 <div class="error_page">
    <div class="container">
-        <img src="/static/images/400art.svg" alt=""/>
+        <img src="/static/images/errors/400art.svg" alt=""/>
        <div class="errorbox">
            <div class="errorcontent">
                <h1 class="lead">{{ _("Whoops. We couldn't find your confirmation link in the system.") }}</h1>
--- a/templates/confirmation/link_expired.html
+++ b/templates/confirmation/link_expired.html
@@ -4,7 +4,7 @@
 <div class="error_page">
    <div class="container">
        <div class="row-fluid">
-            <img class="hourglass-img" src="/static/images/timeout_hourglass.png" alt=""/>
+            <img class="hourglass-img" src="/static/images/errors/timeout_hourglass.png" alt=""/>
            <div class="errorbox">
                <div class="errorcontent">
                    <h1 class="lead">{{ _("Whoops. The confirmation link has expired or been deactivated.") }}</h1>
--- a/templates/confirmation/link_malformed.html
+++ b/templates/confirmation/link_malformed.html
@@ -3,7 +3,7 @@
 {% block portico_content %}
 <div class="error_page">
    <div class="container">
-        <img src="/static/images/500art.svg" alt=""/>
+        <img src="/static/images/errors/500art.svg" alt=""/>
        <div class="errorbox">
            <div class="errorcontent">
                <h1 class="lead">{{ _("Whoops. The confirmation link is malformed.") }}</h1>
--- a/templates/corporate/apps.html
+++ b/templates/corporate/apps.html
@@ -32,7 +32,7 @@
            </div>
            <div class="image">
                <div class="flex">
-                    <img src="/static/images/loader-white.svg" alt="" />
+                    <img src="/static/images/loading/loader-white.svg" alt="" />
                </div>
            </div>
        </div>
--- a/templates/corporate/support_request.html
+++ b/templates/corporate/support_request.html
@@ -31,7 +31,7 @@
                <div class="register-button-box">
                    <button class="register-button support-submit-button" type="submit">
                        <span>{{ _('Submit') }}</span>
-                        <object class="loader" type="image/svg+xml" data="/static/images/loader-white.svg"></object>
+                        <object class="loader" type="image/svg+xml" data="/static/images/loading/loader-white.svg"></object>
                    </button>
                </div>
            </fieldset>
--- a/templates/zerver/auth_subdomain.html
+++ b/templates/zerver/auth_subdomain.html
@@ -5,7 +5,7 @@
 <div class="error_page">
    <div class="container">
        <div class="row-fluid">
-            <img src="/static/images/500art.svg" alt=""/>
+            <img src="/static/images/errors/500art.svg" alt=""/>
            <div class="errorbox">
                <div class="errorcontent">
                    <h1 class="lead">Authentication subdomain</h1>
--- a/templates/zerver/config_error.html
+++ b/templates/zerver/config_error.html
@@ -5,7 +5,7 @@
 <div class="error_page" style="padding-bottom: 60px;">
    <div class="container">
        <div class="row-fluid">
-            <img src="/static/images/500art.svg" alt=""/>
+            <img src="/static/images/errors/500art.svg" alt=""/>
            <div class="errorbox config-error">
                <div class="errorcontent">
                    <h1 class="lead">Configuration error</h1>
--- a/templates/zerver/insecure_desktop_app.html
+++ b/templates/zerver/insecure_desktop_app.html
@@ -5,7 +5,7 @@
 <div class="error_page">
    <div class="container">
        <div class="row-fluid">
-            <img src="/static/images/400art.svg" alt=""/>
+            <img src="/static/images/errors/400art.svg" alt=""/>
            <div class="errorbox config-error">
                <div class="errorcontent">
                    <h1 class="lead">{{ _('Update required') }}</h1>
--- a/templates/zerver/login.html
+++ b/templates/zerver/login.html
@@ -118,7 +118,7 @@ page can be easily identified in it's respective JavaScript file. -->
                            {% endif %}

                            <button type="submit" name="button" class="full-width">
-                                <img class="loader" src="/static/images/loader-white.svg" alt="" />
+                                <img class="loader" src="/static/images/loading/loader-white.svg" alt="" />
                                <span class="text">{{ _("Log in") }}</span>
                            </button>
                        </form>
--- a/templates/zerver/rate_limit_exceeded.html
+++ b/templates/zerver/rate_limit_exceeded.html
@@ -5,7 +5,7 @@
 <div class="error_page">
    <div class="container">
        <div class="row-fluid">
-            <img src="/static/images/500art.svg" alt=""/>
+            <img src="/static/images/errors/500art.svg" alt=""/>
            <div class="errorbox">
                <div class="errorcontent">
                    <h1 class="lead">{{ _("Rate limit exceeded.") }}</h1>
--- a/templates/zerver/register.html
+++ b/templates/zerver/register.html
@@ -262,7 +262,7 @@ Form is validated both client-side using jquery-validation (see signup.js) and s
                <div class="register-button-box">
                    <button class="register-button" type="submit">
                        <span>{{ _('Sign up') }}</span>
-                        <object class="loader" type="image/svg+xml" data="/static/images/loader-white.svg"></object>
+                        <object class="loader" type="image/svg+xml" data="/static/images/loading/loader-white.svg"></object>
                    </button>
                    <input type="hidden" name="next" value="{{ next }}" />
                </div>
--- a/templates/zerver/unsupported_browser.html
+++ b/templates/zerver/unsupported_browser.html
@@ -5,7 +5,7 @@
 <div class="error_page unsupported_browser_page">
    <div class="container">
        <div class="row-fluid">
-            <img src="/static/images/400art.svg" alt=""/>
+            <img src="/static/images/errors/400art.svg" alt=""/>
            <div class="errorbox config-error">
                <div class="errorcontent">
                    <h1 class="lead">{{ _('Unsupported browser') }}</h1>