Skip to content
Browse files

promote home2

  • Loading branch information...
1 parent 46562f8 commit dc6c7f05082e97d99403410ad26aa2a3d5cdfe82 @alexch committed
Showing with 62 additions and 206 deletions.
  1. +4 −9 app.rb
  2. +58 −114 web/home.rb
  3. +0 −83 web/home2.rb
View
13 app.rb
@@ -68,10 +68,6 @@ def initialize
send_file "#{here}/google66d87a0b5d48cf21.html"
end
- get "/" do
- app_page(Home).to_html
- end
-
# build plain-widget pages
[Links, Features, RoadMap, Vision].each do |widget|
get "/#{widget.name.downcase}" do
@@ -161,16 +157,15 @@ def lipsumar_feeds
Lipsumar.new(google_data).lipsumar_feeds
end
+ get "/" do
+ params = {current_account: signed_in? ? current_account : nil}
+ app_page(Home.new(params), show_toc: false).to_html
+ end
get '/about' do
app_page(About).to_html
end
- get '/home2' do
- params = {current_account: signed_in? ? current_account : nil}
- app_page(Home2.new(params), show_toc: false).to_html
- end
-
get '/sharebros' do
app_page(Sharebros.new(:google_data => google_data, :lipsumar_feeds => lipsumar_feeds)).to_html
end
View
172 web/home.rb
@@ -2,135 +2,79 @@
require "app_page"
require "sections"
-
class Home < Widget
include Sections
- def content
+ needs :current_account
+
+ def signed_in?
+ @current_account
+ end
- # todo: unless already saved
- section "Save Your Sharebros", :class => "urgent" do
- b "New:"
- text " Google wants to kidnap your Reader friends! Sign in with OAuth and allow us to grab your friends lists and save them..."
- b ("before it's too late!")
- p do
- item name: "Fetch Your Sharebros", comment: "requires OAuth authentication, which grants this site temporary access to fetch data from your Google Reader account",
- url: "/sharebros"
+ def content
+
+ if !signed_in?
+ section "Sharebro: Restoring Google Reader" do
+ p {
+ text "Google ", a("removed a lot of features", href: "/features"), " from Google Reader, gutting thousands of vibrant online communities in an attempt to move their members to Google Plus."
+ }
+
+ p {
+ text "This site is a hub for efforts to replace what was lost. "
+ text "See ", a("the about page", href: "/about"), " for more info."
+ }
end
end
-
- section "What just happened to Google Reader?" do
-
- text "Google ", a("removed a lot of features", href: "/features"), " from Google Reader, gutting thousands of vibrant online communities in an attempt to move their members to Google Plus."
-
- end
-
- section "What's sharebro.org?" do
- p {
- text "This site is a hub for efforts to replace what was lost."
-
- p "We want to:"
-
- li {
- b "Memorialize what was lost"
- text " with ", (a "Links", href: "/links"), " to commentary on the web, and with ",
- (a "Detailed Features", href: "/features"), " and any replacements we've found."
- }
-
- li {
- b "Fix Google Reader"
- text " by locating or developing plugins and extensions that restore sharing and curating features"
+
+ section "Using Sharebro" do
+
+ if signed_in?
+ p "OK! You're signed in. Now you can..."
+ else
+ p {
+ a("Sign In", href: "/sign_in", class: "big")
+ text " and use Sharebro to do the following:"
}
+ end
- li {
- b "Develop Replacements"
- text " so that we're never again subject to the whim of a company or application for our carefully curated, intensely enjoyed communities of content"
- }
+ item(name: "Resubscribe", comment: "to your Google Reader followers") {
+ if signed_in?
+ div.subscribe do
+ form :method => :post, :action => "/subscribe" do
+ input :type => "submit", :value => "Resubscribe to the People You Folllow in Google Reader"
+ end
+ end
+ p "We recommend doing this even if you've been using Sharebro before. Your subscription list will become much cleaner. It will also include your friends' Google Plus and Lipsumarium feeds."
+ end
}
- p {
- a "Read our vision statement", :href => "/vision"
- text " and see if you agree with our technical and social philosophy."
+ item(name: "Add a 'Send To' link", comment: "and share items from inside Reader again") {
+ if signed_in?
+ div.subscribe do
+ form :method => :post, :action => "/add_send_to_link" do
+ input :type => "submit", :value => "Add 'Send To Sharebro' Link"
+ text " into the 'Send To' link menu"
+ end
+ end
+ p "Note that there are still some bugs in the 'Send To Sharebro' feature -- some items simply can't be found."
+ end
}
- end
-
- section "Development Efforts" do
- item name: "HiveMined", url: "http://hivemined.org",
- comment: "Francis is already working on a full RSS Reader with built-in social sharing features."
-
- item name: "Google Reader Share", url: "http://userscripts.org/scripts/show/117058",
- comment: "Emmanuel Pire's first effort to add a Share button back in to Reader. Ongoing development of this great userscript has been rolled in to this site."
-
- li {
- text "We are planning to provide shared feeds off of sharebro.org, but not exclusively so. Read the "
- a "vision statement", :href => "/vision"
- text " and "
- a "road map", :href => "/roadmap"
- text " for details"
- }
-
- item name: "Other potential replacements", url: "/links#replacement_readers",
- comment: " listed on the Links page"
-
+ item(name: "Add the Google Reader Share plugin",
+ url: "http://userscripts.org/scripts/show/117058",
+ comment: "Emmanuel Pire's first effort to add a Share button back in to Reader.") do
+ p {
+ text "Ongoing development of this great userscript will be rolled in to the Sharebro site but for now it's still separate. "
+ text "This will give you a separate feed, which will appear under a "
+ b "Lipsumarium Shares"
+ text " folder in Google Reader once you ", b("resubscribe"), "."
+ }
+ end
end
- section "Get Involved" do
- p "Want to help us build a better Reader?"
-
- li {
- text "Join the ", (a "Diaspora Google Group", :href => "https://groups.google.com/group/google-reader-diaspora")," and help us figure out how to fix Reader, or where to go if we can't"
- }
- li {
- text "Join the ", (a "Sharebro Google Group", href: "https://groups.google.com/group/sharebro"), " if you want to collaborate on solutions as a coder or tester"
- }
- li {
- text "Follow ",
- (a "Alex Chaffee", href: "http://alexchaffee.com"),
- " on ",
- (a "Plus", href:"https://plus.google.com/107397735779828096052/posts"),
- " and ",
- (a "Twitter", href: "http://twitter.com/alexch"),
- " and he'll keep you updated on our progress"
- }
- li {
- text "Read the ",
- (a "Missing Features", href: "/features"),
- " list and see if we missed any (I'm sure we did but I have to go have breakfast now)"
- }
- end
-
- section "This Site" do
- item name: "Links", url: "/links",
- comment: "a collection of dozens of articles and eulogies"
- item name: "Missing Features", url: "/features",
- comment: "a catalog of what features were removed from Reader, and how we (and others) are trying to bring them back"
- item name: "Road Map", url: "/roadmap",
- comment: "a guide for developers and testers who want to contribute to this site and the tools we're building"
- item name: "Vision", url: "/vision",
- comment: "not quite a manifesto, but more than a mission statement"
- item name: "Source Code", url: "http://github.com/alexch/sharebro", comment: "hosted on github"
- end
-
- section "Team" do
- item name: "Alex Chaffee", url: "http://alexchaffee.com"
- item name: "Emmanuel Pire", url: "http://userscripts.org/users/338834"
- item name: "Nick Chaffee"
- end
-
-
- section "What's a Sharebro?" do
- p "Someone who shares RSS items with their other sharebros."
-
- p "We may also end up calling this app we're writing Sharebro."
-
- p raw(<<-HTML)
- Yes, "sharebro" is
- <a href="http://www.quora.com/Brogramming/Is-the-notion-of-brogramming-exclusionary-and-harmful-towards-women-in-computer-science">arguably sexist</a>.
- I also own <code>onefeed.org</code> but "sharebro" is an <a href="http://www.urbandictionary.com/define.php?term=sharebro">organic term</a> that men <i>and women</i> use to describe themselves and their community, so let's run with it for a while. And brotherhood is a positive thing, right? And if I end up making an app or widget, we could name <b>it</b> Sharebro, as in a helpful little buddy, thereby maybe dodging the "don't call me bro, bro" issue.
- </p>
- HTML
+ section("Get involved") do
+ text "See ", a("the about page", href: "/about#get_involved"), " for more info."
end
end
View
83 web/home2.rb
@@ -1,83 +0,0 @@
-require "links"
-require "app_page"
-require "sections"
-
-
-class Home2 < Widget
-
- include Sections
-
- needs :current_account
-
- def signed_in?
- @current_account
- end
-
- def content
-
- if !signed_in?
- section "Sharebro: Restoring Google Reader" do
- p {
- text "Google ", a("removed a lot of features", href: "/features"), " from Google Reader, gutting thousands of vibrant online communities in an attempt to move their members to Google Plus."
- }
-
- p {
- text "This site is a hub for efforts to replace what was lost. "
- text "See ", a("the about page", href: "/about"), " for more info."
- }
- end
- end
-
- section "Using Sharebro" do
-
- if signed_in?
- p "OK! You're signed in. Now you can..."
- else
- p {
- a("Sign In", href: "/sign_in?back=L2hvbWUy", class: "big") # that means "home2" :-)
- text " and use Sharebro to do the following:"
- }
- end
-
- item(name: "Resubscribe", comment: "to your Google Reader followers") {
- if signed_in?
- div.subscribe do
- form :method => :post, :action => "/subscribe" do
- input :type => "submit", :value => "Resubscribe to the People You Folllow in Google Reader"
- end
- end
- text "We recommend doing this even if you've been using Sharebro before. Your subscription list will become much cleaner. It will also include your friends' Google Plus and Lipsumarium feeds."
- end
- }
-
- item(name: "Add a 'Send To' link", comment: "and share items from inside Reader again") {
- if signed_in?
- div.subscribe do
- form :method => :post, :action => "/add_send_to_link" do
- input :type => "submit", :value => "Add 'Send To Sharebro' Link"
- text " into the 'Send To' link menu"
- end
- end
- text "(Even if you've been using Sharebro before, you should do this.)"
- p "Note that there are still some bugs in the 'Send To Sharebro' feature -- some items simply can't be found."
- end
- }
-
- item(name: "Add the Google Reader Share plugin",
- url: "http://userscripts.org/scripts/show/117058",
- comment: "Emmanuel Pire's first effort to add a Share button back in to Reader.") do
- p{
- text "Ongoing development of this great userscript will be rolled in to the Sharebro site but for now it's still separate. "
- text "This will give you a separate feed, which will appear under a "
- b "Lipsumarium Shares"
- text " folder in Google Reader once you ", b("resubscribe"), "."
- }
- end
- end
-
- section("Get involved") do
- text "See ", a("the about page", href: "/about#get_involved"), " for more info."
- end
-
- end
-end

0 comments on commit dc6c7f0

Please sign in to comment.
Something went wrong with that request. Please try again.