From 431f589903ea3f03678a3c20acfd478ae4c15805 Mon Sep 17 00:00:00 2001
From: Arun yadav <arunkumar5587@gmail.com>
Date: Fri, 18 May 2012 16:37:44 +0530
Subject: templates and views for history, with colour diff v1

---
 gstudio/templates/gstudio/version_diff.html | 103 ++++++++++++++++++----------
 1 file changed, 67 insertions(+), 36 deletions(-)

(limited to 'gstudio/templates/gstudio/version_diff.html')

diff --git a/gstudio/templates/gstudio/version_diff.html b/gstudio/templates/gstudio/version_diff.html
index 8130574..ee5e305 100644
--- a/gstudio/templates/gstudio/version_diff.html
+++ b/gstudio/templates/gstudio/version_diff.html
@@ -111,24 +111,32 @@
 		    <a href="{{ nt1.get_absolute_url }}" title="{{ nt1.title }}" rel="bookmark">{{ ver_new.title }}
 		    </a>
 		  </h2>
-		  <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> {{ diffs }}  
-		      <br/>
-		   {% endif %}
-		   {% if ver_new.plural %}
-		   <b> Plural Name:<nbsp></b>{{ ver_new.plural }} <br/>
-		   {% endif %}
-		  {% 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/>
+		  {% 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 %} -->
+		    
+	<!-- 	  {% 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 %}
@@ -142,30 +150,53 @@
 		    <a href="{{ nt1.get_absolute_url }}" title="{{ nt1.title }}" rel="bookmark">{{ ver_old.title }}
 		    </a>
 		  </h2>
-		  <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 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/>
+		  {% 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 %} -->
+		    
+	<!-- 	  {% 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 %}
 
 					    </td>
+					
+<!-- <th><b><i><br><u>Difference between Selected Versions</u></b></i><br><br> -->
+<!-- {% block content6 %}{% for each in diffs %} -->
+<!--                                 {% autoescape off %} -->
+<!-- 		                  {{ each }}<br> -->
+<!--                                 {% endautoescape %}{% endfor %} {% endblock %}  -->
+<!-- </th> -->
+
 					</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>	
 					
 			
-- 
cgit v1.1