forked from shibao/cannery
add page titles to registration and setting pages
This commit is contained in:
parent
968abd04ee
commit
1a78e88b34
@ -1,3 +1,7 @@
|
||||
# v0.2.3
|
||||
- Fix modals with overflowing forms
|
||||
- Add page titles to registration and setting pages
|
||||
|
||||
# v0.2.2
|
||||
- Fix loading and reconnecting pages not being fixed
|
||||
- Fix closing modal in some cases not triggering a page reload
|
||||
|
@ -1,10 +1,11 @@
|
||||
defmodule CanneryWeb.UserConfirmationController do
|
||||
use CanneryWeb, :controller
|
||||
|
||||
import CanneryWeb.Gettext
|
||||
alias Cannery.Accounts
|
||||
|
||||
def new(conn, _params) do
|
||||
render(conn, "new.html")
|
||||
render(conn, "new.html", page_title: gettext("Confirm your account"))
|
||||
end
|
||||
|
||||
def create(conn, %{"user" => %{"email" => email}}) do
|
||||
|
@ -29,8 +29,11 @@ defmodule CanneryWeb.UserRegistrationController do
|
||||
|
||||
# renders new user registration page
|
||||
defp render_new(conn, invite \\ nil) do
|
||||
changeset = Accounts.change_user_registration(%User{})
|
||||
conn |> render("new.html", changeset: changeset, invite: invite)
|
||||
render(conn, "new.html",
|
||||
changeset: Accounts.change_user_registration(%User{}),
|
||||
invite: invite,
|
||||
page_title: gettext("Register")
|
||||
)
|
||||
end
|
||||
|
||||
def create(conn, %{"user" => %{"invite_token" => invite_token}} = attrs) do
|
||||
|
@ -6,7 +6,7 @@ defmodule CanneryWeb.UserResetPasswordController do
|
||||
plug :get_user_by_reset_password_token when action in [:edit, :update]
|
||||
|
||||
def new(conn, _params) do
|
||||
render(conn, "new.html")
|
||||
render(conn, "new.html", page_title: gettext("Forgot your password?"))
|
||||
end
|
||||
|
||||
def create(conn, %{"user" => %{"email" => email}}) do
|
||||
@ -31,7 +31,10 @@ defmodule CanneryWeb.UserResetPasswordController do
|
||||
end
|
||||
|
||||
def edit(conn, _params) do
|
||||
render(conn, "edit.html", changeset: Accounts.change_user_password(conn.assigns.user))
|
||||
render(conn, "edit.html",
|
||||
changeset: Accounts.change_user_password(conn.assigns.user),
|
||||
page_title: gettext("Reset your password")
|
||||
)
|
||||
end
|
||||
|
||||
# Do not log in the user after reset password to avoid a
|
||||
|
@ -5,7 +5,7 @@ defmodule CanneryWeb.UserSessionController do
|
||||
alias CanneryWeb.UserAuth
|
||||
|
||||
def new(conn, _params) do
|
||||
render(conn, "new.html", error_message: nil)
|
||||
render(conn, "new.html", error_message: nil, page_title: gettext("Log in"))
|
||||
end
|
||||
|
||||
def create(conn, %{"user" => user_params}) do
|
||||
|
@ -1,13 +1,13 @@
|
||||
defmodule CanneryWeb.UserSettingsController do
|
||||
use CanneryWeb, :controller
|
||||
|
||||
import CanneryWeb.Gettext
|
||||
alias Cannery.Accounts
|
||||
alias CanneryWeb.{HomeLive, UserAuth}
|
||||
|
||||
plug :assign_email_and_password_changesets
|
||||
|
||||
def edit(conn, _params) do
|
||||
render(conn, "edit.html")
|
||||
render(conn, "edit.html", page_title: gettext("Settings"))
|
||||
end
|
||||
|
||||
def update(conn, %{"action" => "update_email"} = params) do
|
||||
|
@ -5,11 +5,8 @@
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<%= csrf_meta_tag() %>
|
||||
<%= if(assigns |> Map.has_key?(:page_title),
|
||||
do: "#{assigns.page_title} | Cannery",
|
||||
else: "Cannery"
|
||||
)
|
||||
|> live_title_tag(suffix: "") %>
|
||||
<%= if(assigns |> Map.has_key?(:page_title), do: @page_title, else: "Cannery")
|
||||
|> live_title_tag(suffix: " | Cannery") %>
|
||||
<link phx-track-static rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")} />
|
||||
<script
|
||||
defer
|
||||
|
Loading…
Reference in New Issue
Block a user