Merge pull request #708 from knownasilya/view-cleanup

Fix #700, and cleanup registration, index, forgot

Author: Ilya Radchenko

client/app.js

@@ -11,6 +11,8 @@ var $navbar = $('.navbar');
 $navbar.find('li').removeClass('active');
 $navbar.find('a[href="' + global.location.pathname + '"]')
   .parent().addClass('active');
+$('#layout-header').hide();
+$('#invite-box').height($('#signup-box').height());
 
 // Third party
 require('ui-bootstrap');

lib/views/forgot.html

@@ -1,13 +1,15 @@
 {% extends "base.html" %}
 
 {% block bodyContent %}
-  <div class="row-fluid">
-    <div class="span12">
-      {% for message in messages %}
-        <div class="alert alert-warning">{{ message|raw }}</div>
-      {% endfor %}
+  {% if messages.length %}
+    <div class="row-fluid">
+      <div class="span12">
+        {% for message in messages %}
+          <div class="alert alert-warning">{{ message|raw }}</div>
+        {% endfor %}
+      </div>
     </div>
-  </div>
+  {% endif %}
 
   <div class="row-fluid">
     <div class="span12">

lib/views/index.html

@@ -18,29 +18,26 @@
       </span>
     </div>
   </div>
+
   {% for messages in flash %}
     {% for message in messages %}
-  <div class="alert alert-info">{{ message|raw }}</div>
+      <div class="alert alert-info">{{ message|raw }}</div>
     {% endfor %}
   {% endfor %}
+
   <div id="dashboard" style="display:none">
     <div>
       <div class="row-fluid">
         <div class="span12 dashboard-section">
           {% if !currentUser %}
-          <div class='StriderBlock_LoggedOutFillContent'>{% pluginblock LoggedOutFillContent %}
-            {% include "partials/errors.html" %}
-            {% include "partials/loginform.html" %}
-            {% endpluginblock %}</div>
-
-          <script>
-            $(document).ready(function() {
-            $('#layout-header').hide();
-            $('#invite-box').height($('#signup-box').height());   
-            });
-          </script>
-
+            <div class='StriderBlock_LoggedOutFillContent'>
+              {% pluginblock LoggedOutFillContent %}
+                {% include "partials/errors.html" %}
+                {% include "partials/loginform.html" %}
+              {% endpluginblock %}
+            </div>
           {% endif %}
+
           {% if currentUser && jobs.yours.length < 1 %}
           <div class="alert alert-info no-projects" data-test="no-personal-projects">
             <h3>You don't have any projects configured.</h3>

lib/views/partials/signupform.html

@@ -1,9 +1,4 @@
 <div class="row-fluid">
-  <!-- hack since offsetN doesn't work with first element -->
-  <div class="span2">
-    &nbsp;
-  </div>
-
   <div class="span8">
     <div class="well">
       <h3>Brilliant Continuous Deployment.</h3>