nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3813 from Flaburgan/feature/3811-update-and-refactor-default-public-view

Browse source 
Feature/3811 update and refactor default public view
This commit is contained in:
Jonne Haß 2013-01-07 10:31:16 -08:00
commit c6f92198ba
2 changed files with 159 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -11,6 +11,7 @@
* Made loading of the configuration environment independent of Rails. * Made loading of the configuration environment independent of Rails.
* Do not generate paths like `/a/b/c/config/boot.rb/../../Gemfile` to require and open things, create a proper path instead. * Do not generate paths like `/a/b/c/config/boot.rb/../../Gemfile` to require and open things, create a proper path instead.
* Remove the hack for loading the entire lib folder with a proper solution. [#3809](https://github.com/diaspora/diaspora/issues/3750) * Remove the hack for loading the entire lib folder with a proper solution. [#3809](https://github.com/diaspora/diaspora/issues/3750)
* Update and refactor the default public view `public/default.html` [#3811](https://github.com/diaspora/diaspora/issues/3811)
## Features ## Features

135
public/default.html
View file

@ -1,4 +1,3 @@
<head>
<style type="text/css"> <style type="text/css">
body { body {
margin-top: 50px; margin-top: 50px;
@ -6,30 +5,60 @@
background-image : none; background-image : none;
} }
li {
list-style: none;
}
footer h3 {
margin-bottom: 25px;
text-align: center;
}
footer {
margin-bottom: 12px;
padding: 42px;
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
#header { #header {
/* Hack to hide the header */
-webkit-box-shadow:none; -webkit-box-shadow:none;
-moz-box-shadow:none; -moz-box-shadow:none;
box-shadow:none; box-shadow:none;
border:none; border:none;
background:none; background:none;
left: 0px;
padding: 15px 0px;
}
#header img {
margin-left: 15px;
}
#login-link {
float: right;
margin-right: 15px;
} }
#steps { #steps {
text-align: center; text-align: center;
} }
hr {
border: none;
border-bottom: 1px solid #ccc;
}
#banner { #banner {
border-bottom : 1px solid #ccc; border-bottom : 1px solid #ccc;
border-top : 1px solid #eee; border-top : 1px solid #eee;
padding : 30px; padding : 30px;
margin : 20px 0; margin-top: 20px;
text-align: center;
-webkit-box-shadow : 0 9px 15px -10px rgba(0,0,0,0.7); -webkit-box-shadow : 0 9px 15px -10px rgba(0,0,0,0.7);
-moz-box-shadow : 0 9px 15px -10px rgba(0,0,0,0.7);
-khtml-box-shadow : 0 9px 15px -10px rgba(0,0,0,0.7);
-o-box-shadow : 0 9px 15px -10px rgba(0,0,0,0.7);
-ms-box-shadow : 0 9px 15px -10px rgba(0,0,0,0.7);
box-shadow : 0 9px 15px -10px rgba(0,0,0,0.7);
} }
#links { #links {
@ -47,121 +76,81 @@
max-width: 24%; max-width: 24%;
} }
#login-link {
float: right;
}
#change-page { #change-page {
color: #999; color: #999;
text-align: center; text-align: center;
font-style: italic; font-style: italic;
} }
footer .container {
margin-top: 15px;
}
.helpful { .helpful {
cursor: help; cursor: help;
} }
li { .row {
list-style: none; margin-bottom: 60px;
} }
</style> </style>
</head>
<body>
<div id="page" class="container"> <div id="page" class="container">
<div id="content"> <header id="header">
<div class="row"> <a id="login-link" href="login" class="btn">Log In</a>
<div id="header" style="left: 0; padding: 15px 0;"> <img src="assets/branding/logo_caps.png" />
<a id="login-link" href="login" class="btn" style="margin-right: 15px;">Log In</a> </header>
<img src='assets/branding/logo_caps.png'/ style="margin-left: 15px;">
</div>
</div>
<div id="getting-started"> <div id="banner" class="row">
<div class="row" style="text-align: center;">
<div id="banner">
<h1>Welcome, friend.</h1> <h1>Welcome, friend.</h1>
<h3>You're about to change the Internet. Let's get you set up, shall we?</h3> <h3>You're about to change the Internet. Let's get you set up, shall we?</h3>
</div> </div>
</div>
<br>
<br>
<div id="steps" class="row"> <div id="steps" class="row">
<div class="span4"> <div class="span4">
<h2>Configure your <abbr class="helpful" title="A Diaspora installation">pod</abbr></h2> <h2>Configure your <abbr class="helpful" title="A Diaspora installation">pod</abbr></h2>
<img src='assets/icons/cog.png'/> <img src="assets/icons/cog.png" />
<p>Look at <code class="helpful" <p>Look at
title='General pod configuration (location to upload photos, SSL certs, etc.)'>config/application.yml.example</code> <code class="helpful" title='General pod configuration (location to upload photos, SSL certs, etc.)'>
and <code class="helpful" title="mySQL username/password">config/database.yml.example</code> for config/diaspora.yml.example</code> and <code class="helpful" title="mySQL username/password">
help.</p> config/database.yml.example</code> for help.</p>
</div> </div>
<div class="span4"> <div class="span4">
<h2>Try it out</h2> <h2>Try it out</h2>
<img src='assets/icons/smiley_laughing.png'/> <img src="assets/icons/smiley_laughing.png" />
<p>Start by <a href="users/sign_up">creating an account</a>.</p> <p>Start by <a href="users/sign_up">creating an account</a>.</p>
</div> </div>
<div class="span4"> <div class="span4">
<h2>Make a contribution!</h2> <h2>Make a contribution!</h2>
<img src='assets/icons/pen_write.png'/> <img src="assets/icons/pen_write.png" />
<p>Make Diaspora even better! Fork the project on <a href="http://github.com/diaspora/diaspora/" <p>Make Diaspora even better! Fork the project on
title="github">github</a>, make some changes, <a href="http://github.com/diaspora/diaspora/" title="github">github</a>,
and submit a pull request.</p> make some changes, and submit a pull request.</p>
</div>
</div>
</div> </div>
</div> </div>
<br> <footer>
<br> <h3>Useful Resources</h3>
<hr>
<br>
<h3 style="text-align:center;">Useful Resources</h3>
<br/>
<ul id="links"> <ul id="links">
<ul class="section"> <ul class="section">
<li><strong><a href="http://github.com/diaspora/diaspora/" title="Git repository">Codebase</a></strong></li> <li><a href="http://github.com/diaspora/diaspora/" title="Git repository">Codebase</a></li>
<li><strong><a href="http://github.com/diaspora/diaspora/wiki" <li><a href="http://github.com/diaspora/diaspora/wiki" title="Wiki on github">Documentation</a></li>
title="Wiki on github">Documentation</a></strong></li>
<br>
<li><a href="https://github.com/diaspora/diaspora/issues" title="Bug tracker">Find & Report bugs</a></li>
</ul> </ul>
<ul class="section"> <ul class="section">
<li><a href="http://webchat.freenode.net/?channels=diaspora" title="#diaspora">IRC - General</a></li> <li><a href="http://webchat.freenode.net/?channels=diaspora" title="#diaspora">IRC - General</a></li>
<li><a href="http://webchat.freenode.net/?channels=diaspora-dev" title="#diaspora-dev">IRC - Development</a> <li><a href="http://webchat.freenode.net/?channels=diaspora-dev" title="#diaspora-dev">IRC - Development</a></li>
</li>
</ul> </ul>
<ul class="section"> <ul class="section">
<li><a href="http://groups.google.com/group/diaspora-discuss" title="General discussion mailing list">Discussion <li><a href="http://groups.google.com/group/diaspora-discuss" title="General discussion mailing list">Discussion - General</a></li>
- General</a></li> <li><a href="http://groups.google.com/group/diaspora-dev" title="Dev mailing list">Discussion - Development</a></li>
<li><a href="http://groups.google.com/group/diaspora-dev" title="Dev mailing list">Discussion -
Development</a></li>
</ul> </ul>
<ul class="section"> <ul class="section">
<li><a href="https://github.com/diaspora/diaspora/issues" title="Bug tracker">Find & Report bugs</a></li>
<li><a href="http://guides.rubyonrails.org/">Learn more about Ruby On Rails!</a></li> <li><a href="http://guides.rubyonrails.org/">Learn more about Ruby On Rails!</a></li>
</ul> </ul>
</ul> </ul>
</footer>
<br>
<br>
<hr style="border-color:#ddd;">
<div id="change-page"> <div id="change-page">
This page can be changed to a custom landing page by creating <code>app/views/home/_show.html.haml</code> This page can be changed to a custom landing page by creating <code>app/views/home/_show.html.haml</code>