Updated branding to diaspora* (text and logo)

Plus minor corrections and fixes.
mike-lang · Aug 13, 2013 · 7cd2668 · 7cd2668
1 parent 5c51a09
commit 7cd2668
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 106 deletions.
diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss
@@ -24,7 +24,6 @@
     header nav a {
       color: #ddd;
       font-size: 14px;
-      text-transform: uppercase;
       text-decoration: none;
       padding: 5px 8px; }
       header nav a:hover {
@@ -43,6 +42,10 @@
 
 #mainnav.pull-right {
   margin-top: 12px;
+
+  ul.nav {
+  	text-transform: lowercase; 
+  }
 
   a.btn {
     margin-top: 2px;

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -17,7 +17,7 @@
       <div class="navbar-inner">
         <div class="container-fluid">
           <%= link_to root_path, class: 'brand' do %>
-            <%= image_tag 'logo.png', alt: t('title'), title: t('title'), id: 'header-logo' %>
+            <%= image_tag 'logo.png', alt: t('title'), title: t('title'), id: 'header-logo', height: '65', width: '228' %>
           <% end %>
 
           <div id="mainnav" class="pull-right">
@@ -26,10 +26,11 @@
               <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><a href="http://wiki.diasporafoundation.org">Wiki</a></li>
+              <!-- <li><%= link_to t('pages.tutorials.menu_title'), tutorials_url %></li> -->
               <!-- <li><a href="http://planet.diasporafoundation.org">Planet</a></li> -->
             </ul>
-            <%= link_to "Host yourself", about_path(anchor: "host"), class: 'btn' %>
-            <%= link_to "Join Diaspora*", root_path(anchor: "get_started"), class: 'btn' %>
+            <%= link_to t('buttons.host_pod'), about_path(anchor: "host"), class: 'btn primary' %> 
+            <%= link_to t('buttons.join_diaspora'), root_path(anchor: "get_started"), class: 'btn success' %>
           </div>
         </div>
       </div>

diff --git a/app/views/pages/get_involved.html.erb b/app/views/pages/get_involved.html.erb
@@ -50,8 +50,7 @@
         </li>
         <li>
           <a href="http://wiki.diasporafoundation.org/Installation_guides">
-            <%= t 'pages.get_involved.code_ex2' %>
-          </a>.
+            <%= t 'pages.get_involved.code_ex2' %></a>.
         </li>
         <li><%= t 'pages.get_involved.code_ex3' %></li>
       </ol>
@@ -67,8 +66,7 @@
             </a>
             <%= t 'pages.get_involved.code_ex7' %>
             <a href="http://webchat.freenode.net/?channels=diaspora-dev">
-              <%= t 'pages.get_involved.code_ex8' %>
-            </a>.
+              <%= t 'pages.get_involved.code_ex8' %></a>.
           </p>
         </div>
         <div class="span6">
@@ -93,8 +91,7 @@
         <li>
           <%= t 'pages.get_involved.bugs_ex2' %>
           <a href="http://www.codetriage.com/diaspora/diaspora">
-            <%= t 'pages.get_involved.bugs_ex3' %>
-          </a>.
+            <%= t 'pages.get_involved.bugs_ex3' %></a>.
         </li>
       </ul>
     </div>
@@ -108,8 +105,7 @@
         <li>
           <%= t 'pages.get_involved.translate_ex1' %>
           <a href="https://webtranslateit.com/en/projects/3020-Diaspora">
-            <%= t 'pages.get_involved.translate_ex2' %>
-          </a>.
+            <%= t 'pages.get_involved.translate_ex2' %></a>.
         </li>
         <li>
           <%= t 'pages.get_involved.translate_ex3' %>
@@ -130,8 +126,7 @@
         <li>
           <%= t 'pages.get_involved.voice_ex1' %>
           <a href="https://www.loomio.org/groups/194" target="_blank">
-            <%= t 'pages.get_involved.voice_ex2' %>
-          </a>.
+            <%= t 'pages.get_involved.voice_ex2' %></a>.
         </li>
         <li>
           <%= t 'pages.get_involved.voice_ex3' %>
@@ -152,14 +147,12 @@
         <li>
           <%= t 'pages.get_involved.support_ex1' %>
           <a href="https://docs.google.com/a/joindiaspora.com/spreadsheet/viewform?formkey=dG5RUHpMdlNidzRXN2twcXFRMDR0ZEE6MQ" target="_blank">
-            <%= t 'pages.get_involved.support_ex2' %>
-          </a>
+            <%= t 'pages.get_involved.support_ex2' %></a>.
         </li>
         <li>
           <%= t 'pages.get_involved.support_ex3' %>
           <a href="http://diasporial.com/tutorials/" target="_blank">
-            <%= t 'pages.get_involved.support_ex4' %>
-          </a>
+            <%= t 'pages.get_involved.support_ex4' %></a>.
         </li>
         <li>
           <%= t 'pages.get_involved.support_ex5' %>
@@ -171,8 +164,7 @@
         <li>
           <%= t 'pages.get_involved.support_ex8' %>
           <a href="http://wiki.diasporafoundation.org/" target="_blank">
-            <%= t 'pages.get_involved.support_ex9' %>
-          </a>.
+            <%= t 'pages.get_involved.support_ex9' %></a>.
         </li>
       </ul>
     </div>
@@ -186,8 +178,7 @@
         <li>
           <%= t 'pages.get_involved.run_ex1' %>
           <a href="http://wiki.diasporafoundation.org/Installation_guides" target="_blank">
-            <%= t 'pages.get_involved.run_ex2' %>
-          </a>.
+            <%= t 'pages.get_involved.run_ex2' %></a>.
         </li>
         <li><%= t 'pages.get_involved.run_ex3' %></li>
         <li>
@@ -228,7 +219,7 @@
               </h4>
               <div class="content">
                 <p>
-                  Daniel is responsible for Diaspora*'s good looks and
+                  Daniel is responsible for diaspora*'s good looks and
                   product cohesiveness. His pants are tight and his v-necks are deep.
                 </p>
               </div>
@@ -275,7 +266,7 @@
               </h4>
               <div class="content">
                 <p>
-                  Raphael is the young-wise soul of Diaspora*. He currently is headed
+                  Raphael is the young-wise soul of diaspora*. He currently is headed
                   back to NYU, but he can still be seen trolling our list servs and IRC room.
                 </p>
               </div>
@@ -473,7 +464,7 @@
               </h4>
               <div class="content">
                 <p>
-                  Vittorio is Italian, and he started coding for Diaspora*
+                  Vittorio is Italian, and he started coding for diaspora*
                   with his GSoC project about implementing XMPP IM and videochat.
                   He is writing his thesis about it, while fixing some bugs.
                 </p>
@@ -572,10 +563,10 @@
               </h4>
               <div class="content">
                 <p>
-                  Sean is Diaspora*'s community manager. An aspiring web developer
+                  Sean is diaspora*'s community manager. An aspiring web developer
                   and independent tech journalist based in Illinois, he likes writing
-                  about Diaspora*, making usability designs, and interacting with the
-                  Diaspora* developer community.
+                  about diaspora*, making usability designs, and interacting with the
+                  diaspora* developer community.
                 </p>
               </div>
             </div>
@@ -714,7 +705,7 @@
                   The <a href="http://diaspune.net/">Diaspune</a>
                   guy, Debian guru, free software advocate and contributor, Chamba
                   Open Movie Project coordinator, Swathanthra Malayalam Computing
-                  admin. Runs Diaspora*'s Debian packaging team.
+                  admin. Runs diaspora*'s Debian packaging team.
                   <a href="http://j4v4m4n.in">j4v4m4n.in</a>.
                 </p>
               </div>
@@ -819,7 +810,7 @@
               <div class="content">
                 <p>
                   Just another Italian girl, studying social psychology and loving
-                  computers, open-source and Diaspora*. Loves her town, living
+                  computers, open-source and diaspora*. Loves her town, living
                   abroad and speaking French.
                 </p>
               </div>

diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
@@ -3,7 +3,7 @@
 <div id="masthead", class="hero">
   <div class="container">
     <h1><%= t 'pages.home.headline' %></h1>
-    <h2><%= t 'pages.home.welcome_paragraph' %></h2>
+    <h2><%= t 'pages.home.byline' %></h2>
   </div>
 </div>
 
@@ -71,6 +71,11 @@
         <%= t 'pages.home.choose_pod_exp' %>
         <a href="http://podupti.me/">Pod Uptime</a>.
       </p>
+      <p class="find_out_more">
+        <a href="https://wiki.diasporafoundation.org/Choosing_a_pod" target="_blank" class="btn primary">
+          <%= t 'pages.home.find_more' %>
+        </a>
+      </p>
     </div>
     <div class="span-one-third">
       <h2><%= t 'pages.home.sign_up' %></h2>
@@ -80,7 +85,7 @@
         <%= t 'pages.home.sign_up_ex2' %>
       </p>
       <p class="find_out_more">
-        <a href="http://podupti.me/" class="btn primary" data-backdrop="true" data-controls-modal="my-modal">
+        <a href="http://podupti.me/" target="_blank" class="btn success">
           <%= t 'pages.home.register' %>
         </a>
       </p>
@@ -92,6 +97,11 @@
       <p>
         <%= t 'pages.home.join_convo_ex' %>
       </p>
+<!--      <p class="find_out_more">
+        <a href="/getting-started-1.html" class="btn primary">
+          <%= t 'pages.home.find_more' %>
+        </a>
+      </p> --!>
     </div>
   </div>
 

diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
@@ -8,45 +8,45 @@ en:
       send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
     failure:
       already_authenticated: "You are already signed in."
-      inactive: "Your account was not activated yet."
+      inactive: "Your account has not yet been activated."
       invalid: "Invalid email or password."
       invalid_token: "Invalid authentication token."
       locked: "Your account is locked."
       not_found_in_database: "Invalid email or password."
-      timeout: "Your session expired, please sign in again to continue."
+      timeout: "Your session has expired; please sign in again to continue."
       unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your account before continuing."
+      unconfirmed: "You need to confirm your account before continuing."
     mailer:
       confirmation_instructions:
         subject: "Confirmation instructions"
       reset_password_instructions:
         subject: "Reset password instructions"
       unlock_instructions:
-        subject: "Unlock Instructions"
+        subject: "Unlock instructions"
     omniauth_callbacks:
       failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
       success: "Successfully authenticated from %{kind} account."
     passwords:
-      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
-      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
-      updated: "Your password was changed successfully. You are now signed in."
-      updated_not_active: "Your password was changed successfully."
+      no_token: "You can only access this page by clicking the link provided in a password reset email. If you have copied the link from a password reset email, please make sure you copied the entire URL provided."
+      send_instructions: "You will receive an email in a few minutes with instructions about how to reset your password."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link in your inbox in a few minutes."
+      updated: "Your password has successfully been changed. You are now signed in."
+      updated_not_active: "Your password has successfully been changed."
     registrations:
-      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
+      destroyed: "Bye! Your account has successfully been deleted. We hope to see you again soon."
       signed_up: "Welcome! You have signed up successfully."
-      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
-      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_inactive: "You have successfully signed up. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have successfully signed up. However, we could not sign you in because your account is locked."
       signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
-      updated: "You updated your account successfully."
+      update_needs_confirmation: "You have successfully updated your account, but we need to verify your new email address. Please check your inbox and click on the confirm link to finalise confirmation of your new email address."
+      updated: "You have successfully updated your account."
     sessions:
       signed_in: "Signed in successfully."
       signed_out: "Signed out successfully."
     unlocks:
-      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
-      send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
-      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+      send_instructions: "You will receive an email in a few minutes containing instructions about how to unlock your account."
+      send_paranoid_instructions: "If your account exists, you will receive an email in a few minutes containing instructions about how to unlock it."
+      unlocked: "Your account has successfully been unlocked. Please sign in to continue."
   errors:
     messages:
       already_confirmed: "was already confirmed, please try signing in"