--- a/src/cm/templates/site/text_view.html Wed Feb 03 15:42:56 2010 +0100
+++ b/src/cm/templates/site/text_view.html Wed Feb 03 20:55:30 2010 +0100
@@ -22,7 +22,6 @@
{% autoescape off %}
{{ embed_code }}
{% endautoescape %}
-<!-- <iframe id="text_view_frame" name="text_view_frame" style="height:400px;width:99.9%;" frameborder="0" src ="{% url text-view-comments-frame-version text.key text_version.key %}?{{ request.GET.urlencode }}"/> -->
</center>
</div>
--- a/src/cm/urls.py Wed Feb 03 15:42:56 2010 +0100
+++ b/src/cm/urls.py Wed Feb 03 20:55:30 2010 +0100
@@ -73,11 +73,11 @@
url(r'^text/(?P<key>\w*)/diff/(?P<id_v1>\w*)/(?P<id_v2>\w*)/$', text_diff, name="text-diff"),
# url(r'^text/(?P<key>\w*)/version/(?P<id_version>\w*)/$', text_version, name="text-version"),
+ # main client frame
url(r'^text/(?P<key>\w*)/comments_frame/$', text_view_frame, name="text-view-comments-frame"),
- url(r'^text/(?P<key>\w*)/comments_frame/\?comment_key=(?P<id>\w*)$', text_view_frame, name="text-view-comments-frame-show-comment"),
url(r'^text/(?P<key>\w*)/comments_frame/(?P<version_key>\w*)/$', text_view_frame, name="text-view-comments-frame-version"),
- url(r'^text/(?P<key>\w*)/comments_frame/\?comment_key=(?P<id>\w*)$', text_view_frame, name="text-view-comments-frame-version-show-comment"),
-
+
+ # included in text_view_frame
url(r'^text/(?P<key>\w*)/comments/$', text_view_comments, name="text-view-comments"),
url(r'^text/(?P<key>\w*)/comments/(?P<version_key>\w*)/$', text_view_comments, name="text-view-comments-version"),
--- a/src/cm/views/followup.py Wed Feb 03 15:42:56 2010 +0100
+++ b/src/cm/views/followup.py Wed Feb 03 20:55:30 2010 +0100
@@ -99,7 +99,6 @@
def text_embed(request, key):
text = get_text_by_keys_or_404(key)
- #embed_code = '<iframe frameborder="0" src="%s%s" style="height: 166px; width: 99.9%%; position: relative; top: 0px;">'%(settings.SITE_URL, reverse('text-view-comments-frame', args=[text.key]))
embed_code = embed_html(text.key) ;
template_dict = {
'text' : text,