From 67318f71182aa7c5d1dce75312d50eceba31098e Mon Sep 17 00:00:00 2001 From: Ryan Rauh Date: Mon, 29 Aug 2016 12:57:58 -0500 Subject: [PATCH 1/2] Refactors to BEM and cleans up some markup --- app/assets/stylesheets/board/create.scss | 42 +++----- app/views/board/create_board.html.erb | 130 +++++++++++++---------- 2 files changed, 85 insertions(+), 87 deletions(-) diff --git a/app/assets/stylesheets/board/create.scss b/app/assets/stylesheets/board/create.scss index 6a64f45f..21ee0ccd 100644 --- a/app/assets/stylesheets/board/create.scss +++ b/app/assets/stylesheets/board/create.scss @@ -1,52 +1,34 @@ -.create-new-board--container { +.create-new-board__container { max-width: 600px; margin-left: auto; margin-right: auto; + padding-bottom: 30px; + font-size: 15px; } -.create-new-board--message { - margin: 0px auto 30px auto; - margin-bottom: 30px; - font-size: 15px; +.create-new-board__message { + margin: 0px auto; } -.create-new-board--list { +.create-new-board__list { list-style: none; padding-left: 10px; - padding-bottom: 10px; text-align: left; - li { + &__item { border-left-style: solid; border-left-color: $lightGrey; padding-left: 10px; margin-bottom: 14px; - } -} - -.create-new-board--form { - input.btn.primary { - background: none; - font-size: 16px; - border-style: solid; - padding: 18px; - border-radius: 6px; - text-shadow: none; - &:hover { - background-color: $hb-purple; - color: white; + &--error { + border-left-color: $red; } } } -.create-new-board--labels { +.create-new-board__labels { @include display(flex); @include align-items(center); @include justify-content(center); - .labels-create-message { - font-size: 16px; - margin-bottom: 20px; - } - .labels-create-columns { - font-size: 14px; - } + padding-bottom: 10px; + font-size: 16px; } diff --git a/app/views/board/create_board.html.erb b/app/views/board/create_board.html.erb index 97443a4a..3936c5c1 100644 --- a/app/views/board/create_board.html.erb +++ b/app/views/board/create_board.html.erb @@ -1,66 +1,82 @@
-
- <% if @parameters['create_failed']%> -

Oops!

-
-

HuBoard is unable to create a board for you!

- - <%= form_tag 'create', class: 'create-new-board--form' do %> - - - - +
+ <% if @parameters['create_failed']%> +

Oops!

+
+

HuBoard is unable to create a board for you!

+
    +
  • +

    + You will need write permissions to <%= @parameters['user'] %>/<%= @parameters['repo'] %> +

    + <% if @repo['owner'] && @repo['owner']['type'] == "Organization" %> +

    + <%= @repo['owner']['login'] %> is a GitHub Organization: Please ensure no access restrictions are present +

    + <% end %> +

    + Talk to us! +

    +
    • +
+ <%= form_tag 'create', class: 'create-new-board__form' do %> + + + Go Home + + <% end %>
- <% end %> -
- <% elsif @repo && @repo['permissions'] && @repo['permissions']['push'] %> -

<%= @parameters['user'] %>/<%= @parameters['repo'] %> is not yet configured for HuBoard

-
-

We can automatically get you started with a default label configuration:

-
-
-
-

Allow HuBoard to create the following labels?

+ <% elsif @repo && @repo['permissions'] && @repo['permissions']['push'] %> +

<%= @parameters['user'] %>/<%= @parameters['repo'] %> is not yet configured for HuBoard

+
+

We can automatically get you started with a default label configuration:

+
+
+
+

Allow HuBoard to create the following labels?

+
+
+
    +
  • 0 - Backlog
    • +
  • 1 - Ready
    • +
  • 2 - Working
    • +
  • 3 - Review
    • +
  • 4 - Done
    • +
+
+
+ <%= form_tag 'create', class: 'create-new-board__form' do %> + + + + + <% end %>
-
-
    -
  • 0 - Backlog
    • -
  • 1 - Ready
    • -
  • 2 - Working
    • -
  • 3 - Review
    • -
  • 4 - Done
    • + <% else %> +

    <%= @parameters['user'] %>/<%= @parameters['repo'] %> is not yet configured for HuBoard

    +
    +
      +
    • +

      + You will need write permissions to <%= @parameters['user'] %>/<%= @parameters['repo'] %> +

      + <% if @repo['owner'] && @repo['owner']['type'] == "Organization" %> +

      + <%= @repo['owner']['login'] %> is a GitHub Organization: Please ensure no access restrictions are present +

      + <% end %> +

      + Talk to us! +

      +
    -
    -
- <%= form_tag 'create', class: 'create-new-board--form' do %> - - - - -
- <% end %> - <% else %> -

<%= @parameters['user'] %>/<%= @parameters['repo'] %> is not yet configured for HuBoard

-
- - <%= form_tag 'create_board', class: 'create-new-board--form' do %> - - + + Try again - - + + Go Home
- <% end %> -
- <% end %> + <% end %>
From 1e3d528b72b7aa8629ad0ff670667e66909964df Mon Sep 17 00:00:00 2001 From: Ryan Rauh Date: Wed, 31 Aug 2016 11:17:31 -0500 Subject: [PATCH 2/2] adds analytics paths to determine retry or abandons --- app/views/board/create_board.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/board/create_board.html.erb b/app/views/board/create_board.html.erb index 3936c5c1..c0752575 100644 --- a/app/views/board/create_board.html.erb +++ b/app/views/board/create_board.html.erb @@ -20,8 +20,8 @@ <%= form_tag 'create', class: 'create-new-board__form' do %> - - + + Go Home <% end %> @@ -47,8 +47,8 @@
<%= form_tag 'create', class: 'create-new-board__form' do %> - - + + Create columns manually <% end %>
@@ -70,10 +70,10 @@

- + Try again - + Go Home