diff options
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html')
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html index 59e9cf3..6548448 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html +++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html @@ -303,7 +303,6 @@ ul#navigation li a.last { <div class="row page" itemscope itemtype="{{schema.1.type}}"> <section class="medium-9 columns"> - {% if breadcrumbs_list %} <ul class="breadcrumbs"> {% for e in breadcrumbs_list %} @@ -316,6 +315,15 @@ ul#navigation li a.last { </b></li> {% endfor %} </ul> + {% elif node.teaches %} + <ul class="breadcrumbs"> + <li> + {% for each_topic in node.teaches %} + <a href="{% url 'topic_details' group_name_tag each_topic.pk %}" style="color:black;">{{ each_topic.name }},</a> + {% endfor %} + </li> + </ul> + {% endif %} {% if node.status == 'MODERATION' %} @@ -559,23 +567,7 @@ ul#navigation li a.last { --> {% endcomment %} - <div class="small-4 columns"> - {% get_teaches_list node as teaches_list %} - {% if teaches_list %} - <div class="panel"> - <h6>Resource for: </h6> - {% for each_node in teaches_list %} - {% get_grid_fs_object each_node as grid_fs_obj %} - {% if each_node.mime_type %} - <a href="{% url 'read_file' group_name_tag each_node.pk grid_fs_obj.filename %}{% if nav_list %}?nav_li={{nav_list}}{% endif %}">{{ each_node.name }}</a>, - {% else %} - <a href="{% url 'topic_details' group_name_tag each_node.pk %}{% if nav_list %}?nav_li={{nav_list}}{% endif %}">{{ each_node.name }}</a> - {% if not forloop.last %}, {% endif %} - {% endif %} - {% endfor %} - </div> - {% endif %} - </div> + <div class="small-4 columns"> </div> <div class="small-4 small-pull-4 columns"> <!-- {#% if node.assesses %#} --> @@ -1291,7 +1283,8 @@ ul#navigation li a.last { {% edit_policy groupid node request.user as status %} - {% if user.is_authenticated and status == "allow" and user_access == "allow" and "Group" in group_object.member_of_names_list %} + {% if user.is_authenticated and status == "allow" and user_access == "allow" %} + {% if "Group" in group_object.member_of_names_list or "Author" in group_object.member_of_names_list %} {% get_edit_url node.pk as edit_url %} {% check_group node as is_group %} @@ -1460,6 +1453,7 @@ ul#navigation li a.last { {% endif %} {% endif %} {% endif %} + {% endif %} </div> {% endif %} @@ -1661,7 +1655,7 @@ ul#navigation li a.last { {% if topic %} - location.href = "{% url 'theme_page' group_name_tag theme_id %}?selected="+clicked_node+""; + location.href = "{% url 'theme_page' group_name_tag theme_id %}?tree=hierarchical&selected="+clicked_node+""; {% else %} |