diff options
Diffstat (limited to 'view/tpl')
37 files changed, 218 insertions, 93 deletions
diff --git a/view/tpl/404.tpl b/view/tpl/404.tpl index 518ad1d29..c9b51a63b 100755 --- a/view/tpl/404.tpl +++ b/view/tpl/404.tpl @@ -1 +1,3 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$message}}</h1> +</div> diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 0a7cf2d4d..1ed3baafa 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -33,8 +33,13 @@ {{/foreach}} <div class="section-content-info-wrapper"> <div> - {{$addr_text}} <strong>'{{$addr}}'</strong> + {{$addr_text}} <strong>'{{$addr}}'</strong> </div> + {{if $locstr}} + <div> + {{$loc_text}} {{$locstr}} + </div> + {{/if}} {{if $last_update}} <div> {{$lastupdtext}} {{$last_update}} diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl index 85b476266..56b70bbee 100644 --- a/view/tpl/admin_queue.tpl +++ b/view/tpl/admin_queue.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h3>{{$banner}}</h3> {{if $hasentries}} @@ -11,4 +12,4 @@ </table> -{{/if}}
\ No newline at end of file +{{/if}} diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 26434b20a..4add59a0d 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -49,7 +49,9 @@ {{include file="field_input.tpl" field=$frontpage}} {{include file="field_checkbox.tpl" field=$mirror_frontpage}} {{include file="field_checkbox.tpl" field=$login_on_homepage}} - + {{if $directory_server}} + {{include file="field_select.tpl" field=$directory_server}} + {{/if}} <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 727be5eba..3394cd2ae 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,23 +1,25 @@ <div class="app-container"> -<div class="app-detail"> -<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" style="text-align:center;">{{$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}} -</div> -{{if $install || $update || $delete }} -<div class="app-tools"> -<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-trash drop-icons"></i></button>{{/if}} -</form> -{{/if}} -{{/if}} -</div> + <div class="app-detail"> + <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" style="text-align:center;">{{$app.name}}</div> + </a> + </div> + {{if $app.type !== 'system'}} + {{if $purchase}} + <div class="app-purchase"> + <a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="icon-external"></i></a> + </div> + {{/if}} + {{if $install || $update || $delete }} + <div class="app-tools"> + <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-trash drop-icons"></i></button>{{/if}} + </form> + </div> + {{/if}} + {{/if}} </div> diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 9f95d2999..18576fd56 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,11 +1,5 @@ -<h1>{{$room_name}}</h1> -<div id="chatContainer"> - - <div id="chatTopBar"> - <div id="chatLineHolder"></div> - </div> +<div class="generic-content-wrapper-styled"> - <div id="chatSide"> {{if $is_owner}} <div id="chatDrop"> <form id="chat-destroy" method="post" action="chat"> @@ -13,9 +7,20 @@ <input type="hidden" name="action" value="drop" /> <input type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"/> </form> - </div><br /> + </div> {{/if}} +<h1>{{$room_name}}</h1> + + +<div id="chatContainer"> + + <div id="chatTopBar"> + <div id="chatLineHolder"></div> + </div> + + <div id="chatSide"> + <div id="chatUsers"></div><br /> </div> <div class="clear"></div> @@ -24,14 +29,15 @@ <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 /> + <textarea id="chatText" name="chat_text" rows=3></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 id="chatOptionsBar"> + <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> </div> <script> diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index 1317b672b..c64f21c97 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$header}}</h1> <form action="chat" method="post" > @@ -10,5 +11,4 @@ <br /> <input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" /> </form> - - +</div> diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index 836923231..570aef1c7 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h2>{{$header}}</h2> {{if $is_owner}} @@ -8,3 +9,4 @@ {{$rooms}} +</div> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index da708a98c..81a586e75 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -1,4 +1,4 @@ -<div id="files-mkdir-tools" class="section-content-tools-wrapper form-group"> +<div id="files-mkdir-tools" class="section-content-tools-wrapper"> <label for="files-mkdir">{{$folder_header}}</label> <form method="post" action=""> <input type="hidden" name="sabreAction" value="mkcol"> @@ -7,7 +7,8 @@ </form> <div class="clear"></div> </div> -<div id="files-upload-tools" class="section-content-tools-wrapper form-group"> +<div id="files-upload-tools" class="section-content-tools-wrapper"> + {{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}} <label for="files-upload">{{$upload_header}}</label> <form method="post" action="" enctype="multipart/form-data"> <input type="hidden" name="sabreAction" value="put"> diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl index c75815d07..076fa16cb 100644 --- a/view/tpl/cloud_header.tpl +++ b/view/tpl/cloud_header.tpl @@ -4,8 +4,8 @@ {{if $is_owner}} <a href="/sharedwithme" class="btn btn-xs btn-default"><i class="icon-cloud-download"></i> {{$shared}}</a> {{/if}} - <button id="files-create-btn" class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i> {{$create}}</button> - <button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i> {{$upload}}</button> + <button id="files-create-btn" class="btn btn-xs btn-primary" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i> {{$create}}</button> + <button id="files-upload-btn" class="btn btn-xs btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i> {{$upload}}</button> </div> {{/if}} <h2>{{$header}}</h2> diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index 47f01ef5d..35e97f3e9 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -4,6 +4,7 @@ </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-name-end" ></div> <div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$contact.edit}}</a></div> <div class="contact-entry-end" ></div> </div> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 5bac5b412..4782f827b 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -8,6 +8,11 @@ <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;"> + {{if $item.photo}} + <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> + {{$item.photo}} + </div> + {{/if}} <div class="wall-item-head"> <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}}"> @@ -33,12 +38,15 @@ </div> <div class="clear"></div> </div> - <div class="{{if $item.is_photo}}wall-photo-item{{else}}wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}"> + + {{if $item.body}} + <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> <div class="wall-item-body" id="wall-item-body-{{$item.id}}" > {{$item.body}} </div> <div class="clear"></div> </div> + {{/if}} {{if $item.has_tags}} <div class="wall-item-tools"> {{if $item.mentions}} @@ -61,11 +69,6 @@ <span class="tag">{{$item.folders}}</span> </div> {{/if}} - {{if $item.attachments}} - <div class="body-tags" id="item-attachments"> - <span class='tag'>{{$item.attachments}}</span> - </div> - {{/if}} <div class="clear"></div> </div> {{/if}} @@ -149,9 +152,15 @@ </div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> - {{if $item.responses }} - <div class="wall-item-tools-left{{if $item.responses.count > 1}} btn-group{{/if}}"> - {{foreach $item.responses as $verb=>$response}} + {{if $item.responses || $item.attachments}} + <div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count && $item.attachments)}} btn-group{{/if}}"> + {{if $item.attachments}} + <div class="btn-group"> + <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button> + <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul> + </div> + {{/if}} + {{foreach $item.responses as $verb=>$response}} {{if $response.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-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button> @@ -180,7 +189,7 @@ {{/if}} </div> {{/if}} - {{/foreach}} + {{/foreach}} </div> {{/if}} <div class="clear"></div> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 65b695a70..53f65bc78 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -8,6 +8,11 @@ <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;"> + {{if $item.photo}} + <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> + {{$item.photo}} + </div> + {{/if}} <div class="wall-item-head"> <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}}"> @@ -61,11 +66,6 @@ <span class="tag">{{$item.folders}}</span> </div> {{/if}} - {{if $item.attachments}} - <div class="body-tags" id="item-attachments"> - <span class='tag'>{{$item.attachments}}</span> - </div> - {{/if}} <div class="clear"></div> </div> {{/if}} @@ -146,7 +146,13 @@ </ul> </div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> - <div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count}} btn-group{{/if}}"> + <div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}"> + {{if $item.attachments}} + <div class="btn-group"> + <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button> + <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul> + </div> + {{/if}} <div class="wall-item-list-comments btn-group"> <button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.viewthread}}'; return false;"> {{$item.comment_count_txt}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}</span>{{/if}} @@ -159,7 +165,6 @@ </button> </div> {{/if}} - {{if $item.responses }} {{foreach $item.responses as $verb=>$response}} {{if $response.count}} diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index f643a3597..0c808b9a5 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -2,7 +2,7 @@ <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-url" type="text" name="url" title="{{$hint}}" /> <input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" /> </form> {{if $abook_usage_message}} diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl index 7638f39e7..67accc1ec 100644 --- a/view/tpl/item_attach.tpl +++ b/view/tpl/item_attach.tpl @@ -1,5 +1,5 @@ {{if $attaches}} {{foreach $attaches as $a}} -<a href="{{$a.url}}" title="{{$a.title}}" class="btn btn-xs btn-default"><i class="{{$a.icon}} attach-icons"></i> {{$a.label}}</a> +<li><a href="{{$a.url}}" title="{{$a.title}}"><i class="{{$a.icon}} attach-icons"></i> {{$a.label}}</a></li> {{/foreach}} {{/if}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 7e12c6bb3..b405e4ac8 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -234,6 +234,19 @@ function enableOnUser(){ }) } + function jotGetPubDate() { + //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + $('#createdModal').modal(); + $('#created-modal-OKButton').on('click', function() { + reply=$('#created-date').val(); + if(reply && reply.length) { + $('#jot-created').val(reply); + $('#createdModal').modal('hide'); + } + }) + } + + function jotShare(id) { if ($('#jot-popup').length != 0) $('#jot-popup').show(); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index ea68368aa..75f6b0027 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -3,11 +3,12 @@ {{if $parent}} <input type="hidden" name="parent" value="{{$parent}}" /> {{/if}} - <input type="hidden" name="type" value="{{$ptyp}}" /> + <input type="hidden" name="obj_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="created" id="jot-created" value="{{$defpublish}}" /> <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="" /> @@ -91,6 +92,11 @@ <i id="profile-expires" class="icon-eraser jot-icons"></i> </button> {{/if}} + {{if $feature_future}} + <button id="profile-future-wrapper" class="btn btn-default btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;"> + <i id="profile-future" class="icon-time 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> @@ -180,6 +186,28 @@ </div><!-- /.modal-dialog --> </div><!-- /.modal --> +<!-- Modal for item created--> +<div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" 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="createdModalLabel">{{$future_txt}}</h4> + </div> + <!-- <div class="modal-body"> --> + <div class="modal-body form-group" style="width:90%"> + <div class='date'><input type='text' placeholder='yyyy-mm-dd HH:MM' name='created_text' id='created-date' class="form-control" /></div><script type='text/javascript'>$(function () {var picker = $('#created-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); })</script> + </div> + <!-- </div> --> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> + <button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> +</div><!-- /.modal --> + + {{if $content || $attachment || $expanded}} <script>initEditor();</script> {{/if}} diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index 4ace457ed..c94cf60a7 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h2>{{$header}}</h2> <script> @@ -9,6 +10,15 @@ function drophub(id) { } </script> +<div class="descriptive-text">{{$sync_text}}</div> +<br /> +<div class="descriptive-text">{{$drop_text}}</div> +<div class="descriptive-text">{{$last_resort}}</div> +<br /> + + + + <table> <tr><td>{{$loc}}</td><td>{{$mkprm}}</td><td>{{$drop}}</td></tr> {{foreach $hubs as $hub}} @@ -23,4 +33,6 @@ function drophub(id) { {{/if}} {{/foreach}} </table> - +</div> +<div class="clear"></div> +<button class="btn btn-std" onclick="window.location.href='/locs/f=&sync=1'; return false;">{{$sync}}</button> diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index 9472bd961..da38f3571 100755 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <input type="hidden" name="auth-params" value="login" /> <div id="login-main"> @@ -16,4 +17,5 @@ <input type="hidden" name="{{$k}}" value="{{$v}}" /> {{/foreach}} </form> +</div> <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script> diff --git a/view/tpl/lostpass.tpl b/view/tpl/lostpass.tpl index f6fdb28d7..8ecfd215b 100755 --- a/view/tpl/lostpass.tpl +++ b/view/tpl/lostpass.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h3>{{$title}}</h3> <p id="lostpass-desc"> @@ -8,11 +9,9 @@ <div id="login-name-wrapper"> <label for="login-name" id="label-login-name">{{$name}}</label> <input type="text" maxlength="60" name="login-name" id="login-name" value="" /> + <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" /> </div> <div id="login-extra-end"></div> -<div id="login-submit-wrapper" > - <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" /> -</div> <div id="login-submit-end"></div> </form> - +</div> diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index ccb995849..32d544a86 100755 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -1,7 +1,8 @@ +<div class="generic-content-wrapper-styled"> <h3>{{$title}}</h3> {{foreach $apps as $ap}} {{$ap}} {{/foreach}} <div class="clear"></div> - +</div> diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index ff2011181..f78a3fc2d 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h2>{{$title}}</h2> <form action="new_channel" method="post" id="newchannel-form" class="stylish-select"> @@ -34,3 +35,4 @@ <div id="newchannel-submit-end" class="newchannel-field-end"></div> </form> +</div> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 0ce9c36a8..d22f82f8e 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -18,11 +18,13 @@ </div> {{$upload_form}} {{$album_edit.1}} - <div id="photo-album-contents"> - {{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} - {{/foreach}} - <div id="page-end"></div> + <div class="section-content-wrapper-np"> + <div id="photo-album-contents"> + {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} + <div id="page-end"></div> + </div> </div> </div> <div class="photos-end"></div> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 15faa4a34..46ac65e87 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -7,11 +7,13 @@ <div class="clear"></div> </div> {{$upload_form}} - <div id="photo-album-contents"> - {{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} - {{/foreach}} - <div id="page-end"></div> + <div class="section-content-wrapper-np"> + <div id="photo-album-contents"> + {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} + <div id="page-end"></div> + </div> </div> </div> <div class="photos-end"></div> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index bf02c614d..11a08204d 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -21,7 +21,11 @@ <div class="form-group"> <input id="photos-upload-choose" type="file" name="userfile" /> </div> + {{include file="field_input.tpl" field=$caption}} {{include file="field_checkbox.tpl" field=$visible}} + <div id="body-textarea"> + {{include file="field_textarea.tpl" field=$body}} + </div> <div class="pull-right btn-group form-group"> <div class="btn-group"> {{if $lockstate}} @@ -37,8 +41,11 @@ <div class="clear"></div> {{if $uploader}} - + {{include file="field_input.tpl" field=$caption}} {{include file="field_checkbox.tpl" field=$visible}} + <div id="body-textarea"> + {{include file="field_textarea.tpl" field=$body}} + </div> <div id="photos-upload-perms" class="btn-group pull-right"> {{if $lockstate}} <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> diff --git a/view/tpl/prep.tpl b/view/tpl/prep.tpl index 7bef7a417..debba13a8 100644 --- a/view/tpl/prep.tpl +++ b/view/tpl/prep.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$header}}</h1> {{if $site}} @@ -27,8 +28,4 @@ </div> {{/foreach}} {{/if}} - - - - - +</div> diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index 48a3c7f26..fbed32606 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> <form enctype="multipart/form-data" action="profile_photo" method="post"> @@ -27,3 +28,4 @@ <div id="profile-photo-link-select-wrapper"> {{$select}} </div> +</div> diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index b0ea8b753..20f5df39a 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -31,7 +31,7 @@ <div class="form-group"> <label for="prvmail-text">{{$yourmessage}}</label> - <textarea class="form-control" id="prvmail-text" name="body"">{{$text}}</textarea> + <textarea class="form-control" id="prvmail-text" name="body">{{$text}}</textarea> </div> <div id="prvmail-submit-wrapper" class="form-group"> diff --git a/view/tpl/rating_form.tpl b/view/tpl/rating_form.tpl index 95c2eb03f..4bd826484 100644 --- a/view/tpl/rating_form.tpl +++ b/view/tpl/rating_form.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h3>{{$header}}</h3> <div class="rating-target-name">{{if $site}}{{$website}} {{$site}}{{else}}{{$tgt_name}}{{/if}}</div> @@ -12,6 +13,7 @@ <input type="hidden" name="target" value="{{$target}}" /> <input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" /> +<br /> <h3 class="abook-rating-text-desc">{{$lbl_rating_txt}}</h3> <textarea name="rating_text" id="rating-text" >{{$rating_txt}}</textarea> @@ -19,4 +21,5 @@ <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> -</form>
\ No newline at end of file +</form> +</div> diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index ed673031a..005b122cf 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h2>{{$title}}</h2> <form action="register" method="post" id="register-form"> @@ -49,3 +50,4 @@ <div id="register-submit-end" class="register-field-end"></div> </form> +</div> diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl index 58df71718..d0f7aab64 100755 --- a/view/tpl/rmagic.tpl +++ b/view/tpl/rmagic.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h3>{{$title}}</h3> <form action="rmagic" method="post" > @@ -9,3 +10,4 @@ <div id="rmagic-submit-end" class="rmagic-field-end"></div> </form> +</div> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 003dae993..b44e1c39e 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -2,6 +2,11 @@ <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;"> + {{if $item.photo}} + <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> + {{$item.photo}} + </div> + {{/if}} <div class="wall-item-head"> <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}}"> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index ab62ede45..7c1f4578d 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -136,7 +136,7 @@ </div> </div> </div> - {{if $menus}} + <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings"> <h3> @@ -146,8 +146,12 @@ </h3> </div> <div id="miscellaneous-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous-settings"> - <div class="section-content-wrapper"> - <div class="form-group"> + <div class="section-content-tools-wrapper"> + <div class="ffsapilink"> + <a type="button" class="btn btn-default" href="/ffsapi">{{$firefoxshare}}</a> + </div> + {{if $menus}} + <div class="form-group channel-menu"> <label for="channel_menu">{{$menu_desc}}</label> <select name="channel_menu" class="form-control"> {{foreach $menus as $menu }} @@ -156,12 +160,12 @@ </select> </div> <div class="settings-submit-wrapper" > - <input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> </div> + {{/if}} </div> </div> - {{/if}} </div> </form> </div> diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index 0b16f5602..e50284b9c 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h3>{{$title}}</h3> <p></p> <p>{{$description}}</p> @@ -22,3 +23,4 @@ <div style="margin-left: 25px; margin-right: 25px;">{{$plugins_list}}</div> {{/if}} <p>{{$donate}}</p> +</div> diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl index 34023e03f..a5b384ca3 100644 --- a/view/tpl/sources_edit.tpl +++ b/view/tpl/sources_edit.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> <div class="descriptive-text">{{$desc}}</div> @@ -15,7 +16,7 @@ <br /> <br /> <a href="sources/{{$id}}/drop">{{$drop}}</a> - +</div> diff --git a/view/tpl/sources_list.tpl b/view/tpl/sources_list.tpl index 5fe50ba98..76be35b1a 100644 --- a/view/tpl/sources_list.tpl +++ b/view/tpl/sources_list.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> <div class="descriptive-text">{{$desc}}</div> @@ -12,4 +13,5 @@ <li><a href="sources/{{$source.src_id}}">{{$source.xchan_name}}</a></li> {{/foreach}} </ul> -{{/if}}
\ No newline at end of file +{{/if}} +</div> diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl index 3c6a4be30..3c8a54373 100644 --- a/view/tpl/sources_new.tpl +++ b/view/tpl/sources_new.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> <div class="descriptive-text">{{$desc}}</div> @@ -11,5 +12,5 @@ <input type="submit" name="submit" class="sources-submit" value="{{$submit}}" /> </div> </form> - +</div> |