From 7519fcc255f13f716ac5fe533522bcf548f9a9ee Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Fri, 24 Jan 2014 01:44:56 +0100
Subject: [PATCH] Remove unused cubbies code

---
 app/assets/images/icons/cubbies.png         | Bin 3299 -> 0 bytes
 app/assets/stylesheets/application.css.sass |  11 ---------
 config/locales/diaspora/en.yml              |  26 --------------------
 config/routes.rb                            |   4 ---
 4 files changed, 41 deletions(-)
 delete mode 100644 app/assets/images/icons/cubbies.png

diff --git a/app/assets/images/icons/cubbies.png b/app/assets/images/icons/cubbies.png
deleted file mode 100644
index 6111997c731bcc8bff747a5d26508f972e279d03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3299
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

diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 17cf713b0..9568f2edb 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -1068,17 +1068,6 @@ h1.tag
   :font
     :style italic
 
-.cubbies_steps
-  li
-    :margin
-      :bottom 12px
-    :vertical-align top
-
-.cubbies-settings-image
-  @include box-shadow(3px, 3px, 15px, #333)
-  :margin
-    :bottom 5px
-
 .button.sign_up
   @include linear-gradient(#D9FFA9,#B9E68A)
   :text-shadow none
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 0df1e38a9..5d14b8b0b 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -253,10 +253,6 @@ en:
         any_problem: "Any Problem?"
         contact_podmin: "Contact the administrator of your pod!"
         mail_podmin: "Podmin E-Mail"
-      cubbies:
-        heading: "Connect to Cubbi.es"
-        explanation: "Cubbi.es is the first Diaspora application under development."
-        learn_more: "Learn more"
       diaspora_id:
         heading: "Diaspora ID"
         content_1: "Your Diaspora ID is:"
@@ -1123,28 +1119,6 @@ en:
       success: "Alas! You aren't following #%{name} anymore."
       failure: "Failed to stop following #%{name}. Maybe you already stopped following it?"
 
-  tokens:
-    show:
-      connect_to_cubbies: "Connect to Cubbi.es"
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      love_to_try: "We'd love for you to try it out."
-      sign_up_today: "Sign up today!"
-      screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
-      typical_userpage: "A typical cubbi.es userpage"
-      daniels_account: "Daniel's Diaspora account"
-      making_the_connection: "Making the Connection"
-      connecting_is_simple: "Connecting your Diaspora account is simple!  Just enter your Diaspora ID (<b>%{diaspora_id}</b>) from your cubbies <a href='%{href_link}'>settings page</a> and hit connect."
-      via: "(via %{link})"
-
-  authorizations:
-    index:
-      revoke_access: "Revoke Access"
-      no_applications: "You haven't registered any applications yet."
-    new:
-      cubbies_will: "Cubbies will be able to post photos on your behalf"
-      authorize: "Authorize"
-      nope: "No"
-
   streams:
     community_spotlight_stream: "Community Spotlight"
     aspects_stream: "Aspects"
diff --git a/config/routes.rb b/config/routes.rb
index 70e376620..a40fd9131 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -87,10 +87,6 @@ Diaspora::Application.routes.draw do
 
   resources :apps, :only => [:show]
 
-  #Cubbies info page
-
-  resource :token, :only => :show
-
   # Users and people
 
   resource :user, :only => [:edit, :update, :destroy], :shallow => true do