summaryrefslogtreecommitdiff
path: root/gstudio/templates/gstudio/version_diff.html
blob: 4a11ec2ad22080ce2a16822436911cf599828f42 (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
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390

{% 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="{{ nt.get_absolute_url }}" title="{{ nt.title }}" rel="bookmark">{{ ver_new_dict.title }} {{ nt.id }}.{{ version_no1 }}
		    </a>
		  </h2>
		 
		   {% with nt.html_content|safe as object_content %}<br>
		    
		     <b>Name:<nbsp></b> {{ ver_new_nbh_dict.title  }} <br/>
                           
			   {% if ver_new_nbh_dict.plural or ver_old_nbh_dict.plural  %}
                                <b> Plural Name:<nbsp></b>
                                         {{ ver_new_nbh_dict.plural}} <br/>
                           {% endif %}
                            {% if ver_new_nbh_dict.altnames or ver_old_nbh_dict.altnames%}
                               <b> Alternate names:<nbsp></b>
                                         {{ ver_new_nbh_dict.altnames}} <br/>
		           {% endif %}
	                   {% if ver_new_nbh_dict.type_of  or ver_old_nbh_dict.type_of %}
                                <b> Type of:<nbsp></b>
                                {% for typekey,typevalue in ver_new_nbh_dict.type_of.items %}
                                       <a href="{{typevalue}}" title = "{{typekey}}">{{typekey}}</a>;
                                {% endfor %}<br/>
                           {% endif %}

			  
			    {% if ver_new_nbh_dict.member_of_metatypes  or ver_old_nbh_dict.member_of_metatypes %}
                           
                          
                                <b> Member of Metatypes:<nbsp></b>
                                    {% for mkey,mvalue in ver_new_nbh_dict.member_of_metatypes.items %}
                                        <a href="{{mvalue}}" title = "{{mkey}}">{{mkey}}</a>;
                                    {% endfor %}<br/>
                           {% endif %}
                          
			   
			        
                           {% if ver_new_nbh_dict.contains_subtypes   or ver_old_nbh_dict.contains_subtypes %}
                                <b> Contains SubTypes:<nbsp></b>
                                {% for stkey,stvalue in ver_new_nbh_dict.items %}
                                        <a href="{{stvalue}}" title = "{{stkey}}">{{stkey}}</a>;
                                {% endfor %}<br/>
                           {% endif %}
                          
                          
                           {% if ver_new_nbh_dict.contains_members  or ver_old_nbh_dict.contains_members  %}
                         
                          
                                <b>Contains Members:<nbsp></b>
                                    {% for mkey,mvalue in ver_new_nbh_dict.contains_members.items %}
                                        <a href="{{mvalue}}" title = "{{mkey}}">{{mkey}}</a>;
                                    {% endfor %}<br/>
                           {% endif %}
                         
                           
                         
                         
                           
                                
			<!-- 	   <b>Authors: <nbsp> </b> -->
                                
				       
	                  
			
                        <!--       {% for author in nt.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 ver_new_nbh_dict.priornodes  or ver_old_nbh_dict.priornodes %}
                         
                           
                                <b>Prior nodes:<nbsp></b>
                                    {% for mkey,mvalue in ver_new_nbh_dict.items %}
                                        <a href="{{mvalue}}" title = "{{mkey}}">{{mkey}}</a>;
                                    {% endfor %}<br/>
                           {% endif %}
                           
                           {% if ver_new_nbh_dict.posteriornodes  or ver_old_nbh_dict.posteriornodes %}
                         
                           
                                <b>Posterior nodes:<nbsp></b>
                                    {% for mkey,mvalue in ver_new_nbh_dict.items %}
                                        <a href="{{mvalue}}" title = "{{mkey}}">{{mkey}}</a>;
                                    {% endfor %}<br/>
                           {% endif %}
                             
                            {% if ver_new_nbh_dict.relations  or ver_old_nbh_dict.relations %}
                         
                         
                                 {% for relkey,relvalue in ver_new_nbh_dict.relations.items %}
                                          <b>{{relkey}}:<nbsp></b>
					{% for relk, relv in relvalue.items %}
					    <a href="{{relv}}" title = "{{relk}}">{{relk}}</a>;	      
                                        {% endfor %}<br/>
				 {% endfor %}      
	                   {% endif %}
                           
                           {% if ver_new_nbh_dict.attributes  or ver_old_nbh_dict.attributes %}
                           
				    {% for atkey,atvalue in ver_new_nbh_dict.attributes.items %}
                                      {% if atvalue %}
                                       <b>{{atkey}}:<nbsp> </b>
                                        {% for atr in atvalue %}
                                        	   {{atr}};   
                                         {% endfor %} <br/>
                                      {% endif %}
				    {% endfor %}       
	                   {% endif %}
                            {% if ver_new_nbh_dict.leftroles   or ver_old_nbh_dict.leftroles %}
                         
                                                         
				   <b>Left roles:<nbsp> </b>
                                
				    {% for lrkey,lrvalue in ver_new_nbh_dict.leftroles.items %}
                                        <a href="{{lrvalue}}" title = "{{lrkey}}">{{lrkey}}</a>;	      
				    {% endfor %}       <br/>
	                   {% endif %}
                           
                           {% if ver_new_nbh_dict.rightroles  or ver_old_nbh_dict.rightroles  %}
                        
			      <b>Right roles:<nbsp> </b>
                                
				    {% for rrkey,rrvalue in ver_new_nbh_dict.rightroles.items %}
                                        <a href="{{rrvalue}}" title = "{{rrkey}}">{{rrkey}}</a>;	      
				    {% endfor %}       <br/>
	                   {% endif %}
                           
                          
                           {% if ver_new_nbh_dict.ats  or ver_old_nbh_dict.ats  %}
                                             
                                
				   <b>Subjecttype of:<nbsp> </b>
                                
				    {% for atkey,atvalue in ver_new_nbh_dict.ats.items %}
                                        <a href="{{atvalue}}" title = "{{atkey}}">{{atkey}}</a>;	      
				    {% endfor %}       <br/>
	                   {% endif %}
                           
			   {% if ver_new_nbh_dict.content or  ver_old_nbh_dict.content   %} 
                            <b>Content:<nbsp></b>{{ ver_new_nbh_dict.content }}
                           {% endif %}

		   {% endwith %}
		   {% endblock %} 
		   {% endblock %}

					    </td>
					    <td>
					     
		<h3>{% block content1 %}
		  {% block nodetype-content1 %}
		  <h2 class="nodetype-title">
		    <a href="{{ nt.get_absolute_url }}" title="{{ nt.title }}" rel="bookmark">{{ ver_old_dict.title }} {{ nt.id }}.{{ version_no2 }}
		    </a>
		  </h2> <br>
		    {% with nt.html_content|safe as object_content %}

		    <b>Name:<nbsp></b>{% autoescape off %}
		                  {{ compare_dict.title }}
                                {% endautoescape %}<br> 
	           {% if ver_old_nbh_dict.plural or ver_new_nbh_dict.plural %}
		   <b> Plural Name:<nbsp></b>   {% autoescape off %}
		                  {{ compare_dict.plural }}
                                {% endautoescape %} <br/>
		   {% endif %}
		   {% if ver_old_nbh_dict.altnames or ver_new_nbh_dict.altnames %}
		    <b> Alternate names:<nbsp></b>  {% autoescape off %}
		                  {{ compare_dict.altnames }}
                                {% endautoescape %}
		      <br/>
		   {% endif %}
		   {% if ver_new_nbh_dict.type_of or ver_old_nbh_dict.type_of %}
		      <b> Type of:<nbsp></b>  {% autoescape off %}
		                  {{ compare_dict.type_of }}
                                {% endautoescape %}
		      <br/>
		   {% endif %}
		   {% if ver_new_nbh_dict.member_of_metatypes or ver_old_nbh_dict.member_of_metatypes %}
		      <b>Member of Metatypes:<nbsp></b>  {% autoescape off %}
		                  {{ compare_dict.member_of_metatypes }}
                                {% endautoescape %}
		      <br/>
		   {% endif %}
		   {% if ver_new_nbh_dict.contains_subtypes or ver_old_nbh_dict.contains_subtypes %}
		      <b>Contain subtypes:<nbsp></b>  {% autoescape off %}
		                  {{ compare_dict.contains_subtypes }}
                                {% endautoescape %}
		      <br/>
		   {% endif %}
                                
		   {% if ver_old_nbh_dict.contains_members or ver_new_nbh_dict.contains_members  %}
		   <b>Contains Members:<nbsp></b>{% autoescape off %}
		                  {{ compare_dict.contains_members }}
                                {% endautoescape %} <br/>
		    {% endif %}
		    {% if ver_new_nbh_dict.priornodes or ver_old_nbh_dict.priornodes %}
				  <b>Prior nodes:<nbsp></b> {% autoescape off %}
		                  {{ compare_dict.priornodes }}
                                {% endautoescape %}<br/>
                           
                              
                     {% endif %}
                     {% if ver_new_nbh_dict.posteriornodes or ver_old_nbh_dict.posteriornodes %}
		     <b>Posterior nodes:<nbsp></b> {% autoescape off %}
		                                         {{ compare_dict.posteriornodes }}
                                            {% endautoescape %}<br/>
                           
                              
                      {% endif %}
                           
                      {% if ver_new_nbh_dict.relations or ver_old_nbh_dict.relations %}
                        {% for relkey,relvalue in compare_dict.relations.items %}
                             <b>{{relkey}}:<nbsp></b>             
					    {% autoescape off %}
					    
					       
		                               {{ relvalue }}
					      
                                       
					    {% endautoescape %}
                                            <br/>  
		       {% endfor %} 
	               {% endif %}
                           
                       {% if ver_new_nbh_dict.attributes or ver_old_nbh_dict.attributes %}
                        <b>Attributes:<nbsp></b> {% autoescape off %}
		                                         {{ compare_dict.attributes }}
                                            {% endautoescape %}<br/>   
	               {% endif %}
		   
	
	           {% if ver_new_nbh_dict.leftroles or ver_old_nbh_dict.leftroles %}
                  <b>Left roles:<nbsp> </b> {% autoescape off %}
		                  {{ compare_dict.leftroles }}
                                {% endautoescape %}
                                       <br/>
	          {% endif %}
	          {% if ver_new_nbh_dict.rightroles or ver_old_nbh_dict.rightroles %}
                  <b>Right roles:<nbsp> </b> {% autoescape off %}
		                  {{ compare_dict.rightroles }}
                                {% endautoescape %}
                                       <br/>
	          {% endif %}
                   {% if ver_new_nbh_dict.ats or ver_old_nbh_dict.ats %}
                                             
                                
				   <b>Subjecttype of:<nbsp> </b> {% autoescape off %}
		                  {{ compare_dict.ats }}
                                {% endautoescape %}<br>
		    {% endif %}
                    {% if ver_new_nbh_dict.content or ver_old_nbh_dict.content %}
                     <b> Content:<nbsp></b>  {% autoescape off %}
		         {{ compare_dict.content }}
                       {% endautoescape %} <br/>
                    {% endif %}                                     
 {% endwith %}
 {% endblock %} 
 {% endblock %}
<br>
</td></tr>
<tr><td>
<form method="get" action="/nodetypes/display/merge/{{ ssid1 }}/{{ ssid2 }}">
<input type="submit" value="Merge {{ nt.id }}.{{ version_no1 }} with {{ nt.id }}.{{ version_no2 }}" id="merge1" name="left" ></input></td>
<td><input type="submit" value="Merge {{ nt.id }}.{{ version_no2 }} with {{ nt.id }}.{{ version_no1 }}" id="merge2" name="right"></input></td></form>
</tr>
<tr><td>
<form method="get" action="/nodetypes/display/revert" >
<input type="submit" value="Revert" name="{{ ssid1 }}"></input></td>
<td><input type="submit" value="Revert" name="{{ ssid2 }}"></input></td>
</form></tr>
</table>						
</body>
</html>