Permalink
Browse files

renamed branding

  • Loading branch information...
1 parent bf9f43c commit 8bffec86870ccaa63690c50e0dee2bf7c6204c82 Kevin Rose committed Apr 29, 2010
Showing 351 changed files with 1,864 additions and 1,864 deletions.
View
@@ -472,7 +472,7 @@ EXHIBIT A. Common Public Attribution License Version 1.0.
"The contents of this file are subject to the Common Public Attribution License
Version 1.0. (the "License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+http://code.digg.com/LICENSE. The License is based on the Mozilla Public
License Version 1.1, but Sections 14 and 15 have been added to cover use of
software over a computer network and provide for limited attribution for the
Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -497,10 +497,10 @@ Reserved.
Attribution Phrase (not exceeding 10 words): Powered by Reddit
-Attribution URL: http://code.reddit.com
+Attribution URL: http://code.digg.com
Graphic Image as provided in the Covered Code:
-http://code.reddit.com/reddit_logo.png
+http://code.digg.com/reddit_logo.png
Display of Attribution Information is required in Larger Works which are defined
in the CPAL as a work which combines Covered Code or portions thereof with code
@@ -3,7 +3,7 @@
"The contents of this file are subject to the Common Public Attribution
License Version 1.0. (the "License"); you may not use this file except in
compliance with the License. You may obtain a copy of the License at
-http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+http://code.digg.com/LICENSE. The License is based on the Mozilla Public
License Version 1.1, but Sections 14 and 15 have been added to cover use of
software over a computer network and provide for limited attribution for the
Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -22,7 +22,7 @@ All portions of the code written by CondeNet are Copyright (c) 2006-2009
CondeNet, Inc. All Rights Reserved.
-->
-<schema name="reddit" version="1.1">
+<schema name="digg" version="1.1">
<types>
<!-- field type definitions. The "name" attribute is
just a label to be used by field definitions. The "class"
@@ -387,10 +387,10 @@ CondeNet, Inc. All Rights Reserved.
<field name="points" type="sint" indexed="true" stored="true" required="true" reversed="true" />
<field name="spam" type="boolean" indexed="true" stored="true" required="false" />
<field name="deleted" type="boolean" indexed="true" stored="true" required="false" />
- <!-- subreddit,link,comment -->
+ <!-- subdigg,link,comment -->
<field name="author_id" type="integer" indexed="true" stored="false" required="false" />
<field name="author" type="string" indexed="true" stored="false" required="false" />
- <!-- subreddit -->
+ <!-- subdigg -->
<field name="title" type="text" indexed="true" stored="false" required="false" />
<field name="description" type="text" indexed="true" stored="false" required="false" />
<field name="firsttext" type="text" indexed="true" stored="false" required="false" />
@@ -399,8 +399,8 @@ CondeNet, Inc. All Rights Reserved.
<field name="sr_type" type="string" indexed="true" stored="false" required="false" />
<!-- link -->
<field name="sr_id" type="integer" indexed="true" stored="false" required="false" />
- <field name="reddit" type="string" indexed="true" stored="false" required="false" />
- <field name="subreddit" type="string" indexed="true" stored="false" required="false" />
+ <field name="digg" type="string" indexed="true" stored="false" required="false" />
+ <field name="subdigg" type="string" indexed="true" stored="false" required="false" />
<field name="url" type="text" indexed="true" stored="false" required="false" />
<field name="domain" type="string" indexed="true" stored="false" required="false" multiValued="true" />
<field name="site" type="string" indexed="true" stored="false" required="false" multiValued="true" />
@@ -3,7 +3,7 @@
"The contents of this file are subject to the Common Public Attribution
License Version 1.0. (the "License"); you may not use this file except in
compliance with the License. You may obtain a copy of the License at
-http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+http://code.digg.com/LICENSE. The License is based on the Mozilla Public
License Version 1.1, but Sections 14 and 15 have been added to cover use of
software over a computer network and provide for limited attribution for the
Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -3,7 +3,7 @@
"The contents of this file are subject to the Common Public Attribution
License Version 1.0. (the "License"); you may not use this file except in
compliance with the License. You may obtain a copy of the License at
-http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+http://code.digg.com/LICENSE. The License is based on the Mozilla Public
License Version 1.1, but Sections 14 and 15 have been added to cover use of
software over a computer network and provide for limited attribution for the
Original Developer. In addition, Exhibit A has been modified to be consistent
View
@@ -1,7 +1,7 @@
# The contents of this file are subject to the Common Public Attribution
# License Version 1.0. (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
# License Version 1.1, but Sections 14 and 15 have been added to cover use of
# software over a computer network and provide for limited attribution for the
# Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -21,10 +21,10 @@
################################################################################
# Jacascript files to be compressified
-js_targets = jquery.js jquery.json.js jquery.reddit.js reddit.js ui.core.js ui.datepicker.js sponsored.js
+js_targets = jquery.js jquery.json.js jquery.digg.js reddit.js ui.core.js ui.datepicker.js sponsored.js
# CSS targets
-main_css = reddit.css
-css_targets = reddit-ie6-hax.css reddit-ie7-hax.css mobile.css spreadshirt.css
+main_css = digg.css
+css_targets = digg-ie6-hax.css reddit-ie7-hax.css mobile.css spreadshirt.css
SED=sed
CAT=cat
View
@@ -1,7 +1,7 @@
## The contents of this file are subject to the Common Public Attribution
## License Version 1.0. (the "License"); you may not use this file except in
## compliance with the License. You may obtain a copy of the License at
-## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+## http://code.digg.com/LICENSE. The License is based on the Mozilla Public
## License Version 1.1, but Sections 14 and 15 have been added to cover use of
## software over a computer network and provide for limited attribution for the
## Original Developer. In addition, Exhibit A has been modified to be consistent
View
@@ -1,4 +1,4 @@
#!/bin/sh
-cd /home/ri/reddit/r2
+cd /home/ri/digg/r2
/usr/bin/paster run local.ini supervise_watcher.py -c "Alert(restart_list=['MEM'])"
View
@@ -47,16 +47,16 @@ amqp_virtual_host = /
databases = main, comment, vote, change, email, authorize, award
#db name db host user, pass
-main_db = newreddit, 127.0.0.1, ri, password
-comment_db = newreddit, 127.0.0.1, ri, password
-comment2_db = newreddit, 127.0.0.1, ri, password
-vote_db = newreddit, 127.0.0.1, ri, password
+main_db = newdigg, 127.0.0.1, ri, password
+comment_db = newdigg, 127.0.0.1, ri, password
+comment2_db = newdigg, 127.0.0.1, ri, password
+vote_db = newdigg, 127.0.0.1, ri, password
change_db = changed, 127.0.0.1, ri, password
email_db = email, 127.0.0.1, ri, password
authorize_db = authorize, 127.0.0.1, ri, password
award_db = award, 127.0.0.1, ri, password
-db_app_name = reddit
+db_app_name = digg
db_create_tables = True
type_db = main
@@ -70,9 +70,9 @@ db_table_savehide = relation, account, link, main
db_table_click = relation, account, link, main
db_table_comment = thing, comment
-db_table_subreddit = thing, comment
+db_table_subdigg = thing, comment
-db_table_srmember = relation, subreddit, account, comment
+db_table_srmember = relation, subdigg, account, comment
db_table_friend = relation, account, account, comment
@@ -85,7 +85,7 @@ db_table_inbox_account_message = relation, account, message, main
db_table_report_account_link = relation, account, link, main
db_table_report_account_comment = relation, account, comment, comment
db_table_report_account_message = relation, account, message, main
-db_table_report_account_subreddit = relation, account, subreddit, main
+db_table_report_account_subdigg = relation, account, subreddit, main
db_table_award = thing, award
db_table_trophy = relation, account, award, award
@@ -107,21 +107,21 @@ enable_doquery = False
use_query_cache = False
write_query_queue = False
-stylesheet = reddit.css
-stylesheet_rtl = reddit_rtl.css
+stylesheet = digg.css
+stylesheet_rtl = digg_rtl.css
allowed_css_linked_domains = my.domain.com, my.otherdomain.com
css_killswitch = False
max_sr_images = 20
show_awards = False
-login_cookie = reddit_session
+login_cookie = digg_session
domain = localhost
domain_prefix =
media_domain = localhost
default_sr = localhost
-automatic_reddits =
+automatic_diggs =
admins =
sponsors =
@@ -164,7 +164,7 @@ RATELIMIT = 10
num_comments = 200
max_comments = 500
-num_default_reddits = 10
+num_default_diggs = 10
num_serendipity = 100
sr_dropdown_threshold = 15
@@ -1,7 +1,7 @@
# The contents of this file are subject to the Common Public Attribution
# License Version 1.0. (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
# License Version 1.1, but Sections 14 and 15 have been added to cover use of
# software over a computer network and provide for limited attribution for the
# Original Developer. In addition, Exhibit A has been modified to be consistent
View
@@ -1,7 +1,7 @@
# The contents of this file are subject to the Common Public Attribution
# License Version 1.0. (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
# License Version 1.1, but Sections 14 and 15 have been added to cover use of
# software over a computer network and provide for limited attribution for the
# Original Developer. In addition, Exhibit A has been modified to be consistent
View
@@ -1,7 +1,7 @@
# The contents of this file are subject to the Common Public Attribution
# License Version 1.0. (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
# License Version 1.1, but Sections 14 and 15 have been added to cover use of
# software over a computer network and provide for limited attribution for the
# Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -1,7 +1,7 @@
# The contents of this file are subject to the Common Public Attribution
# License Version 1.0. (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
# License Version 1.1, but Sections 14 and 15 have been added to cover use of
# software over a computer network and provide for limited attribution for the
# Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -1,7 +1,7 @@
# The contents of this file are subject to the Common Public Attribution
# License Version 1.0. (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
# License Version 1.1, but Sections 14 and 15 have been added to cover use of
# software over a computer network and provide for limited attribution for the
# Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -1,7 +1,7 @@
# The contents of this file are subject to the Common Public Attribution
# License Version 1.0. (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
# License Version 1.1, but Sections 14 and 15 have been added to cover use of
# software over a computer network and provide for limited attribution for the
# Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -33,7 +33,7 @@
import r2.lib.app_globals as app_globals
from r2.lib import rpc
import r2.lib.helpers
-import r2.config as reddit_config
+import r2.config as digg_config
from r2.templates import tmpl_dirs
@@ -74,7 +74,7 @@ def load_environment(global_conf={}, app_conf={}):
# note that all config options will override
# any Pylons config options
g = config['pylons.g']
- reddit_config.cache = g.cache
+ digg_config.cache = g.cache
# Return our loaded config object
#return config.Config(tmpl_options, map, paths)
@@ -1,7 +1,7 @@
# The contents of this file are subject to the Common Public Attribution
# License Version 1.0. (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
# License Version 1.1, but Sections 14 and 15 have been added to cover use of
# software over a computer network and provide for limited attribution for the
# Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -275,7 +275,7 @@ def __call__(self, environ, start_response):
elif self.is_auth_cname(sub_domains):
environ['frameless_cname'] = True
environ['authorized_cname'] = True
- elif ("redditSession=cname" in environ.get('HTTP_COOKIE', '')
+ elif ("diggSession=cname" in environ.get('HTTP_COOKIE', '')
and environ['REQUEST_METHOD'] != 'POST'
and not environ['PATH_INFO'].startswith('/error')):
environ['original_path'] = environ['PATH_INFO']
@@ -294,12 +294,12 @@ def __call__(self, environ, start_response):
continue
# subdomains which change the extension
elif sd == 'm':
- environ['reddit-domain-extension'] = 'mobile'
+ environ['digg-domain-extension'] = 'mobile'
elif sd in ('api', 'rss', 'xml', 'json'):
- environ['reddit-domain-extension'] = sd
+ environ['digg-domain-extension'] = sd
elif (len(sd) == 2 or (len(sd) == 5 and sd[2] == '-')) and self.lang_re.match(sd):
- environ['reddit-prefer-lang'] = sd
- environ['reddit-domain-prefix'] = sd
+ environ['digg-prefer-lang'] = sd
+ environ['digg-domain-prefix'] = sd
else:
sr_redirect = sd
sub_domains.remove(sd)
@@ -318,7 +318,7 @@ def __call__(self, environ, start_response):
return self.app(environ, start_response)
-class SubredditMiddleware(object):
+class SubdiggMiddleware(object):
sr_pattern = re.compile(r'^/r/([^/]{2,})')
def __init__(self, app):
@@ -328,10 +328,10 @@ def __call__(self, environ, start_response):
path = environ['PATH_INFO']
sr = self.sr_pattern.match(path)
if sr:
- environ['subreddit'] = sr.groups()[0]
+ environ['subdigg'] = sr.groups()[0]
environ['PATH_INFO'] = self.sr_pattern.sub('', path) or '/'
- elif path.startswith("/reddits"):
- environ['subreddit'] = 'r'
+ elif path.startswith("/diggs"):
+ environ['subdigg'] = 'r'
return self.app(environ, start_response)
class DomainListingMiddleware(object):
@@ -341,7 +341,7 @@ def __init__(self, app):
self.app = app
def __call__(self, environ, start_response):
- if not environ.has_key('subreddit'):
+ if not environ.has_key('subdigg'):
path = environ['PATH_INFO']
domain = self.domain_pattern.match(path)
if domain:
@@ -370,7 +370,7 @@ def __init__(self, app):
def __call__(self, environ, start_response):
path = environ['PATH_INFO']
- domain_ext = environ.get('reddit-domain-extension')
+ domain_ext = environ.get('digg-domain-extension')
for ext, val in self.extensions.iteritems():
if ext == domain_ext or path.endswith('.' + ext):
environ['extension'] = ext
@@ -531,7 +531,7 @@ def make_app(global_conf, full_stack=True, **app_conf):
app = SourceViewMiddleware(app)
app = DomainListingMiddleware(app)
- app = SubredditMiddleware(app)
+ app = SubdiggMiddleware(app)
app = ExtensionMiddleware(app)
app = DomainMiddleware(app)
@@ -1,7 +1,7 @@
# The contents of this file are subject to the Common Public Attribution
# License Version 1.0. (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
# License Version 1.1, but Sections 14 and 15 have been added to cover use of
# software over a computer network and provide for limited attribution for the
# Original Developer. In addition, Exhibit A has been modified to be consistent
Oops, something went wrong.

0 comments on commit 8bffec8

Please sign in to comment.