diff options
Diffstat (limited to 'view/tpl')
63 files changed, 660 insertions, 357 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 3884038c0..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> @@ -67,7 +69,6 @@ <h3>{{$corporate}}</h3> {{include file="field_checkbox.tpl" field=$block_public}} {{include file="field_checkbox.tpl" field=$verify_email}} - {{include file="field_checkbox.tpl" field=$diaspora_enabled}} {{include file="field_checkbox.tpl" field=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$disable_discover_tab}} @@ -79,6 +80,7 @@ {{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=$delivery_batch_count}} {{include file="field_input.tpl" field=$poll_interval}} {{include file="field_input.tpl" field=$maxloadavg}} {{include file="field_input.tpl" field=$abandon_days}} diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index f372911a0..8a4b772a8 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -5,8 +5,8 @@ function confirm_delete_multi(){ return confirm("{{$confirm_delete_multi}}"); } - function selectall(cls){ - $("."+cls).attr('checked','checked'); + function toggle_selectall(cls){ + $("."+cls).prop("checked", !$("."+cls).prop("checked")); return false; } </script> @@ -40,7 +40,7 @@ {{/foreach}} </tbody> </table> - <div class="selectall"><a href="#" onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div> + <div class="selectall"><a href="#" onclick="return toggle_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> @@ -79,10 +79,10 @@ {{/foreach}} </tbody> </table> - <div class="selectall"><a href="#" onclick="return selectall('users_ckbx');">{{$select_all}}</a></div> + <div class="selectall"><a href="#" onclick="return toggle_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?!? {{/if}} </form> -</div>
\ No newline at end of file +</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/bookmarkedchats.tpl b/view/tpl/bookmarkedchats.tpl index 7635bb826..ab4372c25 100644 --- a/view/tpl/bookmarkedchats.tpl +++ b/view/tpl/bookmarkedchats.tpl @@ -1,7 +1,7 @@ {{if $rooms}} <div class="widget"> <h3>{{$header}}</h3> -<ul class="bookmarkchat"> +<ul class="bookmarkchat nav nav-pills nav-stacked"> {{foreach $rooms as $room}} <li><a href="{{$room.xchat_url}}">{{$room.xchat_desc}}</a></li> {{/foreach}} diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 9f95d2999..003e0192b 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$room_name}}</h1> <div id="chatContainer"> @@ -33,6 +34,7 @@ </div> </div> +</div> <script> var room_id = {{$room_id}}; diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index a559dba54..c64f21c97 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -1,13 +1,14 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$header}}</h1> <form action="chat" method="post" > {{include file="field_input.tpl" field=$name}} -<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;" >{{$permissions}}</button> +{{include file="field_input.tpl" field=$chat_expire}} +<button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;" >{{$permissions}}</button> {{$acl}} <div class="clear"></div> <br /> <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 c3dae6627..570aef1c7 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -1,10 +1,12 @@ +<div class="generic-content-wrapper-styled"> <h2>{{$header}}</h2> {{if $is_owner}} <p> -<a href="{{$baseurl}}/chat/{{$nickname}}/new">{{$newroom}}</a> +<span class="btn btn-default"><a href="{{$baseurl}}/chat/{{$nickname}}/new">{{$newroom}}</a></span> </p> {{/if}} {{$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 30a007bd6..4782f827b 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -8,51 +8,70 @@ <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> - <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>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</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('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + {{if $item.photo}} + <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> + {{$item.photo}} </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 item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></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.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/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}}"> + <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> + {{if $item.title}} + <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> + <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</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('item',{{$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 item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></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.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + </div> + <div class="clear"></div> </div> + + {{if $item.body}} <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 class="clear"></div> </div> + {{/if}} + {{if $item.has_tags}} + <div class="wall-item-tools"> + {{if $item.mentions}} + <div class="body-tags" id="item-mentions"> + <span class="tag">{{$item.mentions}}</span> + </div> + {{/if}} + {{if $item.tags}} + <div class="body-tags" id="item-tags"> + <span class="tag">{{$item.tags}}</span> + </div> + {{/if}} + {{if $item.categories}} + <div class="body-tags" id="item-categories"> + <span class="tag">{{$item.categories}}</span> + </div> + {{/if}} + {{if $item.folders}} + <div class="body-tags" id="item-folders"> + <span class="tag">{{$item.folders}}</span> + </div> + {{/if}} + <div class="clear"></div> + </div> + {{/if}} <div class="wall-item-tools"> <div class="wall-item-tools-right btn-group pull-right"> {{if $item.like}} @@ -123,14 +142,25 @@ {{if $item.item_photo_menu}} <li role="presentation" class="divider"></li> {{$item.item_photo_menu}} + + {{if $item.edpost}} + <li role="presentation"><a role="menuitem" href="dreport/{{$item.mid}}">{{$item.dreport}}</a></li> + {{/if}} + {{/if}} </ul> </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> @@ -159,9 +189,10 @@ {{/if}} </div> {{/if}} - {{/foreach}} + {{/foreach}} </div> {{/if}} + <div class="clear"></div> </div> <div class="clear"></div> </div> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 5487d5937..53f65bc78 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -8,51 +8,68 @@ <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> - <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>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</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('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + {{if $item.photo}} + <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> + {{$item.photo}} </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 item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></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.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/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}}"> + <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> + {{if $item.title}} + <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> + <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</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('item',{{$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 item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></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.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + </div> + <div class="clear"></div> </div> - <div class="wall-item-content conv-list-mode" id="wall-item-content-{{$item.id}}"> - <div class="wall-item-title-end"></div> - <div class="wall-item-body wall-item-listbody" id="wall-item-body-{{$item.id}}" > + <div class="{{if $item.is_photo}}wall-photo-item{{else}}wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}"> + <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 class="clear"></div> </div> + {{if $item.has_tags}} + <div class="wall-item-tools"> + {{if $item.mentions}} + <div class="body-tags" id="item-mentions"> + <span class="tag">{{$item.mentions}}</span> + </div> + {{/if}} + {{if $item.tags}} + <div class="body-tags" id="item-tags"> + <span class="tag">{{$item.tags}}</span> + </div> + {{/if}} + {{if $item.categories}} + <div class="body-tags" id="item-categories"> + <span class="tag">{{$item.categories}}</span> + </div> + {{/if}} + {{if $item.folders}} + <div class="body-tags" id="item-folders"> + <span class="tag">{{$item.folders}}</span> + </div> + {{/if}} + <div class="clear"></div> + </div> + {{/if}} + <div class="wall-item-tools"> <div class="wall-item-tools-right btn-group pull-right"> {{if $item.like}} @@ -129,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}} @@ -142,7 +165,6 @@ </button> </div> {{/if}} - {{if $item.responses }} {{foreach $item.responses as $verb=>$response}} {{if $response.count}} @@ -176,6 +198,7 @@ {{/foreach}} {{/if}} </div> + <div class="clear"></div> </div> <div class="clear"></div> </div> diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl index 4794c0b83..01d9a24a0 100755 --- a/view/tpl/cropbody.tpl +++ b/view/tpl/cropbody.tpl @@ -27,8 +27,8 @@ previewWrap: 'previewWrap', minWidth: 300, minHeight: 300, - maxWidth: 640, - maxHeight: 640, + maxWidth: 1024, + maxHeight: 1024, ratioDim: { x: 100, y:100 }, displayOnInit: true, onEndCrop: onEndCrop diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index cf149341e..a2159c885 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -7,7 +7,7 @@ <body> <table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;"> <tbody> - <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 colspan="2" style="background:#43488A; 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/hz-white-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> diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index d2562f080..15505397b 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -12,6 +12,7 @@ <input type="hidden" name="event_hash" value="{{$event_hash}}" /> <input type="hidden" name="xchan" value="{{$xchan}}" /> <input type="hidden" name="mid" value="{{$mid}}" /> +<input type="hidden" name="type" value="{{$type}}" /> <input type="hidden" name="preview" id="event-edit-preview" value="0" /> <div id="event-summary-text">{{$t_text}}</div> @@ -92,14 +93,6 @@ </div> </div> - -<!-- <div class="btn-group pull-right" id="comment-edit-submit-wrapper-desc"> - {{if $preview}} - <button id="comment-edit-submit-desc" class="btn btn-default btn-xs" onclick="preview_comment(desc); return false;" title="{{$preview}}"> - <i class="icon-eye-open comment-icon" ></i> - </button> - {{/if}} ---> </div> <div class="clear"></div> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 6b59eef27..fd0ef0d9b 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -29,6 +29,21 @@ center: 'title', right: 'month,agendaWeek,agendaDay' }, + monthNames: aStr['monthNames'], + monthNamesShort: aStr['monthNamesShort'], + dayNames: aStr['dayNames'], + dayNamesShort: aStr['dayNamesShort'], + buttonText: { + prev: "<span class='fc-text-arrow'>‹</span>", + next: "<span class='fc-text-arrow'>›</span>", + prevYear: "<span class='fc-text-arrow'>«</span>", + nextYear: "<span class='fc-text-arrow'>»</span>", + today: aStr['today'], + month: aStr['month'], + week: aStr['week'], + day: aStr['day'] + }, + allDayText: aStr['allday'], timeFormat: 'H(:mm)', eventClick: function(calEvent, jsEvent, view) { showEvent(calEvent.id); diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index dc334deef..8a007232e 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -17,7 +17,7 @@ <link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" - title="Search in the Red Matrix" /> + title="Search in the Hubzilla" /> <script> diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl index eeea25967..67accc1ec 100644 --- a/view/tpl/item_attach.tpl +++ b/view/tpl/item_attach.tpl @@ -1,8 +1,5 @@ -<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> +{{foreach $attaches as $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/item_categories.tpl b/view/tpl/item_categories.tpl index ec2639a6f..eea0e0b8f 100644 --- a/view/tpl/item_categories.tpl +++ b/view/tpl/item_categories.tpl @@ -1,7 +1,7 @@ {{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> +<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_import.tpl b/view/tpl/item_import.tpl new file mode 100755 index 000000000..65de7fcaf --- /dev/null +++ b/view/tpl/item_import.tpl @@ -0,0 +1,15 @@ +<h2>{{$title}}</h2> + +<form action="import_items" 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> + + <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/jot-header.tpl b/view/tpl/jot-header.tpl index 4121882b7..b405e4ac8 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -3,6 +3,7 @@ var editor = false; var textlen = 0; var plaintext = '{{$editselect}}'; +var pretext = '{{$pretext}}'; function initEditor(cb){ if (editor==false){ @@ -21,6 +22,8 @@ function initEditor(cb){ }); $(".jothidden").show(); if (typeof cb!="undefined") cb(); + if(pretext.length) + addeditortext(pretext); return; } tinyMCE.init({ @@ -191,7 +194,7 @@ function enableOnUser(){ if(reply && reply.length) { reply = bin2hex(reply); $('#profile-rotator').spin('tiny'); - $.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) { + $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) { addeditortext(data); $('#profile-rotator').spin(false); }); @@ -231,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(); @@ -258,7 +274,7 @@ function enableOnUser(){ if(reply && reply.length) { reply = bin2hex(reply); $('#profile-rotator').spin('tiny'); - $.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) { + $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 100dd15b9..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="" /> @@ -47,19 +48,19 @@ <div id="profile-jot-submit-wrapper" class="jothidden"> <div id="profile-jot-submit-left" class="btn-toolbar pull-left"> <div class="btn-group"> - <button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b'); return false;"> + <button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;"> <i class="icon-bold jot-icons"></i> </button> - <button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i'); return false;"> + <button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;"> <i class="icon-italic jot-icons"></i> </button> - <button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u'); return false;"> + <button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;"> <i class="icon-underline jot-icons"></i> </button> - <button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote'); return false;"> + <button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;"> <i class="icon-quote-left jot-icons"></i> </button> - <button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code'); return false;"> + <button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;"> <i class="icon-terminal jot-icons"></i> </button> </div> @@ -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/js_strings.tpl b/view/tpl/js_strings.tpl index 2e7e85604..38cf8edbd 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -40,6 +40,16 @@ 't15' : "{{$t15}}", 't16' : "{{$t16}}", 't17' : "{{$t17}}", + + 'monthNames' : [ "{{$January}}","{{$February}}","{{$March}}","{{$April}}","{{$May}}","{{$June}}","{{$July}}","{{$August}}","{{$September}}","{{$October}}","{{$November}}","{{$December}}" ], + 'monthNamesShort' : [ "{{$Jan}}","{{$Feb}}","{{$Mar}}","{{$Apr}}","{{$MayShort}}","{{$Jun}}","{{$Jul}}","{{$Aug}}","{{$Sep}}","{{$Oct}}","{{$Nov}}","{{$Dec}}" ], + 'dayNames' : ["{{$Sunday}}","{{$Monday}}","{{$Tuesday}}","{{$Wednesday}}","{{$Thursday}}","{{$Friday}}","{{$Saturday}}"], + 'dayNamesShort' : ["{{$Sun}}","{{$Mon}}","{{$Tue}}","{{$Wed}}","{{$Thu}}","{{$Fri}}","{{$Sat}}"], + 'today' : "{{$today}}", + 'month' : "{{$month}}", + 'week' : "{{$week}}", + 'day' : "{{$day}}", + 'allday' : "{{$allday}}" }; </script> diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index 40f91a8bb..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,18 +10,29 @@ 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}} +{{if ! $hub.deleted }} <tr><td> -{{if $hub.deleted}}<strike>{{/if}} -{{$hub.hubloc_url}} ({{$hub.hubloc_addr}}){{if $hub.deleted}}</strike>{{/if}}</td> +{{$hub.hubloc_url}} ({{$hub.hubloc_addr}})</td> <td> - -{{if $hub.primary}}<i class="icon-check"></i>{{else}}<button class="btn btn-std" onclick="primehub({{$hub.hubloc_id}}); return false;" ><i class="icon-check-empty" ></i></button>{{/if}} +{{if $hub.primary}}<button class="btn btn-std"><i class="icon-check"></i></button>{{else}}<button class="btn btn-std" onclick="primehub({{$hub.hubloc_id}}); return false;" ><i class="icon-check-empty" ></i></button>{{/if}} </td> -<td>{{if $hub.primary}}{{else}}{{if ! $hub.deleted}}<button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-trash"></i></button>{{/if}}{{/if}}</td> +<td><button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-trash"></i></button></td> </tr> +{{/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/mail_conv.tpl b/view/tpl/mail_conv.tpl index ec8f8c1e3..4f54f1a6a 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -1,18 +1,41 @@ -<div class="mail-conv-outside-wrapper"> +<div id="mail-{{$mail.id}}" 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}}"><img class="mail-conv-sender-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a> </div> - <div class="mail-conv-detail" > + <div class="mail-conv-detail"> {{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 btn btn-default" ><i class="icon-trash 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 btn btn-default" ><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 class="mail-conv-sender-name"><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></div> + <div class="mail-conv-date autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div> + </div> + <div class="clear"></div> + <div class="mail-conv-content"> + <div class="mail-conv-body"> + {{$mail.body}} + <div class="clear"></div> + </div> + <div class="pull-right dropdown"> + <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}"> + <i class="icon-caret-down"></i> + </button> + <ul class="dropdown-menu" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}"> + {{if $mail.can_recall}} + <li> + <a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="icon-undo mail-icons"></i> {{$mail.recall}}</a> + </li> + {{/if}} + <li> + <a href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="icon-trash mail-icons"></i> {{$mail.delete}}</a> + </li> + {{if $mail.can_recall}} + <li class="divider"></li> + <li> + <a href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a> + </li> + {{/if}} + </ul> + + </div> + <div class="clear"></div> + </div> + <div class="clear"></div> </div> -<hr class="mail-conv-break" /> diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 523a9160a..24e763571 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,12 +1,20 @@ -<h3>{{$prvmsg_header}}</h3> <div class="generic-content-wrapper"> -{{foreach $mails as $mail}} - {{include file="mail_conv.tpl"}} -{{/foreach}} + <div class="section-title-wrapper"> + {{if $mailbox == 'combined'}} + <a class="btn btn-xs btn-danger pull-right" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a> + {{/if}} + <h2>{{$prvmsg_header}}</h2> + <div class="clear"></div> + </div> + <div class="section-content-wrapper"> + {{foreach $mails as $mail}} + {{include file="mail_conv.tpl"}} + {{/foreach}} -{{if $canreply}} -{{include file="prv_message.tpl"}} -{{else}} -{{$unknown_text}} -{{/if}} + {{if $canreply}} + {{include file="prv_message.tpl"}} + {{else}} + {{$unknown_text}} + {{/if}} + </div> </div> diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl index 1cd7145e7..d52fa40e0 100755 --- a/view/tpl/mail_head.tpl +++ b/view/tpl/mail_head.tpl @@ -1,3 +1,8 @@ -<h3>{{$messages}}</h3> - -{{$tab_content}} +<div class="widget"> + <h3>{{$header}}</h3> + <ul class="nav nav-pills nav-stacked"> + {{foreach $messages as $message}} + {{include file="mail_list.tpl"}} + {{/foreach}} + </ul> +</div> diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 1d499e12f..fc9b5afa8 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,8 +1,7 @@ -<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" class="btn btn-default btn-sm"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default btn-sm" ><i class="icon-trash mail-icons drop-icons"></i></a></span> - <div class="clear"> </div> -</div> +<li> + <a href="mail/{{$message.mailbox}}/{{$message.id}}" class="{{if $message.selected}}active{{/if}}"> + <span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br> + <span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br> + <span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span> + </a> +</li> diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl index 3e32eae14..6ea63c21e 100755 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -1,14 +1,9 @@ <div class="widget"> <h3>{{$title}}</h3> <ul class="nav nav-pills nav-stacked"> - <li><a href="{{$check.url}}"{{if $check.sel}} class="checkmessage-selected"{{/if}}>{{$check.label}}</a></li> - <li><a href="{{$new.url}}"{{if $new.sel}} class="newmessage-selected"{{/if}}>{{$new.label}}</a></li> + <li><a href="{{$combined.url}}"{{if $combined.sel}} class="active"{{/if}}>{{$combined.label}}</a></li> + <li><a href="{{$inbox.url}}"{{if $inbox.sel}} class="active"{{/if}}>{{$inbox.label}}</a></li> + <li><a href="{{$outbox.url}}"{{if $outbox.sel}} class="active"{{/if}}>{{$outbox.label}}</a></li> + <li><a href="{{$new.url}}"{{if $new.sel}} class="active"{{/if}}>{{$new.label}}</a></li> </ul> - {{if $tabs}} - <ul class="nav nav-pills nav-stacked"> - {{foreach $tabs as $t}} - <li><a href="{{$t.url}}"{{if $t.sel}} class="message-selected"{{/if}}>{{$t.label}}</a></li> - {{/foreach}} - </ul> - {{/if}} </div> diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index e1d1c6d23..3407e152c 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -48,37 +48,39 @@ else <script type="text/javascript" src="view/js/ajaxupload.js" ></script> <script> $(document).ready(function() { - var uploader = new window.AjaxUpload( - 'prvmail-upload-wrapper', - { action: 'wall_upload/{{$nickname}}', + + var file_uploader = new window.AjaxUpload( + 'prvmail-attach-wrapper', + { action: 'wall_attach/{{$nickname}}', name: 'userfile', onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); }, onComplete: function(file,response) { addmailtext(response); $('#prvmail-rotator').spin(false); - } + } } ); - var file_uploader = new window.AjaxUpload( - 'prvmail-attach-wrapper', + var file_uploader_sub = new window.AjaxUpload( + 'prvmail-attach-sub', { action: 'wall_attach/{{$nickname}}', name: 'userfile', onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); }, onComplete: function(file,response) { addmailtext(response); $('#prvmail-rotator').spin(false); - } + } } ); + }); function prvmailJotGetLink() { reply = prompt("{{$linkurl}}"); if(reply && reply.length) { $('#prvmail-rotator').spin('tiny'); - $.get('parse_url?url=' + reply, function(data) { + $.get('linkinfo?f=&url=' + reply, function(data) { addmailtext(data); $('#prvmail-rotator').spin(false); }); @@ -104,7 +106,7 @@ else event.preventDefault(); if(reply && reply.length) { $('#prvmail-rotator').spin('tiny'); - $.get('parse_url?url=' + reply, function(data) { + $.get('linkinfo?f=&url=' + reply, function(data) { addmailtext(data); $('#prvmail-rotator').spin(false); }); 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/nav.tpl b/view/tpl/nav.tpl index 4241c0a92..3d6809c22 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -189,7 +189,7 @@ {{if $nav.help}} <li class="{{$sel.help}}"> - <a class="{{$nav.help.2}}" target="redmatrix-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"><i class="icon-question"></i></a> + <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"><i class="icon-question"></i></a> </li> {{/if}} </ul> 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/opensearch.tpl b/view/tpl/opensearch.tpl index ea260c6ae..f247e3401 100755 --- a/view/tpl/opensearch.tpl +++ b/view/tpl/opensearch.tpl @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <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> + <ShortName>Hubzilla@{{$nodename}}</ShortName> + <Description>Search in Hubzilla@{{$nodename}}</Description> + <Contact>http://github.com/redmatrix/hubzilla/</Contact> + <Image height="16" width="16" type="image/png">{{$baseurl}}/images/hz-16.png</Image> + <Image height="64" width="64" type="image/png">{{$baseurl}}/images/hz-64.png</Image> <Url type="text/html" template="{{$baseurl}}/search?search={searchTerms}"/> <Url type="application/opensearchdescription+xml" diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl index ef8ff8dce..9df93e4c6 100644 --- a/view/tpl/pdledit.tpl +++ b/view/tpl/pdledit.tpl @@ -3,7 +3,7 @@ <h2>{{$mname}} {{$module}}</h2> <br /> -<a href="help/Comanche" target="redmatrix-help">{{$help}}</a> +<a href="help/Comanche" target="hubzilla-help">{{$help}}</a> <br /> <br /> 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/photo_view.tpl b/view/tpl/photo_view.tpl index f5ff23700..867a1e87b 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -15,7 +15,7 @@ <i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i> {{/if}} {{if $lock}} - <i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('item',{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> + <i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> {{/if}} </div> <div class="btn-group btn-group"> @@ -133,14 +133,14 @@ {{/if}} {{if $likebuttons}} <div class="photo-item-tools-right btn-group pull-right"> - <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false"> - <i class="icon-thumbs-up-alt" title="{{$likethis}}"></i> + <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$likebuttons.id}},'like'); return false"> + <i class="icon-thumbs-up-alt" title="{{$likebuttons.likethis}}"></i> </button> - <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false"> - <i class="icon-thumbs-down-alt" title="{{$nolike}}"></i> + <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$likebuttons.id}},'dislike'); return false"> + <i class="icon-thumbs-down-alt" title="{{$likebuttons.nolike}}"></i> </button> </div> - <div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div> + <div id="like-rotator-{{$likebuttons.id}}" class="photo-like-rotator pull-right"></div> {{/if}} <div class="clear"></div> </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 ee0bbd86b..11a08204d 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -9,7 +9,7 @@ <datalist id="dl-photo-upload"> {{foreach $albums as $al}} {{if $al.text}} - <option value="{{$al.text}}"> + <option value="{{$al.text}}" /> {{/if}} {{/foreach}} </datalist> @@ -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_advanced.tpl b/view/tpl/profile_advanced.tpl index 1f99bf1ad..a4413e536 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -204,7 +204,7 @@ <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}} + <li>{{if $item.img}}<a href="{{$item.url}}" ><img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" /></a>{{/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}}" > 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 c6f393aa4..20f5df39a 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -1,56 +1,109 @@ -<h3>{{$header}}</h3> +{{if $new}} +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$header}}</h2> + </div> + <div class="section-content-wrapper"> +{{/if}} + <div id="prvmail-wrapper" > + <form id="prvmail-form" action="mail" method="post" > -<div id="prvmail-wrapper" > -<form id="prvmail-form" action="mail" method="post" > + <input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" /> + <input type="hidden" name="media_str" id="jot-media" value="" /> -{{$parent}} + {{if $new}} + <div class="form-group"> + <label for="recip">{{$to}}</label> + <input class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" /> + <input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}"> + </div> + <div class="form-group"> + <label for="prvmail-subject">{{$subject}}</label> + <input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" /> + </div> + {{/if}} -<div id="prvmail-to-label">{{$to}}</div> + {{if $reply}} + <input type="hidden" name="replyto" value="{{$parent}}" /> + <input type="hidden" name="messageto" value="{{$recphash}}" /> + <input type="hidden" name="subject" value="{{$subjtxt}}" /> + {{/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}} -{{/if}} + <div class="form-group"> + <label for="prvmail-text">{{$yourmessage}}</label> + <textarea class="form-control" id="prvmail-text" name="body">{{$text}}</textarea> + </div> -<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-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" /> - <button id="prvmail-upload-wrapper" class="btn btn-default btn-sm" > - <i id="prvmail-upload" class="icon-camera jot-icons" title="{{$upload}}"></i> - </button> - - <button id="prvmail-attach-wrapper" class="btn btn-default btn-sm" > - <i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i> - </button> - - <button id="prvmail-link-wrapper" class="btn btn-default btn-sm" onclick="prvmailJotGetLink(); return false;" > - <i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" ></i> - </button> - {{if $feature_expire}} - <button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" onclick="prvmailGetExpiry();return false;" > - <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" ></i> - </button> - {{/if}} - {{if $feature_encrypt}} - <button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"> - <i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i> - </button> - {{/if}} - <div id="prvmail-rotator-wrapper" > - <div id="prvmail-rotator"></div> - </div> -</div> -<div id="prvmail-end"></div> -</form> + <div id="prvmail-submit-wrapper" class="form-group"> + <div id="prvmail-submit" class="pull-right"> + <button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button> + </div> + <div id="prvmail-tools" class="btn-toolbar pull-left"> + <div class="btn-group"> + <button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;"> + <i class="icon-bold jot-icons"></i> + </button> + <button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'prvmail-text'); return false;"> + <i class="icon-italic jot-icons"></i> + </button> + <button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'prvmail-text'); return false;"> + <i class="icon-underline jot-icons"></i> + </button> + <button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'prvmail-text'); return false;"> + <i class="icon-quote-left jot-icons"></i> + </button> + <button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'prvmail-text'); return false;"> + <i class="icon-terminal jot-icons"></i> + </button> + </div> + <div class="btn-group hidden-xs"> + <button id="prvmail-attach-wrapper" class="btn btn-default btn-sm" > + <i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i> + </button> + <button id="prvmail-link-wrapper" class="btn btn-default btn-sm" onclick="prvmailJotGetLink(); return false;" > + <i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" ></i> + </button> + </div> + {{if $feature_expire || $feature_encrypt}} + <div class="btn-group hidden-sm hidden-xs"> + {{if $feature_expire}} + <button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" onclick="prvmailGetExpiry();return false;" > + <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" ></i> + </button> + {{/if}} + {{if $feature_encrypt}} + <button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"> + <i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i> + </button> + {{/if}} + </div> + {{/if}} + + <div class="btn-group visible-xs visible-sm"> + <button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> + <i id="more-tools-icon" class="icon-caret-down jot-icons"></i> + </button> + <ul class="dropdown-menu dropdown-menu-right" role="menu"> + <li class="visible-xs"><a href="#" id="prvmail-attach-sub"><i class="icon-paper-clip"></i> {{$attach}}</a></li> + <li class="visible-xs"><a href="#" onclick="prvmailJotGetLink(); return false;" ><i class="icon-link"></i> {{$insert}}</a></li> + {{if $feature_expire || $feature_encrypt}} + <li class="divider visible-xs"></li> + <li class="visible-sm visible-xs"><a href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="icon-eraser"></i> {{$expires}}</a></li> + <li class="visible-sm visible-xs"><a href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="icon-key"></i> {{$encrypt}}</a></li> + {{/if}} + </ul> + </div> + + + </div> + <div id="prvmail-rotator-wrapper" class="pull-left"> + <div id="prvmail-rotator"></div> + </div> + <div class="clear"></div> + </div> + </form> + </div> +{{if $new}} + </div> </div> +{{/if}} 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 256443b84..b44e1c39e 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -2,33 +2,73 @@ <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> - {{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('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + {{if $item.photo}} + <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> + {{$item.photo}} </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 item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-remove item-forged" title="{{$item.forged}}"></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.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/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}}"> + <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> + {{if $item.title}} + <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> + <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</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('item',{{$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 item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></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.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + </div> + <div class="clear"></div> </div> - <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> - <div class="wall-item-title-end"></div> + <div class="{{if $item.is_photo}}wall-photo-item{{else}}wall-item-content{{/if}}" 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> - <div class="wall-item-tools"> + {{if $item.has_tags}} + <div class="wall-item-tools"> + {{if $item.mentions}} + <div class="body-tags" id="item-mentions"> + <span class="tag">{{$item.mentions}}</span> + </div> + {{/if}} + {{if $item.tags}} + <div class="body-tags" id="item-tags"> + <span class="tag">{{$item.tags}}</span> + </div> + {{/if}} + {{if $item.categories}} + <div class="body-tags" id="item-categories"> + <span class="tag">{{$item.categories}}</span> + </div> + {{/if}} + {{if $item.folders}} + <div class="body-tags" id="item-folders"> + <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}} + <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> @@ -39,16 +79,12 @@ {{/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> + <li><a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li> {{/if}} </ul> </div> + <div class="clear"></div> </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> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index eb497bbb5..ab62ede45 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -23,6 +23,9 @@ {{include file="field_input.tpl" field=$defloc}} {{include file="field_checkbox.tpl" field=$allowloc}} {{include file="field_checkbox.tpl" field=$adult}} + {{include file="field_input.tpl" field=$photo_path}} + {{include file="field_input.tpl" field=$attach_path}} + <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl index ae8dac3f8..52f8d9d3f 100755 --- a/view/tpl/settings_addons.tpl +++ b/view/tpl/settings_addons.tpl @@ -5,29 +5,6 @@ <form action="settings/featured" method="post" autocomplete="off"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div class="panel-group" id="settings" role="tablist"> - {{if $diaspora_enabled}} - <div class="panel"> - <div class="section-subtitle-wrapper" role="tab" id="dspr-settings"> - <h3> - <a title="{{$dsprdesc}}" data-toggle="collapse" data-parent="#settings" href="#dspr-settings-content" aria-controls="dspr-settings-content"> - {{$dsprtitle}} - </a> - </h3> - </div> - <div id="dspr-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="dspr-settings"> - <div class="section-content-tools-wrapper"> - - {{include file="field_checkbox.tpl" field=$dspr_allowed}} - {{include file="field_checkbox.tpl" field=$pubcomments}} - {{include file="field_checkbox.tpl" field=$hijacking}} - - <div class="settings-submit-wrapper" > - <button type="submit" name="dspr-submit" class="btn btn-primary" value="{{$dsprsubmit}}">{{$dsprsubmit}}</button> - </div> - </div> - </div> - </div> - {{/if}} {{$settings_addons}} </div> </form> diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl index 9aacc8958..c98003ea2 100644 --- a/view/tpl/show_thing.tpl +++ b/view/tpl/show_thing.tpl @@ -1,13 +1,13 @@ <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> +{{if $thing.obj_imgurl}}<a href="{{$thing.obj_url}}" ><img src="{{$thing.obj_imgurl}}" width="175" height="175" alt="{{$thing.obj_term}}" /></a>{{/if}} +<a href="{{$thing.obj_url}}" >{{$thing.obj_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-trash drop-icons"></i></a> +<a href="thing/edit/{{$thing.obj_obj}}" title="{{$edit}}" class="btn btn-default" ><i class="icon-pencil thing-edit-icon"></i></a> +<a href="thing/drop/{{$thing.obj_obj}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default" ><i class="icon-trash drop-icons"></i></a> </div> <div class="thing-edit-links-end"></div> {{/if}} diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index 3b0c8841c..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> @@ -10,6 +11,7 @@ {{if $polled}} <p>{{$polled}} {{$lastpoll}}</p> {{/if}} +<p>{{$load_average}} {{$loadavg_all}}</p> <p>{{$web_location}}</p> <p>{{$visit}}</p> <p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p> @@ -21,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> diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl index b170f152c..d513d2855 100644 --- a/view/tpl/thing_edit.tpl +++ b/view/tpl/thing_edit.tpl @@ -29,5 +29,14 @@ <div class="thing-end"></div> +{{$aclselect}} + +{{if $lockstate}} + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> +{{/if}} + + <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 index e93a1aa65..22f8f5cb6 100644 --- a/view/tpl/thing_input.tpl +++ b/view/tpl/thing_input.tpl @@ -29,5 +29,14 @@ <div class="thing-end"></div> +{{$aclselect}} + +{{if $lockstate}} + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> +{{/if}} + + <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> </form> diff --git a/view/tpl/uexport.tpl b/view/tpl/uexport.tpl index 8fea26404..7eafd97a6 100644 --- a/view/tpl/uexport.tpl +++ b/view/tpl/uexport.tpl @@ -8,15 +8,12 @@ <p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p> <p>{{$full}}</p> - <p><em>{{$by_year}}</em></p> - <p>{{$extra}}</p><br /> - <ul> - <li>{{$extra2}}</li><br /> - <li>{{$extra3}}</li><br /> - </ul> + + <p>{{$extra}}</p> + <p>{{$extra2}}</p> + <p>{{$extra3}}</p> + <p>{{$extra4}}</p> - <p>{{$extra5}}</p> - <p><strong>{{$extra6}}</strong> {{$extra7}}</p> </div> </div> diff --git a/view/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl index 57f383788..2a40dcf47 100755 --- a/view/tpl/xrd_host.tpl +++ b/view/tpl/xrd_host.tpl @@ -4,7 +4,7 @@ <hm:Host>{{$zhost}}</hm:Host> - <Link rel='lrdd' template='{{$zroot}}/xrd/?uri={uri}' /> + <Link rel='lrdd' type="application/xrd+xml" template='{{$zroot}}/xrd/?uri={uri}' /> <Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" href="{{$zroot}}/oexchange/xrd" /> |