From 0a5efaeefc6c7e5f48b4a6204dc267d26db3d6c5 Mon Sep 17 00:00:00 2001 From: Manager Bot Date: Sun, 6 Nov 2022 15:40:37 +0000 Subject: [PATCH] Status window refactor. --- Web/templates/admin/blogs.html.ep | 23 +----- Web/templates/admin/domains.html.ep | 29 +------- Web/templates/admin/index.html.ep | 23 +----- Web/templates/admin/people.html.ep | 23 +----- Web/templates/admin/servers.html.ep | 29 +------- Web/templates/admin/settings.html.ep | 23 +----- Web/templates/auth/forgot.html.ep | 36 +++------- Web/templates/auth/login.html.ep | 41 +++++------ Web/templates/auth/register.html.ep | 70 ++++++++----------- Web/templates/auth/reset.html.ep | 49 +++++-------- Web/templates/blog/create.html.ep | 17 +---- Web/templates/blog/settings.html.ep | 17 +---- Web/templates/dashboard/blog.html.ep | 23 +----- Web/templates/dashboard/blog_builds.html.ep | 23 +----- Web/templates/dashboard/blog_config.html.ep | 24 +------ Web/templates/dashboard/blog_history.html.ep | 24 +------ Web/templates/dashboard/blog_media.html.ep | 29 +------- Web/templates/dashboard/blog_page.html.ep | 2 + .../dashboard/blog_page_edit.html.ep | 2 + Web/templates/dashboard/blog_pages.html.ep | 23 +----- Web/templates/dashboard/blog_post.html.ep | 2 + .../dashboard/blog_post_alter.html.ep | 2 + .../dashboard/blog_post_edit.html.ep | 2 + Web/templates/dashboard/blog_posts.html.ep | 23 +----- Web/templates/dashboard/blog_settings.html.ep | 24 +------ .../user_settings/change_password.html.ep | 62 ++++++---------- Web/templates/user_settings/profile.html.ep | 57 ++++++--------- 27 files changed, 143 insertions(+), 559 deletions(-) diff --git a/Web/templates/admin/blogs.html.ep b/Web/templates/admin/blogs.html.ep index e19070b..f968fa4 100644 --- a/Web/templates/admin/blogs.html.ep +++ b/Web/templates/admin/blogs.html.ep @@ -2,28 +2,7 @@ %= include 'admin/_nav', page => 'blogs' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window'; % if ( $blogs ) { diff --git a/Web/templates/admin/domains.html.ep b/Web/templates/admin/domains.html.ep index acc3656..fbc38a0 100644 --- a/Web/templates/admin/domains.html.ep +++ b/Web/templates/admin/domains.html.ep @@ -2,34 +2,7 @@ %= include 'admin/_nav', page => 'domains' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( my $confirmation = flash 'error_message' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window';
diff --git a/Web/templates/admin/index.html.ep b/Web/templates/admin/index.html.ep index 0621188..64f4d77 100644 --- a/Web/templates/admin/index.html.ep +++ b/Web/templates/admin/index.html.ep @@ -2,26 +2,5 @@ %= include 'admin/_nav', page => 'info' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window'; diff --git a/Web/templates/admin/people.html.ep b/Web/templates/admin/people.html.ep index 4e4135d..f16f76b 100644 --- a/Web/templates/admin/people.html.ep +++ b/Web/templates/admin/people.html.ep @@ -2,28 +2,7 @@ %= include 'admin/_nav', page => 'people' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window'; % if ( $people ) {
diff --git a/Web/templates/admin/servers.html.ep b/Web/templates/admin/servers.html.ep index 830b775..ea04244 100644 --- a/Web/templates/admin/servers.html.ep +++ b/Web/templates/admin/servers.html.ep @@ -2,34 +2,7 @@ %= include 'admin/_nav', page => 'servers' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( my $confirmation = flash 'error_message' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window';
diff --git a/Web/templates/admin/settings.html.ep b/Web/templates/admin/settings.html.ep index b82d056..3c02ed5 100644 --- a/Web/templates/admin/settings.html.ep +++ b/Web/templates/admin/settings.html.ep @@ -2,26 +2,5 @@ %= include 'admin/_nav', page => 'settings' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window'; diff --git a/Web/templates/auth/forgot.html.ep b/Web/templates/auth/forgot.html.ep index d6adac9..ab18767 100644 --- a/Web/templates/auth/forgot.html.ep +++ b/Web/templates/auth/forgot.html.ep @@ -1,35 +1,19 @@ % layout 'standard', title => 'Forgot Password', sb_active => 'forgot'; -

Reset Password

If you have forgotten the password for your account, please enter the email address below and you will get a link to reset your password.

-% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window'; - + - <%= include '_base/form/input', type => 'email', name => 'email', - title => 'Email Address', - help => '', - value => $c->stash->{form_email} - %> - - - + <%= include '_base/form/input', type => 'email', name => 'email', + title => 'Email Address', + help => '', + value => $c->stash->{form_email} + %> + + + diff --git a/Web/templates/auth/login.html.ep b/Web/templates/auth/login.html.ep index a6dd7b8..c30083b 100644 --- a/Web/templates/auth/login.html.ep +++ b/Web/templates/auth/login.html.ep @@ -2,31 +2,22 @@

Login

-% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window'; -
+ - <%= include '_base/form/input', type => 'email', name => 'email', - title => 'Email Address', - help => '', - value => $c->stash->{form_email} - %> - - <%= include '_base/form/input', type => 'password', name => 'password', - title => 'Password', - help => '', - value => $c->stash->{form_password} - %> - - - + <%= include '_base/form/input', type => 'email', name => 'email', + title => 'Email Address', + help => '', + value => $c->stash->{form_email} + %> + + <%= include '_base/form/input', type => 'password', name => 'password', + title => 'Password', + help => '', + value => $c->stash->{form_password} + %> + + + diff --git a/Web/templates/auth/register.html.ep b/Web/templates/auth/register.html.ep index f0e7104..a26a897 100644 --- a/Web/templates/auth/register.html.ep +++ b/Web/templates/auth/register.html.ep @@ -1,45 +1,35 @@ % layout 'standard', title => 'Register', sb_active => 'register'; -

Create an account

-% if ( $c->stash->{errors} ) { - -% } - -
- - <%= include '_base/form/input', type => 'text', name => 'name', - title => 'Your name', - help => '', - value => $c->stash->{form_name} - %> - - <%= include '_base/form/input', type => 'email', name => 'email', - title => 'Email Address', - help => '', - value => $c->stash->{form_email} - %> - - <%= include '_base/form/input', type => 'password', name => 'password', - title => 'Password', - help => '', - value => $c->stash->{form_password} - %> - - <%= include '_base/form/input', type => 'password', name => 'password_confirm', - title => 'Confirm Password', - help => '', - value => $c->stash->{form_password_confirm} - %> - - - +%= include '_base/status_window'; + +
+ + <%= include '_base/form/input', type => 'text', name => 'name', + title => 'Your name', + help => '', + value => $c->stash->{form_name} + %> + + <%= include '_base/form/input', type => 'email', name => 'email', + title => 'Email Address', + help => '', + value => $c->stash->{form_email} + %> + + <%= include '_base/form/input', type => 'password', name => 'password', + title => 'Password', + help => '', + value => $c->stash->{form_password} + %> + + <%= include '_base/form/input', type => 'password', name => 'password_confirm', + title => 'Confirm Password', + help => '', + value => $c->stash->{form_password_confirm} + %> + + + diff --git a/Web/templates/auth/reset.html.ep b/Web/templates/auth/reset.html.ep index 3de88a3..ecc1e44 100644 --- a/Web/templates/auth/reset.html.ep +++ b/Web/templates/auth/reset.html.ep @@ -2,37 +2,22 @@

Reset Password

-% if ( $c->stash->{success} ) { - -% } +%= include '_base/status_window'; -% if ( $c->stash->{errors} ) { - -% } +
+ + <%= include '_base/form/input', type => 'password', name => 'password', + title => 'Enter your new password', + help => '', + value => $c->stash->{form_password} + %> + + <%= include '_base/form/input', type => 'password', name => 'password_confirm', + title => 'Confirm your new password', + help => '', + value => $c->stash->{form_password_confirm} + %> + - - - <%= include '_base/form/input', type => 'password', name => 'password', - title => 'Enter your new password', - help => '', - value => $c->stash->{form_password} - %> - - <%= include '_base/form/input', type => 'password', name => 'password_confirm', - title => 'Confirm your new password', - help => '', - value => $c->stash->{form_password_confirm} - %> - - - - + + diff --git a/Web/templates/blog/create.html.ep b/Web/templates/blog/create.html.ep index d58f703..827223a 100644 --- a/Web/templates/blog/create.html.ep +++ b/Web/templates/blog/create.html.ep @@ -19,22 +19,7 @@

If you have your own domain, you can also use that. Be sure to set your DNS records to match *.<%= $c->config->{customer_domain} %>.

-% if ( $c->stash->{success} ) { -

-% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window';
diff --git a/Web/templates/blog/settings.html.ep b/Web/templates/blog/settings.html.ep index 5b1b47a..58eba1f 100644 --- a/Web/templates/blog/settings.html.ep +++ b/Web/templates/blog/settings.html.ep @@ -17,22 +17,7 @@

Let's name and describe this!

-% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window';
diff --git a/Web/templates/dashboard/blog.html.ep b/Web/templates/dashboard/blog.html.ep index 75375cf..0cca83c 100644 --- a/Web/templates/dashboard/blog.html.ep +++ b/Web/templates/dashboard/blog.html.ep @@ -2,28 +2,7 @@ %= include 'dashboard/_blog_nav', page => 'info' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window';
diff --git a/Web/templates/dashboard/blog_builds.html.ep b/Web/templates/dashboard/blog_builds.html.ep index 8502db5..5f103c6 100644 --- a/Web/templates/dashboard/blog_builds.html.ep +++ b/Web/templates/dashboard/blog_builds.html.ep @@ -6,28 +6,7 @@ %= include 'dashboard/_blog_nav', page => 'builds' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window'; %# Job Rejection Panel % if ( $c->param('reject_job') ) { diff --git a/Web/templates/dashboard/blog_config.html.ep b/Web/templates/dashboard/blog_config.html.ep index 38a3d6f..a817e05 100644 --- a/Web/templates/dashboard/blog_config.html.ep +++ b/Web/templates/dashboard/blog_config.html.ep @@ -2,29 +2,7 @@ %= include 'dashboard/_blog_nav', page => 'settings' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } - +%= include '_base/status_window';
diff --git a/Web/templates/dashboard/blog_history.html.ep b/Web/templates/dashboard/blog_history.html.ep index 5be18b8..6334ed2 100644 --- a/Web/templates/dashboard/blog_history.html.ep +++ b/Web/templates/dashboard/blog_history.html.ep @@ -2,29 +2,7 @@ %= include 'dashboard/_blog_nav', page => 'history' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } - +%= include '_base/status_window'; % if ( $history ) {
diff --git a/Web/templates/dashboard/blog_media.html.ep b/Web/templates/dashboard/blog_media.html.ep index 8aa4d91..71410fa 100644 --- a/Web/templates/dashboard/blog_media.html.ep +++ b/Web/templates/dashboard/blog_media.html.ep @@ -2,34 +2,7 @@ %= include 'dashboard/_blog_nav', page => 'media' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( my $error_message = flash 'error_message' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window';
diff --git a/Web/templates/dashboard/blog_page.html.ep b/Web/templates/dashboard/blog_page.html.ep index a06be09..371b990 100644 --- a/Web/templates/dashboard/blog_page.html.ep +++ b/Web/templates/dashboard/blog_page.html.ep @@ -2,6 +2,8 @@ %= include 'dashboard/_blog_nav', page => 'page-create' +%= include '_base/status_window'; +

Create a new page!

diff --git a/Web/templates/dashboard/blog_page_edit.html.ep b/Web/templates/dashboard/blog_page_edit.html.ep index 70db987..a219386 100644 --- a/Web/templates/dashboard/blog_page_edit.html.ep +++ b/Web/templates/dashboard/blog_page_edit.html.ep @@ -2,6 +2,8 @@ %= include 'dashboard/_blog_nav', page => 'page-edit' +%= include '_base/status_window'; +

Editing <%= $blog_page->rel_path %>

diff --git a/Web/templates/dashboard/blog_pages.html.ep b/Web/templates/dashboard/blog_pages.html.ep index 524a477..2d17013 100644 --- a/Web/templates/dashboard/blog_pages.html.ep +++ b/Web/templates/dashboard/blog_pages.html.ep @@ -2,28 +2,7 @@ %= include 'dashboard/_blog_nav', page => 'pages' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window';
diff --git a/Web/templates/dashboard/blog_post.html.ep b/Web/templates/dashboard/blog_post.html.ep index ab93339..229792b 100644 --- a/Web/templates/dashboard/blog_post.html.ep +++ b/Web/templates/dashboard/blog_post.html.ep @@ -2,6 +2,8 @@ %= include 'dashboard/_blog_nav', page => 'create' +%= include '_base/status_window'; +
diff --git a/Web/templates/dashboard/blog_post_alter.html.ep b/Web/templates/dashboard/blog_post_alter.html.ep index 0263984..9d9df8e 100644 --- a/Web/templates/dashboard/blog_post_alter.html.ep +++ b/Web/templates/dashboard/blog_post_alter.html.ep @@ -2,6 +2,8 @@ %= include 'dashboard/_blog_nav', page => 'edit' +%= include '_base/status_window'; +

Editing <%= $post->headers->{title} %>

diff --git a/Web/templates/dashboard/blog_post_edit.html.ep b/Web/templates/dashboard/blog_post_edit.html.ep index 1468e3a..ffe7a5b 100644 --- a/Web/templates/dashboard/blog_post_edit.html.ep +++ b/Web/templates/dashboard/blog_post_edit.html.ep @@ -2,6 +2,8 @@ %= include 'dashboard/_blog_nav', page => 'edit' +%= include '_base/status_window'; + diff --git a/Web/templates/dashboard/blog_posts.html.ep b/Web/templates/dashboard/blog_posts.html.ep index 855f519..7ca3ab5 100644 --- a/Web/templates/dashboard/blog_posts.html.ep +++ b/Web/templates/dashboard/blog_posts.html.ep @@ -2,28 +2,7 @@ %= include 'dashboard/_blog_nav', page => 'posts' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } +%= include '_base/status_window';
diff --git a/Web/templates/dashboard/blog_settings.html.ep b/Web/templates/dashboard/blog_settings.html.ep index ff205e6..ae808f4 100644 --- a/Web/templates/dashboard/blog_settings.html.ep +++ b/Web/templates/dashboard/blog_settings.html.ep @@ -2,29 +2,7 @@ %= include 'dashboard/_blog_nav', page => 'settings' -% if ( my $confirmation = flash 'confirmation' ) { - -% } - -% if ( $c->stash->{success} ) { - -% } - -% if ( $c->stash->{errors} ) { - -% } - +%= include '_base/status_window';
diff --git a/Web/templates/user_settings/change_password.html.ep b/Web/templates/user_settings/change_password.html.ep index 8736b35..0c5302a 100644 --- a/Web/templates/user_settings/change_password.html.ep +++ b/Web/templates/user_settings/change_password.html.ep @@ -2,44 +2,28 @@

Change your password

-% if ( $c->stash->{success} ) { - -% } +%= include '_base/status_window'; -% if ( $c->stash->{errors} ) { - -% } + + + <%= include '_base/form/input', type => 'password', name => 'password', + title => 'Your current password', + help => '', + value => $c->stash->{form_password} + %> + + <%= include '_base/form/input', type => 'password', name => 'new_password', + title => 'Your new password', + help => '', + value => $c->stash->{form_new_password} + %> + + <%= include '_base/form/input', type => 'password', name => 'password_confirm', + title => 'Confirm your new password', + help => '', + value => $c->stash->{form_password_confirm} + %> + - - - - <%= include '_base/form/input', type => 'password', name => 'password', - title => 'Your current password', - help => '', - value => $c->stash->{form_password} - %> - - <%= include '_base/form/input', type => 'password', name => 'new_password', - title => 'Your new password', - help => '', - value => $c->stash->{form_new_password} - %> - - <%= include '_base/form/input', type => 'password', name => 'password_confirm', - title => 'Confirm your new password', - help => '', - value => $c->stash->{form_password_confirm} - %> - - - - + + diff --git a/Web/templates/user_settings/profile.html.ep b/Web/templates/user_settings/profile.html.ep index 319d57f..ae2893a 100644 --- a/Web/templates/user_settings/profile.html.ep +++ b/Web/templates/user_settings/profile.html.ep @@ -2,42 +2,27 @@

Change your name or email

-% if ( $c->stash->{success} ) { - -% } +%= include '_base/status_window'; -% if ( $c->stash->{errors} ) { - -% } +
- + <%= include '_base/form/input', type => 'text', name => 'name', + title => 'Your name', + help => '', + value => $c->stash->{form_name}, + %> - <%= include '_base/form/input', type => 'text', name => 'name', - title => 'Your name', - help => '', - value => $c->stash->{form_name}, - %> - - <%= include '_base/form/input', type => 'email', name => 'email', - title => 'Email Address', - help => '', - value => $c->stash->{form_email}, - %> - - <%= include '_base/form/input', type => 'password', name => 'password', - title => 'Your password (required for these changes)', - help => '', - value => $c->stash->{form_password} - %> - - - + <%= include '_base/form/input', type => 'email', name => 'email', + title => 'Email Address', + help => '', + value => $c->stash->{form_email}, + %> + + <%= include '_base/form/input', type => 'password', name => 'password', + title => 'Your password (required for these changes)', + help => '', + value => $c->stash->{form_password} + %> + + +