diff options
| author | Kedar Aitawdekar <kedar2a@gmail.com> | 2015-07-08 16:48:35 +0530 |
|---|---|---|
| committer | Kedar Aitawdekar <kedar2a@gmail.com> | 2015-07-08 16:48:35 +0530 |
| commit | 83eb43b26bb2824a1c97f277ce1fca72ef4940d1 (patch) | |
| tree | b7b8f7a7fe705f268dc541cc9728a1c1c8f379fa /gnowsys-ndf/gnowsys_ndf | |
| parent | 46bb5930d2f476370d53a8b13a1bb1d191886790 (diff) | |
| download | gnowsys-83eb43b26bb2824a1c97f277ce1fca72ef4940d1.tar.gz | |
Showing theme gst's info on LHS
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf')
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme.html | 17 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/views/topics.py | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme.html index ce33fb1..0f0d237 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme.html +++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme.html @@ -364,7 +364,16 @@ {% endcomment %} {% block meta_content %} - <a class="Tp" href="{% url 'topics' group_name_tag %}" title="Click to go to themes card view"><h2 class="subheader">{% trans "Themes" %}</h2></a> + <a class="Tp" href="{% url 'topics' group_name_tag %}" title="Click to go to themes card view"> + <h3 class="subheader"> + {% if theme_GST.altnames and theme_GST.altnames != "None" %} + {{theme_GST.altnames}} + {% else %} + {{theme_GST.name}} + {% endif%} + </h3> + </a> + {{theme_GST.content|safe}} {% endblock %} {% block related_content %} @@ -374,17 +383,17 @@ <div class="panel" style="background-color:#ddd;"> <ul class="no-bullet" id="app-set-item"> - {% get_memberof_objects_count theme_GST_id groupid as count %} + {% get_memberof_objects_count theme_GST.pk groupid as count %} <li class="selected-app-set-item"> <div> {% if user_access == "allow" %} - <a href="{% url "theme_topic_create" groupid theme_GST_id %}" style="float:right;color:#0b8a91;" title="Add Theme"> + <a href="{% url "theme_topic_create" groupid theme_GST.pk %}" style="float:right;color:#0b8a91;" title="Add Theme"> + Add </a> {% endif %} - <a href="{% url "theme_list" groupid app_id theme_GST_id %}" style="color:#0b8a91;"> + <a href="{% url "theme_list" groupid app_id theme_GST.pk %}" style="color:#0b8a91;"> Theme ({{count}}) </a> diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/views/topics.py b/gnowsys-ndf/gnowsys_ndf/ndf/views/topics.py index 6533647..48cb829 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/views/topics.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/views/topics.py @@ -130,7 +130,7 @@ def themes(request, group_id, app_id=None, app_set_id=None): # nodes_dict = node_collection.find({'member_of': {'$all': [theme_GST._id]},'group_set':{'$all': [ObjectId(group_id)]}}) return render_to_response("ndf/theme.html", - {'theme_GST_id':theme_GST._id, 'themes_cards': themes_cards, + {'theme_GST_id':theme_GST._id, 'theme_GST':theme_GST, 'themes_cards': themes_cards, 'theme_GST':theme_GST, 'group_id': group_id,'groupid': group_id,'node': node,'shelf_list': shelf_list,'shelves': shelves, 'tree': tree, 'nodes':nodes_dict,'app_id': app_id,'app_name': appName,"selected": selected, 'title': title,'themes_list_items': themes_list_items, @@ -668,7 +668,7 @@ def theme_topic_create_edit(request, group_id, app_set_id=None): ) return render_to_response("ndf/theme.html", - {'group_id': group_id,'groupid': group_id, 'drawer': drawer, 'themes_cards': themes_cards, + {'group_id': group_id,'groupid': group_id, 'drawer': drawer, 'themes_cards': themes_cards, 'theme_GST':theme_GST, 'theme_GST':theme_GST, 'shelf_list': shelf_list,'shelves': shelves, 'create_edit': create_edit, 'themes_hierarchy': themes_hierarchy,'app_id': app_id,'appId':app._id, 'nodes_list': nodes_list,'title': title,'node': node, 'parent_nodes_collection': parent_nodes_collection, |