[refs #325] Add new design to error pages

This commit is contained in:
konstantin.grabar 2012-03-22 11:16:56 +04:00
parent ee867aa8d4
commit 21c33b384b
16 changed files with 2860 additions and 2326 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 63 KiB

BIN
app/assets/images/500.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

BIN
app/assets/images/503.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

File diff suppressed because it is too large Load Diff

View File

@ -17,8 +17,8 @@ ActiveRecord::Schema.define(:version => 20120321130436) do
t.integer "user_id", :null => false
t.string "kind"
t.text "data"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "arches", :force => true do |t|
@ -286,26 +286,23 @@ ActiveRecord::Schema.define(:version => 20120321130436) do
t.text "description"
t.string "ancestry"
t.boolean "has_issues", :default => true
t.boolean "has_wiki", :default => false
t.string "srpm_file_name"
t.string "srpm_content_type"
t.integer "srpm_file_size"
t.datetime "srpm_updated_at"
t.boolean "has_wiki", :default => false
t.string "default_branch", :default => "master"
t.boolean "is_rpm", :default => true
end
add_index "projects", ["category_id"], :name => "index_projects_on_category_id"
add_index "projects", ["owner_id"], :name => "index_projects_on_name_and_owner_id_and_owner_type", :unique => true, :case_sensitive => false
create_table "register_requests", :force => true do |t|
t.string "name"
t.string "email"
t.string "token"
t.boolean "approved", :default => false
t.boolean "rejected", :default => false
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.string "interest"
t.text "more"
end
@ -370,16 +367,19 @@ ActiveRecord::Schema.define(:version => 20120321130436) do
t.string "name"
t.string "email", :default => "", :null => false
t.string "encrypted_password", :limit => 128, :default => "", :null => false
t.string "password_salt", :default => "", :null => false
t.string "reset_password_token"
t.datetime "remember_created_at"
t.datetime "created_at"
t.datetime "updated_at"
t.text "ssh_key"
t.string "uname"
t.string "role"
t.string "language", :default => "en"
t.datetime "reset_password_sent_at"
t.string "confirmation_token"
t.datetime "confirmed_at"
t.datetime "confirmation_sent_at"
t.integer "own_projects_count", :default => 0, :null => false
t.datetime "reset_password_sent_at"
t.text "professional_experience"
t.string "site"
t.string "company"
@ -393,6 +393,7 @@ ActiveRecord::Schema.define(:version => 20120321130436) do
t.datetime "locked_at"
end
add_index "users", ["confirmation_token"], :name => "index_users_on_confirmation_token", :unique => true
add_index "users", ["email"], :name => "index_users_on_email", :unique => true
add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
add_index "users", ["uname"], :name => "index_users_on_uname", :unique => true

View File

@ -17,9 +17,12 @@
<div class="middle">
<!--Main menu-->
<menu>
<div class="logo">
<a href="#"><img src="pics/logo-mini.png" alt="Главная" /></a>
</div>
<ul>
<li>
<a href="#" class="first">Главная</a>
<a href="#">Главная</a>
</li>
<li>
<a href="#">Проекты</a>
@ -37,9 +40,6 @@
<a href="#">Документация</a>
</li>
</ul>
<div class="logo">
<img src="pics/logo-mini.png" alt="logo" />
</div>
</menu>
<div class="information">
<!--Search-->

138
doc/design/abf-500.html Normal file
View File

@ -0,0 +1,138 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Сборочная среда</title>
<script type="text/javascript" src="js/html5shiv.js"></script>
<link rel="stylesheet" type="text/css" href="styles/main.css" />
<script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="js/all.js"></script>
</head>
<body>
<div class="wrap">
<!--Top block-->
<header>
<div class="left">
</div>
<div class="middle">
<!--Main menu-->
<menu>
<div class="logo">
<a href="#"><img src="pics/logo-mini.png" alt="Главная" /></a>
</div>
<ul>
<li>
<a href="#">Главная</a>
</li>
<li>
<a href="#">Проекты</a>
</li>
<li>
<a href="#">Группы</a>
</li>
<li>
<a href="#">Мониторинг</a>
</li>
<li>
<a href="#">Платформа</a>
</li>
<li>
<a href="#">Документация</a>
</li>
</ul>
</menu>
<div class="information">
<!--Search-->
<div class="search">
<div class="pic">
</div>
<div class="field">
<input type="text" value="Поиск" class="gray" onClick="if(this.value=='Поиск'){this.value='';this.className='black';}" onblur="if(this.value==''){this.value='Поиск';this.className='gray';}" />
</div>
</div>
<div class="user">
<div class="avatar" onclick="droplist();">
<img src="pics/ava.png" alt="avatar" height="30" />
</div>
<div class="profile" onclick="droplist();">
<a href="#" onclick="droplist();">mikimaus <img src="pics/expand-white.png" alt="ex" /></a>
</div>
</div>
<div class="both">
</div>
<div class="droplist-wrap">
<div class="droplist" id="droplist">
<div class="a"><a href="#">Публичный профиль</a></div>
<div class="a"><a href="#">Настройки</a></div>
<div class="a"><a href="#">Выйти</a></div>
</div>
</div>
</div>
</div>
<div class="right">
</div>
<div class="both">
</div>
</header>
<div class="both">
</div>
<!--Page-->
<article>
<!--Single page content-->
<div class="all error500">
<h1>Ошибка <span>500</span></h1>
<h2>Что-то пошло не так.<br />
Мы были уведомлены об этом<br />
и скоро посмотрим что случилось.</h2>
<p class="pages">
Попробуйте открыть другие страницы.
</p>
<p class="search">
Или воспользуйтесь поиском.
</p>
<div class="both"></div>
</div>
<div class="both">
</div>
</article>
</div>
<!--Footer-->
<footer>
<ul>
<li>
ROSA Лаб. © 2012 <img src="pics/square.png" alt="_" />
</li>
<li>
<img src="pics/flag.png" alt="rosa" /> <img src="pics/square.png" alt="_" />
</li>
<li>
<a href="#">О компании</a> <img src="pics/square.png" alt="_" />
</li>
<li>
<a href="#">Контакты</a> <img src="pics/square.png" alt="_" />
</li>
<li>
<a href="#">Условия использования</a> <img src="pics/square.png" alt="_" />
</li>
<li>
<a href="#">Конфиденциальность</a> <img src="pics/square.png" alt="_" />
</li>
<li>
<a href="#">Безопасность</a>
</li>
</ul>
</footer>
</body>
</html>

62
doc/design/abf-503.html Normal file
View File

@ -0,0 +1,62 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Сборочная среда</title>
<script type="text/javascript" src="js/html5shiv.js"></script>
<link rel="stylesheet" type="text/css" href="styles/main.css" />
<script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="js/all.js"></script>
</head>
<body>
<div class="wrap tmargin30">
<!--Page-->
<article>
<!--Single page content-->
<div class="all error503">
<h1>Ведутся <span>работы</span></h1>
<h2>Мы обновляем сайт, это займет еще некоторое время.<br />
Нажмите <span>F5</span>, если это не помогло, значит,<br />
нужно еще чуточку подождать.<br />
<br />
Мы правда пытаемся сделать это быстро и<br />
приносим свои извинения за возможные неудобства.</h2>
<div class="both"></div>
</div>
<div class="both">
</div>
</article>
</div>
<!--Footer-->
<footer>
<ul>
<li>
ROSA Лаб. © 2012 <img src="pics/square.png" alt="_" />
</li>
<li>
<img src="pics/flag.png" alt="rosa" /> <img src="pics/square.png" alt="_" />
</li>
<li>
<a href="#">О компании</a> <img src="pics/square.png" alt="_" />
</li>
<li>
<a href="#">Контакты</a> <img src="pics/square.png" alt="_" />
</li>
<li>
<a href="#">Условия использования</a> <img src="pics/square.png" alt="_" />
</li>
<li>
<a href="#">Конфиденциальность</a> <img src="pics/square.png" alt="_" />
</li>
<li>
<a href="#">Безопасность</a>
</li>
</ul>
</footer>
</body>
</html>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 63 KiB

BIN
doc/design/pics/500.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

BIN
doc/design/pics/503.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

View File

@ -2,7 +2,7 @@ html, body {
margin: 0;
padding: 0;
font-family: Tahoma, Geneva, Helvetica, sans-serif;
color: #292929;
color: #565657;
background: #1f60a1 url("../pics/bg.png") repeat-x;
min-width: 940px;
min-height: 600px;
@ -86,7 +86,7 @@ header menu {
header menu ul {
list-style: none;
margin: 0;
padding-top: 10px;
padding: 10px 0px 0px 0px;
}
header menu ul li {
@ -98,7 +98,7 @@ header menu ul li a {
color: #FFF;
text-decoration: none;
height: 43px;
padding: 15px 10px 15px 10px;
padding: 15px 15px 15px 15px;
}
header menu ul li a:hover {
@ -106,7 +106,7 @@ header menu ul li a:hover {
}
header menu ul li a.first {
padding-left: 45px;
}
header menu ul li a.active {
@ -117,10 +117,9 @@ header menu ul li a.active {
header div.logo {
float: left;
margin-top: 5px;
padding-left: 0px;
padding-right: 0px;
margin-top: -25px;
padding-left: 10px;
position: absolute;
}
/* Right part of top menu */
@ -235,7 +234,7 @@ header div.droplist a{
position: relative;
padding-left: 15px;
font-size: 12px;
color: #447cae;
color: #7eb7ed;
text-decoration: none;
padding-right: 15px;
margin-top: 10px;
@ -277,7 +276,7 @@ header div.droplist a:hover{
}
.sub-menu nav {
.sub-menu nav { /*<2A><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
float: left;
margin: 0px 0px 0px 0px;
}
@ -287,7 +286,7 @@ header div.droplist a:hover{
text-align: left;
padding: 0;
margin: 0;
padding-top: 4px;
padding-top: 5px;
}
.sub-menu nav ul li {
@ -296,14 +295,14 @@ header div.droplist a:hover{
.sub-menu nav ul li a {
font-size: 12px;
color: #292929;
color: #575756;
text-decoration: none;
height: 34px;
padding: 0px 20px 9px 20px;
padding: 0px 20px 8px 20px;
}
.sub-menu nav ul li a.active {
background: url("../pics/submenu-hover.png") repeat-x scroll 0 100% transparent;
background: url("../pics/submenu-hover.png") repeat-x;
}
.sub-menu nav ul li a:hover {
@ -573,7 +572,7 @@ article input[type="submit"]:disabled {
article h3{
font-size: 14px;
color: #292929;
color: #575756;
margin-bottom: 0;
padding-bottom: 2px;
}
@ -584,7 +583,7 @@ article h3.fix {
}
article a{
color: #447cae;
color: #7eb7ed;
font-size: 12px;
text-decoration: none;
padding: 0px 0px;
@ -811,7 +810,7 @@ article div.activity div.fulltext.view {
}
.admin-preferences ul li a{
color: #292929;
color: #575756;
text-decoration: none;
padding-top: 5px;
padding-bottom: 5px;
@ -828,7 +827,7 @@ article div.activity div.fulltext.view {
float: left;
width: 400px;
font-size: 12px;
color: #292929;
color: #575756;
margin: 0px 0px 10px 0px;
}
@ -1346,7 +1345,7 @@ h3.bmargin10 {
padding: 5px;
font-family: Tahoma, Geneva, Helvetica, sans-serif;
font-size: 12px;
color: #292929;
color: #575756;
margin: 10px 0px;
}
@ -1397,7 +1396,7 @@ h3.bmargin10 {
div.desription-top {
background: #dcecfa;
font-size: 12px;
color: #292929;
color: #575756;
border: 1px solid #a9c6dd;
height: 38px;
width: 100%;
@ -1418,7 +1417,7 @@ div.desription-top input.name {
border: 1px solid #d1deeb;
height: 21px;
width: auto;
color: #292929;
color: #575756;
font-size: 11px;
width: 415px;
padding: 2px 5px 3px;
@ -1450,7 +1449,7 @@ div.desription-top div.fork {
}
.all div.description h3{
color: #292929;
color: #575756;
font-weight: 700;
font-size: 14px;
margin-bottom: 5px;
@ -1461,7 +1460,7 @@ div.desription-top div.fork {
font-size: 12px;
padding: 0;
margin: 0;
color: #292929;
color: #575756;
}
.all div.last-commit {
@ -1508,7 +1507,7 @@ table.tablesorter.project div.pic {
}
a.files-see {
color: #292929;
color: #565657;
text-decoration: underline;
}
@ -1635,7 +1634,7 @@ div.blue-switcher {
width: 258px;
border: 1px solid #a0a0a1;
border-radius: 3px;
background-color: #292929;
background-color: #575756;
color: #FFF;
-webkit-box-shadow: inset 0px 2px 5px 0px rgba(0, 0, 0, 0.3);
-moz-box-shadow: inset 0px 2px 5px 0px rgba(0, 0, 0, 0.3);
@ -1800,7 +1799,7 @@ div.labeltext.edit div.delete {
div.labeltext a {
text-decoration: none;
color: #292929;
color: #565657;
}
div.labeltext.edit a {

View File

@ -1,22 +1,98 @@
<!doctype html>
<title>not found</title>
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Сборочная среда</title>
<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.17/themes/base/jquery-ui.css" media="screen, projection" rel="stylesheet" type="text/css">
<link href="/assets/application.css" media="screen" rel="stylesheet" type="text/css">
<script src="/assets/application.js" type="text/javascript"></script>
</head>
<body>
<div class="wrap">
<!--Top block-->
<header>
<div class="left">
</div>
<div class="middle">
<!--Main menu-->
<menu>
<div class="logo">
<a href="#"><img src="pics/logo-mini.png" alt="Главная"></a>
</div>
<ul>
<li>
<a href="/">Main</a>
</li>
<li>
<a href="/projects">Projects</a>
</li>
<li>
<a href="/groups">Groups</a>
</li>
<li>
<a href="/build_lists">Monitoring</a>
</li>
<li>
<a href="/platforms">Platforms</a>
</li>
</ul>
</menu>
</div>
<div class="right">
</div>
<div class="both">
</div>
</header>
<style>
body { text-align: center;}
h1 { font-size: 50px; }
body { font: 20px Constantia, 'Hoefler Text', "Adobe Caslon Pro", Baskerville, Georgia, Times, serif; color: #999; text-shadow: 2px 2px 2px rgba(200, 200, 200, 0.5); }
::-moz-selection{ background:#FF5E99; color:#fff; }
::selection { background:#FF5E99; color:#fff; }
details { display:block; }
a { color: rgb(36, 109, 56); text-decoration:none; }
a:hover { color: rgb(96, 73, 141) ; text-shadow: 2px 2px 2px rgba(36, 109, 56, 0.5); }
span[frown] { transform: rotate(90deg); display:inline-block; color: #bbb; }
</style>
<div class="both">
</div>
<!--Page-->
<article>
<!--Single page content-->
<div class="all error404">
<h1>Error <span>404</span></h1>
<h2>Page not found</h2>
<p class="pages">
Try to open other pages.
</p>
<p class="search">
Or use the search.
</p>
<div class="both"></div>
</div>
<div class="both">
</div>
</article>
</div>
<!--Footer-->
<footer>
<ul>
<li>
ROSA Lab. © 2012 <img src="pics/square.png" alt="_">
</li>
<li>
<img src="pics/flag.png" alt="rosa"> <img src="pics/square.png" alt="_">
</li>
<li>
<a href="#">About company</a> <img src="pics/square.png" alt="_">
</li>
<li>
<a href="#">Contacts</a> <img src="pics/square.png" alt="_">
</li>
<li>
<a href="#">Terms of use</a> <img src="pics/square.png" alt="_">
</li>
<li>
<a href="#">Confidentiality</a> <img src="pics/square.png" alt="_">
</li>
<li>
<a href="#">Security</a>
</li>
</ul>
</footer>
<details>
<summary><h1>Not found</h1></summary>
<p><span frown>:(</span></p>
</details>
</body></html>

View File

@ -1,26 +1,100 @@
<!DOCTYPE html>
<html>
<head>
<title>We're sorry, but something went wrong (500)</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>
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Сборочная среда</title>
<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.17/themes/base/jquery-ui.css" media="screen, projection" rel="stylesheet" type="text/css">
<link href="/assets/application.css" media="screen" rel="stylesheet" type="text/css">
<script src="/assets/application.js" type="text/javascript"></script>
</head>
<body>
<!-- This file lives in public/500.html -->
<div class="dialog">
<h1>We're sorry, but something went wrong.</h1>
<p>We've been notified about this issue and we'll take a look at it shortly.</p>
<div class="wrap">
<!--Top block-->
<header>
<div class="left">
</div>
<div class="middle">
<!--Main menu-->
<menu>
<div class="logo">
<a href="#"><img src="pics/logo-mini.png" alt="Главная"></a>
</div>
<ul>
<li>
<a href="/">Main</a>
</li>
<li>
<a href="/projects">Projects</a>
</li>
<li>
<a href="/groups">Groups</a>
</li>
<li>
<a href="/build_lists">Monitoring</a>
</li>
<li>
<a href="/platforms">Platforms</a>
</li>
</ul>
</menu>
</div>
<div class="right">
</div>
<div class="both">
</div>
</header>
<div class="both">
</div>
<!--Page-->
<article>
<!--Single page content-->
<div class="all error500">
<h1>Error <span>500</span></h1>
<h2>Something went wrong.<br>
We've been notified about this issue<br>
and we'll take a look at it shortly.</h2>
<p class="pages">
Try to open other pages.
</p>
<p class="search">
Or use the search.
</p>
<div class="both"></div>
</div>
<div class="both">
</div>
</article>
</div>
</body>
</html>
<!--Footer-->
<footer>
<ul>
<li>
ROSA Lab. © 2012 <img src="pics/square.png" alt="_">
</li>
<li>
<img src="pics/flag.png" alt="rosa"> <img src="pics/square.png" alt="_">
</li>
<li>
<a href="#">About company</a> <img src="pics/square.png" alt="_">
</li>
<li>
<a href="#">Contacts</a> <img src="pics/square.png" alt="_">
</li>
<li>
<a href="#">Terms of use</a> <img src="pics/square.png" alt="_">
</li>
<li>
<a href="#">Confidentiality</a> <img src="pics/square.png" alt="_">
</li>
<li>
<a href="#">Security</a>
</li>
</ul>
</footer>
</body></html>

59
public/503.html Normal file
View File

@ -0,0 +1,59 @@
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Сборочная среда</title>
<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.17/themes/base/jquery-ui.css" media="screen, projection" rel="stylesheet" type="text/css">
<link href="/assets/application.css" media="screen" rel="stylesheet" type="text/css">
<script src="/assets/application.js" type="text/javascript"></script>
</head>
<body>
<div class="wrap tmargin30">
<!--Page-->
<article>
<!--Single page content-->
<div class="all error503">
<h1>Work <span>is underway</span></h1>
<h2>We update the site, it will take some time.<br>
Press <span>F5</span>, if this does not help, it means,<br>
need to wait a little bit more.<br>
<br>
We are really trying to do it fast.<br>
We apologize for any inconvenience.</h2>
<div class="both"></div>
</div>
<div class="both">
</div>
</article>
</div>
<!--Footer-->
<footer>
<ul>
<li>
ROSA Lab. © 2012 <img src="/assets/square.png" alt="_">
</li>
<li>
<img src="assets/flag.png" alt="rosa"> <img src="/assets/square.png" alt="_">
</li>
<li>
<a href="#">About company</a> <img src="/assets/square.png" alt="_">
</li>
<li>
<a href="#">Contacts</a> <img src="/assets/square.png" alt="_">
</li>
<li>
<a href="#">Terms of use</a> <img src="/assets/square.png" alt="_">
</li>
<li>
<a href="#">Confidentiality</a> <img src="/assets/square.png" alt="_">
</li>
<li>
<a href="#">Security</a>
</li>
</ul>
</footer>
</body></html>

BIN
public/pics/logo-mini.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB