Skip to content

Commit

Permalink
New earth image plus minor fixes to main pages
Browse files Browse the repository at this point in the history
  • Loading branch information
goobertron committed Aug 23, 2013
1 parent d31530b commit a2c5930
Show file tree
Hide file tree
Showing 6 changed files with 464 additions and 62 deletions.
Binary file modified app/assets/images/earthD2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@

<div id="mainnav" class="pull-right">
<ul class="nav">
<li><%= link_to t('pages.about.menu_title'), about_url %></li>
<!-- <li><%= link_to t('pages.about.menu_title'), about_url %></li> -->
<li><%= link_to t('pages.get_involved.menu_title'), get_involved_url %></li>
<!-- <li><%= link_to t('pages.blog.menu_title'), blog_index_url(subdomain: 'blog') %></li> -->
<li><%= link_to t('.wiki'), 'https://wiki.diasporafoundation.org' %></li>
<li><%= link_to t('pages.tutorials.menu_title'), tutorials_url %></li>
<!-- <li><%= link_to t('.planet'), 'http://planet.diasporafoundation.org' %></li> -->
</ul>
<%= link_to t('buttons.host_pod'), about_path(anchor: "host"), class: 'btn primary' %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/pages/about.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<hr />

<div class="row top_spacing">
<div class="row minor_top_spacing">
<div class="span8">
<h2><%= t '.this' %></h2>
</div>
Expand Down Expand Up @@ -61,7 +61,7 @@
<p><%= t '.connect_ex' %></p>
</div>

<div class="row minor_top_spacing">
<div class="row">
<div class="span2">
<%= image_tag "search.png", alt: t('.search_alt') %>
</div>
Expand Down Expand Up @@ -196,7 +196,7 @@
</h1>
</div>

<div class="row">
<div class="row minor_top_spacing">
<div class="span7">
<%= image_tag "network-distributed.png", alt: t('.distributed_network'), size: "400x161" %>
</div>
Expand Down
4 changes: 1 addition & 3 deletions app/views/pages/get_involved.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,12 @@
</div>
</div>

<hr />

<div class="row" id="bugs">
<div class="span4"><%= image_tag "tick.png", alt: t('.globe_alt') %></div>
<div class="span12">
<h4><%= t '.bugs_header' %></h4>
<ul>
<li><%= t '.bugs_ex1' %></li>
<li><%= t('.bugs_ex1', github_link: link_to(t('.github_link_text'), "https://github.com/diaspora/diaspora/issues")).html_safe %></li>
<li>
<%= t '.bugs_ex2' %>
<a href="http://www.codetriage.com/diaspora/diaspora">
Expand Down
16 changes: 7 additions & 9 deletions app/views/pages/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="row top_spacing">
<h1><%= t '.key_philosophies' %></h1>
</div>
<div class="row">
<div class="row minor_top_spacing">
<div class="span-one-third">
<%= image_tag "decentralized-stamp.png", alt: t('.decentralized_alt') %>
</div>
Expand All @@ -30,7 +30,7 @@
<%= image_tag "keyhole-stamp.png", alt: t('.keyhole_alt') %>
</div>
</div>
<div class="row">
<div class="row minor_top_spacing">
<div class="span-one-third">
<h2><%= t '.decentralization' %></h2>
<p><%= t '.decentralization_about' %></p>
Expand Down Expand Up @@ -68,7 +68,7 @@
<div class="span-one-third">
<h2><%= t '.choose_pod' %></h2>
<p>
<%= t('.choose_pod_exp', poduptime: link_to('Pod Uptime', 'http://podupti.me')).html_safe %>
<%= t '.choose_pod_exp' %>
</p>
<p class="find_out_more">
<a href="https://wiki.diasporafoundation.org/Choosing_a_pod" class="btn primary">
Expand All @@ -92,18 +92,16 @@
<%= t '.join_convo' %>
</h2>
<p>
<%= t '.join_convo_ex' %>
<%= t('.join_convo_ex').html_safe %>
</p>
<!-- <p class="find_out_more">
<a href="/getting-started-1.html" class="btn primary">
<p class="find_out_more">
<a href="/getting_started/sign_up" class="btn primary">
<%= t 'buttons.find_more' %>
</a>
</p> --!>
</p>
</div>
</div>

<hr />

<div class="row top_spacing">
<div class="span-one-third">
<%= image_tag "aspects.png", alt: t('.aspects_alt') %>
Expand Down
Loading

0 comments on commit a2c5930

Please sign in to comment.