diff options
Diffstat (limited to 'view/tpl')
46 files changed, 275 insertions, 97 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index c285e56d1..30abcc6b3 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper"> <h2>{{$header}}</h2> <h3>{{$addr}}</h3> @@ -40,7 +41,9 @@ {{if $is_pending}} +<div class="abook-pending-contact"> {{include file="field_checkbox.tpl" field=$unapproved}} +</div> {{/if}} <br /> @@ -82,3 +85,4 @@ </form> </div> +</div> diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index acf58668d..fdf070aa2 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -16,6 +16,7 @@ <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.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> diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl new file mode 100755 index 000000000..a9f250652 --- /dev/null +++ b/view/tpl/admin_hubloc.tpl @@ -0,0 +1,22 @@ +<div class="generic-content-wrapper" id='adminpage'> + <h1>{{$title}} - {{$page}}</h1> + + <form action="{{$baseurl}}/admin/hubloc" method="post"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + + <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> + </tr>{{/foreach}} + </tbody> + </table> + + +</div> diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl index e5412429f..3d2adc660 100755 --- a/view/tpl/admin_logs.tpl +++ b/view/tpl/admin_logs.tpl @@ -1,4 +1,4 @@ -<div id='adminpage'> +<div class="generic-content-wrapper" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/logs" method="post"> diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 01c178c3e..729ba5dc8 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,4 +1,4 @@ -<div id='adminpage'> +<div class="generic-content-wrapper" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <ul id='pluginslist'> diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index 47c33bec3..f72142e41 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -1,4 +1,4 @@ -<div id='adminpage'> +<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> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 76dae6ea1..d0a5254fe 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -34,7 +34,7 @@ }); }); </script> -<div id='adminpage'> +<div id="adminpage" class="generic-content-wrapper"> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/site" method="post"> @@ -44,10 +44,10 @@ {{include file="field_textarea.tpl" field=$banner}} {{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_select.tpl" field=$ssl_policy}} + {{include file="field_select.tpl" field=$theme_mobile}} + {{include file="field_select.tpl" field=$theme_accessibility}} + {{include file="field_input.tpl" field=$site_channel}} + <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index 88d87c35d..d3665626f 100755 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -1,4 +1,4 @@ -<div id='adminpage'> +<div class="generic-content-wrapper" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <dl> diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 86389e9f2..770df7eba 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -10,7 +10,7 @@ return false; } </script> -<div id='adminpage'> +<div class = "generic-content-wrapper" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/users" method="post"> diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index e5bf3acce..53a8c0f6b 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -41,7 +41,7 @@ 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; diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 317384661..af6b36b1d 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -7,6 +7,11 @@ {{/foreach}} {{/if}} +{{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> diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index f8add5d15..7b6113105 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -16,30 +16,30 @@ </div> <div class="comment-edit-photo-end"></div> <ul class="comment-edit-bb-{{$id}}"> - <li><a class="editicon boldbb shadow" + <li><i class="icon-bold shadow comment-icon" style="cursor: pointer;" title="{{$edbold}}" - onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li> - <li><a class="editicon italicbb shadow" + onclick="insertFormatting('{{$comment}}','b', {{$id}});"></i></li> + <li><i class="icon-italic shadow comment-icon" style="cursor: pointer;" title="{{$editalic}}" - onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li> - <li><a class="editicon underlinebb shadow" + onclick="insertFormatting('{{$comment}}','i', {{$id}});"></i></li> + <li><i class="icon-underline shadow comment-icon" style="cursor: pointer;" title="{{$eduline}}" - onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li> - <li><a class="editicon quotebb shadow" + onclick="insertFormatting('{{$comment}}','u', {{$id}});"></i></li> + <li><i class="icon-quote-left shadow comment-icon" style="cursor: pointer;" title="{{$edquote}}" - onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li> - <li><a class="editicon codebb shadow" + onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></i></li> + <li><i class="icon-terminal shadow comment-icon" style="cursor: pointer;" title="{{$edcode}}" - onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li> - <li><a class="editicon imagebb shadow" + onclick="insertFormatting('{{$comment}}','code', {{$id}});"></i></li> + <li><i class="icon-camera shadow comment-icon" style="cursor: pointer;" title="{{$edimg}}" - onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li> - <li><a class="editicon urlbb shadow" + onclick="insertFormatting('{{$comment}}','img', {{$id}});"></i></li> + <li><i class="icon-link shadow comment-icon" style="cursor: pointer;" title="{{$edurl}}" - onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li> - <li><a class="editicon videobb shadow" + onclick="insertFormatting('{{$comment}}','url', {{$id}});"></i></li> + <li><i class="icon-facetime-video shadow comment-icon" style="cursor: pointer;" title="{{$edvideo}}" - onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li> + onclick="insertFormatting('{{$comment}}','video', {{$id}});"></i></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> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 806e2ba02..c44e2253a 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -31,14 +31,15 @@ </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> + {{if $item.lock}}<i class="wall-item-lock icon-lock lockview" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i> {{else}}<div class="wall-item-lock"></div>{{/if}} <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}}{{/if}}<br /> - <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"><span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/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}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</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> @@ -62,33 +63,33 @@ </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> + <i class="icon-thumbs-up-alt item-tool" title="{{$item.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></i> {{/if}} {{if $item.dislike}} - <a href="#" class="icon dislike item-tool" title="{{$item.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a> + <i class="icon-thumbs-down-alt item-tool" title="{{$item.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></i> {{/if}} {{if $item.share}} - <a href="#" class="icon recycle item-tool" title="{{$item.share.0}}" onclick="jotShare({{$item.id}}); return false"></a> + <i class="icon-retweet item-tool" title="{{$item.share.0}}" onclick="jotShare({{$item.id}}); return false"></i> {{/if}} {{if $item.plink}} - <a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon item-tool remote-link{{$item.sparkle}}"></a> + <i class="icon-external-link item-tool" onclick="window.location.href='{{$item.plink.href}}'; return false;" title="{{$item.plink.title}}"></i> {{/if}} {{if $item.edpost}} - <a class="editpost icon pencil item-tool" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a> + <i class="editpost icon-pencil item-tool" onclick="window.location.href='{{$item.edpost.0}}'; return false;" title="{{$item.edpost.1}}"></i> {{/if}} {{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> + <i id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item item-tool {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{/if}} {{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> + <i id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon-tag item-tool" title="{{$item.tagger.tagit}}"></i> {{/if}} {{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> + <i id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon-folder-open item-tool" title="{{$item.filer}}"></i> {{/if}} <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> <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>{{/if}} + {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ><i class="icon-remove drop-icons"></i></a>{{/if}} </div> {{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="wall-item-delete-end"></div> diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl new file mode 100644 index 000000000..eb082dc37 --- /dev/null +++ b/view/tpl/design_tools.tpl @@ -0,0 +1,7 @@ +<div id="design-tools" class="widget design-tools"> +<h3>{{$title}}</h3> +<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> +</div> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index c6c0ab028..35bbbe0fd 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -1,13 +1,16 @@ <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="generic-content-wrapper"> - <div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div> - {{if $entry.connect}} - <div class="directory-connect"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div> - {{/if}} - <div class="contact-details">{{$entry.details}}</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> +{{if $entry.connect}} +<div class="directory-connect"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div> +{{/if}} +<div class="contact-details">{{$entry.details}}</div> +</div> </div> diff --git a/view/tpl/filestorage.tpl b/view/tpl/filestorage.tpl new file mode 100644 index 000000000..995b52cc8 --- /dev/null +++ b/view/tpl/filestorage.tpl @@ -0,0 +1,22 @@ +{{if $files}} + + <div class="generic-content-wrapper"> + {{if $limit}}{{$limitlabel}}{{$limit}}{{/if}} {{if $used}} {{$usedlabel}}{{$used}}{{/if}} + + + {{foreach $files as $key => $items}} + {{foreach $items as $item}} + <div class="files-list-item"> + <a href="attach/{{$item.download}}">{{$download}}</a> | + <a href="{{$baseurl}}/{{$item.id}}/delete">{{$delete}} + <a href="page/{{$channel}}/{{$item.title}}">{{$title}}</a> {{$item.title}} | + {{$item.size}} bytes + +</div> + {{/foreach}} + {{/foreach}} + </div> + + <div class="clear"></div> + +{{/if}} diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index 350f8d910..b0597e9b6 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -4,5 +4,8 @@ <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}}" /> </form> + {{if $abook_usage_message}} + <div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div> + {{/if}} </div> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 8092a7047..12978038c 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -9,6 +9,10 @@ <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" /> + + {{$mimeselect}} + {{$layoutselect}} + <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> @@ -25,26 +29,26 @@ <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 id="wall-image-upload-div" ><i id="wall-image-upload" class="icon-camera jot-icons" title="{{$upload}}"></i></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 id="wall-file-upload-div" ><i id="wall-file-upload" class="icon-paper-clip jot-icons" title="{{$attach}}"></i></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> + <i id="profile-link" class="icon-link jot-icons" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></i> </div> <div id="profile-video-wrapper" style="display: {{$visitor}};" > - <a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a> + <i id="profile-video" class="icon-facetime-video jot-icons" title="{{$video}}" onclick="jotVideoURL();return false;"></i> </div> <div id="profile-audio-wrapper" style="display: {{$visitor}};" > - <a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a> + <i id="profile-audio" class="icon-volume-up jot-icons" title="{{$audio}}" onclick="jotAudioURL();return false;"></i> </div> <div id="profile-location-wrapper" style="display: {{$visitor}};" > - <a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a> + <i id="profile-location" class="icon-globe jot-icons" title="{{$setloc}}" onclick="jotGetLocation();return false;"></i> </div> <div id="profile-nolocation-wrapper" style="display: none;" > - <a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a> + <i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i> </div> <div id="profile-rotator-wrapper" style="display: {{$visitor}};" > <div id="profile-rotator"></div> diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl index d2cf0f742..60ba14d8c 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> + <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/mail_display.tpl b/view/tpl/mail_display.tpl index 26e02529a..7280f1e84 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper"> {{foreach $mails as $mail}} {{include file="mail_conv.tpl"}} {{/foreach}} @@ -7,3 +8,4 @@ {{else}} {{$unknown_text}} {{/if}} +</div> diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index fc4af8ddd..4d8a744ac 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,7 +1,7 @@ -<div class="mail-list-wrapper"> +<div class="generic-content-wrapper" id="mail-list-wrapper"> <span class="mail-delete"><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></span> - <a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a> - <span class="mail-from">{{$from_name}}</span> - <span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span> - <span class="mail-date" title="{{$date}}">{{$date}}</span> + <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="message/{{$id}}" class="mail-link">{{$subject}}</a></span> + <span class="mail-list" title="{{$date}}">{{$date}}</span> </div> diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 4ee382a27..19428aca2 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -7,7 +7,7 @@ {{if $menus }} <ul id="menulist"> {{foreach $menus as $m }} -<li><a href="menu/{{$m.menu_id}}" title="{{$hintedit}}">{{$edit}}</a> | <a href="menu/{{$m.menu_id}}/drop" title={{$hintdrop}}>{{$drop}}</a> <a href="mitem/{{$m.menu_id}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></li> +<li><a href="menu/{{$m.menu_id}}" title="{{$hintedit}}">{{$edit}}</a> | <a href="menu/{{$m.menu_id}}/drop" title={{$hintdrop}}>{{$drop}}</a> <a href="mitem/{{$m.menu_id}}/new" title="{{$hintcontent}}">{{$m.menu_name}}</a></li> {{/foreach}} </ul> {{/if}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 7c26609c3..f27afed09 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -29,14 +29,14 @@ {{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> + <i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}} fakelink nav-icon" onclick="window.location.href='{{$nav.lock.0}}'; return false;" title="{{$nav.lock.3}}" ></i> </li> {{/if}} {{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}}" >{{$nav.network.1}}</a> + <a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th nav-icon"></i></a> <span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span> <ul id="nav-network-menu" class="menu-popup notify-menus" rel="network"> <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> @@ -48,7 +48,7 @@ {{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}}" >{{$nav.home.1}}</a> + <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home nav-icon"></i></a> <span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span> <ul id="nav-home-menu" class="menu-popup notify-menus" rel="home"> <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> @@ -63,7 +63,7 @@ {{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}}" >{{$nav.messages.1}}</a> + <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope nav-icon"></i></a> <span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span> <ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages"> <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> @@ -75,7 +75,7 @@ {{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}}" >{{$nav.all_events.1}}</a> + <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar nav-icon"></i></a> <span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span> <ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events"> <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> @@ -87,7 +87,7 @@ {{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}}" >{{$nav.intros.1}}</a> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user nav-icon"></i></a> <span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span> <ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros"> <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> @@ -98,7 +98,7 @@ {{if $nav.notifications}} <li id="nav-notify-linkmenu" class="nav-menu fakelink {{$sel.notifications}}"> - <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation nav-icon"></i></a> <span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span> <ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify"> <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> @@ -113,19 +113,19 @@ {{if $nav.directory}} <li id="nav-directory-link" class="nav-menu {{$sel.directory}}"> - <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}">{{$nav.directory.1}}</a> + <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap nav-icon"></i></a> </li> {{/if}} {{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> + <a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question nav-icon"></i></a> </li> {{/if}} {{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> + <a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs nav-icon"></i></a> <ul id="nav-apps-menu" class="menu-popup"> {{foreach $apps as $ap}} <li>{{$ap}}</li> @@ -136,7 +136,7 @@ <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();" /> + <input class="icon-search" id="nav-search-text" type="text" value="" placeholder="" name="search" title="{{$nav.search.3}}" onclick="this.submit();" /> </form> </li> <div id="nav-search-spinner"></div> @@ -148,5 +148,5 @@ <li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> </ul> -<div id="langselector" >{{$langselector}}</div> +{{if $langselector}}<div id="langselector" >{{$langselector}}</div>{{/if}} <div id="panel" style="display: none;"></div> diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index 7b4fdb96e..d8175bdd2 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -1,6 +1,6 @@ <div class="page"> -<div class="page-content-wrapper" id="page-content-wrapper" > +<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> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 72c0830cf..c3cbb064b 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,10 +1,12 @@ <div id="peoplefind-sidebar" class="widget"> <h3>{{$findpeople}}</h3> <div id="peoplefind-desc">{{$desc}}</div> - <form action="dirfind" method="post" /> + <form action="directory" 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}}" /> </form> + {{if $similar}} <div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div> + {{/if}} <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" >{{$random}}</a></div> {{if $inv}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index f825dcba6..cdaae67e4 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -7,12 +7,12 @@ {{if $tools}} <a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a> {{/if}} -{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/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>{{/if}} +{{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}}" rel="prettyPhoto"><img src="{{$photo.src}}" /></a></div> -{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}} +{{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}} diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 707024cb9..102c4d872 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,6 +1,6 @@ <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" > <input type="hidden" id="photos-upload-source" name="source" value="photos" /> diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl index 009fa60a6..6720d3628 100755 --- a/view/tpl/posted_date_widget.tpl +++ b/view/tpl/posted_date_widget.tpl @@ -3,7 +3,7 @@ <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script> <select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="{{$size}}"> {{foreach $dates as $d}} -<option value="{{$url}}/{{$d.1}}/{{$d.2}}" >{{$d.0}}</option> +<option value="{{$url}}?dend={{$d.1}}&dbegin={{$d.2}}" >{{$d.0}}</option> {{/foreach}} </select> </div> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index db48a8509..9f17a0ffa 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -1,3 +1,4 @@ +<div id="profile-content-wrapper" class="generic-content-wrapper"> <h2>{{$title}}</h2> <dl id="aprofile-fullname" class="aprofile"> @@ -179,4 +180,4 @@ {{/foreach}} {{/if}} - +</div> diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl index 27c7d86a0..ea336f969 100755 --- a/view/tpl/saved_searches_aside.tpl +++ b/view/tpl/saved_searches_aside.tpl @@ -4,8 +4,8 @@ <ul id="saved-search-ul"> {{foreach $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> + <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" ></i></a> <a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&search={{$search.encodedterm}}">{{$search.displayterm}}</a> </li> {{/foreach}} diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index bb796346d..5953522dc 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -17,15 +17,14 @@ </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> + {{if $item.lock}}<i class="wall-item-lock icon-lock lockview" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></i> {{else}}<div class="wall-item-lock"></div>{{/if}} <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 class="wall-item-ago" id="wall-item-ago-{{$item.id}}"><span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> + <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><br /> + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}" > 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 194b90e80..10378e599 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper"> <h1>{{$ptitle}}</h1> {{$nickname_block}} @@ -12,6 +13,7 @@ {{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}}" /> @@ -100,9 +102,9 @@ <div id="settings-notifications"> <div id="settings-activity-desc">{{$activity_options}}</div> - -{{include file="field_checkbox.tpl" field=$post_newfriend}} -{{include file="field_checkbox.tpl" field=$post_joingroup}} +{{*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}} @@ -125,3 +127,4 @@ <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> </div> +</div> diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 198ac9565..fcddb3f86 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper"> <h1>{{$title}}</h1> @@ -24,5 +25,4 @@ {{$account_settings}} - - +</div> diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl index cad6a2274..3e447cd0a 100755 --- a/view/tpl/settings_addons.tpl +++ b/view/tpl/settings_addons.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper"> <h1>{{$title}}</h1> @@ -8,3 +9,4 @@ </form> +</div> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 2645ce740..ddd3ca56d 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper"> <h1>{{$ptitle}}</h1> <form action="settings/display" id="settings-form" method="post" autocomplete="off" > @@ -20,3 +21,4 @@ {{/if}} </form> +</div> diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index 47d755ee6..a03817f82 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper"> <h1>{{$title}}</h1> @@ -17,4 +18,4 @@ </div> </form> - +</div> diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index 11c61a43e..fa1d0946f 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper"> <h1>{{$title}}</h1> @@ -29,3 +30,4 @@ {{/foreach}} </form> +</div> diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl new file mode 100644 index 000000000..6e9cee32b --- /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_xchan" name="xchan" value="{{$xchan}}" /> +{{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..267245ae4 --- /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_xchan" name="xchan" value="{{$xchan}}" /> +{{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/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl index 4bfcde896..2d71f01ab 100755 --- a/view/tpl/threaded_conversation.tpl +++ b/view/tpl/threaded_conversation.tpl @@ -1,3 +1,6 @@ +{{if $photo_item}} +{{$photo_item}} +{{/if}} {{foreach $threads as $thread_item}} {{include file="{{$thread_item.template}}" item=$thread_item}} {{/foreach}} diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index b09dc9f38..9a189230b 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -2,7 +2,7 @@ {{if $pages}} - <div id="pagelist-content-wrapper"> + <div id="pagelist-content-wrapper" class="generic-content-wrapper"> {{foreach $pages as $key => $items}} {{foreach $items as $item}} <div class="page-list-item"> diff --git a/view/tpl/write_pages.tpl b/view/tpl/write_pages.tpl index f6668ceb1..53146ee30 100644 --- a/view/tpl/write_pages.tpl +++ b/view/tpl/write_pages.tpl @@ -1,3 +1,3 @@ <div id="write-pages" class="bigwidget"> -<center><span id="wp-new"><a href="{{$newurl}}">{{$new}}</a></span> <span id="wp-edit"><a href="{{$editurl}}">{{$edit}}</a></span></center> +<span id="wp-new"><a href="{{$newurl}}">{{$new}}</a></span> <span id="wp-edit"><a href="{{$editurl}}">{{$edit}}</a></span> </div> |