Changeset 9150aa4 in osmose-frontend


Ignore:
Timestamp:
Oct 11, 2014 8:04:12 PM (5 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Children:
bbaed7d
Parents:
84f6b00
git-author:
Jocelyn Jaubert <jocelyn.jaubert@…> (11/10/2014 20:03:23)
git-committer:
Jocelyn Jaubert <jocelyn.jaubert@…> (11/10/2014 20:04:12)
Message:

Change mustache delimiter to {%, as <% is now used by bottle

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • map.py

    r659227a r9150aa4  
    288288@route('/tpl/popup.tpl') 
    289289def popup_template(lang): 
    290     return template('map/popup', mustache_delimiter="{{=<% %>=}}", website=utils.website) 
     290    return template('map/popup', mustache_delimiter="{{={% %}=}}", website=utils.website) 
    291291 
    292292@route('/tpl/editor.tpl') 
    293293def editor_template(lang): 
    294     return template('map/editor', mustache_delimiter="{{=<% %>=}}") 
     294    return template('map/editor', mustache_delimiter="{{={% %}=}}") 
  • views/map/editor.tpl

    r3859df0 r9150aa4  
    22<h1>{{_("Tags Editor")}}</h1> 
    33<form> 
    4   <%#elems%> 
    5   <a target="_blank" href="http://www.openstreetmap.org/browse/<%type%>/<%id%>"><%type%> <%id%></a> 
    6   <div class="tags" data-type="<%type%>" data-id="<%id%>" data-version="<%version%>"> 
     4  {%#elems%} 
     5  <a target="_blank" href="http://www.openstreetmap.org/browse/{%type%}/{%id%}">{%type%} {%id%}</a> 
     6  <div class="tags" data-type="{%type%}" data-id="{%id%}" data-version="{%version%}"> 
    77    <div class="del"> 
    88    </div> 
     
    1414    </div> 
    1515  </div> 
    16   <%/elems%> 
     16  {%/elems%} 
    1717  </br> 
    1818  <div id="buttons"> 
  • views/map/popup.tpl

    re207440 r9150aa4  
    11{{!mustache_delimiter}} 
    2 <div id="popup-<%error_id%>"> 
     2<div id="popup-{%error_id%}"> 
    33  <div class="bulle_msg"> 
    44    <div class="closebubble"> 
    5       <div class="help"><a target="_blank" href='<%url_help%>#<%item%>'>&nbsp;?&nbsp;</a></div> 
    6       <div class="error-link"><a target="_blank" href="../error/<%error_id%>">&nbsp;E&nbsp;</a></div> 
     5      <div class="help"><a target="_blank" href='{%url_help%}#{%item%}'>&nbsp;?&nbsp;</a></div> 
     6      <div class="error-link"><a target="_blank" href="../error/{%error_id%}">&nbsp;E&nbsp;</a></div> 
    77    </div> 
    88    <div class="bulle_err"> 
    9       <b><% title %></b> 
     9      <b>{% title %}</b> 
    1010      <br> 
    11       <%subtitle%> 
     11      {%subtitle%} 
    1212    </div> 
    13 <%#elems%> 
     13{%#elems%} 
    1414    <div class="bulle_elem"> 
    15   <%^infos%> 
    16       <b><a target="_blank" href="http://www.openstreetmap.org/browse/<%type%>/<%id%>"><%type%> <%id%></a></b> 
    17       <a href="#" onclick="window.open('http://rawedit.openstreetmap.fr/edit/<%type%>/<%id%>','rawedit','height=360,width=710');">rawedit</a> 
    18   <%/infos%> 
    19   <%#relation%> 
    20       <a target="_blank" href="http://analyser.openstreetmap.fr/cgi-bin/index.py?relation=<%id%>">analyse1</a> 
    21       <a target="_blank" href="http://osm8.openstreetmap.fr/~osmbin/analyse-relation-open.py?<%id%>">analyse2</a> 
    22   <%/relation%> 
    23   <%#node%> 
    24       <a href="http://localhost:8111/load_object?objects=n<%id%>" target="hiddenIframe" class="josm">josm</a> 
    25   <%/node%> 
    26   <%#way%> 
    27       <a href="http://localhost:8111/load_object?objects=w<%id%>" target="hiddenIframe" class="josm">josm</a> 
    28   <%/way%> 
    29   <%#relation%> 
    30       <a href="http://localhost:8111/import?url=http://www.openstreetmap.org/api/0.6/<%type%>/<%id%>/full" target="hiddenIframe" class="josm">josm</a> 
    31   <%/relation%> 
    32       <a href="#" class="editor_edit" data-type="<%type%>" data-id="<%id%>" data-error="<%error_id%>">edit</a> 
     15  {%^infos%} 
     16      <b><a target="_blank" href="http://www.openstreetmap.org/browse/{%type%}/{%id%}">{%type%} {%id%}</a></b> 
     17      <a href="#" onclick="window.open('http://rawedit.openstreetmap.fr/edit/{%type%}/{%id%}','rawedit','height=360,width=710');">rawedit</a> 
     18  {%/infos%} 
     19  {%#relation%} 
     20      <a target="_blank" href="http://analyser.openstreetmap.fr/cgi-bin/index.py?relation={%id%}">analyse1</a> 
     21      <a target="_blank" href="http://osm8.openstreetmap.fr/~osmbin/analyse-relation-open.py?{%id%}">analyse2</a> 
     22  {%/relation%} 
     23  {%#node%} 
     24      <a href="http://localhost:8111/load_object?objects=n{%id%}" target="hiddenIframe" class="josm">josm</a> 
     25  {%/node%} 
     26  {%#way%} 
     27      <a href="http://localhost:8111/load_object?objects=w{%id%}" target="hiddenIframe" class="josm">josm</a> 
     28  {%/way%} 
     29  {%#relation%} 
     30      <a href="http://localhost:8111/import?url=http://www.openstreetmap.org/api/0.6/{%type%}/{%id%}/full" target="hiddenIframe" class="josm">josm</a> 
     31  {%/relation%} 
     32      <a href="#" class="editor_edit" data-type="{%type%}" data-id="{%id%}" data-error="{%error_id%}">edit</a> 
    3333      <br> 
    34   <%#fixes%> 
     34  {%#fixes%} 
    3535      <div class="fix"> 
    3636        <div class="fix_links"> 
    37             <a href="http://localhost:8111/import?url=http://{{website}}/api/0.2/error/<%error_id%>/fix/<%num%>" target="hiddenIframe" class="josm">fix-josm</a> 
    38             <a href="#" class="editor_fix" data-type="<%type%>" data-id="<%id%>" data-error="<%error_id%>" data-fix="<%num%>">fix-edit</a> 
     37            <a href="http://localhost:8111/import?url=http://{{website}}/api/0.2/error/{%error_id%}/fix/{%num%}" target="hiddenIframe" class="josm">fix-josm</a> 
     38            <a href="#" class="editor_fix" data-type="{%type%}" data-id="{%id%}" data-error="{%error_id%}" data-fix="{%num%}">fix-edit</a> 
    3939        </div> 
    40     <%#add%> 
    41         <div class="add"> + <b><%k%></b> = <%v%></div> 
    42     <%/add%> 
    43     <%#mod%> 
    44         <div class="mod"> ~ <b><%k%></b> = <%v%></div> 
    45     <%/mod%> 
    46     <%#del%> 
    47         <div class="del"> - <b><%k%></b></div> 
    48     <%/del%> 
     40    {%#add%} 
     41        <div class="add"> + <b>{%k%}</b> = {%v%}</div> 
     42    {%/add%} 
     43    {%#mod%} 
     44        <div class="mod"> ~ <b>{%k%}</b> = {%v%}</div> 
     45    {%/mod%} 
     46    {%#del%} 
     47        <div class="del"> - <b>{%k%}</b></div> 
     48    {%/del%} 
    4949      </div> 
    50   <%/fixes%> 
    51   <%#tags%> 
    52       <b><%k%></b> = 
    53       <%#vlink%><a href="<%vlink%>" target="_blank"><%/vlink%> 
    54       <%v%> 
    55       <%#vlink%></a><%/vlink%> 
     50  {%/fixes%} 
     51  {%#tags%} 
     52      <b>{%k%}</b> = 
     53      {%#vlink%}<a href="{%vlink%}" target="_blank">{%/vlink%} 
     54      {%v%} 
     55      {%#vlink%}</a>{%/vlink%} 
    5656      <br> 
    57   <%/tags%> 
     57  {%/tags%} 
    5858    </div> 
    59 <%/elems%> 
    60 <%#new_elems%> 
     59{%/elems%} 
     60{%#new_elems%} 
    6161    <div class="bulle_elem"> 
    6262      <div class="fix"> 
    6363        <div class="fix_links"> 
    64           <a href="http://localhost:8111/import?url=http://{{website}}/api/0.2/error/<%error_id%>/fix/<%num%>" target="hiddenIframe" class="josm">fix-josm</a> 
     64          <a href="http://localhost:8111/import?url=http://{{website}}/api/0.2/error/{%error_id%}/fix/{%num%}" target="hiddenIframe" class="josm">fix-josm</a> 
    6565        </div> 
    66   <%#add%> 
    67         <div class="add"> + <b><%k%></b> = <%v%></div> 
    68   <%/add%> 
    69   <%#mod%> 
    70         <div class="mod"> ~ <b><%k%></b> = <%v%></div> 
    71   <%/mod%> 
    72   <%#del%> 
    73         <div class="del"> - <b><%k%></b></div> 
    74   <%/del%> 
     66  {%#add%} 
     67        <div class="add"> + <b>{%k%}</b> = {%v%}</div> 
     68  {%/add%} 
     69  {%#mod%} 
     70        <div class="mod"> ~ <b>{%k%}</b> = {%v%}</div> 
     71  {%/mod%} 
     72  {%#del%} 
     73        <div class="del"> - <b>{%k%}</b></div> 
     74  {%/del%} 
    7575      </div> 
    7676    </div> 
    77 <%/new_elems%> 
    78 {{_("Error reported on: ")}} <%b_date%> 
     77{%/new_elems%} 
     78{{_("Error reported on: ")}} {%b_date%} 
    7979  </div> 
    8080  <div class="bulle_verif"> 
    81     <a href="http://www.openstreetmap.org/?lat=<%lat%>&lon=<%lon%>&zoom=18" target="_blank">osm-show</a> 
    82     <a href="http://www.openstreetmap.org/edit?lat=<%lat%>&lon=<%lon%>&zoom=18" target="_blank">osm-edit</a> 
    83     <a href="http://localhost:8111/load_and_zoom?left=<%minlon%>&bottom=<%minlat%>&right=<%maxlon%>&top=<%maxlat%>&select=<%elems_id%>" target="hiddenIframe" class="josm">josm zone</a> 
     81    <a href="http://www.openstreetmap.org/?lat={%lat%}&lon={%lon%}&zoom=18" target="_blank">osm-show</a> 
     82    <a href="http://www.openstreetmap.org/edit?lat={%lat%}&lon={%lon%}&zoom=18" target="_blank">osm-edit</a> 
     83    <a href="http://localhost:8111/load_and_zoom?left={%minlon%}&bottom={%minlat%}&right={%maxlon%}&top={%maxlat%}&select={%elems_id%}" target="hiddenIframe" class="josm">josm zone</a> 
    8484  </div> 
    8585  <div class="bulle_maj"> 
    8686    <b>{{_("change status")}} :</b> 
    87     <a class="closePopup corrected" href="../api/0.2/error/<%error_id%>/done" target="hiddenIframe">{{_("corrected")}}</a> 
    88     <a class="closePopup false_positive" href="../api/0.2/error/<%error_id%>/false" target="hiddenIframe">{{_("false positive")}}</a> 
     87    <a class="closePopup corrected" href="../api/0.2/error/{%error_id%}/done" target="hiddenIframe">{{_("corrected")}}</a> 
     88    <a class="closePopup false_positive" href="../api/0.2/error/{%error_id%}/false" target="hiddenIframe">{{_("false positive")}}</a> 
    8989</div> 
    9090 
Note: See TracChangeset for help on using the changeset viewer.