listar directorios

administration/templates/dashboard.html

@@ -133,7 +133,7 @@
         <!-- Main content -->
         <section class="content">
             <div class="panel panel-default">
-                <div class="panel-heading">Requests</div>
+                <div class="panel-heading">{{ Viewname }}</div>
                 <div class="panel-body text-center">
                     <table data-toggle="table" id="example" class="table table-striped table-bordered"
                            style="width:100%">

administration/urls.py

@@ -3,6 +3,6 @@ from django.conf.urls import url
 from . import views
 
 urlpatterns = [
-    url(r'^$', views.Request, name='Dashboard'),
+    url(r'^$', views.Request_users, name='Dashboard'),
     url(r'^update/$', views.update_user, name='update'),
 ]
\ No newline at end of file

administration/views.py

@@ -6,7 +6,7 @@ from django.http import HttpResponse, HttpResponseRedirect
 from PIL import Image
 
 # Create your views here.
-def Request (request):
+def Request_users (request):
     if request.user.is_superuser or request.user.is_staff:
         user_list = []
         for user in User.objects.filter(is_active=False):
@@ -21,12 +21,11 @@ def Request (request):
                 "superuser": user.is_superuser,
             })
         #messages.success(request, 'your registration is being processed')
-        return render(request,'dashboard.html',{'users': user_list})
+        return render(request,'users_table.html',{'users': user_list, "Viewname" : "Request"})
     else:
         return redirect('../')
 #------------------------------------------------------------------------
 def update_user(request):
-    """
     is_active = False
     is_staff = False
     is_superuser = False
@@ -46,5 +45,5 @@ def update_user(request):
 
     messages.success(request, 'the user was updated')
     return HttpResponseRedirect('../')
-    """
-    imagen = Image.open("")
+def active_users(request):
+    pass
\ No newline at end of file

catalog/templates/base_top.html

@@ -48,7 +48,7 @@
                 <ul class="nav navbar-nav">
                     <li>
                         {% if request.user.is_superuser %}
-                            <a id="product-list-toggle" href="#" title="super user"><i
+                            <a id="product-list-toggle" href="../administration" title="super user"><i
                                 class="fa fa-gears"></i></a>
                         {% endif %}
                     </li>

reports/templates/L2ASCL_data.html

@@ -276,7 +276,10 @@
                     <div class="box box-success">
                         <div class="box-body with-border">
                             <div class="row">
-                                <div class="col-lg-2 col-lg-offset-1 text-center">
+                                <div class="col-lg-2 text-center">
+                                    <h4>Zone: {{report}}</h4>
+                                </div>
+                                <div class="col-lg-2 text-center">
                                     <h4>Platform: {{platform}}</h4>
                                 </div>
                                 <div class="col-lg-2 text-center">
@@ -420,7 +423,7 @@
     <!-- /.content -->
 {% endblock %}
 {% block scripts %}
-    <!-- page script --> 
+    <!-- page script -->
     <script>
         var label;
         // Recibimos el JSON con los datos desde el View

reports/views.py

@@ -100,7 +100,7 @@ def report_L2ASCL(request, report, purchase_id):
         #		graphData['options']['maintainAspectRatio']=False
         # print(json.dumps(graphData).encode("utf-8")) 
 
-    return render(request, 'L2ASCL_data.html', {"graphData": json.dumps(graphData),"name":"foo", "report_name": "SCL Image Classification Data(Km²)", "startDate": startDate,"endDate": endDate,"clouds": dataProduct['clouds'], "platform": dataProduct['platform'],"productLevel": dataProduct['productLevel'] ,"IMAGE_PATH": image_path, 'dafaultLabel': defaultLabel, 'defaultDataSet': defaultDataset, "folders" : folders })
+    return render(request, 'L2ASCL_data.html', {"graphData": json.dumps(graphData),"name":"foo", "report_name": "SCL Image Classification Data(Km²)", "startDate": startDate,"endDate": endDate,"clouds": dataProduct['clouds'], "platform": dataProduct['platform'],"productLevel": dataProduct['productLevel'] ,"IMAGE_PATH": image_path, 'dafaultLabel': defaultLabel, 'defaultDataSet': defaultDataset, "folders" : folders,"report":reporteDir })
 
 
     # -------------------------------------------------------------------------------def Reports(request):