Merge pull request #373 from Cadasta/enhancement/messages

Added message timing and css
Cadasta · Jul 10, 2016 · d177eae · d177eae
2 parents dd90f9b + af9cf5c
commit d177eae
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/cadasta/core/static/css/main.css b/cadasta/core/static/css/main.css
diff --git a/cadasta/core/static/css/main.css.map b/cadasta/core/static/css/main.css.map
diff --git a/cadasta/core/static/css/main.scss b/cadasta/core/static/css/main.scss
@@ -1066,6 +1066,8 @@ button#add-contact { // below contacts table
 
 .alert {
   text-align: center;
+  max-width: 50%;
+  margin: 0 auto;
 }
 
 .translation-wrapper {
@@ -1075,12 +1077,20 @@ button#add-contact { // below contacts table
 #messages { // success messages on top of map
   position: relative;
   z-index: 999;
+  margin-top: 10px;
+  margin-bottom: 10px;
 }
 
 .alert-error { // same as alert-danger
   @include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text);
 }
 
+@media (max-width: $screen-sm-max) {
+  .alert {
+    max-width: none;
+  }
+}
+
 /* =Modals
 -------------------------------------------------------------- */
 

diff --git a/cadasta/templates/core/base.html b/cadasta/templates/core/base.html
@@ -192,6 +192,9 @@
        $('.dropdown-toggle').dropdown();
        $('#language').change(function() { this.form.submit(); });
      });
+      window.setTimeout(function() {
+        $(".alert-success").fadeTo(500, 0).slideUp(500, function(){ $(this).remove(); });
+      }, 5000);
     </script>
   </body>
 </html>
diff --git a/cadasta/templates/organization/organization_dashboard.html b/cadasta/templates/organization/organization_dashboard.html
@@ -39,13 +39,13 @@ <h2>{% trans "Organization Overview" %}</h2>
             <!-- Starter text -->
             <h3 style="text-transform: none;">{% trans "You're ready to go" %}</h3>
             <p>
-              {% trans "You have successfully created your organization. What would you like to do next?" %}
+              {% trans "You have successfully created your organization.  You're now ready to add your first location." %}
             </p>
             <div class="btn-full">
               <a href="{% url 'organization:project-add' organization.slug %}" class="btn btn-primary btn-lg" role="button">
                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Add a new project" %}
               </a>
-              <a href="#" class="btn btn-primary btn-lg" role="button">
+              <a href="#" class="btn btn-primary btn-lg hidden" role="button">
                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Add new members" %}
               </a>
             </div>