summaryrefslogtreecommitdiff
path: root/gstudio/templates/gstudio/version_diff.html
blob: ee5e305c4b70235f84a13f4412b5e75ed58e425a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211

{% load i18n comments gstudio_tags %}
{% load gstudio_tags i18n  %}
{% get_tags as nodetype_tags %}
{% load adminmedia  grp_tags %}


{% load gstudio_tags i18n  %}
{% get_tags as nodetype_tags %}
{% load adminmedia  grp_tags %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<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">
	        	body {
				background-color: white;
			        display:block;
			}
			.content
			{
			}
			.content1
			{
			}
	 </style>
		{% block blockbots %}
    		<meta name="robots" content="NONE,NOARCHIVE" />
    		{% endblock %} <!-- STYLESHEETS -->
    		{% block stylesheets %}
    		<link href="{% admin_media_prefix %}css/base.css" rel="stylesheet" type="text/css" />
    		{% if LANGUAGE_BIDI %}
    		<link href="{% block stylesheet_rtl %}{% admin_media_prefix %}css/rtl.css{% endblock %}" rel="stylesheet" type="text/css" />
    		{% endif %}
    		<link href="{% admin_media_prefix %}jquery/ui/css/custom-theme/jquery-ui-1.8.custom.css" rel="stylesheet" type="text/css" media="screen" title="no title" charset="utf-8" />
    		<link href="{% admin_media_prefix %}css/jquery-ui-grappelli-extensions.css" rel="stylesheet" type="text/css" />
    		{% endblock %} <!-- EXTRASTYLES -->
    		{% block extrastyle %}{% endblock %} <!-- JAVASCRIPTS -->
    		{% block javascripts %}
    		<script type="text/javascript">
    			// GLOBALS
    			var grappelli = {},
    			// TODO: klemens: drop ADMIN_URL
    			ADMIN_URL = "{% url admin:index %}",
    			MODEL_URL_ARRAY = {% get_content_types %}, DATE_FORMAT = "{% get_date_format %}", TIME_FORMAT = "{% get_time_format %}", DATETIME_FORMAT = "{% get_datetime_format %}";
    		</script>
    		<!-- jQuery, jQuery-UI -->
    		<script src="{% admin_media_prefix %}jquery/jquery-1.6.2.min.js" type="text/javascript"></script>
    		<script src="{% admin_media_prefix %}jquery/ui/js/jquery-ui-1.8.15.custom.min.js" type="text/javascript"></script>
    		<!-- Grappelli Main JS -->
    		<script src="{% admin_media_prefix %}js/grappelli/grappelli.js" type="text/javascript"></script>
    		<!-- Grappelli jQuery Plugins, Widgets -->
    		<script src="{% admin_media_prefix %}js/grappelli/jquery.grp_collapsible.js" type="text/javascript"></script>
    		<script src="{% admin_media_prefix %}js/grappelli/jquery.grp_collapsible_group.js" type="text/javascript"></script>
    		<script src="{% admin_media_prefix %}js/grappelli/jquery.grp_timepicker.js" type="text/javascript"></script>
    		<script src="{% admin_media_prefix %}js/grappelli/jquery.grp_related_fk.js" type="text/javascript"></script>
    		<script src="{% admin_media_prefix %}js/grappelli/jquery.grp_related_m2m.js" type="text/javascript"></script>
    		<script src="{% admin_media_prefix %}js/grappelli/jquery.grp_related_generic.js" type="text/javascript"></script>
    		<script src="{% admin_media_prefix %}js/grappelli/jquery.grp_autocomplete_fk.js" type="text/javascript"></script>
    		<script src="{% admin_media_prefix %}js/grappelli/jquery.grp_autocomplete_m2m.js" type="text/javascript"></script>
    		<script src="{% admin_media_prefix %}js/grappelli/jquery.grp_autocomplete_generic.js" type="text/javascript"></script>
    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/jquery-ui-timepicker-0.2.9/include/jquery-1.5.1.min.js"></script>
    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/jquery-ui-timepicker-0.2.9/include/jquery.ui.core.min.js"></script>
    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/jquery-ui-timepicker-0.2.9/include/jquery.ui.widget.min.js"></script>
    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/jquery-ui-timepicker-0.2.9/include/jquery.ui.tabs.min.js"></script>
    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/jquery-ui-timepicker-0.2.9/include/jquery.ui.position.min.js"></script>

    <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/jquery.ui.timepicker.js"></script>

    <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
    	<script src="{{STATIC_URL}}gstudio/js/gstudio.js" type="text/javascript"></script>
    		<!-- EXTRAHEAD -->
    		{% block extrahead %}{% endblock %}

    		{% endblock %}
    		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
    		<meta http-equiv="cache-control" content="public" />
    		<meta name="robots" content="follow, all" />
    		<meta name="language" content="{{ LANGUAGE_CODE }}" />
    		<meta name="description" content="{% block meta-description %}Demonstration of the Gstudio Blog application.{% endblock %}" />
    		<meta name="keywords" content="{% block meta-keywords %}django, blog, gstudio, {{ nodetype_tags|join:", "}}{% endblock %}" />
    		<meta name="author" content="gnowgi" />
    		{% block meta %}{% endblock %}
    		<link rel="pingback" href="/xmlrpc/" />
    		<link rel="shortcut icon" href="{{ STATIC_URL }}gstudio/img/favicon.ico" />
    		<link rel="home" href="{% url gstudio_nodetype_archive_index %}" />
    		<link rel="stylesheet" type="text/css" media="screen, projection" href="{{ STATIC_URL }}gstudio/css/grappelli_skin_default.css" />
    		<link rel="stylesheet" type="text/css" media="screen, projection" href="{{ STATIC_URL }}gstudio/css/screen.css" />
    		<link rel="stylesheet" type="text/css" media="screen, projection" href="{{ STATIC_URL }}gstudio/css/screen_gstudio.css" />
    		<link rel="stylesheet" type="text/css" media="print" href="{{ STATIC_URL }}gstudio/css/print.css" />
    		{% block link %}{% endblock %}
    		{% block script %}{% endblock %} <title>Gnowledge Studio - {% block title %}{% endblock %}</title>
    	</head>
	<body id="gstudio">
		
			

	
		
		
			{% include "gstudio/_header.html" %}
			<div id="breadcrumbs" class="span-24 last">
				/ {% block breadcrumbs %}{% endblock %}
			</div>
			<!-- <div id="body" class="span-24 last" > -->
			  	<table border="0" >
					<tr><td>
					     
		<h3>{% block content %}
		  {% block nodetype-content %}
		  <h2 class="nodetype-title">
		    <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 %}
		 <!--  <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 %}

					    </td>
					    <td>
					     
		<h3>{% block content1 %}
		  {% block nodetype-content1 %}
		  <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 %} -->
		    
	<!-- 	  {% 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>	
					
			
		    


	</body>
</html>