MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #556 from fermionic/20121224-smarty3-template-collision

Browse source 
change field_*.tpl to * in some missed templates
This commit is contained in:
fermionic 2012-12-24 06:06:56 -08:00
commit e5dac2d387
9 changed files with 47 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
view/admin_site.tpl
View file

@ -41,13 +41,13 @@
<form action="$baseurl/admin/site" method="post"> <form action="$baseurl/admin/site" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'> <input type='hidden' name='form_security_token' value='$form_security_token'>
{{ inc field_input.tpl with $field=$sitename }}{{ endinc }} {{ inc $field_input with $field=$sitename }}{{ endinc }}
{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }} {{ inc $field_textarea with $field=$banner }}{{ endinc }}
{{ inc field_select.tpl with $field=$language }}{{ endinc }} {{ inc $field_select with $field=$language }}{{ endinc }}
{{ inc field_select.tpl with $field=$theme }}{{ endinc }} {{ inc $field_select with $field=$theme }}{{ endinc }}
{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }} {{ inc $field_select with $field=$theme_mobile }}{{ endinc }}
{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }} {{ inc $field_select with $field=$ssl_policy }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }} {{ inc $field_checkbox with $field=$new_share }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div> <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
@ -83,23 +83,23 @@
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div> <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
<h3>$advanced</h3> <h3>$advanced</h3>
{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }} {{ inc $field_checkbox with $field=$no_utf }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }} {{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }}
{{ inc field_input.tpl with $field=$proxy }}{{ endinc }} {{ inc $field_input with $field=$proxy }}{{ endinc }}
{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }} {{ inc $field_input with $field=$proxyuser }}{{ endinc }}
{{ inc field_input.tpl with $field=$timeout }}{{ endinc }} {{ inc $field_input with $field=$timeout }}{{ endinc }}
{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }} {{ inc $field_input with $field=$delivery_interval }}{{ endinc }}
{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }} {{ inc $field_input with $field=$poll_interval }}{{ endinc }}
{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }} {{ inc $field_input with $field=$maxloadavg }}{{ endinc }}
{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }} {{ inc $field_input with $field=$abandon_days }}{{ endinc }}
{{ inc field_input.tpl with $field=$lockpath }}{{ endinc }} {{ inc $field_input with $field=$lockpath }}{{ endinc }}
{{ inc field_input.tpl with $field=$temppath }}{{ endinc }} {{ inc $field_input with $field=$temppath }}{{ endinc }}
{{ inc field_input.tpl with $field=$basepath }}{{ endinc }} {{ inc $field_input with $field=$basepath }}{{ endinc }}
<h3>$performance</h3> <h3>$performance</h3>
{{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }} {{ inc $field_checkbox with $field=$use_fulltext_engine }}{{ endinc }}
{{ inc field_input.tpl with $field=$itemcache }}{{ endinc }} {{ inc $field_input with $field=$itemcache }}{{ endinc }}
{{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }} {{ inc $field_input with $field=$itemcache_duration }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div> <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

11
view/smarty3/admin_site.tpl
View file

@ -47,6 +47,8 @@
{{include file="file:{{$field_select}}" field=$theme}} {{include file="file:{{$field_select}}" field=$theme}}
{{include file="file:{{$field_select}}" field=$theme_mobile}} {{include file="file:{{$field_select}}" field=$theme_mobile}}
{{include file="file:{{$field_select}}" field=$ssl_policy}} {{include file="file:{{$field_select}}" field=$ssl_policy}}
{{include file="file:{{$field_checkbox}}" field=$new_share}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
@ -90,6 +92,15 @@
{{include file="file:{{$field_input}}" field=$poll_interval}} {{include file="file:{{$field_input}}" field=$poll_interval}}
{{include file="file:{{$field_input}}" field=$maxloadavg}} {{include file="file:{{$field_input}}" field=$maxloadavg}}
{{include file="file:{{$field_input}}" field=$abandon_days}} {{include file="file:{{$field_input}}" field=$abandon_days}}
{{include file="file:{{$field_input}}" field=$lockpath}}
{{include file="file:{{$field_input}}" field=$temppath}}
{{include file="file:{{$field_input}}" field=$basepath}}
<h3>{{$performance}}</h3>
{{include file="file:{{$field_checkbox}}" field=$use_fulltext_engine}}
{{include file="file:{{$field_input}}" field=$itemcache}}
{{include file="file:{{$field_input}}" field=$itemcache_duration}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

1
view/theme/dispy/config.php
View file

@ -65,7 +65,6 @@ function dispy_form(&$a, $font_size, $line_height, $colour) {
'dark' => 'dark', 'dark' => 'dark',
); );
//$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
$t = get_markup_template("theme_settings.tpl" ); $t = get_markup_template("theme_settings.tpl" );
$includes = array( $includes = array(

6
view/theme/dispy/smarty3/theme_settings.tpl
View file

@ -1,8 +1,8 @@
{{include file="field_select.tpl" field=$colour}} {{include file="file:{{$field_select}}" field=$colour}}
{{include file="field_select.tpl" field=$font_size}} {{include file="file:{{$field_select}}" field=$font_size}}
{{include file="field_select.tpl" field=$line_height}} {{include file="file:{{$field_select}}" field=$line_height}}
<div class="settings-submit-wrapper"> <div class="settings-submit-wrapper">
<input type="submit" value="{{$submit}}" class="settings-submit" name="dispy-settings-submit" /> <input type="submit" value="{{$submit}}" class="settings-submit" name="dispy-settings-submit" />

6
view/theme/dispy/theme_settings.tpl
View file

@ -1,8 +1,8 @@
{{inc field_select.tpl with $field=$colour}}{{endinc}} {{inc $field_select with $field=$colour}}{{endinc}}
{{inc field_select.tpl with $field=$font_size}}{{endinc}} {{inc $field_select with $field=$font_size}}{{endinc}}
{{inc field_select.tpl with $field=$line_height}}{{endinc}} {{inc $field_select with $field=$line_height}}{{endinc}}
<div class="settings-submit-wrapper"> <div class="settings-submit-wrapper">
<input type="submit" value="$submit" class="settings-submit" name="dispy-settings-submit" /> <input type="submit" value="$submit" class="settings-submit" name="dispy-settings-submit" />

2
view/theme/frost-mobile/contact_edit.tpl
View file

@ -70,7 +70,7 @@
{{ endif }} {{ endif }}
<div id="contact-edit-end" ></div> <div id="contact-edit-end" ></div>
{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} {{inc $field_checkbox with $field=$hidden }}{{endinc}}
<div id="contact-edit-info-wrapper"> <div id="contact-edit-info-wrapper">
<h4>$lbl_info1</h4> <h4>$lbl_info1</h4>

2
view/theme/frost-mobile/smarty3/contact_edit.tpl
View file

@ -70,7 +70,7 @@
{{/if}} {{/if}}
<div id="contact-edit-end" ></div> <div id="contact-edit-end" ></div>
{{include file="field_checkbox.tpl" field=$hidden}} {{include file="file:{{$field_checkbox}}" field=$hidden}}
<div id="contact-edit-info-wrapper"> <div id="contact-edit-info-wrapper">
<h4>{{$lbl_info1}}</h4> <h4>{{$lbl_info1}}</h4>

6
view/theme/quattro/smarty3/theme_settings.tpl
View file

@ -1,8 +1,8 @@
<script src="{{$baseurl}}/view/theme/quattro/jquery.tools.min.js"></script> <script src="{{$baseurl}}/view/theme/quattro/jquery.tools.min.js"></script>
{{include file="field_select.tpl" field=$color}} {{include file="file:{{$field_select}}" field=$color}}
{{include file="field_select.tpl" field=$align}} {{include file="file:{{$field_select}}" field=$align}}
<div class="field"> <div class="field">
@ -29,4 +29,4 @@
<script> <script>
$(".inputRange").rangeinput(); $(".inputRange").rangeinput();
</script> </script>

6
view/theme/quattro/theme_settings.tpl
View file

@ -1,8 +1,8 @@
<script src="$baseurl/view/theme/quattro/jquery.tools.min.js"></script> <script src="$baseurl/view/theme/quattro/jquery.tools.min.js"></script>
{{inc field_select.tpl with $field=$color}}{{endinc}} {{inc $field_select with $field=$color}}{{endinc}}
{{inc field_select.tpl with $field=$align}}{{endinc}} {{inc $field_select with $field=$align}}{{endinc}}
<div class="field"> <div class="field">
@ -29,4 +29,4 @@
<script> <script>
$(".inputRange").rangeinput(); $(".inputRange").rangeinput();
</script> </script>