Merge lp:~godricglow/postorius/bug_login_render_fix into lp:postorius

[Pranjal Yadav]

Fixed a rendering bug on login page, corrected missplaced new line character

[lp:~godricglow/postorius/bug_login_render_fix]

195. By Pranjal Yadav <email address hidden> on 2015-01-30

fixed 1308219 and merged trunk

196. By Pranjal Yadav <email address hidden> on 2015-01-30

fixed a rendering bug on login page

[Florian Fuchs (flo-fuchs)]

Hi Pranjal,

thanks for that. Looks better now... ;-)

Florian

review: Approve

=== modified file 'src/postorius/templates/postorius/login.html'
--- src/postorius/templates/postorius/login.html	2015-01-17 17:23:59 +0000
+++ src/postorius/templates/postorius/login.html	2015-01-29 20:32:49 +0000
@@ -23,9 +23,7 @@
       <input type="hidden" name="assertion" value="" />
       <a rel="nofollow" id="browserid" href="#"><img src="{% static 'postorius/img/sign_in_blue.png' %}" alt="{% trans 'Login using BrowserID' %}" /></a>
     </form>
-    <p>{% trans "Mozilla Persona is an easy way to sign into multiple websites, while
-still controlling your personal data. For more information <a
-href='http://www.mozilla.org/en-US/persona'>see the Mozilla website</a>" %}.</p>
+    <p>{% trans "Mozilla Persona is an easy way to sign into multiple websites, while still controlling your personal data. For more information <a href='http://www.mozilla.org/en-US/persona'>see the Mozilla website</a>" %}.</p>
     <noscript><p class="text-error">{% trans "Mozilla Persona requires the use of
 JavaScript." %}</p></noscript>
   </div>

=== modified file 'src/postorius/views/list.py'
--- src/postorius/views/list.py	2015-01-19 15:03:09 +0000
+++ src/postorius/views/list.py	2015-01-29 20:32:49 +0000
@@ -66,8 +66,6 @@
                                    % request.POST['owner_email']))
                 except HTTPError as e:
                     messages.error(request, _(e.msg))
-        else:
-            owner_form = NewOwnerForm()
         if 'moderator_email' in request.POST:
             moderator_form = NewModeratorForm(request.POST)
             if moderator_form.is_valid():
@@ -79,8 +77,8 @@
                                    % request.POST['moderator_email']))
                 except HTTPError as e:
                     messages.error(request, _(e.msg))
-        else:
-            moderator_form = NewModeratorForm()
+        owner_form = NewOwnerForm()
+        moderator_form = NewModeratorForm()
         return render_to_response('postorius/lists/members.html',
                                   {'list': self.mailing_list,
                                    'owner_form': owner_form,