From c90eeac0c0429ca805b95f508a759c84f0f2812a Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Wed, 11 Apr 2018 23:22:40 +0900 Subject: [PATCH 01/21] Update bootstrap 3 to 4 --- .../templates/app/src/views/layouts/application.slang.ecr | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr index cfb227bf7..9589fe4f4 100644 --- a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr +++ b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr @@ -5,7 +5,7 @@ html meta charset="utf-8" meta http-equiv="X-UA-Compatible" content="IE=edge" meta name="viewport" content="width=device-width, initial-scale=1" - link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" + link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" link rel="stylesheet" href="/dist/main.bundle.css" body @@ -22,6 +22,7 @@ html div.col-sm-12.main == content - script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js" - script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" + script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" + script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" + script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" script src="/dist/main.bundle.js" From c9071e8990f6d53837a94863abc8140aee05857a Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Wed, 11 Apr 2018 23:26:23 +0900 Subject: [PATCH 02/21] Update bootstrap 3 to 4 for ecr --- .../templates/app/src/views/layouts/application.ecr.ecr | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr b/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr index d49a6b69d..0fd454880 100644 --- a/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr +++ b/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr @@ -5,7 +5,7 @@ - + @@ -32,8 +32,9 @@ - - + + + From 9cc98cdaa0e622c0e135c7b0511ee47d35f6471c Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Wed, 11 Apr 2018 23:49:34 +0900 Subject: [PATCH 03/21] Update for bootstrap 4, add row class div --- .../templates/app/src/views/home/index.ecr.ecr | 18 ++++++++++-------- .../app/src/views/home/index.slang.ecr | 17 +++++++++-------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/amber/cli/templates/app/src/views/home/index.ecr.ecr b/src/amber/cli/templates/app/src/views/home/index.ecr.ecr index 0344b287d..188c96d06 100644 --- a/src/amber/cli/templates/app/src/views/home/index.ecr.ecr +++ b/src/amber/cli/templates/app/src/views/home/index.ecr.ecr @@ -1,10 +1,12 @@ - -
-

<%= "<" %>%= t "welcome_to_amber" %>

-

Thank you for trying out the Amber Framework. We are working hard to provide a super fast and reliable framework that provides all the productivity tools you are used to without sacrificing the speed.

-
- Getting Started with Amber Framework - List of Awesome Crystal projects and shards - What's hot in Crystal right now +
+ +
+

<%= "<" %>%= t "welcome_to_amber" %>

+

Thank you for trying out the Amber Framework. We are working hard to provide a super fast and reliable framework that provides all the productivity tools you are used to without sacrificing the speed.

+
+ Getting Started with Amber Framework + List of Awesome Crystal projects and shards + What's hot in Crystal right now +
diff --git a/src/amber/cli/templates/app/src/views/home/index.slang.ecr b/src/amber/cli/templates/app/src/views/home/index.slang.ecr index 9e2a19c56..ee8e8428c 100644 --- a/src/amber/cli/templates/app/src/views/home/index.slang.ecr +++ b/src/amber/cli/templates/app/src/views/home/index.slang.ecr @@ -1,8 +1,9 @@ -div#logo.col-sm-6 -div.col-sm-6 - h2 = t "welcome_to_amber" - p Thank you for trying out the Amber Framework. We are working hard to provide a super fast and reliable framework that provides all the productivity tools you are used to without sacrificing the speed. - div.list-group - a.list-group-item.list-group-item-action target="_blank" href="https://docs.amberframework.org" Getting Started with Amber Framework - a.list-group-item.list-group-item-action target="_blank" href="https://github.com/veelenga/awesome-crystal" List of Awesome Crystal projects and shards - a.list-group-item.list-group-item-action target="_blank" href="https://crystalshards.xyz" What's hot in Crystal right now +div.row + div#logo.col-sm-6 + div.col-sm-6 + h2 = t "welcome_to_amber" + p Thank you for trying out the Amber Framework. We are working hard to provide a super fast and reliable framework that provides all the productivity tools you are used to without sacrificing the speed. + div.list-group + a.list-group-item.list-group-item-action target="_blank" href="https://docs.amberframework.org" Getting Started with Amber Framework + a.list-group-item.list-group-item-action target="_blank" href="https://github.com/veelenga/awesome-crystal" List of Awesome Crystal projects and shards + a.list-group-item.list-group-item-action target="_blank" href="https://crystalshards.xyz" What's hot in Crystal right now From f13dd97c8763eb66cb1e56ab6865e370e15f2da0 Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Wed, 11 Apr 2018 23:59:22 +0900 Subject: [PATCH 04/21] Add col-sm for bootstrap 4 row --- .../app/src/views/layouts/application.ecr.ecr | 12 +++++++----- .../app/src/views/layouts/application.slang.ecr | 7 ++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr b/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr index 0fd454880..866551205 100644 --- a/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr +++ b/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr @@ -19,11 +19,13 @@
- <%="<"%>%- flash.each do |key, value| %> -
%= key %>"> -

<%="<"%>%= flash[key] %>

-
- <%="<"%>%- end %> +
+ <%="<"%>%- flash.each do |key, value| %> +
%= key %>"> +

<%="<"%>%= flash[key] %>

+
+ <%="<"%>%- end %> +
diff --git a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr index 9589fe4f4..baa2e91bf 100644 --- a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr +++ b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr @@ -15,9 +15,10 @@ html == render(partial: "layouts/_nav.slang") div.container div.row - - flash.each do |key, value| - div class="alert alert-#{key}" - p = flash[key] + div.col-sm + - flash.each do |key, value| + div class="alert alert-#{key}" + p = flash[key] div.row div.col-sm-12.main == content From 45aeb1e1708e87cae3429e41b827a91766d3ecf8 Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 20:36:03 +0900 Subject: [PATCH 05/21] #746 fix indentations --- src/amber/cli/templates/app/src/views/home/index.ecr.ecr | 2 +- .../cli/templates/app/src/views/layouts/application.ecr.ecr | 2 +- .../cli/templates/app/src/views/layouts/application.slang.ecr | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amber/cli/templates/app/src/views/home/index.ecr.ecr b/src/amber/cli/templates/app/src/views/home/index.ecr.ecr index 188c96d06..bae0a2b51 100644 --- a/src/amber/cli/templates/app/src/views/home/index.ecr.ecr +++ b/src/amber/cli/templates/app/src/views/home/index.ecr.ecr @@ -1,5 +1,5 @@
- +

<%= "<" %>%= t "welcome_to_amber" %>

