Merge commit '8c091aac6ba4b21bfd674fd55a3f710539b60193'
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index 92f4d9b..99d4d78 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -387,10 +387,7 @@
if not sized and w != DEFAULT_ICON_WIDTH:
orig = self.icon_original
if not orig:
- if w > DEFAULT_ICON_WIDTH:
- return None
- else:
- orig = self.icon
+ return self.icon
sized = orig.save_thumbnail(filename='',
image=PIL.Image.open(orig.rfile()),
content_type=orig.content_type,
diff --git a/Allura/allura/templates/login_fragment.html b/Allura/allura/templates/login_fragment.html
index e49bb91..335019e 100644
--- a/Allura/allura/templates/login_fragment.html
+++ b/Allura/allura/templates/login_fragment.html
@@ -53,7 +53,7 @@
}
</style>
</head>
- <body>
+ <body class="{% block body_css_class%}{% endblock %}">
{{ c.form.display(action='../do_login', target='_top', value=dict(return_to=return_to)) }}
{% for blob in g.resource_manager.emit('body_js_tail') %}
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 98dda1b..c7136ae 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -394,6 +394,10 @@
assert image.size == (48, 48)
r = self.app.get('/p/test/icon?foo=bar')
+ r = self.app.get('/p/test/icon?w=96')
+ image = PIL.Image.open(StringIO.StringIO(r.body))
+ assert image.size == (96, 96)
+ r = self.app.get('/p/test/icon?w=12345', status=404)
def test_project_screenshot(self):
file_name = 'neo-icon-set-454545-256x350.png'
diff --git a/ForgeImporters/forgeimporters/templates/project_base.html b/ForgeImporters/forgeimporters/templates/project_base.html
index d0bac1b..e7c9446 100644
--- a/ForgeImporters/forgeimporters/templates/project_base.html
+++ b/ForgeImporters/forgeimporters/templates/project_base.html
@@ -115,7 +115,7 @@
{% endblock %}
</fieldset>
- <fieldset id="tool-fields">
+ <div id="tool-fields">
{% if c.form_errors['tools'] %}
<div class="error">{{c.form_errors['tools']}}</div>
{% endif %}
@@ -135,7 +135,7 @@
{{tool_importer.tool_description}}
</div>
{% endfor %}
- </fieldset>
+ </div>
<div style="margin:5px">
You'll receive an email after each tool import finishes.
