summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gstudio/models.py75
-rw-r--r--gstudio/templates/gstudio/skeleton.html620
-rw-r--r--gstudio/templates/registration/activate.html2
-rw-r--r--gstudio/templates/registration/login.html2
-rw-r--r--gstudio/templates/registration/logout.html2
-rw-r--r--gstudio/templates/registration/password_change_done.html2
-rw-r--r--gstudio/templates/registration/password_change_form.html2
-rw-r--r--gstudio/templates/registration/password_reset_complete.html2
-rw-r--r--gstudio/templates/registration/password_reset_confirm.html2
-rw-r--r--gstudio/templates/registration/password_reset_done.html2
-rw-r--r--gstudio/templates/registration/password_reset_form.html2
-rw-r--r--gstudio/templates/registration/registration_complete.html2
-rw-r--r--gstudio/templates/registration/registration_form.html2
-rw-r--r--objectapp/models.py51
-rw-r--r--objectapp/templates/objectapp/skeleton.html160
15 files changed, 520 insertions, 408 deletions
diff --git a/gstudio/models.py b/gstudio/models.py
index a1ddf94..885b345 100644
--- a/gstudio/models.py
+++ b/gstudio/models.py
@@ -485,6 +485,7 @@ class Nodetype(Node):
(PUBLISHED, _('published')))
content = models.TextField(_('content'), null=True, blank=True)
+ content_org = models.TextField(_('content'), null=True, blank=True)
parent = models.ForeignKey('self', null=True, blank=True,
verbose_name=_('is a kind of'),
related_name='children')
@@ -667,39 +668,50 @@ class Nodetype(Node):
return attrs
def get_graph_json(self):
-
- predicate_id={"plural":"a1","altnames":"a2","contains_members":"a3","contains_subtypes":"a4"}
+
+
+ # predicate_id={"plural":"a1","altnames":"a2","contains_members":"a3","contains_subtypes":"a4","prior_nodes":"a5", "posterior_nodes":"a6"}
g_json = {}
g_json["node_metadata"]= []
-
+
nbh = self.get_nbh
-
+ predicate_id = {}
+ counter = 1
+ for key in nbh.keys():
+ val = "a" + str(counter)
+ predicate_id[key] = val
+ counter = counter + 1
+ #print predicate_id
+
+ attr_counter = -1
+
this_node = {"_id":str(self.id),"title":self.title,"screen_name":self.title, "url":self.get_absolute_url()}
+ g_json["node_metadata"].append(this_node)
+
for key in predicate_id.keys():
if nbh[key]:
try:
g_json[str(key)]=[]
g_json["node_metadata"].append({"_id":str(predicate_id[key]),"screen_name":key})
- g_json[str(key)].append({"from":self.id , "to":predicate_id[key],"value":1 })
+ g_json[str(key)].append({"from":self.id , "to":predicate_id[key],"value":1, "level":1 })
if not isinstance(nbh[key],basestring):
- for item in nbh[key]:
-
- g_json["node_metadata"].append({"_id":str(item.id),"screen_name":item.title, "title":item.title, "url":item.get_absolute_url()})
- g_json[str(key)].append({"from":predicate_id[key] , "to":item.id ,"value":1 })
-
- else:
- value={nbh["plural"]:"a4",nbh["altnames"]:"a5"}
- this_node[str(key)]=nbh[key]
-
- for item in value.keys():
- g_json["node_metadata"].append({"_id":str(value[nbh[key]]),"screen_name":nbh[key]})
- g_json[str(key)].append({"from":predicate_id[key] , "to":value[nbh[key]] ,"value":1 })
-
+ for item in nbh[key]:
+ # user
+ g_json["node_metadata"].append({"_id":str(item.id),"screen_name":item.title, "title":item.title, "url":item.get_absolute_url()})
+ g_json[str(key)].append({"from":predicate_id[key] , "to":item.id ,"value":1 })
+ else:
+ #value={nbh["plural"]:"a4",nbh["altnames"]:"a5"}
+ #this_node[str(key)]=nbh[key] key, nbh[key]
+ #for item in value.keys():
+ g_json["node_metadata"].append({"_id":attr_counter,"screen_name":nbh[key]})
+ g_json[str(key)].append({"from":predicate_id[key] , "to":attr_counter ,"value":1, "level":2 })
+ attr_counter-=1
+
except:
- pass
- g_json["node_metadata"].append(this_node)
+ pass
+ # print g_json
return json.dumps(g_json)
@@ -1171,8 +1183,8 @@ class Objecttype(Nodetype):
nbh['subjecttype_of']= self.subjecttype_of.all()
# get all the RTs for the objecttype
nbh.update(self.get_relationtypes)
-
- nbh['type_of'] = [self.parent]
+ if self.parent:
+ nbh['type_of'] = [self.parent]
nbh['contains_subtypes'] = Nodetype.objects.filter(parent=self.id)
# get all the objects inheriting this OT
@@ -1840,24 +1852,29 @@ class Intersection(Node):
reversion.register(NID)
-reversion.register(Node)
-reversion.register(Objecttype)
-reversion.register(Edge)
if not reversion.is_registered(Systemtype):
reversion.register(Systemtype)
+if not reversion.is_registered(Objecttype):
+ reversion.register(Objecttype , follow=["nodetype_ptr"])
+
+if not reversion.is_registered(Node):
+ reversion.register(Node , follow=["nid_ptr"])
+
+if not reversion.is_registered(Edge):
+ reversion.register(Edge , follow=["nid_ptr"])
+
+
if not reversion.is_registered(Processtype):
reversion.register(Processtype, follow=["changing_attributetype_set", "changing_relationtype_set"])
if not reversion.is_registered(Nodetype):
- reversion.register(Nodetype, follow=["parent", "metatypes"])
+ reversion.register(Nodetype, follow=["node_ptr","parent", "metatypes","prior_nodes", "posterior_nodes"])
if not reversion.is_registered(Metatype):
- reversion.register(Metatype, follow=["parent"])
+ reversion.register(Metatype, follow=["node_ptr","parent"])
-if not reversion.is_registered(Nodetype):
- reversion.register(Nodetype, follow=["prior_nodes", "posterior_nodes"])
if not reversion.is_registered(Relationtype):
reversion.register(Relationtype, follow=["left_subjecttype", "right_subjecttype"])
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html
index 27518d7..cb25a87 100644
--- a/gstudio/templates/gstudio/skeleton.html
+++ b/gstudio/templates/gstudio/skeleton.html
@@ -9,12 +9,31 @@
stroke: #ccc;
}
.nodetext {
- pointer-events: none;
- font: 10px sans-serif;
+ #pointer-events: none;
+ font: 10px Serif;
+ font-style:italic;
}
+ .mainnode{
+
+ font: 15px sans-serif;
+ fill:"red";
+ border-width: 1px;
+ font-weight:bold;
+ border-color: gray;
+
+ }
+ .relnode {
+ font: 10px sans-serif;
+ font-weight:bold;
+ fill:#000;
+ }
+
+
.node {
border-width: 1px;
border-color: gray;
+ fill:"green";
+ font: 10px sans-serif;
}
body {
background-color: white;
@@ -128,297 +147,334 @@
Javascript for Object type force graph
-->
- <script type="text/javascript" >
+ <script type="text/javascript" >
-var w = 700,
-h = 300,
-fill = d3.scale.category20();
+ var w = 700,
+ h = 300,
+ fill = d3.scale.category20();
-var vis = d3.select("#chart")
-.append("svg:svg")
-.attr("width", w)
-.attr("height", h);
+ var vis = d3.select("#chart")
+ .append("svg:svg")
+ .attr("width", w)
+ .attr("height", h);
-vis.append("svg:g").attr("class", "edges");
-vis.append("svg:g").attr("class", "nodes");
+ vis.append("svg:g").attr("class", "edges");
+ vis.append("svg:g").attr("class", "nodes");
$(function() {
-$.ajax({
-url: '/nodetypes/graphs/graph_json/{{ object.id }}',
-//crossDomain: true,
-dataType: 'json',
-success : function(json) {
-
-//var node = NID.objects.get(slug='{{ slug }}');
-var force;
-
-// this contains all the nodes as a dict with _id as the key
-
-var nodes_by_id = _.reduce(json.node_metadata, function(acc, n) {
-acc[n._id] = n;
-return acc;
-}, {});
-
-var member_of = _(json.member_of).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'member_of';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var contains_subtypes = _(json.contains_subtypes).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'contains_subtypes';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var contains_members = _(json.contains_members).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'contains_members';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var left_subjecttype_of = _(json.left_subjecttype_of).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'left_subjecttype_of';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var subjecttype_of = _(json.subjecttype_of).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'subjecttype_of';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var plural = _(json.plural).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'plural';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var altnames = _(json.altnames).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'altnames';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var content = _(json.content).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'content';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var contains_members = _(json.contains_members).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'contains_members';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var authors = _(json.authors).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'authors';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var type_of = _(json.type_of).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'type_of';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var right_subjecttype_of = _(json.right_subjecttype_of).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'right_subjecttype_of';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var follows_edges = _(json.is_followed_by).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'follows_edges';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-var mentions_edges = _(json.is_mentioned_by).chain().map(function(e) {
-e.source = nodes_by_id[e.from];
-e.target = nodes_by_id[e.to];
-e.type = 'mentions_edges';
-return e;
-}).filter(function(e){
-return nodes_by_id[e.from] && nodes_by_id[e.to]
-}).value();
-
-nodes_by_id[{{ object.id }}].x = w/2.0;
-nodes_by_id[{{ object.id }}].y = h/2.0;
-
-all_edges = new Array();
-all_edges = all_edges.concat(follows_edges, member_of, contains_members, contains_subtypes, mentions_edges, right_subjecttype_of, left_subjecttype_of, subjecttype_of, type_of,plural,altnames,contains_members,authors,content);
-/* all_edges.concat(follows_edges);
-all_edges.concat(member_of_metatype);
-all_edges.concat(contains_members);
-all_edges.concat(contains_subtypes);
-all_edges.concat(mentions_edges);
-
-document.getElementById('debugbox1').value= follows_edges; //member_of_metatype
-document.getElementById('debugbox2').value= mentions_edges;
-//document.getElementById('debugbox2').value= member_of_metatype;
-document.getElementById('debugbox3').value= all_edges;
-*/
-var force = d3.layout.force()
-.linkStrength(0.5)
-.charge(-2000)
-.friction(0.7)
-.gravity(0.7)
-.linkDistance(10)
-.nodes([])
-.links([])
-.size([w, h])
-.start();
-
-function update(edges){
-// for each func
-_.each(nodes_by_id, function(n){n.added = false});
-// reduce the nodes list to have only those nodes for a given rel.
-nodes = _.reduce(edges, function(acc, e) {
-if(nodes_by_id[e.from] && !nodes_by_id[e.from].added){
-nodes_by_id[e.from].added = true;
-acc.push(nodes_by_id[e.from]);
-}
-if(nodes_by_id[e.to] && !nodes_by_id[e.to].added){
-nodes_by_id[e.to].added = true;
-acc.push(nodes_by_id[e.to]);
-}
-return acc;
-}, []);
-
-force.nodes(nodes);
-force.links(edges);
-force.start();
-
-link = d3.select("#chart g.edges").selectAll("line.link")
-.data(edges, function(e){return e.from + "-" + e.to + "-" + e.type});
-
-link.enter().append("svg:line")
-.attr("class", "link")
-.style("stroke-width", 2 /* function(d) {
-return Math.sqrt(d.value);
-} */ )
-.attr("x1", function(d) {
-return d.source.x;
-})
-
-.attr("y1", function(d) {
-return d.source.y;
-})
-.attr("x2", function(d) {
-return d.target.x;
-})
-.attr("y2", function(d) {
-return d.target.y;
-})
-.append("a")
-.text(function(d) { return d.type; });
-
-var node = d3.select("#chart g.nodes").selectAll("g.node").data(nodes);
-
-var new_g = node.enter().append("svg:g")
-.attr("class", "node")
-.call(force.drag);
-
-new_g.append("svg:circle")
-.attr("cx", function(d) { return d.x - w/2.0 + 15; })
-.attr("cy", function(d) { return d.y - h/2.0 + 15; })
-.attr("r", 7)
-.style("fill", function color(d) { if (d._id=={{ object.id }}) return "red"; else if (d._id== "a1" || d._id== "a2" || d._id== "a3" ) return "steelblue" ; else return "yellow"});
-
-new_g.append("svg:text")
-.attr("dy", 20)
-.attr("dx", 25)
-
-/* .attr("text-anchor", "middle") */
-.text(function(d) {
-return d.screen_name;
-});
-
-node.exit().remove();
-
-force.on("tick", function() {
-
-var x_center = $("#chart").width() / 2;
-var y_center = $("#chart").height() / 2;
-
-link.attr("x1", function(d) { return d.source.x; })
-.attr("y1", function(d) { return d.source.y; })
-.attr("x2", function(d) { return d.target.x; })
-.attr("y2", function(d) { return d.target.y; });
-
-node.attr("transform", function(d) { return "translate(" + (d.x-16) + "," + (d.y-16) + ")"; });
-
-});
-}
-
-update(all_edges);
-vis.style("opacity", 1e-6)
-.transition()
-.duration(1000)
-.style("opacity", 1);
-
-/* $('input#follows').change(function(){
-update(all_edges);
-});
-*/
-
-/* $('input#mentions').change(function(){
-update(all_edges);
-}); */
-}
-});
+ $.ajax({
+ url: '/nodetypes/graphs/graph_json/{{ object.id }}',
+ //crossDomain: true,
+ dataType: 'json',
+ success : function(json) {
+
+ //var node = NID.objects.get(slug='{{ slug }}');
+ var force;
+
+ // this contains all the nodes as a dict with _id as the key
+
+ var nodes_by_id = _.reduce(json.node_metadata, function(acc, n) {
+ acc[n._id] = n;
+ return acc;
+ }, {});
+
+ var member_of = _(json.member_of).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'member_of';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+
+ var contains_subtypes = _(json.contains_subtypes).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'contains_subtypes';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+ var contains_members = _(json.contains_members).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'contains_members';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+
+ var left_subjecttype_of = _(json.left_subjecttype_of).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'left_subjecttype_of';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+
+ var subjecttype_of = _(json.subjecttype_of).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'subjecttype_of';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+ var plural = _(json.plural).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'plural';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+
+ var altnames = _(json.altnames).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'altnames';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+ var content = _(json.content).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'content';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+ var contains_members = _(json.contains_members).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'contains_members';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+
+
+ var type_of = _(json.type_of).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'type_of';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+
+ var right_subjecttype_of = _(json.right_subjecttype_of).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'right_subjecttype_of';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+
+ var follows_edges = _(json.is_followed_by).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'follows_edges';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+
+
+ var prior_nodes = _(json.prior_nodes).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'prior_node';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+ var posterior_nodes = _(json.posterior_nodes).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'posterior_node';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+
+ var mentions_edges = _(json.is_mentioned_by).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'mentions_edges';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();
+
+
+ nodes_by_id[{{ object.id }}].x = w/2.0;
+ nodes_by_id[{{ object.id }}].y = h/2.0;
+
+ all_edges = new Array();
+ all_edges = all_edges.concat(follows_edges, member_of, contains_members, contains_subtypes, mentions_edges, right_subjecttype_of, left_subjecttype_of, subjecttype_of, type_of,plural,altnames,contains_members,content, prior_nodes, posterior_nodes);
+ /* all_edges.concat(follows_edges);
+ all_edges.concat(member_of_metatype);
+ all_edges.concat(contains_members);
+ all_edges.concat(contains_subtypes);
+ all_edges.concat(mentions_edges);
+
+
+ document.getElementById('debugbox1').value= follows_edges; //member_of_metatype
+ document.getElementById('debugbox2').value= mentions_edges;
+ //document.getElementById('debugbox2').value= member_of_metatype;
+ document.getElementById('debugbox3').value= all_edges;
+ */
+ var force = d3.layout.force()
+ .linkStrength(0.5)
+ .charge(-2000)
+ .friction(0.7)
+ .gravity(0.7)
+ .linkDistance(13)
+ .nodes([])
+ .links([])
+ .size([w, h])
+ .start();
+
+ function update(edges){
+ // for each func
+ _.each(nodes_by_id, function(n){n.added = false});
+ // reduce the nodes list to have only those nodes for a given rel.
+ nodes = _.reduce(edges, function(acc, e) {
+ if(nodes_by_id[e.from] && !nodes_by_id[e.from].added){
+ nodes_by_id[e.from].added = true;
+ acc.push(nodes_by_id[e.from]);
+ }
+ if(nodes_by_id[e.to] && !nodes_by_id[e.to].added){
+ nodes_by_id[e.to].added = true;
+ acc.push(nodes_by_id[e.to]);
+ }
+ return acc;
+ }, []);
+
+ force.nodes(nodes);
+ force.links(edges);
+ force.start();
+
+ link = d3.select("#chart g.edges").selectAll("line.link")
+ .data(edges, function(e){return e.from + "-" + e.to + "-" + e.type});
+
+ link.enter().append("svg:line")
+ .attr("class", "link")
+ .style("stroke-width", 2 /* function(d) {
+ return Math.sqrt(d.value);
+ } */ )
+ .attr("x1", function(d) {
+ return d.source.x;
+ })
+ .attr("y1", function(d) {
+ return d.source.y;
+ })
+ .attr("x2", function(d) {
+ return d.target.x;
+ })
+ .attr("y2", function(d) {
+ return d.target.y;
+ })
+ .attr("text", function(d) {
+ return d.type;
+ })
+
+ .append("a")
+ .text(function(d) { return d.type; });
+
+
+ var node = d3.select("#chart g.nodes").selectAll("g.node").data(nodes);
+
+ var new_g = node.enter().append("svg:a")
+ .attr("class", function(d) { if (d._id=={{ object.id }}) return "mainnode"; else if (isNaN(d._id)) return "relnode"; else if ((d._id)<0) return "nodetext"; else return "node"; })
+ .attr("xlink:href",function(d){return d.url;})
+ .call(force.drag);
+
+
+
+
+ new_g.append("svg:circle")
+ .attr("cx", function(d) { return d.x - w/2.0 + 15; })
+ .attr("cy", function(d) { return d.y - h/2.0 + 15; })
+ .attr("r", function(d) { if (d._id=={{ object.id }}) return 8; else if (isNaN(d._id) || (d._id)<0) return 1; else return 7 })
+ .style("fill", function color(d) { if (d._id=={{ object.id }}) return "red"; else if (isNaN(d._id) || (d._id)<0) return "white" ; else return "green"});
+
+ new_g.append("svg:text")
+ .attr("class",function(d) { if (d._id=={{ object.id }}) return "mainnode"; else if (isNaN(d._id)) return "relnode"; else if ((d._id)<0) return "nodetext"; else return "node"; })
+ .attr("dy", 20)
+ .attr("dx", 25)
+ .attr("text-anchor",function text(d) { if (isNaN(d._id) || (d._id)<0) return "middle" ; else return "left"})
+
+// .attr("style",function text(d) { if (isNaN(d._id)) return "font-size:9.00pt;fill:#333;" ; else return "font-size:9.00pt;fill:black;"})
+
+ .text(function(d) {
+ return d.screen_name;
+ });
+
+ node.exit().remove();
+
+
+
+ force.on("tick", function() {
+
+ var x_center = $("#chart").width() / 2;
+ var y_center = $("#chart").height() / 2;
+
+ link.attr("x1", function(d) { return d.source.x; })
+ .attr("y1", function(d) { return d.source.y; })
+ .attr("x2", function(d) { return d.target.x; })
+ .attr("y2", function(d) { return d.target.y; });
+
+ node.attr("transform", function(d) { return "translate(" + (d.x-16) + "," + (d.y-16) + ")"; });
+
+ });
+ }
+
+ update(all_edges);
+ vis.style("opacity", 1e-6)
+ .transition()
+ .duration(1000)
+ .style("opacity", 1);
+
+ /* $('input#follows').change(function(){
+ update(all_edges);
+ });
+ */
+
+ /* $('input#mentions').change(function(){
+ update(all_edges);
+ }); */
+ }
+ });
+
// $("#relation_type").buttonset();
-
+
// $('input#mentions').change(function(){console.log(this)});
// $('input#follows').change(function(){console.log(this)});
});
- </script>
- </div>
+
+</script>
+ </div>
</div>
<div>
{% include "gstudio/_header.html" %}
diff --git a/gstudio/templates/registration/activate.html b/gstudio/templates/registration/activate.html
index e85121e..45df694 100644
--- a/gstudio/templates/registration/activate.html
+++ b/gstudio/templates/registration/activate.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "gstudio/base.html" %}
{% load i18n %}
{% block content %}
diff --git a/gstudio/templates/registration/login.html b/gstudio/templates/registration/login.html
index 4e0d763..222505c 100644
--- a/gstudio/templates/registration/login.html
+++ b/gstudio/templates/registration/login.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "gstudio/base.html" %}
{% load i18n %}
{% block content %}
diff --git a/gstudio/templates/registration/logout.html b/gstudio/templates/registration/logout.html
index fe17eba..8749565 100644
--- a/gstudio/templates/registration/logout.html
+++ b/gstudio/templates/registration/logout.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "gstudio/base.html" %}
{% load i18n %}
{% block content %}
diff --git a/gstudio/templates/registration/password_change_done.html b/gstudio/templates/registration/password_change_done.html
index 659be0a..b0f6f28 100644
--- a/gstudio/templates/registration/password_change_done.html
+++ b/gstudio/templates/registration/password_change_done.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "gstudio/base.html" %}
{% load i18n %}
{% block content %}
diff --git a/gstudio/templates/registration/password_change_form.html b/gstudio/templates/registration/password_change_form.html
index a640aa6..71d84df 100644
--- a/gstudio/templates/registration/password_change_form.html
+++ b/gstudio/templates/registration/password_change_form.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "gstudio/base.html" %}
{% load i18n %}
{% block content %}
diff --git a/gstudio/templates/registration/password_reset_complete.html b/gstudio/templates/registration/password_reset_complete.html
index ef3637c..d0a6df9 100644
--- a/gstudio/templates/registration/password_reset_complete.html
+++ b/gstudio/templates/registration/password_reset_complete.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "gstudio/base.html" %}
{% load i18n %}
{% block content %}
diff --git a/gstudio/templates/registration/password_reset_confirm.html b/gstudio/templates/registration/password_reset_confirm.html
index 3990f06..38b04f9 100644
--- a/gstudio/templates/registration/password_reset_confirm.html
+++ b/gstudio/templates/registration/password_reset_confirm.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "gstudio/base.html" %}
{% load i18n %}
{% block content %}
diff --git a/gstudio/templates/registration/password_reset_done.html b/gstudio/templates/registration/password_reset_done.html
index 6057ccb..344c088 100644
--- a/gstudio/templates/registration/password_reset_done.html
+++ b/gstudio/templates/registration/password_reset_done.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "gstudio/base.html" %}
{% load i18n %}
{% block content %}
diff --git a/gstudio/templates/registration/password_reset_form.html b/gstudio/templates/registration/password_reset_form.html
index a640aa6..71d84df 100644
--- a/gstudio/templates/registration/password_reset_form.html
+++ b/gstudio/templates/registration/password_reset_form.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "gstudio/base.html" %}
{% load i18n %}
{% block content %}
diff --git a/gstudio/templates/registration/registration_complete.html b/gstudio/templates/registration/registration_complete.html
index 3d3d950..a86f977 100644
--- a/gstudio/templates/registration/registration_complete.html
+++ b/gstudio/templates/registration/registration_complete.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "gstudio/base.html" %}
{% load i18n %}
{% block content %}
diff --git a/gstudio/templates/registration/registration_form.html b/gstudio/templates/registration/registration_form.html
index a640aa6..71d84df 100644
--- a/gstudio/templates/registration/registration_form.html
+++ b/gstudio/templates/registration/registration_form.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "gstudio/base.html" %}
{% load i18n %}
{% block content %}
diff --git a/objectapp/models.py b/objectapp/models.py
index fb846f5..15c904c 100644
--- a/objectapp/models.py
+++ b/objectapp/models.py
@@ -362,39 +362,50 @@ class Gbobject(Node):
def get_graph_json(self):
-
- predicate_id={"plural":"a1","altnames":"a2","member_of":"a3"}
+
+
+ # predicate_id={"plural":"a1","altnames":"a2","contains_members":"a3","contains_subtypes":"a4","prior_nodes":"a5", "posterior_nodes":"a6"}
g_json = {}
g_json["node_metadata"]= []
-
+
nbh = self.get_nbh
-
+ predicate_id = {}
+ counter = 1
+ for key in nbh.keys():
+ val = "a" + str(counter)
+ predicate_id[key] = val
+ counter = counter + 1
+ #print predicate_id
+
+ attr_counter = -1
+
this_node = {"_id":str(self.id),"title":self.title,"screen_name":self.title, "url":self.get_absolute_url()}
+ g_json["node_metadata"].append(this_node)
+
for key in predicate_id.keys():
if nbh[key]:
try:
g_json[str(key)]=[]
g_json["node_metadata"].append({"_id":str(predicate_id[key]),"screen_name":key})
- g_json[str(key)].append({"from":self.id , "to":predicate_id[key],"value":1 })
+ g_json[str(key)].append({"from":self.id , "to":predicate_id[key],"value":1, "level":1 })
if not isinstance(nbh[key],basestring):
- for item in nbh[key]:
-
- g_json["node_metadata"].append({"_id":str(item.id),"screen_name":item.title, "title":item.title, "url":item.get_absolute_url()})
- g_json[str(key)].append({"from":predicate_id[key] , "to":item.id ,"value":1 })
-
- else:
- value={nbh["plural"]:"a4",nbh["altnames"]:"a5"}
- this_node[str(key)]=nbh[key]
-
- for item in value.keys():
- g_json["node_metadata"].append({"_id":str(value[nbh[key]]),"screen_name":nbh[key]})
- g_json[str(key)].append({"from":predicate_id[key] , "to":value[nbh[key]] ,"value":1 })
-
+ for item in nbh[key]:
+ # user
+ g_json["node_metadata"].append({"_id":str(item.id),"screen_name":item.title, "title":item.title, "url":item.get_absolute_url()})
+ g_json[str(key)].append({"from":predicate_id[key] , "to":item.id ,"value":1 })
+ else:
+ #value={nbh["plural"]:"a4",nbh["altnames"]:"a5"}
+ #this_node[str(key)]=nbh[key] key, nbh[key]
+ #for item in value.keys():
+ g_json["node_metadata"].append({"_id":attr_counter,"screen_name":nbh[key]})
+ g_json[str(key)].append({"from":predicate_id[key] , "to":attr_counter ,"value":1, "level":2 })
+ attr_counter-=1
+
except:
- pass
- g_json["node_metadata"].append(this_node)
+ pass
+ print g_json
return json.dumps(g_json)
diff --git a/objectapp/templates/objectapp/skeleton.html b/objectapp/templates/objectapp/skeleton.html
index 36069e0..ff24c85 100644
--- a/objectapp/templates/objectapp/skeleton.html
+++ b/objectapp/templates/objectapp/skeleton.html
@@ -5,38 +5,54 @@
<html xml:lang="{{ LANGUAGE_CODE }}" lang="{{ LANGUAGE_CODE }}" version="-//W3C//DTD XHTML 1.1//EN" xmlns="http://www.w3.org/1999/xhtml">
<head>
-<style type="text/css">
- .link {
- stroke : #ccc;
- }
-
- .nodetext {
- pointer-events : none;
- font : 10px sans-serif;
- }
-
- .node {
- border-width : 1px;
- border-color : gray;
- }
- body {
- background-color:white;
- }
+ <style type="text/css">
+ .link {
+ stroke: #ccc;
+ }
+ .nodetext {
+ #pointer-events: none;
+ font: 10px Serif;
+ font-style:italic;
+ }
+ .mainnode{
+
+ font: 15px sans-serif;
+ fill:"red";
+ border-width: 1px;
+ font-weight:bold;
+ border-color: gray;
+
+ }
+ .relnode {
+ font: 10px sans-serif;
+ font-weight:bold;
+ fill:#000;
+ }
+
- #chart {
- height: 90%;
- margin: 0 auto;
- width: 90%;
- }
-
- svg {
- margin-left: 10%;
- margin-right: 10%;
- display: block;
- position:absolute;
- }
-
- </style>
+ .node {
+ border-width: 1px;
+ border-color: gray;
+ fill:"green";
+ font: 10px sans-serif;
+ }
+ body {
+ background-color: white;
+ }
+ #chart {
+ height: 90%;
+ margin: 0 auto;
+ width: 90%;
+ display: block;
+ }
+ svg {
+ margin-left: 10%;
+ margin-right: 10%;
+ display: block;
+ position: absolute;
+ }
+
+ </style>
<!-- the header lines from grappelli -->
{% block blockbots %}
<meta name="robots" content="NONE,NOARCHIVE" />
@@ -156,17 +172,17 @@ $(function() {
dataType: 'json',
success : function(json) {
-
+ //var node = NID.objects.get(slug='{{ slug }}');
var force;
-
+ // this contains all the nodes as a dict with _id as the key
var nodes_by_id = _.reduce(json.node_metadata, function(acc, n) {
acc[n._id] = n;
return acc;
}, {});
-
- var member_of = _(json.member_of).chain().map(function(e) {
+
+ var member_of = _(json.member_of).chain().map(function(e) {
e.source = nodes_by_id[e.from];
e.target = nodes_by_id[e.to];
e.type = 'member_of';
@@ -232,17 +248,28 @@ $(function() {
}).filter(function(e){
return nodes_by_id[e.from] && nodes_by_id[e.to]
}).value();
+
- var content = _(json.content).chain().map(function(e) {
+
+ var type_of = _(json.type_of).chain().map(function(e) {
e.source = nodes_by_id[e.from];
e.target = nodes_by_id[e.to];
- e.type = 'content';
+ e.type = 'type_of';
return e;
}).filter(function(e){
return nodes_by_id[e.from] && nodes_by_id[e.to]
}).value();
- var contains_members = _(json.contains_members).chain().map(function(e) {
+ /*var content = _(json.content).chain().map(function(e) {
+ e.source = nodes_by_id[e.from];
+ e.target = nodes_by_id[e.to];
+ e.type = 'content';
+ return e;
+ }).filter(function(e){
+ return nodes_by_id[e.from] && nodes_by_id[e.to]
+ }).value();*/
+
+ contains_members = _(json.contains_members).chain().map(function(e) {
e.source = nodes_by_id[e.from];
e.target = nodes_by_id[e.to];
e.type = 'contains_members';
@@ -251,20 +278,19 @@ $(function() {
return nodes_by_id[e.from] && nodes_by_id[e.to]
}).value();
- var authors = _(json.authors).chain().map(function(e) {
+ var prior_nodes = _(json.prior_nodes).chain().map(function(e) {
e.source = nodes_by_id[e.from];
e.target = nodes_by_id[e.to];
- e.type = 'authors';
+ e.type = 'prior_node';
return e;
}).filter(function(e){
return nodes_by_id[e.from] && nodes_by_id[e.to]
- }).value();
+ }).value();
-
- var type_of = _(json.type_of).chain().map(function(e) {
+ var posterior_nodes = _(json.posterior_nodes).chain().map(function(e) {
e.source = nodes_by_id[e.from];
e.target = nodes_by_id[e.to];
- e.type = 'type_of';
+ e.type = 'posterior_node';
return e;
}).filter(function(e){
return nodes_by_id[e.from] && nodes_by_id[e.to]
@@ -305,7 +331,7 @@ $(function() {
nodes_by_id[{{ object.id }}].y = h/2.0;
all_edges = new Array();
- all_edges = all_edges.concat(follows_edges, member_of, contains_members, contains_subtypes, mentions_edges, right_subjecttype_of, left_subjecttype_of, subjecttype_of, type_of,plural,altnames,contains_members,authors,content);
+ all_edges = all_edges.concat(follows_edges, member_of, contains_members, contains_subtypes, mentions_edges, right_subjecttype_of, left_subjecttype_of, subjecttype_of,type_of,plural,altnames,contains_members, prior_nodes,posterior_nodes);
/* all_edges.concat(follows_edges);
all_edges.concat(member_of_metatype);
all_edges.concat(contains_members);
@@ -323,7 +349,7 @@ $(function() {
.charge(-2000)
.friction(0.7)
.gravity(0.7)
- .linkDistance(50)
+ .linkDistance(15)
.nodes([])
.links([])
.size([w, h])
@@ -370,37 +396,39 @@ $(function() {
.attr("y2", function(d) {
return d.target.y;
})
+ .attr("text", function(d) {
+ return d.type;
+ })
+
.append("a")
.text(function(d) { return d.type; });
- var node = d3.select("#chart g.nodes").selectAll("g.node").data(nodes);
- //.filter(function(d) { return !(d._id=="a4" && d._id=="a5")});
+ var node = d3.select("#chart g.nodes").selectAll("g.node").data(nodes);
- var new_g = node.enter().append("svg:g")
- .attr("class", "node")
- .call(force.drag);
-
-
-
-
-
+
+ var new_g = node.enter().append("svg:a")
+ .attr("class", function(d) { if (d._id=={{ object.id }}) return "mainnode"; else if (isNaN(d._id)) return "relnode"; else if ((d._id)<0) return "nodetext"; else return "node"; })
+ .attr("xlink:href", function(d){return d.url;})
+ .call(force.drag);
- new_g.append("svg:circle")
+ new_g.append("svg:circle")
.attr("cx", function(d) { return d.x - w/2.0 + 15; })
- .attr("cy", function(d) { return d.y - h/2.0 + 15; })
- .attr("r", 7)
- .style("fill", function color(d) { if (d._id=={{ object.id }}) return "red"; else if (d._id== "a1" || d._id== "a2" || d._id== "a3" ) return "steelblue" ; else return "yellow"});
-
-
-
+ .attr("cy", function(d) { return d.y - h/2.0 + 15; })
+ .attr("r", function(d) { if (d._id=={{ object.id }}) return 8; else if (isNaN(d._id) || (d._id)<0) return 1; else return 7 })
+ .style("fill", function color(d) { if (d._id=={{ object.id }}) return "red"; else if (isNaN(d._id) || (d._id)<0) return "white" ; else return "green"});
+
+
new_g.append("svg:text")
+ .attr("class",function(d) { if (d._id=={{ object.id }}) return "mainnode"; else if (isNaN(d._id)) return "relnode"; else if ((d._id)<0) return "nodetext"; else return "node"; })
.attr("dy", 20)
- .attr("dx", 25)
-
- /* .attr("text-anchor", "middle") */
+ .attr("dx", 25)
+ .attr("text-anchor",function text(d) { if (isNaN(d._id) || (d._id)<0) return "middle" ; else return "left"})
+
+// .attr("style",function text(d) { if (isNaN(d._id)) return "font-size:9.00pt;fill:#333;" ; else return "font-size:9.00pt;fill:black;"})
+
.text(function(d) {
return d.screen_name;
});
generated by cgit v1.1 at 2024-09-12 15:42:55 +0000