summaryrefslogtreecommitdiff
path: root/gstudio/templates
diff options
context:
space:
mode:
authorArun yadav <arunkumar5587@gmail.com>2012-05-09 15:15:55 +0530
committerArun yadav <arunkumar5587@gmail.com>2012-05-09 15:15:55 +0530
commit7e02e008009c476c831d7dcda78db9bc22beb42e (patch)
tree93d7af0af0dad7d2aa646f26cdb49eb1dfe098e4 /gstudio/templates
parentd121f3bdbcbefd176f3d70c871542c745f6e0e0f (diff)
downloadgnowsys-7e02e008009c476c831d7dcda78db9bc22beb42e.tar.gz
Added views ,templates and some version related properties in models.py
Diffstat (limited to 'gstudio/templates')
-rw-r--r--gstudio/templates/gstudio/base.html13
-rw-r--r--gstudio/templates/gstudio/display.html12
-rw-r--r--gstudio/templates/gstudio/version_diff.html180
3 files changed, 187 insertions, 18 deletions
diff --git a/gstudio/templates/gstudio/base.html b/gstudio/templates/gstudio/base.html
index 8625e13..20b010d 100644
--- a/gstudio/templates/gstudio/base.html
+++ b/gstudio/templates/gstudio/base.html
@@ -52,19 +52,8 @@
<h3>{% trans "Versions" %}</h3>
<table border="1" cellspacing="0">
{% for sid in object.get_ssid reversed %}
- <tr>
- <td width="5%" >
- <input type="radio" name="group1" value="{{ sid }}"><a href="{{ object.get_version_url }}{{ sid }}">{{ object.id }}{{ sid }}</a></input>
- </td>
- <td width="5%">
- <input type="radio" name="group2" value="{{ sid }}">{{ sid }}</input>
- </td>
- </tr>
- <br>
+ <a href="{{ object.get_version_url }}{{ sid }}">{{ object.title }}{{ object.id }}{{ sid }}</a><br>
{% endfor %}
- </table>
- <br>
- <input type="submit" value="Compare" />
</div>
<br>
diff --git a/gstudio/templates/gstudio/display.html b/gstudio/templates/gstudio/display.html
index f4c2dfb..f2053a6e 100644
--- a/gstudio/templates/gstudio/display.html
+++ b/gstudio/templates/gstudio/display.html
@@ -523,9 +523,9 @@ $(function() {
{% block sidebar %}
<div class="History">
- <!-- <script type="text/javascript"> -->
+ <script type="text/javascript">
<!-- function go_to_loc(sid) -->
- <!-- { -->
+ <!-- { -->
<!-- window.location.href = "{{ nt.get_version_url }}"+sid -->
@@ -533,10 +533,10 @@ $(function() {
<!-- } -->
- <!-- </script> -->
+ <!-- </script> -->
<h3>{% trans "Versions" %}</h3>
- <form action="" method="POST" >
+ <form action="/nodetypes/display/showhistory/" >
<table cellspacing="0" border="2">
{% for sid in nt.get_ssid reversed %}
<tr>
@@ -544,10 +544,10 @@ $(function() {
<input type="radio" name="group1" value="{{ sid }}"><a href="{{ nt.get_version_url }}{{ sid }}">{{ nt.id }}.{{ sid }}</a></input>
</td>
<td>
- <input type="radio" name="group2" value="{{ sid }}">{{ sid }}</input>
+ <input type="radio" name="group2" value="{{ sid }}">{{ nt.id }}.{{ sid }}</input>
</td>
{% endfor %}
-
+
</table>
<input type="submit" value="Compare" />
</form>
diff --git a/gstudio/templates/gstudio/version_diff.html b/gstudio/templates/gstudio/version_diff.html
new file mode 100644
index 0000000..8130574
--- /dev/null
+++ b/gstudio/templates/gstudio/version_diff.html
@@ -0,0 +1,180 @@
+
+{% 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>
+ <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/>
+ {% 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>
+ <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/>
+ {% endwith %}
+ {% endblock %}
+ {% endblock %}
+
+ </td>
+ </tr>
+ </table>
+
+
+
+
+
+ </body>
+</html>
+
+
+
+
generated by cgit v1.1 at 2024-08-22 02:41:48 +0000