Mercurial Mercurial > comt / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add prefix to use external caller as proxy (calls via api)
authorraph
Thu, 15 Jul 2010 16:09:52 +0200
changeset 291 7aec57e4738f
parent 290 757202d3ed11
child 292 3442202aff1a
add prefix to use external caller as proxy (calls via api)
src/cm/templates/site/text_view_comments.html file | annotate | diff | comparison | revisions
src/cm/templates/site/text_view_frame.html file | annotate | diff | comparison | revisions 
--- a/src/cm/templates/site/text_view_comments.html	Thu Jul 15 16:07:59 2010 +0200
+++ b/src/cm/templates/site/text_view_comments.html	Thu Jul 15 16:09:52 2010 +0200
@@ -64,11 +64,12 @@
 //initial comment db as json
 sv_comments = "{{ json_comments|escapejs }}";
 sv_filter_data = "{{ json_filter_datas|escapejs }}";
-sv_site_url = "{{ SITE_URL|escapejs }}";
+sv_site_url = "{% if request.GET.prefix %}{{ request.GET.prefix }}{% else %}{{ SITE_URL|escapejs }}{% endif %}";
+sv_prefix = "{% if request.GET.prefix %}{{ request.GET.prefix }}{% endif %}";
 
-sv_client_url = "{% url text-client-exchange %}?{{ request.GET.urlencode }}" ;
-sv_text_view_show_comment_url = "{% url text-view-show-comment text.key '' %}";
-sv_text_feed_url = "{% url text-feed text.key %}";
+sv_client_url = "{% if request.GET.prefix %}{{ request.GET.prefix }}{% endif %}{% url text-client-exchange %}?{{ request.GET.urlencode }}" ;
+sv_text_view_show_comment_url = "{% if request.GET.prefix %}{{ request.GET.prefix }}{% endif %}{% url text-view-show-comment text.key '' %}";
+sv_text_feed_url = "{% if request.GET.prefix %}{{ request.GET.prefix }}{% endif %}{% url text-feed text.key %}";
 
 sv_client_date_fmt = "{{ client_date_fmt.js_parse }}"; //"%Y-%m-%dT%H:%M:%S" ;
 sv_key = "{{ text.key|escapejs }}";
@@ -83,7 +84,7 @@
 
 --></script>
 
-<script type="text/javascript" src="{% url django.views.i18n.javascript_catalog %}"></script>
+<script type="text/javascript" src="{% if request.GET.prefix %}{{ request.GET.prefix }}{% endif %}{% url django.views.i18n.javascript_catalog %}"></script>
 {% if CLIENT_DEBUG  %}
 <script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/client/c_permissions.js"></script> 
 <script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/client/c_preferences.js"></script>
--- a/src/cm/templates/site/text_view_frame.html	Thu Jul 15 16:07:59 2010 +0200
+++ b/src/cm/templates/site/text_view_frame.html	Thu Jul 15 16:09:52 2010 +0200
@@ -30,7 +30,7 @@
 
     <link type="text/css" href="{{ CM_MEDIA_PREFIX }}css/site/text_view_frame.css" rel="stylesheet" />
 
-    <script type="text/javascript" src="{% url django.views.i18n.javascript_catalog %}"></script>
+    <script type="text/javascript" src="{% if request.GET.prefix %}{{ request.GET.prefix }}{% endif %}{% url django.views.i18n.javascript_catalog %}"></script>
 {% if CLIENT_DEBUG %}
     <script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/client/f_message.js"></script>
     <script type="text/javascript" src="{{ CM_MEDIA_PREFIX }}js/client/f_printDialog.js"></script>
@@ -59,6 +59,7 @@
 
 </head>
 <BODY>
+
     <DIV id="add_comment_btn" class="initially_hidden"> 
 		<img align="middle" src="{{ CM_MEDIA_PREFIX }}img/note_add_sop_mid.gif" alt="{% blocktrans %}add a comment{% endblocktrans %}" title="{% blocktrans %}add a comment{% endblocktrans %}"/>
     </DIV>
@@ -84,7 +85,8 @@
 	    {% url text-view-comments-version text.key text_version.key as frame_url %}
 	             <iframe id="text_view_comments" name="text_view_comments" class="ui-layout-center"
             width="100%" height="100%" frameborder="0" scrolling="auto"
-            src="{{ frame_url }}{{ frame_url|url_args }}{{ request.GET.urlencode }}"></iframe>
+            src="{% if request.GET.prefix %}{{ request.GET.prefix }}{% else %}{% endif %}{{ frame_url }}{{ frame_url|url_args }}{{ request.GET.urlencode }}"></iframe>
+             
              
 <!--  exemple de passage d'arguments        <iframe id="text_view_comments" name="text_view_comments" class="ui-layout-center"
             width="100%" height="100%" frameborder="0" scrolling="auto"
@@ -97,7 +99,7 @@
 <!--         <p id="validateTips">All form fields are required.</p> -->
 
 		{% url text-export text.key "FoRmAt" "DoWnLoAd" "WhIcHCoMmEnT" "WiThCoLoR" as export_url %}    
-        <form name="print_export_form" id="print_export_form" method="post" action="" target_action="{{ export_url }}{{ export_url|url_args }}{{ request.GET.urlencode }}">
+        <form name="print_export_form" id="print_export_form" method="post" action="" target_action="{% if request.GET.prefix %}{{ request.GET.prefix }}{% else %}{% endif %}{{ export_url }}{{ export_url|url_args }}{{ request.GET.urlencode }}">
 	        <fieldset>
                 <label for="p_comments">{% blocktrans %}Which comments?{% endblocktrans %}</label>
                 <select  name="p_comments" id="p_comments" />
comt