diff options
Diffstat (limited to 'view/tpl')
28 files changed, 448 insertions, 233 deletions
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/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index c02e55c25..1317b672b 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -2,6 +2,7 @@ <form action="chat" method="post" > {{include file="field_input.tpl" field=$name}} +{{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> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index da708a98c..44e4eb54c 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -8,6 +8,7 @@ <div class="clear"></div> </div> <div id="files-upload-tools" class="section-content-tools-wrapper form-group"> + {{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 dc8064f1a..760d64db0 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -8,51 +8,75 @@ <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> + {{if $item.photo}} + <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> + {{$item.photo}} </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 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}} + {{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"> {{if $item.like}} @@ -167,6 +191,7 @@ {{/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..a3fb642ce 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -8,51 +8,73 @@ <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}} + {{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"> {{if $item.like}} @@ -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 ae3e8c012..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:#026D0D; 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/ghash-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/item_attach.tpl b/view/tpl/item_attach.tpl index eeea25967..7638f39e7 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}} +<a href="{{$a.url}}" title="{{$a.title}}" class="btn btn-xs btn-default"><i class="{{$a.icon}} attach-icons"></i> {{$a.label}}</a> +{{/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/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 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/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 09333ae11..4f54f1a6a 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -4,16 +4,38 @@ </div> <div class="mail-conv-detail"> {{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}} - <div class="mail-conv-sender-name" ><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></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 class="mail-conv-body">{{$mail.body}}</div> - <div class="btn-group pull-right" id="mail-conv-delete-wrapper-{{$mail.id}}" > - {{if $mail.can_recall}} - <a href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-barcode mail-icons"></i></a> - <a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-undo mail-icons"></i></a> - {{/if}} - <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}}" class="btn btn-default" ><i class="icon-trash mail-icons"></i></a> + </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> diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 789c25ade..24e763571 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,6 +1,8 @@ <div class="generic-content-wrapper"> <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> diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl index b3bb94d71..6ea63c21e 100755 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -1,7 +1,6 @@ <div class="widget"> <h3>{{$title}}</h3> <ul class="nav nav-pills nav-stacked"> - <li><a href="{{$check.url}}"{{if $check.sel}} class="active"{{/if}}>{{$check.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> diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 2119d3b02..3407e152c 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -48,30 +48,32 @@ 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() { 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/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 225b4f6b0..867a1e87b 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -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 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/prv_message.tpl b/view/tpl/prv_message.tpl index a83896f32..b0ea8b753 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 class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" 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 class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" /> - -<div id="prvmail-message-label">{{$yourmessage}}</div> -<textarea class="prvmail-text form-control" 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" class="clear"></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..d072a0b3c 100644 --- a/view/tpl/rating_form.tpl +++ b/view/tpl/rating_form.tpl @@ -19,4 +19,4 @@ <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> -</form>
\ No newline at end of file +</form> 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> |