Merge pull request #399 from Cadasta/bugfix/css-locationmsg

Map error message
Cadasta · Jul 12, 2016 · 4b084b7 · 4b084b7
2 parents d3e1d82 + 6d5ce27
commit 4b084b7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 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
@@ -113,6 +113,8 @@ header {
   position: relative;
   height: $header-height;
   background-color: $brand-primary;
+  -webkit-box-shadow: 0 1px 4px rgba(31,54,79,.2);
+  -moz-box-shadow: 0 1px 4px rgba(31,54,79,.2);
   box-shadow: 0 1px 4px rgba(31,54,79,.2);
   &.header {
     top: 0;
@@ -525,6 +527,7 @@ header {
   padding-top: 30px;
   background: #fff;
   -webkit-box-shadow: 0 0 6px rgba(0,0,0,.3);
+  -moz-box-shadow: 0 0 6px rgba(0,0,0,.3);
   box-shadow: 0 0 6px rgba(0,0,0,.3);
   border-radius: 4px;
 }
@@ -669,6 +672,7 @@ header {
     overflow-x: hidden;
     overflow-y: scroll;
     -webkit-box-shadow: 0 0 6px rgba(0,0,0,.3);
+    -moz-box-shadow: 0 0 6px rgba(0,0,0,.3);
     box-shadow: 0 0 6px rgba(0,0,0,.3);
     z-index: 300;
     .btn {
@@ -1068,6 +1072,9 @@ button#add-contact { // below contacts table
   text-align: center;
   max-width: 50%;
   margin: 0 auto;
+  -webkit-box-shadow:: 10px 10px 6px -8px rgba(0,0,0,.5);
+  -moz-box-shadow:  10px 10px 6px -8px rgba(0,0,0,.5);
+  box-shadow:  10px 10px 6px -8px rgba(0,0,0,.5);
 }
 
 .translation-wrapper {

diff --git a/cadasta/templates/organization/project_wrapper.html b/cadasta/templates/organization/project_wrapper.html
@@ -33,6 +33,7 @@ <h1>
           <li><a class="edit" href="{% url 'organization:project-edit-permissions' object.organization.slug object.slug %}">{% trans "Edit member permissions" %}</a></li>
           <li role="separator" class="divider"></li>
           <li><a href="{% url 'organization:project-download' object.organization.slug object.slug %}" data-toggle="modal">{% trans "Download data" %}</a></li>
+          <li role="separator" class="divider"></li>
           <li>
             {% if object.archived %}
             <a class="archive" href="#unarchive_confirm" data-toggle="modal">{% trans "Unarchive project" %}</a>

diff --git a/cadasta/templates/spatial/location_form.html b/cadasta/templates/spatial/location_form.html
@@ -17,12 +17,13 @@ <h2>{{ title }}</h2>
         <div class="panel-body">
 
           <h3>Draw location on map</h3>
-          <p>
-            {% blocktrans %}Use the map tools to mark your new location. Next select the location type below.  Once complete, select the save button.<br /><br />{% endblocktrans %}
-          </p>
-          <div class="form-group">
-            {{ form.type.errors }}
-            <label for="{{ form.type.id_for_label }}">{% trans "What type of location is this?" %}</label>
+          <div class="clearfix form-group{% if form.geometry.errors %} has-error{% endif %}">
+            <p>{% blocktrans %}1. Use the tools provided on the left side of the map to mark your new location.{% endblocktrans %}</p>
+            <label class="control-label">{{ form.geometry.errors }}</label>
+          </div>
+          <div class="form-group{% if form.type.errors %} has-error{% endif %}">
+            <label for="{{ form.type.id_for_label }}">{% trans "2. What type of location is this?" %}</label>
+            <label class="pull-right control-label">{{ form.type.errors }}</label>
             {% render_field form.type class+="form-control" %}
           </div>
           {% for field in form %}
@@ -34,7 +35,6 @@ <h3>Draw location on map</h3>
             </div>
             {% endif %}
           {% endfor %}
-          {{ form.geometry.errors }}
          </div>
         <div class="panel-footer panel-buttons">
           <input class="btn btn-primary" type="submit" value="{% trans 'Save' %}"/>