You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by cu...@apache.org on 2019/05/29 16:36:33 UTC
[whimsy] branch master updated (779886b -> 5ad008b)
This is an automated email from the ASF dual-hosted git repository.
curcuru pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from 779886b Factor out survey_root, improve displays
new 6c02bf5 Allow pass-thru of style
new 5ad008b Improved error page base
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lib/whimsy/asf/themes.rb | 5 +++--
www/404.cgi | 33 +++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 2 deletions(-)
create mode 100755 www/404.cgi
[whimsy] 01/02: Allow pass-thru of style
Posted by cu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
curcuru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 6c02bf5fbe5289eb49adda1f9b6fb39d3ce4ca79
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Wed May 29 12:36:09 2019 -0400
Allow pass-thru of style
---
lib/whimsy/asf/themes.rb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/whimsy/asf/themes.rb b/lib/whimsy/asf/themes.rb
index c3aef09..04cf36c 100644
--- a/lib/whimsy/asf/themes.rb
+++ b/lib/whimsy/asf/themes.rb
@@ -128,7 +128,8 @@ class Wunderbar::HtmlMarkup
relatedtitle: 'Related Whimsy Links',
related: nil,
helpblock: nil,
- breadcrumbs: nil
+ breadcrumbs: nil,
+ style: 'panel-info'
)
_whimsy_nav
_div.content.container_fluid do
@@ -140,7 +141,7 @@ class Wunderbar::HtmlMarkup
if helpblock or related
_div.row do
_div.col_md_8 do
- _whimsy_panel subtitle, style: "panel-info" do
+ _whimsy_panel subtitle, style: style do
if helpblock
helpblock.call
else
[whimsy] 02/02: Improved error page base
Posted by cu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
curcuru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 5ad008b38a76142520b372ab128744dec63014da
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Wed May 29 12:36:25 2019 -0400
Improved error page base
---
www/404.cgi | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/www/404.cgi b/www/404.cgi
new file mode 100755
index 0000000..17152eb
--- /dev/null
+++ b/www/404.cgi
@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+PAGETITLE = "404 - Not Found Error - Apache Whimsy"
+$LOAD_PATH.unshift '/srv/whimsy/lib'
+require 'wunderbar'
+require 'wunderbar/bootstrap'
+require 'whimsy/asf'
+
+_html do
+ _body? do
+ _whimsy_body(
+ title: PAGETITLE,
+ subtitle: "URL #{ENV['REDIRECT_URL']} Not Found",
+ style: 'panel-danger',
+ related: {
+ "/" => "Whimsy Server Homepage",
+ "/committers/tools" => "Whimsy All Tools Listing",
+ "https://github.com/apache/whimsy/blob/master/www#{ENV['SCRIPT_NAME']}" => "See This Source Code",
+ "mailto:dev@whimsical.apache.org?subject=[SITE] 404 Error Page #{ENV['REDIRECT_URL']}" => "Questions? Email Whimsy PMC"
+ },
+ helpblock: -> {
+ _p do
+ _span.label.label_danger '404'
+ _ " Whatever you're looking for at "
+ _code ENV['REDIRECT_URL']
+ _ " is not there. We'll double-check our crystal balls, but you should probably try another "
+ _a 'magic link.', href: '/'
+ end
+ }
+ ) do
+ # No-op
+ end
+ end
+end