diff options
Diffstat (limited to 'view/tpl')
36 files changed, 452 insertions, 234 deletions
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index a76878438..a3390b179 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -35,6 +35,7 @@ <td class="checkbox"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td> <td class="tools"> <a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a> + <a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='icon-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a> <a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='icon-trash admin-icons'></i></a> </td> </tr> @@ -42,7 +43,7 @@ </tbody> </table> <div class='selectall'><a href='#' onclick="return selectall('channels_ckbx');">{{$select_all}}</a></div> - <div class="submit"><input type="submit" name="page_channels_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_channels_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div> + <div class="submit"><input type="submit" name="page_channels_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_channels_code" value="{{$code}}/{{$uncode}}" /> <input type="submit" name="page_channels_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div> {{else}} NO CHANNELS?!? {{/if}} diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 225b281cc..3884038c0 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -46,7 +46,9 @@ {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} - {{include file="field_checkbox.tpl" field=$no_login_on_homepage}} + {{include file="field_input.tpl" field=$frontpage}} + {{include file="field_checkbox.tpl" field=$mirror_frontpage}} + {{include file="field_checkbox.tpl" field=$login_on_homepage}} <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 4a438e8fd..44d230ae0 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -3,42 +3,26 @@ <input type="hidden" name="filehash" value="{{$file.hash}}" /> <input type="hidden" name="uid" value="{{$uid}}" /> <input type="hidden" name="fileid" value="{{$file.id}}" /> - + {{if !$isadir}}{{include file="field_checkbox.tpl" field=$notify}}{{/if}} + {{if $isadir}}{{include file="field_checkbox.tpl" field=$recurse}}{{/if}} <div id="attach-edit-tools-share" class="btn-group form-group"> {{if !$isadir}} - <a href="/rpost?body=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}"> - <i class="icon-paperclip jot-icons"></i> + <a href="/rpost?attachment=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}"> + <i class="icon-share jot-icons"></i> </a> {{/if}} <button id="link-btn" class="btn btn-default btn-xs" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}"> - <i class="icon-share jot-icons"></i> + <i class="icon-link jot-icons"></i> </button> </div> - <div id="attach-edit-tools-perms" class="form-group pull-right btn-group"> - {{if $isadir}} - <div id="attach-edit-perms-recurse" class="btn-group" data-toggle="buttons"> - <label class="btn btn-default btn-xs" title="{{$recurse}}"> - <input type="checkbox" autocomplete="off" name="recurse" value="1"><i class="icon-level-down jot-icons"></i> - </label> - </div> - {{/if}} - {{if !$isadir}} - <div id="attach-edit-activity" class="btn-group" data-toggle="buttons"> - <label class="btn btn-default btn-xs" title="{{$activity_btn_title}}"> - <input type="checkbox" autocomplete="off" name="no_activity" value="1"><i class="icon-ban-circle jot-icons"></i> - </label> - </div> - {{/if}} - <div id="attach-edit-perms" class="btn-group"> - <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> - </button> - <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit"> - {{$submit}} - </button> - </div> + <div id="attach-edit-perms" class="btn-group pull-right"> + <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> + </button> + <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit"> + {{$submit}} + </button> </div> - {{$aclselect}} <div id="link-code" class="form-group"> diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl index 4068375cb..85e4865ea 100644 --- a/view/tpl/blocklist.tpl +++ b/view/tpl/blocklist.tpl @@ -1,18 +1,67 @@ +<div class="section-title-wrapper"> + {{if $editor}} + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('block-editor');"><i class="icon-edit"></i> {{$create}}</button> + </div> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> +</div> +{{if $editor}} +<div id="block-editor" class="section-content-tools-wrapper"> + {{$editor}} +</div> +{{/if}} {{if $pages}} - - <div id="pagelist-content-wrapper" class="generic-content-wrapper"> +<div id="pagelist-content-wrapper" class="section-content-wrapper-np"> + <table id="block-list-table"> + <tr> + <th width="1%">{{$name}}</th> + <th width="94%">{{$blocktitle}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%" class="hidden-xs">{{$created}}</th> + <th width="1%" class="hidden-xs">{{$edited}}</th> + </tr> {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - <div class="page-list-item"> - {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}} - {{if $view}}<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}} - {{*if $preview}}<a href="block/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn-btn-default"></i></a> {{/if*}} - {{$item.title}} - </div> - {{/foreach}} + {{foreach $items as $item}} + <tr id="block-list-item-{{$item.url}}"> + <td> + {{if $view}} + <a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a> + {{else}} + {{$item.name}} + {{/if}} + </td> + <td> + {{$item.title}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $item.bb_element}} + <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a> + {{/if}} + </td> + <td class="hidden-xs"> + {{$item.created}} + </td> + <td class="hidden-xs"> + {{$item.edited}} + </td> + </tr> + {{/foreach}} {{/foreach}} - </div> - - <div class="clear"></div> - + </table> +</div> +<div class="clear"></div> {{/if}} diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 77d861224..c1d03da83 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -26,7 +26,7 @@ <td class="cloud-index-tool">{{$item.attachIcon}}</td> <td id="file-edit-{{$item.attachId}}" class="cloud-index-tool"></td> <td class="cloud-index-tool"><i class="fakelink icon-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td> - <td class="cloud-index-tool"><a href="{{$item.fileStorageUrl}}/{{$item.attachId}}/delete" title="{{$delete}}" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a></td> + <td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> {{else}} <td></td><td></td><td></td><td></td> @@ -35,7 +35,7 @@ <td class="hidden-xs">{{$item.sizeFormatted}}</td> <td class="hidden-xs">{{$item.lastmodified}}</td> </tr> - <tr> + <tr id="cloud-tools-{{$item.attachId}}"> <td id="perms-panel-{{$item.attachId}}" colspan="9"></td> </tr> {{/foreach}} diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl index 09a79edd8..5c15e1c2c 100755 --- a/view/tpl/contact_slider.tpl +++ b/view/tpl/contact_slider.tpl @@ -1,4 +1,4 @@ <div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div> <script> - $("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], width:'100%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } }); + $("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } }); </script> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index a575df554..e0acc25ae 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -21,7 +21,7 @@ {{/if}} {{if $item.lock}} <div class="wall-item-lock dropdown"> - <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + <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"> @@ -117,14 +117,13 @@ {{if $item.star}} <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li> {{/if}} + {{if $item.drop.dropping}} + <li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li> + {{/if}} {{if $item.item_photo_menu}} <li role="presentation" class="divider"></li> {{$item.item_photo_menu}} {{/if}} - {{if $item.drop.dropping}} - <li role="presentation" class="divider"></li> - <li role="presentation"><a role="menuitem" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li> - {{/if}} </ul> </div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 818517c46..85425b4e2 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -21,7 +21,7 @@ {{/if}} {{if $item.lock}} <div class="wall-item-lock dropdown"> - <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + <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"> @@ -118,14 +118,14 @@ {{if $item.star}} <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li> {{/if}} + {{if $item.drop.dropping}} + <li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li> + {{/if}} {{if $item.item_photo_menu}} <li role="presentation" class="divider"></li> {{$item.item_photo_menu}} {{/if}} - {{if $item.drop.dropping}} - <li role="presentation" class="divider"></li> - <li role="presentation"><a role="menuitem" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li> - {{/if}} + </ul> </div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl index 53d90be74..dffeeafa0 100644 --- a/view/tpl/design_tools.tpl +++ b/view/tpl/design_tools.tpl @@ -1,6 +1,6 @@ <div id="design-tools" class="widget design-tools"> <h3>{{$title}}</h3> -<ul> +<ul class="nav nav-pills nav-stacked"> <li><a href="blocks/{{$who}}">{{$blocks}}</a></li> <li><a href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a></li> <li><a href="layouts/{{$who}}">{{$layout}}</a></li> diff --git a/view/tpl/diaspora_consensus.tpl b/view/tpl/diaspora_consensus.tpl new file mode 100644 index 000000000..b6b7cf13d --- /dev/null +++ b/view/tpl/diaspora_consensus.tpl @@ -0,0 +1,17 @@ +<poll> +<guid>{{$guid_q}}</guid> +<question>{{$question}}</question> +<poll_answer> + <guid>{{$guid_y}}</guid> + <answer>{{$agree}}</answer> +</poll_answer> +<poll_answer> + <guid>{{$guid_n}}</guid> + <answer>{{$disagree}}</answer> +</poll_answer> +<poll_answer> + <guid>{{$guid_a}}</guid> + <answer>{{$abstain}}</answer> +</poll_answer> +</poll> + diff --git a/view/tpl/diaspora_post.tpl b/view/tpl/diaspora_post.tpl index 2fe916e00..ebfe9e5b7 100644 --- a/view/tpl/diaspora_post.tpl +++ b/view/tpl/diaspora_post.tpl @@ -4,6 +4,7 @@ <raw_message>{{$body}}</raw_message> <guid>{{$guid}}</guid> <diaspora_handle>{{$handle}}</diaspora_handle> + {{$poll}} <public>{{$public}}</public> <created_at>{{$created}}</created_at> <provider_display_name>{{$provider}}</provider_display_name> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index db098baa1..0608bca0a 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -20,6 +20,9 @@ {{if $entry.canrate}}<button class="btn btn-default" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i></button><span class="required" id="edited-{{$entry.hash}}" style="display: none;" >*</span>{{/if}} </div> {{/if}} +{{if $entry.common_friends}} +<div id="dir-common">{{$entry.common_txt}}</div> +{{/if}} {{if $entry.public_forum}} <div class="contact-forum"> {{$entry.forum_label}} @{{$entry.nickname}}+ diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl index 890b746bf..20e597909 100755 --- a/view/tpl/edpost_head.tpl +++ b/view/tpl/edpost_head.tpl @@ -1 +1,12 @@ -<h2>{{$title}}</h2> +<div class="section-title-wrapper"> + {{if $delete}} + <div class="pull-right"> + <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a> + </div> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> +</div> +<div id="webpage-editor" class="section-content-tools-wrapper"> + {{$editor}} +</div> diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 986a93a16..d2562f080 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -152,8 +152,10 @@ <br /> + <div class="clear event-form-location-end"></div> +{{if ! $eid}} <div class='field checkbox'> <label class="mainlabel" for='id_share'>{{$sh_text}}</label> @@ -170,6 +172,8 @@ <button id="event-permissions-button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> {{$acl}} +{{/if}} + <div class="clear"></div> <button id="event-edit-preview-btn" class="btn btn-default" title="{{$preview}}" onclick="doEventPreview(); return false;"><i class="icon-eye-open" ></i></button> diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index 4dfa83699..128bbfbe1 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,6 +1,6 @@ <div class='form-group field input'> - <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> - <input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} + <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label> + <input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}> <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> <div class="clear"></div> </div> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 0ffed7163..4121882b7 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -107,6 +107,7 @@ function enableOnUser(){ /* enable tinymce on focus and click */ $("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").click(enableOnUser); + var upload_title = $('#wall-image-upload').attr('title'); var attach_title = $('#wall-file-upload').attr('title'); try { diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index ed1d1e35f..100dd15b9 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,5 +1,8 @@ <div id="profile-jot-wrapper"> <form id="profile-jot-form" action="{{$action}}" method="post"> + {{if $parent}} + <input type="hidden" name="parent" value="{{$parent}}" /> + {{/if}} <input type="hidden" name="type" value="{{$ptyp}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <input type="hidden" name="return" value="{{$return_path}}" /> @@ -10,7 +13,8 @@ <input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="{{$post_id}}" /> <input type="hidden" name="webpage" value="{{$webpage}}" /> - <input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" /> + <input type="hidden" name="preview" id="jot-preview" value="0" /> + <input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" /> {{if $showacl}}{{$acl}}{{/if}} {{$mimeselect}} {{$layoutselect}} @@ -19,22 +23,27 @@ <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}} </div> {{/if}} - <div id="jot-title-wrap" class="jothidden" style="display:none"> + {{if $webpage}} + <div id="jot-pagetitle-wrap" class="jothidden"> + <input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}"> + </div> + {{/if}} + <div id="jot-title-wrap" class="jothidden"> <input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex=1 value="{{$title}}"> </div> {{if $catsenabled}} - <div id="jot-category-wrap" class="jothidden" style="display:none"> + <div id="jot-category-wrap" class="jothidden"> <input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput"> </div> {{/if}} - {{if $webpage}} - <div id="jot-pagetitle-wrap" class="jothidden" style="display:none"> - <input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}"> - </div> - {{/if}} <div id="jot-text-wrap"> <textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex=2 placeholder="{{$share}}">{{$content}}</textarea> </div> + {{if $attachment}} + <div id="jot-attachment-wrap"> + <input class="jot-attachment" name="attachment" id="jot-attachment" type="text" value="{{$attachment}}" readonly="readonly" onclick="this.select();"> + </div> + {{/if}} <div id="profile-jot-submit-wrapper" class="jothidden"> <div id="profile-jot-submit-left" class="btn-toolbar pull-left"> <div class="btn-group"> @@ -170,20 +179,7 @@ </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> -<script type="text/javascript"> - $(function() { - $('#datetimepicker1').datetimepicker({ - language: 'us', - icons: { - time: "icon-time", - date: "icon-calendar", - up: "icon-arrow-up", - down: "icon-arrow-down" - } - }); - }); -</script> -{{if $content}} +{{if $content || $attachment || $expanded}} <script>initEditor();</script> {{/if}} diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index c557b535d..2e7e85604 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -21,6 +21,7 @@ 'rating_text' : "{{$rating_text}}", 'submit' : "{{$submit}}", 'linkurl' : "{{$linkurl}}", + 'leavethispage' : "{{$leavethispage}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl index 0a0085497..ab7408eae 100644 --- a/view/tpl/layoutlist.tpl +++ b/view/tpl/layoutlist.tpl @@ -1,19 +1,69 @@ -{{if $pages}} +<div class="section-title-wrapper"> + {{if $editor}} + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('layout-editor');"><i class="icon-edit"></i> {{$create}}</button> + <a href="{{$help.url}}" target="_blank" class="btn btn-xs btn-warning" title="{{$help.title}}"><i class="icon-info"></i> {{$help.text}}</a> + </div> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> +</div> +{{if $editor}} +<div id="layout-editor" class="section-content-tools-wrapper"> + {{$editor}} +</div> +{{/if}} - <div id="pagelist-content-wrapper" class="generic-content-wrapper"> +{{if $pages}} +<div id="pagelist-content-wrapper" class="section-content-wrapper-np"> + <table id="layout-list-table"> + <tr> + <th width="1%">{{$name}}</th> + <th width="94%">{{$descr}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%" class="hidden-xs">{{$created}}</th> + <th width="1%" class="hidden-xs">{{$edited}}</th> + </tr> {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - <div class="page-list-item"> - {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}} - {{if $view}}<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}} - {{if $share}}<a href="layouts/{{$channel}}/share/{{$item.mid}}" title="{{$share}}"><i class="icon-share design-icons btn btn-default"></i></a> {{/if}} - {{*if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if*}} - {{$item.title}} - </div> - {{/foreach}} + {{foreach $items as $item}} + <tr id="layout-list-item-{{$item.url}}"> + <td> + {{if $view}} + <a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a> + {{else}} + {{$item.title}} + {{/if}} + </td> + <td> + {{$item.descr}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $item.bb_element}} + <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a> + {{/if}} + </td> + <td class="hidden-xs"> + {{$item.created}} + </td> + <td class="hidden-xs"> + {{$item.edited}} + </td> + </tr> {{/foreach}} - </div> - - <div class="clear"></div> - + {{/foreach}} + </table> +</div> +<div class="clear"></div> {{/if}} diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl index d423e6691..a4e2e1925 100755 --- a/view/tpl/main_slider.tpl +++ b/view/tpl/main_slider.tpl @@ -1,8 +1,10 @@ <div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div> <script> +$(document).ready(function() { var old_cmin = 0; var old_cmax = 99; - $("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], width:'100%', showLabels: false, onstatechange: function(v) { + + $("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false, onstatechange: function(v) { var carr = v.split(","); if(carr[0] != bParam_cmin) { old_cmin = bParam_cmin; @@ -32,4 +34,5 @@ page_load = true; liveUpdate(); } +}); </script> diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 1ccfb3d68..7fc17471c 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -1,25 +1,29 @@ - -<h2>{{$header}}</h2> - -{{if $menu_id}} -<a href="mitem/{{$menu_id}}" title="{{$hintedit}}">{{$editcontents}}</a> -{{/if}} - -<form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}" method="post" > - -{{if $menu_id}} -<input type="hidden" name="menu_id" value="{{$menu_id}}" /> -{{/if}} -{{if $menu_system}} -<input type="hidden" name="menu_system" value="{{$menu_system}}" /> +{{if $header}} +<div class="section-title-wrapper"> + {{if $menu_id}} + <div class="pull-right"> + <a href="mitem/{{$menu_id}}" title="{{$hintedit}}" class="btn btn-xs btn-success"><i class="icon-edit"></i> {{$editcontents}}</a> + </div> + {{/if}} + <h2>{{$header}}</h2> + <div class="clear"></div> +</div> {{/if}} +<div id="menu-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> + <form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" > + {{if $menu_id}} + <input type="hidden" name="menu_id" value="{{$menu_id}}" /> + {{/if}} + {{if $menu_system}} + <input type="hidden" name="menu_system" value="{{$menu_system}}" /> + {{/if}} + {{include file="field_input.tpl" field=$menu_name}} + {{include file="field_input.tpl" field=$menu_desc}} - -{{include file="field_input.tpl" field=$menu_name}} -{{include file="field_input.tpl" field=$menu_desc}} -{{include file="field_checkbox.tpl" field=$menu_bookmark}} -<div class="menuedit-submit-wrapper" > -<input type="submit" name="submit" class="menuedit-submit" value="{{$submit}}" /> + {{include file="field_checkbox.tpl" field=$menu_bookmark}} + <div class="menuedit-submit-wrapper form-group pull-right" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}} <i class="icon-caret-right"></i></button> + </div> + <div class="clear"></div> + </form> </div> - -</form> diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 35ad91937..888dc6e6d 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -1,17 +1,38 @@ -<div class="generic-content-wrapper-styled"> - -<h1>{{$title}}</h1> - -<a href="menu/new" title="{{$hintnew}}">{{$hintnew}}</a> +<div class="section-title-wrapper"> + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-creator');"><i class="icon-edit"></i> {{$hintnew}}</button> + </div> + <h2>{{$title}}</h2> + <div class="clear"></div> +</div> -<br /> +{{$create}} {{if $menus }} -<ul id="menulist"> -{{foreach $menus as $m }} -<li><a href="menu/{{$m.menu_id}}" title="{{$hintedit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> <a href="menu/{{$m.menu_id}}/drop" title="{{$hintdrop}}"><i class="icon-trash drop-icons design-icons design-remove-icon btn btn-default"></i></a> {{if $m.bookmark}}<i class="icon-bookmark" title="{{$bmark}}" ></i> {{/if}}<a href="mitem/{{$m.menu_id}}/new" title="{{$hintcontent}}">{{$m.menu_name}}</a></li> -{{/foreach}} -</ul> -{{/if}} - +<div id="menulist-content-wrapper" class="section-content-wrapper-np"> + <table id="menu-list-table"> + <tr> + <th width="1%"></th> + <th width="1%">{{$nametitle}}</th> + <th width="93%">{{$desctitle}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%" class="hidden-xs">{{$created}}</th> + <th width="1%" class="hidden-xs">{{$edited}}</th> + </tr> + {{foreach $menus as $m }} + <tr id="menu-list-item-{{$m.menu_id}}"> + <td>{{if $m.bookmark}}<i class="icon-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td> + <td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td> + <td>{{$m.menu_desc}}</td> + <td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td> + <td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="icon-share"></i></a></td> + <td class="menu-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> + <td class="hidden-xs">{{$m.menu_created}}</td> + <td class="hidden-xs">{{$m.menu_edited}}</td> + </tr> + {{/foreach}} + </table> </div> +{{/if}} diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index a18fbb0ef..cdc022c5c 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -1,32 +1,37 @@ - -<h2>{{$header}}</h2> - -<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" > - -<input type="hidden" name="menu_id" value="{{$menu_id}}" /> - -{{if $mitem_id}} -<input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> -{{/if}} - -{{include file="field_input.tpl" field=$mitem_desc}} -{{include file="field_input.tpl" field=$mitem_link}} -{{include file="field_input.tpl" field=$mitem_order}} -{{include file="field_checkbox.tpl" field=$usezid}} -{{include file="field_checkbox.tpl" field=$newwin}} - -<div id="settings-default-perms" class="settings-default-perms" > - <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> - {{$aclselect}} - <div id="settings-default-perms-menu-end"></div> +{{if $header}} +<div class="section-title-wrapper"> + <h2>{{$header}}</h2> </div> -<br/> -<div id="settings-default-perms-end"></div> - - - -<div class="mitemedit-submit-wrapper" > -<input id="dbtn-submit" type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" /> +{{/if}} +<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> + <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" > + <input type="hidden" name="menu_id" value="{{$menu_id}}" /> + {{if $mitem_id}} + <input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> + {{/if}} + {{include file="field_input.tpl" field=$mitem_desc}} + {{include file="field_input.tpl" field=$mitem_link}} + {{if $menu_names}} + <datalist id="menu-names"> + {{foreach $menu_names as $menu_name}} + <option value="{{$menu_name}}"> + {{/foreach}} + </datalist> + {{/if}} + {{include file="field_input.tpl" field=$mitem_order}} + {{include file="field_checkbox.tpl" field=$usezid}} + {{include file="field_checkbox.tpl" field=$newwin}} + <div class="pull-right form-group"> + <div class="btn-group"> + <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 $submit_more}} + <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}} <i class="icon-caret-right"></i></button> + {{/if}} + <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> + </div> + {{$aclselect}} + </div> + </form> </div> - -</form> diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index dc5b0e9f9..4e606654f 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -1,18 +1,34 @@ -<h1>{{$title}}</h1> -<h2>{{$menudesc}} ({{$menuname}})</h2> +<div class="section-title-wrapper"> + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i> {{$hintnew}}</button> + </div> + <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2> + <div class="clear"></div> +</div> -<a href="menu/{{$menu_id}}" title="{{$hintmenu}}">{{$edmenu}}</a><br /> -<a href="mitem/{{$menu_id}}/new" title="{{$hintnew}}">{{$hintnew}}</a> - -<br /> -<br /> +{{$create}} {{if $mlist }} -<ul id="mitemlist" class="menu-item-list"> -{{foreach $mlist as $m }} -<li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil mitem-edit btn btn-default"></i></a><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}><i class="icon-trash btn btn-default"></i></a> <a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li> -{{/foreach}} -</ul> +<div id="mitemlist-content-wrapper" class="section-content-wrapper-np"> + <table id="mitem-list-table"> + <tr> + <th width="1%">{{$nametitle}}</th> + <th width="96%">{{$targettitle}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + </tr> + {{foreach $mlist as $m }} + <tr id="mitem-list-item-{{$m.mitem_id}}"> + <td width="1%">{{$m.mitem_desc}}</td> + <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td> + <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td> + <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td> + <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> + </tr> + {{/foreach}} + </table> +</div> {{/if}} diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index d8175bdd2..5328648b9 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -1,8 +1,8 @@ <div class="page"> <div class="generic-content-wrapper" id="page-content-wrapper" > - <h3 class="page-title">{{$title}}</h3> - <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> + {{if $title}}<h2 class="page-title">{{$title}}</h2>{{/if}} + <div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> <div class="page-date">{{$date}}</div> <div class="page-body">{{$body}}</div> </div> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index ba71c1e80..5d68cb2d8 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,6 +1,7 @@ <div id="peoplefind-sidebar" class="widget"> <h3>{{$findpeople}}</h3> <form action="directory" method="post" /> + <input type="hidden" name="navsearch" value="1" /> <div class="form-group"> <div class="input-group"> <input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" /> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 52ef161ba..49181b018 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -18,7 +18,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(event,{{$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('item',{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> {{/if}} </div> <div class="btn-group btn-group"> diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl index 632aab2b3..705cb6c75 100755 --- a/view/tpl/photosajax.tpl +++ b/view/tpl/photosajax.tpl @@ -1,4 +1,4 @@ {{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} +{{include file="photo_top.tpl"}} {{/foreach}} <script>justifyPhotosAjax()</script> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 014cf4192..d5a608c82 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -13,7 +13,7 @@ {{/if}} {{if $item.lock}} <div class="wall-item-lock dropdown"> - <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + <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"> diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl index 9297a282a..ae8dac3f8 100755 --- a/view/tpl/settings_addons.tpl +++ b/view/tpl/settings_addons.tpl @@ -17,6 +17,7 @@ <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}} diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 6532b4ec1..02f679852 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -11,7 +11,7 @@ <div class="section-subtitle-wrapper" role="tab" id="theme-settings-title"> <h3> <a data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content"> - Theme Settings + {{$d_tset}} </a> </h3> </div> @@ -34,7 +34,7 @@ <div class="section-subtitle-wrapper" role="tab" id="custom-settings-title"> <h3> <a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content"> - Custom Theme Settings + {{$d_ctset}} </a> </h3> </div> @@ -50,7 +50,7 @@ <div class="section-subtitle-wrapper" role="tab" id="content-settings-title"> <h3> <a data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content"> - Content Settings + {{$d_cset}} </a> </h3> </div> diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl index 4502df276..cb365ed05 100644 --- a/view/tpl/sharedwithme.tpl +++ b/view/tpl/sharedwithme.tpl @@ -15,7 +15,7 @@ <tr id="cloud-index-{{$item.id}}"> <td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td> <td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}} <span class="label label-success">{{$label_new}}</span>{{/if}}</td> - <td class="cloud-index-tool"><a href="/sharedwithme/{{$item.id}}/drop" title="{{$drop}}" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a></td> + <td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> <td class="hidden-xs">{{$item.objfilesize}}</td> <td class="hidden-xs">{{$item.objedited}}</td> </tr> diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl index a5c6faa99..4ecf823dd 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -1,16 +1,20 @@ -<div class="pmenu{{if $class}} {{$class}}{{/if}}"> -{{if $menu.menu_desc}} - <h3 class="pmenu-title">{{$menu.menu_desc}}</h3> +{{if $wrap}} +<div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}"> {{/if}} -{{if $edit}} -<a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a> -{{/if}} -{{if $items }} -<ul class="pmenu-body"> -{{foreach $items as $mitem }} -<li class="pmenu-item"><a href="{{$mitem.mitem_link}}" {{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}</a></li> -{{/foreach }} -</ul> -{{/if}} -<div class="pmenu-end"></div> + {{if $menu.menu_desc}} + <h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3> + {{/if}} + {{if $items}} + <ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills nav-stacked{{elseif !$wrap || $class}} {{$class}}{{/if}}"> + {{foreach $items as $mitem }} + <li id="pmenu-item-{{$mitem.mitem_id}}" class="pmenu-item{{if $mitem.submenu}} dropdown{{/if}}"> + <a href="{{if $mitem.submenu}}#{{else}}{{$mitem.mitem_link}}{{/if}}"{{if $mitem.submenu}} class="dropdown-toggle" data-toggle="dropdown"{{/if}}{{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}{{if $mitem.submenu}}<span class="caret"></span>{{/if}}</a> + {{if $mitem.submenu}}{{$mitem.submenu}}{{/if}} + </li> + {{/foreach }} + </ul> + {{/if}} +{{if $wrap}} + <div class="pmenu-end"></div> </div> +{{/if}} diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl index cde24525c..83cd80959 100755 --- a/view/tpl/viewcontact_template.tpl +++ b/view/tpl/viewcontact_template.tpl @@ -1,10 +1,15 @@ <div class="generic-content-wrapper generic-content-wrapper-styled"> <h3>{{$title}}</h3> + +<div id="connections-wrapper"> {{foreach $contacts as $contact}} {{include file="contact_template.tpl"}} {{/foreach}} - +<div id="page-end"></div> +</div> <div id="view-contact-end"></div> {{$paginate}} </div> +<script>$(document).ready(function() { loadingPage = false;});</script> +<div id="page-spinner"></div> diff --git a/view/tpl/viewcontactsajax.tpl b/view/tpl/viewcontactsajax.tpl new file mode 100644 index 000000000..68be228be --- /dev/null +++ b/view/tpl/viewcontactsajax.tpl @@ -0,0 +1,3 @@ +{{foreach $contacts as $contact}} +{{include file="contact_template.tpl"}} +{{/foreach}} diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 8335ebd62..77fb09492 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,38 +1,74 @@ -{{$listtitle}} +<div class="section-title-wrapper"> + {{if $editor}} + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('webpage-editor');"><i class="icon-edit"></i> {{$create}}</button> + </div> + {{/if}} + <h2>{{$listtitle}}</h2> + <div class="clear"></div> +</div> +{{if $editor}} +<div id="webpage-editor" class="section-content-tools-wrapper"> + {{$editor}} +</div> +{{/if}} {{if $pages}} - - <div id="pagelist-content-wrapper" class="generic-content-wrapper-styled"> - <table class="webpage-list-table"> - <tr><td>{{$actions_txt}}</td><td>{{$pagelink_txt}}</td><td>{{$title_txt}}</td><td>{{$created_txt}}</td><td>{{$edited_txt}}</td></tr> +<div id="pagelist-content-wrapper" class="section-content-wrapper-np"> + <table id="webpage-list-table"> + <tr> + <th width="1%">{{$pagelink_txt}}</th> + <th width="95%">{{$title_txt}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%" class="hidden-xs">{{$created_txt}}</th> + <th width="1%" class="hidden-xs">{{$edited_txt}}</th> + </tr> {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - <tr> - <td> - {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}} - {{if $view}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}} - {{if $preview}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn btn-default"></i></a> {{/if}} - </td> - <td> - {{if $view}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a> - {{else}}{{$item.pagetitle}} - {{/if}} - </td> - <td> - {{$item.title}} - </td> - <td> - {{$item.created}} - </td> - <td> - {{$item.edited}} - </td> - </tr> - {{/foreach}} + {{foreach $items as $item}} + <tr id="webpage-list-item-{{$item.url}}"> + <td> + {{if $view}} + <a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a> + {{else}} + {{$item.pagetitle}} + {{/if}} + </td> + <td> + {{$item.title}} + </td> + <td class="webpage-list-tool dropdown"> + {{if $item.lockstate=='lock'}} + <i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i> + <ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $item.bb_element}} + <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a> + {{/if}} + </td> + <td class="hidden-xs"> + {{$item.created}} + </td> + <td class="hidden-xs"> + {{$item.edited}} + </td> + </tr> + {{/foreach}} {{/foreach}} - - </table> - </div> - - <div class="clear"></div> - + </table> +</div> +<div class="clear"></div> {{/if}} |