diff --git a/r2/r2/config/routing.py b/r2/r2/config/routing.py index 7f58ceb63..172270db2 100644 --- a/r2/r2/config/routing.py +++ b/r2/r2/config/routing.py @@ -67,7 +67,6 @@ def make_map(global_conf={}, app_conf={}): mc('/buttonlite', controller='buttons', action='button_lite') mc('/widget', controller='buttons', action='widget_demo_page') - mc('/socialite', controller='buttons', action='socialite_demo_page') mc('/bookmarklets', controller='buttons', action='bookmarklets') mc('/stats', controller='front', action='stats') diff --git a/r2/r2/controllers/buttons.py b/r2/r2/controllers/buttons.py index fa1933a18..44d924a17 100644 --- a/r2/r2/controllers/buttons.py +++ b/r2/r2/controllers/buttons.py @@ -21,7 +21,7 @@ ################################################################################ from reddit_base import RedditController from r2.lib.pages import Button, ButtonNoBody, ButtonEmbed, ButtonLite, \ - ButtonDemoPanel, WidgetDemoPanel, Bookmarklets, BoringPage, Socialite + ButtonDemoPanel, WidgetDemoPanel, Bookmarklets, BoringPage from r2.lib.pages.things import wrap_links from r2.models import * from r2.lib.utils import tup, query_string @@ -183,12 +183,6 @@ class ButtonsController(RedditController): show_sidebar = False, content=WidgetDemoPanel()).render() - def GET_socialite_demo_page(self): - return BoringPage(_("socialite toolbar"), - show_sidebar = False, - content=Socialite()).render() - - def GET_bookmarklets(self): return BoringPage(_("bookmarklets"), show_sidebar = False, diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 135416fdd..f78088428 100644 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -1238,10 +1238,6 @@ class WidgetDemoPanel(Templated): """Demo page for the .embed widget.""" pass -class Socialite(Templated): - """Demo page for the socialite Firefox extension""" - pass - class Bookmarklets(Templated): """The bookmarklets page.""" def __init__(self, buttons=None): diff --git a/r2/r2/public/static/socialite/index.html b/r2/r2/public/static/socialite/index.html new file mode 100644 index 000000000..1c9b05ecb --- /dev/null +++ b/r2/r2/public/static/socialite/index.html @@ -0,0 +1,113 @@ + + + + + + +
+
+
+
+ + +
+Install it for free! +

If you like it, why not thank chromakode, the redditor who made it, with some cash so he can buy some bacon. +

+
+ +
+ +
+
+
+ + + +
+
+ + + +
75% goes to chromakode
+24% pays for servers
+1% pays for this
+ +
+
+
+ +
+

What does it do?

+
    +
  • reddit functionally unobtrusively integrated into Firefox!
    • +
  • magically appears when you click a reddit link to let you vote, save, and hide links right there!
    • +
  • unlock the digital fairy dust that is the serendipity button!
    • +
  • achieve the notoriety you feel has long been wasted on your inferior peers!
    • +
  • enhance your reddit experience so much that you start using exclamation points!
    • +
+
+ +

+

Socialite screenshot
+

+ +

How to use it

+ +

+ Although Socialite appears auto-magically, you can also open the bar manually by clicking on the reddit + icon on the right side of your location bar: +

+ +

+

lookup-or-submit button
+

+ +

+ If the page is not submitted to reddit, or you click again, a submit + bar will appear: +

+ +

+

submit bar screenshot
+

+ +

+ (PRO-TIP: if you want to skip straight to the submit bar, + middle-click on the reddit icon.) +

+ + +

Configuration

+ +

+ Like a Mr. Potato Head, you can change its appearance -- choose what buttons are displayed in the toolbar in the + extensions preferences: +

+ +

+

site properties window screenshot
+

+ +

Activate for other reddit sites

+

+ Our toolbar gets around. Since reddit lets you + + host reddits from other domains - like + the Cute List - Socialite will also let you edit the list of domains that it works for. +

+

+

preferences window screenshot
+

+ +
+ +
Want to get in on the reddit development scene like chromakode?
Click here to dive in.
+ +
+ + diff --git a/r2/r2/public/static/socialite/installbutton-end.png b/r2/r2/public/static/socialite/installbutton-end.png deleted file mode 100644 index 6d3c54f2f..000000000 Binary files a/r2/r2/public/static/socialite/installbutton-end.png and /dev/null differ diff --git a/r2/r2/public/static/socialite/installbutton.png b/r2/r2/public/static/socialite/installbutton.png deleted file mode 100644 index cb89a496b..000000000 Binary files a/r2/r2/public/static/socialite/installbutton.png and /dev/null differ diff --git a/r2/r2/public/static/socialite/reddit-head.png b/r2/r2/public/static/socialite/reddit-head.png new file mode 100644 index 000000000..71dc9ad0a Binary files /dev/null and b/r2/r2/public/static/socialite/reddit-head.png differ diff --git a/r2/r2/public/static/socialite/socialite-add.png b/r2/r2/public/static/socialite/socialite-add.png new file mode 100644 index 000000000..11978465e Binary files /dev/null and b/r2/r2/public/static/socialite/socialite-add.png differ diff --git a/r2/r2/public/static/socialite/socialite-bacon.png b/r2/r2/public/static/socialite/socialite-bacon.png new file mode 100644 index 000000000..b99776e8c Binary files /dev/null and b/r2/r2/public/static/socialite/socialite-bacon.png differ diff --git a/r2/r2/public/static/socialite/socialite.png b/r2/r2/public/static/socialite/socialite.png deleted file mode 100644 index 2e3b41ac4..000000000 Binary files a/r2/r2/public/static/socialite/socialite.png and /dev/null differ diff --git a/r2/r2/public/static/socialite/socialitebg.png b/r2/r2/public/static/socialite/socialitebg.png new file mode 100644 index 000000000..371508c01 Binary files /dev/null and b/r2/r2/public/static/socialite/socialitebg.png differ diff --git a/r2/r2/public/static/socialite/socialitelogo.png b/r2/r2/public/static/socialite/socialitelogo.png new file mode 100644 index 000000000..2e149b0fa Binary files /dev/null and b/r2/r2/public/static/socialite/socialitelogo.png differ diff --git a/r2/r2/public/static/socialite/thumbsup3.png b/r2/r2/public/static/socialite/thumbsup3.png new file mode 100644 index 000000000..8af5a99ee Binary files /dev/null and b/r2/r2/public/static/socialite/thumbsup3.png differ diff --git a/r2/r2/templates/socialite.html b/r2/r2/templates/socialite.html deleted file mode 100644 index 592944707..000000000 --- a/r2/r2/templates/socialite.html +++ /dev/null @@ -1,84 +0,0 @@ -
- -

install Socialite, a reddit Firefox extension

- -

- - Socialite integrates the features of reddit into Firefox. -

- -

- When you click on links on reddit, Socialite displays a toolbar above the page, allowing you to vote articles up and down, view comments, and save links to your profile. Features include: -

- -
-

- - Add to Firefox - -

- - -
- -

how to use it

- -

- Socialite will display a toolbar automatically when you click on reddit links.

-

- Socialite screenshot -

- -

- In addition, you can open the bar manually by clicking on the reddit - icon on the right side of your location bar: -

- -

- lookup-or-submit button -

- -

- If the page is not submitted to reddit, or you click again, a submit - bar will appear: -

- -

- submit bar screenshot -

- -

- (HINT: if you want to skip straight to the submit bar, - middle-click on the reddit icon.) -

- - -

Configuration

- -

- you can configure what buttons are displayed in the toolbar in the - extensions preferences: -

- -

- site properties window screenshot -

- -

configure for other reddit sites

-

- Since reddit lets you - - host reddits from other domains, like - BaconBuzz, Socialite will also let you edit the list of domains that it works for. -

-

- preferences window screenshot -

- -