Thank you for trying out the Amber Framework. We are working hard to provide a super fast and reliable framework that provides all the productivity tools you are used to without sacrificing the speed.

diff --git a/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr b/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr index 866551205..57392ef5e 100644 --- a/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr +++ b/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr @@ -19,7 +19,7 @@
-
+
<%="<"%>%- flash.each do |key, value| %>
%= key %>">

<%="<"%>%= flash[key] %>

diff --git a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr index baa2e91bf..ae681b70b 100644 --- a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr +++ b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr @@ -15,7 +15,7 @@ html == render(partial: "layouts/_nav.slang") div.container div.row - div.col-sm + div.col-sm - flash.each do |key, value| div class="alert alert-#{key}" p = flash[key] From 06e7ff1d0dd1e28967e2b11c6c1beaaa4bd3e2e8 Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 20:43:19 +0900 Subject: [PATCH 06/21] #746 Remove col-md-6 from index.slang.ecr --- src/amber/cli/templates/app/src/views/home/index.slang.ecr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amber/cli/templates/app/src/views/home/index.slang.ecr b/src/amber/cli/templates/app/src/views/home/index.slang.ecr index ee8e8428c..3895ecc06 100644 --- a/src/amber/cli/templates/app/src/views/home/index.slang.ecr +++ b/src/amber/cli/templates/app/src/views/home/index.slang.ecr @@ -1,5 +1,5 @@ div.row - div#logo.col-sm-6 + div#logo div.col-sm-6 h2 = t "welcome_to_amber" p Thank you for trying out the Amber Framework. We are working hard to provide a super fast and reliable framework that provides all the productivity tools you are used to without sacrificing the speed. From 0e789564183ae826ac8529b2c514c08fbc36b350 Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 20:46:30 +0900 Subject: [PATCH 07/21] #746 change jquery-slim to jquery --- .../cli/templates/app/src/views/layouts/application.ecr.ecr | 2 +- .../cli/templates/app/src/views/layouts/application.slang.ecr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr b/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr index 57392ef5e..d127df5c5 100644 --- a/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr +++ b/src/amber/cli/templates/app/src/views/layouts/application.ecr.ecr @@ -34,7 +34,7 @@
- + diff --git a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr index ae681b70b..a3404d805 100644 --- a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr +++ b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr @@ -23,7 +23,7 @@ html div.col-sm-12.main == content - script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" + script src="https://code.jquery.com/jquery-3.3.1.min.js" script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" script src="/dist/main.bundle.js" From 95457c5f1bff50e62364c85a04b6730334694b4a Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 21:36:08 +0900 Subject: [PATCH 08/21] #746 migrate pull-right to ml-auto for auth links --- .../cli/templates/auth/src/views/layouts/+_nav.ecr.ecr | 8 ++++---- .../cli/templates/auth/src/views/layouts/+_nav.slang.ecr | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr b/src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr index 872a04ed1..599aa253c 100644 --- a/src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr +++ b/src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr @@ -1,10 +1,10 @@ <%="<"%>%- if (current_<%= @name %> = context.current_<%= @name %>) %> - | Sign Out + | Sign Out <%="<"%>%- active = context.request.path == "/profile" ? "active" : "" %> - %= active %> pull-right" href="/profile"><%="<"%>%= current_<%= @name %>.email %> + %= active %>" href="/profile"><%="<"%>%= current_<%= @name %>.email %> <%="<"%>%- else %> <%="<"%>%- active = context.request.path == "/signup" ? "active" : "" %> - %= active %> pull-right" href="/signup">| Sign Up + %= active %>" href="/signup">| Sign Up <%="<"%>%- active = context.request.path == "/signin" ? "active" : "" %> - %= active %> pull-right" href="/signin">| Sign In + %= active %>" href="/signin">| Sign In <%="<"%>%- end %> diff --git a/src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr b/src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr index adae0e10e..bc3ceadf1 100644 --- a/src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr +++ b/src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr @@ -1,13 +1,13 @@ - if (current_<%= @name %> = context.current_<%= @name %>) - a.nav-item.pull-right href="/signout" + a.nav-item.ml-auto href="/signout" | Sign Out - active = context.request.path == "/profile" ? "active" : "" - a class="nav-item #{active} pull-right" href="/profile" + a class="nav-item #{active}" href="/profile" == current_<%= @name %>.email - else - active = context.request.path == "/signup" ? "active" : "" - a class="nav-item #{active} pull-right" href="/signup" + a class="nav-item ml-auto #{active}" href="/signup" | Sign Up - active = context.request.path == "/signin" ? "active" : "" - a class="nav-item #{active} pull-right" href="/signin" + a class="nav-item #{active}" href="/signin" | Sign In From 37574082870161ba81cf0fd1699c951b235401a1 Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 22:00:07 +0900 Subject: [PATCH 09/21] #746 btn-xs to btn-sm. btn-xs is removed --- spec/support/fixtures/render_fixtures.cr | 4 ++-- spec/support/sample/views/test/_form.slang | 6 +++--- .../cli/templates/auth/src/views/registration/new.ecr.ecr | 2 +- .../templates/auth/src/views/registration/new.slang.ecr | 2 +- .../cli/templates/auth/src/views/session/new.ecr.ecr | 2 +- .../cli/templates/auth/src/views/session/new.slang.ecr | 2 +- .../cli/templates/auth/src/views/{{name}}/edit.ecr.ecr | 4 ++-- .../cli/templates/auth/src/views/{{name}}/edit.slang.ecr | 4 ++-- .../cli/templates/auth/src/views/{{name}}/show.ecr.ecr | 2 +- .../cli/templates/auth/src/views/{{name}}/show.slang.ecr | 2 +- .../scaffold/view/src/views/{{name}}/_form.ecr.ecr | 4 ++-- .../scaffold/view/src/views/{{name}}/_form.slang.ecr | 4 ++-- .../scaffold/view/src/views/{{name}}/index.ecr.ecr | 8 ++++---- .../scaffold/view/src/views/{{name}}/index.slang.ecr | 8 ++++---- .../scaffold/view/src/views/{{name}}/show.ecr.ecr | 6 +++--- .../scaffold/view/src/views/{{name}}/show.slang.ecr | 6 +++--- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/spec/support/fixtures/render_fixtures.cr b/spec/support/fixtures/render_fixtures.cr index a234b1c6b..e1a2db51a 100644 --- a/spec/support/fixtures/render_fixtures.cr +++ b/spec/support/fixtures/render_fixtures.cr @@ -13,8 +13,8 @@ module RenderFixtures
- - back + + back HTML end diff --git a/spec/support/sample/views/test/_form.slang b/spec/support/sample/views/test/_form.slang index 322c54f72..6c451e263 100755 --- a/spec/support/sample/views/test/_form.slang +++ b/spec/support/sample/views/test/_form.slang @@ -3,6 +3,6 @@ form action="/posts" method="post" div.form-group input.form-control type="text" name="title" placeholder="Title" value="hey you" div.form-group - textarea.form-control rows="10" name="content" placeholder="Content" = "out there in the cold" - button.btn.btn-primary.btn-xs type="submit" Submit - a.btn.btn-default.btn-xs href="/posts" back + textarea.form-control rows="10" name="content" placeholder="Content" = "out there in the cold" + button.btn.btn-primary.btn-sm type="submit" Submit + a.btn.btn-default.btn-sm href="/posts" back diff --git a/src/amber/cli/templates/auth/src/views/registration/new.ecr.ecr b/src/amber/cli/templates/auth/src/views/registration/new.ecr.ecr index fea1c2525..29db185d1 100644 --- a/src/amber/cli/templates/auth/src/views/registration/new.ecr.ecr +++ b/src/amber/cli/templates/auth/src/views/registration/new.ecr.ecr @@ -16,7 +16,7 @@
- +
<%="<"%>%= link_to("Already have an account?", "/signin") -%> diff --git a/src/amber/cli/templates/auth/src/views/registration/new.slang.ecr b/src/amber/cli/templates/auth/src/views/registration/new.slang.ecr index 88a9fd6af..57f621c01 100644 --- a/src/amber/cli/templates/auth/src/views/registration/new.slang.ecr +++ b/src/amber/cli/templates/auth/src/views/registration/new.slang.ecr @@ -11,7 +11,7 @@ form action="/registration" method="post" input.form-control type="email" name="email" placeholder="Email" .form-group input.form-control type="password" name="password" placeholder="Password" - button.btn.btn-primary.btn-xs type="submit" + button.btn.btn-primary.btn-sm type="submit" | Register
== link_to("Already have an account?", "/signin") diff --git a/src/amber/cli/templates/auth/src/views/session/new.ecr.ecr b/src/amber/cli/templates/auth/src/views/session/new.ecr.ecr index b4cca1d19..bcc5869d6 100644 --- a/src/amber/cli/templates/auth/src/views/session/new.ecr.ecr +++ b/src/amber/cli/templates/auth/src/views/session/new.ecr.ecr @@ -16,7 +16,7 @@
- +
<%="<"%>%= link_to("Don't have an account yet?", "/signup") -%> diff --git a/src/amber/cli/templates/auth/src/views/session/new.slang.ecr b/src/amber/cli/templates/auth/src/views/session/new.slang.ecr index bc3530f03..4be20fca8 100644 --- a/src/amber/cli/templates/auth/src/views/session/new.slang.ecr +++ b/src/amber/cli/templates/auth/src/views/session/new.slang.ecr @@ -11,6 +11,6 @@ form action="/session" method="post" input.form-control type="email" name="email" placeholder="Email" div.form-group input.form-control type="password" name="password" placeholder="Password" - button.btn.btn-primary.btn-xs type="submit" Sign In + button.btn.btn-primary.btn-sm type="submit" Sign In
== link_to("Don't have an account yet?", "/signup") diff --git a/src/amber/cli/templates/auth/src/views/{{name}}/edit.ecr.ecr b/src/amber/cli/templates/auth/src/views/{{name}}/edit.ecr.ecr index 6e4bcca16..173452ae0 100644 --- a/src/amber/cli/templates/auth/src/views/{{name}}/edit.ecr.ecr +++ b/src/amber/cli/templates/auth/src/views/{{name}}/edit.ecr.ecr @@ -13,6 +13,6 @@
%= <%= @name %>.email %>" />
- <%="<"%>%= submit("Update", class: "btn btn-primary btn-xs") %> - <%="<"%>%= link_to("profile", "/profile", class: "btn btn-default btn-xs") %> + <%="<"%>%= submit("Update", class: "btn btn-primary btn-sm") %> + <%="<"%>%= link_to("profile", "/profile", class: "btn btn-default btn-sm") %> diff --git a/src/amber/cli/templates/auth/src/views/{{name}}/edit.slang.ecr b/src/amber/cli/templates/auth/src/views/{{name}}/edit.slang.ecr index a8b1ec7b2..afa9a2168 100644 --- a/src/amber/cli/templates/auth/src/views/{{name}}/edit.slang.ecr +++ b/src/amber/cli/templates/auth/src/views/{{name}}/edit.slang.ecr @@ -9,5 +9,5 @@ h1 Edit Profile == csrf_tag .form-group input.form-control type="email" name="email" placeholder="Email" value="#{<%= @name %>.email}" - == submit("Update", class: "btn btn-primary btn-xs") - == link_to("profile", "/profile", class: "btn btn-default btn-xs") + == submit("Update", class: "btn btn-primary btn-sm") + == link_to("profile", "/profile", class: "btn btn-default btn-sm") diff --git a/src/amber/cli/templates/auth/src/views/{{name}}/show.ecr.ecr b/src/amber/cli/templates/auth/src/views/{{name}}/show.ecr.ecr index 57a177a87..2c396910a 100644 --- a/src/amber/cli/templates/auth/src/views/{{name}}/show.ecr.ecr +++ b/src/amber/cli/templates/auth/src/views/{{name}}/show.ecr.ecr @@ -1,5 +1,5 @@

