diff options
| author | Anuja <anujag@anujag-Latitude-D630.(none)> | 2012-03-19 16:38:01 +0530 |
|---|---|---|
| committer | Anuja <anujag@anujag-Latitude-D630.(none)> | 2012-03-19 16:38:01 +0530 |
| commit | 33e34a918490dab6a34ddfc0748297241a043291 (patch) | |
| tree | 82d31140d236763b999a29f7488165c25af1d091 /gstudio/templates | |
| parent | 7a4f561e851fdc7246d804c3abb6748b8a4199a6 (diff) | |
| download | gnowsys-33e34a918490dab6a34ddfc0748297241a043291.tar.gz | |
Changes made on urls,models,base,skeleton etc
Diffstat (limited to 'gstudio/templates')
| -rw-r--r-- | gstudio/templates/gstudio/base.html | 5 | ||||
| -rw-r--r-- | gstudio/templates/gstudio/nodetype_detail.html | 27 | ||||
| -rw-r--r-- | gstudio/templates/gstudio/skeleton.html | 2 | ||||
| -rw-r--r-- | gstudio/templates/gstudio/tags/breadcrumbs.html | 2 |
4 files changed, 23 insertions, 13 deletions
diff --git a/gstudio/templates/gstudio/base.html b/gstudio/templates/gstudio/base.html index 1d8898b..2c612e1 100644 --- a/gstudio/templates/gstudio/base.html +++ b/gstudio/templates/gstudio/base.html @@ -1,4 +1,5 @@ {% extends "gstudio/skeleton.html" %} +{% load gstudio_tags i18n %} {% load objectapp_tags i18n %} {% block meta %} @@ -11,11 +12,11 @@ <link rel="wlwmanifest" type="application/wlwmanifest+xml" href="{% url objectapp_wlwmanifest %}" /> <link rel="search" type="application/opensearchdescription+xml" title="Objectapp's Blog" href="{% url objectapp_opensearch %}" /> <link rel="alternate" type="application/rss+xml" title="{% trans "RSS Feed of latest gbobjects" %}" href="{% url objectapp_gbobject_latest_feed %}" /> - {% get_archives_gbobjects "objectapp/tags/archives_gbobjects_link.html" %} + <!-- {% get_archives_gbobjects "objectapp/tags/archives_gbobjects_link.html" %} --> {% endblock %} {% block breadcrumbs %} - {% objectapp_breadcrumbs %} + {% gstudio_breadcrumbs %} {% endblock %} {% block sidebar %} diff --git a/gstudio/templates/gstudio/nodetype_detail.html b/gstudio/templates/gstudio/nodetype_detail.html index 774b688..f5740ea 100644 --- a/gstudio/templates/gstudio/nodetype_detail.html +++ b/gstudio/templates/gstudio/nodetype_detail.html @@ -33,8 +33,14 @@ {% block content %} - {% block nodetype-content %} +<h2 class="nodetype-title"> + <a href="{{ object.get_absolute_url }}" title="{{ object.title }}" rel="bookmark"> + {{ object.title }} + </a> + <a href="{{ object.ref.get_edit_url }}" target="_blank" >[edit]</a> + + </h2> {% with object.html_content|safe as object_content %} @@ -117,7 +123,7 @@ {% if object.get_rendered_nbh.priornodes %} - <b>Priornodes:<nbsp></b> + <b>Prior nodes:<nbsp></b> {% for mkey,mvalue in object.get_rendered_nbh.priornodes.items %} <a href="{{mvalue}}">{{mkey}}</a>; {% endfor %}<br/> @@ -144,14 +150,15 @@ {% endif %} {% if object.get_rendered_nbh.attributes %} - - - <b>Attributes:<nbsp> </b> - - {% for items in object.get_rendered_nbh.attributes.items %} - {{items}}; - {% endfor %} <br/> + {% for atkey,atvalue in object.get_rendered_nbh.attributes.items %} + {% if atvalue %} + <b>{{atkey}}:<nbsp> </b> + {% for atr in atvalue %} + {{atr}}; + {% endfor %} <br/> + {% endif %} + {% endfor %} {% endif %} {% if object.get_rendered_nbh.leftroles %} @@ -176,7 +183,7 @@ {% if object.get_rendered_nbh.ats %} - <b>Attribute Types:<nbsp> </b> + <b>Subjecttype of:<nbsp> </b> {% for atkey,atvalue in object.get_rendered_nbh.ats.items %} <a href="{{atvalue}}">{{atkey}}</a>; diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html index a54988b..27518d7 100644 --- a/gstudio/templates/gstudio/skeleton.html +++ b/gstudio/templates/gstudio/skeleton.html @@ -144,7 +144,7 @@ vis.append("svg:g").attr("class", "nodes"); $(function() { $.ajax({ -url: '/gstudio/graphs/graph_json/{{ object.id }}', +url: '/nodetypes/graphs/graph_json/{{ object.id }}', //crossDomain: true, dataType: 'json', success : function(json) { diff --git a/gstudio/templates/gstudio/tags/breadcrumbs.html b/gstudio/templates/gstudio/tags/breadcrumbs.html index c7a5361..57f9ad9 100644 --- a/gstudio/templates/gstudio/tags/breadcrumbs.html +++ b/gstudio/templates/gstudio/tags/breadcrumbs.html @@ -1,6 +1,8 @@ {% for crumb in breadcrumbs %} {% if not forloop.last %} +{% if crumb.name %} <a href="{{ crumb.url }}" title="{{ crumb.name }}">{{ crumb.name }}</a> {{ separator }} +{% endif %} {% else %} {{ crumb.name }} {% endif %} |