Merge pull request #1961 from codidact/0valt/1396/deleted-users

Oaphi · web-flow · commit 199b6307a6cc · 2026-01-29T14:18:45.000Z
Remove all hardcoded Codidactyl references from QPixel
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -17,6 +17,10 @@
 @import url('https://fonts.googleapis.com/css2?family=Red+Hat+Display&family=Roboto&family=Roboto+Mono&display=swap');
 @import 'variables';
 
+html, body {
+  height: 100%;
+}
+
 h1, h2, h3, h4, h5, h6 {
   font-family: $font-stack-display;
 }
diff --git a/app/assets/stylesheets/tour.scss b/app/assets/stylesheets/tour.scss
@@ -1,23 +1,23 @@
-.codidactyl {
+.mascot {
   width: 80px;
   padding: 2rem;
   margin-top: 1rem;
 }
 
-.codidactyl + .is-flexible {
+.mascot + .is-flexible {
   width: 0;
 }
 
-.codidactyl-hints {
+.mascot-hints {
   padding: 1rem;
 }
 
-.codidactyl-sticky {
+.mascot-sticky {
   position: sticky;
   top: 0.5rem;
 }
 
-.codidactyl-small {
+.mascot-small {
   max-height: 1em;
 }
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -682,7 +682,7 @@ def check_deleted
     go_to_not_found = !current_user&.at_least_moderator? || params[:deleted_screen].present?
 
     if deleted && go_to_not_found
-      render :deleted_user, layout: 'without_sidebar', status: 404
+      not_found!
     end
   end
 end
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
@@ -80,7 +80,7 @@ def self.useful_err_msg
       'random data again.',
       'This community has reached a critical mass and collapsed into a black hole. Currently trying to ' \
       'recover using Hawking radiation.',
-      'Operations are on pause while we attempt to recapture the codidactyl. Please hold.',
+      'Operations are on pause while we attempt to recapture the pixel. Please hold.',
       'The data center is on fire. Please hold while we activate fire suppression systems.',
       'The reciprocal controller flag is set incorrectly. Please stand on your head and rickroll yourself to fix this.',
       'The quantum cache has become uncertain. Please observe it again after making a cup of tea.',
diff --git a/app/views/devise/mailer/_friendly_footer.html.erb b/app/views/devise/mailer/_friendly_footer.html.erb
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -14,4 +14,4 @@
   <%= confirmation_url(@resource, confirmation_token: @token, host: RequestContext.community.host) %>
 </p>
 
-<%= render 'devise/mailer/friendly_footer' %>
+<%= sanitize(render_markdown(SiteSetting['FriendlyEmailFooter']), scrubber: scrubber) %>
diff --git a/app/views/devise/mailer/email_changed.html.erb b/app/views/devise/mailer/email_changed.html.erb
@@ -19,4 +19,4 @@
   </p>
 <% end %><br/>
 
-<%= render 'devise/mailer/friendly_footer' %>
+<%= sanitize(render_markdown(SiteSetting['FriendlyEmailFooter']), scrubber: scrubber) %>
diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb
@@ -8,4 +8,4 @@
   <%= link_to 'change your password now', new_password_url(@resource) %> to protect your account.
 </p>
 
-<%= render 'devise/mailer/friendly_footer' %>
+<%= sanitize(render_markdown(SiteSetting['FriendlyEmailFooter']), scrubber: scrubber) %>
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -11,4 +11,4 @@
   above and set a new password.
 </p>
 
-<%= render 'devise/mailer/friendly_footer' %>
+<%= sanitize(render_markdown(SiteSetting['FriendlyEmailFooter']), scrubber: scrubber) %>
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -6,4 +6,4 @@
 
 <p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token), class: 'button is-filled' %></p>
 
-<%= render 'devise/mailer/friendly_footer' %>
+<%= sanitize(render_markdown(SiteSetting['FriendlyEmailFooter']), scrubber: scrubber) %>
diff --git a/app/views/errors/not_found.html.erb b/app/views/errors/not_found.html.erb
@@ -5,10 +5,13 @@
 
 <p class="is-lead">The page you're looking for couldn't be found.</p>
 
-<p>You might have followed an old link, or a post might have been deleted.</p>
+<%
+  is_user = params[:id].present? ? request.original_fullpath.include?(user_path(id: params[:id])) : false
+%>
 
+<p>You might have followed an old link, or the <%= is_user ? 'user' : 'post' %> might have been deleted.</p>
 
 <p>
   <%= link_to 'Go back', :back, class: 'button is-outlined' %>
   <%= link_to 'Go home', root_path, class: 'button is-outlined' %>
-</p>
+</p>
diff --git a/app/views/tour/_hint_widget.html.erb b/app/views/tour/_hint_widget.html.erb
@@ -1,7 +1,9 @@
 <div class="widget<%= " #{classes}" if defined?(classes) %>">
   <div class="widget--header">
-    <img src="/assets/codidactyl.png" alt="Codidactyl" class="codidactyl-small">
-    Codidactyl's Hints
+    <img src="<%= SiteSetting['NetworkMascotLogoPath'] %>"
+         alt="<%= SiteSetting['NetworkMascotName'] %>"
+         class="mascot-small">
+    <%= SiteSetting['NetworkMascotName'] %>'s Hints
   </div>
   <div class="widget--body">
     <%= yield %>
diff --git a/app/views/tour/end.html.erb b/app/views/tour/end.html.erb
@@ -1,16 +1,17 @@
 <div class="grid">
-    <div class="grid--cell codidactyl">
-        <img src="/assets/codidactyl.png" alt="Codidactyl">
+  <div class="grid--cell mascot">
+    <img src="<%= SiteSetting['NetworkMascotLogoPath'] %>"
+         alt="<%= SiteSetting['NetworkMascotName'] %>">
+  </div>
+  <div class="grid--cell is-flexible">
+    <div class="widget">
+      <div class="widget--body">
+        <h1>Congratulations!</h1>
+        <p>You have successfully completed my tutorial. Now you're ready to dive into this community. Go and learn together.</p>
+      </div>
+      <div class="widget--footer step-1-footer">
+        <a href="/" class="button is-filled">End tutorial</a>
+      </div>
     </div>
-    <div class="grid--cell is-flexible">
-        <div class="widget">
-            <div class="widget--body">
-                <h1>Congratulations!</h1>
-                <p>You have successfully completed my tutorial. Now you're ready to dive into this community. Go and learn together.</p>
-            </div>
-            <div class="widget--footer step-1-footer">
-                <a href="/" class="button is-filled">End tutorial</a>
-            </div>
-        </div>
-    </div>
-</div>
+  </div>
+</div>
diff --git a/app/views/tour/index.html.erb b/app/views/tour/index.html.erb
@@ -1,17 +1,16 @@
 <div class="grid">
-    <div class="grid--cell codidactyl">
-        <img src="/assets/codidactyl.png" alt="Codidactyl">
+  <div class="grid--cell mascot">
+    <img src="<%= SiteSetting['NetworkMascotLogoPath'] %>" alt="<%= SiteSetting['NetworkMascotName'] %>">
+  </div>
+  <div class="grid--cell is-flexible">
+    <div class="widget">
+      <div class="widget--body">
+        <%= raw(sanitize(render_markdown(SiteSetting['TourBeginningDescription']), scrubber: scrubber)) %>
+      </div>
+      <div class="widget--footer">
+        <a href="/tour/q" class="button is-filled">Let's go</a>
+        <a href="/" class="button">No, thanks</a>
+      </div>
     </div>
-    <div class="grid--cell is-flexible">
-        <div class="widget">
-            <div class="widget--body">
-                <p>Hi!</p>
-                <p>I'm your friendly neighbourhood <a href="https://en.wikipedia.org/wiki/Pterodactylus">Codidactyl</a> and I'd like to introduce you to this website. Don't worry: It doesn't take long and you can abort at any time.</p>
-            </div>
-            <div class="widget--footer">
-                <a href="/tour/q" class="button is-filled">Let's go</a>
-                <a href="/" class="button">No, thanks</a>
-            </div>
-        </div>
-    </div>
-</div>
+  </div>
+</div>
diff --git a/app/views/tour/more.html.erb b/app/views/tour/more.html.erb
@@ -1,6 +1,6 @@
 <div class="grid step-1" id="1">
-  <div class="grid--cell codidactyl tour-wide-only">
-    <img src="/assets/codidactyl.png" alt="Codidactyl">
+  <div class="grid--cell mascot tour-wide-only">
+    <img src="<%= SiteSetting['NetworkMascotLogoPath'] %>" alt="<%= SiteSetting['NetworkMascotName'] %>">
   </div>
   <div class="grid--cell is-flexible">
     <div class="widget">
@@ -15,8 +15,8 @@
 </div>
 
 <div class="grid step-2 hide" id="2">
-  <div class="grid--cell codidactyl tour-wide-only">
-    <img src="/assets/codidactyl.png" alt="Codidactyl">
+  <div class="grid--cell mascot tour-wide-only">
+    <img src="<%= SiteSetting['NetworkMascotLogoPath'] %>" alt="<%= SiteSetting['NetworkMascotName'] %>">
   </div>
   <div class="grid--cell is-flexible">
     <div class="widget">
@@ -45,8 +45,8 @@
 </div>
 
 <div class="grid step-3 hide" id="3">
-  <div class="grid--cell codidactyl tour-wide-only">
-    <img src="/assets/codidactyl.png" alt="Codidactyl">
+  <div class="grid--cell mascot tour-wide-only">
+    <img src="<%= SiteSetting['NetworkMascotLogoPath'] %>" alt="<%= SiteSetting['NetworkMascotName'] %>">
   </div>
   <div class="grid--cell is-flexible">
     <div class="widget">
@@ -65,8 +65,8 @@
 </div>
 
 <div class="grid step-4 hide" id="4">
-  <div class="grid--cell codidactyl tour-wide-only">
-    <img src="/assets/codidactyl.png" alt="Codidactyl">
+  <div class="grid--cell mascot tour-wide-only">
+    <img src="<%= SiteSetting['NetworkMascotLogoPath'] %>" alt="<%= SiteSetting['NetworkMascotName'] %>">
   </div>
   <div class="grid--cell is-flexible">
     <div class="widget">
@@ -102,8 +102,8 @@
 </div>
 
 <div class="grid step-5 hide" id="5">
-  <div class="grid--cell codidactyl tour-wide-only">
-    <img src="/assets/codidactyl.png" alt="Codidactyl">
+  <div class="grid--cell mascot tour-wide-only">
+    <img src="<%= SiteSetting['NetworkMascotLogoPath'] %>" alt="<%= SiteSetting['NetworkMascotName'] %>">
   </div>
   <div class="grid--cell is-flexible">
     <div class="widget">
@@ -122,8 +122,8 @@
 </div>
 
 <div class="grid step-6 hide" id="6">
-  <div class="grid--cell codidactyl tour-wide-only">
-    <img src="/assets/codidactyl.png" alt="Codidactyl">
+  <div class="grid--cell mascot tour-wide-only">
+    <img src="<%= SiteSetting['NetworkMascotLogoPath'] %>" alt="<%= SiteSetting['NetworkMascotName'] %>">
   </div>
   <div class="grid--cell is-flexible">
     <div class="widget">
diff --git a/app/views/tour/question1.html.erb b/app/views/tour/question1.html.erb
@@ -1,6 +1,7 @@
 <div class="grid">
-  <div class="grid--cell codidactyl">
-    <img src="/assets/codidactyl.png" alt="Codidactyl">
+  <div class="grid--cell mascot">
+    <img src="<%= SiteSetting['NetworkMascotLogoPath'] %>"
+         alt="<%= SiteSetting['NetworkMascotName'] %>">
   </div>
   <div class="grid--cell is-flexible">
     <div class="widget">
diff --git a/app/views/tour/question2.html.erb b/app/views/tour/question2.html.erb
diff --git a/app/views/tour/question3.html.erb b/app/views/tour/question3.html.erb
diff --git a/app/views/users/deleted_user.html.erb b/app/views/users/deleted_user.html.erb
diff --git a/app/views/users/vote_summary.html.erb b/app/views/users/vote_summary.html.erb
diff --git a/config/application.rb b/config/application.rb
diff --git a/db/seeds/site_settings.yml b/db/seeds/site_settings.yml

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,23 @@`
`1`		`-.codidactyl {`
	`1`	`+.mascot {`
`2`	`2`	`width: 80px;`
`3`	`3`	`padding: 2rem;`
`4`	`4`	`margin-top: 1rem;`
`5`	`5`	`}`
`6`	`6`
`7`		`-.codidactyl + .is-flexible {`
	`7`	`+.mascot + .is-flexible {`
`8`	`8`	`width: 0;`
`9`	`9`	`}`
`10`	`10`
`11`		`-.codidactyl-hints {`
	`11`	`+.mascot-hints {`
`12`	`12`	`padding: 1rem;`
`13`	`13`	`}`
`14`	`14`
`15`		`-.codidactyl-sticky {`
	`15`	`+.mascot-sticky {`
`16`	`16`	`position: sticky;`
`17`	`17`	`top: 0.5rem;`
`18`	`18`	`}`
`19`	`19`
`20`		`-.codidactyl-small {`
	`20`	`+.mascot-small {`
`21`	`21`	`max-height: 1em;`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@`
`6`	`6`
`7`	`7`	`<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token), class: 'button is-filled' %></p>`
`8`	`8`
`9`		`-<%= render 'devise/mailer/friendly_footer' %>`
	`9`	`+<%= sanitize(render_markdown(SiteSetting['FriendlyEmailFooter']), scrubber: scrubber) %>`