Profile

<%="<"%>%= <%= @name %>.email %> - <%="<"%>%= link_to("edit", "/profile/edit", class: "btn btn-success btn-xs") %> + <%="<"%>%= link_to("edit", "/profile/edit", class: "btn btn-success btn-sm") %>

diff --git a/src/amber/cli/templates/auth/src/views/{{name}}/show.slang.ecr b/src/amber/cli/templates/auth/src/views/{{name}}/show.slang.ecr index 20d99c0db..569fc63a0 100644 --- a/src/amber/cli/templates/auth/src/views/{{name}}/show.slang.ecr +++ b/src/amber/cli/templates/auth/src/views/{{name}}/show.slang.ecr @@ -1,4 +1,4 @@ h1 Profile p == <%= @name %>.email - == link_to("edit", "/profile/edit", class: "btn btn-success btn-xs") + == link_to("edit", "/profile/edit", class: "btn btn-success btn-sm") diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr index 35ff90821..19386f97d 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr @@ -32,6 +32,6 @@ <% end -%>
<% end -%> - <%="<"%>%= submit("Submit", class: "btn btn-primary btn-xs") -%> - <%="<"%>%= link_to("back", "/<%= Inflector.pluralize(@name) %>", class: "btn btn-default btn-xs") -%> + <%="<"%>%= submit("Submit", class: "btn btn-primary btn-sm") -%> + <%="<"%>%= link_to("back", "/<%= Inflector.pluralize(@name) %>", class: "btn btn-default btn-sm") -%> diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr index 11aac39ec..efeb62936 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr @@ -21,5 +21,5 @@ == text_field(name: "<%= field.name %>", value: <%= @name %>.<%= field.name %>, placeholder: "<%= field.name.capitalize %>", class: "form-control") <%- end -%> <%- end -%> - == submit("Submit", class: "btn btn-primary btn-xs") - == link_to("back", "/<%= Inflector.pluralize(@name) %>", class: "btn btn-default btn-xs") + == submit("Submit", class: "btn btn-primary btn-sm") + == link_to("back", "/<%= Inflector.pluralize(@name) %>", class: "btn btn-default btn-sm") diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.ecr.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.ecr.ecr index f78800f1f..d404445db 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.ecr.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.ecr.ecr @@ -3,7 +3,7 @@

