Skip to content

Commit

Permalink
Update and refactor default public view, close diaspora#3811
Browse files Browse the repository at this point in the history
  • Loading branch information
@Flaburgan
Flaburgan committed Jan 7, 2013
1 parent 26139fc commit 3c84f2e
Show file tree
Hide file tree
Showing 2 changed files with 159 additions and 169 deletions.
1 change: 1 addition & 0 deletions Changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* 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.
* 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
Expand Down
327 changes: 158 additions & 169 deletions public/default.html
View file
Original file line number Diff line number Diff line change
@@ -1,169 +1,158 @@
<head>
<style type="text/css">
body {
margin-top: 50px;
background-color: white;
background-image : none;
}

#header {
-webkit-box-shadow:none;
-moz-box-shadow:none;
box-shadow:none;
border:none;
background:none;
}

#steps {
text-align: center;
}

hr {
border: none;
border-bottom: 1px solid #ccc;
}

#banner {
border-bottom : 1px solid #ccc;
border-top : 1px solid #eee;
padding : 30px;
margin : 20px 0;

-webkit-box-shadow : 0 9px 15px -10px rgba(0,0,0,0.7);
}

#links {
margin: 0;
padding: 0;
text-align: center;
}

#links .section {
margin: 0;
padding: 0;
display: inline-block;
vertical-align: top;
width: 24%;
max-width: 24%;
}

#login-link {
float: right;
}

#change-page {
color: #999;
text-align: center;
font-style: italic;
}

footer .container {
margin-top: 15px;
}

.helpful {
cursor: help;
}

li {
list-style: none;
}

</style>
</head>

<body>
<div id="page" class="container">
<div id="content">
<div class="row">
<div id="header" style="left: 0; padding: 15px 0;">
<a id="login-link" href="login" class="btn" style="margin-right: 15px;">Log In</a>
<img src='assets/branding/logo_caps.png'/ style="margin-left: 15px;">
</div>
</div>

<div id="getting-started">
<div class="row" style="text-align: center;">
<div id="banner">
<h1>Welcome, friend.</h1>

<h3>You're about to change the Internet. Let's get you set up, shall we?</h3>
</div>
</div>
<br>
<br>

<div id="steps" class="row">
<div class="span4">
<h2>Configure your <abbr class="helpful" title="A Diaspora installation">pod</abbr></h2>
<img src='assets/icons/cog.png'/>

<p>Look at <code class="helpful"
title='General pod configuration (location to upload photos, SSL certs, etc.)'>config/application.yml.example</code>
and <code class="helpful" title="mySQL username/password">config/database.yml.example</code> for
help.</p>
</div>

<div class="span4">

<h2>Try it out</h2>
<img src='assets/icons/smiley_laughing.png'/>

<p>Start by <a href="users/sign_up">creating an account</a>.</p>
</div>

<div class="span4">
<h2>Make a contribution!</h2>
<img src='assets/icons/pen_write.png'/>

<p>Make Diaspora even better! Fork the project on <a href="http://github.com/diaspora/diaspora/"
title="github">github</a>, make some changes,
and submit a pull request.</p>
</div>
</div>
</div>
</div>

<br>
<br>

<hr>

<br>


<h3 style="text-align:center;">Useful Resources</h3>
<br/>
<ul id="links">
<ul class="section">
<li><strong><a href="http://github.com/diaspora/diaspora/" title="Git repository">Codebase</a></strong></li>
<li><strong><a href="http://github.com/diaspora/diaspora/wiki"
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 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-dev" title="#diaspora-dev">IRC - Development</a>
</li>
</ul>
<ul class="section">
<li><a href="http://groups.google.com/group/diaspora-discuss" title="General discussion mailing list">Discussion
- General</a></li>
<li><a href="http://groups.google.com/group/diaspora-dev" title="Dev mailing list">Discussion -
Development</a></li>
</ul>
<ul class="section">
<li><a href="http://guides.rubyonrails.org/">Learn more about Ruby On Rails!</a></li>
</ul>
</ul>

<br>
<br>

<hr style="border-color:#ddd;">

<div id="change-page">
This page can be changed to a custom landing page by creating <code>app/views/home/_show.html.haml</code>
</div>
</div>
<style type="text/css">
body {
margin-top: 50px;
background-color: white;
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 {
/* Hack to hide the header */
-webkit-box-shadow:none;
-moz-box-shadow:none;
box-shadow:none;
border:none;
background:none;

left: 0px;
padding: 15px 0px;
}

#header img {
margin-left: 15px;
}

#login-link {
float: right;
margin-right: 15px;
}

#steps {
text-align: center;
}

#banner {
border-bottom : 1px solid #ccc;
border-top : 1px solid #eee;
padding : 30px;
margin-top: 20px;
text-align: center;

-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 {
margin: 0;
padding: 0;
text-align: center;
}

#links .section {
margin: 0;
padding: 0;
display: inline-block;
vertical-align: top;
width: 24%;
max-width: 24%;
}

#change-page {
color: #999;
text-align: center;
font-style: italic;
}

.helpful {
cursor: help;
}

.row {
margin-bottom: 60px;
}
</style>

<div id="page" class="container">
<header id="header">
<a id="login-link" href="login" class="btn">Log In</a>
<img src="assets/branding/logo_caps.png" />
</header>

<div id="banner" class="row">
<h1>Welcome, friend.</h1>
<h3>You're about to change the Internet. Let's get you set up, shall we?</h3>
</div>

<div id="steps" class="row">
<div class="span4">
<h2>Configure your <abbr class="helpful" title="A Diaspora installation">pod</abbr></h2>
<img src="assets/icons/cog.png" />

<p>Look at
<code class="helpful" title='General pod configuration (location to upload photos, SSL certs, etc.)'>
config/diaspora.yml.example</code> and <code class="helpful" title="mySQL username/password">
config/database.yml.example</code> for help.</p>
</div>

<div class="span4">
<h2>Try it out</h2>
<img src="assets/icons/smiley_laughing.png" />

<p>Start by <a href="users/sign_up">creating an account</a>.</p>
</div>

<div class="span4">
<h2>Make a contribution!</h2>
<img src="assets/icons/pen_write.png" />

<p>Make Diaspora even better! Fork the project on
<a href="http://github.com/diaspora/diaspora/" title="github">github</a>,
make some changes, and submit a pull request.</p>
</div>
</div>

<footer>
<h3>Useful Resources</h3>
<ul id="links">
<ul class="section">
<li><a href="http://github.com/diaspora/diaspora/" title="Git repository">Codebase</a></li>
<li><a href="http://github.com/diaspora/diaspora/wiki" title="Wiki on github">Documentation</a></li>
</ul>
<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-dev" title="#diaspora-dev">IRC - Development</a></li>
</ul>
<ul class="section">
<li><a href="http://groups.google.com/group/diaspora-discuss" title="General discussion mailing list">Discussion - General</a></li>
<li><a href="http://groups.google.com/group/diaspora-dev" title="Dev mailing list">Discussion - Development</a></li>
</ul>
<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>
</ul>
</ul>
</footer>

<div id="change-page">
This page can be changed to a custom landing page by creating <code>app/views/home/_show.html.haml</code>
</div>
</div>

0 comments on commit 3c84f2e

Please sign in to comment.