Difference generation between versions done partly, list of differences generated.

3 files changed, 80 insertions, 66 deletions

diff --git a/gstudio/templates/gstudio/base.html b/gstudio/templates/gstudio/base.html
index 435a653..bf84918 100644
--- a/gstudio/templates/gstudio/base.html
+++ b/gstudio/templates/gstudio/base.html
@@ -45,9 +45,14 @@
      
        <h3>{% trans "Versions" %}</h3>
         <table border="1" cellspacing="0">
+	
         {% for sid in object.ref.get_ssid  %}
-	    <a href="{{ object.get_version_url }}{{ sid }}">{{ object.title }}{{ object.id }}{{ sid }}</a><br>
+	   
+	      
+	     <a href="{{ object.get_version_url }}{{ sid }}/{{ forloop.counter }}">{{ object.title }} {{ object.id }}.{{ forloop.counter }}</a><br>
+	 
         {% endfor %}
+	   
 </div>
 <br>
 
diff --git a/gstudio/templates/gstudio/display.html b/gstudio/templates/gstudio/display.html
index 67d9fff..184b58d 100644
--- a/gstudio/templates/gstudio/display.html
+++ b/gstudio/templates/gstudio/display.html
@@ -493,10 +493,9 @@ $(function() {
 		<h3>{% block content %}
 		  {% block nodetype-content %}
 		  <h2 class="nodetype-title">
-		    <a href="{{ nt.get_absolute_url }}" title="{{ nt.title }}" rel="bookmark">{{ ver_dict.title }}
+		    <a href="{{ nt.get_absolute_url }}" title="{{ nt.title }}" rel="bookmark">{{ ver_dict.title }} {{ nt.id }}.{{ cnt }}
 		    </a>
 		  </h2>
-		  <br>
 		    {% with nt.html_content|safe as object_content %}
 		    <b>Name:<nbsp></b>{{ ver_dict.title }}<br/>
 		      {% if ver_dict.altnames %}
@@ -547,19 +546,21 @@ $(function() {
 	      }
 	   </script>
 	   
-	    <form name="history" action="/nodetypes/display/showhistory/" >
+	    <form name="history" action="/nodetypes/display/showhistory/{{ ssid }}" >
 	    <table cellspacing="0" border="2">
-	    {% for sid in nt.get_ssid reversed %}
+	    <tr>
+	    <td> <input type="radio" name="group1" value="{{ ssid }}" checked >{{ nt.id }}.{{ cnt }}</input></td>
+	    <td></td></tr>
+	    {% for sid in nt.get_ssid  %}
+	    {% ifnotequal forloop.counter cnt %}
 	    <tr>
 	    <td>
-	    <input type="radio" name="group1" value="{{ sid }}" onclick="go_to_loc('{{ sid }}')" ><a href="{{ nt.get_version_url }}{{ sid }}">{{ nt.id }}.{{ sid }}</a></input>
 	    </td>
 	    <td>
-            <input type="radio" id="{{ sid }}"name="group2" value="{{ sid }}" >{{ nt.id }}.{{ sid }}</input>
-            </td>
-            {% endfor %}
 	    
-	    </table>
+            <input type="radio" id="{{ sid }}"name="group2" value="{{ sid }}" >{{ nt.id }}.{{ forloop.counter }}</input>
+            </td>{% endifnotequal %}
+            {% endfor %}</tr></table>
             <input type="submit" value="Compare" />
 	    </form>
     
diff --git a/gstudio/templates/gstudio/version_diff.html b/gstudio/templates/gstudio/version_diff.html
index ee5e305..a640f07 100644
--- a/gstudio/templates/gstudio/version_diff.html
+++ b/gstudio/templates/gstudio/version_diff.html
@@ -111,32 +111,32 @@
 		    <a href="{{ nt1.get_absolute_url }}" title="{{ nt1.title }}" rel="bookmark">{{ ver_new.title }}
 		    </a>
 		  </h2>
-		  {% block content56 %}{% for each in diffs1 %}
-                                {% autoescape off %}
-		                  {{ each }}<br>
-                                {% endautoescape %}{% endfor %} {% endblock %}
+		  <!-- {% block content56 %}{% for each in diffs1 %} -->
+                  <!--               {% autoescape off %} -->
+		  <!--                 {{ each }}<br> -->
+                  <!--               {% endautoescape %}{% endfor %} {% endblock %} -->
 		 <!--  <br> -->
-	<!-- 	    {% with nt1.html_content|safe as object_content %} -->
-	<!-- 	    <b>Name:<nbsp></b>{{ ver_new.title }}<br/> -->
-	<!-- 	    {% if ver_new.altnames %} -->
-	<!-- 	    <b> Alternate names:<nbsp></b>{{ ver_new.altnames }} -->
-	<!-- 	      <br/> -->
-	<!-- 	   {% endif %} -->
-	<!-- 	   {% if ver_new.plural %} -->
-	<!-- 	   <b> Plural Name:<nbsp></b>{{ ver_new.plural }} <br/> -->
-	<!-- 	   {% endif %} -->
-	<!-- 	    {% if ver_new.content %} -->
-	<!-- 	   <b> Content:<nbsp></b>{{ ver_new.content }} <br/> -->
-	<!-- 	   {% endif %} -->
+		    {% with nt1.html_content|safe as object_content %}<br>
+		    <b>Name:<nbsp></b>{{ ver_new.title }}<br/>
+		    {% if ver_new.altnames %}
+		    <b> Alternate names:<nbsp></b>{{ ver_new.altnames }}
+		      <br/>
+		   {% endif %}
+		   {% if ver_new.plural %}
+		   <b> Plural Name:<nbsp></b>{{ ver_new.plural }} <br/>
+		   {% endif %}
+		  
+		   <b> Content:<nbsp></b>{{ ver_new.content }} <br/>
+		   
 		    
-	<!-- 	  {% if nt1.get_rendered_nbh.authors %}<b>Authors: <nbsp> </b> -->
-	<!-- 	  {% endif %} -->
-	<!-- 	{% for author in nt1.authors.all %} -->
-      	<!-- <span class="vcard author"> -->
-        <!-- <a href="{% url gstudio_author_detail author %}" class="fn nickname url" rel="author" -->
-        <!--   title="{% blocktrans with author as author %}Show {{ author }} nodetypes{% endblocktrans %}">{{ author }}</a> -->
-      	<!-- </span>{% if not forloop.last %}, {% endif %} -->
-      	<!-- {% endfor %} <br/> -->
+		  {% if nt1.get_rendered_nbh.authors %}<b>Authors: <nbsp> </b>
+		  {% endif %}
+		{% for author in nt1.authors.all %}
+      	<span class="vcard author">
+        <a href="{% url gstudio_author_detail author %}" class="fn nickname url" rel="author"
+          title="{% blocktrans with author as author %}Show {{ author }} nodetypes{% endblocktrans %}">{{ author }}</a>
+      	</span>{% if not forloop.last %}, {% endif %}
+      	{% endfor %} <br/>
  {% endwith %}
  {% endblock %} 
  {% endblock %}
@@ -149,33 +149,41 @@
 		  <h2 class="nodetype-title">
 		    <a href="{{ nt1.get_absolute_url }}" title="{{ nt1.title }}" rel="bookmark">{{ ver_old.title }}
 		    </a>
-		  </h2>
-		  {% block content85 %}{% for each in diffs %}
-                                {% autoescape off %}
-		                  {{ each }}<br>
-                                {% endautoescape %}{% endfor %} {% endblock %}
-		  <!-- <br> -->
-	<!-- 	    {% with nt1.html_content|safe as object_content %} -->
-	<!-- 	    <b>Name:<nbsp></b>{{ ver_old.title }}<br/> -->
-	<!-- 	      {% if ver_old.altnames %} -->
-	<!-- 	    <b> Alternate names:<nbsp></b>{{ ver_old.altnames}}  -->
-	<!-- 	      <br/> -->
-	<!-- 	   {% endif %} -->
-	<!-- 	   {% if ver_old.plural %} -->
-	<!-- 	   <b> Plural Name:<nbsp></b>{{ ver_old.plural }} <br/> -->
-	<!-- 	   {% endif %} -->
-	<!-- 	   {% if ver_old.content %} -->
-	<!-- 	   <b> Content:<nbsp></b>{{ ver_old.content }} <br/> -->
-	<!-- 	   {% endif %} -->
+		  </h2><!-- <b> -->
+		  <!-- {% block content85 %}{% for each in diffs %} -->
+                  <!--               {% autoescape off %} -->
+		  <!--                 {{ each }}<br> -->
+                  <!--               {% endautoescape %}{% endfor %} {% endblock %}</b> -->
+		  <br>
+		    {% with nt1.html_content|safe as object_content %}
+		    <b>Name:<nbsp></b>{% autoescape off %}
+		                  {{ diffs.0 }}
+                                {% endautoescape %}<br> 
+		      {% if ver_old.altnames %}
+		    <b> Alternate names:<nbsp></b>  {% autoescape off %}
+		                  {{ diffs.1 }}
+                                {% endautoescape %}
+		      <br/>
+		   {% endif %}
+		   {% if ver_old.plural %}
+		   <b> Plural Name:<nbsp></b>   {% autoescape off %}
+		                  {{ diffs.2 }}
+                                {% endautoescape %} <br/>
+		   {% endif %}
+		  
+		   <b> Content:<nbsp></b>  {% autoescape off %}
+		                  {{ diffs.3 }}
+                                {% endautoescape %} <br/>
+		   
 		    
-	<!-- 	  {% if nt1.get_rendered_nbh.authors %}<b>Authors: <nbsp> </b> -->
-	<!-- 	  {% endif %} -->
-	<!-- 	{% for author in nt1.authors.all %} -->
-      	<!-- <span class="vcard author"> -->
-        <!-- <a href="{% url gstudio_author_detail author %}" class="fn nickname url" rel="author" -->
-        <!--   title="{% blocktrans with author as author %}Show {{ author }} nodetypes{% endblocktrans %}">{{ author }}</a> -->
-      	<!-- </span>{% if not forloop.last %}, {% endif %} -->
-      	<!-- {% endfor %} <br/> -->
+		  {% if nt1.get_rendered_nbh.authors %}<b>Authors: <nbsp> </b>
+		  {% endif %}
+		{% for author in nt1.authors.all %}
+      	<span class="vcard author">
+        <a href="{% url gstudio_author_detail author %}" class="fn nickname url" rel="author"
+          title="{% blocktrans with author as author %}Show {{ author }} nodetypes{% endblocktrans %}">{{ author }}</a>
+      	</span>{% if not forloop.last %}, {% endif %}
+      	{% endfor %} <br/>
  {% endwith %}
  {% endblock %} 
  {% endblock %}
@@ -192,12 +200,12 @@
 					</tr>
 <tr><td><input type="button" value="Merge"></input><input type="button" value="RollBack"></input></td> 
 <td><input type="button" value="Merge"></input><input type="button" value="RollBack"></input></td> </tr>
-<tr><th><b><i>Difference between Selected Versions<b><i><th><tr>
-<tr><td><b>{% block content5 %}{% for each in diffs %}
-                                {% autoescape off %}
-		                  {{ each }}<br>
-                                {% endautoescape %}{% endfor %} {% endblock %} </b> </td></tr>
-			       </table>	
+<!-- <tr><th><b><i>Difference between Selected Versions<b><i><th><tr> -->
+<!-- <tr><td><b>{% block content5 %}{% for each in diffs %} -->
+<!--                                 {% autoescape off %} -->
+<!-- 		                  {{ each }}<br> -->
+<!--                                 {% endautoescape %}{% endfor %} {% endblock %} </b> </td></tr> -->
+<!-- 			       </table>	 -->