Relationship modal, scrollbar bug fix, hide org logo

cadasta/core/static/css/main.scss

@@ -70,7 +70,7 @@ body, #cadasta {
   height: 100%;
   min-height: 100%;
   margin: 0;
-  overflow: scroll;
+  overflow: auto;
 }
 
 #cadasta {
@@ -259,10 +259,11 @@ header {
   }
 }
 
+#dashboard .header,
 #project-single .header,
 #project-wizard .header,
 #organization-single .header { 
-  position: absolute;
+  position: fixed;
 }
 
 /* =User links & links in registration
@@ -617,11 +618,12 @@ main.container-fluid {
   padding: 0;
   overflow: hidden;
   overflow-y: scroll;
+  height: 100%;
+  height: -webkit-calc(100% - 30px);
+  height: -moz-calc(100% - 30px);
+  height: calc(100% - 30px);
   > .row { // for map to expand need height
     height: 100%;
-    height: -webkit-calc(100% - 30px);
-    height: -moz-calc(100% - 30px);
-    height: calc(100% - 30px);
     margin-right: 0;
   }
   h2 {
@@ -676,7 +678,7 @@ main.container-fluid {
     margin: 0 auto;
     padding: 24px;
     overflow-x: hidden;
-    overflow-y: scroll;
+    overflow-y: auto;
     -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);
@@ -755,6 +757,10 @@ main.container-fluid {
   }
 }
 
+body.map .content-single {
+  overflow-y: hidden;
+}
+
 @media (max-width: $screen-sm-max) {
   .content-single {
     position: relative;
@@ -904,6 +910,11 @@ table.table-location { // location details in map area
   }
 }
 
+table#select-list {
+  border-bottom-width: 1px;
+  margin-bottom: 0;
+}
+
 @media (max-width: $screen-sm-max) {
   table {
     overflow-x: auto;
@@ -919,7 +930,8 @@ div.org-logo {
 }
 
 .org-text {
-  margin-left: 160px;
+  // margin-left: 160px; adjusted until upload field is added
+  margin-left: 0;
 }
 
 .member-pic {
@@ -980,6 +992,10 @@ img.org-logo, img#org-logo {
   max-height: 50px;
 }
 
+#organizations .table div.org-logo {
+  display: none; // hidden until upload field is added
+}
+
 @media (max-width: $screen-xs-max) {
   img.org-logo, img#org-logo {
     max-width: 80px;
@@ -1043,7 +1059,7 @@ img.org-logo, img#org-logo {
 }
 
 button#add-contact,
-button#add_btn { // below contacts table and party table
+button#add-party { // below contacts table and party table
   padding: 0;
 }
 
@@ -1069,6 +1085,18 @@ button#add_btn { // below contacts table and party table
   }
 }
 
+div.add-btn-btm { // add party link at bottom of table 
+  padding: 10px 24px;
+  text-align: left;
+  border-bottom: 3px solid $table-border-color;
+  margin-bottom: 20px;
+}
+
+#new-item {
+  background: $body-bg;
+  padding: 20px 20px 0 20px;
+}
+
 .more-menu {
   float: left;
   font-size: 24px;
@@ -1168,7 +1196,7 @@ button#add_btn { // below contacts table and party table
       min-width: 100px;
     }
   }
-  button#add-contact, button#add_btn {
+  button#add-contact, button#add-party {
     background: transparent;
     color: $link-color !important;
     border: 0;
@@ -1205,4 +1233,4 @@ ul.errorlist {
   display: block;
   text-transform: uppercase;
   padding-bottom: 2px;
- } 
+}

cadasta/core/static/js/rel_new_item.js

@@ -1,4 +1,4 @@
-$('button#add_btn').click(function() {
-  var val = $('#new_enitity_field').val();
-  $('#new_enitity_field').val((val === 'on' ? '' : 'on'));
+$('button#add-party').click(function() {
+  var val = $('#new_entity_field').val();
+  $('#new_entity_field').val((val === 'on' ? '' : 'on'));
 });

cadasta/core/static/js/rel_tenure.js

@@ -1,5 +1,5 @@
-$('button#add_btn').click(function() {
-  $('table#select-list').toggleClass('hidden');
+$('button#add-party').click(function() {
+  $('div#select-party').toggleClass('hidden');
   $('div#new-item').toggleClass('hidden');
 });
 

cadasta/spatial/tests/test_widgets.py

@@ -25,9 +25,9 @@ class NewEntityWidgetTest(TestCase):
     def test_render_value(self):
         widget = NewEntityWidget()
         expected = (
-            '<button class="btn btn-block btn-primary"'
-            '        id="add_btn" type="button">Add new party</button>'
-            '<input id="new_enitity_field" type="hidden"'
+            '<button class="btn btn-link"'
+            '        id="add-party" type="button">Add party</button>'
+            '<input id="new_entity_field" type="hidden"'
             '       name="name" value="value">'
         )
         rendered = widget.render(name='name', value='value')
@@ -36,9 +36,9 @@ def test_render_value(self):
     def test_render_no_value(self):
         widget = NewEntityWidget()
         expected = (
-            '<button class="btn btn-block btn-primary"'
-            '        id="add_btn" type="button">Add new party</button>'
-            '<input id="new_enitity_field" type="hidden"'
+            '<button class="btn btn-link"'
+            '        id="add-party" type="button">Add party</button>'
+            '<input id="new_entity_field" type="hidden"'
             '       name="name" value="">'
         )
         rendered = widget.render(name='name', value=None)

cadasta/spatial/widgets.py

@@ -37,9 +37,9 @@ class Media:
 
     def render(self, name, value, attrs={}):
         html = (
-            '<button class="btn btn-block btn-primary"'
-            '        id="add_btn" type="button">Add new party</button>'
-            '<input id="new_enitity_field" type="hidden"'
+            '<button class="btn btn-link"'
+            '        id="add-party" type="button">Add party</button>'
+            '<input id="new_entity_field" type="hidden"'
             '       name="{name}" value="{value}">'
         )
 

cadasta/templates/core/base.html

@@ -22,7 +22,7 @@
     {% endif %}
     {% block extra_head %}{% endblock %}
   </head>
-  <body id="{% block top-nav %}{% endblock %}" class="{% block body-class %}{% endblock %}">
+  <body id="{% block top-nav %}{% endblock %}" class="page{% block body-class %}{% endblock %}">
     <div id="cadasta">
       <!-- Site header -->
       <header class="header" role="banner">

cadasta/templates/core/dashboard.html

@@ -1,6 +1,7 @@
 {% extends "core/base.html" %}
 
 {% block top-nav %}dashboard{% endblock %}
+{% block body-class %} map{% endblock %}
 
 {% block title %} | Dashboard{% endblock %}
 

cadasta/templates/organization/project_add_extents.html

@@ -5,6 +5,7 @@
 {% load i18n %}
 
 {% block page_title %}| Draw map{% endblock %}
+{% block body-class %} map{% endblock %}
 
 {% block extra_head %}
 {% leaflet_css plugins="draw,forms" %}

cadasta/templates/organization/project_dashboard.html

@@ -35,6 +35,7 @@
 {% endblock %}
 
 {% block page_title %}Overview | {% endblock %}
+{% block body-class %} map{% endblock %}
 {% block left-nav %}overview{% endblock %}
 
 {% block content %}

cadasta/templates/organization/project_edit_geometry.html

@@ -5,6 +5,8 @@
 {% load leaflet_tags %}
 
 {% block page_title %}Edit project location | {% endblock %}
+{% block body-class %} map{% endblock %}
+
 
 {% block extra_head %}
 {% leaflet_css plugins="draw,forms" %}

cadasta/templates/spatial/location_add.html

@@ -1,6 +1,8 @@
 {% extends "organization/project_wrapper.html" %}
 {% load i18n %}
 {% load widget_tweaks %}
+
+{% block body-class %} map{% endblock %}
 {% block left-nav %}map{% endblock %}
 
 {% load staticfiles %}

cadasta/templates/spatial/location_edit.html

@@ -5,6 +5,7 @@
 {% load staticfiles %}
 
 {% block page_title %}Edit location | {% endblock %}
+{% block body-class %} map{% endblock %}
 
 {% block extra_head %}
 {% leaflet_css plugins="draw,forms" %}

cadasta/templates/spatial/location_map.html

@@ -2,6 +2,7 @@
 {% load i18n %}
 
 {% block page_title %}Project Map | {% endblock %}
+{% block body-class %} map{% endblock %}
 {% block left-nav %}map{% endblock %}
 
 {% load leaflet_tags %}

cadasta/templates/spatial/location_wrapper.html

@@ -2,6 +2,7 @@
 {% load i18n %}
 
 {% block left-nav %}map{% endblock %}
+{% block body-class %} map{% endblock %}
 
 {% load leaflet_tags %}
 {% load staticfiles %}