Merge pull request #562 from fermionic/20121225-smarty-includes-like-friendicas

some missed templates
This commit is contained in:
fermionic 2012-12-25 11:29:46 -08:00
commit b31bc6c3a6
11 changed files with 33 additions and 25 deletions

View file

@ -989,6 +989,12 @@ if(! function_exists('login')) {
'$lostpass' => t('Forgot your password?'),
'$lostlink' => t('Password Reset'),
'$tostitle' => t('Website Terms of Service'),
'$toslink' => t('terms of service'),
'$privacytitle' => t('Website Privacy Policy'),
'$privacylink' => t('privacy policy'),
));
call_hooks('login_hook',$o);

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -29,15 +29,16 @@
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
<div class="comment-edit-bb-{{$id}}">
<a class="icon bb-image" style="cursor: pointer;" title="{{$edimg}}" onclick="insertFormatting('{{$comment}}','img',{{$id}});">img</a>
<a class="icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});">url</a>
<a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});">video</a>
<div class="comment-edit-bb">
<a title="{{$edimg}}" onclick="insertFormatting('{{$comment}}','img',{{$id}});"><i class="icon-picture"></i></a>
<a title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});"><i class="icon-bookmark"></i></a>
<a title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});"><i class="icon-film"></i></a>
<a title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});"><i class="icon-underline"></i></a>
<a title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});"><i class="icon-italic"></i></a>
<a title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});"><i class="icon-bold"></i></a>
<a title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});"><i class="icon-comments"></i></a>
<a class="icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});">u</a>
<a class="icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});">i</a>
<a class="icon bold" style="cursor: pointer;" title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});">b</a>
<a class="icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});">quote</a>
</div>
<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>

View file

@ -35,7 +35,7 @@
</li>
{{/if}}
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear" style="color: lightgray;"></span></a>
<ul id="nav-site-menu" class="menu-popup">
{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}
{{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}
@ -50,7 +50,7 @@
</ul>
</li>
{{if $nav.notifications}}
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a>
<li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify"></span></a>
<span id="notify-update" class="nav-notify"></span>
<ul id="nav-notifications-menu" class="menu-popup">
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>

View file

@ -45,7 +45,8 @@
</div>
<div class="wall-item-bottom">
<div class="">
{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}}
<!-- {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
{{if $item.conv}}<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'><i class="icon-link icon-large"></i></a>{{/if}}
</div>
<div class="wall-item-actions">

View file

@ -54,7 +54,7 @@
<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> <!-- {{$item.vwall}} -->{{/if}}
<span class="wall-item-ago">-
{{if $item.plink}}<a class="link" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
{{if $item.lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
</span>
</div>
@ -98,7 +98,7 @@
{{/if}}
{{/if}}
{{if $item.vote.share}}
<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"><i class="icon-share icon-large"></i></a>
<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet icon-large"></i></a>
{{/if}}
{{if $item.star}}
<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classdo}}" title="{{$item.star.do}}"><i class="icon-star icon-large"></i></a>