Merge branch 'dev' of gitlab.geoint.mx:mario.chirinos/GeoInt_SIDT into dev

GeoInt_SIDT/urls.py

@@ -27,4 +27,5 @@ urlpatterns = [
 	url(r'^reports/', include('reports.urls')),
 	url(r'^$', RedirectView.as_view(url='/catalog/', permanent=True)),
 	url(r'^accounts/', include('django.contrib.auth.urls')),
-] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+] 
+#+ static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

catalog/templates/base_top.html

@@ -26,7 +26,7 @@
     <div class="wrmapper">
       <header class="main-header">
         <!-- Logo -->
-        <a href="index2.html" class="logo">
+        <a class="logo">
           <!-- mini logo for sidebar mini 50x50 pixels -->
           <span class="logo-mini"><b>G</b>eo</span>
           <!-- logo for regular state and mobile devices -->

catalog/views.py

@@ -49,6 +49,7 @@ def requestToImage(request):
     img_link = request.GET['value']
     r        = requests.get(img_link, auth=("emmhp", "geoemm29"), stream=True)
     img_str  = base64.b64encode(r.content)
+    img_str = img_str.decode('utf-8')
 
     return JsonResponse({'img': img_str})
 
@@ -89,8 +90,12 @@ def productList(request):
     catalog = []
     for p in products:
         # img_link = products[p]['link_icon']
-        # img_link = img_link[:img_link.find("/")+2] + "emmhp:geoemm29@" + img_link[img_link.find("/")+2:]
+        # img_link = img_link[:img_link.find("/")+2] + "emmhp:geoemm29@" + img_link[img_link.find("/")+2:]        
 
+        if products[p].get('tileid') is None:
+            titleid = products[p]['title'].split("_")
+            products[p]['tileid'] = titleid[5][1:]
+        
         catalog.append({
             'process'          : process,
             'start_date'       : init_date,