Fixes a couple of things which were broken by merge with 2.8.0

GeoNode · May 2, 2018 · e0a1808 · e0a1808
1 parent e209771
commit e0a1808
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 172 deletions.
diff --git a/geonode/layers/templates/layers/layer_detail.html b/geonode/layers/templates/layers/layer_detail.html
@@ -445,6 +445,10 @@ <h4>{% trans "Metadata" %}</h4>
                 <a class="btn btn-default btn-block btn-xs" href="{% url "layer_metadata" resource.service_typename %}">{% trans "Wizard" %}</a>
                 <a class="btn btn-default btn-block btn-xs" href="{% url "layer_metadata_advanced" resource.service_typename %}">{% trans "Advanced Edit" %}</a>
                 <a class="btn btn-default btn-block btn-xs" href="{% url "layer_metadata_upload" resource.service_typename %}">{% trans "Upload Metadata" %}</a>
+                {% if USE_WORLDMAP %}
+                  <a class="btn btn-default btn-block btn-xs" href="/layers/{{ resource.service_typename }}/searchable-fields">{% trans "Search" %}</a>
+                  <a class="btn btn-default btn-block btn-xs" href="/gazetteer/edit/{{ resource.service_typename }}">{% trans "Gazetteer" %}</a>
+                {% endif %}
               </div>
               {% endif %}
               {% if GEOSERVER_BASE_URL and not resource.service %}

diff --git a/geonode/layers/templates/upload/layer_upload_base.html b/geonode/layers/templates/upload/layer_upload_base.html
@@ -9,28 +9,23 @@
         margin: 5px 0 0 10px;
         /* height: 40px; */
     }
-
     #right {
         float: right;
         margin: 5px 10px 0 0;
         /* height: 40px; */
     }
-
     .inline-headers h4, .inline-headers select {
       display: inline-block;
       vertical-align: top;
     }
-
     .active {
         background-color: #cccccc !important;
         font-weight: bold !important;
     }
-
     .faqHeader {
         font-size: 17px;
         margin: 20px;
     }
-
     .panel-heading [data-toggle="collapse"]:after {
         font-family: 'FontAwesome';
         content: "\f078"; /* "play" icon */
@@ -45,7 +40,6 @@
         -o-transform: rotate(-90deg);
         transform: rotate(-90deg); */
     }
-
     .panel-heading [data-toggle="collapse"].collapsed:after {
         /* rotate "play" icon from > (right arrow) to ^ (up arrow) */
     /*    -webkit-transform: rotate(90deg);
@@ -55,7 +49,6 @@
         transform: rotate(90deg); */
         color: #454444;
     }
-
     .help-tip{
         position: absolute;
         /* top: 18px;
@@ -71,26 +64,21 @@
         line-height: 26px;
         cursor: default;
     }
-
     .help-tip:before{
         content:'?';
         font-weight: bold;
         color:#fff;
     }
-
     .button-tip{
         position: absolute;
     }
-
     .help-tip:hover p,
     .button-tip:hover p{
         display:block;
         transform-origin: 100% 0%;
-
         -webkit-animation: fadeIn 0.3s ease-in-out;
         animation: fadeIn 0.3s ease-in-out;
     }
-
     .help-tip p,
     .button-tip p{    /* The tooltip */
         display: none;
@@ -108,7 +96,6 @@
         line-height: 1.4;
         z-index: 10000;
     }
-
     .help-tip p:before,
     .button-tip p:before{ /* The pointer of the tooltip */
         position: absolute;
@@ -120,7 +107,6 @@
         right:10px;
         top:-12px;
     }
-
     .help-tip p:after,
     .button-tip p:after{ /* Prevents the tooltip from being hidden */
         width:100%;
@@ -130,172 +116,17 @@
         top:-40px;
         left:0;
     }
-
     /* CSS animation */
-
     @-webkit-keyframes fadeIn {
         0% {
             opacity:0;
             transform: scale(0.6);
         }
-
         100% {
             opacity:100%;
             transform: scale(1);
         }
     }
