From d3e801d43cccea4d01a67e8cf2e16af4298a1460 Mon Sep 17 00:00:00 2001
From: Kedar Aitawdekar <kedar2a@gmail.com>
Date: Wed, 8 Jul 2015 16:55:33 +0530
Subject: showing file/e-library gst info on LHS

---
 .../gnowsys_ndf/ndf/templates/ndf/file.html        | 25 +++++++++++-----------
 gnowsys-ndf/gnowsys_ndf/ndf/views/e-library.py     |  2 +-
 gnowsys-ndf/gnowsys_ndf/ndf/views/file.py          |  4 ++--
 3 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'gnowsys-ndf/gnowsys_ndf')

diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/file.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/file.html
index 0bcc476..ba8b5be 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/file.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/file.html
@@ -44,7 +44,18 @@
 
 <!-- left top panel -->
 {% block meta_content %}
-  <h2 class="subheader">{% trans title %}</h2>
+
+  <a href="{% url app_gst.name|lower group_name_tag %}">
+    <h2 class="subheader">
+      {% if app_gst.altnames and app_gst.altnames != "None" %}
+        {{app_gst.altnames}}
+      {% else %}
+        {{app_gst.name}}
+      {% endif%}
+    </h2>
+    {{app_gst.content|safe}}
+  </a>
+
 {% endblock %}
 
 
@@ -53,18 +64,6 @@
 
   <div class="panel" style="background-color:#ddd;">
     
-    <!-- radio buttons for E-Library app: CR and XCR -->
-    {% comment %}
-    <!-- 
-    {% if title == "E-Library" %}
-      <input type="radio" name="crxcr" value="cr" id="cr-rad" title="Curricular">
-        <label for="cr-rad" title="Curricular">CR</label>
-      <input type="radio" name="crxcr" value="xcr" id="xcr-rad" title="Extra Curricular">
-        <label for="xcr-rad" title="Extra Curricular">XCR</label>
-    {% endif %}
-    -->
-    {% endcomment %}  
-    
     <ul class="side-nav">
       <dl class="tabs" data-tab >
 
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/views/e-library.py b/gnowsys-ndf/gnowsys_ndf/ndf/views/e-library.py
index 56ffac3..d9a908f 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/views/e-library.py
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/views/e-library.py
@@ -130,7 +130,7 @@ def resource_list(request, group_id, app_id=None, page_no=1):
 
 	return render_to_response("ndf/resource_list.html", 
 								{'title': title, 
-								 'appId':app._id,
+								 'appId':app._id, "app_gst": app,
 								 # 'already_uploaded': already_uploaded,'shelf_list': shelf_list,'shelves': shelves,
 								 'files': files,
 								 "detail_urlname": "file_detail", 'ebook_pages': educationaluse_stats.get("eBooks", 0),
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/views/file.py b/gnowsys-ndf/gnowsys_ndf/ndf/views/file.py
index 0882d32..aadce4f 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/views/file.py
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/views/file.py
@@ -278,7 +278,7 @@ def file(request, group_id, file_id=None, page_no=1):
       already_uploaded = request.GET.getlist('var', "")
       return render_to_response("ndf/file.html",
                                 {'title': title,
-                                 'appId':app._id,
+                                 'appId':app._id, "app_gst": app, 
                                  'searching': True, 'query': search_field,
                                  'already_uploaded': already_uploaded,'shelf_list': shelf_list,'shelves': shelves,
                                  'files': files, 'docCollection': docCollection, 'imageCollection': imageCollection, 
@@ -374,7 +374,7 @@ def file(request, group_id, file_id=None, page_no=1):
       datavisual = json.dumps(datavisual)
       return render_to_response("ndf/file.html", 
                                 {'title': title,
-                                 'appId':app._id,
+                                 'appId':app._id, "app_gst": app,
                                  'already_uploaded': already_uploaded,'shelf_list': shelf_list,'shelves': shelves,
                                  # 'sourceid':source_id_set,
                                  'file_pages': file_pages, 'image_pages': images_pc.count(),
-- 
cgit v1.1