diff --git a/assets/package-lock.json b/assets/package-lock.json index bdd7c28a..1bfdcb35 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -10,6 +10,7 @@ "@typescript-eslint/eslint-plugin": "^7.8.0", "@typescript-eslint/parser": "^7.8.0", "autoprefixer": "^10.4.19", + "bbcode": "^0.1.5", "cross-env": "^7.0.3", "eslint": "^8.34.0", "jest-environment-jsdom": "^29.7.0", @@ -1843,6 +1844,14 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, + "node_modules/bbcode": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/bbcode/-/bbcode-0.1.5.tgz", + "integrity": "sha512-Y2pi7ozdeYawBm02+s1O0fVVSVZjOxWjayeGFmfgXGZY2EHOuy4yTpdhbRbjfJmlAOYMzxhUXsnyuVlrvKLqZw==", + "dependencies": { + "underscore": "*" + } + }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -4459,6 +4468,11 @@ "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==", "dev": true }, + "node_modules/underscore": { + "version": "1.13.6", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", + "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==" + }, "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", diff --git a/lib/philomena_web/templates/ban/_ban_reason.html.slime b/lib/philomena_web/templates/ban/_ban_reason.html.slime index 2537bc2e..298a1627 100644 --- a/lib/philomena_web/templates/ban/_ban_reason.html.slime +++ b/lib/philomena_web/templates/ban/_ban_reason.html.slime @@ -1,13 +1,13 @@ .block.block--fixed.block--warning h4 - ' You've been banned! + ' You are currently suspended. p - ' You cannot create comments or posts or update metadata (or do anything but read, really) until + ' While you can continue browsing the sites and viewing posts, following tags, etc. you cannot create comments, posts, or update metadata (or do anything but read, really) until = pretty_time @conn.assigns.current_ban.valid_until ' . p - ' The reason given by the administrator who banned you is: + ' The reason given by the administrator is: br strong> = @conn.assigns.current_ban.reason diff --git a/lib/philomena_web/templates/image/show.html.slime b/lib/philomena_web/templates/image/show.html.slime index 3527e355..69a3a513 100644 --- a/lib/philomena_web/templates/image/show.html.slime +++ b/lib/philomena_web/templates/image/show.html.slime @@ -6,8 +6,8 @@ = if @conn.assigns.advert do = render PhilomenaWeb.AdvertView, "_box.html", advert: @conn.assigns.advert, conn: @conn = render PhilomenaWeb.ImageView, "_tags.html", image: @image, tag_change_count: @tag_change_count, changeset: @image_changeset, conn: @conn - .image-description - = render PhilomenaWeb.ImageView, "_description.html", image: @image, body: @description, conn: @conn + .image-description + = render PhilomenaWeb.ImageView, "_description.html", image: @image, body: @description, conn: @conn = render PhilomenaWeb.Image.DescriptionView, "_form.html", image: @image, changeset: @image_changeset, conn: @conn = render PhilomenaWeb.ImageView, "_source.html", image: @image, source_change_count: @source_change_count, changeset: @image_changeset, conn: @conn = render PhilomenaWeb.ImageView, "_options.html", image: @image, changeset: @image_changeset, conn: @conn @@ -23,4 +23,4 @@ - true -> #comments data-current-url=Routes.image_comment_path(@conn, :index, @image) data-loaded="true" - = render PhilomenaWeb.Image.CommentView, "index.html", image: @image, comments: @comments, conn: @conn + = render PhilomenaWeb.Image.CommentView, "index.html", image: @image, comments: @comments, conn: @conn \ No newline at end of file