diff options
Diffstat (limited to 'view/tpl')
265 files changed, 3800 insertions, 3414 deletions
diff --git a/view/tpl/404.tpl b/view/tpl/404.tpl index bf4d4e949..518ad1d29 100644..100755 --- a/view/tpl/404.tpl +++ b/view/tpl/404.tpl @@ -1 +1 @@ -<h1>$message</h1> +<h1>{{$message}}</h1> diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 606e61b80..b8b01df4c 100644..100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -1,50 +1,101 @@ +<div class="generic-content-wrapper"> +<h2>{{$header}}</h2> -<h2>$header</h2> - -<h3>$addr</h3> +<h3>{{$addr}}</h3> +{{if $notself}} <div id="connection-flag-tabs"> -$tabs +{{$tabs}} </div> +{{/if}} + +{{if $self}} +<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div> +{{/if}} + <div id="contact-edit-wrapper"> -{{ if $slide }} -<h3>$lbl_slider</h3> +{{if $last_update}} +{{$lastupdtext}} {{$last_update}} +{{/if}} + +{{if $notself}} +{{if $slide}} +<h3>{{$lbl_slider}}</h3> + +{{$slide}} + +{{/if}} +{{/if}} + + +<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" > +<input type="hidden" name="contact_id" value="{{$contact_id}}"> +<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> + +<div class="abook-permschange" style="display: none;"></div> + +{{if $is_pending}} +<div class="abook-pending-contact"> +{{include file="field_checkbox.tpl" field=$unapproved}} +</div> +{{/if}} + +{{if $multiprofs }} +<div> +<h3>{{$lbl_vis1}}</h3> +<div>{{$lbl_vis2}}</div> + +{{$profile_select}} +</div> +{{/if}} + +<h3>{{$permlbl}}</h3> +<div id="perm-desc" class="descriptive-text">{{$permnote}}</div> -$slide -{{ endif }} +{{* {{if $noperms}} +<div id="noperm-msg" class="warning-text">{{$noperms}}</div> +<div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div> +{{/if}} +*}} -<h3>Permissions</h3> -<form action="connections/$contact_id" method="post" > -<input type="hidden" name="contact_id" value="$contact_id"> -<input id="contact-closeness-mirror" type="hidden" name="closeness" value="$close" /> <br /> -<b>$quick</b> +<h3>{{$quick}}</h3> <ul> -<li><a href="#" onclick="connectFullShare(); return false;">$full</a></li> -<li><a href="#" onclick="connectCautiousShare(); return false;">$cautious</a></li> -<li><a href="#" onclick="connectFollowOnly(); return false;">$follow</a></li> -<br /> +{{if $self}} +<li><span class="fakelink" onclick="connectClear();">{{$clear}}</span></li> +<li><span class="fakelink" onclick="connectForum();">{{$forum}}</span></li> +<li><span class="fakelink" onclick="connectSoapBox();">{{$soapbox}}</span></li> +{{/if}} +<li><span class="fakelink" onclick="connectFullShare();">{{$full}}</span></li> +<li><span class="fakelink" onclick="connectCautiousShare();">{{$cautious}}</span></li> +<li><span class="fakelink" onclick="connectFollowOnly();">{{$follow}}</span></li> +</ul> + +<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> + -<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">$advanced</div> +<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div> -<div id="abook-advanced-panel" style="display: none;"> +<div id="abook-advanced-panel" style="display: block;"> -<span class="abook-them">$them</span><span class="abook-me">$me</span> +<span class="abook-them">{{$them}}</span><span class="abook-me">{{$me}}</span> <br /> <br /> -{{ for $perms as $prm }} -{{inc field_acheckbox.tpl with $field=$prm }}{{endinc}} -{{ endfor }} +{{foreach $perms as $prm}} +{{include file="field_acheckbox.tpl" field=$prm}} +{{/foreach}} <br /> </div> -<input class="contact-edit-submit" type="submit" name="submit" value="$submit" /> + +<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> </form> </div> +</div> diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index e5231b0f8..4babf5669 100644..100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -1,18 +1,34 @@ -<div id="acl-wrapper"> - <input id="acl-search"> - <a href="#" id="acl-showall">$showall</a> - <div id="acl-list"> - <div id="acl-list-content"> - </div> - </div> - <span id="acl-fields"></span> -</div> - -<div class="acl-list-item" rel="acl-template" style="display:none"> - <img src="{0}"><p>{1}</p> - <a href="#" class='acl-button-show'>$show</a> - <a href="#" class='acl-button-hide'>$hide</a> -</div> +<div class="modal" id="aclModal"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title">{{$aclModalTitle}}</h4> + </div> + <div class="modal-body"> + <div id="acl-wrapper"> + <button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button> + <input type="text" id="acl-search" placeholder=""> + <div id="acl-list"> + <div id="acl-list-content"></div> + </div> + <span id="acl-fields"></span> + </div> + <div class="acl-list-item" rel="acl-template" style="display:none"> + <img data-src="{0}"><p>{1}</p> + <button class="acl-button-hide btn btn-xs btn-default"><i class="icon-remove"></i> {{$hide}}</button> + <button class="acl-button-show btn btn-xs btn-default"><i class="icon-ok"></i> {{$show}}</button> + </div> + {{if $jotnets}} + {{$jotnets}} + {{/if}} + </div> + <div class="modal-footer clear"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> +</div><!-- /.modal --> <script> $(document).ready(function() { @@ -20,7 +36,7 @@ $(document).ready(function() { if(typeof acl=="undefined"){ acl = new ACL( baseurl+"/acl", - [ $allowcid,$allowgid,$denycid,$denygid ] + [ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ] ); } }, 5000 ); diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index ca1f4985c..cb3827bf2 100644..100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -10,33 +10,35 @@ }); }); </script> -<h4><a href="$admurl">$admtxt</a></h4> +<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4> <ul class='admin linklist'> - <li class='admin link button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li> - <li class='admin link button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li> - <li class='admin link button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li> - <li class='admin link button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li> - <li class='admin link button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li> + <li class='admin link button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li> + <li class='admin link button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li> + <li class='admin link button {{$admin.channels.2}}'><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li> + <li class='admin link button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li> + <li class='admin link button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li> + <li class='admin link button {{$admin.hubloc.2}}'><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li> + <li class='admin link button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> </ul> -{{ if $admin.update }} +{{if $admin.update}} <ul class='admin linklist'> - <li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li> - <li class='admin link button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li> + <li class='admin link button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li> + <li class='admin link button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li> </ul> -{{ endif }} +{{/if}} -{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }} +{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}} <ul class='admin linklist'> - {{ for $admin.plugins_admin as $l }} - <li class='admin link button $l.2'><a href='$l.0'>$l.1</a></li> - {{ endfor }} + {{foreach $admin.plugins_admin as $l}} + <li class='admin link button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li> + {{/foreach}} </ul> -<h4>$logtxt</h4> +<h4>{{$logtxt}}</h4> <ul class='admin linklist'> - <li class='admin link button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li> + <li class='admin link button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li> </ul> diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl new file mode 100755 index 000000000..b26e67687 --- /dev/null +++ b/view/tpl/admin_channels.tpl @@ -0,0 +1,50 @@ +<script> + function confirm_delete(uname){ + return confirm( "{{$confirm_delete}}".format(uname)); + } + function confirm_delete_multi(){ + return confirm("{{$confirm_delete_multi}}"); + } + function selectall(cls){ + $("."+cls).attr('checked','checked'); + return false; + } +</script> +<div class = "generic-content-wrapper" id='adminpage'> + <h1>{{$title}} - {{$page}}</h1> + + <form action="{{$baseurl}}/admin/channels" method="post"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + + <h3>{{$h_channels}}</h3> + {{if $channels}} + <table id='channels'> + <thead> + <tr> + {{foreach $th_channels as $th}}<th>{{$th}}</th>{{/foreach}} + <th></th> + <th></th> + </tr> + </thead> + <tbody> + {{foreach $channels as $c}} + <tr> + <td class='channel_id'>{{$c.channel_id}}</td> + <td class='channel_name'><a href="channel/{{$c.channel_address}}">{{$c.channel_name}}</a></td> + <td class='channel_address'>{{$c.channel_address}}</td> + <td class="checkbox"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td> + <td class="tools"> + <a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a> + <a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='icon-remove admin-icons'></i></a> + </td> + </tr> + {{/foreach}} + </tbody> + </table> + <div class='selectall'><a href='#' onclick="return selectall('channels_ckbx');">{{$select_all}}</a></div> + <div class="submit"><input type="submit" name="page_channels_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_channels_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div> + {{else}} + NO CHANNELS?!? + {{/if}} + </form> +</div> diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl new file mode 100755 index 000000000..06a8cdf6a --- /dev/null +++ b/view/tpl/admin_hubloc.tpl @@ -0,0 +1,27 @@ +<div class="generic-content-wrapper" id='adminpage'> + <h1>{{$title}} - {{$page}}</h1> + + <table id='server'> + <thead> + <tr> + {{foreach $th_hubloc as $th}}<th>{{$th}}</th>{{/foreach}} + </tr> + </thead> + <tbody> + + {{foreach $hubloc as $hub}}<tr> + <td>{{$hub.hubloc_id}}</td><td>{{$hub.hubloc_addr}}</td><td>{{$hub.hubloc_host}}</td><td>{{$hub.hubloc_status}}</td> + <td> + <form action="{{$baseurl}}/admin/hubloc" method="post"> + <input type="hidden" name="hublocid" value="{{$hub.hubloc_id}}"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <input type='hidden' name='url' value='{{$hub.hubloc_host}}'> + <input type="submit" name="check" value="check" > + <input type="submit" name="repair" value="repair" ></td> + </form> + </tr>{{/foreach}} + </tbody> + </table> + + +</div> diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl index b777cf420..3d2adc660 100644..100755 --- a/view/tpl/admin_logs.tpl +++ b/view/tpl/admin_logs.tpl @@ -1,19 +1,19 @@ -<div id='adminpage'> - <h1>$title - $page</h1> +<div class="generic-content-wrapper" id='adminpage'> + <h1>{{$title}} - {{$page}}</h1> - <form action="$baseurl/admin/logs" method="post"> - <input type='hidden' name='form_security_token' value='$form_security_token'> + <form action="{{$baseurl}}/admin/logs" method="post"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - {{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }} - {{ inc field_input.tpl with $field=$logfile }}{{ endinc }} - {{ inc field_select.tpl with $field=$loglevel }}{{ endinc }} + {{include file="field_checkbox.tpl" field=$debugging}} + {{include file="field_input.tpl" field=$logfile}} + {{include file="field_select.tpl" field=$loglevel}} - <div class="submit"><input type="submit" name="page_logs" value="$submit" /></div> + <div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div> </form> - <h3>$logname</h3> - <div style="width:100%; height:400px; overflow: auto; "><pre>$data</pre></div> -<!-- <iframe src='$baseurl/$logname' style="width:100%; height:400px"></iframe> --> - <!-- <div class="submit"><input type="submit" name="page_logs_clear_log" value="$clear" /></div> --> + <h3>{{$logname}}</h3> + <div style="width:100%; height:400px; overflow: auto; "><pre>{{$data}}</pre></div> +<!-- <iframe src='{{$baseurl}}/{{$logname}}' style="width:100%; height:400px"></iframe> --> + <!-- <div class="submit"><input type="submit" name="page_logs_clear_log" value="{{$clear}}" /></div> --> </div> diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 74b56bb4e..40821c534 100644..100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,15 +1,15 @@ -<div id='adminpage'> - <h1>$title - $page</h1> +<div class="generic-content-wrapper" id='adminpage'> + <h1>{{$title}} - {{$page}}</h1> <ul id='pluginslist'> - {{ for $plugins as $p }} - <li class='plugin $p.1'> - <a class='toggleplugin' href='$baseurl/admin/$function/$p.0?a=t&t=$form_security_token' title="{{if $p.1==on }}Disable{{ else }}Enable{{ endif }}" ><span class='icon $p.1'></span></a> - <a href='$baseurl/admin/$function/$p.0'><span class='name'>$p.2.name</span></a> - <span class="version">$p.2.version</span> - {{ if $p.2.experimental }} $experimental {{ endif }}{{ if $p.2.unsupported }} $unsupported {{ endif }} + {{foreach $plugins as $p}} + <li class='plugin {{$p.1}}'> + <a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><i class='{{if $p.1==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i></a> + <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span> + {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}} - <div class='desc'>$p.2.description</div> + <div class='desc'>{{$p.2.description}}</div> </li> - {{ endfor }} + {{/foreach}} </ul> </div> diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index 931c7b83c..1c1a59879 100644..100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -1,36 +1,36 @@ -<div id='adminpage'> - <h1>$title - $page</h1> +<div class = "generic-content-wrapper" id='adminpage'> + <h1>{{$title}} - {{$page}}</h1> - <p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/$function/$plugin/?a=t&t=$form_security_token">$action</a></p> - <p>$info.description</p> + <p><i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&t={{$form_security_token}}">{{$action}}</a></p> + <p>{{$info.description}}</p> - <p class="author">$str_author - {{ for $info.author as $a }} - {{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }}, - {{ endfor }} + <p class="author">{{$str_author}} + {{foreach $info.author as $a}} + {{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}}, + {{/foreach}} </p> - <p class="maintainer">$str_maintainer - {{ for $info.maintainer as $a }} - {{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }}, - {{ endfor }} + <p class="maintainer">{{$str_maintainer}} + {{foreach $info.maintainer as $a}} + {{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}}, + {{/foreach}} </p> - {{ if $screenshot }} - <a href="$screenshot.0" class='screenshot'><img src="$screenshot.0" alt="$screenshot.1" /></a> - {{ endif }} + {{if $screenshot}} + <a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a> + {{/if}} - {{ if $admin_form }} - <h3>$settings</h3> - <form method="post" action="$baseurl/admin/$function/$plugin/"> - $admin_form + {{if $admin_form}} + <h3>{{$settings}}</h3> + <form method="post" action="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/"> + {{$admin_form}} </form> - {{ endif }} + {{/if}} - {{ if $readme }} + {{if $readme}} <h3>Readme</h3> <div id="plugin_readme"> - $readme + {{$readme}} </div> - {{ endif }} + {{/if}} </div> diff --git a/view/tpl/admin_remoteupdate.tpl b/view/tpl/admin_remoteupdate.tpl deleted file mode 100644 index 874c6e626..000000000 --- a/view/tpl/admin_remoteupdate.tpl +++ /dev/null @@ -1,98 +0,0 @@ -<script src="js/jquery.htmlstream.js"></script> -<script> - /* ajax updater */ - function updateEnd(data){ - //$("#updatepopup .panel_text").html(data); - $("#remoteupdate_form").find("input").removeAttr('disabled'); - $(".panel_action_close").fadeIn() - } - function updateOn(data){ - - var patt=/§([^§]*)§/g; - var matches = data.match(patt); - $(matches).each(function(id,data){ - data = data.replace(/§/g,""); - d = data.split("@"); - console.log(d); - elm = $("#updatepopup .panel_text #"+d[0]); - html = "<div id='"+d[0]+"' class='progress'>"+d[1]+"<span>"+d[2]+"</span></div>"; - if (elm.length==0){ - $("#updatepopup .panel_text").append(html); - } else { - $(elm).replaceWith(html); - } - }); - - - } - - $(function(){ - $("#remoteupdate_form").submit(function(){ - var data={}; - $(this).find("input").each(function(i, e){ - name = $(e).attr('name'); - value = $(e).val(); - e.disabled = true; - data[name]=value; - }); - - $("#updatepopup .panel_text").html(""); - $("#updatepopup").show(); - $("#updatepopup .panel").hide().slideDown(500); - $(".panel_action_close").hide().click(function(){ - $("#updatepopup .panel").slideUp(500, function(){ - $("#updatepopup").hide(); - }); - }); - - $.post( - $(this).attr('action'), - data, - updateEnd, - 'text', - updateOn - ); - - - return false; - }) - }); -</script> -<div id="updatepopup" class="popup"> - <div class="background"></div> - <div class="panel"> - <div class="panel_in"> - <h1>Friendica Update</h1> - <div class="panel_text"></div> - <div class="panel_actions"> - <input type="button" value="$close" class="panel_action_close"> - </div> - </div> - </div> -</div> -<div id="adminpage"> - <dl> <dt>Your version:</dt><dd>$localversion</dd> </dl> -{{ if $needupdate }} - <dl> <dt>New version:</dt><dd>$remoteversion</dd> </dl> - - <form id="remoteupdate_form" method="POST" action="$baseurl/admin/update"> - <input type="hidden" name="$remotefile.0" value="$remotefile.2"> - - {{ if $canwrite }} - <div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div> - {{ else }} - <h3>Your friendica installation is not writable by web server.</h3> - {{ if $canftp }} - <p>You can try to update via FTP</p> - {{ inc field_input.tpl with $field=$ftphost }}{{ endinc }} - {{ inc field_input.tpl with $field=$ftppath }}{{ endinc }} - {{ inc field_input.tpl with $field=$ftpuser }}{{ endinc }} - {{ inc field_password.tpl with $field=$ftppwd }}{{ endinc }} - <div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div> - {{ endif }} - {{ endif }} - </form> -{{ else }} -<h4>No updates</h4> -{{ endif }} -</div> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index e09996aee..c6c15cec4 100644..100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -6,7 +6,7 @@ autoDimensions: false, onStart: function(){ var theme = $("#id_theme :selected").val(); - $("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme); + $("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme); }, onComplete: function(){ $("div#fancybox-content form").submit(function(e){ @@ -34,49 +34,52 @@ }); }); </script> -<div id='adminpage'> - <h1>$title - $page</h1> +<div id="adminpage" class="generic-content-wrapper"> + <h1>{{$title}} - {{$page}}</h1> - <form action="$baseurl/admin/site" method="post"> - <input type='hidden' name='form_security_token' value='$form_security_token'> + <form action="{{$baseurl}}/admin/site" method="post"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + + {{include file="field_input.tpl" field=$sitename}} + {{include file="field_textarea.tpl" field=$banner}} + {{include file="field_textarea.tpl" field=$admininfo}} + {{include file="field_select.tpl" field=$language}} + {{include file="field_select.tpl" field=$theme}} + {{include file="field_select.tpl" field=$theme_mobile}} + {{include file="field_select.tpl" field=$theme_accessibility}} + {{include file="field_input.tpl" field=$site_channel}} + {{include file="field_checkbox.tpl" field=$no_login_on_homepage}} - {{ inc field_input.tpl with $field=$sitename }}{{ endinc }} - {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }} - {{ inc field_select.tpl with $field=$language }}{{ endinc }} - {{ inc field_select.tpl with $field=$theme }}{{ endinc }} - {{ inc field_select.tpl with $field=$ssl_policy }}{{ 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> - <h3>$registration</h3> - {{ inc field_input.tpl with $field=$register_text }}{{ endinc }} - {{ inc field_select.tpl with $field=$register_policy }}{{ endinc }} + <h3>{{$registration}}</h3> + {{include file="field_input.tpl" field=$register_text}} + {{include file="field_select.tpl" field=$register_policy}} + {{include file="field_select.tpl" field=$access_policy}} - <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>$upload</h3> - {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }} + <h3>{{$upload}}</h3> + {{include file="field_input.tpl" field=$maximagesize}} - <h3>$corporate</h3> - {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }} - {{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }} - {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }} + <h3>{{$corporate}}</h3> + {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$force_publish}} + {{include file="field_checkbox.tpl" field=$disable_discover_tab}} - <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> - {{ inc field_input.tpl with $field=$proxy }}{{ endinc }} - {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }} - {{ inc field_input.tpl with $field=$timeout }}{{ endinc }} - {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }} - {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }} - {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }} - {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }} + <h3>{{$advanced}}</h3> + {{include file="field_input.tpl" field=$proxy}} + {{include file="field_input.tpl" field=$proxyuser}} + {{include file="field_input.tpl" field=$timeout}} + {{include file="field_input.tpl" field=$delivery_interval}} + {{include file="field_input.tpl" field=$poll_interval}} + {{include file="field_input.tpl" field=$maxloadavg}} + {{include file="field_input.tpl" field=$abandon_days}} - <div class="submit"><input type="submit" name="page_site" value="$submit" /></div> + <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> </form> </div> diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index 4efe1960c..24cdd57cc 100644..100755 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -1,40 +1,36 @@ -<div id='adminpage'> - <h1>$title - $page</h1> +<div class="generic-content-wrapper" id='adminpage'> + <h1>{{$title}} - {{$page}}</h1> <dl> - <dt>$queues.label</dt> - <dd>$queues.deliverq - $queues.queue</dd> + <dt>{{$queues.label}}</dt> + <dd>{{$queues.queue}}</dd> </dl> <dl> - <dt>$pending.0</dt> - <dd>$pending.1</dt> + <dt>{{$pending.0}}</dt> + <dd>{{$pending.1}}</dt> </dl> <dl> - <dt>$users.0</dt> - <dd>$users.1</dd> + <dt>{{$users.0}}</dt> + <dd>{{$users.1}}</dd> </dl> - {{ for $accounts as $p }} + <!-- $accounts is empty + {{foreach $accounts as $p}} <dl> - <dt>$p.0</dt> - <dd>{{ if $p.1 }}$p.1{{ else }}0{{ endif }}</dd> + <dt>{{$p.0}}</dt> + <dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd> </dl> - {{ endfor }} - - + {{/foreach}} --> <dl> - <dt>$plugins.0</dt> - - {{ for $plugins.1 as $p }} - <dd>$p</dd> - {{ endfor }} - + <dt>{{$plugins.0}}</dt> + <dd> + {{foreach $plugins.1 as $p}} {{$p}} {{/foreach}} + + </dd> </dl> - <dl> - <dt>$version.0</dt> - <dd>$version.1 - $build</dt> + <dt>{{$version.0}}</dt> + <dd>{{$version.1}} - {{$build}}</dd> </dl> - </div> diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index f67e4a0f7..65fffd17c 100644..100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -1,89 +1,91 @@ <script> function confirm_delete(uname){ - return confirm( "$confirm_delete".format(uname)); + return confirm( "{{$confirm_delete}}".format(uname)); } function confirm_delete_multi(){ - return confirm("$confirm_delete_multi"); + return confirm("{{$confirm_delete_multi}}"); } function selectall(cls){ $("."+cls).attr('checked','checked'); return false; } </script> -<div id='adminpage'> - <h1>$title - $page</h1> +<div class = "generic-content-wrapper" id='adminpage'> + <h1>{{$title}} - {{$page}}</h1> - <form action="$baseurl/admin/users" method="post"> - <input type='hidden' name='form_security_token' value='$form_security_token'> + <form action="{{$baseurl}}/admin/users" method="post"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - <h3>$h_pending</h3> - {{ if $pending }} + <h3>{{$h_pending}}</h3> + {{if $pending}} <table id='pending'> <thead> <tr> - {{ for $th_pending as $th }}<th>$th</th>{{ endfor }} + {{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}} <th></th> <th></th> </tr> </thead> <tbody> - {{ for $pending as $u }} + {{foreach $pending as $u}} <tr> - <td class="created">$u.created</td> - <td class="name">$u.name</td> - <td class="email">$u.email</td> - <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td> + <td class="created">{{$u.account_created}}</td> + <td class="email">{{$u.account_email}}</td> + <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td> <td class="tools"> - <a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a> - <a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a> + <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><i class='icon-thumbs-up-alt admin-icons'></i></a> + <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><i class='icon-thumbs-down-alt admin-icons'></i></a> </td> </tr> - {{ endfor }} + {{/foreach}} </tbody> </table> - <div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div> - <div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div> - {{ else }} - <p>$no_pending</p> - {{ endif }} + <div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div> + <div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div> + {{else}} + <p>{{$no_pending}}</p> + {{/if}} - <h3>$h_users</h3> - {{ if $users }} + <h3>{{$h_users}}</h3> + {{if $users}} <table id='users'> <thead> <tr> - <th></th> - {{ for $th_users as $th }}<th>$th</th>{{ endfor }} + {{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}} <th></th> <th></th> </tr> </thead> <tbody> - {{ for $users as $u }} + {{foreach $users as $u}} <tr> - <td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td> - <td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td> - <td class='email'>$u.email</td> - <td class='register_date'>$u.register_date</td> - <td class='login_date'>$u.login_date</td> - <td class='lastitem_date'>$u.lastitem_date</td> - <td class='login_date'>$u.page-flags</td> - <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td> + <td class='account_id'>{{$u.account_id}}</td> + <td class='email'>{{if $u.blocked}} + <i>{{$u.account_email}}</i> + {{else}} + <strong>{{$u.account_email}}</strong> + {{/if}}</td> + <td class='channels'>{{$u.channels}}</td> + <td class='register_date'>{{$u.account_created}}</td> + <td class='login_date'>{{$u.account_lastlog}}</td> + <td class='account_expires'>{{$u.account_expires}}</td> + <td class='service_class'>{{$u.account_service_class}}</td> + <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"/></td> <td class="tools"> - <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a> - <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a> + <a href="{{$baseurl}}/admin/users/block/{{$u.account_id}}?t={{$form_security_token}}" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($u.blocked)}}dim{{/if}}'></i></a> + <a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class='icon-remove admin-icons'></i></a> </td> </tr> - {{ endfor }} + {{/foreach}} </tbody> </table> - <div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div> - <div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div> - {{ else }} + <div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div> + <div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div> + {{else}} NO USERS?!? - {{ endif }} + {{/if}} </form> </div> diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl index 56a7b73fc..61653c47c 100644..100755 --- a/view/tpl/album_edit.tpl +++ b/view/tpl/album_edit.tpl @@ -1,14 +1,14 @@ <div id="photo-album-edit-wrapper"> -<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/$nickname/album/$hexalbum" method="post" > +<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" > -<label id="photo-album-edit-name-label" for="photo-album-edit-name" >$nametext</label> -<input type="text" size="64" name="albumname" value="$album" > +<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label> +<input type="text" size="64" name="albumname" value="{{$album}}" > <div id="photo-album-edit-name-end"></div> -<input id="photo-album-edit-submit" type="submit" name="submit" value="$submit" /> -<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="$dropsubmit" onclick="return confirmDelete();" /> +<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" /> +<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete();" /> </form> </div> diff --git a/view/tpl/alt_pager.tpl b/view/tpl/alt_pager.tpl new file mode 100644 index 000000000..b46dc7662 --- /dev/null +++ b/view/tpl/alt_pager.tpl @@ -0,0 +1,4 @@ +<div class="pager"> +{{if $has_less}}<a href="{{$url}}&page={{$prevpage}}" class="pager-prev">{{$less}}</a>{{/if}} +{{if $has_more}}{{if $has_less}} | {{/if}}<a href="{{$url}}&page={{$nextpage}}" class="pager-next">{{$more}}</a>{{/if}} +</div> diff --git a/view/tpl/api_config_xml.tpl b/view/tpl/api_config_xml.tpl index 3281e59dd..8c0766c73 100644..100755 --- a/view/tpl/api_config_xml.tpl +++ b/view/tpl/api_config_xml.tpl @@ -1,24 +1,24 @@ <config> <site> - <name>$config.site.name</name> - <server>$config.site.server</server> + <name>{{$config.site.name}}</name> + <server>{{$config.site.server}}</server> <theme>default</theme> <path></path> - <logo>$config.site.logo</logo> + <logo>{{$config.site.logo}}</logo> <fancy>true</fancy> <language>en</language> - <email>$config.site.email</email> + <email>{{$config.site.email}}</email> <broughtby></broughtby> <broughtbyurl></broughtbyurl> <timezone>UTC</timezone> - <closed>$config.site.closed</closed> + <closed>{{$config.site.closed}}</closed> <inviteonly>false</inviteonly> - <private>$config.site.private</private> - <textlimit>$config.site.textlimit</textlimit> - <ssl>$config.site.ssl</ssl> - <sslserver>$config.site.sslserver</sslserver> + <private>{{$config.site.private}}</private> + <textlimit>{{$config.site.textlimit}}</textlimit> + <ssl>{{$config.site.ssl}}</ssl> + <sslserver>{{$config.site.sslserver}}</sslserver> <shorturllength>30</shorturllength> </site> diff --git a/view/tpl/api_friends_xml.tpl b/view/tpl/api_friends_xml.tpl index 0ea7eb13b..f2a7234d1 100644..100755 --- a/view/tpl/api_friends_xml.tpl +++ b/view/tpl/api_friends_xml.tpl @@ -1,5 +1,5 @@ <users type="array"> - {{for $users as $user }} - {{inc api_user_xml.tpl }}{{endinc}} - {{endfor}} + {{foreach $users as $user}} + {{include file="api_user_xml.tpl"}} + {{/foreach}} </users> diff --git a/view/tpl/api_ratelimit_xml.tpl b/view/tpl/api_ratelimit_xml.tpl index 36ec1993d..e4b470a25 100644..100755 --- a/view/tpl/api_ratelimit_xml.tpl +++ b/view/tpl/api_ratelimit_xml.tpl @@ -1,6 +1,6 @@ <hash> - <remaining-hits type="integer">$hash.remaining_hits</remaining-hits> - <hourly-limit type="integer">$hash.hourly_limit</hourly-limit> - <reset-time type="datetime">$hash.reset_time</reset-time> - <reset_time_in_seconds type="integer">$hash.resettime_in_seconds</reset_time_in_seconds> + <remaining-hits type="integer">{{$hash.remaining_hits}}</remaining-hits> + <hourly-limit type="integer">{{$hash.hourly_limit}}</hourly-limit> + <reset-time type="datetime">{{$hash.reset_time}}</reset-time> + <reset_time_in_seconds type="integer">{{$hash.resettime_in_seconds}}</reset_time_in_seconds> </hash> diff --git a/view/tpl/api_status_xml.tpl b/view/tpl/api_status_xml.tpl index f6cd9c2c0..cbb736e22 100644..100755 --- a/view/tpl/api_status_xml.tpl +++ b/view/tpl/api_status_xml.tpl @@ -1,46 +1,46 @@ -<status>{{ if $status }} - <created_at>$status.created_at</created_at> - <id>$status.id</id> - <text>$status.text</text> - <source>$status.source</source> - <truncated>$status.truncated</truncated> - <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id> - <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id> - <favorited>$status.favorited</favorited> - <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name> - <geo>$status.geo</geo> - <coordinates>$status.coordinates</coordinates> - <place>$status.place</place> - <contributors>$status.contributors</contributors> +<status>{{if $status}} + <created_at>{{$status.created_at}}</created_at> + <id>{{$status.id}}</id> + <text>{{$status.text}}</text> + <source>{{$status.source}}</source> + <truncated>{{$status.truncated}}</truncated> + <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id> + <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id> + <favorited>{{$status.favorited}}</favorited> + <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name> + <geo>{{$status.geo}}</geo> + <coordinates>{{$status.coordinates}}</coordinates> + <place>{{$status.place}}</place> + <contributors>{{$status.contributors}}</contributors> <user> - <id>$status.user.id</id> - <name>$status.user.name</name> - <screen_name>$status.user.screen_name</screen_name> - <location>$status.user.location</location> - <description>$status.user.description</description> - <profile_image_url>$status.user.profile_image_url</profile_image_url> - <url>$status.user.url</url> - <protected>$status.user.protected</protected> - <followers_count>$status.user.followers</followers_count> - <profile_background_color>$status.user.profile_background_color</profile_background_color> - <profile_text_color>$status.user.profile_text_color</profile_text_color> - <profile_link_color>$status.user.profile_link_color</profile_link_color> - <profile_sidebar_fill_color>$status.user.profile_sidebar_fill_color</profile_sidebar_fill_color> - <profile_sidebar_border_color>$status.user.profile_sidebar_border_color</profile_sidebar_border_color> - <friends_count>$status.user.friends_count</friends_count> - <created_at>$status.user.created_at</created_at> - <favourites_count>$status.user.favourites_count</favourites_count> - <utc_offset>$status.user.utc_offset</utc_offset> - <time_zone>$status.user.time_zone</time_zone> - <profile_background_image_url>$status.user.profile_background_image_url</profile_background_image_url> - <profile_background_tile>$status.user.profile_background_tile</profile_background_tile> - <profile_use_background_image>$status.user.profile_use_background_image</profile_use_background_image> + <id>{{$status.user.id}}</id> + <name>{{$status.user.name}}</name> + <screen_name>{{$status.user.screen_name}}</screen_name> + <location>{{$status.user.location}}</location> + <description>{{$status.user.description}}</description> + <profile_image_url>{{$status.user.profile_image_url}}</profile_image_url> + <url>{{$status.user.url}}</url> + <protected>{{$status.user.protected}}</protected> + <followers_count>{{$status.user.followers}}</followers_count> + <profile_background_color>{{$status.user.profile_background_color}}</profile_background_color> + <profile_text_color>{{$status.user.profile_text_color}}</profile_text_color> + <profile_link_color>{{$status.user.profile_link_color}}</profile_link_color> + <profile_sidebar_fill_color>{{$status.user.profile_sidebar_fill_color}}</profile_sidebar_fill_color> + <profile_sidebar_border_color>{{$status.user.profile_sidebar_border_color}}</profile_sidebar_border_color> + <friends_count>{{$status.user.friends_count}}</friends_count> + <created_at>{{$status.user.created_at}}</created_at> + <favourites_count>{{$status.user.favourites_count}}</favourites_count> + <utc_offset>{{$status.user.utc_offset}}</utc_offset> + <time_zone>{{$status.user.time_zone}}</time_zone> + <profile_background_image_url>{{$status.user.profile_background_image_url}}</profile_background_image_url> + <profile_background_tile>{{$status.user.profile_background_tile}}</profile_background_tile> + <profile_use_background_image>{{$status.user.profile_use_background_image}}</profile_use_background_image> <notifications></notifications> - <geo_enabled>$status.user.geo_enabled</geo_enabled> - <verified>$status.user.verified</verified> + <geo_enabled>{{$status.user.geo_enabled}}</geo_enabled> + <verified>{{$status.user.verified}}</verified> <following></following> - <statuses_count>$status.user.statuses_count</statuses_count> - <lang>$status.user.lang</lang> - <contributors_enabled>$status.user.contributors_enabled</contributors_enabled> + <statuses_count>{{$status.user.statuses_count}}</statuses_count> + <lang>{{$status.user.lang}}</lang> + <contributors_enabled>{{$status.user.contributors_enabled}}</contributors_enabled> </user> -{{ endif }}</status> +{{/if}}</status> diff --git a/view/tpl/api_test_xml.tpl b/view/tpl/api_test_xml.tpl index 7509a2dc1..80a541c39 100644..100755 --- a/view/tpl/api_test_xml.tpl +++ b/view/tpl/api_test_xml.tpl @@ -1 +1 @@ -<ok>$ok</ok> +<ok>{{$ok}}</ok> diff --git a/view/tpl/api_timeline_atom.tpl b/view/tpl/api_timeline_atom.tpl index 9039220e7..e8bfb689e 100644..100755 --- a/view/tpl/api_timeline_atom.tpl +++ b/view/tpl/api_timeline_atom.tpl @@ -1,90 +1,90 @@ <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/"> <generator uri="http://status.net" version="0.9.7">StatusNet</generator> - <id>$rss.self</id> + <id>{{$rss.self}}</id> <title>Friendika</title> <subtitle>Friendika API feed</subtitle> - <logo>$rss.logo</logo> - <updated>$rss.atom_updated</updated> - <link type="text/html" rel="alternate" href="$rss.alternate"/> - <link type="application/atom+xml" rel="self" href="$rss.self"/> + <logo>{{$rss.logo}}</logo> + <updated>{{$rss.atom_updated}}</updated> + <link type="text/html" rel="alternate" href="{{$rss.alternate}}"/> + <link type="application/atom+xml" rel="self" href="{{$rss.self}}"/> <author> <activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type> - <uri>$user.url</uri> - <name>$user.name</name> - <link rel="alternate" type="text/html" href="$user.url"/> - <link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="$user.profile_image_url"/> - <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="$user.profile_image_url"/> - <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$user.profile_image_url"/> - <link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="$user.profile_image_url"/> + <uri>{{$user.url}}</uri> + <name>{{$user.name}}</name> + <link rel="alternate" type="text/html" href="{{$user.url}}"/> + <link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/> + <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/> + <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/> + <link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/> <georss:point></georss:point> - <poco:preferredUsername>$user.screen_name</poco:preferredUsername> - <poco:displayName>$user.name</poco:displayName> + <poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername> + <poco:displayName>{{$user.name}}</poco:displayName> <poco:urls> <poco:type>homepage</poco:type> - <poco:value>$user.url</poco:value> + <poco:value>{{$user.url}}</poco:value> <poco:primary>true</poco:primary> </poco:urls> - <statusnet:profile_info local_id="$user.id"></statusnet:profile_info> + <statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info> </author> <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.--> <activity:subject> <activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type> - <id>$user.contact_url</id> - <title>$user.name</title> - <link rel="alternate" type="text/html" href="$user.url"/> - <link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="$user.profile_image_url"/> - <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="$user.profile_image_url"/> - <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$user.profile_image_url"/> - <link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="$user.profile_image_url"/> - <poco:preferredUsername>$user.screen_name</poco:preferredUsername> - <poco:displayName>$user.name</poco:displayName> + <id>{{$user.contact_url}}</id> + <title>{{$user.name}}</title> + <link rel="alternate" type="text/html" href="{{$user.url}}"/> + <link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/> + <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/> + <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/> + <link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/> + <poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername> + <poco:displayName>{{$user.name}}</poco:displayName> <poco:urls> <poco:type>homepage</poco:type> - <poco:value>$user.url</poco:value> + <poco:value>{{$user.url}}</poco:value> <poco:primary>true</poco:primary> </poco:urls> - <statusnet:profile_info local_id="$user.id"></statusnet:profile_info> + <statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info> </activity:subject> - {{ for $statuses as $status }} + {{foreach $statuses as $status}} <entry> - <activity:obj_type>$status.objecttype</activity:obj_type> - <id>$status.message_id</id> - <title>$status.text</title> - <content type="html">$status.statusnet_html</content> - <link rel="alternate" type="text/html" href="$status.url"/> - <activity:verb>$status.verb</activity:verb> - <published>$status.published</published> - <updated>$status.updated</updated> + <activity:obj_type>{{$status.objecttype}}</activity:obj_type> + <id>{{$status.message_id}}</id> + <title>{{$status.text}}</title> + <content type="html">{{$status.statusnet_html}}</content> + <link rel="alternate" type="text/html" href="{{$status.url}}"/> + <activity:verb>{{$status.verb}}</activity:verb> + <published>{{$status.published}}</published> + <updated>{{$status.updated}}</updated> - <link rel="self" type="application/atom+xml" href="$status.self"/> - <link rel="edit" type="application/atom+xml" href="$status.edit"/> - <statusnet:notice_info local_id="$status.id" source="$status.source" > + <link rel="self" type="application/atom+xml" href="{{$status.self}}"/> + <link rel="edit" type="application/atom+xml" href="{{$status.edit}}"/> + <statusnet:notice_info local_id="{{$status.id}}" source="{{$status.source}}" > </statusnet:notice_info> <author> <activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type> - <uri>$status.user.url</uri> - <name>$status.user.name</name> - <link rel="alternate" type="text/html" href="$status.user.url"/> - <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$status.user.profile_image_url"/> + <uri>{{$status.user.url}}</uri> + <name>{{$status.user.name}}</name> + <link rel="alternate" type="text/html" href="{{$status.user.url}}"/> + <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$status.user.profile_image_url}}"/> <georss:point/> - <poco:preferredUsername>$status.user.screen_name</poco:preferredUsername> - <poco:displayName>$status.user.name</poco:displayName> + <poco:preferredUsername>{{$status.user.screen_name}}</poco:preferredUsername> + <poco:displayName>{{$status.user.name}}</poco:displayName> <poco:address/> <poco:urls> <poco:type>homepage</poco:type> - <poco:value>$status.user.url</poco:value> + <poco:value>{{$status.user.url}}</poco:value> <poco:primary>true</poco:primary> </poco:urls> </author> - <link rel="ostatus:conversation" type="text/html" href="$status.url"/> + <link rel="ostatus:conversation" type="text/html" href="{{$status.url}}"/> </entry> - {{ endfor }} + {{/foreach}} </feed> diff --git a/view/tpl/api_timeline_rss.tpl b/view/tpl/api_timeline_rss.tpl index 40239273c..86c645e99 100644..100755 --- a/view/tpl/api_timeline_rss.tpl +++ b/view/tpl/api_timeline_rss.tpl @@ -1,26 +1,26 @@ <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com"> <channel> <title>Friendika</title> - <link>$rss.alternate</link> - <atom:link type="application/rss+xml" rel="self" href="$rss.self"/> + <link>{{$rss.alternate}}</link> + <atom:link type="application/rss+xml" rel="self" href="{{$rss.self}}"/> <description>Friendika timeline</description> - <language>$rss.language</language> + <language>{{$rss.language}}</language> <ttl>40</ttl> <image> - <link>$user.link</link> - <title>$user.name's items</title> - <url>$user.profile_image_url</url> + <link>{{$user.link}}</link> + <title>{{$user.name}}'s items</title> + <url>{{$user.profile_image_url}}</url> </image> -{{ for $statuses as $status }} +{{foreach $statuses as $status}} <item> - <title>$status.user.name: $status.text</title> - <description>$status.text</description> - <pubDate>$status.created_at</pubDate> - <guid>$status.url</guid> - <link>$status.url</link> - <twitter:source>$status.source</twitter:source> + <title>{{$status.user.name}}: {{$status.text}}</title> + <description>{{$status.text}}</description> + <pubDate>{{$status.created_at}}</pubDate> + <guid>{{$status.url}}</guid> + <link>{{$status.url}}</link> + <twitter:source>{{$status.source}}</twitter:source> </item> -{{ endfor }} +{{/foreach}} </channel> </rss> diff --git a/view/tpl/api_timeline_xml.tpl b/view/tpl/api_timeline_xml.tpl index 4a32b411b..f14d73e9c 100644..100755 --- a/view/tpl/api_timeline_xml.tpl +++ b/view/tpl/api_timeline_xml.tpl @@ -1,20 +1,20 @@ <statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/"> -{{ for $statuses as $status }} <status> - <text>$status.text</text> - <truncated>$status.truncated</truncated> - <created_at>$status.created_at</created_at> - <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id> - <source>$status.source</source> - <id>$status.id</id> - <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id> - <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name> - <geo>$status.geo</geo> - <favorited>$status.favorited</favorited> -{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }} <statusnet:html>$status.statusnet_html</statusnet:html> - <statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id> - <url>$status.url</url> - <coordinates>$status.coordinates</coordinates> - <place>$status.place</place> - <contributors>$status.contributors</contributors> +{{foreach $statuses as $status}} <status> + <text>{{$status.text}}</text> + <truncated>{{$status.truncated}}</truncated> + <created_at>{{$status.created_at}}</created_at> + <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id> + <source>{{$status.source}}</source> + <id>{{$status.id}}</id> + <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id> + <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name> + <geo>{{$status.geo}}</geo> + <favorited>{{$status.favorited}}</favorited> +{{include file="api_user_xml.tpl" user=$status.user}} <statusnet:html>{{$status.statusnet_html}}</statusnet:html> + <statusnet:conversation_id>{{$status.statusnet_conversation_id}}</statusnet:conversation_id> + <url>{{$status.url}}</url> + <coordinates>{{$status.coordinates}}</coordinates> + <place>{{$status.place}}</place> + <contributors>{{$status.contributors}}</contributors> </status> -{{ endfor }}</statuses> +{{/foreach}}</statuses> diff --git a/view/tpl/api_user_xml.tpl b/view/tpl/api_user_xml.tpl index d286652c0..3b51992f6 100644..100755 --- a/view/tpl/api_user_xml.tpl +++ b/view/tpl/api_user_xml.tpl @@ -1,46 +1,46 @@ <user> - <id>$user.id</id> - <name>$user.name</name> - <screen_name>$user.screen_name</screen_name> - <location>$user.location</location> - <description>$user.description</description> - <profile_image_url>$user.profile_image_url</profile_image_url> - <url>$user.url</url> - <protected>$user.protected</protected> - <followers_count>$user.followers_count</followers_count> - <friends_count>$user.friends_count</friends_count> - <created_at>$user.created_at</created_at> - <favourites_count>$user.favourites_count</favourites_count> - <utc_offset>$user.utc_offset</utc_offset> - <time_zone>$user.time_zone</time_zone> - <statuses_count>$user.statuses_count</statuses_count> - <following>$user.following</following> - <profile_background_color>$user.profile_background_color</profile_background_color> - <profile_text_color>$user.profile_text_color</profile_text_color> - <profile_link_color>$user.profile_link_color</profile_link_color> - <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color> - <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color> - <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url> - <profile_background_tile>$user.profile_background_tile</profile_background_tile> - <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image> - <notifications>$user.notifications</notifications> - <geo_enabled>$user.geo_enabled</geo_enabled> - <verified>$user.verified</verified> - <lang>$user.lang</lang> - <contributors_enabled>$user.contributors_enabled</contributors_enabled> - <status>{{ if $user.status }} - <created_at>$user.status.created_at</created_at> - <id>$user.status.id</id> - <text>$user.status.text</text> - <source>$user.status.source</source> - <truncated>$user.status.truncated</truncated> - <in_reply_to_status_id>$user.status.in_reply_to_status_id</in_reply_to_status_id> - <in_reply_to_user_id>$user.status.in_reply_to_user_id</in_reply_to_user_id> - <favorited>$user.status.favorited</favorited> - <in_reply_to_screen_name>$user.status.in_reply_to_screen_name</in_reply_to_screen_name> - <geo>$user.status.geo</geo> - <coordinates>$user.status.coordinates</coordinates> - <place>$user.status.place</place> - <contributors>$user.status.contributors</contributors> - {{ endif }}</status> + <id>{{$user.id}}</id> + <name>{{$user.name}}</name> + <screen_name>{{$user.screen_name}}</screen_name> + <location>{{$user.location}}</location> + <description>{{$user.description}}</description> + <profile_image_url>{{$user.profile_image_url}}</profile_image_url> + <url>{{$user.url}}</url> + <protected>{{$user.protected}}</protected> + <followers_count>{{$user.followers_count}}</followers_count> + <friends_count>{{$user.friends_count}}</friends_count> + <created_at>{{$user.created_at}}</created_at> + <favourites_count>{{$user.favourites_count}}</favourites_count> + <utc_offset>{{$user.utc_offset}}</utc_offset> + <time_zone>{{$user.time_zone}}</time_zone> + <statuses_count>{{$user.statuses_count}}</statuses_count> + <following>{{$user.following}}</following> + <profile_background_color>{{$user.profile_background_color}}</profile_background_color> + <profile_text_color>{{$user.profile_text_color}}</profile_text_color> + <profile_link_color>{{$user.profile_link_color}}</profile_link_color> + <profile_sidebar_fill_color>{{$user.profile_sidebar_fill_color}}</profile_sidebar_fill_color> + <profile_sidebar_border_color>{{$user.profile_sidebar_border_color}}</profile_sidebar_border_color> + <profile_background_image_url>{{$user.profile_background_image_url}}</profile_background_image_url> + <profile_background_tile>{{$user.profile_background_tile}}</profile_background_tile> + <profile_use_background_image>{{$user.profile_use_background_image}}</profile_use_background_image> + <notifications>{{$user.notifications}}</notifications> + <geo_enabled>{{$user.geo_enabled}}</geo_enabled> + <verified>{{$user.verified}}</verified> + <lang>{{$user.lang}}</lang> + <contributors_enabled>{{$user.contributors_enabled}}</contributors_enabled> + <status>{{if $user.status}} + <created_at>{{$user.status.created_at}}</created_at> + <id>{{$user.status.id}}</id> + <text>{{$user.status.text}}</text> + <source>{{$user.status.source}}</source> + <truncated>{{$user.status.truncated}}</truncated> + <in_reply_to_status_id>{{$user.status.in_reply_to_status_id}}</in_reply_to_status_id> + <in_reply_to_user_id>{{$user.status.in_reply_to_user_id}}</in_reply_to_user_id> + <favorited>{{$user.status.favorited}}</favorited> + <in_reply_to_screen_name>{{$user.status.in_reply_to_screen_name}}</in_reply_to_screen_name> + <geo>{{$user.status.geo}}</geo> + <coordinates>{{$user.status.coordinates}}</coordinates> + <place>{{$user.status.place}}</place> + <contributors>{{$user.status.contributors}}</contributors> + {{/if}}</status> </user> diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl new file mode 100644 index 000000000..4719f7f96 --- /dev/null +++ b/view/tpl/app.tpl @@ -0,0 +1,19 @@ +<div class="app-container"> +<a href="{{$app.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}><img src="{{$app.photo}}" width="80" height="80" /> +<div class="app-name">{{$app.name}}</div> +</a> +{{if $app.type !== 'system'}} +{{if $purchase}} +<a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="icon-external"></i></a> +{{/if}} +{{if $install || $update || $delete }} +<form action="{{$hosturl}}appman" method="post"> +<input type="hidden" name="papp" value="{{$app.papp}}" /> +{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default" title="{{$install}}" ><i class="icon-download-alt" ></i></button>{{/if}} +{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default" title="{{$edit}}" ><i class="icon-pencil" ></i></button>{{/if}} +{{if $delete}}<button type="submit" name="delete" value="{{$delete}}" class="btn btn-default" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></button>{{/if}} +</form> +{{/if}} +{{/if}} +</div> + diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl new file mode 100644 index 000000000..ff28e0598 --- /dev/null +++ b/view/tpl/app_create.tpl @@ -0,0 +1,30 @@ +<h2>{{$banner}}</h2> + + +<form action="appman" method="post"> +{{if $guid}} +<input type="hidden" name="guid" value="{{$guid}}" /> +{{/if}} +{{if $author}} +<input type="hidden" name="author" value="{{$author}}" /> +{{/if}} +{{if $addr}} +<input type="hidden" name="addr" value="{{$addr}}" /> +{{/if}} + +{{include file="field_input.tpl" field=$name}} +{{include file="field_input.tpl" field=$url}} +{{include file="field_textarea.tpl" field=$desc}} +{{include file="field_input.tpl" field=$photo}} +{{include file="field_input.tpl" field=$version}} +{{include file="field_input.tpl" field=$price}} +{{include file="field_input.tpl" field=$page}} + +{{if $embed}} +{{include file="field_textarea.tpl" field=$embed}} +{{/if}} + +<input type="submit" name="submit" value="{{$submit}}" /> + +</form> + diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl new file mode 100644 index 000000000..5cf3f40d6 --- /dev/null +++ b/view/tpl/app_select.tpl @@ -0,0 +1,10 @@ +{{if $authed}} +<div class="widget"> +<h3>{{$title}}</h3> +<ul> +<li><a href="appman">{{$new}}</a></li> +<li><a href="apps/edit">{{$edit}}</a></li> +</ul> +</div> +{{/if}} + diff --git a/view/tpl/apps.tpl b/view/tpl/apps.tpl index 4c7f8c94c..d8e538cb7 100644..100755 --- a/view/tpl/apps.tpl +++ b/view/tpl/apps.tpl @@ -1,7 +1,11 @@ -<h3>$title</h3> +<h3>{{$title}}</h3> + +{{foreach $apps as $ap}} +<div class="app-container"> +<a href="{{$ap.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $ap.hover}}title="{{$ap.hover}}"{{/if}}><img src="{{$ap.photo}}" width="80" height="80" /> +<div class="app-name">{{$ap.name}}</div> +</a> +</div> +{{/foreach}} +<div class="clear"></div> -<ul> - {{ for $apps as $ap }} - <li>$ap</li> - {{ endfor }} -</ul> diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl index 2feb547ee..2c8024d47 100644..100755 --- a/view/tpl/atom_feed.tpl +++ b/view/tpl/atom_feed.tpl @@ -4,26 +4,29 @@ xmlns:at="http://purl.org/atompub/tombstones/1.0" xmlns:media="http://purl.org/syndication/atommedia" xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" + xmlns:zot="http://purl.org/zot" xmlns:as="http://activitystrea.ms/spec/1.0/" xmlns:georss="http://www.georss.org/georss" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/" > - <id>$feed_id</id> - <title>$feed_title</title> - <generator uri="http://friendica.com" version="$version">Friendica</generator> + <id>{{$feed_id}}</id> + <title>{{$feed_title}}</title> + <generator uri="http://getzot.com" version="{{$version}}">{{$red}}</generator> <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" /> - $hub - $salmon - $community +{{if $hub}} + {{$hub}} +{{/if}} +{{if $salmon}} + {{$salmon}} +{{/if}} - <updated>$feed_updated</updated> + <updated>{{$feed_updated}}</updated> - <dfrn:owner> - <name dfrn:updated="$namdate" >$name</name> - <uri dfrn:updated="$uridate" >$profile_page</uri> - <link rel="photo" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" /> - <link rel="avatar" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" /> - $birthday - </dfrn:owner> + <zot:owner> + <name>{{$name}}</name> + <uri>{{$profile_page}}</uri> + <link rel="photo" type="{{$mimephoto}}" media:width="175" media:height="175" href="{{$photo}}" /> + <link rel="avatar" type="{{$mimephoto}}" media:width="175" media:height="175" href="{{$photo}}" /> + </zot:owner> diff --git a/view/tpl/atom_feed_dfrn.tpl b/view/tpl/atom_feed_dfrn.tpl index 0bae62b52..307001fbe 100644..100755 --- a/view/tpl/atom_feed_dfrn.tpl +++ b/view/tpl/atom_feed_dfrn.tpl @@ -10,20 +10,20 @@ xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/" > - <id>$feed_id</id> - <title>$feed_title</title> - <generator uri="http://friendica.com" version="$version">Friendica</generator> + <id>{{$feed_id}}</id> + <title>{{$feed_title}}</title> + <generator uri="http://friendica.com" version="{{$version}}">Friendica</generator> <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" /> - $hub - $salmon - $community + {{$hub}} + {{$salmon}} + {{$community}} - <updated>$feed_updated</updated> + <updated>{{$feed_updated}}</updated> <author> - <name dfrn:updated="$namdate" >$name</name> - <uri dfrn:updated="$uridate" >$profile_page</uri> - <link rel="photo" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" /> - <link rel="avatar" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" /> - $birthday + <name dfrn:updated="{{$namdate}}" >{{$name}}</name> + <uri dfrn:updated="{{$uridate}}" >{{$profile_page}}</uri> + <link rel="photo" type="image/jpeg" dfrn:updated="{{$picdate}}" media:width="175" media:height="175" href="{{$photo}}" /> + <link rel="avatar" type="image/jpeg" dfrn:updated="{{$picdate}}" media:width="175" media:height="175" href="{{$photo}}" /> + {{$birthday}} </author> diff --git a/view/tpl/atom_mail.tpl b/view/tpl/atom_mail.tpl deleted file mode 100644 index bf7c3efc8..000000000 --- a/view/tpl/atom_mail.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -<dfrn:mail> - - <dfrn:sender> - <dfrn:name>$name</dfrn:name> - <dfrn:uri>$profile_page</dfrn:uri> - <dfrn:avatar>$thumb</dfrn:avatar> - </dfrn:sender> - - <dfrn:id>$item_id</dfrn:id> - <dfrn:in-reply-to>$parent_id</dfrn:in-reply-to> - <dfrn:sentdate>$created</dfrn:sentdate> - <dfrn:subject>$subject</dfrn:subject> - <dfrn:content>$content</dfrn:content> - -</dfrn:mail> - diff --git a/view/tpl/atom_suggest.tpl b/view/tpl/atom_suggest.tpl deleted file mode 100644 index 66c61f9b6..000000000 --- a/view/tpl/atom_suggest.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -<dfrn:suggest> - - <dfrn:url>$url</dfrn:url> - <dfrn:name>$name</dfrn:name> - <dfrn:photo>$photo</dfrn:photo> - <dfrn:request>$request</dfrn:request> - <dfrn:note>$note</dfrn:note> - -</dfrn:suggest> - diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl new file mode 100644 index 000000000..0d3d2c571 --- /dev/null +++ b/view/tpl/attach_edit.tpl @@ -0,0 +1,36 @@ +<div id="attach-edit-backlink">< <a href="cloud/{{$channelnick}}">{{$backlink}}</a></div> + +<h1>{{$header}}</h1> + +<form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > + +<div id="attach-edit-perms" > +<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> +</button> +{{$aclselect}} {{$file.filename}} +</div> + +<input type="hidden" name="channelnick" value="{{$channelnick}}" /> +<input type="hidden" name="filehash" value="{{$file.hash}}" /> +<input type="hidden" name="uid" value="{{$uid}}" /> +<input type="hidden" name="fileid" value="{{$file.id}}" /> + +{{if $isadir}} +<div id="attach-edit-recurse" > + <label id="attach-edit-recurse-text" for="attach-recurse-input" >{{$recurse}}</label> + <input id="attach-recurse-input" type="checkbox" name="recurse" value="1" /> +</div> +{{else}} +<div class="cut-paste-desc">{{$cpdesc}}</div> +<input type="text" id="cutpasteinput" name="cutpastelink" value="[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" onclick="this.select();" /><br /> +{{/if}} + +<div class="cut-paste-desc">{{$cpldesc}}</div> +<input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br /> + +<div class="clear"></div> +<input id="attach-edit-submit" type="submit" name="submit" value="{{$submit}}" /> +</form> + + diff --git a/view/tpl/auto_request.tpl b/view/tpl/auto_request.tpl deleted file mode 100644 index 961de9bb3..000000000 --- a/view/tpl/auto_request.tpl +++ /dev/null @@ -1,37 +0,0 @@ - -<h1>$header</h1> - -<p id="dfrn-request-intro"> -$page_desc<br /> -<ul id="dfrn-request-networks"> -<li><a href="http://friendica.com" title="$friendica">$friendica</a></li> -<li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li> -<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li> -{{ if $emailnet }}<li>$emailnet</li>{{ endif }} -</ul> -</p> -<p> -$invite_desc -</p> -<p> -$desc -</p> - -<form action="dfrn_request/$nickname" method="post" /> - -<div id="dfrn-request-url-wrapper" > - <label id="dfrn-url-label" for="dfrn-url" >$your_address</label> - <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" /> - <div id="dfrn-request-url-end"></div> -</div> - - -<div id="dfrn-request-info-wrapper" > - -</div> - - <div id="dfrn-request-submit-wrapper"> - <input type="submit" name="submit" id="dfrn-request-submit-button" value="$submit" /> - <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="$cancel" /> - </div> -</form> diff --git a/view/tpl/birthdays_reminder.tpl b/view/tpl/birthdays_reminder.tpl index 8db7d22f4..d0500364a 100644..100755 --- a/view/tpl/birthdays_reminder.tpl +++ b/view/tpl/birthdays_reminder.tpl @@ -1,10 +1,10 @@ -{{ if $count }} -<div id="birthday-notice" class="birthday-notice fakelink $classtoday" onclick="openClose('birthday-wrapper');">$event_reminders ($count)</div> -<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">$event_title</div> +{{if $count}} +<div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div> +<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div> <div id="birthday-title-end"></div> -{{ for $events as $event }} -<div class="birthday-list" id="birthday-$event.id"></a> <a href="$event.link">$event.title</a> $event.date </div> -{{ endfor }} +{{foreach $events as $event}} +<div class="birthday-list" id="birthday-{{$event.id}}"></a> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div> +{{/foreach}} </div> -{{ endif }} +{{/if}} diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl new file mode 100644 index 000000000..adf61f788 --- /dev/null +++ b/view/tpl/blocklist.tpl @@ -0,0 +1,18 @@ +{{if $pages}} + + <div id="pagelist-content-wrapper" class="generic-content-wrapper"> + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + <div class="page-list-item"> + {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon"></i></a> {{/if}} + {{if $view}}<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon"></i></a> {{/if}} + {{if $preview}}<a href="block/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if}} + {{$item.title}} + </div> + {{/foreach}} + {{/foreach}} + </div> + + <div class="clear"></div> + +{{/if}} diff --git a/view/tpl/bookmarkedchats.tpl b/view/tpl/bookmarkedchats.tpl new file mode 100644 index 000000000..7635bb826 --- /dev/null +++ b/view/tpl/bookmarkedchats.tpl @@ -0,0 +1,10 @@ +{{if $rooms}} +<div class="widget"> +<h3>{{$header}}</h3> +<ul class="bookmarkchat"> +{{foreach $rooms as $room}} +<li><a href="{{$room.xchat_url}}">{{$room.xchat_desc}}</a></li> +{{/foreach}} +</ul> +</div> +{{/if}}
\ No newline at end of file diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index b7b0ac86c..204b5114a 100644..100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -1,27 +1,30 @@ <script> - var bParam_cmd = "$baseurl/update_$pgtype"; + var bParam_cmd = "{{$baseurl}}/update_{{$pgtype}}"; - var bParam_uid = $uid; - var bParam_gid = $gid; - var bParam_cid = $cid; - var bParam_cmin = $cmin; - var bParam_cmax = $cmax; - var bParam_star = $star; - var bParam_liked = $liked; - var bParam_conv = $conv; - var bParam_spam = $spam; - var bParam_new = $nouveau; - var bParam_page = $page; - var bParam_wall = $wall; + var bParam_uid = {{$uid}}; + var bParam_gid = {{$gid}}; + var bParam_cid = {{$cid}}; + var bParam_cmin = {{$cmin}}; + var bParam_cmax = {{$cmax}}; + var bParam_star = {{$star}}; + var bParam_liked = {{$liked}}; + var bParam_conv = {{$conv}}; + var bParam_spam = {{$spam}}; + var bParam_new = {{$nouveau}}; + var bParam_page = {{$page}}; + var bParam_wall = {{$wall}}; + var bParam_list = {{$list}}; + var bParam_fh = {{$fh}}; - var bParam_search = "$search"; - var bParam_order = "$order"; - var bParam_file = "$file"; - var bParam_cats = "$cats"; - var bParam_dend = "$dend"; - var bParam_dbegin = "$dbegin"; + var bParam_search = "{{$search}}"; + var bParam_order = "{{$order}}"; + var bParam_file = "{{$file}}"; + var bParam_cats = "{{$cats}}"; + var bParam_dend = "{{$dend}}"; + var bParam_dbegin = "{{$dbegin}}"; + var bParam_mid = "{{$mid}}"; function buildCmd() { var udargs = ((page_load) ? "/load" : ""); @@ -37,11 +40,15 @@ if(bParam_spam != 0) bCmd = bCmd + "&spam=" + bParam_spam; if(bParam_new != 0) bCmd = bCmd + "&new=" + bParam_new; if(bParam_wall != 0) bCmd = bCmd + "&wall=" + bParam_wall; + if(bParam_list != 0) bCmd = bCmd + "&list=" + bParam_list; + if(bParam_fh != 0) bCmd = bCmd + "&fh=" + bParam_fh; if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search; + if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order; if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file; - if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats; + if(bParam_cats != "") bCmd = bCmd + "&cat=" + bParam_cats; if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend; if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin; + if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid; if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page; return(bCmd); } diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl index 19e91c560..2c0b3bcc2 100644..100755 --- a/view/tpl/categories_widget.tpl +++ b/view/tpl/categories_widget.tpl @@ -1,12 +1,12 @@ <div id="categories-sidebar" class="widget"> - <h3>$title</h3> - <div id="categories-sidebar-desc">$desc</div> + <h3>{{$title}}</h3> + <div id="categories-sidebar-desc">{{$desc}}</div> <ul class="categories-ul"> - <li class="tool"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li> - {{ for $terms as $term }} - <li class="tool"><a href="$base?f=&cat=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li> - {{ endfor }} + <li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li> + {{foreach $terms as $term}} + <li class="tool"><a href="{{$base}}?f=&cat={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li> + {{/foreach}} </ul> </div> diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index af4f9b703..1ed2fbd2c 100644..100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,12 +1,12 @@ <div class="channel-selection"> -{{ if $channel.default_links }} -{{ if $channel.default }} -<div class="channel-selection-default default">$msg_default</div> -{{ else }} -<div class="channel-selection-default"><a href="manage/$channel.channel_id/default">$msg_make_default</a></div> -{{ endif }} -{{ endif }} -<a href="$channel.link" class="channel-selection-photo-link" title="$channel.channel_name"><img class="channel-photo" src="$channel.xchan_photo_m" alt="$channel.channel_name" /></a> -<a href="$channel.link" class="channel-selection-name-link" title="$channel.channel_name"><div class="channel-name">$channel.channel_name</div></a> +{{if $channel.default_links}} +{{if $channel.default}} +<div class="channel-selection-default default"><i class="icon-check"></i> {{$msg_default}}</div> +{{else}} +<div class="channel-selection-default"><a href="manage/{{$channel.channel_id}}/default"><i class="icon-check-empty" title="{{$msg_make_default}}"></i></a></div> +{{/if}} +{{/if}} +<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a> +<a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a> </div> <div class="channel-selection-end"></div> diff --git a/view/tpl/channel_id_select.tpl b/view/tpl/channel_id_select.tpl new file mode 100644 index 000000000..ecebd4bc0 --- /dev/null +++ b/view/tpl/channel_id_select.tpl @@ -0,0 +1,7 @@ +{{if $channels}} +<select name="dest_channel" id="dest-channel-select"> +{{foreach $channels as $c}} +<option {{if $c.channel_id == $selected}}selected="selected"{{/if}} value="{{$c.channel_id}}">{{$c.channel_name}}</option> +{{/foreach}} +</select> +{{/if}}
\ No newline at end of file diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl new file mode 100755 index 000000000..f7635ea52 --- /dev/null +++ b/view/tpl/channel_import.tpl @@ -0,0 +1,35 @@ +<h2>{{$title}}</h2> + +<form action="import" method="post" enctype="multipart/form-data" id="import-channel-form"> + + <div id="import-desc" class="descriptive-paragraph">{{$desc}}</div> + + <label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label> + <input type="file" name="filename" id="import-filename" class="import-input" value="" /> + <div id="import-filename-end" class="import-field-end"></div> + + <div id="import-choice" class="descriptive-paragraph">{{$choice}}</div> + + <label for="import-old-address" id="label-import-old-address" class="import-label" >{{$label_old_address}}</label> + <input type="text" name="old_address" id="import-old-address" class="import-input" value="" /> + <div id="import-old-address-end" class="import-field-end"></div> + + <label for="import-old-email" id="label-import-old-email" class="import-label" >{{$label_old_email}}</label> + <input type="text" name="email" id="import-old-email" class="import-input" value="{{$email}}" /> + <div id="import-old-email-end" class="import-field-end"></div> + + <label for="import-old-pass" id="label-import-old-pass" class="import-label" >{{$label_old_pass}}</label> + <input type="password" name="password" id="import-old-pass" class="import-input" value="{{$pass}}" /> + <div id="import-old-pass-end" class="import-field-end"></div> + + <div id="import-common-desc" class="descriptive-paragraph">{{$common}}</div> + + <input type="checkbox" name="make_primary" id="import-make-primary" value="1" /> + <label for="import-make-primary" id="label-import-make-primary">{{$label_import_primary}}</label> + <div id="import-make-primary-end" class="import-field-end"></div> + + <input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" /> + <div id="import-submit-end" class="import-field-end"></div> + +</form> + diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 916ba1c75..2c31cb498 100644..100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,22 +1,32 @@ -<h3>$header</h3> +<h3>{{$header}}</h3> -{{ if $links }} -{{ for $links as $l }} -<a class="channels-links" href="$l.0" title="$l.1">$l.2</a> -{{ endfor }} -{{ endif }} +{{if $links}} +{{foreach $links as $l}} +<a class="channels-links" href="{{$l.0}}" title="{{$l.1}}">{{$l.2}}</a> +{{/foreach}} +{{/if}} +<div class="channels-break"></div> -{{ if $selected }} -<div id="channels-selected">$msg_selected</div> -{{ inc channel.tpl with $channel=$selected }}{{ endinc }} +{{if $channel_usage_message}} +<div id="channel-usage-message" class="usage-message"> +{{$channel_usage_message}} +</div> +{{/if}} +{{if $selected}} +<div id="selected-channel"> +<div id="channels-selected">{{$msg_selected}}</div> +{{include file="channel.tpl" channel=$selected}} +</div> <div class="channels-end selected"></div> -{{ endif }} +{{/if}} +<br /> +<div id="channels-desc" class="descriptive-text">{{$desc}}</div> -<div id="channels-desc" class="descriptive-text">$desc</div> - -{{ for $all_channels as $chn }} -{{ inc channel.tpl with $channel=$chn }}{{ endinc }} -{{ endfor }} +<div id="all-channels"> +{{foreach $all_channels as $chn}} +{{include file="channel.tpl" channel=$chn}} +{{/foreach}} +</div> <div class="channels-end all"></div> diff --git a/view/tpl/chanview.tpl b/view/tpl/chanview.tpl index 641294feb..a43ea1b5d 100644..100755 --- a/view/tpl/chanview.tpl +++ b/view/tpl/chanview.tpl @@ -1 +1,2 @@ -<iframe id="remote-channel" width="100%" src="$url" onload="resize_iframe()"></iframe> +<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" ><i class="icon-fullscreen"></i></div> +<iframe id="remote-channel" width="100%" src="{{$url}}" onload="resize_iframe()"></iframe> diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl new file mode 100644 index 000000000..9f95d2999 --- /dev/null +++ b/view/tpl/chat.tpl @@ -0,0 +1,128 @@ +<h1>{{$room_name}}</h1> +<div id="chatContainer"> + + <div id="chatTopBar"> + <div id="chatLineHolder"></div> + </div> + + <div id="chatSide"> + {{if $is_owner}} + <div id="chatDrop"> + <form id="chat-destroy" method="post" action="chat"> + <input type="hidden" name="room_name" value="{{$room_name}}" /> + <input type="hidden" name="action" value="drop" /> + <input type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"/> + </form> + </div><br /> + {{/if}} + + <div id="chatUsers"></div><br /> + </div> + <div class="clear"></div> + <div id="chatBottomBar"> + <div class="tip"></div> + + <form id="chat-form" method="post" action="#"> + <input type="hidden" name="room_id" value="{{$room_id}}" /> + <textarea id="chatText" name="chat_text" rows=3 cols=80></textarea><br /> + <input type="submit" name="submit" value="{{$submit}}" /> + </form> + + <a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a>{{if $bookmark_link}} | <a href="{{$bookmark_link}}" target="_blank" >{{$bookmark}}</a>{{/if}} + + </div> + +</div> + +<script> +var room_id = {{$room_id}}; +var last_chat = 0; +var chat_timer = null; + +$(document).ready(function() { + chat_timer = setTimeout(load_chats,300); + +}); + + +$('#chat-form').submit(function(ev) { + $('body').css('cursor','wait'); + $.post("chatsvc", $('#chat-form').serialize(),function(data) { + if(chat_timer) clearTimeout(chat_timer); + $('#chatText').val(''); + load_chats(); + $('body').css('cursor','auto'); + },'json'); + ev.preventDefault(); +}); + +function load_chats() { + + $.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat + ((stopped) ? '&stopped=1' : ''),function(data) { + if(data.success && (! stopped)) { + update_inroom(data.inroom); + update_chats(data.chats); + } + }); + + chat_timer = setTimeout(load_chats,10000); + +} + +function update_inroom(inroom) { + var html = document.createElement('div'); + var count = inroom.length; + $.each( inroom, function(index, item) { + var newNode = document.createElement('div'); + $(newNode).html('<img style="height: 32px; width: 32px;" src="' + item.img + '" alt="' + item.name + '" /> ' + item.status + '<br />' + item.name + '<br/>'); + html.appendChild(newNode); + }); + $('#chatUsers').html(html); +} + +function update_chats(chats) { + + var count = chats.length; + $.each( chats, function(index, item) { + last_chat = item.id; + var newNode = document.createElement('div'); + newNode.setAttribute('class', 'chat-item'); + $(newNode).html('<img class="chat-item-photo" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body"><span class="chat-item-name">' + item.name + ' </span><span class="autotime chat-item-time" title="' + item.isotime + '">' + item.localtime + '</span><br /><span class="chat-item-text">' + item.text + '</span></div><div class="chat-item-end"></div>'); + $('#chatLineHolder').append(newNode); + $(".autotime").timeago(); + + }); + var elem = document.getElementById('chatTopBar'); + elem.scrollTop = elem.scrollHeight; + +} + +</script> +<script> +function isMobile() { +if( navigator.userAgent.match(/Android/i) + || navigator.userAgent.match(/webOS/i) + || navigator.userAgent.match(/iPhone/i) + || navigator.userAgent.match(/iPad/i) + || navigator.userAgent.match(/iPod/i) + || navigator.userAgent.match(/BlackBerry/i) + || navigator.userAgent.match(/Windows Phone/i) + ){ + return true; + } + else { + return false; + } +} +$(function(){ + + $('#chatText').keypress(function(e){ + if (e.keyCode == 13 && e.shiftKey||isMobile()) { + } + else if (e.keyCode == 13) { + e.preventDefault(); + $(this).parent('form').trigger('submit'); + } + }); +}); +</script> diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl new file mode 100644 index 000000000..287f95cc0 --- /dev/null +++ b/view/tpl/chatroom_new.tpl @@ -0,0 +1,13 @@ +<h1>{{$header}}</h1> + +<form action="chat" method="post" > +{{include file="field_input.tpl" field=$name}} +<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> +{{$acl}} +<div class="clear"></div> +<br /> +<br /> +<input type="submit" name="submit" value="{{$submit}}" /> +</form> + + diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl new file mode 100644 index 000000000..71fec8200 --- /dev/null +++ b/view/tpl/chatroomlist.tpl @@ -0,0 +1,11 @@ +<div class="widget"> +<h3>{{$header}}</h3> +{{if $items}} +<table class="chatroomlist"> +{{foreach $items as $item}} +<tr><td align="left"><a href="{{$baseurl}}/chat/{{$nickname}}/{{$item.cr_id}}">{{$item.cr_name}}</a></td><td align="right">{{$item.cr_inroom}}</td></tr> +{{/foreach}} +</table> +{{/if}} +</div> + diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl new file mode 100644 index 000000000..c3dae6627 --- /dev/null +++ b/view/tpl/chatrooms.tpl @@ -0,0 +1,10 @@ +<h2>{{$header}}</h2> + +{{if $is_owner}} +<p> +<a href="{{$baseurl}}/chat/{{$nickname}}/new">{{$newroom}}</a> +</p> +{{/if}} + +{{$rooms}} + diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index cc7153ebb..423d13d88 100644..100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -1,68 +1,66 @@ - {{ if $threaded }} - <div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;"> - {{ else }} - <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> - {{ endif }} - <form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> - <input type="hidden" name="type" value="$type" /> - <input type="hidden" name="profile_uid" value="$profile_uid" /> - <input type="hidden" name="parent" value="$parent" /> - <input type="hidden" name="return" value="$return_path" /> - <input type="hidden" name="jsreload" value="$jsreload" /> - <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> - <input type="hidden" name="post_id_random" value="$rand_num" /> - - <div class="comment-edit-photo" id="comment-edit-photo-$id" > - <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> - </div> - <div class="comment-edit-photo-end"></div> - <ul class="comment-edit-bb-$id"> - <li><a class="editicon boldbb shadow" - style="cursor: pointer;" title="$edbold" - onclick="insertFormatting('$comment','b', $id);"></a></li> - <li><a class="editicon italicbb shadow" - style="cursor: pointer;" title="$editalic" - onclick="insertFormatting('$comment','i', $id);"></a></li> - <li><a class="editicon underlinebb shadow" - style="cursor: pointer;" title="$eduline" - onclick="insertFormatting('$comment','u', $id);"></a></li> - <li><a class="editicon quotebb shadow" - style="cursor: pointer;" title="$edquote" - onclick="insertFormatting('$comment','quote', $id);"></a></li> - <li><a class="editicon codebb shadow" - style="cursor: pointer;" title="$edcode" - onclick="insertFormatting('$comment','code', $id);"></a></li> - <li><a class="editicon imagebb shadow" - style="cursor: pointer;" title="$edimg" - onclick="insertFormatting('$comment','img', $id);"></a></li> - <li><a class="editicon urlbb shadow" - style="cursor: pointer;" title="$edurl" - onclick="insertFormatting('$comment','url', $id);"></a></li> - <li><a class="editicon videobb shadow" - style="cursor: pointer;" title="$edvideo" - onclick="insertFormatting('$comment','video', $id);"></a></li> - </ul> - <div class="comment-edit-bb-end"></div> - <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen(this, $id);" onBlur="commentClose(this,$id);cmtBbClose(this,$id);" >$comment</textarea> - {{ if $qcomment }} - <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > + {{if $threaded}} + <div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;"> + {{else}} + <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;"> + {{/if}} + <form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;"> + <input type="hidden" name="type" value="{{$type}}" /> + <input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> + <input type="hidden" name="parent" value="{{$parent}}" /> + <input type="hidden" name="return" value="{{$return_path}}" /> + <input type="hidden" name="jsreload" value="{{$jsreload}}" /> + <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> + <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" >{{$comment}}</textarea> + {{if $qcomment}} + <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" > <option value=""></option> - {{ for $qcomment as $qc }} - <option value="$qc">$qc</option> - {{ endfor }} + {{foreach $qcomment as $qc}} + <option value="{{$qc}}">{{$qc}}</option> + {{/foreach}} </select> - {{ endif }} - - <div class="comment-edit-text-end"></div> - <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > - <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> - {{ if $preview }} - <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span> - <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div> - {{ endif }} + {{/if}} + <div class="clear"></div> + <div id="comment-tools-{{$id}}" class="comment-tools"> + <div id="comment-edit-bb-{{$id}}" class="btn-group pull-left"> + <button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;"> + <i class="icon-bold comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;"> + <i class="icon-italic comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;"> + <i class="icon-underline comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;"> + <i class="icon-quote-left comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;"> + <i class="icon-terminal comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$comment}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;"> + <i class="icon-camera comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('{{$comment}}','url', {{$id}}); return false;"> + <i class="icon-link comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;"> + <i class="icon-facetime-video comment-icon"></i> + </button> + {{if $feature_encrypt}} + <button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"> + <i class="icon-key comment-icon"></i> + </button> + {{/if}} + </div> + <div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}"> + {{if $preview}} + <button id="comment-edit-submit-{{$id}}" class="btn btn-default btn-xs" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}"> + <i class="icon-eye-open comment-icon" ></i> + </button> + {{/if}} + <button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button> + </div> </div> - - <div class="comment-edit-end"></div> + <div class="clear"></div> </form> - </div> diff --git a/view/tpl/common_friends.tpl b/view/tpl/common_friends.tpl index 1f610d8c4..489717e78 100644..100755 --- a/view/tpl/common_friends.tpl +++ b/view/tpl/common_friends.tpl @@ -1,12 +1,15 @@ <div class="profile-match-wrapper"> <div class="profile-match-photo"> - <a href="$url"> - <img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" /> + <a href="{{$url}}"> + <img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" /> </a> </div> <div class="profile-match-break"></div> <div class="profile-match-name"> - <a href="$url" title="$name[$tags]">$name</a> + <a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a> </div> + {{if $note}} + <div class="profile-match-note">{{$note}}</div> + {{/if}} <div class="profile-match-end"></div> -</div>
\ No newline at end of file +</div> diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl index 97b771e7a..fa6bfbdfa 100644..100755 --- a/view/tpl/common_tabs.tpl +++ b/view/tpl/common_tabs.tpl @@ -1,6 +1,8 @@ -<ul class="tabs"> - {{ for $tabs as $tab }} - <li {{ if $tab.id }}id="$tab.id"{{ endif }}><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li> - {{ endfor }} -</ul> -<div class="tabs-end"></div>
\ No newline at end of file +<div id="tabs-collapse-1" class="navbar-collapse collapse"> + <ul class="nav nav-tabs nav-justified"> + {{foreach $tabs as $tab}} + <li class="{{$tab.sel}}" {{if $tab.id}}id="{{$tab.id}}"{{/if}}><a href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li> + {{/foreach}} + </ul> +</div> +<div class="tabs-end"></div> diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl new file mode 100755 index 000000000..44866c323 --- /dev/null +++ b/view/tpl/connection_template.tpl @@ -0,0 +1,9 @@ +<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" > + <div class="contact-entry-photo-wrapper" > + <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img class="contact-block-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a> + </div> + <div class="contact-entry-photo-end" ></div> + <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div></a> + <div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$edit}}</a></div> + <div class="contact-entry-end" ></div> +</div> diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl new file mode 100755 index 000000000..c69dcde50 --- /dev/null +++ b/view/tpl/connections.tpl @@ -0,0 +1,26 @@ +<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1> + +{{if $finding}}<h4>{{$finding}}</h4>{{/if}} + +<div id="contacts-search-wrapper"> +<form id="contacts-search-form" action="{{$cmd}}" method="get" > +<span class="contacts-search-desc">{{$desc}}</span> +<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" /> +<input type="submit" name="submit" id="contacts-search-submit" class="btn btn-default" value="{{$submit}}" /> +</form> +</div> +<div id="contacts-search-end"></div> + +{{$tabs}} + + +{{foreach $contacts as $contact}} + {{include file="connection_template.tpl"}} +{{/foreach}} +<div id="contact-edit-end"></div> + +{{$paginate}} + + + + diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl index a623c4944..d1ce5ca67 100644..100755 --- a/view/tpl/contact_block.tpl +++ b/view/tpl/contact_block.tpl @@ -1,12 +1,12 @@ <div id="contact-block"> -<div id="contact-block-numcontacts">$contacts</div> -{{ if $micropro }} - <a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a> +<div id="contact-block-numcontacts">{{$contacts}}</div> +{{if $micropro}} + <a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a> <div class='contact-block-content'> - {{ for $micropro as $m }} - $m - {{ endfor }} + {{foreach $micropro as $m}} + {{$m}} + {{/foreach}} </div> -{{ endif }} +{{/if}} </div> <div class="clear"></div> diff --git a/view/tpl/contact_edit.tpl b/view/tpl/contact_edit.tpl deleted file mode 100644 index 4f99b4aca..000000000 --- a/view/tpl/contact_edit.tpl +++ /dev/null @@ -1,89 +0,0 @@ - -<h2>$header</h2> - -<div id="contact-edit-wrapper" > - - $tab_str - - <div id="contact-edit-drop-link" > - <a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a> - </div> - - <div id="contact-edit-drop-link-end"></div> - - - <div id="contact-edit-nav-wrapper" > - <div id="contact-edit-links"> - <ul> - <li><div id="contact-edit-rel">$relation_text</div></li> - <li><div id="contact-edit-nettype">$nettype</div></li> - {{ if $lost_contact }} - <li><div id="lost-contact-message">$lost_contact</div></li> - {{ endif }} - {{ if $insecure }} - <li><div id="insecure-message">$insecure</div></li> - {{ endif }} - {{ if $blocked }} - <li><div id="block-message">$blocked</div></li> - {{ endif }} - {{ if $ignored }} - <li><div id="ignore-message">$ignored</div></li> - {{ endif }} - {{ if $archived }} - <li><div id="archive-message">$archived</div></li> - {{ endif }} - - <li> </li> - - {{ if $common_text }} - <li><div id="contact-edit-common"><a href="$common_link">$common_text</a></div></li> - {{ endif }} - {{ if $all_friends }} - <li><div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div></li> - {{ endif }} - - - <li><a href="network/?cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li> - {{ if $lblsuggest }} - <li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li> - {{ endif }} - - </ul> - </div> - </div> - <div id="contact-edit-nav-end"></div> - - -<form action="contacts/$contact_id" method="post" > -<input type="hidden" name="contact_id" value="$contact_id"> -<input id="contact-closeness-mirror" type="hidden" name="closeness" value="$close" /> - - {{ if $poll_enabled }} - <div id="contact-edit-poll-wrapper"> - <div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></div> - <span id="contact-edit-poll-text">$updpub</span> $poll_interval <span id="contact-edit-update-now" class="button"><a href="contacts/$contact_id/update" >$udnow</a></span> - </div> - {{ endif }} - <div id="contact-edit-end" ></div> - - {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} - -<div id="contact-edit-info-wrapper"> -<h4>$lbl_info1</h4> - <textarea id="contact-edit-info" rows="8" cols="60" name="info">$info</textarea> - <input class="contact-edit-submit" type="submit" name="submit" value="$submit" /> -</div> -<div id="contact-edit-info-end"></div> - - -<div id="contact-edit-profile-select-text"> -<h4>$lbl_vis1</h4> -<p>$lbl_vis2</p> -</div> -$profile_select -<div id="contact-edit-profile-select-end"></div> - -<input class="contact-edit-submit" type="submit" name="submit" value="$submit" /> - -</form> -</div> diff --git a/view/tpl/contact_head.tpl b/view/tpl/contact_head.tpl index 9cfd81710..72e7edbfb 100644..100755 --- a/view/tpl/contact_head.tpl +++ b/view/tpl/contact_head.tpl @@ -1,10 +1,10 @@ <script language="javascript" type="text/javascript" - src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> + src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> tinyMCE.init({ theme : "advanced", - mode : "$editselect", + mode : "{{$editselect}}", elements: "contact-edit-info", plugins : "bbcode", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", @@ -20,7 +20,7 @@ tinyMCE.init({ force_p_newlines : false, force_br_newlines : true, forced_root_block : '', - content_css: "$baseurl/view/custom_tinymce.css" + content_css: "{{$baseurl}}/view/custom_tinymce.css" }); diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl index 2ccb08a90..33cd3fb71 100644..100755 --- a/view/tpl/contact_slider.tpl +++ b/view/tpl/contact_slider.tpl @@ -1,4 +1,4 @@ -<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="$val" /></div> +<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div> <script> - $("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '|', '$intimate', '|', '$friends', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } }); + $("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } }); </script> diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl index 0accd5e02..7feefa655 100644..100755 --- a/view/tpl/contact_template.tpl +++ b/view/tpl/contact_template.tpl @@ -1,9 +1,8 @@ - -<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" > +<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" > <div class="contact-entry-photo-wrapper" > - <a href="$contact.edit" title="$contact.img_hover" /><img src="$contact.thumb" alt="$contact.name" /></a> + <a href="{{$contact.link}}" title="{{$contact.img_hover}}" /><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a> </div> <div class="contact-entry-photo-end" ></div> - <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div> + <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div> <div class="contact-entry-end" ></div> </div> diff --git a/view/tpl/contacts-template.tpl b/view/tpl/contacts-template.tpl deleted file mode 100644 index ecb342bf4..000000000 --- a/view/tpl/contacts-template.tpl +++ /dev/null @@ -1,26 +0,0 @@ -<h1>$header{{ if $total }} ($total){{ endif }}</h1> - -{{ if $finding }}<h4>$finding</h4>{{ endif }} - -<div id="contacts-search-wrapper"> -<form id="contacts-search-form" action="$cmd" method="get" > -<span class="contacts-search-desc">$desc</span> -<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" /> -<input type="submit" name="submit" id="contacts-search-submit" value="$submit" /> -</form> -</div> -<div id="contacts-search-end"></div> - -$tabs - - -{{ for $contacts as $contact }} - {{ inc contact_template.tpl }}{{ endinc }} -{{ endfor }} -<div id="contact-edit-end"></div> - -$paginate - - - - diff --git a/view/tpl/content.tpl b/view/tpl/content.tpl deleted file mode 100644 index 466045d39..000000000 --- a/view/tpl/content.tpl +++ /dev/null @@ -1,2 +0,0 @@ -<div id="content-begin"></div> -<div id="content-end"></div> diff --git a/view/tpl/conv.tpl b/view/tpl/conv.tpl index b7222f154..ddb959b84 100644..100755 --- a/view/tpl/conv.tpl +++ b/view/tpl/conv.tpl @@ -1,17 +1,17 @@ -{{ for $threads as $thread }} -<div id="thread-wrapper-$thread.id" class="thread-wrapper"> - {{ for $thread.items as $item }} +{{foreach $threads as $thread}} +<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper"> + {{foreach $thread.items as $item}} {{if $item.comment_firstcollapsed}} <div class="hide-comments-outer"> - <span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span> + <span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span> </div> - <div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;"> - {{endif}} - {{if $item.comment_lastcollapsed}}</div>{{endif}} + <div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;"> + {{/if}} + {{if $item.comment_lastcollapsed}}</div>{{/if}} - {{ inc $item.template }}{{ endinc }} + {{include file="{{$item.template}}"}} - {{ endfor }} + {{/foreach}} </div> -{{ endfor }} +{{/foreach}} diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl index 202b095e7..aa7b55e9b 100644..100755 --- a/view/tpl/conv_frame.tpl +++ b/view/tpl/conv_frame.tpl @@ -1,14 +1,5 @@ <div id="threads-begin"></div> <div id="threads-end"></div> <div id="conversation-end"></div> - -{{ if $dropping }} -<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"> - <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> - <div id="item-delete-selected-desc" >$dropping</div> -</div> -<div id="item-delete-selected-end"></div> -{{ endif }} - -<img id="page-spinner" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> +<div id="page-spinner"></div> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 66fb499a6..d7ed7d0f4 100644..100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -1,115 +1,189 @@ {{if $item.comment_firstcollapsed}} - <div class="hide-comments-outer"> - <span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span> - </div> - <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;"> -{{endif}} -<div id="thread-wrapper-$item.id" class="thread-wrapper $item.toplevel"> -<a name="$item.id" ></a> -<div class="wall-item-outside-wrapper $item.indent$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-outside-wrapper-$item.id" > - <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" > - <div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id"> - {{ if $item.owner_url }} - <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" > - <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"> - <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a> - </div> - <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div> - {{ endif }} - <div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id" - onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" - onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> - <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a> - <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> - <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> - <ul> - $item.item_photo_menu - </ul> - </div> - - </div> - <div class="wall-item-photo-end"></div> - <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" > - {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> - {{ else }}<div class="wall-item-lock"></div>{{ endif }} - <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div> - </div> - </div> - <div class="wall-item-author"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" 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{{ endif }}<br /> - <div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div> - </div> - <div class="wall-item-content" id="wall-item-content-$item.id" > - <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> - <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body - <div class="body-tag"> - {{ for $item.tags as $tag }} - <span class='tag'>$tag</span> - {{ endfor }} +<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});"> + <span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span> <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> +</div> +<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> +{{/if}} + <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}"> + <a name="{{$item.id}}" ></a> + <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > + <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> + <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > + <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> + <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> </div> - {{ if $item.has_cats }} - <div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} - </div> - {{ endif }} - - {{ if $item.has_folders }} - <div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} - </div> - {{ endif }} + <div class="wall-item-photo-end" style="clear:both"></div> + </div> + {{if $item.title}} + <div class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3>{{$item.title}}</h3></div> + {{/if}} + {{if $item.lock}} + <div class="wall-item-lock dropdown"> + <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + </div> + {{/if}} + <div class="wall-item-author"> + <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" 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>{{/if}} + </div> + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> + {{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span> {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + </div> + <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> + <div class="wall-item-title-end"></div> + <div class="wall-item-body" id="wall-item-body-{{$item.id}}" > + {{$item.body}} + {{if $item.tags}} + <div class="body-tag"> + {{foreach $item.tags as $tag}} + <span class='tag'>{{$tag}}</span> + {{/foreach}} + </div> + {{/if}} + {{if $item.has_cats}} + <div class="categorytags"> + <span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} + </div> + {{/if}} + {{if $item.has_folders}} + <div class="filesavetags"> + <span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} + </div> + {{/if}} + </div> + </div> + <div class="wall-item-tools"> + <div class="wall-item-tools-right btn-group pull-right"> + {{if $item.like}} + <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false"> + <i class="icon-thumbs-up-alt" title="{{$item.like.0}}"></i> + </button> + {{/if}} + {{if $item.dislike}} + <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'dislike'); return false"> + <i class="icon-thumbs-down-alt" title="{{$item.dislike.0}}"></i> + </button> + {{/if}} + <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> + <i class="icon-caret-down"></i> + </button> + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> + {{if $item.share}} + <li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li> + {{/if}} + {{if $item.plink}} + <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="icon-external-link"></i> {{$item.plink.title}}</a></li> + {{/if}} + {{if $item.edpost}} + <li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost icon-pencil"></i> {{$item.edpost.1}}</a></li> + {{/if}} + {{if $item.tagger}} + <li role="presentation"><a role="menuitem" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="icon-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a></li> + {{/if}} + {{if $item.filer}} + <li role="presentation"><a role="menuitem" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="icon-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a></li> + {{/if}} + {{if $item.bookmark}} + <li role="presentation"><a role="menuitem" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="icon-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a></li> + {{/if}} + {{if $item.addtocal}} + <li role="presentation"><a role="menuitem" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="icon-calendar" title="{{$item.addtocal}}"></i> {{$item.addtocal}}</a></li> + {{/if}} + {{if $item.star}} + <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li> + {{/if}} + {{if $item.item_photo_menu}} + <li role="presentation" class="divider"></li> + {{$item.item_photo_menu}} + {{/if}} + {{if $item.drop.dropping}} + <li role="presentation" class="divider"></li> + <li role="presentation"><a role="menuitem" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove"></i> {{$item.drop.delete}}</a></li> + {{/if}} + </ul> + </div> + <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> + <div class="wall-item-tools-left{{if $item.like_count && $item.dislike_count}} btn-group{{/if}}"> + {{if $item.like_count}} + <div class="btn-group"> + <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-like-{{$item.id}}">{{$item.like_count}} {{$item.like_button_label}}</button> + {{if $item.like_list_part}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $item.like_list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + {{else}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $item.like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + {{/if}} + </div> + {{/if}} + {{if $item.dislike_count}} + <div class="btn-group"> + <button type="button" class="btn btn-default btn-sm wall-item-dislike dropdown-toggle" data-toggle="dropdown" id="wall-item-dislike-{{$item.id}}">{{$item.dislike_count}} {{$item.dislike_button_label}}</button> + {{if $item.dislike_list_part}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$item.id}}">{{foreach $item.dislike_list_part as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul> + {{else}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$item.id}}">{{foreach $item.dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul> + {{/if}} + </div> + {{/if}} + </div> + {{if $item.like_list_part}} + <div class="modal" id="likeModal-{{$item.id}}"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title">{{$item.like_modal_title}}</h4> + </div> + <div class="modal-body"> + <ul>{{foreach $item.like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + </div> + <div class="modal-footer clear"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + {{/if}} + {{if $item.dislike_list_part}} + <div class="modal" id="dislikeModal-{{$item.id}}"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title">{{$item.dislike_modal_title}}</h4> + </div> + <div class="modal-body"> + <ul>{{foreach $item.dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul> + </div> + <div class="modal-footer clear"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + {{/if}} + </div> + {{* we dont' use this do we? + {{if $item.drop.pagedrop}} + <input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" /> + {{/if}} + *}} + <div class="clear"></div> </div> + <div class="wall-item-wrapper-end"></div> + <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> </div> - <div class="wall-item-tools" id="wall-item-tools-$item.id"> - {{ if $item.like }} - <a href="#" class="icon like item-tool" title="$item.like.0" onclick="dolike($item.id,'like'); return false"></a> - {{ endif }} - {{ if $item.dislike }} - <a href="#" class="icon dislike item-tool" title="$item.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> - {{ endif }} - {{ if $item.share }} - <a href="#" class="icon recycle item-tool" title="$item.share.0" onclick="jotShare($item.id); return false"></a> - {{ endif }} - {{ if $item.plink }} - <a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon item-tool remote-link$item.sparkle"></a> - {{ endif }} - {{ if $item.edpost }} - <a class="editpost icon pencil item-tool" href="$item.edpost.0" title="$item.edpost.1"></a> - {{ endif }} - {{ if $item.star }} - <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon item-tool $item.star.isstarred" title="$item.star.toggle"></a> - {{ endif }} - {{ if $item.tagger }} - <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon item-tool tagged" title="$item.tagger.tagit"></a> - {{ endif }} - {{ if $item.filer }} - <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon item-tool" title="$item.filer"></a> - {{ endif }} - <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> - - <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > - {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} - </div> - {{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} - <div class="wall-item-delete-end"></div> + {{if $item.toplevel}} + {{foreach $item.children as $child}} + {{include file="{{$child.template}}" item=$child}} + {{/foreach}} + {{/if}} + {{if $item.comment}} + <div class="wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" > + {{$item.comment}} </div> - </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.showlike</div> - <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.showdislike</div> - -<div class="wall-item-outside-wrapper-end $item.indent" ></div> -</div> -{{ if $item.toplevel }} -{{ for $item.children as $item }} - {{ inc $item.template }}{{ endinc }} -{{ endfor }} -{{ endif }} - -<div class="wall-item-comment-wrapper" > - $item.comment -</div> - - + <div id="comment-edit-preview-{{$item.id}}" class="comment-edit-preview"></div> + <div class="clear"></div> + {{/if}} + </div> +{{if $item.comment_lastcollapsed}} </div> -{{if $item.comment_lastcollapsed}}</div>{{endif}} +{{/if}} diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl index 70cd389c9..97d64327a 100644..100755 --- a/view/tpl/conversation.tpl +++ b/view/tpl/conversation.tpl @@ -1,28 +1,20 @@ <div id="threads-begin"></div> -{{ for $threads as $thread }} -<div id="thread-wrapper-$thread.id" class="thread-wrapper"> - {{ for $thread.items as $item }} +{{foreach $threads as $thread}} +<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper"> + {{foreach $thread.items as $item}} {{if $item.comment_firstcollapsed}} <div class="hide-comments-outer"> - <span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span> + <span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span> </div> - <div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;"> - {{endif}} - {{if $item.comment_lastcollapsed}}</div>{{endif}} + <div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;"> + {{/if}} + {{if $item.comment_lastcollapsed}}</div>{{/if}} - {{ inc $item.template }}{{ endinc }} + {{include file="{{$item.template}}"}} - {{ endfor }} + {{/foreach}} </div> -{{ endfor }} +{{/foreach}} <div id="threads-end"></div> <div id="conversation-end"></div> - -{{ if $dropping }} -<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"> - <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> - <div id="item-delete-selected-desc" >$dropping</div> -</div> -<div id="item-delete-selected-end"></div> -{{ endif }} diff --git a/view/tpl/convobj.tpl b/view/tpl/convobj.tpl index a35e232e2..d5cee1170 100644..100755 --- a/view/tpl/convobj.tpl +++ b/view/tpl/convobj.tpl @@ -1,4 +1,4 @@ -{{ for $threads as $item }} -{{ inc $item.template }}{{ endinc }} -{{ endfor }} +{{foreach $threads as $item}} +{{include file="{{$item.template}}"}} +{{/foreach}} diff --git a/view/tpl/crepair.tpl b/view/tpl/crepair.tpl index a3e532b61..1a5a019db 100644..100755 --- a/view/tpl/crepair.tpl +++ b/view/tpl/crepair.tpl @@ -1,45 +1,44 @@ +<form id="crepair-form" action="crepair/{{$contact_id}}" method="post" > -<form id="crepair-form" action="crepair/$contact_id" method="post" > +<h4>{{$contact_name}}</h4> -<h4>$contact_name</h4> - -<label id="crepair-name-label" class="crepair-label" for="crepair-name">$label_name</label> -<input type="text" id="crepair-name" class="crepair-input" name="name" value="$contact_name" /> +<label id="crepair-name-label" class="crepair-label" for="crepair-name">{{$label_name}}</label> +<input type="text" id="crepair-name" class="crepair-input" name="name" value="{{$contact_name}}" /> <div class="clear"></div> -<label id="crepair-nick-label" class="crepair-label" for="crepair-nick">$label_nick</label> -<input type="text" id="crepair-nick" class="crepair-input" name="nick" value="$contact_nick" /> +<label id="crepair-nick-label" class="crepair-label" for="crepair-nick">{{$label_nick}}</label> +<input type="text" id="crepair-nick" class="crepair-input" name="nick" value="{{$contact_nick}}" /> <div class="clear"></div> -<label id="crepair-attag-label" class="crepair-label" for="crepair-attag">$label_attag</label> -<input type="text" id="crepair-attag" class="crepair-input" name="attag" value="$contact_attag" /> +<label id="crepair-attag-label" class="crepair-label" for="crepair-attag">{{$label_attag}}</label> +<input type="text" id="crepair-attag" class="crepair-input" name="attag" value="{{$contact_attag}}" /> <div class="clear"></div> -<label id="crepair-url-label" class="crepair-label" for="crepair-url">$label_url</label> -<input type="text" id="crepair-url" class="crepair-input" name="url" value="$contact_url" /> +<label id="crepair-url-label" class="crepair-label" for="crepair-url">{{$label_url}}</label> +<input type="text" id="crepair-url" class="crepair-input" name="url" value="{{$contact_url}}" /> <div class="clear"></div> -<label id="crepair-request-label" class="crepair-label" for="crepair-request">$label_request</label> -<input type="text" id="crepair-request" class="crepair-input" name="request" value="$request" /> +<label id="crepair-request-label" class="crepair-label" for="crepair-request">{{$label_request}}</label> +<input type="text" id="crepair-request" class="crepair-input" name="request" value="{{$request}}" /> <div class="clear"></div> -<label id="crepair-confirm-label" class="crepair-label" for="crepair-confirm">$label_confirm</label> -<input type="text" id="crepair-confirm" class="crepair-input" name="confirm" value="$confirm" /> +<label id="crepair-confirm-label" class="crepair-label" for="crepair-confirm">{{$label_confirm}}</label> +<input type="text" id="crepair-confirm" class="crepair-input" name="confirm" value="{{$confirm}}" /> <div class="clear"></div> -<label id="crepair-notify-label" class="crepair-label" for="crepair-notify">$label_notify</label> -<input type="text" id="crepair-notify" class="crepair-input" name="notify" value="$notify" /> +<label id="crepair-notify-label" class="crepair-label" for="crepair-notify">{{$label_notify}}</label> +<input type="text" id="crepair-notify" class="crepair-input" name="notify" value="{{$notify}}" /> <div class="clear"></div> -<label id="crepair-poll-label" class="crepair-label" for="crepair-poll">$label_poll</label> -<input type="text" id="crepair-poll" class="crepair-input" name="poll" value="$poll" /> +<label id="crepair-poll-label" class="crepair-label" for="crepair-poll">{{$label_poll}}</label> +<input type="text" id="crepair-poll" class="crepair-input" name="poll" value="{{$poll}}" /> <div class="clear"></div> -<label id="crepair-photo-label" class="crepair-label" for="crepair-photo">$label_photo</label> +<label id="crepair-photo-label" class="crepair-label" for="crepair-photo">{{$label_photo}}</label> <input type="text" id="crepair-photo" class="crepair-input" name="photo" value="" /> <div class="clear"></div> -<input type="submit" name="submit" value="$lbl_submit" /> +<input type="submit" name="submit" value="{{$lbl_submit}}" /> </form> diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl index 4c0ca3d63..da5b1e859 100644..100755 --- a/view/tpl/cropbody.tpl +++ b/view/tpl/cropbody.tpl @@ -1,9 +1,9 @@ -<h1>$title</h1> +<h1>{{$title}}</h1> <p id="cropimage-desc"> -$desc +{{$desc}} </p> <div id="cropimage-wrapper"> -<img src="$image_url" id="croppa" class="imgCrop" alt="$title" /> +<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" /> </div> <div id="cropimage-preview-wrapper" > <div id="previewWrap" ></div> @@ -39,10 +39,10 @@ $desc </script> -<form action="profile_photo/$resource" id="crop-image-form" method="post" /> -<input type='hidden' name='form_security_token' value='$form_security_token'> +<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" /> +<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> -<input type='hidden' name='profile' value='$profile'> +<input type='hidden' name='profile' value='{{$profile}}'> <input type="hidden" name="cropfinal" value="1" /> <input type="hidden" name="xstart" id="x1" /> <input type="hidden" name="ystart" id="y1" /> @@ -52,7 +52,7 @@ $desc <input type="hidden" name="width" id="width" /> <div id="crop-image-submit-wrapper" > -<input type="submit" name="submit" value="$done" /> +<input type="submit" name="submit" value="{{$done}}" /> </div> </form> diff --git a/view/tpl/crophead.tpl b/view/tpl/crophead.tpl index 48f375426..48f375426 100644..100755 --- a/view/tpl/crophead.tpl +++ b/view/tpl/crophead.tpl diff --git a/view/tpl/delegate.tpl b/view/tpl/delegate.tpl index 9a7d2e18d..cbaa8da86 100644..100755 --- a/view/tpl/delegate.tpl +++ b/view/tpl/delegate.tpl @@ -1,57 +1,57 @@ -<h3>$header</h3> +<h3>{{$header}}</h3> -<div id="delegate-desc" class="delegate-desc">$desc</div> +<div id="delegate-desc" class="delegate-desc">{{$desc}}</div> -{{ if $managers }} -<h3>$head_managers</h3> +{{if $managers}} +<h3>{{$head_managers}}</h3> -{{ for $managers as $x }} +{{foreach $managers as $x}} <div class="contact-block-div"> <a class="contact-block-link" href="#" > -<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" /> +<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" /> </a> </div> -{{ endfor }} +{{/foreach}} <div class="clear"></div> <hr /> -{{ endif }} +{{/if}} -<h3>$head_delegates</h3> +<h3>{{$head_delegates}}</h3> -{{ if $delegates }} -{{ for $delegates as $x }} +{{if $delegates}} +{{foreach $delegates as $x}} <div class="contact-block-div"> -<a class="contact-block-link" href="$base/delegate/remove/$x.uid" > -<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" /> +<a class="contact-block-link" href="{{$base}}/delegate/remove/{{$x.uid}}" > +<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" /> </a> </div> -{{ endfor }} +{{/foreach}} <div class="clear"></div> -{{ else }} -$none -{{ endif }} +{{else}} +{{$none}} +{{/if}} <hr /> -<h3>$head_potentials</h3> -{{ if $potentials }} -{{ for $potentials as $x }} +<h3>{{$head_potentials}}</h3> +{{if $potentials}} +{{foreach $potentials as $x}} <div class="contact-block-div"> -<a class="contact-block-link" href="$base/delegate/add/$x.uid" > -<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" /> +<a class="contact-block-link" href="{{$base}}/delegate/add/{{$x.uid}}" > +<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" /> </a> </div> -{{ endfor }} +{{/foreach}} <div class="clear"></div> -{{ else }} -$none -{{ endif }} +{{else}} +{{$none}} +{{/if}} <hr /> diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl new file mode 100644 index 000000000..80a538231 --- /dev/null +++ b/view/tpl/design_tools.tpl @@ -0,0 +1,9 @@ +<div id="design-tools" class="widget design-tools"> +<h3>{{$title}}</h3> +<ul> +<li><a href="blocks/{{$who}}">{{$blocks}}</a></li> +<li><a href="menu">{{$menus}}</a></li> +<li><a href="layouts/{{$who}}">{{$layout}}</a></li> +<li><a href="webpages/{{$who}}">{{$pages}}</a></li> +</ul> +</div> diff --git a/view/tpl/dfrn_req_confirm.tpl b/view/tpl/dfrn_req_confirm.tpl deleted file mode 100644 index 6c916323c..000000000 --- a/view/tpl/dfrn_req_confirm.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -<p id="dfrn-request-homecoming" > -$welcome -<br /> -$please - -</p> -<form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> -<input type="hidden" name="dfrn_url" value="$dfrn_url" /> -<input type="hidden" name="confirm_key" value="$confirm_key" /> -<input type="hidden" name="localconfirm" value="1" /> -$aes_allow - -<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">$hidethem</label> -<input type="checkbox" name="hidden-contact" value="1" {{ if $hidechecked }}checked="checked" {{ endif }} /> - - -<div id="dfrn-request-homecoming-submit-wrapper" > -<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="$submit" /> -</div> -</form>
\ No newline at end of file diff --git a/view/tpl/dfrn_request.tpl b/view/tpl/dfrn_request.tpl deleted file mode 100644 index 4f8a87ea2..000000000 --- a/view/tpl/dfrn_request.tpl +++ /dev/null @@ -1,59 +0,0 @@ - -<h1>$header</h1> - -<p id="dfrn-request-intro"> -$page_desc<br /> -$invite_desc -</p> -<p> -$desc -</p> - -<form action="dfrn_request/$nickname" method="post" /> - -<div id="dfrn-request-url-wrapper" > - <label id="dfrn-url-label" for="dfrn-url" >$your_address</label> - <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" /> - <div id="dfrn-request-url-end"></div> -</div> - -<p id="dfrn-request-options"> -$pls_answer -</p> - -<div id="dfrn-request-info-wrapper" > - - -<p id="doiknowyou"> -$does_know -</p> - - <div id="dfrn-request-know-yes-wrapper"> - <label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">$yes</label> - <input type="radio" name="knowyou" id="knowyouyes" value="1" /> - - <div id="dfrn-request-knowyou-break" ></div> - </div> - <div id="dfrn-request-know-no-wrapper"> - <label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">$no</label> - <input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" /> - - <div id="dfrn-request-knowyou-end"></div> - </div> - - -<p id="dfrn-request-message-desc"> -$add_note -</p> - <div id="dfrn-request-message-wrapper"> - <textarea name="dfrn-request-message" rows="4" cols="64" ></textarea> - </div> - - -</div> - - <div id="dfrn-request-submit-wrapper"> - <input type="submit" name="submit" id="dfrn-request-submit-button" value="$submit" /> - <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="$cancel" /> - </div> -</form> diff --git a/view/tpl/diasp_dec_hdr.tpl b/view/tpl/diasp_dec_hdr.tpl deleted file mode 100644 index e87c61888..000000000 --- a/view/tpl/diasp_dec_hdr.tpl +++ /dev/null @@ -1,8 +0,0 @@ -<decrypted_hdeader> - <iv>$inner_iv</iv> - <aes_key>$inner_key</aes_key> - <author> - <name>$author_name</name> - <uri>$author_uri</uri> - </author> -</decrypted_header> diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl new file mode 100644 index 000000000..d78aec1f5 --- /dev/null +++ b/view/tpl/dir_sort_links.tpl @@ -0,0 +1,6 @@ +<div class="widget" id="dir_sort_links"> +<h3>{{$header}}</h3> +<a href="directory?f=&order=normal">{{$normal}}</a><br /> +<a href="directory?f=&order=reverse">{{$reverse}}</a><br /> +<a href="directory?f=&order=date">{{$date}}</a><br /> +</div> diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index e1def851b..5d703e2dd 100644..100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -1,14 +1,14 @@ -<h1>$dirlbl</h1> +<h1>{{$dirlbl}}</h1> -{{ if $search }} -<h4>$finddsc $safetxt</h4> -{{ endif }} +{{if $search}} +<h4>{{$finddsc}} {{$safetxt}}</h4> +{{/if}} -{{for $entries as $entry}} +{{foreach $entries as $entry}} -{{ inc direntry.tpl }}{{ endinc }} +{{include file="direntry.tpl"}} -{{ endfor }} +{{/foreach}} diff --git a/view/tpl/directory_item.tpl b/view/tpl/directory_item.tpl deleted file mode 100644 index b45da4465..000000000 --- a/view/tpl/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -<div class="directory-item lframe" id="directory-item-$id" > - <div class="contact-photo-wrapper" id="directory-photo-wrapper-$id" > - <div class="contact-photo" id="directory-photo-$id" > - <a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" ><img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" /></a> - </div> - </div> - - <div class="contact-name" id="directory-name-$id">$name</div> - <div class="contact-details">$details</div> -</div> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index e860da41c..e5f12944e 100644..100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -1,11 +1,16 @@ +<div class="directory-item lframe" id="directory-item-{{$entry.id}}" > +<div class="generic-content-wrapper"> -<div class="directory-item lframe" id="directory-item-$entry.id" > - <div class="contact-photo-wrapper" id="directory-photo-wrapper-$entry.id" > - <div class="contact-photo" id="directory-photo-$entry.id" > - <a href="$entry.profile_link" class="directory-profile-link" id="directory-profile-link-$entry.id" ><img class="directory-photo-img" src="$entry.photo" alt="$entry.alttext" title="$entry.alttext" /></a> - </div> - </div> +<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > +<div class="contact-photo" id="directory-photo-{{$entry.id}}" > +<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a> +</div> +</div> - <div class="contact-name" id="directory-name-$entry.id">$entry.name</div> - <div class="contact-details">$entry.details</div> +<div class="contact-name" id="directory-name-{{$entry.id}}" ><span onclick="dirdetails('{{$entry.hash}}');" class="fakelink" >{{$entry.name}}</span></div> +{{if $entry.connect}} +<div class="directory-connect btn btn-default"><a href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a></div> +{{/if}} +<div class="contact-details">{{$entry.details}}</div> +</div> </div> diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl new file mode 100755 index 000000000..da6ea1a44 --- /dev/null +++ b/view/tpl/direntry_large.tpl @@ -0,0 +1,43 @@ +<div class="directory-popup-item lframe" id="directory-item-{{$id}}" > +<div class="generic-content-wrapper"> + +<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > + <div class="contact-photo dirpopup" id="directory-photo-{{$id}}" > + <a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" ><img class="directory-photo-img" style="height:175px; width:175px;" src="{{$photo}}" alt="{{$alttext}}" title="{{$alttext}}" /></a> + </div> + <div class="contact-photo dirpopup" id="directory-qr-{{$id}}" > + <img class="directory-photo-img" style="height:175px; width:175px;" src="photo/qr?f=&qr={{$qrlink}}" alt="QR" title="{{$qrlink}}" /> + </div> +</div> + +<div class="clear"></div> + + +<div class="contact-name" id="directory-name-{{$id}}" >{{$name}}{{if $online}} <i class="icon-asterisk online-now" title="{{$online}}"></i>{{/if}}</div> +{{if $connect}} +<div class="directory-connect btn btn-default"><a href="{{$connect}}"><i class="icon-plus connect-icon"></i> {{$conn_label}}</a></div> +{{/if}} + +<div class="contact-webbie">{{$address}}</div> + +<div class="contact-details">{{$details}}</div> +{{if $marital}} +<div class="directory-marital">{{$marital}} </div> +{{/if}} +{{if $sexual}} +<div class="directory-sexual">{{$sexual}} </div> +{{/if}} +{{if $homepage}} +<div class="directory-homepage">{{$homepage}} </div> +{{/if}} +{{if $hometown}} +<div class="directory-hometown">{{$hometown}} </div> +{{/if}} +{{if $about}} +<div class="directory-about">{{$about}} </div> +{{/if}} +{{if $kw}} +<div class="directory-keywords">{{$kw}} {{$keywords}}</div> +{{/if}} +</div> +</div> diff --git a/view/tpl/display-head.tpl b/view/tpl/display-head.tpl index 3d4e7e96a..3d4e7e96a 100644..100755 --- a/view/tpl/display-head.tpl +++ b/view/tpl/display-head.tpl diff --git a/view/tpl/edpage_head.tpl b/view/tpl/edpage_head.tpl new file mode 100755 index 000000000..890b746bf --- /dev/null +++ b/view/tpl/edpage_head.tpl @@ -0,0 +1 @@ +<h2>{{$title}}</h2> diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl index b83e606a0..890b746bf 100644..100755 --- a/view/tpl/edpost_head.tpl +++ b/view/tpl/edpost_head.tpl @@ -1 +1 @@ -<h2>$title</h2> +<h2>{{$title}}</h2> diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index 43f72f15c..cf149341e 100644..100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -1,26 +1,26 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> - <title>$banner</title> + <title>{{$banner}}</title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> </head> <body> -<table style="border:1px solid #ccc"> +<table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;"> <tbody> - <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">$product</div><div style="clear: both;"></div></td></tr> + <tr><td colspan="2" style="background:#c60032; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/rm-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> - <tr><td style="padding-top:22px;" colspan="2">$preamble</td></tr> + <tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr> - <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$source_link"><img style="border:0px;width:48px;height:48px;" src="$source_photo"></a></td> - <td style="padding-top:22px;"><a href="$source_link">$source_name</a></td></tr> - <tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr> - <tr><td style="padding-right:22px;">$htmlversion</td></tr> - <tr><td style="padding-top:11px;" colspan="2">$hsitelink</td></tr> - <tr><td style="padding-bottom:11px;" colspan="2">$hitemlink</td></tr> - <tr><td></td><td>$thanks</td></tr> - <tr><td></td><td>$site_admin</td></tr> + <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td> + <td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td></tr> + <tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr> + <tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr> + <tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr> + <tr><td style="padding-bottom:11px;" colspan="2">{{$hitemlink}}</td></tr> + <tr><td></td><td>{{$thanks}}</td></tr> + <tr><td></td><td>{{$site_admin}}</td></tr> </tbody> </table> </body> diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl index 018bb6078..bdab4c273 100644..100755 --- a/view/tpl/email_notify_text.tpl +++ b/view/tpl/email_notify_text.tpl @@ -1,13 +1,12 @@ - -$preamble +{{$preamble}} -$title +{{$title}} -$textversion +{{$textversion}} -$tsitelink -$titemlink +{{$tsitelink}} +{{$titemlink}} -$thanks -$site_admin +{{$thanks}} +{{$site_admin}} diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl index 80c1dfc55..e0977e262 100644..100755 --- a/view/tpl/event.tpl +++ b/view/tpl/event.tpl @@ -1,10 +1,10 @@ -{{ for $events as $event }} +{{foreach $events as $event}} <div class="event"> - {{ if $event.item.author-name }}<a href="$event.item.author-link" ><img src="$event.item.author-avatar" height="32" width="32" />$event.item.author-name</a>{{ endif }} - $event.html - {{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" class="plink-event-link icon s22 remote-link"></a>{{ endif }} - {{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }} + {{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}" height="32" width="32" />{{$event.item.author.xchan_name}}</a>{{/if}} + {{$event.html}} + {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="icon-external-link" ></i></a>{{/if}} + {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="icon-pencil"></i></a>{{/if}} </div> <div class="clear"></div> -{{ endfor }} +{{/foreach}} diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 536c52b0f..bfdf4d0b6 100644..100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -1,49 +1,54 @@ -<h3>$title</h3> +<h3>{{$title}}</h3> <p> -$desc +{{$desc}} </p> -<form action="$post" method="post" > +<form action="{{$post}}" method="post" > -<input type="hidden" name="event_id" value="$eid" /> -<input type="hidden" name="cid" value="$cid" /> -<input type="hidden" name="uri" value="$uri" /> +<input type="hidden" name="event_id" value="{{$eid}}" /> +<input type="hidden" name="xchan" value="{{$xchan}}" /> +<input type="hidden" name="mid" value="{{$mid}}" /> -<div id="event-start-text">$s_text</div> -$s_dsel $s_tsel +<div id="event-start-text">{{$s_text}}</div> +{{$s_dsel}} {{$s_tsel}} -<div id="event-finish-text">$f_text</div> -$f_dsel $f_tsel +<div class="clear"></div><br /> -<div id="event-datetime-break"></div> - -<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" $n_checked /> <div id="event-nofinish-text">$n_text</div> +<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div> <div id="event-nofinish-break"></div> -<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" $a_checked /> <div id="event-adjust-text">$a_text</div> + +<div id="event-finish-text">{{$f_text}}</div> +{{$f_dsel}} {{$f_tsel}} + +<div id="event-datetime-break"></div> + + +<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div> <div id="event-adjust-break"></div> -<div id="event-summary-text">$t_text</div> -<input type="text" id="event-summary" name="summary" value="$t_orig" /> +<div id="event-summary-text">{{$t_text}}</div> +<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" /> -<div id="event-desc-text">$d_text</div> -<textarea id="event-desc-textarea" name="desc">$d_orig</textarea> +<div id="event-desc-text">{{$d_text}}</div> +<textarea id="event-desc-textarea" name="desc">{{$d_orig}}</textarea> -<div id="event-location-text">$l_text</div> -<textarea id="event-location-textarea" name="location">$l_orig</textarea> +<div id="event-location-text">{{$l_text}}</div> +<textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea> +<br /> -<input type="checkbox" name="share" value="1" id="event-share-checkbox" $sh_checked /> <div id="event-share-text">$sh_text</div> +<input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div> <div id="event-share-break"></div> -$acl +{{$acl}} <div class="clear"></div> -<input id="event-submit" type="submit" name="submit" value="$submit" /> +<input id="event-submit" type="submit" name="submit" value="{{$submit}}" /> </form> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 471748b97..d6b34b33e 100644..100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -1,11 +1,11 @@ -<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' /> +<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' /> <script language="javascript" type="text/javascript" - src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script> + src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script> <script> function showEvent(eventid) { $.get( - '$baseurl/events/?id='+eventid, + '{{$baseurl}}/events/?id='+eventid, function(data){ $.fancybox(data); } @@ -14,7 +14,7 @@ $(document).ready(function() { $('#events-calendar').fullCalendar({ - events: '$baseurl/events/json/', + events: '{{$baseurl}}/events/json/', header: { left: 'prev,next today', center: 'title', @@ -27,21 +27,21 @@ eventRender: function(event, element, view) { //console.log(view.name); - if (event.item['author-name']==null) return; + if (event.item['author']['xchan_name']==null) return; switch(view.name){ case "month": element.find(".fc-event-title").html( "<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format( - event.item['author-avatar'], - event.item['author-name'], + event.item['author']['xchan_photo_s'], + event.item['author']['xchan_name'], event.title )); break; case "agendaWeek": element.find(".fc-event-title").html( "<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format( - event.item['author-avatar'], - event.item['author-name'], + event.item['author']['xchan_photo_s'], + event.item['author']['xchan_name'], event.item.desc, event.item.location )); @@ -49,8 +49,8 @@ case "agendaDay": element.find(".fc-event-title").html( "<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format( - event.item['author-avatar'], - event.item['author-name'], + event.item['author']['xchan_photo_s'], + event.item['author']['xchan_name'], event.item.desc, event.item.location )); @@ -73,15 +73,15 @@ }); </script> - +{{if $editselect != 'none'}} <script language="javascript" type="text/javascript" - src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> + src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> tinyMCE.init({ theme : "advanced", - mode : "textareas", + mode : "{{$editselect}}", plugins : "bbcode,paste", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", @@ -97,7 +97,7 @@ force_p_newlines : false, force_br_newlines : true, forced_root_block : '', - content_css: "$baseurl/view/custom_tinymce.css", + content_css: "{{$baseurl}}/view/custom_tinymce.css", theme_advanced_path : false, setup : function(ed) { ed.onInit.add(function(ed) { @@ -106,7 +106,9 @@ } }); - + {{else}} + <script language="javascript" type="text/javascript"> + {{/if}} $(document).ready(function() { diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index b0e182c56..c87d20529 100644..100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,6 +1,6 @@ -$tabs -<h2>$title</h2> +{{$tabs}} +<h2>{{$title}}</h2> -<div id="new-event-link"><a href="$new_event.0" >$new_event.1</a></div> +<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div> <div id="events-calendar"></div> diff --git a/view/tpl/events.tpl b/view/tpl/events.tpl deleted file mode 100644 index e0d830691..000000000 --- a/view/tpl/events.tpl +++ /dev/null @@ -1,24 +0,0 @@ -$tabs -<h2>$title</h2> - -<div id="new-event-link"><a href="$new_event.0" >$new_event.1</a></div> - -<div id="event-calendar-wrapper"> - <a href="$previus.0" class="prevcal $previus.2"><div id="event-calendar-prev" class="icon s22 prev" title="$previus.1"></div></a> - $calendar - <a href="$next.0" class="nextcal $next.2"><div id="event-calendar-prev" class="icon s22 next" title="$next.1"></div></a> -</div> -<div class="event-calendar-end"></div> - - -{{ for $events as $event }} - <div class="event"> - {{ if $event.is_first }}<hr /><a name="link-$event.j" ><div class="event-list-date">$event.d</div></a>{{ endif }} - {{ if $event.item.author-name }}<a href="$event.item.author-link" ><img src="$event.item.author-avatar" height="32" width="32" />$event.item.author-name</a>{{ endif }} - $event.html - {{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" class="plink-event-link icon s22 remote-link"></a>{{ endif }} - {{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }} - </div> - <div class="clear"></div> - -{{ endfor }} diff --git a/view/tpl/events_reminder.tpl b/view/tpl/events_reminder.tpl index f641a5faf..fd6a1a5c7 100644..100755 --- a/view/tpl/events_reminder.tpl +++ b/view/tpl/events_reminder.tpl @@ -1,10 +1,10 @@ -{{ if $count }} -<div id="event-notice" class="birthday-notice fakelink $classtoday" onclick="openClose('event-wrapper');">$event_reminders ($count)</div> -<div id="event-wrapper" style="display: none;" ><div id="event-title">$event_title</div> +{{if $count}} +<div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div> +<div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title}}</div> <div id="event-title-end"></div> -{{ for $events as $event }} -<div class="event-list" id="event-$event.id"></a> <a href="events/$event.link">$event.title</a> $event.date </div> -{{ endfor }} +{{foreach $events as $event}} +<div class="event-list" id="event-{{$event.id}}"></a> <a href="events/{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div> +{{/foreach}} </div> -{{ endif }} +{{/if}} diff --git a/view/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl index c6e4cb08e..68c0bcdf2 100644..100755 --- a/view/tpl/failed_updates.tpl +++ b/view/tpl/failed_updates.tpl @@ -1,17 +1,17 @@ -<h2>$banner</h2> +<h2>{{$banner}}</h2> -<div id="failed_updates_desc">$desc</div> +<div id="failed_updates_desc">{{$desc}}</div> -{{ if $failed }} -{{ for $failed as $f }} +{{if $failed}} +{{foreach $failed as $f}} -<h4>$f</h4> +<h4>{{$f}}</h4> <ul> -<li><a href="$base/admin/dbsync/mark/$f">$mark</a></li> -<li><a href="$base/admin/dbsync/$f">$apply</a></li> +<li><a href="{{$base}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li> +<li><a href="{{$base}}/admin/dbsync/{{$f}}">{{$apply}}</a></li> </ul> <hr /> -{{ endfor }} -{{ endif }} +{{/foreach}} +{{/if}} diff --git a/view/tpl/fake_feed.tpl b/view/tpl/fake_feed.tpl deleted file mode 100644 index c37071cf4..000000000 --- a/view/tpl/fake_feed.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<feed xmlns="http://www.w3.org/2005/Atom" > - - <id>fake feed</id> - <title>fake title</title> - - <updated>1970-01-01T00:00:00Z</updated> - - <author> - <name>Fake Name</name> - <uri>http://example.com</uri> - </author> - diff --git a/view/tpl/field.tpl b/view/tpl/field.tpl index 35f5afd39..942cfcef5 100644..100755 --- a/view/tpl/field.tpl +++ b/view/tpl/field.tpl @@ -1,4 +1,3 @@ - - {{ if $field.0==select }} - {{ inc field_select.tpl }}{{ endinc }} - {{ endif }} + {{if $field.0==select}} + {{include file="field_select.tpl"}} + {{/if}} diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 06bed38e7..f5dda4cc0 100644..100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -1,7 +1,6 @@ - <div class='field acheckbox'> - <label for='id_$field.0'>$field.1</label> - <input type="checkbox" class="abook-edit-them" name='$field.0' id='them_id_$field.0' value="1" disabled="disabled" {{ if $field.2 }}checked="checked"{{ endif }} /> - <input type="checkbox" class="abook-edit-me" name='$field.0' id='me_id_$field.0' value="$field.4" {{ if $field.3 }}checked="checked"{{ endif }} {{ if $field.5 }} disabled="disabled" {{ endif }}/> - <span class='field_abook_help'>$field.6</span> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <input type="checkbox" class="abook-edit-them" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} /> + <input type="checkbox" class="abook-edit-me" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />{{if $field.5}} <span class="permission-inherited">{{$inherited}}</span> {{/if}} + <span class='field_abook_help'>{{$field.6}}</span> </div> diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index afab29243..51d56f69c 100644..100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,6 +1,5 @@ - <div class='field checkbox'> - <label for='id_$field.0'>$field.1</label> - <input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}> - <span class='field_help'>$field.3</span> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}> + <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl new file mode 100644 index 000000000..a68781698 --- /dev/null +++ b/view/tpl/field_colorinput.tpl @@ -0,0 +1,6 @@ + <div class='field input color'> + <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> + <input class='color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} + <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span> + <div id='end_{{$field.0}}' class='field_end'></div> + </div> diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl index a4dc8e571..1f9218954 100644..100755 --- a/view/tpl/field_combobox.tpl +++ b/view/tpl/field_combobox.tpl @@ -1,18 +1,17 @@ - <div class='field combobox'> - <label for='id_$field.0' id='id_$field.0_label'>$field.1</label> - {# html5 don't work on Chrome, Safari and IE9 - <input id="id_$field.0" type="text" list="data_$field.0" > - <datalist id="data_$field.0" > - {{ for $field.4 as $opt=>$val }}<option value="$val">{{ endfor }} - </datalist> #} + <label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label> + {{* html5 don't work on Chrome, Safari and IE9 see https://github.com/thgreasi/datalist-polyfill + <input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" > + <datalist id="data_{{$field.0}}" > + {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}} + </datalist> *}} - <input id="id_$field.0" type="text" value="$field.2"> - <select id="select_$field.0" onChange="$('#id_$field.0').val($(this).val())"> - <option value="">$field.5</option> - {{ for $field.4 as $opt=>$val }}<option value="$val">$val</option>{{ endfor }} + <input id="id_{{$field.0}}" type="text" value="{{$field.2}}"> + <select id="select_{{$field.0}}" onChange="$('#id_{{$field.0}}').val($(this).val())"> + <option value="">{{$field.5}}</option> + {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}} </select> - <span class='field_help'>$field.3</span> + <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl index be15d3f60..a6b49f6da 100644..100755 --- a/view/tpl/field_custom.tpl +++ b/view/tpl/field_custom.tpl @@ -1,6 +1,5 @@ - <div class='field custom'> - <label for='$field.0'>$field.1</label> - $field.2 - <span class='field_help'>$field.3</span> + <label for='{{$field.0}}'>{{$field.1}}</label> + {{$field.2}} + <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index 09417deca..a584f95e7 100644..100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,7 +1,6 @@ - <div class='field input'> - <label for='id_$field.0' id='label_$field.0'>$field.1</label> - <input name='$field.0' id='id_$field.0' value="$field.2"> - <span id='help_$field.0' class='field_help'>$field.3</span> - <div id='end_$field.0' class='field_end'></div> + <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> + <input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} + <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span> + <div id='end_{{$field.0}}' class='field_end'></div> </div> diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl index 47a513a55..d9a8d7289 100644..100755 --- a/view/tpl/field_intcheckbox.tpl +++ b/view/tpl/field_intcheckbox.tpl @@ -1,6 +1,5 @@ - <div class='field checkbox'> - <label for='id_$field.0'>$field.1</label> - <input type="checkbox" name='$field.0' id='id_$field.0' value="$field.3" {{ if $field.2 }}checked="true"{{ endif }}> - <span class='field_help'>$field.4</span> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="true"{{/if}}> + <span class='field_help'>{{$field.4}}</span> </div> diff --git a/view/tpl/field_openid.tpl b/view/tpl/field_openid.tpl deleted file mode 100644 index acd93ff62..000000000 --- a/view/tpl/field_openid.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - <div class='field input openid'> - <label for='id_$field.0'>$field.1</label> - <input name='$field.0' id='id_$field.0' value="$field.2"> - <span class='field_help'>$field.3</span> - </div> diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index e604b7f5d..23058f8a6 100644..100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,6 +1,5 @@ - <div class='field password'> - <label for='id_$field.0'>$field.1</label> - <input type='password' name='$field.0' id='id_$field.0' value="$field.2"> - <span class='field_help'>$field.3</span> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> + <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_radio.tpl b/view/tpl/field_radio.tpl index a915e8eb3..147b6b834 100644..100755 --- a/view/tpl/field_radio.tpl +++ b/view/tpl/field_radio.tpl @@ -1,6 +1,5 @@ - <div class='field radio'> - <label for='id_$field.0_$field.2'>$field.1</label> - <input type="radio" name='$field.0' id='id_$field.0_$field.2' value="$field.2" {{ if $field.4 }}checked="true"{{ endif }}> - <span class='field_help'>$field.3</span> + <label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label> + <input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}> + <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_richtext.tpl b/view/tpl/field_richtext.tpl index c124ee000..c8639cf10 100644..100755 --- a/view/tpl/field_richtext.tpl +++ b/view/tpl/field_richtext.tpl @@ -1,6 +1,5 @@ - <div class='field richtext'> - <label for='id_$field.0'>$field.1</label> - <textarea name='$field.0' id='id_$field.0' class="fieldRichtext">$field.2</textarea> - <span class='field_help'>$field.3</span> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext">{{$field.2}}</textarea> + <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index d79eb48e0..9aca26e7b 100644..100755 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -1,8 +1,7 @@ - <div class='field select'> - <label for='id_$field.0'>$field.1</label> - <select name='$field.0' id='id_$field.0'> - {{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }} + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <select name='{{$field.0}}' id='id_{{$field.0}}'> + {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> - <span class='field_help'>$field.3</span> + <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl new file mode 100644 index 000000000..f0090cf98 --- /dev/null +++ b/view/tpl/field_select_disabled.tpl @@ -0,0 +1,7 @@ + <div class='field select'> + <label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label> + <select disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'> + {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} + </select> + <span class='field_help'>{{$field.3}}</span> + </div> diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl index 765b285d9..861be3201 100644..100755 --- a/view/tpl/field_select_raw.tpl +++ b/view/tpl/field_select_raw.tpl @@ -1,8 +1,7 @@ - <div class='field select'> - <label for='id_$field.0'>$field.1</label> - <select name='$field.0' id='id_$field.0'> - $field.4 + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <select name='{{$field.0}}' id='id_{{$field.0}}'> + {{$field.4}} </select> - <span class='field_help'>$field.3</span> + <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index 2425cdd3b..b454045c0 100644..100755 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,6 +1,5 @@ - <div class='field textarea'> - <label for='id_$field.0'>$field.1</label> - <textarea name='$field.0' id='id_$field.0'>$field.2</textarea> - <span class='field_help'>$field.3</span> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <textarea name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> + <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl index 1b3ede36c..a0e454bf5 100644..100755 --- a/view/tpl/field_themeselect.tpl +++ b/view/tpl/field_themeselect.tpl @@ -1,9 +1,9 @@ - <script>$(function(){ previewTheme($("#id_$field.0")[0]); });</script> + <script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script> <div class='field select'> - <label for='id_$field.0'>$field.1</label> - <select name='$field.0' id='id_$field.0' {{ if $field.5=='preview' }}onchange="previewTheme(this);"{{ endif }} > - {{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }} + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5=='preview'}}onchange="previewTheme(this);"{{/if}} > + {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> - <span class='field_help'>$field.3</span> + <span class='field_help'>{{$field.3}}</span> <div id="theme-preview"></div> </div> diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl index 5d4a775c2..e36e775c7 100644..100755 --- a/view/tpl/field_yesno.tpl +++ b/view/tpl/field_yesno.tpl @@ -1,13 +1,13 @@ <div class='field yesno'> - <label for='id_$field.0'>$field.1</label> - <div class='onoff' id="id_$field.0_onoff"> - <input type="hidden" name='$field.0' id='id_$field.0' value="$field.2"> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <div class='onoff' id="id_{{$field.0}}_onoff"> + <input type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> <a href="#" class='off'> - {{ if $field.4 }}$field.4.0{{ else }}OFF{{ endif }} + {{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}} </a> <a href="#" class='on'> - {{ if $field.4 }}$field.4.1{{ else }}ON{{ endif }} + {{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}} </a> </div> - <span class='field_help'>$field.3</span> + <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl index 54fba7435..70d68c56e 100644..100755 --- a/view/tpl/fileas_widget.tpl +++ b/view/tpl/fileas_widget.tpl @@ -1,12 +1,12 @@ <div id="fileas-sidebar" class="widget"> - <h3>$title</h3> - <div id="nets-desc">$desc</div> + <h3>{{$title}}</h3> + <div id="nets-desc">{{$desc}}</div> <ul class="fileas-ul"> - <li class="tool"><a href="$base" class="fileas-link fileas-all{{ if $sel_all }} fileas-selected{{ endif }}">$all</a></li> - {{ for $terms as $term }} - <li class="tool"><a href="$base?f=&file=$term.name" class="fileas-link{{ if $term.selected }} fileas-selected{{ endif }}">$term.name</a></li> - {{ endfor }} + <li class="tool"><a href="{{$base}}" class="fileas-link fileas-all{{if $sel_all}} fileas-selected{{/if}}">{{$all}}</a></li> + {{foreach $terms as $term}} + <li class="tool"><a href="{{$base}}?f=&file={{$term.name}}" class="fileas-link{{if $term.selected}} fileas-selected{{/if}}">{{$term.name}}</a></li> + {{/foreach}} </ul> </div> diff --git a/view/tpl/filebrowser.tpl b/view/tpl/filebrowser.tpl index 1e97237f4..787f7c0cd 100644..100755 --- a/view/tpl/filebrowser.tpl +++ b/view/tpl/filebrowser.tpl @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script> + <script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script> <style> .panel_wrapper div.current{.overflow: auto; height: auto!important; } .filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;} @@ -60,24 +60,24 @@ <div id="general_panel" class="panel current"> <div class="filebrowser path"> - {{ for $path as $p }}<a href="$p.0">$p.1</a>{{ endfor }} + {{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}} </div> <div class="filebrowser folders"> <ul> - {{ for $folders as $f }}<li><a href="$f.0/">$f.1</a></li>{{ endfor }} + {{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}} </ul> </div> - <div class="filebrowser files $type"> + <div class="filebrowser files {{$type}}"> <ul> - {{ for $files as $f }} - <li><a href="#" onclick="FileBrowserDialogue.mySubmit('$f.0'); return false;"><img src="$f.2"><span>$f.1</span></a></li> - {{ endfor }} + {{foreach $files as $f}} + <li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li> + {{/foreach}} </ul> </div> </div> </div> <div class="mceActionPanel"> - <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" /> + <input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" /> </div> </body> diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl index ae837d6b7..ae59ab713 100644..100755 --- a/view/tpl/filer_dialog.tpl +++ b/view/tpl/filer_dialog.tpl @@ -1,4 +1,4 @@ -{{ inc field_combobox.tpl }}{{ endinc }} +{{include file="field_combobox.tpl"}} <div class="settings-submit-wrapper" > - <input id="filer_save" type="button" class="settings-submit" value="$submit" /> + <input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" /> </div> diff --git a/view/tpl/filestorage.tpl b/view/tpl/filestorage.tpl new file mode 100644 index 000000000..1995b95e1 --- /dev/null +++ b/view/tpl/filestorage.tpl @@ -0,0 +1,23 @@ +{{if $files}} + + <div class="generic-content-wrapper"> + {{if $limit}}{{$limitlabel}}{{$limit}}{{/if}} {{if $used}} {{$usedlabel}}{{$used}}{{/if}} + <br /> + <br /> + + {{foreach $files as $key => $items}} + {{foreach $items as $item}} + <div class="files-list-item"> + <a href="{{$baseurl}}/{{$item.id}}/edit" title="{{$edit}}"><i class="icon-pencil"></i></a> + <a href="{{$baseurl}}/{{$item.id}}/delete" title="{{$delete}}"><i class="icon-remove drop-icons"></i></a> + {{if ! $item.dir}}<a href="attach/{{$item.download}}">{{/if}}{{$item.title}}{{if ! $item.dir}}</a>{{/if}} + {{if ! $item.dir}} | {{$item.size}} bytes{{else}}{{$directory}}{{/if}} + +</div> + {{/foreach}} + {{/foreach}} + </div> + + <div class="clear"></div> + +{{/if}} diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index 259e74a93..f643a3597 100644..100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -1,8 +1,12 @@ <div id="follow-sidebar" class="widget"> - <h3>$connect</h3> - <div id="connect-desc">$desc</div> + <h3>{{$connect}}</h3> + <div id="connect-desc">{{$desc}}</div> <form action="follow" method="post" /> - <input id="side-follow-url" type="text" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" /> + <input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" /> + <input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" /> </form> + {{if $abook_usage_message}} + <div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div> + {{/if}} </div> diff --git a/view/tpl/follow_slap.tpl b/view/tpl/follow_slap.tpl deleted file mode 100644 index 1b1443bee..000000000 --- a/view/tpl/follow_slap.tpl +++ /dev/null @@ -1,25 +0,0 @@ - <entry> - <author> - <name>$name</name> - <uri>$profile_page</uri> - <link rel="photo" type="image/jpeg" media:width="80" media:height="80" href="$thumb" /> - <link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb" /> - </author> - - <id>$item_id</id> - <title>$title</title> - <published>$published</published> - <content type="$type" >$content</content> - - <as:actor> - <as:obj_type>http://activitystrea.ms/schema/1.0/person</as:obj_type> - <id>$profile_page</id> - <title></title> - <link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="$photo"/> - <link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb"/> - <poco:preferredUsername>$nick</poco:preferredUsername> - <poco:displayName>$name</poco:displayName> - </as:actor> - <as:verb>$verb</as:verb> - $ostat_follow - </entry> diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl index f3404f783..5ae52aa8a 100644..100755 --- a/view/tpl/generic_links_widget.tpl +++ b/view/tpl/generic_links_widget.tpl @@ -1,11 +1,11 @@ -<div class="widget{{ if $class }} $class{{ endif }}"> - {{if $title}}<h3>$title</h3>{{endif}} - {{if $desc}}<div class="desc">$desc</div>{{endif}} +<div class="widget{{if $class}} {{$class}}{{/if}}"> + {{if $title}}<h3>{{$title}}</h3>{{/if}} + {{if $desc}}<div class="desc">{{$desc}}</div>{{/if}} <ul> - {{ for $items as $item }} - <li class="tool"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li> - {{ endfor }} + {{foreach $items as $item}} + <li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}active{{/if}}">{{$item.label}}</a></li> + {{/foreach}} </ul> </div> diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl index 2cbebbb8e..850e7101f 100644..100755 --- a/view/tpl/group_drop.tpl +++ b/view/tpl/group_drop.tpl @@ -1,9 +1,7 @@ -<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" > - <a href="group/drop/$id?t=$form_security_token" +<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" > + <a href="group/drop/{{$id}}?t={{$form_security_token}}" onclick="return confirmDelete();" - id="group-delete-icon-$id" - class="icon drophide group-delete-icon" - onmouseover="imgbright(this);" - onmouseout="imgdull(this);" ></a> + id="group-delete-icon-{{$id}}" + class="group-delete-icon" ><i class="icon-remove drop-icons"></i></a> </div> <div class="group-delete-end"></div> diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl index 2fa2b1a55..eb658624c 100644..100755 --- a/view/tpl/group_edit.tpl +++ b/view/tpl/group_edit.tpl @@ -1,23 +1,24 @@ -<h2>$title</h2> +<h2>{{$title}}</h2> <div id="group-edit-wrapper" > - <form action="group/$gid" id="group-edit-form" method="post" > - <input type='hidden' name='form_security_token' value='$form_security_token'> + <form action="group/{{$gid}}" id="group-edit-form" method="post" > + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - {{ inc field_input.tpl with $field=$gname }}{{ endinc }} - {{ if $drop }}$drop{{ endif }} + {{include file="field_input.tpl" field=$gname}} + {{include file="field_checkbox.tpl" field=$public}} + {{if $drop}}{{$drop}}{{/if}} <div id="group-edit-submit-wrapper" > - <input type="submit" name="submit" value="$submit" > + <input type="submit" name="submit" value="{{$submit}}" > </div> <div id="group-edit-select-end" ></div> </form> </div> -{{ if $groupeditor }} +{{if $groupeditor}} <div id="group-update-wrapper"> - {{ inc groupeditor.tpl }}{{ endinc }} + {{include file="groupeditor.tpl"}} </div> -{{ endif }} -{{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }} +{{/if}} +{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}} diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl index 3809cb994..2223125ea 100644..100755 --- a/view/tpl/group_selection.tpl +++ b/view/tpl/group_selection.tpl @@ -1,8 +1,8 @@ <div class="field custom"> -<label for="group-selection" id="group-selection-lbl">$label</label> +<label for="group-selection" id="group-selection-lbl">{{$label}}</label> <select name="group-selection" id="group-selection" > -{{ for $groups as $group }} -<option value="$group.id" {{ if $group.selected }}selected="selected"{{ endif }} >$group.name</option> -{{ endfor }} +{{foreach $groups as $group}} +<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option> +{{/foreach}} </select> </div> diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index ebb194d9c..8c5d3927d 100644..100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -1,33 +1,33 @@ <div class="widget" id="group-sidebar"> -<h3>$title</h3> +<h3>{{$title}}</h3> + <div id="sidebar-group-list"> <ul id="sidebar-group-ul"> - {{ for $groups as $group }} + {{foreach $groups as $group}} <li class="sidebar-group-li"> - {{ if $group.cid }} + {{if $group.cid}} <input type="checkbox" - class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" - onclick="contactgroupChangeMember('$group.id','$group.cid');return true;" - {{ if $group.ismember }}checked="checked"{{ endif }} + class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" + onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;" + {{if $group.ismember}}checked="checked"{{/if}} /> - {{ endif }} - {{ if $group.edit }} - <a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a> - {{ endif }} - <a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a> + {{/if}} + {{if $group.edit}} + <a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><i id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer icon-pencil"></i></a> + {{/if}} + <span class="sidebar-group-name"><a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a></span> </li> - {{ endfor }} + {{/foreach}} </ul> - </div> +</div> + <div id="sidebar-new-group"> - <a href="group/new">$createtext</a> - </div> - {{ if $ungrouped }} - <div id="sidebar-ungrouped"> - <a href="nogroup">$ungrouped</a> + <a href="group/new">{{$createtext}}</a> </div> - {{ endif }} + </div> + + diff --git a/view/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl index 755985eb3..c79bb0a2a 100644..100755 --- a/view/tpl/groupeditor.tpl +++ b/view/tpl/groupeditor.tpl @@ -1,16 +1,16 @@ <div id="group"> -<h3>$groupeditor.label_members</h3> +<h3>{{$groupeditor.label_members}}</h3> <div id="group-members" class="contact_list"> -{{ for $groupeditor.members as $c}} $c {{ endfor }} +{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}} </div> <div id="group-members-end"></div> <hr id="group-separator" /> </div> <div id="contacts"> -<h3>$groupeditor.label_contacts</h3> +<h3>{{$groupeditor.label_contacts}}</h3> <div id="group-all-contacts" class="contact_list"> -{{ for $groupeditor.contacts as $m}} $m {{ endfor }} +{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}} </div> <div id="group-all-contacts-end"></div> </div> diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl new file mode 100644 index 000000000..fdcc4521c --- /dev/null +++ b/view/tpl/hdr.tpl @@ -0,0 +1,5 @@ +<div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> + +<ul id="nav-notifications-template" style="display:none;" rel="template"> + <li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> +</ul> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 632ab21ca..a212fd486 100644..100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,28 +1,33 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> -<base href="$baseurl/" /> -<meta name="generator" content="$generator" /> +<base href="{{$baseurl}}/" /> +<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=0"> +<meta name="generator" content="{{$generator}}" /> <!--[if IE]> <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> -$head_css +<script>(function(w){var dpr=((w.devicePixelRatio===undefined)?1:w.devicePixelRatio);if(!!w.navigator.standalone){var r=new XMLHttpRequest();r.open('GET','/retinaimages.php?devicePixelRatio='+dpr,false);r.send()}else{document.cookie='devicePixelRatio='+dpr+'; path=/'}})(window)</script> +<noscript><style id="devicePixelRatio" media="only screen and (-moz-min-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2)">html{background-image:url("/retinaimages.php?devicePixelRatio=2")}</style></noscript> -$js_strings +{{$head_css}} -$head_js +{{$js_strings}} -<link rel="shortcut icon" href="$baseurl/images/red.png" /> +{{$head_js}} + +<link rel="shortcut icon" href="{{$icon}}" /> <link rel="search" - href="$baseurl/opensearch" + href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" - title="Search in Friendica" /> + title="Search in Red" /> <script> - var updateInterval = $update_interval; - var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }}; + var updateInterval = {{$update_interval}}; + var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; + var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}}; </script> diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl new file mode 100644 index 000000000..e01243077 --- /dev/null +++ b/view/tpl/help.tpl @@ -0,0 +1,3 @@ +<div id = "help-content" class="generic-content-wrapper"> +{{$content}} +</div> diff --git a/view/tpl/hide_comments.tpl b/view/tpl/hide_comments.tpl index 55ee9dd7b..f4ed9c552 100644..100755 --- a/view/tpl/hide_comments.tpl +++ b/view/tpl/hide_comments.tpl @@ -1,4 +1,4 @@ <div class="hide-comments-outer"> -<span id="hide-comments-total-$id" class="hide-comments-total">$num_comments</span> <span id="hide-comments-$id" class="hide-comments fakelink" onclick="showHideComments($id);">$hide_text</span> +<span id="hide-comments-total-{{$id}}" class="hide-comments-total">{{$num_comments}}</span> <span id="hide-comments-{{$id}}" class="hide-comments fakelink" onclick="showHideComments({{$id}});">{{$hide_text}}</span> </div> -<div id="collapsed-comments-$id" class="collapsed-comments" style="display: $display;"> +<div id="collapsed-comments-{{$id}}" class="collapsed-comments" style="display: {{$display}};"> diff --git a/view/tpl/install.tpl b/view/tpl/install.tpl index b3a5f46ff..0e77aa97b 100644..100755 --- a/view/tpl/install.tpl +++ b/view/tpl/install.tpl @@ -1,10 +1,9 @@ +<h1>{{$title}}</h1> +<h2>{{$pass}}</h2> -<h1>$title</h1> -<h2>$pass</h2> +{{if $status}} +<h3 class="error-message">{{$status}}</h3> +{{/if}} -{{ if $status }} -<h3 class="error-message">$status</h3> -{{ endif }} - -$text +{{$text}} diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl index 1d8a4b263..2f773f746 100644..100755 --- a/view/tpl/install_checks.tpl +++ b/view/tpl/install_checks.tpl @@ -1,24 +1,24 @@ -<h1>$title</h1> -<h2>$pass</h2> -<form action="$baseurl/index.php?q=setup" method="post"> +<h1>{{$title}}</h1> +<h2>{{$pass}}</h2> +<form action="{{$baseurl}}/index.php?q=setup" method="post"> <table> -{{ for $checks as $check }} - <tr><td>$check.title </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if$check.required}}off{{else}}yellow{{endif}}{{endif}}"></td><td>{{if $check.required}}(required){{endif}}</td></tr> - {{if $check.help }} - <tr><td colspan="3"><blockquote>$check.help</blockquote></td></tr> - {{endif}} -{{ endfor }} +{{foreach $checks as $check}} + <tr><td>{{$check.title}} </td><td><i class="{{if $check.status}}icon-check{{else}}{{if $check.required}}icon-check-empty{{else}}icon-exclamation{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr> + {{if $check.help}} + <tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr> + {{/if}} +{{/foreach}} </table> -{{ if $phpath }} - <input type="hidden" name="phpath" value="$phpath"> -{{ endif }} +{{if $phpath}} + <input type="hidden" name="phpath" value="{{$phpath}}"> +{{/if}} -{{ if $passed }} +{{if $passed}} <input type="hidden" name="pass" value="2"> - <input type="submit" value="$next"> -{{ else }} + <input type="submit" value="{{$next}}"> +{{else}} <input type="hidden" name="pass" value="1"> - <input type="submit" value="$reload"> -{{ endif }} + <input type="submit" value="{{$reload}}"> +{{/if}} </form> diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl index dd8ba1302..3968d2a54 100644..100755 --- a/view/tpl/install_db.tpl +++ b/view/tpl/install_db.tpl @@ -1,30 +1,30 @@ - -<h1>$title</h1> -<h2>$pass</h2> +<h1>{{$title}}</h1> +<h2>{{$pass}}</h2> <p> -$info_01<br> -$info_02<br> -$info_03 +{{$info_01}}<br> +{{$info_02}}<br> +{{$info_03}} </p> -{{ if $status }} -<h3 class="error-message">$status</h3> -{{ endif }} +{{if $status}} +<h3 class="error-message">{{$status}}</h3> +{{/if}} -<form id="install-form" action="$baseurl/setup" method="post"> +<form id="install-form" action="{{$baseurl}}/setup" method="post"> -<input type="hidden" name="phpath" value="$phpath" /> +<input type="hidden" name="phpath" value="{{$phpath}}" /> <input type="hidden" name="pass" value="3" /> -{{ inc field_input.tpl with $field=$dbhost }}{{endinc}} -{{ inc field_input.tpl with $field=$dbuser }}{{endinc}} -{{ inc field_password.tpl with $field=$dbpass }}{{endinc}} -{{ inc field_input.tpl with $field=$dbdata }}{{endinc}} +{{include file="field_input.tpl" field=$dbhost}} +{{include file="field_input.tpl" field=$dbport}} +{{include file="field_input.tpl" field=$dbuser}} +{{include file="field_password.tpl" field=$dbpass}} +{{include file="field_input.tpl" field=$dbdata}} -<input id="install-submit" type="submit" name="submit" value="$submit" /> +<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> </form> diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl index ba39b99c5..d6fc66c87 100644..100755 --- a/view/tpl/install_settings.tpl +++ b/view/tpl/install_settings.tpl @@ -1,27 +1,27 @@ +<h1>{{$title}}</h1> +<h2>{{$pass}}</h2> -<h1>$title</h1> -<h2>$pass</h2> +{{if $status}} +<h3 class="error-message">{{$status}}</h3> +{{/if}} -{{ if $status }} -<h3 class="error-message">$status</h3> -{{ endif }} +<form id="install-form" action="{{$baseurl}}/setup" method="post"> -<form id="install-form" action="$baseurl/setup" method="post"> - -<input type="hidden" name="phpath" value="$phpath" /> -<input type="hidden" name="dbhost" value="$dbhost" /> -<input type="hidden" name="dbuser" value="$dbuser" /> -<input type="hidden" name="dbpass" value="$dbpass" /> -<input type="hidden" name="dbdata" value="$dbdata" /> +<input type="hidden" name="phpath" value="{{$phpath}}" /> +<input type="hidden" name="dbhost" value="{{$dbhost}}" /> +<input type="hidden" name="dbport" value="{{$dbport}}" /> +<input type="hidden" name="dbuser" value="{{$dbuser}}" /> +<input type="hidden" name="dbpass" value="{{$dbpass}}" /> +<input type="hidden" name="dbdata" value="{{$dbdata}}" /> <input type="hidden" name="pass" value="4" /> -{{ inc field_input.tpl with $field=$adminmail }}{{endinc}} -{{ inc field_input.tpl with $field=$siteurl }}{{endinc}} +{{include file="field_input.tpl" field=$adminmail}} +{{include file="field_input.tpl" field=$siteurl}} -$timezone +{{$timezone}} -<input id="install-submit" type="submit" name="submit" value="$submit" /> +<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> </form> diff --git a/view/tpl/intros.tpl b/view/tpl/intros.tpl index 6d1f1baa0..a4aed3bb8 100644..100755 --- a/view/tpl/intros.tpl +++ b/view/tpl/intros.tpl @@ -1,18 +1,17 @@ +<div class="intro-wrapper" id="intro-{{$contact_id}}" > -<div class="intro-wrapper" id="intro-$contact_id" > - -<div class="intro-fullname" id="intro-fullname-$contact_id" >$fullname</div> -<a class="intro-url-link" id="intro-url-link-$contact_id" href="$url" ><img id="photo-$contact_id" class="intro-photo" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a> -<div class="intro-wrapper-end" id="intro-wrapper-end-$contact_id"></div> +<div class="intro-fullname" id="intro-fullname-{{$contact_id}}" >{{$fullname}}</div> +<a class="intro-url-link" id="intro-url-link-{{$contact_id}}" href="{{$url}}" ><img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" /></a> +<div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div> <form class="intro-form" action="intro" method="post"> -<input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" /> -<input class="intro-submit-block" type="submit" name="submit" value="$block" /> -<input class="intro-submit-discard" type="submit" name="submit" value="$discard" /> -{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} -{# {{ inc field_checkbox.tpl with $field=$activity }}{{endinc}} #} -<input type="hidden" name="contact_id" value="$contact_id" > +<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" /> +<input class="intro-submit-block" type="submit" name="submit" value="{{$block}}" /> +<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" /> +{{include file="field_checkbox.tpl" field=$hidden}} +{{* {{include file="field_checkbox.tpl" field=$activity}} *}} +<input type="hidden" name="contact_id" value="{{$contact_id}}" > -<input class="intro-submit-approve" type="submit" name="submit" value="$approve" /> +<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" /> </form> </div> <div class="intro-end"></div> diff --git a/view/tpl/intros_header.tpl b/view/tpl/intros_header.tpl index 17afd0cbd..15096c7f8 100644..100755 --- a/view/tpl/intros_header.tpl +++ b/view/tpl/intros_header.tpl @@ -1 +1 @@ -<h3>$title</h3> +<h3>{{$title}}</h3> diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl index a47ef0162..2b7ab9cfb 100644..100755 --- a/view/tpl/invite.tpl +++ b/view/tpl/invite.tpl @@ -1,10 +1,13 @@ <form action="invite" method="post" id="invite-form" > + +<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <div id="invite-wrapper"> -<h3>$invite</h3> +<h3>{{$invite}}</h3> <div id="invite-recipient-text"> -$addr_text +{{$addr_text}} </div> <div id="invite-recipient-textarea"> @@ -12,15 +15,15 @@ $addr_text </div> <div id="invite-message-text"> -$msg_text +{{$msg_text}} </div> <div id="invite-message-textarea"> -<textarea id="invite-message" name="message" rows="10" cols="72" >$default_message</textarea> +<textarea id="invite-message" name="message" rows="10" cols="72" >{{$default_message}}</textarea> </div> <div id="invite-submit-wrapper"> -<input type="submit" name="submit" value="$submit" /> +<input type="submit" name="submit" value="{{$submit}}" /> </div> </div> diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl new file mode 100644 index 000000000..eeea25967 --- /dev/null +++ b/view/tpl/item_attach.tpl @@ -0,0 +1,8 @@ +<div class="clear"></div> +{{if $attaches}} +<div class="body-attach"> + {{foreach $attaches as $a}} + <a href="{{$a.url}}" title="{{$a.title}}" class="attachlink" ><i class="icon-paper-clip attach-icons attach-clip"></i><i class="{{$a.icon}} attach-icons"></i></a> + {{/foreach}} +</div> +{{/if}} diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl new file mode 100644 index 000000000..ec2639a6f --- /dev/null +++ b/view/tpl/item_categories.tpl @@ -0,0 +1,8 @@ +{{if $categories}} +<div class="categorytags"> +{{foreach $categories as $cat}} +<span class="item-category"><i class="icon-asterisk cat-icons"></i> {{if $cat.url}}<a href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span> +{{/foreach}} +</div> +{{/if}} + diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl new file mode 100644 index 000000000..0e68a172a --- /dev/null +++ b/view/tpl/item_filer.tpl @@ -0,0 +1,8 @@ +{{if $categories}} +<div class="filesavetags"> +{{foreach $categories as $cat}} +<span class="item-category"><i class="icon-folder-close cat-icons"></i> {{$cat.term}} <a href="{{$cat.removelink}}" class="category-remove-link" title="{{$remove}}"><i class="icon-remove drop-icons"></i></a></span> +{{/foreach}} +</div> +{{/if}} + diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index f777e997f..abf446ba9 100644..100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -1,21 +1,20 @@ - <script language="javascript" type="text/javascript"> var editor=false; var textlen = 0; -var plaintext = '$editselect'; +var plaintext = '{{$editselect}}'; function initEditor(cb){ if (editor==false){ - $("#profile-jot-text-loading").show(); + $("#profile-jot-text-loading").spin('small').show(); if(plaintext == 'none') { - $("#profile-jot-text-loading").hide(); + $("#profile-jot-text-loading").spin(false).hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; - $("a#jot-perms-icon").fancybox({ - 'transitionIn' : 'elastic', - 'transitionOut' : 'elastic' + $("a#jot-perms-icon").colorbox({ + 'inline' : true, + 'transition' : 'elastic' }); $(".jothidden").show(); if (typeof cb!="undefined") cb(); @@ -24,7 +23,7 @@ function initEditor(cb){ tinyMCE.init({ theme : "advanced", mode : "specific_textareas", - editor_selector: $editselect, + editor_selector: {{$editselect}}, auto_focus: "profile-jot-text", plugins : "bbcode,paste,autoresize, inlinepopups", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", @@ -42,7 +41,7 @@ function initEditor(cb){ force_br_newlines : true, forced_root_block : '', convert_urls: false, - content_css: "$baseurl/view/custom_tinymce.css", + content_css: "{{$baseurl}}/view/custom_tinymce.css", theme_advanced_path : false, file_browser_callback : "fcFileBrowser", setup : function(ed) { @@ -74,29 +73,11 @@ function initEditor(cb){ $('#profile-jot-desc').html(' '); } - //Character count - - if(textlen <= 140) { - $('#character-counter').removeClass('red'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('grey'); - } - if((textlen > 140) && (textlen <= 420)) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('red'); - $('#character-counter').addClass('orange'); - } - if(textlen > 420) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('red'); - } - $('#character-counter').text(textlen); }); ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; - $("#profile-jot-text-loading").hide(); + $("#profile-jot-text-loading").spin(false).hide(); $(".jothidden").show(); if (typeof cb!="undefined") cb(); }); @@ -105,11 +86,7 @@ function initEditor(cb){ }); editor = true; - // setup acl popup - $("a#jot-perms-icon").fancybox({ - 'transitionIn' : 'elastic', - 'transitionOut' : 'elastic' - }); + } else { if (typeof cb!="undefined") cb(); } @@ -122,35 +99,41 @@ function enableOnUser(){ } </script> -<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script> +<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script> <script> - var ispublic = '$ispublic'; + var ispublic = '{{$ispublic}}'; $(document).ready(function() { /* enable tinymce on focus and click */ $("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").click(enableOnUser); + var upload_title = $('#wall-image-upload').attr('title'); + var attach_title = $('#wall-file-upload').attr('title'); var uploader = new window.AjaxUpload( 'wall-image-upload', - { action: 'wall_upload/$nickname', + { action: '{{$baseurl}}/wall_upload/{{$nickname}}', name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').show(); }, + title: upload_title, + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onComplete: function(file,response) { addeditortext(response); - $('#profile-rotator').hide(); + $('#jot-media').val($('#jot-media').val() + response); + $('#profile-rotator').spin(false); } } ); var file_uploader = new window.AjaxUpload( 'wall-file-upload', - { action: 'wall_attach/$nickname', + { action: '{{$baseurl}}/wall_attach/{{$nickname}}', name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').show(); }, + title: attach_title, + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onComplete: function(file,response) { addeditortext(response); - $('#profile-rotator').hide(); + $('#jot-media').val($('#jot-media').val() + response); + $('#profile-rotator').spin(false); } } ); @@ -177,48 +160,61 @@ function enableOnUser(){ } function jotGetLink() { - reply = prompt("$linkurl"); + reply = prompt("{{$linkurl}}"); if(reply && reply.length) { reply = bin2hex(reply); - $('#profile-rotator').show(); - $.get('parse_url?binurl=' + reply, function(data) { + $('#profile-rotator').spin('tiny'); + $.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) { addeditortext(data); - $('#profile-rotator').hide(); + $('#profile-rotator').spin(false); }); } } function jotVideoURL() { - reply = prompt("$vidurl"); + reply = prompt("{{$vidurl}}"); if(reply && reply.length) { addeditortext('[video]' + reply + '[/video]'); } } function jotAudioURL() { - reply = prompt("$audurl"); + reply = prompt("{{$audurl}}"); if(reply && reply.length) { addeditortext('[audio]' + reply + '[/audio]'); } } - function jotGetLocation() { - reply = prompt("$whereareu", $('#jot-location').val()); + reply = prompt("{{$whereareu}}", $('#jot-location').val()); if(reply && reply.length) { $('#jot-location').val(reply); } } + function jotGetExpiry() { + //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + $('#expiryModal').modal(); + $('#expiry-modal-OKButton').on('click', function() { + reply=$('#expiration-date').val(); + if(reply && reply.length) { + $('#jot-expire').val(reply); + $('#expiryModal').modal('hide'); + } +}) + + + } + function jotShare(id) { if ($('#jot-popup').length != 0) $('#jot-popup').show(); - $('#like-rotator-' + id).show(); - $.get('share/' + id, function(data) { + $('#like-rotator-' + id).spin('tiny'); + $.get('{{$baseurl}}/share/' + id, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); - $('#like-rotator-' + id).hide(); + $('#like-rotator-' + id).spin(false); $(window).scrollTop(0); }); @@ -237,19 +233,19 @@ function enableOnUser(){ event.preventDefault(); if(reply && reply.length) { reply = bin2hex(reply); - $('#profile-rotator').show(); - $.get('parse_url?binurl=' + reply, function(data) { + $('#profile-rotator').spin('tiny'); + $.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); - $('#profile-rotator').hide(); + $('#profile-rotator').spin(false); }); }); } } function itemTag(id) { - reply = prompt("$term"); + reply = prompt("{{$term}}"); if(reply && reply.length) { reply = reply.replace('#',''); if(reply.length) { @@ -257,7 +253,7 @@ function enableOnUser(){ commentBusy = true; $('body').css('cursor', 'wait'); - $.get('tagger/' + id + '?term=' + reply); + $.get('{{$baseurl}}/tagger/' + id + '?term=' + reply); if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,3000); liking = 1; @@ -270,7 +266,7 @@ function enableOnUser(){ var bordercolor = $("input").css("border-color"); $.get('filer/', function(data){ - $.fancybox(data); + $.colorbox({html:data}); $("#id_term").keypress(function(){ $(this).css("border-color",bordercolor); }) @@ -284,11 +280,11 @@ function enableOnUser(){ if(reply && reply.length) { commentBusy = true; $('body').css('cursor', 'wait'); - $.get('filer/' + id + '?term=' + reply, NavUpdate); + $.get('{{$baseurl}}/filer/' + id + '?term=' + reply, NavUpdate); // if(timer) clearTimeout(timer); // timer = setTimeout(NavUpdate,3000); liking = 1; - $.fancybox.close(); + $.colorbox.close(); } else { $("#id_term").css("border-color","#FF0000"); } @@ -298,21 +294,44 @@ function enableOnUser(){ } + function itemBookmark(id) { + $.get('{{$baseurl}}/bookmarks?f=&item=' + id); + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,1000); + } + + function itemAddToCal(id) { + $.get('{{$baseurl}}/events/add/' + id); + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,1000); + } + + function jotClearLocation() { $('#jot-coord').val(''); $('#profile-nolocation-wrapper').hide(); } - function addeditortext(data) { - if(plaintext == 'none') { - var currentText = $("#profile-jot-text").val(); - $("#profile-jot-text").val(currentText + data); - } - else - tinyMCE.execCommand('mceInsertRawHTML',false,data); - } - $geotag + {{$geotag}} + +</script> + +<script> +$( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-delete-link,.block-delete-link", function(e) { + var link = $(this).attr("href"); // "get" the intended link in a var + + if (typeof(eval($.fn.modal)) === 'function'){ + e.preventDefault(); + bootbox.confirm("<h4>{{$confirmdelete}}</h4>",function(result) { + if (result) { + document.location.href = link;} + });} + else { + return confirm("{{$confirmdelete}}"); + } + }); </script> + diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 29c420900..c4fdba0f5 100644..100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,86 +1,142 @@ - <div id="profile-jot-wrapper" > - <div id="profile-jot-banner-wrapper"> - <div id="profile-jot-desc" > </div> - <div id="character-counter" class="grey"></div> - </div> - <div id="profile-jot-banner-end"></div> - - <form id="profile-jot-form" action="$action" method="post" > - <input type="hidden" name="type" value="$ptyp" /> - <input type="hidden" name="profile_uid" value="$profile_uid" /> - <input type="hidden" name="return" value="$return_path" /> - <input type="hidden" name="location" id="jot-location" value="$defloc" /> + <form id="profile-jot-form" action="{{$action}}" method="post" > + <input type="hidden" name="type" value="{{$ptyp}}" /> + <input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> + <input type="hidden" name="return" value="{{$return_path}}" /> + <input type="hidden" name="location" id="jot-location" value="{{$defloc}}" /> + <input type="hidden" name="expire" id="jot-expire" value="{{$defexpire}}" /> + <input type="hidden" name="media_str" id="jot-media" value="" /> + <input type="hidden" name="source" id="jot-source" value="{{$source}}" /> <input type="hidden" name="coord" id="jot-coord" value="" /> - <input type="hidden" name="post_id" value="$post_id" /> + <input type="hidden" name="post_id" value="{{$post_id}}" /> + <input type="hidden" name="webpage" value="{{$webpage}}" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> - <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div> - {{ if $catsenabled }} - <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> - {{ endif }} + {{if $showacl}}{{$acl}}{{/if}} + {{$mimeselect}} + {{$layoutselect}} + {{if $id_select}} + <div class="channel-id-select-div"> + <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}} + </div> + {{/if}} + <div id="jot-title-wrap"> + <input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"> + </div> + {{if $catsenabled}} + <div id="jot-category-wrap"> + <input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /> + </div> + {{/if}} + {{if $webpage}} + <div id="jot-pagetitle-wrap"> + <input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" /> + </div> + {{/if}} <div id="jot-text-wrap"> - <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> - <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> + <textarea class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea> </div> - -<div id="profile-jot-submit-wrapper" class="jothidden"> - <input type="submit" id="profile-jot-submit" name="submit" value="$share" /> - - <div id="profile-upload-wrapper" style="display: $visitor;" > - <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div> - </div> - <div id="profile-attach-wrapper" style="display: $visitor;" > - <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div> - </div> - - <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" > - <a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a> - </div> - <div id="profile-video-wrapper" style="display: $visitor;" > - <a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a> - </div> - <div id="profile-audio-wrapper" style="display: $visitor;" > - <a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a> - </div> - <div id="profile-location-wrapper" style="display: $visitor;" > - <a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a> - </div> - <div id="profile-nolocation-wrapper" style="display: none;" > - <a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a> - </div> - - <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" > - <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang - </div> - - {{ if $preview }}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>{{ endif }} - - - <div id="profile-jot-perms-end"></div> - - - <div id="profile-jot-plugin-wrapper"> - $jotplugins - </div> - - <div id="profile-rotator-wrapper" style="display: $visitor;" > - <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> - </div> - - <div id="jot-preview-content" style="display:none;"></div> - - <div style="display: none;"> - <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;"> - $acl - <hr style="clear:both"/> - $jotnets + <div id="profile-jot-submit-wrapper" class="jothidden"> + <div id="profile-jot-submit-left" class="btn-group pull-left"> + {{if $visitor}} + <button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" > + <i class="icon-camera jot-icons"></i> + </button> + <button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" > + <i id="wall-file-upload" class="icon-paper-clip jot-icons"></i> + </button> + <button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"> + <i id="profile-link" class="icon-link jot-icons"></i> + </button> + <button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;"> + <i id="profile-video" class="icon-facetime-video jot-icons"></i> + </button> + <button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;"> + <i id="profile-audio" class="icon-volume-up jot-icons"></i> + </button> + <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;"> + <i id="profile-nolocation" class="icon-circle-blank jot-icons"></i> + </button> + <button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;"> + <i id="profile-location" class="icon-globe jot-icons"></i> + </button> + {{/if}} + {{if $feature_expire}} + <button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;"> + <i id="profile-expires" class="icon-eraser jot-icons"></i> + </button> + {{/if}} + {{if $feature_encrypt}} + <button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"> + <i id="profile-encrypt" class="icon-key jot-icons"></i> + </button> + {{/if}} + </div> + <div id="profile-rotator-wrapper"> + <div id="profile-rotator"></div> + </div> + <div id="profile-jot-submit-right" class="btn-group pull-right"> + {{if $showacl}} + <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i> + </button> + {{/if}} + {{if $preview}} + <button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}"> + <i class="icon-eye-open jot-icons" ></i> + </button> + {{/if}} + <button class="btn btn-primary btn-sm" type="submit" name="submit">{{$share}}</button> + </div> + <div id="profile-jot-perms-end"></div> + <div id="profile-jot-plugin-wrapper"> + {{$jotplugins}} + </div> </div> - </div> - - + <div id="profile-jot-text-loading"></div> + <div id="profile-jot-end" class="clear"></div> + <div id="jot-preview-content" style="display:none;"></div> + </form> </div> -<div id="profile-jot-end"></div> -</form> -</div> - {{ if $content }}<script>initEditor();</script>{{ endif }} +<!-- Modal for item expiry--> +<div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4> + </div> + <!-- <div class="modal-body"> --> + <div class="modal-body form-group" style="width:90%"> + <div class="input-group input-group-sm date" id="datetimepicker1"> + <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> --> + <span class="icon-calendar"></span> + </span> + <input id="expiration-date" type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/> + </div> + </div> + <!-- </div> --> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> + <button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> +</div><!-- /.modal --> +<script type="text/javascript"> + $(function() { + $('#datetimepicker1').datetimepicker({ + language: 'us', + icons: { + time: "icon-time", + date: "icon-calendar", + up: "icon-arrow-up", + down: "icon-arrow-down" + } + }); + }); +</script> + +{{if $content}} +<script>initEditor();</script> +{{/if}} diff --git a/view/tpl/jot_geotag.tpl b/view/tpl/jot_geotag.tpl index b0f71e73b..7a398b612 100644..100755 --- a/view/tpl/jot_geotag.tpl +++ b/view/tpl/jot_geotag.tpl @@ -1,4 +1,3 @@ - if(navigator.geolocation) { navigator.geolocation.getCurrentPosition(function(position) { $('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude); diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index babb1b219..515e3107f 100644..100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -1,33 +1,38 @@ - <script> var aStr = { - 'delitem' : '$delitem', - 'comment' : '$comment', - 'showmore' : '$showmore', - 'showfewer' : '$showfewer', - 'pwshort' : '$pwshort', - 'pwnomatch' : '$pwnomatch', - 'everybody' : '$everybody', + 'delitem' : "{{$delitem}}", + 'comment' : "{{$comment}}", + 'showmore' : "{{$showmore}}", + 'showfewer' : "{{$showfewer}}", + 'divgrowmore' : "{{$divgrowmore}}", + 'divgrowless' : "{{$divgrowless}}", + 'pwshort' : "{{$pwshort}}", + 'pwnomatch' : "{{$pwnomatch}}", + 'everybody' : "{{$everybody}}", + 'passphrase' : "{{$passphrase}}", + 'passhint' : "{{$passhint}}", + 'permschange' : "{{$permschange}}", + 'closeAll' : "{{$closeAll}}", - 't01' : $t01, - 't02' : $t02, - 't03' : '$t03', - 't04' : '$t04', - 't05' : '$t05', - 't06' : '$t06', - 't07' : '$t07', - 't08' : '$t08', - 't09' : '$t09', - 't10' : '$t10', - 't11' : '$t11', - 't12' : '$t12', - 't13' : '$t13', - 't14' : '$t14', - 't15' : '$t15', - 't16' : '$t16', - 't17' : '$t17', + 't01' : "{{$t01}}", + 't02' : "{{$t02}}", + 't03' : "{{$t03}}", + 't04' : "{{$t04}}", + 't05' : "{{$t05}}", + 't06' : "{{$t06}}", + 't07' : "{{$t07}}", + 't08' : "{{$t08}}", + 't09' : "{{$t09}}", + 't10' : "{{$t10}}", + 't11' : "{{$t11}}", + 't12' : "{{$t12}}", + 't13' : "{{$t13}}", + 't14' : "{{$t14}}", + 't15' : "{{$t15}}", + 't16' : "{{$t16}}", + 't17' : "{{$t17}}", }; </script> diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl index e777a0a86..b512c759b 100644..100755 --- a/view/tpl/lang_selector.tpl +++ b/view/tpl/lang_selector.tpl @@ -1,10 +1,11 @@ -<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div> -<div id="language-selector" style="display: none;" > +<h1>{{$title}}</h1> +<br /> +<div id="language-selector" > <form action="#" method="post" > <select name="system_language" onchange="this.form.submit();" > - {{ for $langs.0 as $v=>$l }} - <option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option> - {{ endfor }} + {{foreach $langs.0 as $v=>$l}} + <option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option> + {{/foreach}} </select> </form> </div> diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl new file mode 100644 index 000000000..96c692c1c --- /dev/null +++ b/view/tpl/layoutlist.tpl @@ -0,0 +1,19 @@ +{{if $pages}} + + <div id="pagelist-content-wrapper" class="generic-content-wrapper"> + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + <div class="page-list-item"> + {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon"></i></a> {{/if}} + {{if $view}}<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon"></i></a> {{/if}} + {{if $share}}<a href="layouts/{{$channel}}/share/{{$item.mid}}" title="{{$share}}"><i class="icon-share design-icons"></i></a> {{/if}} + {{if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if}} + {{$item.title}} + </div> + {{/foreach}} + {{/foreach}} + </div> + + <div class="clear"></div> + +{{/if}} diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl index 2651ea1f8..60ba14d8c 100644..100755 --- a/view/tpl/like_noshare.tpl +++ b/view/tpl/like_noshare.tpl @@ -1,5 +1,5 @@ -<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id"> - <a href="#" class="icon like" title="$likethis" onclick="dolike($id,'like'); return false"></a> - <a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a> - <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> +<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}"> + <i class="icon-thumbs-up-alt item-tool" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i> + <i class="icon-thumbs-down-alt item-tool" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i> + <div id="like-rotator-{{$id}}" class="like-rotator"></div> </div> diff --git a/view/tpl/list_things.tpl b/view/tpl/list_things.tpl new file mode 100644 index 000000000..fb8935d82 --- /dev/null +++ b/view/tpl/list_things.tpl @@ -0,0 +1,13 @@ +{{if $things}} +{{foreach $things as $key => $items}} +<b>{{$items.profile}} {{$key}}</b> +<ul class="profile-thing-list"> +{{foreach $items as $item}} +<li>{{if $item.img}}<img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" />{{/if}} +<a href="{{$item.url}}" >{{$item.term}}</a> +</li> +{{/foreach}} +</ul> +<div class="clear"></div> +{{/foreach}} +{{/if}} diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index 149c46e4c..f6f48e138 100644..100755 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -1,31 +1,33 @@ -<form action="$dest_url" id="$form_id" method="post" > +<form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <input type="hidden" name="auth-params" value="login" /> <div id="login_standard"> - {{ inc field_input.tpl with $field=$lname }}{{ endinc }} - {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }} + {{include file="field_input.tpl" field=$lname}} + {{include file="field_password.tpl" field=$lpassword}} </div> <div id="login-extra-links"> - {{ if $register }}<a href="$register.link" title="$register.title" id="register-link">$register.desc</a>{{ endif }} - <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a> + {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}} + <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a> </div> - {{ inc field_checkbox.tpl with $field=$remember }}{{ endinc }} + <div class="clear"></div> + + {{include file="field_checkbox.tpl" field=$remember}} <div id="login-standard-end"></div> <div id="login-submit-wrapper" > - <input type="submit" name="submit" id="login-submit-button" value="$login" /> + <input type="submit" name="submit" id="login-submit-button" class="btn btn-default" value="{{$login}}" /> </div> - {{ for $hiddens as $k=>$v }} - <input type="hidden" name="$k" value="$v" /> - {{ endfor }} + {{foreach $hiddens as $k=>$v}} + <input type="hidden" name="{{$k}}" value="{{$v}}" /> + {{/foreach}} </form> -<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script> +<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script> diff --git a/view/tpl/logout.tpl b/view/tpl/logout.tpl index efc971df8..7548ed196 100644..100755 --- a/view/tpl/logout.tpl +++ b/view/tpl/logout.tpl @@ -1,6 +1,6 @@ -<form action="$dest_url" method="post" > +<form action="{{$dest_url}}" method="post" > <div class="logout-wrapper"> <input type="hidden" name="auth-params" value="logout" /> -<input type="submit" name="submit" id="logout-button" value="$logout" /> +<input type="submit" name="submit" id="logout-button" value="{{$logout}}" /> </div> </form> diff --git a/view/tpl/lostpass.tpl b/view/tpl/lostpass.tpl index cd3644157..f6fdb28d7 100644..100755 --- a/view/tpl/lostpass.tpl +++ b/view/tpl/lostpass.tpl @@ -1,17 +1,17 @@ -<h3>$title</h3> +<h3>{{$title}}</h3> <p id="lostpass-desc"> -$desc +{{$desc}} </p> <form action="lostpass" method="post" > <div id="login-name-wrapper"> - <label for="login-name" id="label-login-name">$name</label> + <label for="login-name" id="label-login-name">{{$name}}</label> <input type="text" maxlength="60" name="login-name" id="login-name" value="" /> </div> <div id="login-extra-end"></div> <div id="login-submit-wrapper" > - <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" /> + <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" /> </div> <div id="login-submit-end"></div> </form> diff --git a/view/tpl/magicsig.tpl b/view/tpl/magicsig.tpl deleted file mode 100644 index 75f9bc475..000000000 --- a/view/tpl/magicsig.tpl +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<me:env xmlns:me="http://salmon-protocol.org/ns/magic-env"> -<me:data type="application/atom+xml"> -$data -</me:data> -<me:encoding>$encoding</me:encoding> -<me:alg>$algorithm</me:alg> -<me:sig key_id="$keyhash">$signature</me:sig> -</me:env> diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index fe115d223..f794ffc78 100644..100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -1,13 +1,17 @@ <div class="mail-conv-outside-wrapper"> <div class="mail-conv-sender" > - <a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a> - <div class="mail-conv-sender-name" >$mail.from_name</div> + <a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a> + <div class="mail-conv-sender-name" >{{$mail.from_name}}</div> </div> <div class="mail-conv-detail" > - <div class="mail-conv-date">$mail.date</div> - <div class="mail-conv-subject">$mail.subject</div> - <div class="mail-conv-body">$mail.body</div> - <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div> + {{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}} + <div class="mail-conv-date">{{$mail.date}}</div> + <div class="mail-conv-subject">{{$mail.subject}}</div> + <div class="mail-conv-body">{{$mail.body}}</div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div> + {{if $mail.can_recall}} + <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div> + {{/if}} <div class="mail-conv-outside-wrapper-end"></div> </div> </div> diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 8fbc12929..523a9160a 100644..100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,10 +1,12 @@ +<h3>{{$prvmsg_header}}</h3> +<div class="generic-content-wrapper"> +{{foreach $mails as $mail}} + {{include file="mail_conv.tpl"}} +{{/foreach}} -{{ for $mails as $mail }} - {{ inc mail_conv.tpl }}{{endinc}} -{{ endfor }} - -{{ if $canreply }} -{{ inc prv_message.tpl }}{{ endinc }} -{{ else }} -$unknown_text -{{endif }}
\ No newline at end of file +{{if $canreply}} +{{include file="prv_message.tpl"}} +{{else}} +{{$unknown_text}} +{{/if}} +</div> diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl index afb65f537..1cd7145e7 100644..100755 --- a/view/tpl/mail_head.tpl +++ b/view/tpl/mail_head.tpl @@ -1,3 +1,3 @@ -<h3>$messages</h3> +<h3>{{$messages}}</h3> -$tab_content +{{$tab_content}} diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 4417d1863..e17a206a0 100644..100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,19 +1,8 @@ -<div class="mail-list-outside-wrapper"> - <div class="mail-list-sender" > - <a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="$from_photo" height="32" width="32" alt="$from_name" /></a> - <div class="mail-list-sender-name" >$from_name</div> - </div> - <div class="mail-list-recip" > - <a href="$to_url" class="mail-list-recip-url" ><img class="mail-list-recip-photo" src="$to_photo" height="32" width="32" alt="$to_name" /></a> - <div class="mail-list-recip-name" >$to_name</div> - </div> - <div class="mail-list-date">$date</div> - <div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div> - <div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" > - <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="icon drophide mail-list-delete delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> - </div> +<div class="generic-content-wrapper" id="mail-list-wrapper"> + <a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a> + <span class="mail-list">{{$from_name}}</span> + <span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$id}}" class="mail-link">{{$subject}}</a></span> + <span class="mail-list" title="{{$date}}">{{$date}}</span> + <span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span> + <div class="clear"> </div> </div> -</div> -<div class="mail-list-delete-end"></div> - -<div class="mail-list-outside-wrapper-end"></div> diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl index ea8b04cf3..fbc290df1 100644..100755 --- a/view/tpl/main_slider.tpl +++ b/view/tpl/main_slider.tpl @@ -1,17 +1,27 @@ -<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="$val" /></div> +<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div> <script> - $("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '|', '$intimate', '|', '$friends', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ], onstatechange: function(v) { - var carr = v.split(";"); - network_cmin = carr[0]; - network_cmax = carr[1]; - networkRefresh(); - } }); + var old_cmin = 0; + var old_cmax = 99; + $("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { + var carr = v.split(";"); + if(carr[0] != bParam_cmin) { + old_cmin = bParam_cmin; + bParam_cmin = carr[0]; + } + if(carr[1] != bParam_cmax) { + old_cmax = bParam_cmax; + bParam_cmax = carr[1]; + } + networkRefresh(); + } }); var slideTimer = null; function networkRefresh() { if((document.readyState !== "complete") || (slideTimer !== null)) return; - setTimeout(function() { $("#profile-jot-text-loading").show(); }, 1000 ); + if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax)) + return; + setTimeout(function() { $("#profile-jot-text-loading").spin('small'); }, 1000 ); slideTimer = setTimeout(networkTimerRefresh,2000); } diff --git a/view/tpl/match.tpl b/view/tpl/match.tpl index b052845ae..41587430b 100644..100755 --- a/view/tpl/match.tpl +++ b/view/tpl/match.tpl @@ -1,16 +1,16 @@ <div class="profile-match-wrapper"> <div class="profile-match-photo"> - <a href="$url"> - <img src="$photo" alt="$name" title="$name[$tags]" /> + <a href="{{$url}}"> + <img src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" /> </a> </div> <div class="profile-match-break"></div> <div class="profile-match-name"> - <a href="$url" title="$name[$tags]">$name</a> + <a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a> </div> <div class="profile-match-end"></div> - {{ if $connlnk }} - <div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div> - {{ endif }} + {{if $connlnk}} + <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}"><i class="icon-plus connect-icon"></i> {{$conntxt}}</a></div> + {{/if}} </div> diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl new file mode 100644 index 000000000..1ccfb3d68 --- /dev/null +++ b/view/tpl/menuedit.tpl @@ -0,0 +1,25 @@ + +<h2>{{$header}}</h2> + +{{if $menu_id}} +<a href="mitem/{{$menu_id}}" title="{{$hintedit}}">{{$editcontents}}</a> +{{/if}} + +<form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}" method="post" > + +{{if $menu_id}} +<input type="hidden" name="menu_id" value="{{$menu_id}}" /> +{{/if}} +{{if $menu_system}} +<input type="hidden" name="menu_system" value="{{$menu_system}}" /> +{{/if}} + + +{{include file="field_input.tpl" field=$menu_name}} +{{include file="field_input.tpl" field=$menu_desc}} +{{include file="field_checkbox.tpl" field=$menu_bookmark}} +<div class="menuedit-submit-wrapper" > +<input type="submit" name="submit" class="menuedit-submit" value="{{$submit}}" /> +</div> + +</form> diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl new file mode 100644 index 000000000..271bace82 --- /dev/null +++ b/view/tpl/menulist.tpl @@ -0,0 +1,16 @@ +<h1>{{$title}}</h1> + +<a href="menu/new" title="{{$hintnew}}">{{$hintnew}}</a> + +<br /> + +{{if $menus }} +<ul id="menulist"> +{{foreach $menus as $m }} +<li><a href="menu/{{$m.menu_id}}" title="{{$hintedit}}"><i class="icon-pencil design-icons design-edit-icon"></i></a> <a href="menu/{{$m.menu_id}}/drop" title={{$hintdrop}}><i class="icon-remove drop-icons design-icons design-remove-icon"></i></a> <a href="mitem/{{$m.menu_id}}/new" title="{{$hintcontent}}">{{$m.menu_name}}</a></li> +{{/foreach}} +</ul> +{{/if}} + + + diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl index fce771bd5..4db427fa7 100644..100755 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -1,10 +1,11 @@ <div id="message-sidebar" class="widget"> - <div id="message-new"><a href="$new.url" class="{{ if $new.sel }}newmessage-selected{{ endif }}">$new.label</a> </div> + <div id="message-check"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div> + <div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div> <ul class="message-ul"> - {{ for $tabs as $t }} - <li class="tool"><a href="$t.url" class="message-link{{ if $t.sel }}message-selected{{ endif }}">$t.label</a></li> - {{ endfor }} + {{foreach $tabs as $t}} + <li class="tool"><a href="{{$t.url}}" class="message-link{{if $t.sel}}message-selected{{/if}}">{{$t.label}}</a></li> + {{/foreach}} </ul> </div> diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl index 06df22d7b..23b7bd281 100644..100755 --- a/view/tpl/micropro_img.tpl +++ b/view/tpl/micropro_img.tpl @@ -1 +1 @@ -<div class="contact-block-div{{if $class}} $class{{endif}}"><a class="contact-block-link{{if $class}} $class{{endif}}{{if $click}} fakelink{{endif}}" href="{{if $click}}#{{else}}$url{{endif}}" {{if $click}}onclick="$click"{{endif}}><img class="contact-block-img{{if $class}} $class{{endif}}" src="$photo" title="$title" alt="$name" /></a></div> +<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="{{$name}}" /></a></div> diff --git a/view/tpl/micropro_txt.tpl b/view/tpl/micropro_txt.tpl index 6a6ef6392..295e7940d 100644..100755 --- a/view/tpl/micropro_txt.tpl +++ b/view/tpl/micropro_txt.tpl @@ -1 +1 @@ -<div class="contact-block-textdiv{{if $class}} $class{{endif}}"><a class="contact-block-link{{if $class}} $class{{endif}}{{if $click}} fakelink{{endif}}" href="{{if $click}}#{{else}}$url{{endif}}" {{if $click}}onclick="$click"{{endif}} title="$title">$name</a></div> +<div class="contact-block-textdiv{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}} title="{{$title}}">{{$name}}</a></div> diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl new file mode 100644 index 000000000..482005e44 --- /dev/null +++ b/view/tpl/mitemedit.tpl @@ -0,0 +1,32 @@ + +<h2>{{$header}}</h2> + +<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" > + +<input type="hidden" name="menu_id" value="{{$menu_id}}" /> + +{{if $mitem_id}} +<input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> +{{/if}} + +{{include file="field_input.tpl" field=$mitem_desc}} +{{include file="field_input.tpl" field=$mitem_link}} +{{include file="field_input.tpl" field=$mitem_order}} +{{include file="field_checkbox.tpl" field=$usezid}} +{{include file="field_checkbox.tpl" field=$newwin}} + +<div id="settings-default-perms" class="settings-default-perms" > + <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> + {{$aclselect}} + <div id="settings-default-perms-menu-end"></div> +</div> +<br/> +<div id="settings-default-perms-end"></div> + + + +<div class="mitemedit-submit-wrapper" > +<input type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" /> +</div> + +</form> diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl new file mode 100644 index 000000000..2c1ded6cc --- /dev/null +++ b/view/tpl/mitemlist.tpl @@ -0,0 +1,19 @@ +<h1>{{$title}}</h1> +<h2>{{$menudesc}} ({{$menuname}})</h2> + +<a href="menu/{{$menu_id}}" title="{{$hintmenu}}">{{$edmenu}}</a><br /> +<a href="mitem/{{$menu_id}}/new" title="{{$hintnew}}">{{$hintnew}}</a> + +<br /> +<br /> + +{{if $mlist }} +<ul id="mitemlist" class="menu-item-list"> +{{foreach $mlist as $m }} +<li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil mitem-edit btn btn-default"></i></a><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}><i class="icon-remove btn btn-default"></i></a> <a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li> +{{/foreach}} +</ul> +{{/if}} + + + diff --git a/view/tpl/moderated_comment.tpl b/view/tpl/moderated_comment.tpl deleted file mode 100644 index 911c35f33..000000000 --- a/view/tpl/moderated_comment.tpl +++ /dev/null @@ -1,34 +0,0 @@ - <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> - <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> - <input type="hidden" name="type" value="$type" /> - <input type="hidden" name="profile_uid" value="$profile_uid" /> - <input type="hidden" name="parent" value="$parent" /> - <input type="hidden" name="return" value="$return_path" /> - <input type="hidden" name="jsreload" value="$jsreload" /> - <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> - - <div class="comment-edit-photo" id="comment-edit-photo-$id" > - <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> - </div> - <div class="comment-edit-photo-end"></div> - <div id="mod-cmnt-wrap-$id" class="mod-cmnt-wrap" style="display:none"> - <div id="mod-cmnt-name-lbl-$id" class="mod-cmnt-name-lbl">$lbl_modname</div> - <input type="text" id="mod-cmnt-name-$id" class="mod-cmnt-name" name="mod-cmnt-name" value="$modname" /> - <div id="mod-cmnt-email-lbl-$id" class="mod-cmnt-email-lbl">$lbl_modemail</div> - <input type="text" id="mod-cmnt-email-$id" class="mod-cmnt-email" name="mod-cmnt-email" value="$modemail" /> - <div id="mod-cmnt-url-lbl-$id" class="mod-cmnt-url-lbl">$lbl_modurl</div> - <input type="text" id="mod-cmnt-url-$id" class="mod-cmnt-url" name="mod-cmnt-url" value="$modurl" /> - </div> - <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> - - <div class="comment-edit-text-end"></div> - <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > - <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> - <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div> - </div> - - <div class="comment-edit-end"></div> - </form> - - </div> diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl index 9349c56ae..63eaa2d8d 100644..100755 --- a/view/tpl/mood_content.tpl +++ b/view/tpl/mood_content.tpl @@ -1,20 +1,20 @@ -<h3>$title</h3> +<h3>{{$title}}</h3> -<div id="mood-desc">$desc</div> +<div id="mood-desc">{{$desc}}</div> <form action="mood" method="get"> <br /> <br /> -<input id="mood-parent" type="hidden" value="$parent" name="parent" /> +<input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" /> <select name="verb" id="mood-verb-select" > -{{ for $verbs as $v }} -<option value="$v.0">$v.1</option> -{{ endfor }} +{{foreach $verbs as $v}} +<option value="{{$v.0}}">{{$v.1}}</option> +{{/foreach}} </select> <br /> <br /> -<input type="submit" name="submit" value="$submit" /> +<input type="submit" name="submit" value="{{$submit}}" /> </form> diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 2d1ea7a61..b6cff7c74 100644..100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -1,8 +1,7 @@ - -<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> +<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> -var plaintext = '$editselect'; +var plaintext = '{{$editselect}}'; if(plaintext != 'none') { tinyMCE.init({ @@ -25,7 +24,7 @@ if(plaintext != 'none') { force_br_newlines : true, forced_root_block : '', convert_urls: false, - content_css: "$baseurl/view/custom_tinymce.css", + content_css: "{{$baseurl}}/view/custom_tinymce.css", //Character count theme_advanced_path : false, setup : function(ed) { @@ -46,17 +45,29 @@ else </script> -<script type="text/javascript" src="js/ajaxupload.js" ></script> +<script type="text/javascript" src="view/js/ajaxupload.js" ></script> <script> $(document).ready(function() { var uploader = new window.AjaxUpload( 'prvmail-upload', - { action: 'wall_upload/$nickname', + { action: 'wall_upload/{{$nickname}}', + name: 'userfile', + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onComplete: function(file,response) { + addeditortext(response); + $('#profile-rotator').spin(false); + } + } + ); + + var file_uploader = new window.AjaxUpload( + 'prvmail-attach', + { action: 'wall_attach/{{$nickname}}', name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').show(); }, + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onComplete: function(file,response) { - tinyMCE.execCommand('mceInsertRawHTML',false,response); - $('#profile-rotator').hide(); + addeditortext(response); + $('#profile-rotator').spin(false); } } ); @@ -64,16 +75,23 @@ else }); function jotGetLink() { - reply = prompt("$linkurl"); + reply = prompt("{{$linkurl}}"); if(reply && reply.length) { - $('#profile-rotator').show(); + $('#profile-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); + addeditortext(response); + $('#profile-rotator').spin(false); }); } } + function prvmailGetExpiry() { + reply = prompt("{{$expireswhen}}", $('#inp-prvmail-expires').val()); + if(reply && reply.length) { + $('#inp-prvmail-expires').val(reply); + } + } + function linkdropper(event) { var linkFound = event.dataTransfer.types.contains("text/uri-list"); if(linkFound) @@ -85,13 +103,24 @@ else event.target.textContent = reply; event.preventDefault(); if(reply && reply.length) { - $('#profile-rotator').show(); + $('#profile-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); + addeditortext(response); + $('#profile-rotator').spin(false); }); } } + function addeditortext(data) { + if(plaintext == 'none') { + var currentText = $("#prvmail-text").val(); + $("#prvmail-text").val(currentText + data); + } + else + tinyMCE.execCommand('mceInsertRawHTML',false,data); + } + + + </script> diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl new file mode 100755 index 000000000..1a591f9f8 --- /dev/null +++ b/view/tpl/myapps.tpl @@ -0,0 +1,9 @@ +<h3>{{$title}}</h3> + +{{foreach $apps as $ap}} +<div class="app-container"> +{{$ap}} +</div> +{{/foreach}} +<div class="clear"></div> + diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index f8f9e1c06..fa51526d2 100644..100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,126 +1,175 @@ -<header> - <div id="site-location">$sitelocation</div> - <div id="banner">$banner</div> -</header> -<nav> - <ul> - {{ if $nav.lock }} - <li id="nav-rmagic-link" class="nav-menu-icon" > - <a class="icon $nav.lock.2" href="$nav.lock.0" title="$nav.lock.3" >$nav.lock.1</a> - </li> - {{ endif }} - - - {{ if $nav.network }} - <li id="nav-network-link" class="nav-menu $sel.network"> - <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" ><span class="icon network">$nav.network.1</span></a> - <span id="net-update" class="nav-notify fakelink" onclick="notify_popup('network'); return false;" ></span> - </li> - {{ endif }} - - {{ if $nav.home }} - <li id="nav-home-link" class="nav-menu $sel.home"> - <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" ><span class="icon home">$nav.home.1</span></a> - <span id="home-update" class="nav-notify fakelink" onclick="notify_popup('home'); return false;" ></span> - </li> - {{ endif }} - - {{ if $nav.messages }} - <li id="nav-mail-link" class="nav-menu $sel.messages"> - <a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" ><span class="icon mail">$nav.messages.1</span></a> - <span id="mail-update" class="nav-notify fakelink" onclick="notify_popup('mail'); return false;" ></span> - </li> - {{ endif }} - - {{ if $nav.all_events }} - <li id="nav-all-events-link" class="nav-menu $sel.all_events"> - <a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" ><span class="icon events">$nav.all_events.1</span></a> - <span id="all-events-update" class="nav-notify fakelink" onclick="notify_popup('all_events'); return false;" ></span> - </li> - {{ endif }} - - {{ if $nav.intros }} - <li id="nav-intros-link" class="nav-menu $sel.intros"> - <a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" ><span class="icon introductions">$nav.intros.1</span></a> - <span id="intro-update" class="nav-notify"></span> - </li> - {{ endif }} + <div class="container-fluid"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <button id="expand-tabs" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#tabs-collapse-1"> + <i class="icon-circle-arrow-down" id="expand-tabs-icon"></i> + </button> + <button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1"> + <i class="icon-circle-arrow-right" id="expand-aside-icon"></i> + </button> + {{if $userinfo}} + <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span> + {{if $localuser}} + <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> + {{foreach $nav.usermenu as $usermenu}} + <li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem">{{$usermenu.1}}</a></li> + {{/foreach}} + <li role="presentation" class="divider"></li> + {{if $nav.profiles}}<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem">{{$nav.profiles.1}}</a></li>{{/if}} + {{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem">{{$nav.manage.1}}</a></li>{{/if}} + {{if $nav.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem">{{$nav.settings.1}}</a></li>{{/if}} + {{if $nav.admin}} + <li role="presentation" class="divider"></li> + <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem">{{$nav.admin.1}}</a></li> + {{/if}} + {{if $nav.logout}} + <li role="presentation" class="divider"></li> + <li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem">{{$nav.logout.1}}</a></li> + {{/if}} + </ul> + {{/if}} + {{/if}} + </div> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav navbar-left"> + {{if $nav.lock}} + <li> + <a title="{{$nav.lock.3}}" href="{{$nav.lock.0}}"><i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}}"></i></a> + </li> + {{/if}} + + {{if $nav.login}}<li class="{{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}} + + {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}} + + {{if $nav.network}} + <li class="{{$sel.network}} hidden-xs"> + <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a> + <span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span> + <ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network"> + {{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}} + <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.network}} visible-xs"> + <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a> + <span class="net-update badge" rel="#nav-network-menu"></span> + </li> + {{/if}} + + {{if $nav.home}} + <li class="{{$sel.home}} hidden-xs"> + <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a> + <span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span> + <ul id="nav-home-menu" class="dropdown-menu" rel="home"> + {{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}} + <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.home}} visible-xs"> + <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a> + <span class="home-update badge" rel="#nav-home-menu"></span> + </li> + {{/if}} + + {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} + + {{if $nav.messages}} + <li class="{{$sel.messages}} hidden-xs"> + <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a> + <span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span> + <ul id="nav-messages-menu" class="dropdown-menu" rel="messages"> + <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> + <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.messages}} visible-xs"> + <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a> + <span class="mail-update badge" rel="#nav-messages-menu"></span> + </li> + {{/if}} + + {{if $nav.all_events}} + <li class="{{$sel.all_events}} hidden-xs"> + <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a> + <span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span> + <ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> + <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> + <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.all_events}} visible-xs"> + <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a> + <span class="all_events-update badge" rel="#nav-all_events-menu"></span> + </li> + {{/if}} + + {{if $nav.intros}} + <li class="{{$sel.intros}} hidden-xs"> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a> + <span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span> + <ul id="nav-intros-menu" class="dropdown-menu" rel="intros"> + <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.intros}} visible-xs"> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a> + <span class="intro-update badge" rel="#nav-intros-menu"></span> + </li> + {{/if}} - - {{ if $nav.notifications }} - - <li id="nav-notifications-linkmenu" class="nav-menu fakelink" onclick="notify_popup('notify'); return false;" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a> - <span id="notify-update" class="nav-notify"></span> - <ul id="nav-notifications-menu" class="menu-popup"> - <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li> - <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li> - <li class="empty">$emptynotifications</li> + {{if $nav.notifications}} + <li class="{{$sel.notifications}} hidden-xs"> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a> + <span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span> + <ul id="nav-notify-menu" class="dropdown-menu" rel="notify"> + <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> + <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.notifications}} visible-xs"> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a> + <span class="notify-update badge" rel="#nav-notify-menu"></span> + </li> + {{/if}} </ul> - </li> - {{ endif }} - - {{ if $nav.settings }} - <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">$nav.settings.1</span></a> - <ul id="nav-site-menu" class="menu-popup"> - {{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }} - - {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }} - - </ul> - </li> - {{ endif }} - {{ if $userinfo }} - <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a> - {{ if $localuser }} - <ul id="nav-user-menu" class="menu-popup"> - {{ for $nav.usermenu as $usermenu }} - <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li> - {{ endfor }} - {{ if $nav.profiles }}<li><a class="$nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3">$nav.profiles.1</a></li>{{ endif }} - {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }} - - {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }} - {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }} - - </ul> - {{ endif }} - </li> - {{ endif }} - {{ if $nav.login }}<li id="nav-login-link" class="nav-menu $nav.login.2"><a href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }} - - {{ if $nav.help }} - <li id="nav-help-link" class="nav-menu $sel.help"> - <a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a> - </li> - {{ endif }} - - {{ if $nav.apps }} - <li id="nav-apps-link" class="nav-menu $sel.apps"> - <a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a> - <ul id="nav-apps-menu" class="menu-popup"> - {{ for $apps as $ap }} - <li>$ap</li> - {{ endfor }} - </ul> - </li> - {{ endif }} - - <li id="nav-searchbar"> - <form method="get" action="search"> - <input id="nav-search-text" type="text" value="" placeholder="$nav.search.1" name="search" title="$nav.search.3" onclick="this.submit();" /> - </form> - </li> - - - - - </ul> - - -</nav> -<ul id="nav-notifications-template" style="display:none;" rel="template"> - <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> -</ul> - -<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div> -<div id="panel" style="display: none;"></div> + <ul class="nav navbar-nav navbar-right"> + <li class="hidden-xs"> + <form method="get" action="search" role="search"> + <div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder="" name="search" title="{{$nav.search.3}}" onclick="this.submit();" /> + </form> + </li> + <li class="visible-xs"> + <a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a> + </li> + + {{if $nav.directory}} + <li class="{{$sel.directory}}"> + <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap"></i></a> + </li> + {{/if}} + + {{if $nav.apps}} + <li class="{{$sel.apps}}"> + <a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a> + </li> + {{/if}} + + {{if $nav.help}} + <li class="{{$sel.help}}"> + <a class="{{$nav.help.2}}" target="redmatrix-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a> + </li> + {{/if}} + </ul> + </div> + </div> diff --git a/view/tpl/netfriend.tpl b/view/tpl/netfriend.tpl index c2a92ce9e..ec6b3b6cc 100644..100755 --- a/view/tpl/netfriend.tpl +++ b/view/tpl/netfriend.tpl @@ -1,14 +1,14 @@ -<div class="intro-approve-as-friend-desc">$approve_as</div> +<div class="intro-approve-as-friend-desc">{{$approve_as}}</div> <div class="intro-approve-as-friend-wrapper"> - <label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">$as_friend</label> - <input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" /> + <label class="intro-approve-as-friend-label" for="intro-approve-as-friend-{{$intro_id}}">{{$as_friend}}</label> + <input type="radio" name="duplex" id="intro-approve-as-friend-{{$intro_id}}" class="intro-approve-as-friend" {{$friend_selected}} value="1" /> <div class="intro-approve-friend-break" ></div> </div> <div class="intro-approve-as-friend-end"></div> <div class="intro-approve-as-fan-wrapper"> - <label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">$as_fan</label> - <input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0" /> + <label class="intro-approve-as-fan-label" for="intro-approve-as-fan-{{$intro_id}}">{{$as_fan}}</label> + <input type="radio" name="duplex" id="intro-approve-as-fan-{{$intro_id}}" class="intro-approve-as-fan" {{$fan_selected}} value="0" /> <div class="intro-approve-fan-break"></div> </div> <div class="intro-approve-as-end"></div> diff --git a/view/tpl/nets.tpl b/view/tpl/nets.tpl deleted file mode 100644 index 920c2332b..000000000 --- a/view/tpl/nets.tpl +++ /dev/null @@ -1,10 +0,0 @@ -<div id="nets-sidebar" class="widget"> - <h3>$title</h3> - <div id="nets-desc">$desc</div> - <a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a> - <ul class="nets-ul"> - {{ for $nets as $net }} - <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> - {{ endfor }} - </ul> -</div> diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index f83bc3a11..261f965da 100644..100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -1,29 +1,29 @@ -<h2>$title</h2> +<h2>{{$title}}</h2> <form action="new_channel" method="post" id="newchannel-form"> - <div id="newchannel-desc" class="descriptive-paragraph">$desc</div> + <div id="newchannel-desc" class="descriptive-paragraph">{{$desc}}</div> - <label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >$label_name</label> - <input type="text" name="name" id="newchannel-name" class="newchannel-input" value="$name" /> + <label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >{{$label_name}}</label> + <input type="text" name="name" id="newchannel-name" class="newchannel-input" value="{{$name}}" /> <div id="newchannel-name-feedback" class="newchannel-feedback"></div> <div id="newchannel-name-end" class="newchannel-field-end"></div> - <div id="newchannel-name-help" class="descriptive-paragraph">$help_name</div> + <div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div> - <label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >$label_nick</label> - <input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="$nickname" /> + <label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label> + <input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" /> <div id="newchannel-nickname-feedback" class="newchannel-feedback"></div> <div id="newchannel-nickname-end" class="newchannel-field-end"></div> - <div id="newchannel-nick-desc" class="descriptive-paragraph">$nick_desc</div> + <div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div> - <input type="checkbox" name="import" id="newchannel-import" value="1" /> - <label for="newchannel-import" id="label-newchannel-import">$label_import</label> + <div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div> + <div id="newchannel-import-end" class="newchannel-field-end"></div> - <input type="submit" name="submit" id="newchannel-submit-button" value="$submit" /> + <input type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" /> <div id="newchannel-submit-end" class="newchannel-field-end"></div> </form> diff --git a/view/tpl/nogroup-template.tpl b/view/tpl/nogroup-template.tpl index dd00ed097..15094b2d6 100644..100755 --- a/view/tpl/nogroup-template.tpl +++ b/view/tpl/nogroup-template.tpl @@ -1,11 +1,11 @@ -<h1>$header</h1> +<h1>{{$header}}</h1> -{{ for $contacts as $contact }} - {{ inc contact_template.tpl }}{{ endinc }} -{{ endfor }} +{{foreach $contacts as $contact}} + {{include file="contact_template.tpl"}} +{{/foreach}} <div id="contact-edit-end"></div> -$paginate +{{$paginate}} diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl new file mode 100644 index 000000000..0e8c8017c --- /dev/null +++ b/view/tpl/notes.tpl @@ -0,0 +1,27 @@ +<div class="widget"> +<script> +var noteSaveTimer = null; +$(document).on('focusout',"#note-text",function(e){ + if(noteSaveTimer) + clearTimeout(noteSaveTimer); + notePostFinal(); + noteSaveTimer = null; +}); + +$(document).on('focusin',"#note-text",function(e){ + noteSaveTimer = setTimeout(noteSaveChanges,10000); +}); + +function notePostFinal() { + $.post('notes/sync', { 'note_text' : $('#note-text').val() }); +} + +function noteSaveChanges() { + $.post('notes', { 'note_text' : $('#note-text').val() }); + noteSaveTimer = setTimeout(noteSaveChanges,10000); +} +</script> + +<h3>{{$banner}}</h3> +<textarea name="note_text" id="note-text">{{$text}}</textarea> +</div> diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl index 1a13b68b9..ae87c8ec8 100644..100755 --- a/view/tpl/notifications.tpl +++ b/view/tpl/notifications.tpl @@ -1,8 +1,7 @@ - -<h1>$notif_header</h1> - -{{ inc common_tabs.tpl }}{{ endinc }} - +<h1>{{$notif_header}}</h1> +{{if $notifications_available}} +<a href="#" onclick="markRead('notify');">{{$notif_link_mark_seen}}</a> +{{/if}} <div class="notif-network-wrapper"> - $notif_content + {{$notif_content}} </div> diff --git a/view/tpl/notifications_comments_item.tpl b/view/tpl/notifications_comments_item.tpl index 73cc9f948..856955424 100644..100755 --- a/view/tpl/notifications_comments_item.tpl +++ b/view/tpl/notifications_comments_item.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a> -</div>
\ No newline at end of file + <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> +</div> diff --git a/view/tpl/notifications_dislikes_item.tpl b/view/tpl/notifications_dislikes_item.tpl index 73cc9f948..856955424 100644..100755 --- a/view/tpl/notifications_dislikes_item.tpl +++ b/view/tpl/notifications_dislikes_item.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a> -</div>
\ No newline at end of file + <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> +</div> diff --git a/view/tpl/notifications_friends_item.tpl b/view/tpl/notifications_friends_item.tpl index 73cc9f948..856955424 100644..100755 --- a/view/tpl/notifications_friends_item.tpl +++ b/view/tpl/notifications_friends_item.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a> -</div>
\ No newline at end of file + <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> +</div> diff --git a/view/tpl/notifications_likes_item.tpl b/view/tpl/notifications_likes_item.tpl index 389144d9b..b2ba4024b 100644..100755 --- a/view/tpl/notifications_likes_item.tpl +++ b/view/tpl/notifications_likes_item.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="$item_link" target="friendica-notification"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a> -</div>
\ No newline at end of file + <a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> +</div> diff --git a/view/tpl/notifications_network_item.tpl b/view/tpl/notifications_network_item.tpl deleted file mode 100644 index bd86548fc..000000000 --- a/view/tpl/notifications_network_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<div class="notif-item"> - <a href="{$item_link}" target="friendica-notifications"><img src="{$item_image}" class="notif-image">{$item_text} <span class="notif-when">{$item_when}</span></a> -</div>
\ No newline at end of file diff --git a/view/tpl/notifications_posts_item.tpl b/view/tpl/notifications_posts_item.tpl index 73cc9f948..856955424 100644..100755 --- a/view/tpl/notifications_posts_item.tpl +++ b/view/tpl/notifications_posts_item.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a> -</div>
\ No newline at end of file + <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> +</div> diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl index 73cc9f948..856955424 100644..100755 --- a/view/tpl/notify.tpl +++ b/view/tpl/notify.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a> -</div>
\ No newline at end of file + <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> +</div> diff --git a/view/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl index 31f02ac50..2b7afa80e 100644..100755 --- a/view/tpl/oauth_authorize.tpl +++ b/view/tpl/oauth_authorize.tpl @@ -1,10 +1,10 @@ -<h1>$title</h1> +<h1>{{$title}}</h1> <div class='oauthapp'> - <img src='$app.icon'> - <h4>$app.name</h4> + <img src='{{$app.icon}}'> + <h4>{{$app.name}}</h4> </div> -<h3>$authorize</h3> +<h3>{{$authorize}}</h3> <form method="POST"> -<div class="settings-submit-wrapper"><input class="settings-submit" type="submit" name="oauth_yes" value="$yes" /></div> +<div class="settings-submit-wrapper"><input class="settings-submit" type="submit" name="oauth_yes" value="{{$yes}}" /></div> </form> diff --git a/view/tpl/oauth_authorize_done.tpl b/view/tpl/oauth_authorize_done.tpl index 51eaea248..2e91e0125 100644..100755 --- a/view/tpl/oauth_authorize_done.tpl +++ b/view/tpl/oauth_authorize_done.tpl @@ -1,4 +1,4 @@ -<h1>$title</h1> +<h1>{{$title}}</h1> -<p>$info</p> -<code>$code</code> +<p>{{$info}}</p> +<code>{{$code}}</code> diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl index d3a9a9311..b0cfed2e5 100755 --- a/view/tpl/oembed_video.tpl +++ b/view/tpl/oembed_video.tpl @@ -1,4 +1,4 @@ -<a href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'> - <img width='$tw' height='$th' src='$turl' > - <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url($baseurl/images/icons/48/play.png) no-repeat center center;'></div> +<a href="{{$embedurl}}" onclick="this.innerHTML=Base64.decode('{{$escapedhtml}}'); return false;" style="float:left; margin: 1em; position: relative;"> + <img width="{{$tw}}" height="{{$th}}" src="{{$turl}}" /> + <div style="position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;"></div> </a> diff --git a/view/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl index c7e6df498..74ef22874 100644..100755 --- a/view/tpl/oexchange_xrd.tpl +++ b/view/tpl/oexchange_xrd.tpl @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> - <Subject>$base</Subject> + <Subject>{{$base}}</Subject> <Property type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendika</Property> @@ -14,19 +14,19 @@ <Link rel="icon" - href="$base/images/friendika-16.png" + href="{{$base}}/images/friendika-16.png" type="image/png" /> <Link rel="icon32" - href="$base/images/friendika-32.png" + href="{{$base}}/images/friendika-32.png" type="image/png" /> <Link rel= "http://www.oexchange.org/spec/0.8/rel/offer" - href="$base/oexchange" + href="{{$base}}/oexchange" type="text/html" /> </XRD> diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl index 374fcaac9..ea260c6ae 100644..100755 --- a/view/tpl/opensearch.tpl +++ b/view/tpl/opensearch.tpl @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>Friendika@$nodename</ShortName> - <Description>Search in Friendika@$nodename</Description> - <Contact>http://bugs.friendika.com/</Contact> - <Image height="16" width="16" type="image/png">$baseurl/images/friendika-16.png</Image> - <Image height="64" width="64" type="image/png">$baseurl/images/friendika-64.png</Image> + <ShortName>Red Matrix@{{$nodename}}</ShortName> + <Description>Search in The Red Matrix@{{$nodename}}</Description> + <Contact>http://github.com/friendica/red/</Contact> + <Image height="16" width="16" type="image/png">{{$baseurl}}/images/rm-16.png</Image> + <Image height="64" width="64" type="image/png">{{$baseurl}}/images/rm-64.png</Image> <Url type="text/html" - template="$baseurl/search?search={searchTerms}"/> + template="{{$baseurl}}/search?search={searchTerms}"/> <Url type="application/opensearchdescription+xml" rel="self" - template="$baseurl/opensearch" /> -</OpenSearchDescription>
\ No newline at end of file + template="{{$baseurl}}/opensearch" /> +</OpenSearchDescription> diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl new file mode 100755 index 000000000..d8175bdd2 --- /dev/null +++ b/view/tpl/page_display.tpl @@ -0,0 +1,9 @@ +<div class="page"> + +<div class="generic-content-wrapper" id="page-content-wrapper" > + <h3 class="page-title">{{$title}}</h3> + <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> + <div class="page-date">{{$date}}</div> + <div class="page-body">{{$body}}</div> +</div> +</div> diff --git a/view/tpl/pagetypes.tpl b/view/tpl/pagetypes.tpl deleted file mode 100644 index c9022a1c1..000000000 --- a/view/tpl/pagetypes.tpl +++ /dev/null @@ -1,5 +0,0 @@ - {{inc field_radio.tpl with $field=$page_normal }}{{endinc}} - {{inc field_radio.tpl with $field=$page_community }}{{endinc}} - {{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}} - {{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}} - {{inc field_radio.tpl with $field=$page_freelove }}{{endinc}} diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl new file mode 100644 index 000000000..ef8ff8dce --- /dev/null +++ b/view/tpl/pdledit.tpl @@ -0,0 +1,21 @@ +<h1>{{$header}}</h1> + +<h2>{{$mname}} {{$module}}</h2> + +<br /> +<a href="help/Comanche" target="redmatrix-help">{{$help}}</a> +<br /> +<br /> + + + +<form action="pdledit" method="post" > +<input type="hidden" name="module" value="{{$module}}" /> +<textarea rows="24" cols="80" name="content">{{$content}}</textarea> + +<br /> +<input type="submit" name="submit" value="{{$submit}}" /> + +</form> + + diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 3c2692d25..55bf1575f 100644..100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,14 +1,22 @@ <div id="peoplefind-sidebar" class="widget"> - <h3>$findpeople</h3> - <div id="peoplefind-desc">$desc</div> - <form action="dirfind" method="post" /> - <input id="side-peoplefind-url" type="text" name="search" size="24" title="$hint" /><input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" /> + <h3>{{$findpeople}}</h3> + <div class="descriptive-text">{{$desc}}</div> + <form action="directory" method="post" /> + <input class="icon-search" id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" placeholder=""/> + <input id="side-peoplefind-submit" class="btn btn-default" type="submit" name="submit" value="{{$findthem}}" /> + <br /> + {{if $advanced_search}} + <a href="#" onclick="openClose('advanced-people-search-div'); return false;">{{$advanced_search}}</a> + <div id="advanced-people-search-div" style="display: none;"> + <input class="icon-search" id="side-advanced-peoplefind-url" type="text" name="query" size="24" title="{{$advanced_hint}}" placeholder=""/> + <input id="side-advanced-peoplefind-submit" class="btn btn-default" type="submit" name="submit" value="{{$find_advanced}}" /> + </div> + <br /> + {{/if}} </form> - <div class="side-link" id="side-match-link"><a href="match" >$similar</a></div> - <div class="side-link" id="side-suggest-link"><a href="suggest" >$suggest</a></div> - <div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >$random</a></div> - {{ if $inv }} - <div class="side-link" id="side-invite-link" ><a href="invite" >$inv</a></div> - {{ endif }} + {{if $similar}}<a href="match" >{{$similar}}</a><br />{{/if}} + {{if $loggedin}}<a href="suggest" >{{$suggest}}</a><br />{{/if}} + <a href="randprof" >{{$random}}</a><br /> + {{if $loggedin}}{{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}}{{/if}} </div> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index cc3dcfb9c..a63bff78c 100644..100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,7 +1,7 @@ -<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id"> - <a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle"> - <img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize$twist" id="photo-album-photo-$id" /> - <p class='caption'>$desc</p> +<div class="photo-album-image-wrapper{{$twist}}" id="photo-album-image-wrapper-{{$id}}"> + <a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}"> + <img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize" id="photo-album-photo-{{$id}}" /> + <p class='caption'>{{$desc}}</p> </a> </div> <div class="photo-album-image-wrapper-end"></div> diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl new file mode 100755 index 000000000..7ff4a8cc0 --- /dev/null +++ b/view/tpl/photo_albums.tpl @@ -0,0 +1,15 @@ +<div id="side-bar-photos-albums" class="widget"> +<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3> +{{if $albums}} +<ul> +{{foreach $albums as $al}} +{{if $al.text}} +<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a> ({{$al.total}})</li> +{{/if}} +{{/foreach}} +</ul> +{{/if}} +{{if $upload}} +<div id="photo-albums-upload-link"><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></div> +{{/if}} +</div> diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl index b4ea62b45..cb7ae17ba 100644..100755 --- a/view/tpl/photo_drop.tpl +++ b/view/tpl/photo_drop.tpl @@ -1,4 +1,4 @@ -<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > - <a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> +<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" > + <a href="item/drop/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></a> </div> <div class="wall-item-delete-end"></div> diff --git a/view/tpl/photo_edit.tpl b/view/tpl/photo_edit.tpl deleted file mode 100644 index 53b69caae..000000000 --- a/view/tpl/photo_edit.tpl +++ /dev/null @@ -1,50 +0,0 @@ - -<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" > - - <input type="hidden" name="item_id" value="$item_id" /> - - <label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label> - <input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" /> - - <div id="photo-edit-albumname-end"></div> - - <label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label> - <input id="photo-edit-caption" type="text" size="84" name="desc" value="$caption" /> - - <div id="photo-edit-caption-end"></div> - - <label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label> - <input name="newtag" id="photo-edit-newtag" size="84" title="$help_tags" type="text" /> - - <div id="photo-edit-tags-end"></div> - <div id="photo-edit-rotate-wrapper"> - <div id="photo-edit-rotate-label"> - $rotatecw<br> - $rotateccw - </div> - <input type="radio" name="rotate" value="1" /><br> - <input type="radio" name="rotate" value="2" /> - </div> - <div id="photo-edit-rotate-end"></div> - - <div id="photo-edit-perms" class="photo-edit-perms" > - <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="$permissions"/> - <span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions - </a> - <div id="photo-edit-perms-menu-end"></div> - - <div style="display: none;"> - <div id="photo-edit-perms-select" > - $aclselect - </div> - </div> - </div> - <div id="photo-edit-perms-end"></div> - - <input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" /> - <input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; /> - - <div id="photo-edit-end"></div> -</form> - - diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl index 22884e848..e7d25fd55 100644..100755 --- a/view/tpl/photo_item.tpl +++ b/view/tpl/photo_item.tpl @@ -1,22 +1,22 @@ -<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" > - <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" > - <a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id"> - <img src="$thumb" class="wall-item-photo" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a> +<div class="wall-item-outside-wrapper{{$indent}}" id="wall-item-outside-wrapper-{{$id}}" > + <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" > + <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}"> + <img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a> </div> - <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > - <a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a> - <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> + <div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" > + <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a> + <div class="wall-item-ago" id="wall-item-ago-{{$id}}">{{$ago}}</div> </div> - <div class="wall-item-content" id="wall-item-content-$id" > - <div class="wall-item-title" id="wall-item-title-$id">$title</div> - <div class="wall-item-body" id="wall-item-body-$id" >$body</div> + <div class="wall-item-content" id="wall-item-content-{{$id}}" > + <div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div> + <div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div> </div> - $drop + {{$drop}} <div class="wall-item-wrapper-end"></div> <div class="wall-item-comment-separator"></div> - $comment + {{$comment}} -<div class="wall-item-outside-wrapper-end$indent" ></div> +<div class="wall-item-outside-wrapper-end{{$indent}}" ></div> </div> diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl index 155cab51d..944928f85 100644..100755 --- a/view/tpl/photo_top.tpl +++ b/view/tpl/photo_top.tpl @@ -1,8 +1,7 @@ - -<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$photo.id"> - <a href="$photo.link" class="photo-top-photo-link" id="photo-top-photo-link-$photo.id" title="$photo.title"> - <img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-photo$photo.twist" id="photo-top-photo-$photo.id" /> +<div class="photo-top-image-wrapper lframe {{$photo.twist}}" id="photo-top-image-wrapper-{{$photo.id}}"> + <a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> + <img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo" id="photo-top-photo-{{$photo.id}}" /> </a> - <div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div> + <div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div> </div> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 732caf690..0c16eb362 100644..100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,37 +1,91 @@ -<div id="live-display"></div> -<h3><a href="$album.0">$album.1</a></h3> +<div id="live-photos"></div> +<h3><a href="{{$album.0}}">{{$album.1}}</a></h3> <div id="photo-edit-link-wrap"> -{{ if $tools }} -<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a> -| -<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a> -{{ endif }} -{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }} +{{if $tools}} +<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a> +{{/if}} +{{if $lock}} | <i class="lockview icon-lock" title="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');"></i> {{/if}} </div> -{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }} -<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div> -{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }} +{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}} +<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="max-width: 100%;" src="{{$photo.src}}"></a></div> +{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}} <div id="photo-photo-end"></div> -<div id="photo-caption">$desc</div> -{{ if $tags }} -<div id="in-this-photo-text">$tags.0</div> -<div id="in-this-photo">$tags.1</div> -{{ endif }} -{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }} +<div id="photo-caption">{{$desc}}</div> +{{if $tags}} +<div id="in-this-photo-text">{{$tag_hdr}}</div> +{{foreach $tags as $t}} +<div id="in-this-photo">{{$t.0}}</div> +{{if $edit}}<div id="tag-remove"><a href="{{$t.1}}">{{$t.2}}</a></div>{{/if}} +{{/foreach}} +{{/if}} -{{ if $edit }}$edit{{ endif }} +{{if $edit}} +<div id="photo-edit-edit-wrapper" class="fakelink" onclick="openClose('photo-edit-edit');">{{$edit.edit}}</div> +<div id="photo-edit-edit" style="display: none;"> +<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form"> -{{ if $likebuttons }} + <input type="hidden" name="item_id" value="{{$edit.item_id}}"> + + <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label> + <input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" list="dl-albums"> +{{if $edit.albums}} + <datalist id="dl-albums"> + {{foreach $edit.albums as $al}} + {{if $al.text}} + <option value="{{$al.text}}"> + {{/if}} + {{/foreach}} + </datalist> +{{/if}} + <div id="photo-edit-albumname-end"></div> + + <label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label> + <input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$edit.caption}}"> + + <div id="photo-edit-caption-end"></div> + + <label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$edit.tag_label}}</label> + <input name="newtag" id="photo-edit-newtag" size="84" title="{{$edit.help_tags}}" type="text"> + + <div id="photo-edit-tags-end"></div> + <div id="photo-edit-rotate-wrapper"> + <div id="photo-edit-rotate-label"> + {{$edit.rotatecw}}<br> + {{$edit.rotateccw}} + </div> + <input type="radio" name="rotate" value="1"><br> + <input type="radio" name="rotate" value="2"> + </div> + <div id="photo-edit-rotate-end"></div> + + <div id="settings-default-perms" class="settings-default-perms"> + <span id="jot-perms-icon" class="{{$edit.lockstate}}"></span> + <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$edit.permissions}}</button> + {{$edit.aclselect}} + <div id="settings-default-perms-menu-end"></div> + </div> + <br/> + <div id="settings-default-perms-end"></div> + + <input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}"> + <input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();"> + + <div id="photo-edit-end"></div> +</form> +</div> +{{/if}} + +{{if $likebuttons}} <div id="photo-like-div"> - $likebuttons - $like - $dislike + {{$likebuttons}} + {{$like}} + {{$dislike}} </div> -{{ endif }} +{{/if}} -$comments +{{$comments}} -$paginate +{{$paginate}} diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 1df78cb7b..43a22a017 100644..100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,11 +1,11 @@ -<h3>$title</h3> -{{ if $can_post }} -<a id="photo-top-upload-link" href="$upload.1">$upload.0</a> -{{ endif }} +<h3>{{$title}}</h3> +{{if $can_post}} +<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a> +{{/if}} <div class="photos"> -{{ for $photos as $photo }} - {{ inc photo_top.tpl }}{{ endinc }} -{{ endfor }} +{{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} +{{/foreach}} </div> <div class="photos-end"></div> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 93c0b7d54..62591c648 100644..100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,45 +1,40 @@ -<h3>$pagename</h3> +<h3>{{$pagename}}</h3> -<div id="photos-usage-message">$usage</div> +<div id="photos-usage-message" class="usage-message">{{$usage}}</div> -<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" > +<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" > + <input type="hidden" id="photos-upload-source" name="source" value="photos" /> <div id="photos-upload-new-wrapper" > <div id="photos-upload-newalbum-div"> - <label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label> + <label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label> </div> <input id="photos-upload-newalbum" type="text" name="newalbum" /> </div> <div id="photos-upload-new-end"></div> <div id="photos-upload-exist-wrapper"> - <div id="photos-upload-existing-album-text">$existalbumtext</div> - $albumselect + <div id="photos-upload-existing-album-text">{{$existalbumtext}}</div> + {{$albumselect}} </div> <div id="photos-upload-exist-end"></div> <div id="photos-upload-noshare-div" class="photos-upload-noshare-div" > <input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /> - <label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label> + <label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label> </div> <div id="photos-upload-perms" class="photos-upload-perms" > - <a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" /> - <span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions - </a> + <span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span> + <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> </div> + {{$aclselect}} <div id="photos-upload-perms-end"></div> - <div style="display: none;"> - <div id="photos-upload-permissions-wrapper"> - $aclselect - </div> - </div> - <div id="photos-upload-spacer"></div> - $uploader + {{$uploader}} - $default + {{$default}} <div class="photos-upload-end" ></div> </form> diff --git a/view/tpl/poco_entry_xml.tpl b/view/tpl/poco_entry_xml.tpl index 4d84cee41..869894852 100644..100755 --- a/view/tpl/poco_entry_xml.tpl +++ b/view/tpl/poco_entry_xml.tpl @@ -1,7 +1,7 @@ <entry> -{{ if $entry.id }}<id>$entry.id</id>{{ endif }} -{{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }} -{{ if $entry.preferredUsername }}<preferredUsername>$entry.preferredUsername</preferredUsername>{{ endif }} -{{ if $entry.urls }}{{ for $entry.urls as $url }}<urls><value>$url.value</value><type>$url.type</type></urls>{{ endfor }}{{ endif }} -{{ if $entry.photos }}{{ for $entry.photos as $photo }}<photos><value>$photo.value</value><type>$photo.type</type></photos>{{ endfor }}{{ endif }} +{{if $entry.id}}<id>{{$entry.id}}</id>{{/if}} +{{if $entry.displayName}}<displayName>{{$entry.displayName}}</displayName>{{/if}} +{{if $entry.preferredUsername}}<preferredUsername>{{$entry.preferredUsername}}</preferredUsername>{{/if}} +{{if $entry.urls}}{{foreach $entry.urls as $url}}<urls><value>{{$url.value}}</value><type>{{$url.type}}</type></urls>{{/foreach}}{{/if}} +{{if $entry.photos}}{{foreach $entry.photos as $photo}}<photos><value>{{$photo.value}}</value><type>{{$photo.type}}</type></photos>{{/foreach}}{{/if}} </entry> diff --git a/view/tpl/poco_xml.tpl b/view/tpl/poco_xml.tpl index 9549b695d..0e38a692c 100644..100755 --- a/view/tpl/poco_xml.tpl +++ b/view/tpl/poco_xml.tpl @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <response> -{{ if $response.sorted }}<sorted>$response.sorted</sorted>{{ endif }} -{{ if $response.filtered }}<filtered>$response.filtered</filtered>{{ endif }} -{{ if $response.updatedSince }}<updatedSince>$response.updatedSince</updatedSince>{{ endif }} -<startIndex>$response.startIndex</startIndex> -<itemsPerPage>$response.itemsPerPage</itemsPerPage> -<totalResults>$response.totalResults</totalResults> +{{if $response.sorted}}<sorted>{{$response.sorted}}</sorted>{{/if}} +{{if $response.filtered}}<filtered>{{$response.filtered}}</filtered>{{/if}} +{{if $response.updatedSince}}<updatedSince>{{$response.updatedSince}}</updatedSince>{{/if}} +<startIndex>{{$response.startIndex}}</startIndex> +<itemsPerPage>{{$response.itemsPerPage}}</itemsPerPage> +<totalResults>{{$response.totalResults}}</totalResults> -{{ if $response.totalResults }} -{{ for $response.entry as $entry }} -{{ inc poco_entry_xml.tpl }}{{ endinc }} -{{ endfor }} -{{ else }} +{{if $response.totalResults}} +{{foreach $response.entry as $entry}} +{{include file="poco_entry_xml.tpl"}} +{{/foreach}} +{{else}} <entry></entry> -{{ endif }} +{{/if}} </response> diff --git a/view/tpl/poke_content.tpl b/view/tpl/poke_content.tpl index b9e089f5b..22a0b291f 100644..100755 --- a/view/tpl/poke_content.tpl +++ b/view/tpl/poke_content.tpl @@ -1,32 +1,32 @@ -<h3>$title</h3> +<h3>{{$title}}</h3> -<div id="poke-desc">$desc</div> +<div id="poke-desc">{{$desc}}</div> <form action="poke" method="get"> <br /> <br /> -<div id="poke-recip-label">$clabel</div> +<div id="poke-recip-label">{{$clabel}}</div> <br /> -<input id="poke-recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off" /> -<input id="poke-recip-complete" type="hidden" value="$id" name="cid" /> -<input id="poke-parent" type="hidden" value="$parent" name="parent" /> +<input id="poke-recip" type="text" size="64" maxlength="255" value="{{$name}}" name="pokename" autocomplete="off" /> +<input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" /> +<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" /> <br /> <br /> -<div id="poke-action-label">$choice</div> +<div id="poke-action-label">{{$choice}}</div> <br /> <br /> <select name="verb" id="poke-verb-select" > -{{ for $verbs as $v }} -<option value="$v.0">$v.1</option> -{{ endfor }} +{{foreach $verbs as $v}} +<option value="{{$v.0}}">{{$v.1}}</option> +{{/foreach}} </select> <br /> <br /> -<div id="poke-private-desc">$prv_desc</div> -<input type="checkbox" name="private" {{ if $parent }}disabled="disabled"{{ endif }} value="1" /> +<div id="poke-private-desc">{{$prv_desc}}</div> +<input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" /> <br /> <br /> -<input type="submit" name="submit" value="$submit" /> +<input type="submit" name="submit" value="{{$submit}}" /> </form> diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl index 3e2ee5a3e..0867ab392 100644..100755 --- a/view/tpl/posted_date_widget.tpl +++ b/view/tpl/posted_date_widget.tpl @@ -1,9 +1,16 @@ <div id="datebrowse-sidebar" class="widget"> - <h3>$title</h3> + <h3>{{$title}}</h3> <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script> -<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="$size"> -{{ for $dates as $d }} -<option value="$url/$d.1/$d.2" >$d.0</option> -{{ endfor }} -</select> +<ul id="posted-date-selector"> +{{foreach $dates as $y => $arr}} +<li id="posted-date-selector-year-{{$y}}" class="fakelink" onclick="openClose('posted-date-selector-{{$y}}');">{{$y}}</li> +<div id="posted-date-selector-{{$y}}" style="display: none;"> +<ul class="posted-date-selector-months"> +{{foreach $arr as $d}} +<li class="posted-date-li"><a href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}&dbegin={{$d.2}}'); return false;">{{$d.0}}</a></li> +{{/foreach}} +</ul> +</div> +{{/foreach}} +</ul> </div> diff --git a/view/tpl/profed_head.tpl b/view/tpl/profed_head.tpl index 2477654b3..103960a76 100644..100755 --- a/view/tpl/profed_head.tpl +++ b/view/tpl/profed_head.tpl @@ -1,11 +1,11 @@ <script language="javascript" type="text/javascript" - src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> + src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> tinyMCE.init({ theme : "advanced", - mode : "$editselect", + mode : "{{$editselect}}", plugins : "bbcode,paste", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", @@ -21,7 +21,7 @@ tinyMCE.init({ force_p_newlines : false, force_br_newlines : true, forced_root_block : '', - content_css: "$baseurl/view/custom_tinymce.css", + content_css: "{{$baseurl}}/view/custom_tinymce.css", theme_advanced_path : false, setup : function(ed) { ed.onInit.add(function(ed) { diff --git a/view/tpl/profile-hide-friends.tpl b/view/tpl/profile-hide-friends.tpl deleted file mode 100644 index 9ecacfbe0..000000000 --- a/view/tpl/profile-hide-friends.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="hide-friends-text"> -$desc -</p> - - <div id="hide-friends-yes-wrapper"> - <label id="hide-friends-yes-label" for="hide-friends-yes">$yes_str</label> - <input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" /> - - <div id="hide-friends-break" ></div> - </div> - <div id="hide-friends-no-wrapper"> - <label id="hide-friends-no-label" for="hide-friends-no">$no_str</label> - <input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0" /> - - <div id="hide-friends-end"></div> - </div> diff --git a/view/tpl/profile-hide-wall.tpl b/view/tpl/profile-hide-wall.tpl deleted file mode 100644 index 10185e243..000000000 --- a/view/tpl/profile-hide-wall.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="hide-wall-text"> -$desc -</p> - - <div id="hide-wall-yes-wrapper"> - <label id="hide-wall-yes-label" for="hide-wall-yes">$yes_str</label> - <input type="radio" name="hidewall" id="hide-wall-yes" $yes_selected value="1" /> - - <div id="hide-wall-break" ></div> - </div> - <div id="hide-wall-no-wrapper"> - <label id="hide-wall-no-label" for="hide-wall-no">$no_str</label> - <input type="radio" name="hidewall" id="hide-wall-no" $no_selected value="0" /> - - <div id="hide-wall-end"></div> - </div> diff --git a/view/tpl/profile-in-directory.tpl b/view/tpl/profile-in-directory.tpl deleted file mode 100644 index 56b28d37e..000000000 --- a/view/tpl/profile-in-directory.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="profile-in-directory"> -$desc -</p> - - <div id="profile-in-dir-yes-wrapper"> - <label id="profile-in-dir-yes-label" for="profile-in-dir-yes">$yes_str</label> - <input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" /> - - <div id="profile-in-dir-break" ></div> - </div> - <div id="profile-in-dir-no-wrapper"> - <label id="profile-in-dir-no-label" for="profile-in-dir-no">$no_str</label> - <input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0" /> - - <div id="profile-in-dir-end"></div> - </div> diff --git a/view/tpl/profile-in-netdir.tpl b/view/tpl/profile-in-netdir.tpl deleted file mode 100644 index 882ad2d17..000000000 --- a/view/tpl/profile-in-netdir.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="profile-in-directory"> -$desc -</p> - - <div id="profile-in-netdir-yes-wrapper"> - <label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">$yes_str</label> - <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" /> - - <div id="profile-in-netdir-break" ></div> - </div> - <div id="profile-in-netdir-no-wrapper"> - <label id="profile-in-netdir-no-label" for="profile-in-netdir-no">$no_str</label> - <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0" /> - - <div id="profile-in-netdir-end"></div> - </div> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 0bc4d3fd3..73033fe40 100644..100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -1,170 +1,223 @@ -<h2>$title</h2> +<div id="profile-content-wrapper" class="generic-content-wrapper"> +<h2>{{$title}}</h2> + +{{if $profile.canlike || $profile.like_count}} +<div id="profile-like-wrapper"> +{{if $profile.canlike}} + <button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" > + <i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i> + </button> +{{/if}} + + +{{if $profile.like_count}} +<div class="btn-group"> +<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button> +{{if $profile.likers}} +<ul class="dropdown-menu" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}">{{$liker.name}}</a></li>{{/foreach}}</ul> +{{/if}} +</div> +{{/if}} +</div> +{{/if}} <dl id="aprofile-fullname" class="aprofile"> - <dt>$profile.fullname.0</dt> - <dd>$profile.fullname.1</dd> + <dt>{{$profile.fullname.0}}</dt> + <dd>{{$profile.fullname.1}}</dd> </dl> -{{ if $profile.gender }} +{{if $profile.gender}} <dl id="aprofile-gender" class="aprofile"> - <dt>$profile.gender.0</dt> - <dd>$profile.gender.1</dd> + <dt>{{$profile.gender.0}}</dt> + <dd>{{$profile.gender.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.birthday }} +{{if $profile.birthday}} <dl id="aprofile-birthday" class="aprofile"> - <dt>$profile.birthday.0</dt> - <dd>$profile.birthday.1</dd> + <dt>{{$profile.birthday.0}}</dt> + <dd>{{$profile.birthday.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.age }} +{{if $profile.age}} <dl id="aprofile-age" class="aprofile"> - <dt>$profile.age.0</dt> - <dd>$profile.age.1</dd> + <dt>{{$profile.age.0}}</dt> + <dd>{{$profile.age.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.marital }} +{{if $profile.marital}} <dl id="aprofile-marital" class="aprofile"> - <dt><span class="heart">♥</span> $profile.marital.0</dt> - <dd>$profile.marital.1{{ if $profile.marital.with }} ($profile.marital.with){{ endif }}{{ if $profile.howlong }} $profile.howlong{{ endif }}</dd> + <dt><span class="heart">♥</span> {{$profile.marital.0}}</dt> + <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.sexual }} +{{if $profile.sexual}} <dl id="aprofile-sexual" class="aprofile"> - <dt>$profile.sexual.0</dt> - <dd>$profile.sexual.1</dd> + <dt>{{$profile.sexual.0}}</dt> + <dd>{{$profile.sexual.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.keywords }} +{{if $profile.keywords}} <dl id="aprofile-tags" class="aprofile"> - <dt>$profile.keywords.0</dt> - <dd>$profile.keywords.1</dd> + <dt>{{$profile.keywords.0}}</dt> + <dd>{{$profile.keywords.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.homepage }} +{{if $profile.homepage}} <dl id="aprofile-homepage" class="aprofile"> - <dt>$profile.homepage.0</dt> - <dd>$profile.homepage.1</dd> + <dt>{{$profile.homepage.0}}</dt> + <dd>{{$profile.homepage.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.hometown }} +{{if $profile.hometown}} <dl id="aprofile-hometown" class="aprofile"> - <dt>$profile.hometown.0</dt> - <dd>$profile.hometown.1</dd> + <dt>{{$profile.hometown.0}}</dt> + <dd>{{$profile.hometown.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.politic }} +{{if $profile.politic}} <dl id="aprofile-politic" class="aprofile"> - <dt>$profile.politic.0</dt> - <dd>$profile.politic.1</dd> + <dt>{{$profile.politic.0}}</dt> + <dd>{{$profile.politic.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.religion }} +{{if $profile.religion}} <dl id="aprofile-religion" class="aprofile"> - <dt>$profile.religion.0</dt> - <dd>$profile.religion.1</dd> + <dt>{{$profile.religion.0}}</dt> + <dd>{{$profile.religion.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.about }} +{{if $profile.about}} <dl id="aprofile-about" class="aprofile"> - <dt>$profile.about.0</dt> - <dd>$profile.about.1</dd> + <dt>{{$profile.about.0}}</dt> + <dd>{{$profile.about.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.interest }} +{{if $profile.interest}} <dl id="aprofile-interest" class="aprofile"> - <dt>$profile.interest.0</dt> - <dd>$profile.interest.1</dd> + <dt>{{$profile.interest.0}}</dt> + <dd>{{$profile.interest.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.likes }} +{{if $profile.likes}} <dl id="aprofile-likes" class="aprofile"> - <dt>$profile.likes.0</dt> - <dd>$profile.likes.1</dd> + <dt>{{$profile.likes.0}}</dt> + <dd>{{$profile.likes.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.dislikes }} +{{if $profile.dislikes}} <dl id="aprofile-dislikes" class="aprofile"> - <dt>$profile.dislikes.0</dt> - <dd>$profile.dislikes.1</dd> + <dt>{{$profile.dislikes.0}}</dt> + <dd>{{$profile.dislikes.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.contact }} +{{if $profile.contact}} <dl id="aprofile-contact" class="aprofile"> - <dt>$profile.contact.0</dt> - <dd>$profile.contact.1</dd> + <dt>{{$profile.contact.0}}</dt> + <dd>{{$profile.contact.1}}</dd> </dl> -{{ endif }} +{{/if}} + +{{if $profile.channels}} +<dl id="aprofile-channels" class="aprofile"> + <dt>{{$profile.channels.0}}</dt> + <dd>{{$profile.channels.1}}</dd> +</dl> +{{/if}} -{{ if $profile.music }} +{{if $profile.music}} <dl id="aprofile-music" class="aprofile"> - <dt>$profile.music.0</dt> - <dd>$profile.music.1</dd> + <dt>{{$profile.music.0}}</dt> + <dd>{{$profile.music.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.book }} +{{if $profile.book}} <dl id="aprofile-book" class="aprofile"> - <dt>$profile.book.0</dt> - <dd>$profile.book.1</dd> + <dt>{{$profile.book.0}}</dt> + <dd>{{$profile.book.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.tv }} +{{if $profile.tv}} <dl id="aprofile-tv" class="aprofile"> - <dt>$profile.tv.0</dt> - <dd>$profile.tv.1</dd> + <dt>{{$profile.tv.0}}</dt> + <dd>{{$profile.tv.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.film }} +{{if $profile.film}} <dl id="aprofile-film" class="aprofile"> - <dt>$profile.film.0</dt> - <dd>$profile.film.1</dd> + <dt>{{$profile.film.0}}</dt> + <dd>{{$profile.film.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.romance }} +{{if $profile.romance}} <dl id="aprofile-romance" class="aprofile"> - <dt>$profile.romance.0</dt> - <dd>$profile.romance.1</dd> + <dt>{{$profile.romance.0}}</dt> + <dd>{{$profile.romance.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.work }} +{{if $profile.work}} <dl id="aprofile-work" class="aprofile"> - <dt>$profile.work.0</dt> - <dd>$profile.work.1</dd> + <dt>{{$profile.work.0}}</dt> + <dd>{{$profile.work.1}}</dd> </dl> -{{ endif }} +{{/if}} -{{ if $profile.education }} +{{if $profile.education}} <dl id="aprofile-education" class="aprofile"> - <dt>$profile.education.0</dt> - <dd>$profile.education.1</dd> -</dl> -{{ endif }} - - - - + <dt>{{$profile.education.0}}</dt> + <dd>{{$profile.education.1}}</dd> +</dl> +{{/if}} + +{{if $things}} +{{foreach $things as $key => $items}} +<b>{{$profile.fullname.1}} {{$key}}</b> +<ul class="profile-thing-list"> +{{foreach $items as $item}} +<li>{{if $item.img}}<img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" />{{/if}} +<a href="{{$item.url}}" >{{$item.term}}</a> +{{if $profile.canlike}}<br /> +<button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" > +<i class="icon-thumbs-up-alt" title="{{$likethis}}"></i> +</button> +{{/if}} +{{if $item.like_count}} +<div class="btn-group"> +<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button> +{{if $item.likes}} +<ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}">{{$liker.xchan_name}}</a></li>{{/foreach}}</ul> +{{/if}} +</div> +{{/if}} +</li> +{{/foreach}} +</ul> +<div class="clear"></div> +{{/foreach}} +{{/if}} + +</div> diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index a498f3a65..196b3ac6d 100644..100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -1,14 +1,14 @@ -$default +{{$default}} -<h1>$banner</h1> +<h1>{{$banner}}</h1> <div id="profile-edit-links"> <ul> -<li><a href="profile_photo" id="profile-photo_upload-link" title="$profpic">$profpic</a></li> -<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li> -<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li> +<li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li> +<li><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li> +<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li> <li></li> -<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li> +<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li> </ul> </div> @@ -17,147 +17,149 @@ $default <div id="profile-edit-wrapper" > -<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" > -<input type='hidden' name='form_security_token' value='$form_security_token'> +<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" > +<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div id="profile-edit-profile-name-wrapper" > -<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label> -<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div> +<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label> +<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div> </div> <div id="profile-edit-profile-name-end"></div> <div id="profile-edit-name-wrapper" > -<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label> -<input type="text" size="32" name="name" id="profile-edit-name" value="$name" /> +<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label> +<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name}}" /> </div> <div id="profile-edit-name-end"></div> <div id="profile-edit-pdesc-wrapper" > -<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label> -<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" /> +<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label> +<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" /> </div> <div id="profile-edit-pdesc-end"></div> <div id="profile-edit-gender-wrapper" > -<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label> -$gender +<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label> +{{$gender}} </div> <div id="profile-edit-gender-end"></div> <div id="profile-edit-dob-wrapper" > -<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label> +<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label> <div id="profile-edit-dob" > -$dob $age +{{$dob}} {{$age}} </div> </div> <div id="profile-edit-dob-end"></div> -$hide_friends +{{$hide_friends}} <div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" /> +<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> </div> <div class="profile-edit-submit-end"></div> <div id="profile-edit-address-wrapper" > -<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label> -<input type="text" size="32" name="address" id="profile-edit-address" value="$address" /> +<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label> +<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address}}" /> </div> <div id="profile-edit-address-end"></div> <div id="profile-edit-locality-wrapper" > -<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label> -<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" /> +<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label> +<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality}}" /> </div> <div id="profile-edit-locality-end"></div> <div id="profile-edit-postal-code-wrapper" > -<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label> -<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" /> +<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label> +<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" /> </div> <div id="profile-edit-postal-code-end"></div> <div id="profile-edit-region-wrapper" > -<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label> -<input type="text" size="32" name="region" id="profile-edit-region" value="$region" /> +<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label> +<input type="text" size="32" name="region" id="profile-edit-region" value="{{$region}}" /> </div> <div id="profile-edit-region-end"></div> <div id="profile-edit-country-name-wrapper" > -<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label> -<input type="text" size="32" name="country_name" id="profile-edit-country-name" value="$country_name" /> +<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label> +<input type="text" size="32" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" /> </div> <div id="profile-edit-country-name-end"></div> <div id="profile-edit-hometown-wrapper" > -<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label> -<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="$hometown" /> +<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label> +<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" /> </div> <div id="profile-edit-hometown-end"></div> <div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" /> +<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> </div> <div class="profile-edit-submit-end"></div> <div id="profile-edit-marital-wrapper" > -<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label> -$marital +<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label> +{{$marital}} </div> -<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label> -<input type="text" size="32" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" /> -<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label> -<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" /> +<div class="clear"></div> +<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label> +<input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" /> +<div class="clear"></div> +<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label> +<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" /> <div id="profile-edit-marital-end"></div> <div id="profile-edit-sexual-wrapper" > -<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label> -$sexual +<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label> +{{$sexual}} </div> <div id="profile-edit-sexual-end"></div> <div id="profile-edit-homepage-wrapper" > -<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label> -<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" /> +<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label> +<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" /> </div> <div id="profile-edit-homepage-end"></div> <div id="profile-edit-politic-wrapper" > -<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label> -<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" /> +<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label> +<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic}}" /> </div> <div id="profile-edit-politic-end"></div> <div id="profile-edit-religion-wrapper" > -<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label> -<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" /> +<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label> +<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion}}" /> </div> <div id="profile-edit-religion-end"></div> <div id="profile-edit-pubkeywords-wrapper" > -<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label> -<input type="text" size="32" name="keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$keywords" /> -</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div> +<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label> +<input type="text" size="32" name="keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$keywords}}" /> +</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div> <div id="profile-edit-pubkeywords-end"></div> <div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" /> +<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> </div> <div class="profile-edit-submit-end"></div> <div id="about-jot-wrapper" > <p id="about-jot-desc" > -$lbl_about +{{$lbl_about}} </p> -<textarea rows="10" cols="72" id="profile-about-text" name="about" >$about</textarea> +<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea> </div> <div id="about-jot-end"></div> @@ -165,10 +167,10 @@ $lbl_about <div id="interest-jot-wrapper" > <p id="interest-jot-desc" > -$lbl_hobbies +{{$lbl_hobbies}} </p> -<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea> +<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest}}</textarea> </div> <div id="interest-jot-end"></div> @@ -176,10 +178,10 @@ $lbl_hobbies <div id="likes-jot-wrapper" > <p id="likes-jot-desc" > -$lbl_likes +{{$lbl_likes}} </p> -<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >$likes</textarea> +<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes}}</textarea> </div> <div id="likes-jot-end"></div> @@ -187,10 +189,10 @@ $lbl_likes <div id="dislikes-jot-wrapper" > <p id="dislikes-jot-desc" > -$lbl_dislikes +{{$lbl_dislikes}} </p> -<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >$dislikes</textarea> +<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes}}</textarea> </div> <div id="dislikes-jot-end"></div> @@ -198,37 +200,46 @@ $lbl_dislikes <div id="contact-jot-wrapper" > <p id="contact-jot-desc" > -$lbl_social +{{$lbl_social}} </p> -<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea> +<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea> </div> <div id="contact-jot-end"></div> +<div id="channels-jot-wrapper" > +<p id="channels-jot-desc" > +{{$lbl_channels}} +</p> + +<textarea rows="10" cols="72" id="channels-jot-text" name="channels" >{{$channels}}</textarea> + +</div> +<div id="channels-jot-end"></div> <div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" /> +<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> </div> <div class="profile-edit-submit-end"></div> <div id="music-jot-wrapper" > <p id="music-jot-desc" > -$lbl_music +{{$lbl_music}} </p> -<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea> +<textarea rows="10" cols="72" id="music-jot-text" name="music" >{{$music}}</textarea> </div> <div id="music-jot-end"></div> <div id="book-jot-wrapper" > <p id="book-jot-desc" > -$lbl_book +{{$lbl_book}} </p> -<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea> +<textarea rows="10" cols="72" id="book-jot-text" name="book" >{{$book}}</textarea> </div> <div id="book-jot-end"></div> @@ -237,10 +248,10 @@ $lbl_book <div id="tv-jot-wrapper" > <p id="tv-jot-desc" > -$lbl_tv +{{$lbl_tv}} </p> -<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea> +<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv}}</textarea> </div> <div id="tv-jot-end"></div> @@ -249,27 +260,27 @@ $lbl_tv <div id="film-jot-wrapper" > <p id="film-jot-desc" > -$lbl_film +{{$lbl_film}} </p> -<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea> +<textarea rows="10" cols="72" id="film-jot-text" name="film" >{{$film}}</textarea> </div> <div id="film-jot-end"></div> <div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" /> +<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> </div> <div class="profile-edit-submit-end"></div> <div id="romance-jot-wrapper" > <p id="romance-jot-desc" > -$lbl_love +{{$lbl_love}} </p> -<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea> +<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance}}</textarea> </div> <div id="romance-jot-end"></div> @@ -278,10 +289,10 @@ $lbl_love <div id="work-jot-wrapper" > <p id="work-jot-desc" > -$lbl_work +{{$lbl_work}} </p> -<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea> +<textarea rows="10" cols="72" id="work-jot-text" name="work" >{{$work}}</textarea> </div> <div id="work-jot-end"></div> @@ -290,10 +301,10 @@ $lbl_work <div id="education-jot-wrapper" > <p id="education-jot-desc" > -$lbl_school +{{$lbl_school}} </p> -<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea> +<textarea rows="10" cols="72" id="education-jot-text" name="education" >{{$education}}</textarea> </div> <div id="education-jot-end"></div> @@ -301,7 +312,7 @@ $lbl_school <div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" /> +<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> </div> <div class="profile-edit-submit-end"></div> diff --git a/view/tpl/profile_edlink.tpl b/view/tpl/profile_edlink.tpl deleted file mode 100644 index ea787b9f5..000000000 --- a/view/tpl/profile_edlink.tpl +++ /dev/null @@ -1,2 +0,0 @@ -<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles/$profid" ></a></div> -<div class="clear"></div>
\ No newline at end of file diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl index 7ff6d685b..cc0f3477c 100644..100755 --- a/view/tpl/profile_entry.tpl +++ b/view/tpl/profile_entry.tpl @@ -1,11 +1,10 @@ - <div class="profile-listing" > <div class="profile-listing-photo-wrapper" > -<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a> +<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a> </div> <div class="profile-listing-photo-end"></div> -<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div> -<div class="profile-listing-visible">$visible</div> +<div class="profile-listing-name" id="profile-listing-name-{{$id}}"><a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a></div> +<div class="profile-listing-visible">{{$visible}}</div> </div> <div class="profile-listing-end"></div> diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl index 61a273792..856d689f1 100644..100755 --- a/view/tpl/profile_listing_header.tpl +++ b/view/tpl/profile_listing_header.tpl @@ -1,8 +1,11 @@ -<h1>$header</h1> +<h1>{{$header}}</h1> <p id="profile-listing-desc" class="button" > -<a href="profile_photo" >$chg_photo</a> +<a href="profile_photo" >{{$chg_photo}}</a> </p> -<div id="profile-listing-new-link-wrapper" class="button" > -<a href="$cr_new_link" id="profile-listing-new-link" title="$cr_new" >$cr_new</a> +<p id="profile-stuff-link" class="button"> +<a href="thing" title="{{$stuff_desc}}">{{$addstuff}}</a> +</p> +<p id="profile-listing-new-link-wrapper" class="button" > +<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a> </div> diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index 282e890c8..48a3c7f26 100644..100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -1,29 +1,29 @@ -<h1>$title</h1> +<h1>{{$title}}</h1> <form enctype="multipart/form-data" action="profile_photo" method="post"> -<input type='hidden' name='form_security_token' value='$form_security_token'> +<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div id="profile-photo-upload-wrapper"> -<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">$lbl_upfile</label> +<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label> <input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" /> <div class="clear"></div> -<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">$lbl_profiles</label> +<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label> <select name="profile" id="profile-photo-profiles" class="form-input" > -{{ for $profiles as $p }} -<option value="$p.id" {{ if $p.default }}selected="selected"{{ endif }}>$p.name</option> -{{ endfor }} +{{foreach $profiles as $p}} +<option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option> +{{/foreach}} </select> <div class="clear"></div> <div id="profile-photo-submit-wrapper"> -<input type="submit" name="submit" id="profile-photo-submit" value="$submit"> +<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}"> </div> </div> </form> <div id="profile-photo-link-select-wrapper"> -$select -</div>
\ No newline at end of file +{{$select}} +</div> diff --git a/view/tpl/profile_publish.tpl b/view/tpl/profile_publish.tpl deleted file mode 100644 index 8fd0bc913..000000000 --- a/view/tpl/profile_publish.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="profile-publish-desc-$instance"> -$pubdesc -</p> - - <div id="profile-publish-yes-wrapper-$instance"> - <label id="profile-publish-yes-label-$instance" for="profile-publish-yes-$instance">$str_yes</label> - <input type="radio" name="profile_publish_$instance" id="profile-publish-yes-$instance" $yes_selected value="1" /> - - <div id="profile-publish-break-$instance" ></div> - </div> - <div id="profile-publish-no-wrapper-$instance"> - <label id="profile-publish-no-label-$instance" for="profile-publish-no-$instance">$str_no</label> - <input type="radio" name="profile_publish_$instance" id="profile-publish-no-$instance" $no_selected value="0" /> - - <div id="profile-publish-end-$instance"></div> - </div> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 323658463..d72507d4c 100644..100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,52 +1,58 @@ <div class="vcard"> - {{ if $profile.edit }} - <div class="action"> - <a class="profile-edit-side-link icon edit" rel="#profiles-menu" title="$profile.edit.3" href="#" ><span>$profile.edit.1</span></a> - <ul id="profiles-menu" class="menu-popup"> - {{ for $profile.menu.entries as $e }} + {{if $profile.edit}} + <div class="dropdown"> + <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> + <ul class="dropdown-menu" role="menu"> + {{foreach $profile.menu.entries as $e}} <li> - <a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a> + <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a> </li> - {{ endfor }} - <li><a href="profile_photo" >$profile.menu.chg_photo</a></li> - <li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li> - + {{/foreach}} + <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li> + {{if $profile.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>{{/if}} </ul> </div> - {{ endif }} + {{/if}} - <div class="fn label">$profile.name</div> + <div class="fn label">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> - {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} - <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div> + {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} + <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> - {{ if $location }} - <dl class="location"><dt class="location-label">$location</dt> + {{if $location}} + <dl class="location"><dt class="location-label">{{$location}}</dt> <dd class="adr"> - {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }} + {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}} <span class="city-state-zip"> - <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }} - <span class="region">$profile.region</span> - <span class="postal-code">$profile.postal_code</span> + <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}} + <span class="region">{{$profile.region}}</span> + <span class="postal-code">{{$profile.postal_code}}</span> </span> - {{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }} + {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}} </dd> </dl> - {{ endif }} + {{/if}} - {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }} + {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}} - {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }} + {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}} - {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" >$profile.homepage</a></dd></dl>{{ endif }} + {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" >{{$profile.homepage}}</a></dd></dl>{{/if}} + +{{if $connect}} +<a href="{{$connect_url}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a> +{{/if}} </div> <div id="vcard-end"></div> -$contact_block + +{{$chanmenu}} + +{{$contact_block}} diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 3f0bd937f..118bd846f 100644..100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -1,37 +1,54 @@ - -<h3>$header</h3> +<h3>{{$header}}</h3> <div id="prvmail-wrapper" > -<form id="prvmail-form" action="message" method="post" > +<form id="prvmail-form" action="mail" method="post" > + +{{$parent}} -$parent +<div id="prvmail-to-label">{{$to}}</div> -<div id="prvmail-to-label">$to</div> +{{if $showinputs}} +<input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" /> +<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}"> +{{else}} +{{$select}} +{{/if}} -{{ if $showinputs }} -<input type="text" id="recip" name="messagerecip" value="$prefill" maxlength="255" size="64" tabindex="10" /> -<input type="hidden" id="recip-complete" name="messageto" value="$preid"> -{{ else }} -$select -{{ endif }} +<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" /> +<input type="hidden" name="media_str" id="jot-media" value="" /> -<div id="prvmail-subject-label">$subject</div> -<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" /> +<div id="prvmail-subject-label">{{$subject}}</div> +<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" /> -<div id="prvmail-message-label">$yourmessage</div> -<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea> +<div id="prvmail-message-label">{{$yourmessage}}</div> +<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea> <div id="prvmail-submit-wrapper" > - <input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" /> + <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" /> <div id="prvmail-upload-wrapper" > - <div id="prvmail-upload" class="icon border camera" title="$upload" ></div> + <i id="prvmail-upload" class="icon-camera jot-icons" title="{{$upload}}"></i> + </div> + + <div id="prvmail-attach-wrapper" > + <i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i> </div> + <div id="prvmail-link-wrapper" > - <div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div> + <i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i> + </div> + {{if $feature_expire}} + <div id="prvmail-expire-wrapper" > + <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i> + </div> + {{/if}} + {{if $feature_encrypt}} + <div id="prvmail-encrypt-wrapper" > + <i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"></i> </div> + {{/if}} <div id="prvmail-rotator-wrapper" > - <img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> + <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> </div> </div> <div id="prvmail-end"></div> diff --git a/view/tpl/pwdreset.tpl b/view/tpl/pwdreset.tpl index 497b93396..a9106343f 100644..100755 --- a/view/tpl/pwdreset.tpl +++ b/view/tpl/pwdreset.tpl @@ -1,17 +1,15 @@ -<h3>$lbl1</h3> +<h3>{{$lbl1}}</h3> <p> -$lbl2 +{{$lbl2}} </p> <p> -$lbl3 +{{$lbl3}} </p> +<p>{{$newpass}}</p> <p> -$newpass +{{$lbl4}} {{$lbl5}} </p> <p> -$lbl4 $lbl5 -</p> -<p> -$lbl6 +{{$lbl6}} </p> diff --git a/view/tpl/rbmark.tpl b/view/tpl/rbmark.tpl new file mode 100644 index 000000000..bead1de2f --- /dev/null +++ b/view/tpl/rbmark.tpl @@ -0,0 +1,16 @@ +<h3>{{$header}}</h3> + + +<form action="rbmark" method="post" > + +<input type="hidden" name="private" value="{{$private}}" /> +<input type="hidden" name="ischat" value="{{$ischat}}" /> + +{{include file="field_input.tpl" field=$url}} +{{include file="field_input.tpl" field=$title}} +{{include file="field_select.tpl" field=$menus}} +{{include file="field_input.tpl" field=$menu_name}} + +<input type="submit" name="submit" value="{{$submit}}" /> + +</form> diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 4b565718d..ed673031a 100644..100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -1,45 +1,51 @@ -<h2>$title</h2> +<h2>{{$title}}</h2> <form action="register" method="post" id="register-form"> -{{ if $registertext }} -<div id="register-desc" class="descriptive-paragraph">$registertext</div> -{{ endif }} -{{ if $invitations }} - <p id="register-invite-desc">$invite_desc</p> - <label for="register-invite" id="label-register-invite" class="register-label">$label_invite</label> - <input type="text" maxlength="72" size="32" name="invite_code" id="register-invite" class="register-input" value="$invite_code" /> +{{if $reg_is}} +<div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div> +{{/if}} +{{if $registertext}}<div id="register-text" class="descriptive-paragraph">{{$registertext}}</div> +{{/if}} +{{if $other_sites}}<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div> +{{/if}} + +{{if $invitations}} + <p id="register-invite-desc">{{$invite_desc}}</p> + + <label for="register-invite" id="label-register-invite" class="register-label">{{$label_invite}}</label> + <input type="text" maxlength="72" size="32" name="invite_code" id="register-invite" class="register-input" value="{{$invite_code}}" /> <div id="register-invite-feedback" class="register-feedback"></div> <div id="register-invite-end" class="register-field-end"></div> -{{ endif }} +{{/if}} - <label for="register-email" id="label-register-email" class="register-label" >$label_email</label> - <input type="text" maxlength="72" size="32" name="email" id="register-email" class="register-input" value="$email" /> + <label for="register-email" id="label-register-email" class="register-label" >{{$label_email}}</label> + <input type="text" maxlength="72" size="32" name="email" id="register-email" class="register-input" value="{{$email}}" /> <div id="register-email-feedback" class="register-feedback"></div> <div id="register-email-end" class="register-field-end"></div> - <label for="register-password" id="label-register-password" class="register-label" >$label_pass1</label> - <input type="password" maxlength="72" size="32" name="password" id="register-password" class="register-input" value="$pass1" /> + <label for="register-password" id="label-register-password" class="register-label" >{{$label_pass1}}</label> + <input type="password" maxlength="72" size="32" name="password" id="register-password" class="register-input" value="{{$pass1}}" /> <div id="register-password-feedback" class="register-feedback"></div> <div id="register-password-end" class="register-field-end"></div> - <label for="register-password2" id="label-register-password2" class="register-label" >$label_pass2</label> - <input type="password" maxlength="72" size="32" name="password2" id="register-password2" class="register-input" value="$pass2" /> + <label for="register-password2" id="label-register-password2" class="register-label" >{{$label_pass2}}</label> + <input type="password" maxlength="72" size="32" name="password2" id="register-password2" class="register-input" value="{{$pass2}}" /> <div id="register-password2-feedback" class="register-feedback"></div> <div id="register-password2-end" class="register-field-end"></div> - {{ if $enable_tos }} + {{if $enable_tos}} <input type="checkbox" name="tos" id="register-tos" value="1" /> - <label for="register-tos" id="label-register-tos">$label_tos</label> + <label for="register-tos" id="label-register-tos">{{$label_tos}}</label> <div id="register-tos-feedback" class="register-feedback"></div> <div id="register-tos-end" class="register-field-end"></div> - {{ else }} + {{else}} <input type="hidden" name="tos" value="1" /> - {{ endif }} + {{/if}} - <input type="submit" name="submit" id="register-submit-button" value="$submit" /> + <input type="submit" name="submit" class="btn btn-default" id="register-submit-button" value="{{$submit}}" /> <div id="register-submit-end" class="register-field-end"></div> </form> diff --git a/view/tpl/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl index 9e0562878..d6d2fd211 100644..100755 --- a/view/tpl/remote_friends_common.tpl +++ b/view/tpl/remote_friends_common.tpl @@ -1,21 +1,21 @@ <div id="remote-friends-in-common" class="bigwidget"> - <div id="rfic-desc">$desc {{ if $linkmore }}<a href="$base/common/rem/$uid/$cid">$more</a>{{ endif }}</div> - {{ if $items }} - {{ for $items as $item }} + <div id="rfic-desc">{{$desc}} {{if $linkmore}}<a href="{{$base}}/common/{{$uid}}">{{$more}}</a>{{/if}}</div> + {{if $items}} + {{foreach $items as $item}} <div class="profile-match-wrapper"> <div class="profile-match-photo"> - <a href="$item.url"> - <img src="$item.photo" width="80" height="80" alt="$item.name" title="$item.name" /> + <a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}"> + <img src="{{$item.xchan_photo_m}}" width="80" height="80" alt="{{$item.xchan_name}}" title="{{$item.xchan_name}}" /> </a> </div> <div class="profile-match-break"></div> <div class="profile-match-name"> - <a href="$itemurl" title="$item.name">$item.name</a> + <a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}" title="{{$item.xchan_name}}">{{$item.xchan_name}}</a> </div> <div class="profile-match-end"></div> </div> - {{ endfor }} - {{ endif }} + {{/foreach}} + {{/if}} <div id="rfic-end" class="clear"></div> </div> diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl index a3ca8d4cf..c42eaf0e1 100644..100755 --- a/view/tpl/removeme.tpl +++ b/view/tpl/removeme.tpl @@ -1,19 +1,21 @@ -<h1>$title</h1> +<h1>{{$title}}</h1> <div id="remove-account-wrapper"> -<div id="remove-account-desc">$desc</div> +<div id="remove-account-desc">{{$desc}}</div> -<form action="$basedir/removeme" autocomplete="off" method="post" > -<input type="hidden" name="verify" value="$hash" /> +<form action="{{$basedir}}/removeme" autocomplete="off" method="post" > +<input type="hidden" name="verify" value="{{$hash}}" /> <div id="remove-account-pass-wrapper"> -<label id="remove-account-pass-label" for="remove-account-pass">$passwd</label> +<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> <input type="password" id="remove-account-pass" name="qxz_password" /> </div> <div id="remove-account-pass-end"></div> -<input type="submit" name="submit" value="$submit" /> +{{include file="field_checkbox.tpl" field=$global}} + +<input type="submit" name="submit" value="{{$submit}}" /> </form> </div> diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl new file mode 100755 index 000000000..58df71718 --- /dev/null +++ b/view/tpl/rmagic.tpl @@ -0,0 +1,11 @@ +<h3>{{$title}}</h3> + +<form action="rmagic" method="post" > + + <label for="rmagic-address" id="label-rmagic-address" class="rmagic-label">{{$desc}}</label> + <input type="text" maxlength="255" size="32" name="address" id="rmagic-address" class="rmagic-input" value="" /> + + <input type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" /> + <div id="rmagic-submit-end" class="rmagic-field-end"></div> + +</form> diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl new file mode 100644 index 000000000..e0b2ab538 --- /dev/null +++ b/view/tpl/safesearch.tpl @@ -0,0 +1,4 @@ +<div id="directory_safemode" class="widget"> +<h3>{{$safemode}}</h3> +<a href="toggle_safesearch">{{$toggle}}</a> +</div> diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl new file mode 100644 index 000000000..1a9f51af9 --- /dev/null +++ b/view/tpl/saved_searches.tpl @@ -0,0 +1,14 @@ +<div class="widget" id="saved-search-list"> + <h3 id="search">{{$title}}</h3> + {{$searchbox}} + + <ul id="saved-search-ul"> + {{foreach $saved as $search}} + <li id="search-term-{{$search.id}}" class="saved-search-li clear"> + <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer saved-search-icon" ></i></a> + <a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a> + </li> + {{/foreach}} + </ul> + <div class="clear"></div> +</div> diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl index a204c48ff..0258a7632 100644..100755 --- a/view/tpl/saved_searches_aside.tpl +++ b/view/tpl/saved_searches_aside.tpl @@ -1,14 +1,14 @@ <div class="widget" id="saved-search-list"> - <h3 id="search">$title</h3> - $searchbox + <h3 id="search">{{$title}}</h3> + {{$searchbox}} <ul id="saved-search-ul"> - {{ for $saved as $search }} - <li class="saved-search-li clear"> - <a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&remove=1&search=$search.encodedterm"></a> - <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&search=$search.encodedterm">$search.displayterm</a> + {{foreach $saved as $search}} + <li id="search-term-{{$search.id}}" class="saved-search-li clear"> + <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&remove=1&search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop saved-search-icon" ></i></a> + <a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="network/?f=&search={{$search.encodedterm}}">{{$search.displayterm}}</a> </li> - {{ endfor }} + {{/foreach}} </ul> <div class="clear"></div> </div> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index db72eee6a..f86ee0202 100644..100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -1,62 +1,63 @@ -<a name="$item.id" ></a> -<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > - <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" > - <div class="wall-item-info" id="wall-item-info-$item.id"> - <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" - onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" - onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> - <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a> - <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> - <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> - <ul> - $item.item_photo_menu - </ul> +<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}"> + <a name="{{$item.id}}" ></a> + <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" > + <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> + <div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}" > + <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> + <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> </div> + <div class="wall-item-photo-end" style="clear:both"></div> </div> - <div class="wall-item-photo-end"></div> - <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" > - {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> - {{ else }}<div class="wall-item-lock"></div>{{ endif }} - <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div> + {{if $item.title}} + <div class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3>{{$item.title}}</h3></div> + {{/if}} + {{if $item.lock}} + <div class="wall-item-lock dropdown"> + <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> </div> - </div> - <div class="wall-item-author"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> - - <div id="wall-item-ago-$item.id" class="wall-item-ago"><abbr class="wall-item-ago-time" title="$item.localtime">$item.ago</abbr>{{ if $item.app }}<span class="item.app">$item.str_app</span>{{ endif }}</div> - - </div> - <div class="wall-item-content" id="wall-item-content-$item.id" > - <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> - <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body - <div class="body-tag"> - {{ for $item.tags as $tag }} - <span class='tag'>$tag</span> - {{ endfor }} + {{/if}} + <div class="wall-item-author"> + <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" 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>{{/if}} + </div> + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> + {{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + </div> + <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> + <div class="wall-item-title-end"></div> + <div class="wall-item-body" id="wall-item-body-{{$item.id}}" > + {{$item.body}} </div> </div> - </div> - <div class="wall-item-tools" id="wall-item-tools-$item.id"> - <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > - {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} + <div class="wall-item-tools"> + <div class="wall-item-tools-right btn-group pull-right"> + <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> + <i class="icon-caret-down"></i> + </button> + <ul class="dropdown-menu"> + {{if $item.item_photo_menu}} + {{$item.item_photo_menu}} + {{/if}} + {{if $item.drop.dropping}} + <li role="presentation" class="divider"></li> + <li><a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove"></i> {{$item.drop.delete}}</a></li> + {{/if}} + </ul> + </div> </div> - {{ if $item.drop.pagedropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} - <div class="wall-item-delete-end"></div> + {{* we dont' use this do we? + {{if $item.drop.pagedrop}} + <input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" /> + {{/if}} + *}} + <div class="clear"></div> </div> + <div class="wall-item-wrapper-end"></div> + {{if $item.conv}} + <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" > + <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a> + </div> + {{/if}} + <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> </div> - <div class="wall-item-wrapper-end"></div> - - - <div class="wall-item-conv" id="wall-item-conv-$item.id" > - {{ if $item.conv }} - <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a> - {{ endif }} - </div> - -<div class="wall-item-outside-wrapper-end $item.indent" ></div> - </div> - diff --git a/view/tpl/sellpage_edit.tpl b/view/tpl/sellpage_edit.tpl new file mode 100644 index 000000000..0a4726fb2 --- /dev/null +++ b/view/tpl/sellpage_edit.tpl @@ -0,0 +1,23 @@ +<h1>{{$header}}</h1> +<form id="sellpage-edit" action="connect/{{$address}}" method="post"> + +{{include file="field_checkbox.tpl" field=$premium}} + +<div class="descriptive-text">{{$desc}}</div> + +<div class="sellpage-editbody"> +<p id="sellpage-bodydesc" > +{{$lbl_about}} +</p> + +<textarea rows="10" cols="72" id="sellpage-textinp" name="text" >{{$text}}</textarea> + +</div> +<div id="sellpage-editbody-end"></div> + + +<div class="descriptive-text">{{$lbl2}}</div> +<div class="sellpage-final">{{$desc2}}</div> + +<input type="submit" name="submit" value="{{$submit}}" /> +</form> diff --git a/view/tpl/sellpage_submit.tpl b/view/tpl/sellpage_submit.tpl new file mode 100644 index 000000000..2bd735ea4 --- /dev/null +++ b/view/tpl/sellpage_submit.tpl @@ -0,0 +1,3 @@ +<form id="sellpage-submit" action="connect/{{$address}}" method="post"> +<input type="submit" name="submit" value="{{$continue}}" /> +</form>
\ No newline at end of file diff --git a/view/tpl/sellpage_view.tpl b/view/tpl/sellpage_view.tpl new file mode 100644 index 000000000..20a65ffbe --- /dev/null +++ b/view/tpl/sellpage_view.tpl @@ -0,0 +1,11 @@ +<div class="generic-content-wrapper"> +<h1>{{$header}}</h1> + +<div class="descriptive-text">{{$desc}}</div> + +<div class="sellpage-body">{{$text}}</div> + +<div class="sellpage-final">{{$desc2}}</div> + +{{$submit}} +</div> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 48b3cffe7..1fef255f0 100644..100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,134 +1,140 @@ -<h1>$ptitle</h1> +<div class="generic-content-wrapper"> +<h1>{{$ptitle}}</h1> -$nickname_block +{{$nickname_block}} <form action="settings" id="settings-form" method="post" autocomplete="off" > -<input type='hidden' name='form_security_token' value='$form_security_token'> +<input type='hidden' name='form_security_token' value='{{$form_security_token}}' /> -<h3 class="settings-heading">$h_basic</h3> +<h3 class="settings-heading">{{$h_basic}}</h3> -{{inc field_input.tpl with $field=$username }}{{endinc}} -{{inc field_custom.tpl with $field=$timezone }}{{endinc}} -{{inc field_input.tpl with $field=$defloc }}{{endinc}} -{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}} +{{include file="field_input.tpl" field=$username}} +{{include file="field_custom.tpl" field=$timezone}} +{{include file="field_input.tpl" field=$defloc}} +{{include file="field_checkbox.tpl" field=$allowloc}} +{{include file="field_checkbox.tpl" field=$adult}} <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="$submit" /> +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> </div> -<h3 class="settings-heading">$h_prv</h3> +<h3 class="settings-heading">{{$h_prv}}</h3> +{{include file="field_checkbox.tpl" field=$hide_presence}} -<input type="hidden" name="visibility" value="$visibility" /> +<h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3> +<ul id="settings-privacy-macros"> +<li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li> +<li><a href="#" onclick="channel_privacy_macro(1); return false" id="settings_pmacro1">{{$pmacro1}}</a></li> +<li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li> +<li><a href="#" onclick="channel_privacy_macro(0); return false" id="settings_pmacro0">{{$pmacro0}}</a></li> +</ul> -<div id="settings-permissions-wrapper"> -{{ for $permiss_arr as $permit }} -{{inc field_select.tpl with $field=$permit }}{{endinc}} -{{ endfor }} -</div> - +<button type="button" class="btn btn-xs btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button> -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="$submit" /> -</div> +<div class="collapse well" id="settings-permissions-wrapper"> +{{if !$expert}} + <div class="alert alert-info">{{$hint}}</div> +{{/if}} -$profile_in_dir +{{foreach $permiss_arr as $permit}} + {{if $expert}} + {{include file="field_select.tpl" field=$permit}} + {{else}} + {{include file="field_select_disabled.tpl" field=$permit}} + {{/if}} +{{/foreach}} -$blocktags +{{if $expert}} + <div class="settings-submit-wrapper" > + <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> + </div> +{{/if}} -$suggestme +</div> +<div class="settings-common-perms"> -{{inc field_input.tpl with $field=$maxreq }}{{endinc}} +{{$profile_in_dir}} -{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}} +{{$suggestme}} -{{inc field_input.tpl with $field=$expire.days }}{{endinc}} +{{include file="field_yesno.tpl" field=$blocktags}} -<div class="field input"> - <span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span> - <div style="display: none;"> - <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;"> - <h3>$expire.advanced</h3> - {{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}} - {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}} - {{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}} - {{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}} - </div> - </div> +{{include file="field_input.tpl" field=$expire}} </div> <div id="settings-default-perms" class="settings-default-perms" > - <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a> + <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> + {{$aclselect}} <div id="settings-default-perms-menu-end"></div> - - <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" > - - <div style="display: none;"> - <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;"> - $aclselect - </div> - </div> - - </div> </div> <br/> <div id="settings-default-perms-end"></div> -$group_select +{{$group_select}} <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="$submit" /> +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> </div> -<h3 class="settings-heading">$h_not</h3> +<h3 class="settings-heading">{{$h_not}}</h3> <div id="settings-notifications"> -<div id="settings-activity-desc">$activity_options</div> - -{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}} -{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}} -{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}} +<div id="settings-activity-desc">{{$activity_options}}</div> +{{*the next two aren't yet implemented *}} +{{*include file="field_checkbox.tpl" field=$post_newfriend*}} +{{*include file="field_checkbox.tpl" field=$post_joingroup*}} +{{include file="field_checkbox.tpl" field=$post_profilechange}} -<div id="settings-notify-desc">$lbl_not</div> +<div id="settings-notify-desc">{{$lbl_not}}</div> <div class="group"> -{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}} -{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}} -{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}} -{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}} -{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}} -{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}} -{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}} -{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}} +{{include file="field_intcheckbox.tpl" field=$notify1}} +{{include file="field_intcheckbox.tpl" field=$notify2}} +{{include file="field_intcheckbox.tpl" field=$notify3}} +{{include file="field_intcheckbox.tpl" field=$notify4}} +{{include file="field_intcheckbox.tpl" field=$notify5}} +{{include file="field_intcheckbox.tpl" field=$notify6}} +{{include file="field_intcheckbox.tpl" field=$notify7}} +{{include file="field_intcheckbox.tpl" field=$notify8}} </div> </div> <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="$submit" /> +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> </div> -<h3 class="settings-heading">$h_advn</h3> -<div id="settings-pagetype-desc">$h_descadvn</div> - -$pagetype +{{if $menus}} +<h3 class="settings-heading">{{$lbl_misc}}</h3> +<div id="settings-menu-desc">{{$menu_desc}}</div> +<div class="settings-channel-menu-div"> +<select name="channel_menu" class="settings-channel-menu-sel"> +{{foreach $menus as $menu }} +<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option> +{{/foreach}} +</select> +</div> <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="$submit" /> +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> </div> +<div id="settings-channel-menu-end"></div> +{{/if}} +</div> diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index d1a635f91..fcddb3f86 100644..100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -1,28 +1,28 @@ -<h1>$title</h1> +<div class="generic-content-wrapper"> +<h1>{{$title}}</h1> <div id="settings-remove-account-link"> -<a href="removeme" title="$permanent" >$removeme</a> +<a href="removeme" title="{{$permanent}}" >{{$removeme}}</a> </div> <form action="settings/account" id="settings-account-form" method="post" autocomplete="off" > -<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=$email }}{{endinc}} +{{include file="field_input.tpl" field=$email}} -<h3 class="settings-heading">$h_pass</h3> +<h3 class="settings-heading">{{$h_pass}}</h3> -{{inc field_password.tpl with $field=$password1 }}{{endinc}} -{{inc field_password.tpl with $field=$password2 }}{{endinc}} +{{include file="field_password.tpl" field=$password1}} +{{include file="field_password.tpl" field=$password2}} <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="$submit" /> +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> </div> -$account_settings - - +{{$account_settings}} +</div> diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl index 84171dc8d..3e447cd0a 100644..100755 --- a/view/tpl/settings_addons.tpl +++ b/view/tpl/settings_addons.tpl @@ -1,10 +1,12 @@ -<h1>$title</h1> +<div class="generic-content-wrapper"> +<h1>{{$title}}</h1> -<form action="settings/addon" method="post" autocomplete="off"> -<input type='hidden' name='form_security_token' value='$form_security_token'> +<form action="settings/featured" method="post" autocomplete="off"> +<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> -$settings_addons +{{$settings_addons}} </form> +</div> diff --git a/view/tpl/settings_connectors.tpl b/view/tpl/settings_connectors.tpl index 07a86e4fe..a8bde4c1e 100644..100755 --- a/view/tpl/settings_connectors.tpl +++ b/view/tpl/settings_connectors.tpl @@ -1,9 +1,9 @@ -<h1>$title</h1> +<h1>{{$title}}</h1> <form action="settings/connectors" method="post" autocomplete="off"> -<input type='hidden' name='form_security_token' value='$form_security_token'> +<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> -$settings_connectors +{{$settings_connectors}} </form> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 2aac64515..a2038b930 100644..100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -1,22 +1,28 @@ -<h1>$ptitle</h1> +<div class="generic-content-wrapper"> +<h1>{{$ptitle}}</h1> <form action="settings/display" id="settings-form" method="post" autocomplete="off" > -<input type='hidden' name='form_security_token' value='$form_security_token'> +<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> -{{inc field_themeselect.tpl with $field=$theme }}{{endinc}} -{{inc field_themeselect.tpl with $field=$mobile_theme }}{{endinc}} -{{inc field_input.tpl with $field=$ajaxint }}{{endinc}} -{{inc field_input.tpl with $field=$itemspage }}{{endinc}} -{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}} +{{include file="field_themeselect.tpl" field=$theme}} +{{include file="field_themeselect.tpl" field=$mobile_theme}} +{{include file="field_input.tpl" field=$ajaxint}} +{{include file="field_input.tpl" field=$itemspage}} +{{include file="field_checkbox.tpl" field=$nosmile}} <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="$submit" /> +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> </div> -{{ if $theme_config }} +<br /> +<a href="pdledit">{{$layout_editor}}</a> +<br /> + +{{if $theme_config}} <h2>Theme settings</h2> -$theme_config -{{ endif }} +{{$theme_config}} +{{/if}} </form> +</div> diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index fd65abebb..a03817f82 100644..100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -1,20 +1,21 @@ -<h1>$title</h1> +<div class="generic-content-wrapper"> +<h1>{{$title}}</h1> <form action="settings/features" method="post" autocomplete="off"> -<input type='hidden' name='form_security_token' value='$form_security_token'> +<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> -{{ for $features as $f }} -<h3 class="settings-heading">$f.0</h3> +{{foreach $features as $f}} +<h3 class="settings-heading">{{$f.0}}</h3> -{{ for $f.1 as $fcat }} - {{ inc $field_yesno with $field=$fcat }}{{endinc}} -{{ endfor }} -{{ endfor }} +{{foreach $f.1 as $fcat}} + {{include file="{{$field_yesno}}" field=$fcat}} +{{/foreach}} +{{/foreach}} <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-features-submit" value="$submit" /> +<input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" /> </div> </form> - +</div> diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl index eb4721d50..ae11c00c8 100644..100755 --- a/view/tpl/settings_nick_set.tpl +++ b/view/tpl/settings_nick_set.tpl @@ -1,5 +1,4 @@ - <div id="settings-nick-wrapper" > -<div id="settings-nickname-desc" class="info-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div> +<div id="settings-nickname-desc" class="info-message">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div> </div> <div id="settings-nick-end" ></div> diff --git a/view/tpl/settings_nick_subdir.tpl b/view/tpl/settings_nick_subdir.tpl deleted file mode 100644 index 303c24df7..000000000 --- a/view/tpl/settings_nick_subdir.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<p> -It appears that your website is located in a subdirectory of the<br /> -$hostname website, so this setting may not work reliably.<br /> -</p> -<p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'. -</p>
\ No newline at end of file diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index 890c4ee6c..9be0035ff 100644..100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -1,31 +1,33 @@ -<h1>$title</h1> +<div class="generic-content-wrapper"> +<h1>{{$title}}</h1> <form action="settings/oauth" method="post" autocomplete="off"> -<input type='hidden' name='form_security_token' value='$form_security_token'> +<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div id="profile-edit-links"> <ul> <li> - <a id="profile-edit-view-link" href="$baseurl/settings/oauth/add">$add</a> + <a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a> </li> </ul> </div> - {{ for $apps as $app }} + {{foreach $apps as $app}} <div class='oauthapp'> - <img src='$app.icon' class="{{ if $app.icon }} {{ else }}noicon{{ endif }}"> - {{ if $app.name }}<h4>$app.name</h4>{{ else }}<h4>$noname</h4>{{ endif }} - {{ if $app.my }} - {{ if $app.oauth_token }} - <div class="settings-submit-wrapper" ><button class="settings-submit" type="submit" name="remove" value="$app.oauth_token">$remove</button></div> - {{ endif }} - {{ endif }} - {{ if $app.my }} - <a href="$baseurl/settings/oauth/edit/$app.client_id" class="icon s22 edit" title="$edit"> </a> - <a href="$baseurl/settings/oauth/delete/$app.client_id?t=$form_security_token" class="icon s22 delete" title="$delete"> </a> - {{ endif }} + <img src='{{$app.icon}}' class="{{if $app.icon}} {{else}}noicon{{/if}}"> + {{if $app.name}}<h4>{{$app.name}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}} + {{if $app.my}} + {{if $app.oauth_token}} + <div class="settings-submit-wrapper" ><button class="settings-submit" type="submit" name="remove" value="{{$app.oauth_token}}">{{$remove}}</button></div> + {{/if}} + {{/if}} + {{if $app.my}} + <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="icon-pencil btn btn-default"></i></a> + <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="icon-remove btn btn-default"></i></a> + {{/if}} </div> - {{ endfor }} + {{/foreach}} </form> +</div> diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl index e6f2abdc2..bf805363c 100644..100755 --- a/view/tpl/settings_oauth_edit.tpl +++ b/view/tpl/settings_oauth_edit.tpl @@ -1,17 +1,17 @@ -<h1>$title</h1> +<h1>{{$title}}</h1> <form 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=$name }}{{ endinc }} -{{ inc field_input.tpl with $field=$key }}{{ endinc }} -{{ inc field_input.tpl with $field=$secret }}{{ endinc }} -{{ inc field_input.tpl with $field=$redirect }}{{ endinc }} -{{ inc field_input.tpl with $field=$icon }}{{ endinc }} +{{include file="field_input.tpl" field=$name}} +{{include file="field_input.tpl" field=$key}} +{{include file="field_input.tpl" field=$secret}} +{{include file="field_input.tpl" field=$redirect}} +{{include file="field_input.tpl" field=$icon}} <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="$submit" /> -<input type="submit" name="cancel" class="settings-submit" value="$cancel" /> +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> +<input type="submit" name="cancel" class="settings-submit" value="{{$cancel}}" /> </div> </form> diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl new file mode 100644 index 000000000..c48912918 --- /dev/null +++ b/view/tpl/show_thing.tpl @@ -0,0 +1,16 @@ +<h2>{{$header}}</h2> +{{if $thing}} +<div class="thing-show"> +{{if $thing.imgurl}}<img src="{{$thing.imgurl}}" width="175" height="175" alt="{{$thing.term}}" />{{/if}} +<a href="{{$thing.url}}" >{{$thing.term}}</a> +</div> +{{if $canedit}} +<div class="thing-edit-links"> +<a href="thing/edit/{{$thing.term_hash}}" title="{{$edit}}" class="btn btn-default" ><i class="icon-pencil thing-edit-icon"></i></a> +<a href="thing/drop/{{$thing.term_hash}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default" ><i class="icon-remove drop-icons"></i></a> +</div> +<div class="thing-edit-links-end"></div> +{{/if}} + +{{/if}} + diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl new file mode 100755 index 000000000..d956a7228 --- /dev/null +++ b/view/tpl/siteinfo.tpl @@ -0,0 +1,17 @@ +<h3>{{$title}}</h3> +<p></p> +<p>{{$description}}</p> +{{if $version}} +<p>{{$version}}{{if $commit}}+{{$commit}}{{/if}}</p> +{{/if}} +<p>{{$web_location}}</p> +<p>{{$visit}}</p> +<p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p> +<p>{{$adminlabel}}</p> +<p>{{$admininfo}}</p> +<p>{{$contact}}</p> +<p>{{$plugins_text}}</p> +{{if $plugins_list}} + <div style="margin-left: 25px; margin-right: 25px;">{{$plugins_list}}</div> +{{/if}} +<p>{{$donate}}</p> diff --git a/view/tpl/smarty3/README b/view/tpl/smarty3/README new file mode 100644 index 000000000..78ff8d9a1 --- /dev/null +++ b/view/tpl/smarty3/README @@ -0,0 +1,4 @@ +view/tpl/smarty3 + +This directory must exist and be writeable by the webserver in order to store compiled template files, which are created dynamically. Please see the installation instructions. + diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl new file mode 100644 index 000000000..34023e03f --- /dev/null +++ b/view/tpl/sources_edit.tpl @@ -0,0 +1,22 @@ +<h1>{{$title}}</h1> + +<div class="descriptive-text">{{$desc}}</div> + +<form action="sources" method="post"> +<input type="hidden" name="source" value="{{$id}}" /> +<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" /> +{{include file="field_input.tpl" field=$name}} +{{include file="field_textarea.tpl" field=$words}} + +<div class="sources-submit-wrapper" > +<input type="submit" name="submit" class="sources-submit" value="{{$submit}}" /> +</div> +</form> +<br /> +<br /> +<a href="sources/{{$id}}/drop">{{$drop}}</a> + + + + + diff --git a/view/tpl/sources_list.tpl b/view/tpl/sources_list.tpl new file mode 100644 index 000000000..5fe50ba98 --- /dev/null +++ b/view/tpl/sources_list.tpl @@ -0,0 +1,15 @@ +<h1>{{$title}}</h1> + +<div class="descriptive-text">{{$desc}}</div> + +<div class="sources-links"> +<a href="sources/new">{{$new}}</a> +</div> + +{{if $sources}} +<ul class="sources-list"> +{{foreach $sources as $source}} +<li><a href="sources/{{$source.src_id}}">{{$source.xchan_name}}</a></li> +{{/foreach}} +</ul> +{{/if}}
\ No newline at end of file diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl new file mode 100644 index 000000000..3c6a4be30 --- /dev/null +++ b/view/tpl/sources_new.tpl @@ -0,0 +1,15 @@ +<h1>{{$title}}</h1> + +<div class="descriptive-text">{{$desc}}</div> + +<form action="sources" method="post"> +<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" /> +{{include file="field_input.tpl" field=$name}} +{{include file="field_textarea.tpl" field=$words}} + +<div class="sources-submit-wrapper" > +<input type="submit" name="submit" class="sources-submit" value="{{$submit}}" /> +</div> +</form> + + diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl index e97b5e8cc..2008193f9 100644..100755 --- a/view/tpl/suggest_friends.tpl +++ b/view/tpl/suggest_friends.tpl @@ -1,16 +1,16 @@ <div class="profile-match-wrapper"> - <a href="$ignlnk" title="$ignore" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a> <div class="profile-match-photo"> - <a href="$url"> - <img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" /> + <a href="{{$entry.url}}"> + <img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.profile}}]" /> </a> </div> + <a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="icon-remove drop-icons btn btn-default"></i></a> <div class="profile-match-break"></div> <div class="profile-match-name"> - <a href="$url" title="$name">$name</a> + <a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a> </div> <div class="profile-match-end"></div> - {{ if $connlnk }} - <div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div> - {{ endif }} -</div>
\ No newline at end of file + {{if $entry.connlnk}} + <div class="profile-match-connect btn btn-default"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="icon-plus connect-icon"></i> {{$entry.conntxt}}</a></div> + {{/if}} +</div> diff --git a/view/tpl/suggest_page.tpl b/view/tpl/suggest_page.tpl new file mode 100755 index 000000000..97837c852 --- /dev/null +++ b/view/tpl/suggest_page.tpl @@ -0,0 +1,9 @@ +<h3>{{$title}}</h3> + +{{if $entries}} +{{foreach $entries as $child}} +{{include file="suggest_friends.tpl" entry=$child}} +{{/foreach}} +{{/if}} + +<div class="clear"></div> diff --git a/view/tpl/suggest_widget.tpl b/view/tpl/suggest_widget.tpl new file mode 100644 index 000000000..eba8b496e --- /dev/null +++ b/view/tpl/suggest_widget.tpl @@ -0,0 +1,10 @@ +<div class="widget"> +<h3>{{$title}}</h3> +{{if $entries}} +{{foreach $entries as $child}} +{{include file="suggest_friends.tpl" entry=$child}} +{{/foreach}} +{{/if}} +<div class="clear"></div> +<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div> +</div>
\ No newline at end of file diff --git a/view/tpl/suggestions.tpl b/view/tpl/suggestions.tpl index 656336496..2d9cba325 100644..100755 --- a/view/tpl/suggestions.tpl +++ b/view/tpl/suggestions.tpl @@ -1,21 +1,20 @@ - <div class="intro-wrapper" > -<p class="intro-desc">$str_notifytype $notify_type</p> -<div class="intro-madeby">$madeby</div> -<div class="intro-fullname" >$fullname</div> -<a class="intro-url-link" href="$url" ><img class="intro-photo lframe" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a> -<div class="intro-note" >$note</div> +<p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p> +<div class="intro-madeby">{{$madeby}}</div> +<div class="intro-fullname" >{{$fullname}}</div> +<a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" /></a> +<div class="intro-note" >{{$note}}</div> <div class="intro-wrapper-end"></div> -<form class="intro-form" action="notifications/$intro_id" method="post"> -<input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" /> -<input class="intro-submit-discard" type="submit" name="submit" value="$discard" /> +<form class="intro-form" action="notifications/{{$intro_id}}" method="post"> +<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" /> +<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" /> </form> <div class="intro-form-end"></div> -<form class="intro-approve-form" action="$request" method="get"> -{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} -<input class="intro-submit-approve" type="submit" name="submit" value="$approve" /> +<form class="intro-approve-form" action="{{$request}}" method="get"> +{{include file="field_checkbox.tpl" field=$hidden}} +<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" /> </form> </div> <div class="intro-end"></div> diff --git a/view/tpl/tag_slap.tpl b/view/tpl/tag_slap.tpl deleted file mode 100644 index 231a13f10..000000000 --- a/view/tpl/tag_slap.tpl +++ /dev/null @@ -1,30 +0,0 @@ - <entry> - <author> - <name>$name</name> - <uri>$profile_page</uri> - <link rel="photo" type="image/jpeg" media:width="80" media:height="80" href="$thumb" /> - <link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb" /> - </author> - - <id>$item_id</id> - <title>$title</title> - <published>$published</published> - <content type="$type" >$content</content> - <link rel="mentioned" href="$accturi" /> - <as:actor> - <as:obj_type>http://activitystrea.ms/schema/1.0/person</as:obj_type> - <id>$profile_page</id> - <title></title> - <link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="$photo"/> - <link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb"/> - <poco:preferredUsername>$nick</poco:preferredUsername> - <poco:displayName>$name</poco:displayName> - </as:actor> - <as:verb>$verb</as:verb> - <as:object> - <as:obj_type></as:obj_type> - </as:object> - <as:target> - <as:obj_type></as:obj_type> - </as:target> - </entry> diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl new file mode 100644 index 000000000..b170f152c --- /dev/null +++ b/view/tpl/thing_edit.tpl @@ -0,0 +1,33 @@ +<h2>{{$thing_hdr}}</h2> +<form action="thing" method="post" > +<input type="hidden" name="term_hash" value="{{$thing_hash}}" /> + +{{if $multiprof }} +<div class="thing-profile-label">{{$profile_lbl}}</div> + +<div class="thing-profile">{{$profile_select}}</div> +<div class="thing-field-end"></div> +{{/if}} + +<div class="thing-verb-label">{{$verb_lbl}}</div> + +<div class="thing-verb">{{$verb_select}}</div> +<div class="thing-field-end"></div> + + +<label class="thing-label" for="thing-term">{{$thing_lbl}}</label> +<input type="text" class="thing-input" id="thing-term" name="term" value="{{$thething}}" /> +<div class="thing-field-end"></div> +<label class="thing-label" for="thing-url">{{$url_lbl}}</label> +<input type="text" class="thing-input" id="thing-url" name="url" value="{{$theurl}}" /> +<div class="thing-field-end"></div> +<label class="thing-label" for="thing-img">{{$img_lbl}}</label> +<input type="text" class="thing-input" id="thing-img" name="img" value="{{$imgurl}}" /> +<div class="thing-field-end"></div> + +{{include file="field_checkbox.tpl" field=$activity}} + +<div class="thing-end"></div> + +<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> +</form> diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl new file mode 100644 index 000000000..e93a1aa65 --- /dev/null +++ b/view/tpl/thing_input.tpl @@ -0,0 +1,33 @@ +<h2>{{$thing_hdr}}</h2> +<form action="thing" method="post" > + +{{if $multiprof }} +<div class="thing-profile-label">{{$profile_lbl}}</div> + +<div class="thing-profile">{{$profile_select}}</div> +<div class="thing-field-end"></div> +{{/if}} + + +<div class="thing-verb-label">{{$verb_lbl}}</div> + +<div class="thing-verb">{{$verb_select}}</div> +<div class="thing-field-end"></div> + + +<label class="thing-label" for="thing-term">{{$thing_lbl}}</label> +<input type="text" class="thing-input" id="thing-term" name="term" /> +<div class="thing-field-end"></div> +<label class="thing-label" for="thing-url">{{$url_lbl}}</label> +<input type="text" class="thing-input" id="thing-url" name="url" /> +<div class="thing-field-end"></div> +<label class="thing-label" for="thing-img">{{$img_lbl}}</label> +<input type="text" class="thing-input" id="thing-img" name="img" /> +<div class="thing-field-end"></div> + +{{include file="field_checkbox.tpl" field=$activity}} + +<div class="thing-end"></div> + +<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> +</form> diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl index f60839e49..ea5c3c281 100644..100755 --- a/view/tpl/threaded_conversation.tpl +++ b/view/tpl/threaded_conversation.tpl @@ -1,13 +1,8 @@ -{{ for $threads as $item }} -{{ inc $item.template }}{{ endinc }} -{{ endfor }} +{{if $photo_item}} +{{$photo_item}} +{{/if}} +{{foreach $threads as $thread_item}} +{{include file="{{$thread_item.template}}" item=$thread_item}} +{{/foreach}} <div id="conversation-end"></div> - -{{ if $dropping }} -<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"> - <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> - <div id="item-delete-selected-desc" >$dropping</div> -</div> -<div id="item-delete-selected-end"></div> -{{ endif }} diff --git a/view/tpl/toggle_mobile_footer.tpl b/view/tpl/toggle_mobile_footer.tpl index 58695f4df..82c0197ba 100644..100755 --- a/view/tpl/toggle_mobile_footer.tpl +++ b/view/tpl/toggle_mobile_footer.tpl @@ -1,2 +1,2 @@ -<a id="toggle_mobile_link" href="$toggle_link">$toggle_text</a> +<a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a> diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl new file mode 100644 index 000000000..a5c6faa99 --- /dev/null +++ b/view/tpl/usermenu.tpl @@ -0,0 +1,16 @@ +<div class="pmenu{{if $class}} {{$class}}{{/if}}"> +{{if $menu.menu_desc}} + <h3 class="pmenu-title">{{$menu.menu_desc}}</h3> +{{/if}} +{{if $edit}} +<a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a> +{{/if}} +{{if $items }} +<ul class="pmenu-body"> +{{foreach $items as $mitem }} +<li class="pmenu-item"><a href="{{$mitem.mitem_link}}" {{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}</a></li> +{{/foreach }} +</ul> +{{/if}} +<div class="pmenu-end"></div> +</div> diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl index d6f01643e..18fed6bb4 100644..100755 --- a/view/tpl/viewcontact_template.tpl +++ b/view/tpl/viewcontact_template.tpl @@ -1,9 +1,9 @@ -<h3>$title</h3> +<h3>{{$title}}</h3> -{{ for $contacts as $contact }} - {{ inc contact_template.tpl }}{{ endinc }} -{{ endfor }} +{{foreach $contacts as $contact}} + {{include file="contact_template.tpl"}} +{{/foreach}} <div id="view-contact-end"></div> -$paginate +{{$paginate}} diff --git a/view/tpl/wall_item.tpl b/view/tpl/wall_item.tpl deleted file mode 100644 index e3b2eca0b..000000000 --- a/view/tpl/wall_item.tpl +++ /dev/null @@ -1,79 +0,0 @@ -<a name="$item.id" ></a> -<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > - <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" > - <div class="wall-item-info" id="wall-item-info-$item.id"> - <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" - onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" - onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> - <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /> - </a> - <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> - <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> - <ul> - $item.item_photo_menu - </ul> - </div> - </div> - <div class="wall-item-photo-end"></div> - <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" > - {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> - {{ else }}<div class="wall-item-lock"></div>{{ endif }} - <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div> - </div> - </div> - <div class="wall-item-author"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> - <div id="wall-item-ago-$item.id" class="wall-item-ago"><abbr class="wall-item-ago-time" title="$item.localtime">$item.ago</abbr>{{ if $item.app }}<span class="item.app">$item.str_app</span>{{ endif }}</div> - - </div> - <div class="wall-item-content" id="wall-item-content-$item.id" > - <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> - <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body - <div class="body-tag"> - {{ for $item.tags as $tag }} - <span class='tag'>$tag</span> - {{ endfor }} - </div> - </div> - </div> - <div class="wall-item-tools" id="wall-item-tools-$item.id"> - {{ if $item.vote }} - <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id"> - <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a> - <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> - {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }} - <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> - </div> - {{ endif }} - {{ if $item.plink }} - <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" class="icon remote-link$item.sparkle"></a></div> - {{ endif }} - {{ if $item.edpost }} - <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> - {{ endif }} - - {{ if $item.star }} - <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a> - <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> - {{ endif }} - {{ if $item.filer }} - <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a> - {{ endif }} - <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > - {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} - </div> - {{ if $item.drop.pagedropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} - <div class="wall-item-delete-end"></div> - </div> - </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div> - <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div> - <div class="wall-item-comment-wrapper" > - $item.comment - </div> - -<div class="wall-item-outside-wrapper-end $item.indent" ></div> -</div> diff --git a/view/tpl/wall_thread.tpl b/view/tpl/wall_thread.tpl deleted file mode 100644 index 0ee9594c8..000000000 --- a/view/tpl/wall_thread.tpl +++ /dev/null @@ -1,120 +0,0 @@ -{{if $item.comment_firstcollapsed}} - <div class="hide-comments-outer"> - <span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span> - </div> - <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;"> -{{endif}} -<div id="thread-wrapper-$item.id" class="thread-wrapper $item.toplevel"> -<a name="$item.id" ></a> -<div class="wall-item-outside-wrapper $item.indent$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-outside-wrapper-$item.id" > - <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" > - <div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id"> - {{ if $item.owner_url }} - <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" > - <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"> - <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a> - </div> - <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div> - {{ endif }} - <div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id" - onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" - onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> - <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a> - <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> - <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> - <ul> - $item.item_photo_menu - </ul> - </div> - - </div> - <div class="wall-item-photo-end"></div> - <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" > - {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> - {{ else }}<div class="wall-item-lock"></div>{{ endif }} - <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div> - </div> - </div> - <div class="wall-item-author"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <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{{ endif }}<br /> - <div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div> - </div> - <div class="wall-item-content" id="wall-item-content-$item.id" > - <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> - <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body - <div class="body-tag"> - {{ for $item.tags as $tag }} - <span class='tag'>$tag</span> - {{ endfor }} - </div> - {{ if $item.has_cats }} - <div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} - </div> - {{ endif }} - - {{ if $item.has_folders }} - <div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} - </div> - {{ endif }} - </div> - </div> - <div class="wall-item-tools" id="wall-item-tools-$item.id"> - {{ if $item.vote }} - <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id"> - <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a> - {{ if $item.nolike }} - <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> - {{ endif }} - {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }} - </div> - {{ endif }} - {{ if $item.plink }} - <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link$item.sparkle"></a></div> - {{ endif }} - {{ if $item.edpost }} - <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> - {{ endif }} - - {{ if $item.star }} - <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a> - <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> - {{ endif }} - {{ if $item.filer }} - <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a> - {{ endif }} - <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> - - <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > - {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} - </div> - {{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} - <div class="wall-item-delete-end"></div> - </div> - </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div> - <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div> - - {{ if $item.threaded }} - {{ if $item.comment }} - <div class="wall-item-comment-wrapper $item.indent" > - $item.comment - </div> - {{ endif }} - {{ endif }} - -<div class="wall-item-outside-wrapper-end $item.indent" ></div> -</div> -{{ for $item.children as $item }} - {{ inc $item.template }}{{ endinc }} -{{ endfor }} - -{{ if $item.flatten }} -<div class="wall-item-comment-wrapper" > - $item.comment -</div> -{{ endif }} -</div> -{{if $item.comment_lastcollapsed}}</div>{{endif}} diff --git a/view/tpl/wallmessage.tpl b/view/tpl/wallmessage.tpl deleted file mode 100644 index 66b2bc3a0..000000000 --- a/view/tpl/wallmessage.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -<h3>$header</h3> - -<h4>$subheader</h4> - -<div id="prvmail-wrapper" > -<form id="prvmail-form" action="wallmessage/$nickname" method="post" > - -$parent - -<div id="prvmail-to-label">$to</div> -$recipname - -<div id="prvmail-subject-label">$subject</div> -<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" /> - -<div id="prvmail-message-label">$yourmessage</div> -<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea> - - -<div id="prvmail-submit-wrapper" > - <input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" /> - <div id="prvmail-link-wrapper" > - <div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div> - </div> - <div id="prvmail-rotator-wrapper" > - <img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> - </div> -</div> -<div id="prvmail-end"></div> -</form> -</div> diff --git a/view/tpl/wallmsg-header.tpl b/view/tpl/wallmsg-header.tpl deleted file mode 100644 index cb3922572..000000000 --- a/view/tpl/wallmsg-header.tpl +++ /dev/null @@ -1,82 +0,0 @@ - -<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> -<script language="javascript" type="text/javascript"> - -var plaintext = '$editselect'; - -if(plaintext != 'none') { - tinyMCE.init({ - theme : "advanced", - mode : "specific_textareas", - editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode,paste", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "center", - theme_advanced_blockformats : "blockquote,code", - gecko_spellcheck : true, - paste_text_sticky : true, - entity_encoding : "raw", - add_unload_trigger : false, - remove_linebreaks : false, - force_p_newlines : false, - force_br_newlines : true, - forced_root_block : '', - convert_urls: false, - content_css: "$baseurl/view/custom_tinymce.css", - //Character count - theme_advanced_path : false, - setup : function(ed) { - ed.onInit.add(function(ed) { - ed.pasteAsPlainText = true; - var editorId = ed.editorId; - var textarea = $('#'+editorId); - if (typeof(textarea.attr('tabindex')) != "undefined") { - $('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex')); - textarea.attr('tabindex', null); - } - }); - } - }); -} -else - $("#prvmail-text").contact_autocomplete(baseurl+"/acl"); - - -</script> -<script> - - function jotGetLink() { - reply = prompt("$linkurl"); - if(reply && reply.length) { - $('#profile-rotator').show(); - $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); - }); - } - } - - function linkdropper(event) { - var linkFound = event.dataTransfer.types.contains("text/uri-list"); - if(linkFound) - event.preventDefault(); - } - - function linkdrop(event) { - var reply = event.dataTransfer.getData("text/uri-list"); - event.target.textContent = reply; - event.preventDefault(); - if(reply && reply.length) { - $('#profile-rotator').show(); - $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); - }); - } - } - -</script> - diff --git a/view/tpl/wallwall_item.tpl b/view/tpl/wallwall_item.tpl deleted file mode 100644 index 9c824fb3b..000000000 --- a/view/tpl/wallwall_item.tpl +++ /dev/null @@ -1,86 +0,0 @@ -<a name="$item.id" ></a> -<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" > - <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" > - <div class="wall-item-info wallwall" id="wall-item-info-$item.id"> - <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" > - <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"> - <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a> - </div> - <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div> - <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" - onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" - onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> - <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a> - <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> - <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> - <ul> - $item.item_photo_menu - </ul> - </div> - - </div> - <div class="wall-item-photo-end"></div> - <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" > - {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> - {{ else }}<div class="wall-item-lock"></div>{{ endif }} - <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div> - </div> - </div> - <div class="wall-item-author"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" 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<br /> - <div id="wall-item-ago-$item.id" class="wall-item-ago"><abbr class="wall-item-ago-time" title="$item.localtime">$item.ago</abbr>{{ if $item.app }}<span class="item.app">$item.str_app</span>{{ endif }}</div> - </div> - <div class="wall-item-content" id="wall-item-content-$item.id" > - <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> - <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body - <div class="body-tag"> - {{ for $item.tags as $tag }} - <span class='tag'>$tag</span> - {{ endfor }} - </div> - </div> - </div> - <div class="wall-item-tools" id="wall-item-tools-$item.id"> - {{ if $item.vote }} - <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id"> - <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a> - <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> - {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }} - <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> - </div> - {{ endif }} - {{ if $item.plink }} - <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" class="icon remote-link$item.sparkle"></a></div> - {{ endif }} - {{ if $item.edpost }} - <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> - {{ endif }} - - {{ if $item.star }} - <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a> - <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> - {{ endif }} - {{ if $item.filer }} - <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a> - {{ endif }} - - <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > - {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} - </div> - {{ if $item.drop.pagedropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} - <div class="wall-item-delete-end"></div> - </div> - </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div> - <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div> - <div class="wall-item-comment-separator"></div> - <div class="wall-item-comment-wrapper"> - $item.comment - </div> - -<div class="wall-item-outside-wrapper-end $item.indent" ></div> -</div> - diff --git a/view/tpl/wallwall_thread.tpl b/view/tpl/wallwall_thread.tpl deleted file mode 100644 index ecfb65aef..000000000 --- a/view/tpl/wallwall_thread.tpl +++ /dev/null @@ -1,107 +0,0 @@ -{{if $item.comment_firstcollapsed}} - <div class="hide-comments-outer"> - <span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span> - </div> - <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;"> -{{endif}} -<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel"> -<a name="$item.id" ></a> -<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" > - <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" > - <div class="wall-item-info wallwall" id="wall-item-info-$item.id"> - <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" > - <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"> - <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a> - </div> - <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div> - <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" - onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" - onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> - <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a> - <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> - <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> - <ul> - $item.item_photo_menu - </ul> - </div> - - </div> - <div class="wall-item-photo-end"></div> - <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" > - {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> - {{ else }}<div class="wall-item-lock"></div>{{ endif }} - <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div> - </div> - </div> - <div class="wall-item-author"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" 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<br /> - <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div> - </div> - <div class="wall-item-content" id="wall-item-content-$item.id" > - <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> - <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body - <div class="body-tag"> - {{ for $item.tags as $tag }} - <span class='tag'>$tag</span> - {{ endfor }} - </div> - </div> - </div> - <div class="wall-item-tools" id="wall-item-tools-$item.id"> - {{ if $item.vote }} - <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id"> - <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a> - <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> - {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }} - <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> - </div> - {{ endif }} - {{ if $item.plink }} - <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" class="icon remote-link$item.sparkle"></a></div> - {{ endif }} - {{ if $item.edpost }} - <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> - {{ endif }} - - {{ if $item.star }} - <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a> - <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> - {{ endif }} - {{ if $item.filer }} - <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a> - {{ endif }} - - <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > - {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} - </div> - {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} - <div class="wall-item-delete-end"></div> - </div> - </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div> - <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div> - - {{ if $item.threaded }} - {{ if $item.comment }} - <div class="wall-item-comment-wrapper $item.indent" > - $item.comment - </div> - {{ endif }} - {{ endif }} - -<div class="wall-item-outside-wrapper-end $item.indent" ></div> -</div> -{{ for $item.children as $item }} - {{ inc $item.template }}{{ endinc }} -{{ endfor }} - -{{ if $item.flatten }} -<div class="wall-item-comment-wrapper" > - $item.comment -</div> -{{ endif }} -</div> -{{if $item.comment_lastcollapsed}}</div>{{endif}} diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl new file mode 100644 index 000000000..4ae153423 --- /dev/null +++ b/view/tpl/webpagelist.tpl @@ -0,0 +1,37 @@ +{{if $pages}} + + <div id="pagelist-content-wrapper" class="generic-content-wrapper"> + <table class="webpage-list-table"> + <tr><td>{{$actions_txt}}</td><td>{{$pagelink_txt}}</td><td>{{$title_txt}}</td><td>{{$created_txt}}</td><td>{{$edited_txt}}</td></tr> + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + <tr> + <td> + {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}} + {{if $view}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}} + {{if $preview}}<a href="page/{{$channel}}/{{$item.pagetitle}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn btn-default"></i></a> {{/if}} + </td> + <td> + {{if $view}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a> + {{else}}{{$item.pagetitle}} + {{/if}} + </td> + <td> + {{$item.title}} + </td> + <td> + {{$item.created}} + </td> + <td> + {{$item.edited}} + </td> + </tr> + {{/foreach}} + {{/foreach}} + + </table> + </div> + + <div class="clear"></div> + +{{/if}} diff --git a/view/tpl/write_pages.tpl b/view/tpl/write_pages.tpl new file mode 100644 index 000000000..53146ee30 --- /dev/null +++ b/view/tpl/write_pages.tpl @@ -0,0 +1,3 @@ +<div id="write-pages" class="bigwidget"> +<span id="wp-new"><a href="{{$newurl}}">{{$new}}</a></span> <span id="wp-edit"><a href="{{$editurl}}">{{$edit}}</a></span> +</div> diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index 4e3f69b0c..929965727 100644..100755 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -1,15 +1,20 @@ <div class="vcard"> -<div class="fn">$name</div> -<div id="profile-photo-wrapper"><img class="vcard-photo photo" src="$photo" alt="name" /></div> +<div class="fn">{{$name}}</div> +<div id="profile-photo-wrapper"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></div> </div> - +{{if $mode != 'mail'}} <div id="profile-extra-links"> <ul> -{{ if $connect }} - <li><a id="follow-link" href="follow?f=&url=$follow">$connect</a></li> -{{ endif }} +{{if $connect}} + <li><a id="follow-link" href="follow?f=&url={{$follow}}">{{$connect}}</a></li> +{{/if}} +{{if $newwin}} + <li><a id="visit-chan-link" href="{{$url}}" title="{{$newtit}}" target="_blank" >{{$newwin}}</a></li> +{{/if}} </ul> -</div> + +</div> +{{/if}} diff --git a/view/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl index 94e3c2146..57f383788 100644..100755 --- a/view/tpl/xrd_host.tpl +++ b/view/tpl/xrd_host.tpl @@ -2,17 +2,10 @@ <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0' xmlns:hm='http://host-meta.net/xrd/1.0'> - <hm:Host>$zhost</hm:Host> + <hm:Host>{{$zhost}}</hm:Host> - <Link rel='lrdd' template='$domain/xrd/?uri={uri}' /> - <Link rel='acct-mgmt' href='$domain/amcd' /> - <Link rel='http://services.mozilla.com/amcd/0.1' href='$domain/amcd' /> + <Link rel='lrdd' template='{{$zroot}}/xrd/?uri={uri}' /> <Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" - href="$domain/oexchange/xrd" /> - - <Property xmlns:mk="http://salmon-protocol.org/ns/magic-key" - type="http://salmon-protocol.org/ns/magic-key" - mk:key_id="1">$bigkey</Property> - + href="{{$zroot}}/oexchange/xrd" /> </XRD> diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl index 3a6ca7ba7..20d438dd5 100644..100755 --- a/view/tpl/xrd_person.tpl +++ b/view/tpl/xrd_person.tpl @@ -1,29 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> - <Subject>$accturi</Subject> - <Alias>$accturi</Alias> - <Alias>$profile_url</Alias> + <Subject>{{$accturi}}</Subject> - <Link rel="http://purl.org/macgirvin/dfrn/1.0" - href="$profile_url" /> <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" - href="$atom" /> + href="{{$atom}}" /> <Link rel="http://webfinger.net/rel/profile-page" type="text/html" - href="$profile_url" /> - <Link rel="http://microformats.org/profile/hcard" - type="text/html" - href="$hcard_url" /> + href="{{$profile_url}}" /> <Link rel="http://portablecontacts.net/spec/1.0" - href="$poco_url" /> + href="{{$poco_url}}" /> <Link rel="http://webfinger.net/rel/avatar" type="image/jpeg" - href="$photo" /> + href="{{$photo}}" /> - <Property xmlns:mk="http://salmon-protocol.org/ns/magic-key" - type="http://salmon-protocol.org/ns/magic-key" - mk:key_id="1">$bigkey</Property> - </XRD> |