diff --git a/apps/admin/test/admin/views/error_helpers_test.exs b/apps/admin/test/admin/views/error_helpers_test.exs
index 294b2dd6..dccc29bf 100644
--- a/apps/admin/test/admin/views/error_helpers_test.exs
+++ b/apps/admin/test/admin/views/error_helpers_test.exs
@@ -11,7 +11,7 @@ defmodule Admin.ErrorHelpersTest do
|> form_for(
"/example",
as: :test_params,
- errors: [error_field: {"is an error", []}],
+ errors: [error_field: {"is an error", []}]
)
end
diff --git a/apps/app/lib/app_web/router.ex b/apps/app/lib/app_web/router.ex
index cff22100..e071e50f 100644
--- a/apps/app/lib/app_web/router.ex
+++ b/apps/app/lib/app_web/router.ex
@@ -14,12 +14,6 @@ defmodule AppWeb.Router do
plug :accepts, ["json"]
end
- scope "/", AppWeb do
- pipe_through :browser
-
- get "/", PageController, :index
- end
-
# Other scopes may use custom stacks.
# scope "/api", AppWeb do
# pipe_through :api
diff --git a/apps/auth_web/lib/auth_web/templates/pow_email_confirmation/mailer/email_confirmation.html.eex b/apps/auth_web/lib/auth_web/templates/pow_email_confirmation/mailer/email_confirmation.html.eex
index 9bad8d0f..c123a94c 100644
--- a/apps/auth_web/lib/auth_web/templates/pow_email_confirmation/mailer/email_confirmation.html.eex
+++ b/apps/auth_web/lib/auth_web/templates/pow_email_confirmation/mailer/email_confirmation.html.eex
@@ -12,7 +12,7 @@
Please use the following link to confirm your e-mail address:
<% end %>
- <%= CoreWeb.EmailHelpers.button href: @url do %>
+ <%= styled_button href: @url do %>
Confirm my email address
<% end %>
<% end %>
diff --git a/apps/auth_web/lib/auth_web/templates/pow_reset_password/mailer/reset_password.html.eex b/apps/auth_web/lib/auth_web/templates/pow_reset_password/mailer/reset_password.html.eex
index 227f5163..36868372 100644
--- a/apps/auth_web/lib/auth_web/templates/pow_reset_password/mailer/reset_password.html.eex
+++ b/apps/auth_web/lib/auth_web/templates/pow_reset_password/mailer/reset_password.html.eex
@@ -12,7 +12,7 @@
Please use the following link to reset your password:
<% end %>
- <%= CoreWeb.EmailHelpers.button href: @url do %>
+ <%= styled_button href: @url do %>
Reset my password
<% end %>
diff --git a/apps/auth_web/lib/auth_web/views/pow/email_view.ex b/apps/auth_web/lib/auth_web/views/pow/email_view.ex
index 46be792b..42abe9ee 100644
--- a/apps/auth_web/lib/auth_web/views/pow/email_view.ex
+++ b/apps/auth_web/lib/auth_web/views/pow/email_view.ex
@@ -4,6 +4,6 @@ defmodule AuthWeb.EmailView do
namespace: AuthWeb,
pattern: "**/*"
- import CoreWeb.EmailHelpers
import Phoenix.HTML, only: [raw: 1]
+ import CoreWeb.EmailHelpers
end
diff --git a/apps/content/lib/content_web/templates/menus/edit.html.eex b/apps/content/lib/content_web/templates/menus/edit.html.eex
deleted file mode 100644
index 97e656d0..00000000
--- a/apps/content/lib/content_web/templates/menus/edit.html.eex
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-<%= form_for @conn, Routes.menus_path(@conn, :update, @id), [method: :put], fn _f -> %>
-<% end %>
diff --git a/apps/content/lib/content_web/views/layout_view.ex b/apps/content/lib/content_web/views/layout_view.ex
index 5de2bf14..0e86a5ac 100644
--- a/apps/content/lib/content_web/views/layout_view.ex
+++ b/apps/content/lib/content_web/views/layout_view.ex
@@ -1,8 +1,6 @@
defmodule Content.LayoutView do
use Content, :view
- alias Content.{Option, Options}
-
def title(Content.PostsView, "index.html", assigns) do
"Page #{assigns.page} | #{title(nil, nil, nil)}"
end
diff --git a/apps/core/lib/core_web/views/email_helpers.ex b/apps/core/lib/core_web/views/email_helpers.ex
index 7431b1e8..24fbc7b8 100644
--- a/apps/core/lib/core_web/views/email_helpers.ex
+++ b/apps/core/lib/core_web/views/email_helpers.ex
@@ -158,8 +158,9 @@ defmodule CoreWeb.EmailHelpers do
"""
end
+ @spec col(number, keyword, [{:do, any}, ...]) :: {:safe, [...]}
def col(n, opts, do: content) do
- {of, opts} = Keyword.pop!(opts, :of)
+ {of, _opts} = Keyword.pop!(opts, :of)
width = n * 100.0 / of
~E"""
@@ -225,6 +226,8 @@ defmodule CoreWeb.EmailHelpers do
"""
end
+ def styled_button(opts, do: content), do: button(opts, do: content)
+
def button(opts, do: content) do
{overrides, opts_without_style} = Keyword.pop(opts, :style, %{})
{href, _rest_opts} = Keyword.pop!(opts_without_style, :href)
@@ -285,9 +288,10 @@ defmodule CoreWeb.EmailHelpers do
end
defp li_for_ul(index, list_length, content) do
- last_styles = if index == list_length - 1, do: map_style(effective_styles(:last_li))
+ style_type = if index == list_length - 1, do: :last_li, else: :li
+
~E"""
-
+
<%= content %>
"""
diff --git a/apps/core/test/core_web/views/error_helpers_test.exs b/apps/core/test/core_web/views/error_helpers_test.exs
index d3c76621..0db085a2 100644
--- a/apps/core/test/core_web/views/error_helpers_test.exs
+++ b/apps/core/test/core_web/views/error_helpers_test.exs
@@ -4,25 +4,24 @@ defmodule CoreWeb.ErrorHelpersTest do
import CoreWeb.ErrorHelpers
import Phoenix.HTML, only: [safe_to_string: 1]
import Phoenix.HTML.Form, only: [form_for: 3]
- import Ecto.Changeset, only: [cast: 3, add_error: 3]
def form do
:example
|> form_for(
"/example",
as: :test_params,
- errors: [error_field: {"is an error", []}],
+ errors: [error_field: {"is an error", []}]
)
end
test "error_class/2" do
- assert error_class(form, :error_field) == "error"
- assert error_class(form, :no_error_field) == ""
+ assert error_class(form(), :error_field) == "error"
+ assert error_class(form(), :no_error_field) == ""
end
test "error_tag/3" do
markup =
- form
+ form()
|> error_tag(:error_field, class: "foobar")
|> Enum.at(0)
|> safe_to_string()
diff --git a/apps/core/test/core_web/views/helpers_test.exs b/apps/core/test/core_web/views/helpers_test.exs
index 4c88ddad..e6d75818 100644
--- a/apps/core/test/core_web/views/helpers_test.exs
+++ b/apps/core/test/core_web/views/helpers_test.exs
@@ -12,7 +12,7 @@ defmodule CoreWeb.HelpersTest do
|> form_for(
"/example",
as: :test_params,
- errors: [error_field: {"is an error", []}],
+ errors: [error_field: {"is an error", []}]
)
end
@@ -78,7 +78,7 @@ defmodule CoreWeb.HelpersTest do
end
test "styled_input/4 (without error)" do
- markup = safe_to_string(styled_input(form, :no_error_field))
+ markup = safe_to_string(styled_input(form(), :no_error_field))
assert markup =~ ~S{ safe_to_string()
diff --git a/apps/core/test/mix/legendary_test.exs b/apps/core/test/mix/legendary_test.exs
index 49e40598..f84497b1 100644
--- a/apps/core/test/mix/legendary_test.exs
+++ b/apps/core/test/mix/legendary_test.exs
@@ -40,7 +40,7 @@ defmodule Mix.LegendaryTest do
integer_array_input,
array_input,
other_input,
- ] = inputs(schema)
+ ] = inputs(schema())
assert reference_input == nil
assert integer_input =~ ~s(number_input)