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