diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index dddc2fc..8b18338 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,9 +1,12 @@ - + - RailsGoat - <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> - <%= javascript_include_tag "application", "data-turbolinks-track" => true %> + + + RailsGoat - OWASP Security Training + + <%= stylesheet_link_tag "application", media: "all", "data-turbo-track": "reload" %> + <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %> <%#= csrf_meta_tags %> - + + - + + + body { font-size:<%= raw cookies[:font] %> !important;} <% end %> + <%= render "layouts/shared/header" %> <%= render "layouts/shared/sidebar" %> -
- <% if current_user %> -
- <%= render "layouts/shared/messages" %> - <%= yield %> -
- <% else %> -
+ +
<%= render "layouts/shared/messages" %> - <%= yield %> -
- <% end %> -
+ <%= yield %> + + <%= render "layouts/shared/footer" %> - - - diff --git a/app/views/layouts/shared/_footer.html.erb b/app/views/layouts/shared/_footer.html.erb index f2a9c18..a197612 100755 --- a/app/views/layouts/shared/_footer.html.erb +++ b/app/views/layouts/shared/_footer.html.erb @@ -1,22 +1,56 @@ - +<% if current_user %> + +<% end %> - \ No newline at end of file + diff --git a/app/views/layouts/shared/_header.html.erb b/app/views/layouts/shared/_header.html.erb index 24b39ca..09637f4 100755 --- a/app/views/layouts/shared/_header.html.erb +++ b/app/views/layouts/shared/_header.html.erb @@ -1,88 +1,155 @@ <% if current_user %> -
- - - Font Size: - A - A - - -
- - - + +
+
+
+
+ + RailsGoat + +
+ +
+ +
+
+ +
+ + + + + + +
+ + + <%= button_to "https://github.com/OWASP/railsgoat/wiki", { + method: "get", + class: "btn btn-sm btn-outline-primary", + onclick: "window.open('https://github.com/OWASP/railsgoat/wiki', '_blank'); return false;" + } do %> + Tutorials + <% end %> + + +
+ +
    +
  • + <%= link_to user_account_settings_path(user_id: current_user.id), class: "dropdown-item" do %> + Account Settings + <% end %> +
    • +
    • +
  • + <%= link_to logout_path, class: "dropdown-item text-danger" do %> + Logout + <% end %> +
    • +
+
+
+
-
    -
  • - - Welcome, <%= current_user.first_name.html_safe %> -
    • -
-
    -
  • - <%= button_to "Visit Tutorial", nil, - { - :class => "btn", - :method => "get", - :onclick => "window.open('https://github.com/OWASP/railsgoat/wiki', '_blank')" - } %> -
    • -
-
-<% else %> - -
-
    -
  • - <%= button_to "Signup", signup_path, {:class => "btn btn-primary", :method => "get"} %> -
    • -
-
    -
  • - <%= button_to "login", login_path, {:class => "btn", :method => "get"} %> -
    • -
-
    -
  • - <%= button_to "Tutorial Credentials", "#myModalLabel1", {:id => "show_creds_btn", :class => "btn btn-danger", :method => "get"} %> -
    • -
-
    -
  • - <%= button_to "Visit Tutorial", nil, - { - :class => "btn", - :method => "get", - :onclick => "window.open('https://github.com/OWASP/railsgoat/wiki', '_blank')" - } %> -
    • -
+
-