ref: refs/heads/master
commit 4c776f5fdc3c6899c874d19338a7da043a35638c
Author: Klaus Kämpf
Date: Wed Jul 15 15:13:53 2009 +0200
Make filename more expressive, add comment
---
webclient/app/controllers/hosts_controller.rb | 3 +-
webclient/public/migrate.html | 30 -------------------------
webclient/public/migration_missing.html | 30 +++++++++++++++++++++++++
3 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/webclient/app/controllers/hosts_controller.rb b/webclient/app/controllers/hosts_controller.rb
index 75dfa2c..b410e5c 100644
--- a/webclient/app/controllers/hosts_controller.rb
+++ b/webclient/app/controllers/hosts_controller.rb
@@ -9,7 +9,8 @@ class HostsController < ApplicationController
@hosts = Host.find(:all)
rescue Exception => e
logger.error e.to_s
- redirect_to "/migrate"
+ # show nice error screen and remind to "rake db:migrate"
+ redirect_to "/migration_missing"
end
end
diff --git a/webclient/public/migrate.html b/webclient/public/migrate.html
deleted file mode 100644
index d428f6c..0000000
--- a/webclient/public/migrate.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Webclient setup is incomplete</title>
- <style type="text/css">
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
- div.dialog {
- width: 25em;
- padding: 0 4em;
- margin: 4em auto 0 auto;
- border: 1px solid #ccc;
- border-right-color: #999;
- border-bottom-color: #999;
- }
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
- </style>
-</head>
-
-<body>
- <!-- This file lives in public/migrate.html -->
- <div class="dialog">
- <h1>Webclient setup is incomplete</h1>
- <p>Please ask the admin to run <tt><b>rake db:migrate</b></tt> first.</p>
- </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/webclient/public/migration_missing.html b/webclient/public/migration_missing.html
new file mode 100644
index 0000000..d428f6c
--- /dev/null
+++ b/webclient/public/migration_missing.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+ <title>Webclient setup is incomplete</title>
+ <style type="text/css">
+ body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+ div.dialog {
+ width: 25em;
+ padding: 0 4em;
+ margin: 4em auto 0 auto;
+ border: 1px solid #ccc;
+ border-right-color: #999;
+ border-bottom-color: #999;
+ }
+ h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+ </style>
+</head>
+
+<body>
+ <!-- This file lives in public/migrate.html -->
+ <div class="dialog">
+ <h1>Webclient setup is incomplete</h1>
+ <p>Please ask the admin to run <tt><b>rake db:migrate</b></tt> first.</p>
+ </div>
+</body>
+</html>
\ No newline at end of file
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
