aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Kahn-Greene <willg@bluesock.org>2011-04-13 10:04:30 -0400
committerWill Kahn-Greene <willg@bluesock.org>2011-04-13 10:04:30 -0400
commit8e1e744d27fbc887c6d9ce6e937848a25275ed6c (patch)
tree89b598d40b6a78df42a3f73195ca81b4084b8c99
parent56d507b60bf2393dbeed8b81524b6b922dbc6ad0 (diff)
downloadmediagoblin-8e1e744d27fbc887c6d9ce6e937848a25275ed6c.tar.lz
mediagoblin-8e1e744d27fbc887c6d9ce6e937848a25275ed6c.tar.xz
mediagoblin-8e1e744d27fbc887c6d9ce6e937848a25275ed6c.zip
Changes Mediagoblin -> MediaGoblin.
-rw-r--r--mediagoblin/__init__.py2
-rw-r--r--mediagoblin/app.py6
-rw-r--r--mediagoblin/auth/__init__.py15
-rw-r--r--mediagoblin/auth/forms.py2
-rw-r--r--mediagoblin/auth/lib.py2
-rw-r--r--mediagoblin/auth/routing.py2
-rw-r--r--mediagoblin/auth/views.py4
-rw-r--r--mediagoblin/models.py2
-rw-r--r--mediagoblin/routing.py2
-rw-r--r--mediagoblin/staticdirect.py2
-rw-r--r--mediagoblin/storage.py2
-rw-r--r--mediagoblin/templates/mediagoblin/base.html6
-rw-r--r--mediagoblin/tests/__init__.py2
-rw-r--r--mediagoblin/tests/test_auth.py2
-rw-r--r--mediagoblin/tests/test_storage.py2
-rw-r--r--mediagoblin/util.py2
-rw-r--r--mediagoblin/views.py2
-rw-r--r--setup.py2
18 files changed, 37 insertions, 22 deletions
diff --git a/mediagoblin/__init__.py b/mediagoblin/__init__.py
index 033b9173..dec83661 100644
--- a/mediagoblin/__init__.py
+++ b/mediagoblin/__init__.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index a9ae223c..195d4792 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
@@ -37,7 +37,7 @@ def load_controller(string):
return func
-class MediagoblinApp(object):
+class MediaGoblinApp(object):
"""
Really basic wsgi app using routes and WebOb.
"""
@@ -90,7 +90,7 @@ def paste_app_factory(global_config, **kw):
connection = mongokit.Connection(
kw.get('db_host'), kw.get('db_port'))
- mgoblin_app = MediagoblinApp(
+ mgoblin_app = MediaGoblinApp(
connection, kw.get('db_name', 'mediagoblin'),
user_template_path=kw.get('local_templates'))
diff --git a/mediagoblin/auth/__init__.py b/mediagoblin/auth/__init__.py
index e69de29b..c129cbf8 100644
--- a/mediagoblin/auth/__init__.py
+++ b/mediagoblin/auth/__init__.py
@@ -0,0 +1,15 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index 33403544..db8aaceb 100644
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py
index 907ba200..7cf021bc 100644
--- a/mediagoblin/auth/lib.py
+++ b/mediagoblin/auth/lib.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/mediagoblin/auth/routing.py b/mediagoblin/auth/routing.py
index e304de9b..92f19371 100644
--- a/mediagoblin/auth/routing.py
+++ b/mediagoblin/auth/routing.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index d56dfa43..aadde32f 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
@@ -70,7 +70,7 @@ def register_success(request):
def login(request):
"""
- Mediagoblin login view.
+ MediaGoblin login view.
If you provide the POST with 'next', it'll redirect to that view.
"""
diff --git a/mediagoblin/models.py b/mediagoblin/models.py
index af10e795..d5f87a90 100644
--- a/mediagoblin/models.py
+++ b/mediagoblin/models.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index 1401b723..169917f0 100644
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/mediagoblin/staticdirect.py b/mediagoblin/staticdirect.py
index 1c87c7ba..49681c22 100644
--- a/mediagoblin/staticdirect.py
+++ b/mediagoblin/staticdirect.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/mediagoblin/storage.py b/mediagoblin/storage.py
index e6e3a59d..a06a6b05 100644
--- a/mediagoblin/storage.py
+++ b/mediagoblin/storage.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 546dc264..0934df2b 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -1,6 +1,6 @@
<html>
<head>
- <title>{% block title %}Mediagoblin{% endblock title %}</title>
+ <title>{% block title %}MediaGoblin{% endblock title %}</title>
{# <link rel="stylesheet" type="text/css"
href="{{ request.staticdirect('/css/base.css') }}"/> #}
</head>
@@ -13,10 +13,10 @@
<tr>
<td id="mediagoblin_logo">
{% block mediagoblin_logo %}
- <a href="{{ request.urlgen('index') }}">Mediagoblin</a>
+ <a href="{{ request.urlgen('index') }}">MediaGoblin</a>
{% endblock %}
</td>
- <td>{% block mediagoblin_header_title %}Mediagoblin Home{% endblock %}</td>
+ <td>{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}</td>
</tr>
<tr>
<td></td>
diff --git a/mediagoblin/tests/__init__.py b/mediagoblin/tests/__init__.py
index 98a67908..c129cbf8 100644
--- a/mediagoblin/tests/__init__.py
+++ b/mediagoblin/tests/__init__.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index d7397723..94ce6bba 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/mediagoblin/tests/test_storage.py b/mediagoblin/tests/test_storage.py
index 79f1c8ea..94e16a8e 100644
--- a/mediagoblin/tests/test_storage.py
+++ b/mediagoblin/tests/test_storage.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/mediagoblin/util.py b/mediagoblin/util.py
index 6551a3cc..d8d981c9 100644
--- a/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index 37ed3a62..7a3cf098 100644
--- a/mediagoblin/views.py
+++ b/mediagoblin/views.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify
diff --git a/setup.py b/setup.py
index 8be416b1..1d790779 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# This program is free software: you can redistribute it and/or modify