diff --git a/mediagoblin/plugins/httpapiauth/__init__.py b/mediagoblin/plugins/httpapiauth/__init__.py
new file mode 100644
index 00000000..d3d2065e
--- /dev/null
+++ b/mediagoblin/plugins/httpapiauth/__init__.py
@@ -0,0 +1,58 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
+#
+# 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 .
+
+import logging
+import base64
+
+from werkzeug.exceptions import BadRequest, Unauthorized
+
+from mediagoblin.plugins.api.tools import Auth
+
+_log = logging.getLogger(__name__)
+
+
+def setup_http_api_auth():
+ _log.info('Setting up HTTP API Auth...')
+
+
+class HTTPAuth(Auth):
+ def trigger(self, request):
+ if request.authorization:
+ return True
+
+ return False
+
+ def __call__(self, request, *args, **kw):
+ _log.debug('Trying to authorize the user agent via HTTP Auth')
+ if not request.authorization:
+ return False
+
+ user = request.db.User.query.filter_by(
+ username=request.authorization['username']).first()
+
+ if user.check_login(request.authorization['password']):
+ request.user = user
+ return True
+ else:
+ raise Unauthorized()
+
+ return False
+
+
+
+hooks = {
+ 'setup': setup_http_api_auth,
+ 'auth': HTTPAuth()}
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index b37da026..cd16a7c0 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -138,37 +138,6 @@ header {
list-style: none;
}
-.dropdown {
- display: inline-block;
- color: #c3c3c3;
- background-color: #424242;
- border: 1px solid;
- border-color: #464646 #2B2B2B #252525;
- border-radius: 4px;
- padding: 3px 8px;
- font-size: 16px;
- text-decoration: none;
- font-style: normal;
- font-weight: bold;
- cursor: pointer;
- position: relative;
-}
-
-.dropdown_items {
- position: absolute;
- right: 0px;
- top: 25px;
- background-color: #424242;
- padding: 10px;
- width: 160px;
- border-radius: 5px 0 5px 5px;
- box-shadow: 0 2px 1px black;
-}
-
-.dropdown_items a {
- display: block;
-}
-
a.logo {
color: #fff;
font-weight: bold;
diff --git a/mediagoblin/static/js/header_dropdown.js b/mediagoblin/static/js/header_dropdown.js
deleted file mode 100644
index 643bafa4..00000000
--- a/mediagoblin/static/js/header_dropdown.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * GNU MediaGoblin -- federated, autonomous media hosting
- * Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
- *
- * 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 .
- */
-
-$(document).ready(function() {
- $(".dropdown_items").hide();
- $(document).mouseup(function(e) {
- if($(e.target).is(".dropdown")) {
- $(".dropdown_items").toggle();
- } else if($(e.target).is(".dropdown_items")) {
- return;
- } else {
- $(".dropdown_items").hide();
- }
- });
-});
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index b6ba8818..ef99242f 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -52,24 +52,17 @@
{% block mediagoblin_header_title %}{% endblock %}
{% if request.user and request.user.status == 'active' %}
{% trans %}+ Add media{% endtrans %}
+ {% trans %}+ Add collection{% endtrans %}
{% endif %}
{% trans %}View your profile{% endtrans %}{% trans %}Log out{% endtrans %}
diff --git a/mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html b/mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html
new file mode 100644
index 00000000..cf5099a2
--- /dev/null
+++ b/mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html
@@ -0,0 +1,23 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
+#
+# 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 .
+#}
+
+
+
+
+{%- trans %}Atom feed{% endtrans -%}
 }}){kind=icon}
+
+{%- trans %}Atom feed{% endtrans -%}