Changeset 1093 in main for branches


Ignore:
Timestamp:
05/10/12 14:16:46 (8 years ago)
Author:
pcosquer
Message:

add a lof of missing urlencode filters

Location:
branches/1.0/openPLM
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • branches/1.0/openPLM/document3D/templates/decompose_msg.html

    r913 r1093  
    33 
    44        <li> 
    5         A document (<a href="/object/{{element.0.type}}/{{element.0.reference}}/{{element.0.revision}}/">{{ element.0.reference }}</a> ) 
    6         with a STEP file (<a href="/file/{{element.1.id}}/">{{ element.1.filename }}</a>) 
     5        A document (<a href="/object/{{element.0.type|urlencode }}/{{element.0.reference|urlencode }}/{{element.0.revision|urlencode }}/">{{ element.0.reference }}</a> ) 
     6        with a STEP file (<a href="/file/{{element.1.id|urlencode }}/">{{ element.1.filename }}</a>) 
    77        is linked to this part. Do you want to analyse it to build the BOM? 
    8         <a style="color:#FFFF00" href="{{part.plmobject_url}}decompose/{{ element.1.id }}/">Yes</a>              
     8        <a style="color:#FFFF00" href="{{part.plmobject_url}}decompose/{{ element.1.id|urlencode }}/">Yes</a>              
    99    </li> 
    1010 
  • branches/1.0/openPLM/templates/attributes.html

    r984 r1093  
    2828        {% if is_owner %} 
    2929            {% ifequal object_type 'User' %} 
    30                 <a class="{{"Button"|button}}" href="/user/{{object_reference}}/modify/"><span class="ui-button-text">{% trans "Edit this information" %}</span></a> 
    31                 <a class="{{"Button"|button}}" href="/user/{{object_reference}}/password/"><span class="ui-button-text">{% trans "Change my password" %}</span></a> 
     30                <a class="{{"Button"|button}}" href="/user/{{object_reference|urlencode }}/modify/"><span class="ui-button-text">{% trans "Edit this information" %}</span></a> 
     31                <a class="{{"Button"|button}}" href="/user/{{object_reference|urlencode }}/password/"><span class="ui-button-text">{% trans "Change my password" %}</span></a> 
    3232            {% else %} 
    3333                {% if obj.is_editable %} 
    3434                    <a class="{{"Button"|button}}"  
    35                         href="/object/{{object_type}}/{{object_reference}}/{{object_revision}}/modify/"> 
     35                        href="/object/{{object_type|urlencode }}/{{object_reference|urlencode }}/{{object_revision|urlencode }}/modify/"> 
    3636                        <span class="ui-button-text">{% trans "Edit this information" %}</span> 
    3737                    </a> 
     
    6969                        <span class="comment posted-by"> 
    7070                            {% trans "Posted by:" %} 
    71                             <a href="/user/{{comment.user}}/">{{ comment.user_name }}</a> 
     71                            <a href="/user/{{comment.user|urlencode }}/">{{ comment.user_name }}</a> 
    7272                        </span> 
    7373                        <span class="comment date"> 
  • branches/1.0/openPLM/templates/base.html

    r1015 r1093  
    9494                                <li class="{{"Button"|button:"corner-left"}}" id="NavigateButton"> 
    9595                            {% endif %} 
    96                             <a href="{% if obj.plmobject_url %}{{obj.plmobject_url}}navigate/{% else %}/user/{{user}}/navigate/{% endif %}"> 
     96                            <a href="{% if obj.plmobject_url %}{{obj.plmobject_url}}navigate/{% else %}/user/{{user|urlencode }}/navigate/{% endif %}"> 
    9797                                <span class="ui-button-text">{% trans "NAVIGATE" %}</span> 
    9898                            </a> 
     
    103103                                <li class="{{"Button"|button:"corner-right"}}" id="StudyButton"> 
    104104                            {% endif %} 
    105                             <a href="{% if obj.plmobject_url %}{{obj.plmobject_url}} {% else %}/user/{{user}}/{% endif %}"> 
     105                            <a href="{% if obj.plmobject_url %}{{obj.plmobject_url}} {% else %}/user/{{user|urlencode }}/{% endif %}"> 
    106106                                <span class="ui-button-text">{% trans "STUDY" %}</span> 
    107107                            </a> 
  • branches/1.0/openPLM/templates/blocks/supermenu.html

    r923 r1093  
    1717    <div class="menurow"> 
    1818        <div class="menuitem">  
    19         <a class="tooltip" href="/user/{{user}}/parts-doc-cad/"> 
     19        <a class="tooltip" href="/user/{{user|urlencode }}/parts-doc-cad/"> 
    2020            {% trans "Study" %} 
    2121            <span class="triangle">&nbsp;</span> 
     
    2727    </div> 
    2828    <div class="menuitem">  
    29     <a class="tooltip" href="/user/{{user}}/navigate/"> 
     29    <a class="tooltip" href="/user/{{user|urlencode }}/navigate/"> 
    3030        {% trans "Navigate" %} 
    3131        <span class="triangle">&nbsp;</span> 
  • branches/1.0/openPLM/templates/blocks/user.html

    r901 r1093  
    33 
    44{% get_current_language as LANGUAGE_CODE %} 
    5 <a href="/user/{{user}}/">{{user.get_full_name}}</a> | {% now "D j N Y, G:i"%} 
     5<a href="/user/{{user|urlencode }}/">{{user.get_full_name}}</a> | {% now "D j N Y, G:i"%} 
    66<form id="SetLangForm" action="/i18n/setlang/" method="post"> 
    77    <ul> 
  • branches/1.0/openPLM/templates/create.html

    r917 r1093  
    7272                </li> 
    7373                <li> 
    74                 <a href="/user/{{user.username}}/delegation/sponsor/"> 
     74                <a href="/user/{{user.username|urlencode }}/delegation/sponsor/"> 
    7575                    {% trans "Sponsor a new user" %} 
    7676                <li> 
  • branches/1.0/openPLM/templates/documents/files.html

    r971 r1093  
    8787 
    8888                                {% if instance.locked %} 
    89                                     <a class="{{"Button"|button}}" href="./checkin/{{instance.id}}/"> 
     89                                    <a class="{{"Button"|button}}" href="./checkin/{{instance.id|urlencode }}/"> 
    9090                                        <span class="ui-button-text check-in">{% trans "CHECK-IN" %}</span> 
    9191                                    </a> 
     
    9696                                        <a class="{{"Button"|button}} 
    9797                                            {% if instance.native_related %}check-out {% endif %}" 
    98                                             href="./checkout/{{instance.id}}/"> 
     98                                            href="./checkout/{{instance.id|urlencode }}/"> 
    9999                                            <span id="{{instance.id}}" class="ui-button-text">{% trans "CHECK-OUT" %}</span> 
    100100                                        </a>                                     
     
    143143            <h6>{% trans "Deprecated files:" %}</h6> 
    144144            {% for doc_file in deprecated_files %}         
    145                 <p><a href="/file/{{doc_file.id}}/">{{doc_file.filename}}</a></p>             
     145                <p><a href="/file/{{doc_file.id|urlencode }}/">{{doc_file.filename}}</a></p>             
    146146            {% endfor %}     
    147147        </div> 
  • branches/1.0/openPLM/templates/groups/pending_invitations.html

    r808 r1093  
    2121                    {% with inv.guest as guest %} 
    2222                        <td class="Content">  
    23                             <a href="/user/{{guest.username}}/"> 
     23                            <a href="/user/{{guest.username|urlencode }}/"> 
    2424                                {{ guest.username }} 
    2525                            </a> 
  • branches/1.0/openPLM/templates/groups/users.html

    r808 r1093  
    3636 
    3737                    <td class="Content">  
    38                         <a href="/user/{{obj.owner.username}}/"> 
     38                        <a href="/user/{{obj.owner.username|urlencode }}/"> 
    3939                            {{ obj.owner.username }} 
    4040                        </a> 
     
    5555 
    5656                        <td class="Content">  
    57                             <a href="/user/{{form.user_data.username}}/"> 
     57                            <a href="/user/{{form.user_data.username|urlencode }}/"> 
    5858                                {{ form.user_data.username }} 
    5959                            </a> 
  • branches/1.0/openPLM/templates/history.html

    r808 r1093  
    2929                        {{histo.action}} 
    3030                    </span> 
    31                     <a href="/user/{{histo.user}}/"> 
     31                    <a href="/user/{{histo.user|urlencode }}/"> 
    3232                        <span class="user"> 
    3333                            {{histo.user}} 
  • branches/1.0/openPLM/templates/mails/invitation1.html

    r808 r1093  
    1010 
    1111        <p> {% trans "Click here to accept the invitation" %}</p> 
    12         <a href="http://{{site.domain}}/group/{{group.name}}/invitation/accept/{{invitation.token}}/"> {% trans "Accept invitation" %} 
     12        <a href="http://{{site.domain}}/group/{{group.name|urlencode }}/invitation/accept/{{invitation.token}}/"> {% trans "Accept invitation" %} 
    1313        </a> 
    1414        <p> {% trans "Click here to refuse the invitation" %}</p> 
    15         <a href="http://{{site.domain}}/group/{{group.name}}/invitation/refuse/{{invitation.token}}/"> {% trans "Refuse invitation" %} 
     15        <a href="http://{{site.domain}}/group/{{group.name|urlencode }}/invitation/refuse/{{invitation.token}}/"> {% trans "Refuse invitation" %} 
    1616        </a> 
    1717    </body> 
  • branches/1.0/openPLM/templates/mails/invitation1.txt

    r371 r1093  
    66 
    77{% trans "Click here to accept the invitation" %} 
    8 http://{{site.domain}}/group/{{group.name}}/invitation/accept/{{invitation.token}}/ 
     8http://{{site.domain}}/group/{{group.name|urlencode }}/invitation/accept/{{invitation.token}}/ 
    99 
    1010{% trans "Click here to refuse the invitation" %} 
    11 http://{{site.domain}}/group/{{group.name}}/invitation/refuse/{{invitation.token}}/ 
     11http://{{site.domain}}/group/{{group.name|urlencode }}/invitation/refuse/{{invitation.token}}/ 
    1212{% endautoescape %} 
  • branches/1.0/openPLM/templates/mails/invitation2.html

    r808 r1093  
    1010 
    1111        <p> {% trans "Click here to accept the invitation" %}</p> 
    12         <a href="http://{{site.domain}}/group/{{group.name}}/invitation/accept/{{invitation.token}}/"> {% trans "Accept invitation" %} 
     12        <a href="http://{{site.domain}}/group/{{group.name|urlencode }}/invitation/accept/{{invitation.token}}/"> {% trans "Accept invitation" %} 
    1313        </a> 
    1414        <p> {% trans "Click here to refuse the invitation" %}</p> 
    15         <a href="http://{{site.domain}}/group/{{group.name}}/invitation/refuse/{{invitation.token}}/"> {% trans "Refuse invitation" %} 
     15        <a href="http://{{site.domain}}/group/{{group.name|urlencode }}/invitation/refuse/{{invitation.token}}/"> {% trans "Refuse invitation" %} 
    1616        </a> 
    1717    </body> 
  • branches/1.0/openPLM/templates/mails/invitation2.txt

    r371 r1093  
    66 
    77{% trans "Click here to accept the invitation" %} 
    8 http://{{site.domain}}/group/{{group.name}}/invitation/accept/{{invitation.token}}/ 
     8http://{{site.domain}}/group/{{group.name|urlencode }}/invitation/accept/{{invitation.token}}/ 
    99 
    1010{% trans "Click here to refuse the invitation" %} 
    11 http://{{site.domain}}/group/{{group.name}}/invitation/refuse/{{invitation.token}}/ 
     11http://{{site.domain}}/group/{{group.name|urlencode }}/invitation/refuse/{{invitation.token}}/ 
    1212{% endautoescape %} 
  • branches/1.0/openPLM/templates/mails/new_account.html

    r808 r1093  
    2929        </table> 
    3030        <p> {% trans "You should change your password!" %}</p> 
    31         <a href="http://{{site.domain}}/user/{{new_user.username}}/password/"> 
     31        <a href="http://{{site.domain}}/user/{{new_user.username|urlencode }}/password/"> 
    3232            {% trans "Click here to change your password" %} 
    3333        </a> 
  • branches/1.0/openPLM/templates/mails/new_account.txt

    r415 r1093  
    11{% load i18n %} 
    22{% autoescape off %} 
    3 {% blocktrans with new_user.first_name as first_name and new_user.last_name as last_name and new_user.username as username and site.domain as domain and sponsor.first_name as s_first_name and sponsor.last_name as s_last_name and sponsor.username as s_username %} 
     3{% blocktrans with new_user.username|urlencode as username_url and new_user.first_name as first_name and new_user.last_name as last_name and new_user.username as username and site.domain as domain and sponsor.first_name as s_first_name and sponsor.last_name as s_last_name and sponsor.username as s_username %} 
    44Welcome {{first_name}} {{last_name}}!   
    55 
     
    1212 
    1313You should change your password ! 
    14 See http://{{domain}}/user/{{username}}/password/ 
     14See http://{{domain}}/user/{{username_url}}/password/ 
    1515 
    1616{% endblocktrans %} 
  • branches/1.0/openPLM/templates/management.html

    r945 r1093  
    3838                    <span>{{link.user.first_name}}</span> 
    3939                    <span>{{link.user.last_name}},</span> 
    40                     <a href="/user/{{link.user.username}}/"><span>{{link.user.username}}</span></a>, 
     40                    <a href="/user/{{link.user.username|urlencode }}/"><span>{{link.user.username}}</span></a>, 
    4141                    {% with link.user.get_profile as profile %} 
    4242                        <span>{{ profile.rank }},</span> 
  • branches/1.0/openPLM/templates/parts/parents.html

    r909 r1093  
    3737            <td class="Content">-{{ level}}</td> 
    3838            <td class="Content">  
    39                 <a href="/object/{{link.parent.type}}/{{link.parent.reference}}/{{link.parent.revision}}/"> 
     39                <a href="/object/{{link.parent.type|urlencode }}/{{link.parent.reference|urlencode }}/{{link.parent.revision|urlencode }}/"> 
    4040                    {{ link.parent.reference }} 
    4141                </a> 
  • branches/1.0/openPLM/templates/users/groups.html

    r996 r1093  
    2121                    <dt class="changeset"> 
    2222                    {% spaceless %} 
    23                         <a href="/group/{{group.name|urlencode}}/"> 
     23                        <a href="/group/{{group.name|urlencode }}/"> 
    2424                            <span class="group_name"> 
    2525                                {{ group.name }}  
  • branches/1.0/openPLM/templates/users/plmobjects.html

    r1001 r1093  
    6565                                    <li> 
    6666                                    {% spaceless %} 
    67                                     <a href="/object/{{link.plmobject__type}}/{{link.plmobject__reference}}/{{link.plmobject__revision}}/"> 
     67                                    <a href="/object/{{link.plmobject__type|urlencode }}/{{link.plmobject__reference|urlencode }}/{{link.plmobject__revision|urlencode }}/"> 
    6868                                        <span class="reference">{{link.plmobject__reference}}</span> 
    6969                                    </a> 
Note: See TracChangeset for help on using the changeset viewer.