Address feedback #5886

hedyorg · Oct 28, 2024 · e39f5f4 · e39f5f4
1 parent f1b744d
commit e39f5f4
Show file tree

Hide file tree

Showing 65 changed files with 491 additions and 101 deletions.
diff --git a/messages.pot b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-06-26 16:04+0200\n"
+"POT-Creation-Date: 2024-10-28 19:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -1265,6 +1265,9 @@ msgstr ""
 msgid "print_accounts"
 msgstr ""
 
+msgid "print_accounts_title"
+msgstr ""
+
 msgid "print_logo"
 msgstr ""
 
@@ -1910,6 +1913,9 @@ msgstr ""
 msgid "walker_variable_role"
 msgstr ""
 
+msgid "website"
+msgstr ""
+
 msgid "what_is_your_role"
 msgstr ""
 

diff --git a/static/js/appbundle.js b/static/js/appbundle.js
@@ -119488,26 +119488,40 @@ def note_with_error(value, err):
       $("#passwords_desc").show();
     }
   }
-  function printAccounts() {
+  function printAccounts(title) {
     var table = document.getElementById("accounts_table");
     let newWindow = window.open("");
     const css2 = `
     <style>
-      @media print {
-        #accounts_table {
-          margin-top: 50px;
-          border-collapse: collapse;
-        }
-        #accounts_table td, th {
-          padding-left: 10px;
-          padding-right: 10px;
-          padding-top: 5px;
-          padding-bottom: 5px;
-          font-size: 24px;
-          border: 1px solid gray;
-        }
+      h1 {
+        font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", "Courier New", monospace;
+        font-size: x-large;
+        margin-left: 20px;
+        color: rgb(44 82 130);
+      }
+
+      #accounts_table {
+        border-collapse: collapse;
+      }
+
+      #accounts_table td, th {
+        padding-left: 10px;
+        padding-right: 10px;
+        padding-top: 5px;
+        padding-bottom: 5px;
+        font-size: 24px;
+        border: 1px solid gray;
+        color: rgb(44 82 130);
+        font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", "Courier New", monospace;
+        text-align: center;
       }
     </style>`;
+    newWindow.document.write(`
+        <div style="display: flex; margin-bottom: 20px;">
+          <img src="/images/hero-graphic/hero-graphic-empty.png" height="100">
+          <h1>${title}</h1>
+        </div>
+    `);
     newWindow.document.write((table == null ? void 0 : table.outerHTML) + css2);
     newWindow.print();
     newWindow.close();
@@ -119569,7 +119583,8 @@ def note_with_error(value, err):
     let result = "";
     for (let [index3, account] of accounts.entries()) {
       result += `
-          <tr class="${index3 % 2 ? "bg-white" : "bg-gray-200"}">
+          <tr class="${index3 % 2 ? "bg-white" : "bg-gray-200"} font-mono">
+            <td class="text-center px-4 py-2">hedy.org</td>
             <td class="text-center px-4 py-2">${account["username"]}</td>
             <td class="text-center px-4 py-2">${account["password"]}</td>
           </tr>`;

diff --git a/static/js/appbundle.js.map b/static/js/appbundle.js.map
diff --git a/static/js/teachers.ts b/static/js/teachers.ts
@@ -566,26 +566,40 @@ export function toggleAutoGeneratePasswords() {
     }
 }
 
-export function printAccounts() {
+export function printAccounts(title: string) {
     var table = document.getElementById("accounts_table");
     let newWindow = window.open("")!;
     const css = `
     <style>
-      @media print {
-        #accounts_table {
-          margin-top: 50px;
-          border-collapse: collapse;
-        }
-        #accounts_table td, th {
-          padding-left: 10px;
-          padding-right: 10px;
-          padding-top: 5px;
-          padding-bottom: 5px;
-          font-size: 24px;
-          border: 1px solid gray;
-        }
+      h1 {
+        font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", "Courier New", monospace;
+        font-size: x-large;
+        margin-left: 20px;
+        color: rgb(44 82 130);
+      }
+
+      #accounts_table {
+        border-collapse: collapse;
+      }
+
+      #accounts_table td, th {
+        padding-left: 10px;
+        padding-right: 10px;
+        padding-top: 5px;
+        padding-bottom: 5px;
+        font-size: 24px;
+        border: 1px solid gray;
+        color: rgb(44 82 130);
+        font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", "Courier New", monospace;
+        text-align: center;
       }
     </style>`;
+    newWindow.document.write(`
+        <div style="display: flex; margin-bottom: 20px;">
+          <img src="/images/hero-graphic/hero-graphic-empty.png" height="100">
+          <h1>${title}</h1>
+        </div>
+    `);
     newWindow.document.write(table?.outerHTML + css);
     newWindow.print();
     newWindow.close();
@@ -661,7 +675,8 @@ function createHtmlForAccountsTable(accounts: Array<any>) {
     let result = ""
     for (let [index, account] of accounts.entries()) {
         result += `
-          <tr class="${ index%2 ? 'bg-white' : 'bg-gray-200'}">
+          <tr class="${ index%2 ? 'bg-white' : 'bg-gray-200'} font-mono">
+            <td class="text-center px-4 py-2">hedy.org</td>
             <td class="text-center px-4 py-2">${account['username']}</td>
             <td class="text-center px-4 py-2">${account['password']}</td>
           </tr>`;

diff --git a/templates/create-accounts.html b/templates/create-accounts.html
@@ -52,23 +52,23 @@ <h3 class="w-full my-0 py-0">
             </div>
         </form>
 
-        <div id="accounts_results" class="w-1/2 gap-4 mt-4 items-center hidden">
+        <div id="accounts_results" class="gap-4 mt-4 items-center hidden">
             <div class="flex flex-row gap-4">
                 <button id="copy_accounts" class="blue-btn px-4 mb-3" onclick="hedyApp.copyAccountsToClipboard('{{_('copy_clipboard')}}')">
                   {{_('copy_accounts_to_clipboard')}}
                 </button>
-                <button id="print_accounts" class="blue-btn px-4 mb-3" onclick="hedyApp.printAccounts()">
+                <button id="print_accounts" class="blue-btn px-4 mb-3"
+                        onclick="hedyApp.printAccounts('{{_('print_accounts_title')}}')">
                   {{_('print_accounts')}}
                 </button>
             </div>
-            <div class="overflow-x-auto rounded-lg shadow-lg">
-                <table id="accounts_table" data-cy="create_accounts_output" class="w-full border border-gray-400">
-                    <tr class="bg-blue-300 text-blue-900">
-                        <th class="px-10 py-2 text-center">{{_('username')}}</th>
-                        <th class="px-10 py-2 text-center">{{_('password')}}</th>
-                    </tr>
-                </table>
-            </div>
+            <table id="accounts_table" data-cy="create_accounts_output" class="border border-gray-400">
+                <tr class="bg-blue-300 text-blue-900">
+                    <th class="px-10 py-2 text-center">{{_('website')}}</th>
+                    <th class="px-10 py-2 text-center">{{_('username')}}</th>
+                    <th class="px-10 py-2 text-center">{{_('password')}}</th>
+                </tr>
+            </table>
         </div>
     </div>
 </div>

diff --git a/translations/ar/LC_MESSAGES/messages.po b/translations/ar/LC_MESSAGES/messages.po
@@ -1496,6 +1496,9 @@ msgstr "Previous page"
 msgid "print_accounts"
 msgstr "Print"
 
+msgid "print_accounts_title"
+msgstr ""
+
 msgid "print_logo"
 msgstr "قول"
 
@@ -2194,7 +2197,7 @@ msgstr "اسم المستخدم"
 
 #, fuzzy
 msgid "username_contains_invalid_symbol"
-msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following rows: {usernames}"
+msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following usernames: {usernames}"
 
 #, fuzzy
 msgid "username_contains_separator"
@@ -2247,6 +2250,9 @@ msgstr "Waiting for submit"
 msgid "walker_variable_role"
 msgstr "walker"
 
+msgid "website"
+msgstr ""
+
 #, fuzzy
 msgid "what_is_your_role"
 msgstr "What is your role?"

diff --git a/translations/bg/LC_MESSAGES/messages.po b/translations/bg/LC_MESSAGES/messages.po
@@ -1645,6 +1645,9 @@ msgstr "Previous page"
 msgid "print_accounts"
 msgstr "Print"
 
+msgid "print_accounts_title"
+msgstr ""
+
 msgid "print_logo"
 msgstr "принтирай"
 
@@ -2421,7 +2424,7 @@ msgstr "Потребителско име"
 
 #, fuzzy
 msgid "username_contains_invalid_symbol"
-msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following rows: {usernames}"
+msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following usernames: {usernames}"
 
 #, fuzzy
 msgid "username_contains_separator"
@@ -2476,6 +2479,9 @@ msgstr "Waiting for submit"
 msgid "walker_variable_role"
 msgstr "walker"
 
+msgid "website"
+msgstr ""
+
 #, fuzzy
 msgid "what_is_your_role"
 msgstr "What is your role?"

diff --git a/translations/bn/LC_MESSAGES/messages.po b/translations/bn/LC_MESSAGES/messages.po
@@ -1693,6 +1693,9 @@ msgstr "Previous page"
 msgid "print_accounts"
 msgstr "Print"
 
+msgid "print_accounts_title"
+msgstr ""
+
 #, fuzzy
 msgid "print_logo"
 msgstr "print"
@@ -2500,7 +2503,7 @@ msgstr "Username"
 
 #, fuzzy
 msgid "username_contains_invalid_symbol"
-msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following rows: {usernames}"
+msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following usernames: {usernames}"
 
 #, fuzzy
 msgid "username_contains_separator"
@@ -2558,6 +2561,9 @@ msgstr "Waiting for submit"
 msgid "walker_variable_role"
 msgstr "walker"
 
+msgid "website"
+msgstr ""
+
 #, fuzzy
 msgid "what_is_your_role"
 msgstr "What is your role?"

diff --git a/translations/ca/LC_MESSAGES/messages.po b/translations/ca/LC_MESSAGES/messages.po
@@ -1515,6 +1515,9 @@ msgstr "Previous page"
 msgid "print_accounts"
 msgstr "Print"
 
+msgid "print_accounts_title"
+msgstr ""
+
 msgid "print_logo"
 msgstr "imprimir"
 
@@ -2225,7 +2228,7 @@ msgstr "Nom d'usuari"
 
 #, fuzzy
 msgid "username_contains_invalid_symbol"
-msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following rows: {usernames}"
+msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following usernames: {usernames}"
 
 #, fuzzy
 msgid "username_contains_separator"
@@ -2277,6 +2280,9 @@ msgstr "Waiting for submit"
 msgid "walker_variable_role"
 msgstr "walker"
 
+msgid "website"
+msgstr ""
+
 msgid "what_is_your_role"
 msgstr "Quin és el teu paper?"
 

diff --git a/translations/cs/LC_MESSAGES/messages.po b/translations/cs/LC_MESSAGES/messages.po
@@ -1631,6 +1631,9 @@ msgstr "Previous page"
 msgid "print_accounts"
 msgstr "Print"
 
+msgid "print_accounts_title"
+msgstr ""
+
 #, fuzzy
 msgid "print_logo"
 msgstr "print"
@@ -2401,7 +2404,7 @@ msgstr "Uživatelské jméno"
 
 #, fuzzy
 msgid "username_contains_invalid_symbol"
-msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following rows: {usernames}"
+msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following usernames: {usernames}"
 
 #, fuzzy
 msgid "username_contains_separator"
@@ -2457,6 +2460,9 @@ msgstr "Waiting for submit"
 msgid "walker_variable_role"
 msgstr "walker"
 
+msgid "website"
+msgstr ""
+
 #, fuzzy
 msgid "what_is_your_role"
 msgstr "What is your role?"

diff --git a/translations/cy/LC_MESSAGES/messages.po b/translations/cy/LC_MESSAGES/messages.po
@@ -1706,6 +1706,9 @@ msgstr "Previous page"
 msgid "print_accounts"
 msgstr "Print"
 
+msgid "print_accounts_title"
+msgstr ""
+
 msgid "print_logo"
 msgstr "argraffu"
 
@@ -2512,7 +2515,7 @@ msgstr "Username"
 
 #, fuzzy
 msgid "username_contains_invalid_symbol"
-msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following rows: {usernames}"
+msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following usernames: {usernames}"
 
 #, fuzzy
 msgid "username_contains_separator"
@@ -2570,6 +2573,9 @@ msgstr "Waiting for submit"
 msgid "walker_variable_role"
 msgstr "walker"
 
+msgid "website"
+msgstr ""
+
 #, fuzzy
 msgid "what_is_your_role"
 msgstr "What is your role?"

diff --git a/translations/da/LC_MESSAGES/messages.po b/translations/da/LC_MESSAGES/messages.po
@@ -1710,6 +1710,9 @@ msgstr "Previous page"
 msgid "print_accounts"
 msgstr "Print"
 
+msgid "print_accounts_title"
+msgstr ""
+
 #, fuzzy
 msgid "print_logo"
 msgstr "print"
@@ -2522,7 +2525,7 @@ msgstr "Username"
 
 #, fuzzy
 msgid "username_contains_invalid_symbol"
-msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following rows: {usernames}"
+msgstr "Usernames cannot contain the symbol ':' or '@'. Remove these symbols from following usernames: {usernames}"
 
 #, fuzzy
 msgid "username_contains_separator"
@@ -2580,6 +2583,9 @@ msgstr "Waiting for submit"
 msgid "walker_variable_role"
 msgstr "walker"
 
+msgid "website"
+msgstr ""
+
 #, fuzzy
 msgid "what_is_your_role"
 msgstr "What is your role?"