-
-    @keyframes fadeIn {
-        0% { opacity:0; }
-        100% { opacity:100%; }
-    }
-</style>
-{% endblock %}
-
-{% block head %}
-{{ block.super }}
-<style>
-    #left {
-        float: left;
-        margin: 5px 0 0 10px;
-        /* height: 40px; */
-    }
-
-    #right {
-        float: right;
-        margin: 5px 10px 0 0;
-        /* height: 40px; */
-    }
-
-    .inline-headers h4, .inline-headers select {
-      display: inline-block;
-      vertical-align: top;
-    }
-
-    .active {
-        background-color: #cccccc !important;
-        font-weight: bold !important;
-    }
-
-    .faqHeader {
-        font-size: 17px;
-        margin: 20px;
-    }
-
-    .panel-heading [data-toggle="collapse"]:after {
-        font-family: 'FontAwesome';
-        content: "\f078"; /* "play" icon */
-        float: right;
-        color: #F58723;
-        font-size: 18px;
-        line-height: 22px;
-        /* rotate "play" icon from > (right arrow) to down arrow */
-    /*    -webkit-transform: rotate(-90deg);
-        -moz-transform: rotate(-90deg);
-        -ms-transform: rotate(-90deg);
-        -o-transform: rotate(-90deg);
-        transform: rotate(-90deg); */
-    }
-
-    .panel-heading [data-toggle="collapse"].collapsed:after {
-        /* rotate "play" icon from > (right arrow) to ^ (up arrow) */
-    /*    -webkit-transform: rotate(90deg);
-        -moz-transform: rotate(90deg);
-        -ms-transform: rotate(90deg);
-        -o-transform: rotate(90deg);
-        transform: rotate(90deg); */
-        color: #454444;
-    }
-
-    .help-tip{
-        position: absolute;
-        /* top: 18px;
-        right: 18px;
-        bottom: 50px;  */
-        margin-left: 10px;
-        text-align: center;
-        background-color: #BCDBEA;
-        border-radius: 50%;
-        width: 24px;
-        height: 24px;
-        font-size: 14px;
-        line-height: 26px;
-        cursor: default;
-    }
-
-    .help-tip:before{
-        content:'?';
-        font-weight: bold;
-        color:#fff;
-    }
-
-    .button-tip{
-        position: absolute;
-    }
-
-    .help-tip:hover p,
-    .button-tip:hover p{
-        display:block;
-        transform-origin: 100% 0%;
-
-        -webkit-animation: fadeIn 0.3s ease-in-out;
-        animation: fadeIn 0.3s ease-in-out;
-    }
-
-    .help-tip p,
-    .button-tip p{    /* The tooltip */
-        display: none;
-        text-align: justify;
-        background-color: #1E2021;
-        padding: 20px;
-        width: 300px;
-        max-width: 300px;
-        position: absolute;
-        border-radius: 3px;
-        box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
-        right: -4px;
-        color: #FFF;
-        font-size: 13px;
-        line-height: 1.4;
-        z-index: 10000;
-    }
-
-    .help-tip p:before,
-    .button-tip p:before{ /* The pointer of the tooltip */
-        position: absolute;
-        content: '';
-        width:0;
-        height: 0;
-        border:6px solid transparent;
-        border-bottom-color:#1E2021;
-        right:10px;
-        top:-12px;
-    }
-
-    .help-tip p:after,
-    .button-tip p:after{ /* Prevents the tooltip from being hidden */
-        width:100%;
-        height:40px;
-        content:'';
-        position: absolute;
-        top:-40px;
-        left:0;
-    }
-
-    /* CSS animation */
-
-    @-webkit-keyframes fadeIn {
-        0% {
-            opacity:0;
-            transform: scale(0.6);
-        }
-
-        100% {
-            opacity:100%;
-            transform: scale(1);
-        }
-    }
-
     @keyframes fadeIn {
         0% { opacity:0; }
         100% { opacity:100%; }

diff --git a/geonode/layers/utils.py b/geonode/layers/utils.py
@@ -397,7 +397,6 @@ def file_upload(filename,
                 metadata_upload_form=False):
     """Saves a layer in GeoNode asking as little information as possible.
        Only filename is required, user and title are optional.
-
     :return: Uploaded layer
     :rtype: Layer
     """
@@ -681,9 +680,7 @@ def upload(incoming, user=None, overwrite=False,
            private=False, metadata_uploaded_preserve=False,
            charset='UTF-8'):
     """Upload a directory of spatial data files to GeoNode
-
        This function also verifies that each layer is in GeoServer.
-
        Supported extensions are: .shp, .tif, .tar, .tar.gz, and .zip (of a shapefile).
        It catches GeoNodeExceptions and gives a report per file
     """