<%= Inflector.pluralize(display_name) %>

- New + New
@@ -24,9 +24,9 @@ <% end -%> - <%="<"%>%= link_to("read", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}", class: "btn btn-primary btn-xs") -%> - <%="<"%>%= link_to("edit", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}/edit", class: "btn btn-success btn-xs") -%> - <%="<"%>%= link_to("delete", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}?_csrf=#{csrf_token}", "data-method": "delete", "data-confirm": "Are you sure?", class: "btn btn-danger btn-xs") -%> + <%="<"%>%= link_to("read", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}", class: "btn btn-primary btn-sm") -%> + <%="<"%>%= link_to("edit", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}/edit", class: "btn btn-success btn-sm") -%> + <%="<"%>%= link_to("delete", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}?_csrf=#{csrf_token}", "data-method": "delete", "data-confirm": "Are you sure?", class: "btn btn-danger btn-sm") -%> diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.slang.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.slang.ecr index b703d8657..03018d752 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.slang.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.slang.ecr @@ -2,7 +2,7 @@ div.row div.col-sm-11 h2 <%= Inflector.pluralize(display_name) %> div.col-sm-1 - a.btn.btn-success.btn-xs href="/<%= Inflector.pluralize(@name) %>/new" New + a.btn.btn-success.btn-sm href="/<%= Inflector.pluralize(@name) %>/new" New div.table-responsive table.table.table-striped thead @@ -19,6 +19,6 @@ div.table-responsive <%- end -%> td span - == link_to("read", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}", class: "btn btn-primary btn-xs") - == link_to("edit", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}/edit", class: "btn btn-success btn-xs") - == link_to("delete", "/<%= Inflector.pluralize(@name) %>/#{ <%= @name %>.id }?_csrf=#{csrf_token}", "data-method": "delete", "data-confirm": "Are you sure?", class: "btn btn-danger btn-xs") + == link_to("read", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}", class: "btn btn-primary btn-sm") + == link_to("edit", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}/edit", class: "btn btn-success btn-sm") + == link_to("delete", "/<%= Inflector.pluralize(@name) %>/#{ <%= @name %>.id }?_csrf=#{csrf_token}", "data-method": "delete", "data-confirm": "Are you sure?", class: "btn btn-danger btn-sm") diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.ecr.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.ecr.ecr index 8cd8c5511..26ab50277 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.ecr.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.ecr.ecr @@ -4,7 +4,7 @@

<%="<"%>%= <%= @name %>.<%= field.name %><%= field.reference? ? ".id" : "" %> %>

<% end -%>

- <%="<"%>%= link_to("back", "/<%= Inflector.pluralize(@name) %>s", class: "btn btn-default btn-xs") -%> - <%="<"%>%= link_to("edit", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}/edit", class: "btn btn-success btn-xs") -%> - <%="<"%>%= link_to("delete", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}?_csrf=#{csrf_token}", "data-method": "delete", "data-confirm": "Are you sure?", class: "btn btn-danger btn-xs") -%> + <%="<"%>%= link_to("back", "/<%= Inflector.pluralize(@name) %>s", class: "btn btn-default btn-sm") -%> + <%="<"%>%= link_to("edit", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}/edit", class: "btn btn-success btn-sm") -%> + <%="<"%>%= link_to("delete", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}?_csrf=#{csrf_token}", "data-method": "delete", "data-confirm": "Are you sure?", class: "btn btn-danger btn-sm") -%>

diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.slang.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.slang.ecr index 34b90450c..703add7e7 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.slang.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.slang.ecr @@ -3,6 +3,6 @@ h1 Show <%= display_name %> p = <%= @name %>.<%= field.name %><%= field.reference? ? ".id" : "" %> <% end -%> p - == link_to("back", "/<%= Inflector.pluralize(@name) %>", class: "btn btn-default btn-xs") - == link_to("edit", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}/edit", class: "btn btn-success btn-xs") - == link_to("delete", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}?_csrf=#{csrf_token}", "data-method": "delete", "data-confirm": "Are you sure?", class: "btn btn-danger btn-xs") + == link_to("back", "/<%= Inflector.pluralize(@name) %>", class: "btn btn-default btn-sm") + == link_to("edit", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}/edit", class: "btn btn-success btn-sm") + == link_to("delete", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}?_csrf=#{csrf_token}", "data-method": "delete", "data-confirm": "Are you sure?", class: "btn btn-danger btn-sm") From e98e61ffbb5324ff6ad1cd9f347af05b87938259 Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 22:07:23 +0900 Subject: [PATCH 10/21] #746 btn-default has removed. change to btn-light --- spec/support/fixtures/render_fixtures.cr | 2 +- spec/support/sample/views/test/_form.slang | 2 +- src/amber/cli/templates/auth/src/views/{{name}}/edit.ecr.ecr | 2 +- src/amber/cli/templates/auth/src/views/{{name}}/edit.slang.ecr | 2 +- .../templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr | 2 +- .../templates/scaffold/view/src/views/{{name}}/_form.slang.ecr | 2 +- .../cli/templates/scaffold/view/src/views/{{name}}/show.ecr.ecr | 2 +- .../templates/scaffold/view/src/views/{{name}}/show.slang.ecr | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/support/fixtures/render_fixtures.cr b/spec/support/fixtures/render_fixtures.cr index e1a2db51a..05f1f017a 100644 --- a/spec/support/fixtures/render_fixtures.cr +++ b/spec/support/fixtures/render_fixtures.cr @@ -14,7 +14,7 @@ module RenderFixtures
- back + back HTML end diff --git a/spec/support/sample/views/test/_form.slang b/spec/support/sample/views/test/_form.slang index 6c451e263..4152452ad 100755 --- a/spec/support/sample/views/test/_form.slang +++ b/spec/support/sample/views/test/_form.slang @@ -5,4 +5,4 @@ form action="/posts" method="post" div.form-group textarea.form-control rows="10" name="content" placeholder="Content" = "out there in the cold" button.btn.btn-primary.btn-sm type="submit" Submit - a.btn.btn-default.btn-sm href="/posts" back + a.btn.btn-light.btn-sm href="/posts" back diff --git a/src/amber/cli/templates/auth/src/views/{{name}}/edit.ecr.ecr b/src/amber/cli/templates/auth/src/views/{{name}}/edit.ecr.ecr index 173452ae0..9686d6dcf 100644 --- a/src/amber/cli/templates/auth/src/views/{{name}}/edit.ecr.ecr +++ b/src/amber/cli/templates/auth/src/views/{{name}}/edit.ecr.ecr @@ -14,5 +14,5 @@ %= <%= @name %>.email %>" />
<%="<"%>%= submit("Update", class: "btn btn-primary btn-sm") %> - <%="<"%>%= link_to("profile", "/profile", class: "btn btn-default btn-sm") %> + <%="<"%>%= link_to("profile", "/profile", class: "btn btn-light btn-sm") %> diff --git a/src/amber/cli/templates/auth/src/views/{{name}}/edit.slang.ecr b/src/amber/cli/templates/auth/src/views/{{name}}/edit.slang.ecr index afa9a2168..3d22e4931 100644 --- a/src/amber/cli/templates/auth/src/views/{{name}}/edit.slang.ecr +++ b/src/amber/cli/templates/auth/src/views/{{name}}/edit.slang.ecr @@ -10,4 +10,4 @@ h1 Edit Profile .form-group input.form-control type="email" name="email" placeholder="Email" value="#{<%= @name %>.email}" == submit("Update", class: "btn btn-primary btn-sm") - == link_to("profile", "/profile", class: "btn btn-default btn-sm") + == link_to("profile", "/profile", class: "btn btn-light btn-sm") diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr index 19386f97d..62c9088d2 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr @@ -33,5 +33,5 @@
<% end -%> <%="<"%>%= submit("Submit", class: "btn btn-primary btn-sm") -%> - <%="<"%>%= link_to("back", "/<%= Inflector.pluralize(@name) %>", class: "btn btn-default btn-sm") -%> + <%="<"%>%= link_to("back", "/<%= Inflector.pluralize(@name) %>", class: "btn btn-light btn-sm") -%> diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr index efeb62936..1ccea1a32 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr @@ -22,4 +22,4 @@ <%- end -%> <%- end -%> == submit("Submit", class: "btn btn-primary btn-sm") - == link_to("back", "/<%= Inflector.pluralize(@name) %>", class: "btn btn-default btn-sm") + == link_to("back", "/<%= Inflector.pluralize(@name) %>", class: "btn btn-light btn-sm") diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.ecr.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.ecr.ecr index 26ab50277..23f099e1b 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.ecr.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.ecr.ecr @@ -4,7 +4,7 @@

<%="<"%>%= <%= @name %>.<%= field.name %><%= field.reference? ? ".id" : "" %> %>

<% end -%>

- <%="<"%>%= link_to("back", "/<%= Inflector.pluralize(@name) %>s", class: "btn btn-default btn-sm") -%> + <%="<"%>%= link_to("back", "/<%= Inflector.pluralize(@name) %>s", class: "btn btn-light btn-sm") -%> <%="<"%>%= link_to("edit", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}/edit", class: "btn btn-success btn-sm") -%> <%="<"%>%= link_to("delete", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}?_csrf=#{csrf_token}", "data-method": "delete", "data-confirm": "Are you sure?", class: "btn btn-danger btn-sm") -%>

diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.slang.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.slang.ecr index 703add7e7..2c64ec933 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.slang.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/show.slang.ecr @@ -3,6 +3,6 @@ h1 Show <%= display_name %> p = <%= @name %>.<%= field.name %><%= field.reference? ? ".id" : "" %> <% end -%> p - == link_to("back", "/<%= Inflector.pluralize(@name) %>", class: "btn btn-default btn-sm") + == link_to("back", "/<%= Inflector.pluralize(@name) %>", class: "btn btn-light btn-sm") == link_to("edit", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}/edit", class: "btn btn-success btn-sm") == link_to("delete", "/<%= Inflector.pluralize(@name) %>/#{<%= @name %>.id}?_csrf=#{csrf_token}", "data-method": "delete", "data-confirm": "Are you sure?", class: "btn btn-danger btn-sm") From 156ea70b08eb1114e13c1fe4bf86c6e964faf5fe Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 22:20:35 +0900 Subject: [PATCH 11/21] #746 update checkbox for bootstrap 4 --- .../scaffold/view/src/views/{{name}}/_form.ecr.ecr | 4 ++-- .../scaffold/view/src/views/{{name}}/_form.slang.ecr | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr index 62c9088d2..99c02298e 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr @@ -21,8 +21,8 @@ when "text" -%> <%="<"%>%= text_area(name: "<%= field.name -%>", content: <%= @name %>.<%= field.name %>, placeholder: "<%= field.name.capitalize %>", class: "form-control", size: "30x10") -%> <% when "boolean" -%> -
- <%="<"%>%= label(<%=":#{field.name}"%>) { check_box(<%=":#{field.name}, checked: #{@name}.#{field.name}.to_s == \"1\""%>) } -%> +
+ <%="<"%>%= label(<%=":#{field.name}"%>, class: "form-check-label") { check_box(<%=":#{field.name}, checked: #{@name}.#{field.name}.to_s == \"1\"", class: "form-check-input"%>) } -%>
<% when "reference" -%> <%="<"%>%= label(<%=":#{field.name}"%>) -%> diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr index 1ccea1a32..061b06c43 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr @@ -11,9 +11,9 @@ when "text" -%> == text_area(name: "<%= field.name -%>", content: <%= @name %>.<%= field.name %>, placeholder: "<%= field.name.capitalize %>", class: "form-control", size: "30x10") <%- when "boolean" -%> - div.checkbox - == label(<%=":#{field.name}"%>) do - == check_box(<%=":#{field.name}, checked: #{@name}.#{field.name}.to_s == \"1\""%>) + div.form-check + == label(<%=":#{field.name}"%>, class: "form-check-label") do + == check_box(<%=":#{field.name}, checked: #{@name}.#{field.name}.to_s == \"1\""%>, class: "form-check-input") <%- when "reference" -%> == label(<%=":#{field.name}"%>) == select_field(name: "<%= field.name %>_id", collection: <%= field.name.capitalize %>.all.map{|<%= field.name %>| [<%= field.name %>.id, <%= field.name %>.id]}, selected: <%= @name %>.<%= field.name %>_id, class: "form-control") From 4a2a5c348891e53a5462fe50358b7ddff0c75bd0 Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 22:25:55 +0900 Subject: [PATCH 12/21] #746 vertical-align: middle; for bootstrap 4 tables --- src/amber/cli/templates/app/src/assets/stylesheets/main.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/amber/cli/templates/app/src/assets/stylesheets/main.scss b/src/amber/cli/templates/app/src/assets/stylesheets/main.scss index 93cea1461..f7456a0fe 100644 --- a/src/amber/cli/templates/app/src/assets/stylesheets/main.scss +++ b/src/amber/cli/templates/app/src/assets/stylesheets/main.scss @@ -90,3 +90,7 @@ h6, .h6 { display: none; } } + +.table td, .table th { + vertical-align: middle; +} From 600a273a2b54d128e0a0f2aa05e7e592b0d2ca7a Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 22:28:16 +0900 Subject: [PATCH 13/21] #746 update alert classs for bootstrap 4 --- .../cli/templates/app/src/assets/stylesheets/main.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/amber/cli/templates/app/src/assets/stylesheets/main.scss b/src/amber/cli/templates/app/src/assets/stylesheets/main.scss index f7456a0fe..3df8228c6 100644 --- a/src/amber/cli/templates/app/src/assets/stylesheets/main.scss +++ b/src/amber/cli/templates/app/src/assets/stylesheets/main.scss @@ -94,3 +94,12 @@ h6, .h6 { .table td, .table th { vertical-align: middle; } + +.alert { + margin-top: 1em; + + p { + margin-top: 0; + margin-bottom: 0; + } +} From a426e1b76041d817743bb27599f2779c43d0424a Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 22:36:56 +0900 Subject: [PATCH 14/21] #746 remove ml-auto, need to fix auth links are on the right side of navbar --- src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr | 4 ++-- .../cli/templates/auth/src/views/layouts/+_nav.slang.ecr | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr b/src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr index 599aa253c..a69bfd7bc 100644 --- a/src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr +++ b/src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr @@ -1,10 +1,10 @@ <%="<"%>%- if (current_<%= @name %> = context.current_<%= @name %>) %> - | Sign Out + | Sign Out <%="<"%>%- active = context.request.path == "/profile" ? "active" : "" %> %= active %>" href="/profile"><%="<"%>%= current_<%= @name %>.email %> <%="<"%>%- else %> <%="<"%>%- active = context.request.path == "/signup" ? "active" : "" %> - %= active %>" href="/signup">| Sign Up + %= active %>" href="/signup">| Sign Up <%="<"%>%- active = context.request.path == "/signin" ? "active" : "" %> %= active %>" href="/signin">| Sign In <%="<"%>%- end %> diff --git a/src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr b/src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr index bc3ceadf1..a9129d0ec 100644 --- a/src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr +++ b/src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr @@ -1,12 +1,12 @@ - if (current_<%= @name %> = context.current_<%= @name %>) - a.nav-item.ml-auto href="/signout" + a.nav-item href="/signout" | Sign Out - active = context.request.path == "/profile" ? "active" : "" a class="nav-item #{active}" href="/profile" == current_<%= @name %>.email - else - active = context.request.path == "/signup" ? "active" : "" - a class="nav-item ml-auto #{active}" href="/signup" + a class="nav-item #{active}" href="/signup" | Sign Up - active = context.request.path == "/signin" ? "active" : "" a class="nav-item #{active}" href="/signin" From 0feda91e0492323e13ee8d901b29cf1321c5d97f Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 22:40:26 +0900 Subject: [PATCH 15/21] #746 using only class and id for div --- src/amber/cli/templates/app/src/views/home/index.slang.ecr | 4 ++-- .../cli/templates/app/src/views/layouts/application.slang.ecr | 4 ++-- .../scaffold/view/src/views/{{name}}/index.slang.ecr | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amber/cli/templates/app/src/views/home/index.slang.ecr b/src/amber/cli/templates/app/src/views/home/index.slang.ecr index 3895ecc06..832cac34e 100644 --- a/src/amber/cli/templates/app/src/views/home/index.slang.ecr +++ b/src/amber/cli/templates/app/src/views/home/index.slang.ecr @@ -1,5 +1,5 @@ -div.row - div#logo +.row + #logo div.col-sm-6 h2 = t "welcome_to_amber" p Thank you for trying out the Amber Framework. We are working hard to provide a super fast and reliable framework that provides all the productivity tools you are used to without sacrificing the speed. diff --git a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr index a3404d805..56918d012 100644 --- a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr +++ b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr @@ -14,12 +14,12 @@ html nav.nav == render(partial: "layouts/_nav.slang") div.container - div.row + .row div.col-sm - flash.each do |key, value| div class="alert alert-#{key}" p = flash[key] - div.row + .row div.col-sm-12.main == content diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.slang.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.slang.ecr index 03018d752..14651d3f0 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.slang.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.slang.ecr @@ -1,4 +1,4 @@ -div.row +.row div.col-sm-11 h2 <%= Inflector.pluralize(display_name) %> div.col-sm-1 From 06acf93be479c3e9998917399a29e58d13d60274 Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 22:41:01 +0900 Subject: [PATCH 16/21] #746 fix checkbox template --- .../templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr index 99c02298e..3c5eaf34d 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr @@ -22,7 +22,7 @@ <%="<"%>%= text_area(name: "<%= field.name -%>", content: <%= @name %>.<%= field.name %>, placeholder: "<%= field.name.capitalize %>", class: "form-control", size: "30x10") -%> <% when "boolean" -%>
- <%="<"%>%= label(<%=":#{field.name}"%>, class: "form-check-label") { check_box(<%=":#{field.name}, checked: #{@name}.#{field.name}.to_s == \"1\"", class: "form-check-input"%>) } -%> + <%="<"%>%= label(<%=":#{field.name}"%>, class: "form-check-label") { check_box(<%=":#{field.name}, checked: #{@name}.#{field.name}.to_s == \"1\""%>, class: "form-check-input") } -%>
<% when "reference" -%> <%="<"%>%= label(<%=":#{field.name}"%>) -%> From 0d2903c67eb03c501d83b9ec066ebfe9a813d201 Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 22:56:26 +0900 Subject: [PATCH 17/21] #746 remove checkbox class for testing --- .../templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr | 4 +--- .../scaffold/view/src/views/{{name}}/_form.slang.ecr | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr index 3c5eaf34d..35db17f3d 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr @@ -21,9 +21,7 @@ when "text" -%> <%="<"%>%= text_area(name: "<%= field.name -%>", content: <%= @name %>.<%= field.name %>, placeholder: "<%= field.name.capitalize %>", class: "form-control", size: "30x10") -%> <% when "boolean" -%> -
- <%="<"%>%= label(<%=":#{field.name}"%>, class: "form-check-label") { check_box(<%=":#{field.name}, checked: #{@name}.#{field.name}.to_s == \"1\""%>, class: "form-check-input") } -%> -
+ <%="<"%>%= label(<%=":#{field.name}"%>) { check_box(<%=":#{field.name}, checked: #{@name}.#{field.name}.to_s == \"1\""%>) } -%> <% when "reference" -%> <%="<"%>%= label(<%=":#{field.name}"%>) -%> <%="<"%>%= select_field(name: "<%= field.name %>_id", collection: <%= field.name.capitalize %>.all.map{|<%= field.name %>| [<%= field.name %>.id, <%= field.name %>.id]}, selected: <%= @name %>.<%= field.name %>_id, class: "form-control") -%> diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr index 061b06c43..b0b881702 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr @@ -11,9 +11,8 @@ when "text" -%> == text_area(name: "<%= field.name -%>", content: <%= @name %>.<%= field.name %>, placeholder: "<%= field.name.capitalize %>", class: "form-control", size: "30x10") <%- when "boolean" -%> - div.form-check - == label(<%=":#{field.name}"%>, class: "form-check-label") do - == check_box(<%=":#{field.name}, checked: #{@name}.#{field.name}.to_s == \"1\""%>, class: "form-check-input") + == label(<%=":#{field.name}"%>) do + == check_box(<%=":#{field.name}, checked: #{@name}.#{field.name}.to_s == \"1\""%>) <%- when "reference" -%> == label(<%=":#{field.name}"%>) == select_field(name: "<%= field.name %>_id", collection: <%= field.name.capitalize %>.all.map{|<%= field.name %>| [<%= field.name %>.id, <%= field.name %>.id]}, selected: <%= @name %>.<%= field.name %>_id, class: "form-control") From c8d49a6a1888725bbf405cf6816d043ff1de199f Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 23:08:53 +0900 Subject: [PATCH 18/21] #746 FOR TEST update checkbox class --- .../templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr index 35db17f3d..7b5ec17c5 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.ecr.ecr @@ -21,7 +21,10 @@ when "text" -%> <%="<"%>%= text_area(name: "<%= field.name -%>", content: <%= @name %>.<%= field.name %>, placeholder: "<%= field.name.capitalize %>", class: "form-control", size: "30x10") -%> <% when "boolean" -%> - <%="<"%>%= label(<%=":#{field.name}"%>) { check_box(<%=":#{field.name}, checked: #{@name}.#{field.name}.to_s == \"1\""%>) } -%> + <%="<"%>%= label(<%=":#{field.name}"%>, class: "form-check-label") do + check_box(<%=":#{field.name}, checked: #{@name}.#{field.name}.to_s == \"1\""%>, + class: "form-check-input") + end -%> <% when "reference" -%> <%="<"%>%= label(<%=":#{field.name}"%>) -%> <%="<"%>%= select_field(name: "<%= field.name %>_id", collection: <%= field.name.capitalize %>.all.map{|<%= field.name %>| [<%= field.name %>.id, <%= field.name %>.id]}, selected: <%= @name %>.<%= field.name %>_id, class: "form-control") -%> From ca907908e304886b9c0c11556b20c8969a09a21d Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Thu, 12 Apr 2018 23:29:57 +0900 Subject: [PATCH 19/21] #746 Using only class name with div --- spec/support/sample/views/test/_form.slang | 4 ++-- .../cli/templates/app/src/views/home/index.slang.ecr | 4 ++-- .../app/src/views/layouts/application.slang.ecr | 10 +++++----- .../cli/templates/auth/src/views/session/new.slang.ecr | 4 ++-- .../scaffold/view/src/views/{{name}}/_form.slang.ecr | 2 +- .../scaffold/view/src/views/{{name}}/index.slang.ecr | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/spec/support/sample/views/test/_form.slang b/spec/support/sample/views/test/_form.slang index 4152452ad..45d4efb02 100755 --- a/spec/support/sample/views/test/_form.slang +++ b/spec/support/sample/views/test/_form.slang @@ -1,8 +1,8 @@ form action="/posts" method="post" == csrf_tag - div.form-group + .form-group input.form-control type="text" name="title" placeholder="Title" value="hey you" - div.form-group + .form-group textarea.form-control rows="10" name="content" placeholder="Content" = "out there in the cold" button.btn.btn-primary.btn-sm type="submit" Submit a.btn.btn-light.btn-sm href="/posts" back diff --git a/src/amber/cli/templates/app/src/views/home/index.slang.ecr b/src/amber/cli/templates/app/src/views/home/index.slang.ecr index 832cac34e..e2337e3ed 100644 --- a/src/amber/cli/templates/app/src/views/home/index.slang.ecr +++ b/src/amber/cli/templates/app/src/views/home/index.slang.ecr @@ -1,9 +1,9 @@ .row #logo - div.col-sm-6 + .col-sm-6 h2 = t "welcome_to_amber" p Thank you for trying out the Amber Framework. We are working hard to provide a super fast and reliable framework that provides all the productivity tools you are used to without sacrificing the speed. - div.list-group + .list-group a.list-group-item.list-group-item-action target="_blank" href="https://docs.amberframework.org" Getting Started with Amber Framework a.list-group-item.list-group-item-action target="_blank" href="https://github.com/veelenga/awesome-crystal" List of Awesome Crystal projects and shards a.list-group-item.list-group-item-action target="_blank" href="https://crystalshards.xyz" What's hot in Crystal right now diff --git a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr index 56918d012..76de43d5f 100644 --- a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr +++ b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr @@ -9,18 +9,18 @@ html link rel="stylesheet" href="/dist/main.bundle.css" body - div.masthead - div.container + .masthead + .container nav.nav == render(partial: "layouts/_nav.slang") - div.container + .container .row - div.col-sm + .col-sm - flash.each do |key, value| div class="alert alert-#{key}" p = flash[key] .row - div.col-sm-12.main + .col-sm-12.main == content script src="https://code.jquery.com/jquery-3.3.1.min.js" diff --git a/src/amber/cli/templates/auth/src/views/session/new.slang.ecr b/src/amber/cli/templates/auth/src/views/session/new.slang.ecr index 4be20fca8..a826b45bb 100644 --- a/src/amber/cli/templates/auth/src/views/session/new.slang.ecr +++ b/src/amber/cli/templates/auth/src/views/session/new.slang.ecr @@ -7,9 +7,9 @@ h1 Sign In form action="/session" method="post" == csrf_tag - div.form-group + .form-group input.form-control type="email" name="email" placeholder="Email" - div.form-group + .form-group input.form-control type="password" name="password" placeholder="Password" button.btn.btn-primary.btn-sm type="submit" Sign In
diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr index b0b881702..3bc341572 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/_form.slang.ecr @@ -6,7 +6,7 @@ == form(action: "/<%= Inflector.pluralize(@name) -%>/#{<%= @name -%>.id.to_s}", method: <%= @name %>.id ? :patch : :post) do == csrf_tag <%- @fields.reject{|f| f.hidden }.each do |field| -%> - div.form-group + .form-group <%- case field.type when "text" -%> == text_area(name: "<%= field.name -%>", content: <%= @name %>.<%= field.name %>, placeholder: "<%= field.name.capitalize %>", class: "form-control", size: "30x10") diff --git a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.slang.ecr b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.slang.ecr index 14651d3f0..70bc70f72 100644 --- a/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.slang.ecr +++ b/src/amber/cli/templates/scaffold/view/src/views/{{name}}/index.slang.ecr @@ -1,9 +1,9 @@ .row - div.col-sm-11 + .col-sm-11 h2 <%= Inflector.pluralize(display_name) %> - div.col-sm-1 + .col-sm-1 a.btn.btn-success.btn-sm href="/<%= Inflector.pluralize(@name) %>/new" New -div.table-responsive +.table-responsive table.table.table-striped thead tr From 634b3eda9b0f2807ea043aac0e636028047c2d59 Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Fri, 13 Apr 2018 20:39:46 +0900 Subject: [PATCH 20/21] #746 pulling auth navigation item on the right side of navigation bar --- .../templates/app/src/assets/stylesheets/main.scss | 12 ++++++++++++ .../templates/auth/src/views/layouts/+_nav.ecr.ecr | 8 ++++---- .../templates/auth/src/views/layouts/+_nav.slang.ecr | 8 ++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/amber/cli/templates/app/src/assets/stylesheets/main.scss b/src/amber/cli/templates/app/src/assets/stylesheets/main.scss index 3df8228c6..638d3920c 100644 --- a/src/amber/cli/templates/app/src/assets/stylesheets/main.scss +++ b/src/amber/cli/templates/app/src/assets/stylesheets/main.scss @@ -103,3 +103,15 @@ h6, .h6 { margin-bottom: 0; } } + +// For Navigation pulling right +.nav-item-auth { + &.nav-item-auth-signout, &.nav-item-auth-signup { + order: 9999; + } + + &.nav-item-auth-profile, &.nav-item-auth-signin { + order: 9990; + margin-left: auto; + } +} \ No newline at end of file diff --git a/src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr b/src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr index a69bfd7bc..72a26b541 100644 --- a/src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr +++ b/src/amber/cli/templates/auth/src/views/layouts/+_nav.ecr.ecr @@ -1,10 +1,10 @@ <%="<"%>%- if (current_<%= @name %> = context.current_<%= @name %>) %> - | Sign Out + | Sign Out <%="<"%>%- active = context.request.path == "/profile" ? "active" : "" %> - %= active %>" href="/profile"><%="<"%>%= current_<%= @name %>.email %> + %= active %>" href="/profile"><%="<"%>%= current_<%= @name %>.email %> <%="<"%>%- else %> <%="<"%>%- active = context.request.path == "/signup" ? "active" : "" %> - %= active %>" href="/signup">| Sign Up + <%="<"%>%- active = context.request.path == "/signin" ? "active" : "" %> - %= active %>" href="/signin">| Sign In + <%="<"%>%- end %> diff --git a/src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr b/src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr index a9129d0ec..9629f8afe 100644 --- a/src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr +++ b/src/amber/cli/templates/auth/src/views/layouts/+_nav.slang.ecr @@ -1,13 +1,13 @@ - if (current_<%= @name %> = context.current_<%= @name %>) - a.nav-item href="/signout" + a.nav-item.nav-item-auth.nav-item-auth-signout href="/signout" | Sign Out - active = context.request.path == "/profile" ? "active" : "" - a class="nav-item #{active}" href="/profile" + a class="nav-item nav-item-auth nav-item-auth-profile #{active}" href="/profile" == current_<%= @name %>.email - else - active = context.request.path == "/signup" ? "active" : "" - a class="nav-item #{active}" href="/signup" + a class="nav-item nav-item-auth nav-item-auth-signup #{active}" href="/signup" | Sign Up - active = context.request.path == "/signin" ? "active" : "" - a class="nav-item #{active}" href="/signin" + a class="nav-item nav-item-auth nav-item-auth-signin #{active}" href="/signin" | Sign In From e9dd38e12c90c8e2422eb728026b582fe62ce3b8 Mon Sep 17 00:00:00 2001 From: ChangJoo Park Date: Sat, 14 Apr 2018 10:30:36 +0900 Subject: [PATCH 21/21] #746 replace indentation tab to spaces --- .../cli/templates/app/src/views/layouts/application.slang.ecr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr index 76de43d5f..f9342623a 100644 --- a/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr +++ b/src/amber/cli/templates/app/src/views/layouts/application.slang.ecr @@ -15,7 +15,7 @@ html == render(partial: "layouts/_nav.slang") .container .row - .col-sm + .col-sm - flash.each do |key, value| div class="alert alert-#{key}" p = flash[key]