mirror of
https://github.com/friendica/friendica
synced 2024-11-10 07:02:54 +00:00
Merge pull request #578 from fermionic/20130110-update-smarty-conversion-script
use Python 2.4 compatible script; update Smarty templates
This commit is contained in:
friendica
commit
c21573e237
23 changed files with 34 additions and 31 deletions
|
|
@ -77,7 +77,7 @@ def fix_element(element):
|
|||
|
||||
if parts[first+1][0] == '$':
|
||||
# This takes care of elements where the filename is a variable, e.g. {{ inc $file }}
|
||||
element += 'file:' + ldelim + parts[first+1].rstrip('}') + rdelim
|
||||
element += ldelim + parts[first+1].rstrip('}') + rdelim
|
||||
else:
|
||||
# This takes care of elements where the filename is a path, e.g. {{ inc file.tpl }}
|
||||
element += parts[first+1].rstrip('}')
|
||||
|
|
@ -189,10 +189,14 @@ for a_file in files:
|
|||
filename = os.path.join(path,a_file)
|
||||
ext = a_file.split('.')[-1]
|
||||
if os.path.isfile(filename) and ext == 'tpl':
|
||||
with open(filename, 'r') as f:
|
||||
f = open(filename, 'r')
|
||||
|
||||
newfilename = os.path.join(outpath,a_file)
|
||||
with open(newfilename, 'w') as outf:
|
||||
outf = open(newfilename, 'w')
|
||||
|
||||
print "Converting " + filename + " to " + newfilename
|
||||
convert(f, outf, php_tpl)
|
||||
|
||||
outf.close()
|
||||
f.close()
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
{{/if}}
|
||||
{{if $item.comment_lastcollapsed}}</div>{{/if}}
|
||||
|
||||
{{include file="file:{{$item.template}}"}}
|
||||
{{include file="{{$item.template}}"}}
|
||||
|
||||
|
||||
{{/foreach}}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{{$live_update}}
|
||||
|
||||
{{foreach $threads as $thread}}
|
||||
{{include file="file:{{$thread.template}}" item=$thread}}
|
||||
{{include file="{{$thread.template}}" item=$thread}}
|
||||
{{/foreach}}
|
||||
|
||||
<div id="conversation-end"></div>
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
|
||||
</div>
|
||||
{{foreach $item.children as $child}}
|
||||
{{include file="file:{{$child.template}}" item=$child}}
|
||||
{{include file="{{$child.template}}" item=$child}}
|
||||
{{/foreach}}
|
||||
|
||||
{{if $item.flatten}}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
{{/if}}
|
||||
{{if $item.comment_lastcollapsed}}</div>{{/if}}
|
||||
|
||||
{{include file="file:{{$item.template}}"}}
|
||||
{{include file="{{$item.template}}"}}
|
||||
|
||||
|
||||
{{/foreach}}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{{$live_update}}
|
||||
|
||||
{{foreach $threads as $thread}}
|
||||
{{include file="file:{{$thread.template}}" item=$thread}}
|
||||
{{include file="{{$thread.template}}" item=$thread}}
|
||||
{{/foreach}}
|
||||
|
||||
<div id="conversation-end"></div>
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onc
|
|||
<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
|
||||
</div>
|
||||
{{foreach $item.children as $child}}
|
||||
{{include file="file:{{$child.template}}" item=$child}}
|
||||
{{include file="{{$child.template}}" item=$child}}
|
||||
{{/foreach}}
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
{{/if}}
|
||||
{{if $item.comment_lastcollapsed}}</div>{{/if}}
|
||||
|
||||
{{include file="file:{{$item.template}}"}}
|
||||
{{include file="{{$item.template}}"}}
|
||||
|
||||
|
||||
{{/foreach}}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{{$live_update}}
|
||||
|
||||
{{foreach $threads as $thread}}
|
||||
{{include file="file:{{$thread.template}}" item=$thread}}
|
||||
{{include file="{{$thread.template}}" item=$thread}}
|
||||
{{/foreach}}
|
||||
|
||||
<div id="conversation-end"></div>
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@
|
|||
<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->
|
||||
<!--</div>-->
|
||||
{{foreach $item.children as $child}}
|
||||
{{include file="file:{{$child.template}}" item=$child}}
|
||||
{{include file="{{$child.template}}" item=$child}}
|
||||
{{/foreach}}
|
||||
|
||||
{{if $item.flatten}}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
</div>
|
||||
|
||||
<div class="acl-list-item" rel="acl-template" style="display:none">
|
||||
<img data-src="{0}"><p>{1}</p>
|
||||
<a href="#" class='acl-button-show'>{{$show}}</a>
|
||||
<a href="#" class='acl-button-hide'>{{$hide}}</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
{{$live_update}}
|
||||
|
||||
{{foreach $threads as $thread}}
|
||||
{{include file="file:{{$thread.template}}" item=$thread}}
|
||||
{{include file="{{$thread.template}}" item=$thread}}
|
||||
{{/foreach}}
|
||||
|
||||
<div id="conversation-end"></div>
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@
|
|||
<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->
|
||||
<!--</div>-->
|
||||
{{foreach $item.children as $child}}
|
||||
{{include file="file:{{$child.template}}" item=$child}}
|
||||
{{include file="{{$child.template}}" item=$child}}
|
||||
{{/foreach}}
|
||||
|
||||
{{if $item.flatten}}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
{{if $item.type == tag}}
|
||||
{{include file="wall_item_tag.tpl"}}
|
||||
{{else}}
|
||||
{{include file="file:{{$item.template}}"}}
|
||||
{{include file="{{$item.template}}"}}
|
||||
{{/if}}
|
||||
|
||||
{{/foreach}}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
{{if $thread.type == tag}}
|
||||
{{include file="wall_item_tag.tpl" item=$thread}}
|
||||
{{else}}
|
||||
{{include file="file:{{$thread.template}}" item=$thread}}
|
||||
{{include file="{{$thread.template}}" item=$thread}}
|
||||
{{/if}}
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@
|
|||
{{if $child.type == tag}}
|
||||
{{include file="wall_item_tag.tpl" item=$child}}
|
||||
{{else}}
|
||||
{{include file="file:{{$item.template}}" item=$child}}
|
||||
{{include file="{{$item.template}}" item=$child}}
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@
|
|||
<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
|
||||
|
||||
{{foreach $item.children as $child}}
|
||||
{{include file="file:{{$child.template}}" item=$child}}
|
||||
{{include file="{{$child.template}}" item=$child}}
|
||||
{{/foreach}}
|
||||
|
||||
{{if $item.flatten}}
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@
|
|||
<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
|
||||
|
||||
{{foreach $item.children as $child}}
|
||||
{{include file="file:{{$child.template}}" item=$child}}
|
||||
{{include file="{{$child.template}}" item=$child}}
|
||||
{{/foreach}}
|
||||
|
||||
{{if $item.flatten}}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
{{if $thread.type == tag}}
|
||||
{{include file="wall_item_tag.tpl" item=$thread}}
|
||||
{{else}}
|
||||
{{include file="file:{{$thread.template}}" item=$thread}}
|
||||
{{include file="{{$thread.template}}" item=$thread}}
|
||||
{{/if}}
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@
|
|||
{{if $item.type == tag}}
|
||||
{{include file="wall_item_tag.tpl" item=$child}}
|
||||
{{else}}
|
||||
{{include file="file:{{$item.template}}" item=$child}}
|
||||
{{include file="{{$item.template}}" item=$child}}
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue