diff options
Diffstat (limited to 'view/tpl')
54 files changed, 697 insertions, 528 deletions
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index 013b72d50..58d645dbf 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -16,6 +16,7 @@ <li><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li> <li><a href='{{$admin.users.0}}'>{{$admin.users.1}}<span id='pending-update' title='{{$h_pending}}'></span></a></li> <li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li> + <li><a href='{{$admin.queue.0}}'>{{$admin.queue.1}}</a></li> <li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li> <li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li> <li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index 817eb939a..a76878438 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -34,8 +34,8 @@ <td class='channel_address'>{{$c.channel_address}}</td> <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}}" 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/delete/{{$c.channel_id}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='icon-remove admin-icons'></i></a> + <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/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> {{/foreach}} diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl new file mode 100644 index 000000000..85b476266 --- /dev/null +++ b/view/tpl/admin_queue.tpl @@ -0,0 +1,14 @@ +<h3>{{$banner}}</h3> + +{{if $hasentries}} + +<table cellpadding="10" id="admin-queue-table"><tr><td>{{$numentries}} </td><td>{{$desturl}}</td><td>{{$priority}}</td><td> </td><td> </td></tr> + +{{foreach $entries as $e}} + +<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td><td>{{$e.priority}}</td>{{if $expert}}<td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-default"><i class="icon-remove"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-default"><i class="icon-trash"></i></a></td>{{/if}}</tr> +{{/foreach}} + +</table> + +{{/if}}
\ No newline at end of file diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index a30892f71..1bcdba473 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -24,7 +24,7 @@ $.post(url, data, function(data) { if(timer) clearTimeout(timer); NavUpdate(); - $.fancybox.close(); + $.colorbox.close(); }) return false; diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index 7f752a773..259640849 100755 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -1,36 +1,32 @@ <div class="generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> - +{{if $adminalertmsg}} + <p class="alert alert-warning" role="alert">{{$adminalertmsg}}</p> +{{/if}} <dl> <dt>{{$queues.label}}</dt> <dd>{{$queues.queue}}</dd> </dl> <dl> + <dt>{{$accounts.0}}</dt> + <dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd> + </dl> + <dl> <dt>{{$pending.0}}</dt> <dd>{{$pending.1}}</dt> </dl> - <dl> - <dt>{{$users.0}}</dt> - <dd>{{$users.1}}</dd> + <dt>{{$channels.0}}</dt> + <dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd> </dl> - <!-- $accounts is empty - {{foreach $accounts as $p}} - <dl> - <dt>{{$p.0}}</dt> - <dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd> - </dl> - {{/foreach}} --> <dl> <dt>{{$plugins.0}}</dt> <dd> {{foreach $plugins.1 as $p}} {{$p}} {{/foreach}} - </dd> </dl> <dl> <dt>{{$version.0}}</dt> <dd>{{$version.1}} - {{$build}}</dd> </dl> - -</div> +</div>
\ No newline at end of file diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 5bf64b4df..aa0abb12f 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -10,15 +10,15 @@ return false; } </script> -<div class = "generic-content-wrapper-styled" id='adminpage'> +<div class="generic-content-wrapper-styled" id="adminpage"> <h1>{{$title}} - {{$page}}</h1> - + <form action="{{$baseurl}}/admin/users" method="post"> - <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - + <input type="hidden" name="form_security_token" value="{{$form_security_token}}"> + <h3>{{$h_pending}}</h3> {{if $pending}} - <table id='pending'> + <table id="pending"> <thead> <tr> {{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}} @@ -31,27 +31,25 @@ <tr> <td class="created">{{$u.account_created}}</td> <td class="email">{{$u.account_email}}</td> - <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td> + <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td> <td class="tools"> - <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><i class='icon-thumbs-up-alt admin-icons'></i></a> - <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><i class='icon-thumbs-down-alt admin-icons'></i></a> + <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$approve}}"><i class="icon-thumbs-up-alt admin-icons"></i></a> + <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$deny}}"><i class="icon-thumbs-down-alt admin-icons"></i></a> </td> </tr> {{/foreach}} </tbody> </table> - <div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div> - <div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div> + <div class="selectall"><a href="#" onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div> + <div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"> <input type="submit" name="page_users_approve" value="{{$approve}}"></div> {{else}} <p>{{$no_pending}}</p> {{/if}} - - - - + + <h3>{{$h_users}}</h3> {{if $users}} - <table id='users'> + <table id="users"> <thead> <tr> {{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}} @@ -62,30 +60,29 @@ <tbody> {{foreach $users as $u}} <tr> - <td class='account_id'>{{$u.account_id}}</td> - <td class='email'>{{if $u.blocked}} + <td class="account_id">{{$u.account_id}}</td> + <td class="email">{{if $u.blocked}} <i>{{$u.account_email}}</i> {{else}} <strong>{{$u.account_email}}</strong> {{/if}}</td> - <td class='channels'>{{$u.channels}}</td> - <td class='register_date'>{{$u.account_created}}</td> - <td class='login_date'>{{$u.account_lastlog}}</td> - <td class='account_expires'>{{$u.account_expires}}</td> - <td class='service_class'>{{$u.account_service_class}}</td> - <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"/></td> + <td class="channels">{{$u.channels}}</td> + <td class="register_date">{{$u.account_created}}</td> + <td class="login_date">{{$u.account_lastlog}}</td> + <td class="account_expires">{{$u.account_expires}}</td> + <td class="service_class">{{$u.account_service_class}}</td> + <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td> <td class="tools"> - <a href="{{$baseurl}}/admin/users/block/{{$u.account_id}}?t={{$form_security_token}}" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($u.blocked)}}dim{{/if}}'></i></a> - <a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class='icon-remove admin-icons'></i></a> + <a href="{{$baseurl}}/admin/users/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="icon-ban-circle admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="icon-trash admin-icons"></i></a> </td> </tr> {{/foreach}} </tbody> </table> - <div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div> - <div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div> + <div class="selectall"><a href="#" onclick="return selectall('users_ckbx');">{{$select_all}}</a></div> + <div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div> {{else}} NO USERS?!? {{/if}} </form> -</div> +</div>
\ No newline at end of file diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 9f0b1746b..cebc17d45 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -11,7 +11,7 @@ <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-remove drop-icons"></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}} diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 26d0e14d2..44daa0a3e 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -23,4 +23,16 @@ <div class="channels-end all"></div> +{{if $delegates}} +<hr /> +<h3>{{$delegate_header}}</h3> +<div id="delegated-channels"> +{{foreach $delegates as $chn}} +{{include file="channel.tpl" channel=$chn}} +{{/foreach}} +</div> + +<div class="channels-end all"></div> +{{/if}} + </div> diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index ab67bc196..49c6af764 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -40,15 +40,15 @@ </button> </div> <div class='btn-group'> - <button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;"> + <!--button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;"> <i class="icon-camera comment-icon"></i> - </button> - <button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('{{$comment}}','url', {{$id}}); return false;"> + </button--> + <button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;"> <i class="icon-link comment-icon"></i> </button> - <button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;"> + <!--button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;"> <i class="icon-facetime-video comment-icon"></i> - </button> + </button--> </div> {{if $feature_encrypt}} <div class='btn-group'> @@ -60,7 +60,7 @@ </div> <div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}"> {{if $preview}} - <button id="comment-edit-submit-{{$id}}" class="btn btn-default btn-xs" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}"> + <button id="comment-edit-presubmit-{{$id}}" class="btn btn-default btn-xs" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}"> <i class="icon-eye-open comment-icon" ></i> </button> {{/if}} diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl index d9ecd22c6..5cefe2f28 100644 --- a/view/tpl/dir_sort_links.tpl +++ b/view/tpl/dir_sort_links.tpl @@ -1,10 +1,15 @@ <div class="widget" id="dir_sort_links"> <h3>{{$header}}</h3> + +{{include file="field_checkbox.tpl" field=$safemode}} +{{include file="field_checkbox.tpl" field=$globaldir}} +{{include file="field_checkbox.tpl" field=$pubforums}} + {{$sort}}: <select onchange='window.location.href="{{$sorturl}}&order="+this.value'> <option value='normal' {{if $selected_sort == 'normal'}}selected='selected'{{/if}}>{{$normal}}</option> <option value='reverse' {{if $selected_sort == 'reverse'}}selected='selected'{{/if}}>{{$reverse}}</option> <option value='date' {{if $selected_sort == 'date'}}selected='selected'{{/if}}>{{$date}}</option> <option value='reversedate' {{if $selected_sort == 'reversedate'}}selected='selected'{{/if}}>{{$reversedate}}</option> </select><br /> -<input type='checkbox' {{if $pubforumsonly}}checked='checked'{{/if}} onchange='window.location.href="{{$forumsurl}}&pubforums="+(this.checked ? 1 : 0)'/> {{$pubforums}}<br /> + </div> diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index 7a2781be0..514626d5f 100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,4 +1,6 @@ - <div class='field checkbox'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <div><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div><span class='field_help'>{{$field.3}}</span> + <div class="form-group field checkbox"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> + <span class="help-block">{{$field.3}}</span> </div> + <div class="clear"></div> diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl index a1e912186..9b6f33462 100644 --- a/view/tpl/field_colorinput.tpl +++ b/view/tpl/field_colorinput.tpl @@ -1,6 +1,6 @@ - <div class='field input color'> - <label class="mainlabel" for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> - <input class='color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} - <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span> + <div class='form-group field input color'> + <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> + <input class='form-control color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} + <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> <div id='end_{{$field.0}}' class='field_end'></div> </div> diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl index 754f5b2f4..907b4c50e 100755 --- a/view/tpl/field_custom.tpl +++ b/view/tpl/field_custom.tpl @@ -1,5 +1,5 @@ - <div class='field custom'> - <label class="mainlabel" for='{{$field.0}}'>{{$field.1}}</label> + <div class='form-group field custom'> + <label for='{{$field.0}}'>{{$field.1}}</label> {{$field.2}} - <span class='field_help'>{{$field.3}}</span> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index be6e3f047..4dfa83699 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,6 +1,6 @@ - <div class='field input'> - <label class="mainlabel" for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> - <input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} - <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span> - <div id='end_{{$field.0}}' class='field_end'></div> + <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}} + <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> + <div class="clear"></div> </div> diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl index 847783518..565f97760 100755 --- a/view/tpl/field_intcheckbox.tpl +++ b/view/tpl/field_intcheckbox.tpl @@ -1,4 +1,6 @@ - <div class='field checkbox'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <div><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.5}}{{$field.5.1}}{{/if}}' data-off='{{if $field.5}}{{$field.5.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div><span class='field_help'>{{$field.4}}</span> + <div class="form-group field checkbox"> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.5}}{{$field.5.1}}{{/if}}' data-off='{{if $field.5}}{{$field.5.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div> + <span class='help-block'>{{$field.4}}</span> </div> + <div class="clear"></div> diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index 38ecf3d07..d19bc9414 100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,5 +1,5 @@ - <div class='field password'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> - <span class='field_help'>{{$field.3}}</span> + <div class='form-group field password'> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <input class="form-control" type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_radio.tpl b/view/tpl/field_radio.tpl index a92324cad..6b5f52de6 100755 --- a/view/tpl/field_radio.tpl +++ b/view/tpl/field_radio.tpl @@ -1,5 +1,8 @@ - <div class='field radio'> - <label class="mainlabel" for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label> - <input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}> - <span class='field_help'>{{$field.3}}</span> + <div class="form-group field radio"> + <label for='id_{{$field.0}}_{{$field.2}}'> + <input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}> + {{$field.1}} + </label> + <span class='help-block'>{{$field.3}}</span> </div> + <div class="clear"></div> diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index 95d1855d6..762447290 100755 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -1,7 +1,7 @@ - <div class='field select'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <select name='{{$field.0}}' id='id_{{$field.0}}'> + <div class='form-group field select'> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'> {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> - <span class='field_help'>{{$field.3}}</span> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl index e241be895..ee5e1508f 100644 --- a/view/tpl/field_select_disabled.tpl +++ b/view/tpl/field_select_disabled.tpl @@ -1,7 +1,7 @@ - <div class='field select'> - <label class="mainlabel" style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label> - <select disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'> + <div class='form-group field select'> + <label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label> + <select class="form-control" disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'> {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> - <span class='field_help'>{{$field.3}}</span> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_select_grouped.tpl b/view/tpl/field_select_grouped.tpl index c7fb4f322..e6d1479de 100644 --- a/view/tpl/field_select_grouped.tpl +++ b/view/tpl/field_select_grouped.tpl @@ -1,6 +1,6 @@ - <div class='field select'> + <div class='form-group field select'> <label for='id_{{$field.0}}'>{{$field.1}}</label> - <select name='{{$field.0}}' id='id_{{$field.0}}'> + <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'> {{foreach $field.4 as $group=>$opts}} <optgroup label='{{$group}}'> {{foreach $opts as $opt=>$val}} @@ -8,5 +8,5 @@ {{/foreach}} </optgroup> </select> - <span class='field_help'>{{$field.3}}</span> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl index 74d575bd0..2780df58c 100755 --- a/view/tpl/field_select_raw.tpl +++ b/view/tpl/field_select_raw.tpl @@ -1,7 +1,7 @@ - <div class='field select'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <select name='{{$field.0}}' id='id_{{$field.0}}'> + <div class='form-group field select'> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'> {{$field.4}} </select> - <span class='field_help'>{{$field.3}}</span> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index dad89a145..01fdc23f5 100755 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,5 +1,5 @@ - <div class='field textarea'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <textarea name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> - <span class='field_help'>{{$field.3}}</span> + <div class='form-group field textarea'> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <textarea class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl index 120727478..250f9fcf1 100755 --- a/view/tpl/field_themeselect.tpl +++ b/view/tpl/field_themeselect.tpl @@ -1,9 +1,9 @@ - <script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script> - <div class='field select'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5=='preview'}}onchange="previewTheme(this);"{{/if}} > + {{if $field.5=='preview'}}<script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script>{{/if}} + <div class='form-group field select'> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5=='preview'}}onchange="previewTheme(this);"{{/if}} > {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> <span class='field_help'>{{$field.3}}</span> - <div id="theme-preview"></div> + {{if $field.5=='preview'}}<div id="theme-preview"></div>{{/if}} </div> diff --git a/view/tpl/generic_addon_settings.tpl b/view/tpl/generic_addon_settings.tpl new file mode 100644 index 000000000..bf39b2aea --- /dev/null +++ b/view/tpl/generic_addon_settings.tpl @@ -0,0 +1,19 @@ +<div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings"> + <h3> + <a title="{{$addon.2}}" data-toggle="collapse" data-parent="#settings" href="#{{$addon.0}}-settings-content" aria-controls="{{$addon.0}}-settings-content"> + {{$addon.1}} + </a> + </h3> + </div> + <div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings"> + <div class="section-content-tools-wrapper"> + {{$content}} + {{if $addon.0}} + <div class="settings-submit-wrapper" > + <button id="{{$addon.0}}-submit" type="submit" name="{{$addon.0}}-submit" class="btn btn-primary" value="{{$addon.3}}">{{$addon.3}}</button> + </div> + {{/if}} + </div> + </div> +</div> diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl index 850e7101f..34ee3e3fd 100755 --- a/view/tpl/group_drop.tpl +++ b/view/tpl/group_drop.tpl @@ -2,6 +2,6 @@ <a href="group/drop/{{$id}}?t={{$form_security_token}}" onclick="return confirmDelete();" id="group-delete-icon-{{$id}}" - class="group-delete-icon" ><i class="icon-remove drop-icons"></i></a> + class="group-delete-icon btn btn-default" title="{{$delete}}" ><i class="icon-trash drop-icons"></i></a> </div> <div class="group-delete-end"></div> diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl index 2223125ea..270d2aa79 100755 --- a/view/tpl/group_selection.tpl +++ b/view/tpl/group_selection.tpl @@ -1,6 +1,6 @@ -<div class="field custom"> +<div class="form-group field custom"> <label for="group-selection" id="group-selection-lbl">{{$label}}</label> -<select name="group-selection" id="group-selection" > +<select class="form-control" name="group-selection" id="group-selection" > {{foreach $groups as $group}} <option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option> {{/foreach}} diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index ebb52dea9..dc334deef 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -4,7 +4,7 @@ <meta name="generator" content="{{$generator}}" /> <!--[if IE]> -<script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script> +<script src="{{$baseurl}}/library/html5.js"></script> <![endif]--> {{$head_css}} diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl index 0e68a172a..07163d59a 100644 --- a/view/tpl/item_filer.tpl +++ b/view/tpl/item_filer.tpl @@ -1,7 +1,7 @@ {{if $categories}} <div class="filesavetags"> {{foreach $categories as $cat}} -<span class="item-category"><i class="icon-folder-close cat-icons"></i> {{$cat.term}} <a href="{{$cat.removelink}}" class="category-remove-link" title="{{$remove}}"><i class="icon-remove drop-icons"></i></a></span> +<span class="item-category"><i class="icon-folder-close cat-icons"></i> {{$cat.term}} <a href="{{$cat.removelink}}" class="category-remove-link" title="{{$remove}}"><i class="icon-trash drop-icons"></i></a></span> {{/foreach}} </div> {{/if}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 8daf2ddb7..0ffed7163 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -1,6 +1,6 @@ <script language="javascript" type="text/javascript"> -var editor=false; +var editor = false; var textlen = 0; var plaintext = '{{$editselect}}'; @@ -22,7 +22,7 @@ function initEditor(cb){ $(".jothidden").show(); if (typeof cb!="undefined") cb(); return; - } + } tinyMCE.init({ theme : "advanced", mode : "specific_textareas", @@ -74,8 +74,7 @@ function initEditor(cb){ } else { $('#profile-jot-desc').html(' '); - } - + } }); ed.onInit.add(function(ed) { @@ -89,7 +88,6 @@ function initEditor(cb){ }); editor = true; - } else { if (typeof cb!="undefined") cb(); } @@ -100,22 +98,19 @@ function enableOnUser(){ $(this).val(""); initEditor(); } - </script> <script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script> <script> var ispublic = '{{$ispublic}}'; $(document).ready(function() { - /* 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'); - - var uploader = new window.AjaxUpload( - 'wall-image-upload', + try { + var uploader = new window.AjaxUpload('wall-image-upload', { action: '{{$baseurl}}/wall_upload/{{$nickname}}', name: 'userfile', title: upload_title, @@ -124,11 +119,26 @@ function enableOnUser(){ addeditortext(response); $('#jot-media').val($('#jot-media').val() + response); $('#profile-rotator').spin(false); - } - } - ); - var file_uploader = new window.AjaxUpload( - 'wall-file-upload', + } + }); + } catch (e) { + } + try { + var uploader_sub = new window.AjaxUpload('wall-image-upload-sub', + { action: '{{$baseurl}}/wall_upload/{{$nickname}}', + name: 'userfile', + title: upload_title, + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onComplete: function(file,response) { + addeditortext(response); + $('#jot-media').val($('#jot-media').val() + response); + $('#profile-rotator').spin(false); + } + }); + } catch(e) { + } + try { + var file_uploader = new window.AjaxUpload('wall-file-upload', { action: '{{$baseurl}}/wall_attach/{{$nickname}}', name: 'userfile', title: attach_title, @@ -137,11 +147,24 @@ function enableOnUser(){ addeditortext(response); $('#jot-media').val($('#jot-media').val() + response); $('#profile-rotator').spin(false); - } - } - ); - - + } + }); + } catch(e) { + } + try { + var file_uploader_sub = new window.AjaxUpload('wall-file-upload-sub', + { action: '{{$baseurl}}/wall_attach/{{$nickname}}', + name: 'userfile', + title: attach_title, + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onComplete: function(file,response) { + addeditortext(response); + $('#jot-media').val($('#jot-media').val() + response); + $('#profile-rotator').spin(false); + } + }); + } catch(e) { + } }); function deleteCheckedItems() { @@ -155,7 +178,7 @@ function enableOnUser(){ else { checkedstr = $(this).val(); } - } + } }); $.post('item', { dropitems: checkedstr }, function(data) { window.location.reload(); @@ -199,14 +222,12 @@ function enableOnUser(){ //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); $('#expiryModal').modal(); $('#expiry-modal-OKButton').on('click', function() { - reply=$('#expiration-date').val(); - if(reply && reply.length) { - $('#jot-expire').val(reply); - $('#expiryModal').modal('hide'); - } -}) - - + reply=$('#expiration-date').val(); + if(reply && reply.length) { + $('#jot-expire').val(reply); + $('#expiryModal').modal('hide'); + } + }) } function jotShare(id) { @@ -220,7 +241,6 @@ function enableOnUser(){ $('#like-rotator-' + id).spin(false); $(window).scrollTop(0); }); - }); } @@ -265,9 +285,9 @@ function enableOnUser(){ } function itemFiler(id) { - + var bordercolor = $("input").css("border-color"); - + $.get('filer/', function(data){ $.colorbox({html:data}); $("#id_term").keypress(function(){ @@ -276,7 +296,7 @@ function enableOnUser(){ $("#select_term").change(function(){ $("#id_term").css("border-color",bordercolor); }) - + $("#filer_save").click(function(e){ e.preventDefault(); reply = $("#id_term").val(); @@ -312,11 +332,11 @@ function enableOnUser(){ function toggleVoting() { if($('#jot-consensus').val() > 0) { $('#jot-consensus').val(0); - $('#profile-voting').removeClass('icon-check').addClass('icon-check-empty'); + $('#profile-voting, #profile-voting-sub').removeClass('icon-check').addClass('icon-check-empty'); } else { $('#jot-consensus').val(1); - $('#profile-voting').removeClass('icon-check-empty').addClass('icon-check'); + $('#profile-voting, #profile-voting-sub').removeClass('icon-check-empty').addClass('icon-check'); } } @@ -325,8 +345,6 @@ function enableOnUser(){ $('#profile-nolocation-wrapper').attr('disabled', true); } - - {{$geotag}} </script> @@ -335,16 +353,15 @@ function enableOnUser(){ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-delete-link,.block-delete-link", function(e) { var link = $(this).attr("href"); // "get" the intended link in a var - if (typeof(eval($.fn.modal)) === 'function'){ - e.preventDefault(); - bootbox.confirm("<h4>{{$confirmdelete}}</h4>",function(result) { - if (result) { - document.location.href = link;} - });} - else { - return confirm("{{$confirmdelete}}"); - } - }); + if (typeof(eval($.fn.modal)) === 'function'){ + e.preventDefault(); + bootbox.confirm("<h4>{{$confirmdelete}}</h4>",function(result) { + if (result) { + document.location.href = link; + } + }); + } else { + return confirm("{{$confirmdelete}}"); + } +}); </script> - - diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index f32dba095..47787676e 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,5 +1,5 @@ -<div id="profile-jot-wrapper" > - <form id="profile-jot-form" action="{{$action}}" method="post" > +<div id="profile-jot-wrapper"> + <form id="profile-jot-form" action="{{$action}}" method="post"> <input type="hidden" name="type" value="{{$ptyp}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <input type="hidden" name="return" value="{{$return_path}}" /> @@ -16,47 +16,57 @@ {{$mimeselect}} {{$layoutselect}} {{if $id_select}} - <div class="channel-id-select-div"> + <div class="channel-id-select-div"> <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}} - </div> + </div> {{/if}} - <div id="jot-title-wrap" class="jothidden" style="display:none"> - <input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}"> + <div id="jot-title-wrap" class="jothidden" style="display:none"> + <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"> - <input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="tagsinput"/> + <div id="jot-category-wrap" class="jothidden" style="display:none"> + <input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="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}}" /> + <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" placeholder="{{$share}}">{{$content}}</textarea> + <textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex=2 placeholder="{{$share}}">{{$content}}</textarea> </div> <div id="profile-jot-submit-wrapper" class="jothidden"> <div id="profile-jot-submit-left" class="btn-toolbar pull-left"> - {{if $visitor}} - <div class='btn-group'> - <button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" > - <i class="icon-camera jot-icons"></i> + <div class="btn-group"> + <button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b'); 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;"> + <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;"> + <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;"> + <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;"> + <i class="icon-terminal jot-icons"></i> </button> + </div> + {{if $visitor}} + <div class="btn-group hidden-xs"> + {{if $writefiles}} <button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" > <i id="wall-file-upload-icon" class="icon-paper-clip jot-icons"></i> </button> + {{/if}} <button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"> <i id="profile-link" class="icon-link jot-icons"></i> </button> - <button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;"> - <i id="profile-video" class="icon-facetime-video jot-icons"></i> - </button> - <button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;"> - <i id="profile-audio" class="icon-volume-up jot-icons"></i> - </button> </div> - <div class='btn-group'> + <div class="btn-group hidden-xs hidden-sm"> <button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;"> <i id="profile-location" class="icon-globe jot-icons"></i> </button> @@ -66,7 +76,7 @@ </button> {{/if}} {{else}} - <div class='btn-group'> + <div class="btn-group hidden-xs"> {{/if}} {{if $feature_expire}} <button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;"> @@ -84,6 +94,35 @@ </button> {{/if}} </div> + <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="#" onclick="preview_post();return false;"><i class="icon-eye-open"></i> {{$preview}}</a></li> + {{if $visitor}} + <li class="divider visible-xs"></li> + {{if $writefiles}}<li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i> {{$attach}}</a></li>{{/if}} + <li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i> {{$weblink}}</a></li> + <!--li class="visible-xs"><a href="#" onclick="jotVideoURL(); return false;"><i class="icon-facetime-video"></i> {{$video}}</a></li--> + <!--li class="visible-xs"><a href="#" onclick="jotAudioURL(); return false;"><i class="icon-volume-up"></i> {{$audio}}</a></li--> + {{/if}} + <li class="divider visible-xs"></li> + <li class="visible-xs visible-sm"><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i> {{$setloc}}</a></li> + {{if $noloc}} + <li class="visible-xs visible-sm"><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i> {{$noloc}}</a></li> + {{/if}} + {{if $feature_expire}} + <li class="visible-xs visible-sm"><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i> {{$expires}}</a></li> + {{/if}} + {{if $feature_encrypt}} + <li class="visible-xs visible-sm"><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="icon-key"></i> {{$encrypt}}</a></li> + {{/if}} + {{if $feature_voting}} + <li class="visible-xs visible-sm"><a href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="icon-check-empty"></i> {{$voting}}</a></li> + {{/if}} + </ul> + </div> </div> <div id="profile-rotator-wrapper"> <div id="profile-rotator"></div> @@ -91,15 +130,15 @@ <div id="profile-jot-submit-right" class="btn-group pull-right"> {{if $showacl}} <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i> + <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>{{if $bang}} <i class="icon-exclamation jot-icons"></i>{{/if}} </button> {{/if}} {{if $preview}} - <button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}"> + <button class="btn btn-default btn-sm hidden-xs" onclick="preview_post();return false;" title="{{$preview}}"> <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} - <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="button-submit" >{{$share}}</button> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit" >{{$share}}</button> </div> <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> @@ -133,17 +172,17 @@ </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" - } - }); - }); + $(function() { + $('#datetimepicker1').datetimepicker({ + language: 'us', + icons: { + time: "icon-time", + date: "icon-calendar", + up: "icon-arrow-up", + down: "icon-arrow-down" + } + }); + }); </script> {{if $content}} diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 4eb9ae844..c557b535d 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -20,6 +20,7 @@ 'rating_val' : "{{$rating_val}}", 'rating_text' : "{{$rating_text}}", 'submit' : "{{$submit}}", + 'linkurl' : "{{$linkurl}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index d1bb00543..40f91a8bb 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -19,7 +19,7 @@ function drophub(id) { {{if $hub.primary}}<i class="icon-check"></i>{{else}}<button class="btn btn-std" onclick="primehub({{$hub.hubloc_id}}); return false;" ><i class="icon-check-empty" ></i></button>{{/if}} </td> -<td>{{if $hub.primary}}{{else}}{{if ! $hub.deleted}}<button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-remove"></i></button>{{/if}}{{/if}}</td> +<td>{{if $hub.primary}}{{else}}{{if ! $hub.deleted}}<button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-trash"></i></button>{{/if}}{{/if}}</td> </tr> {{/foreach}} </table> diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index f6f48e138..9472bd961 100755 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -1,33 +1,19 @@ - <form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <input type="hidden" name="auth-params" value="login" /> - - <div id="login_standard"> - {{include file="field_input.tpl" field=$lname}} - {{include file="field_password.tpl" field=$lpassword}} + <div id="login-main"> + <div id="login-input" class="form-group"> + {{include file="field_input.tpl" field=$lname}} + {{include file="field_password.tpl" field=$lpassword}} + {{include file="field_checkbox.tpl" field=$remember}} + <button type="submit" name="submit" class="btn btn-block btn-primary">{{$login}}</button> + </div> + <div id="login-extra-links"> + {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link" class="pull-right">{{$register.desc}}</a>{{/if}} + <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a> + </div> </div> - - <div id="login-extra-links"> - {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}} - <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a> - </div> - - <div class="clear"></div> - - {{include file="field_checkbox.tpl" field=$remember}} - - <div id="login-standard-end"></div> - - <div id="login-submit-wrapper" > - <input type="submit" name="submit" id="login-submit-button" class="btn btn-default" value="{{$login}}" /> - </div> - {{foreach $hiddens as $k=>$v}} <input type="hidden" name="{{$k}}" value="{{$v}}" /> {{/foreach}} - - </form> - - <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script> diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index f794ffc78..ec8f8c1e3 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -8,9 +8,9 @@ <div class="mail-conv-date">{{$mail.date}}</div> <div class="mail-conv-subject">{{$mail.subject}}</div> <div class="mail-conv-body">{{$mail.body}}</div> - <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon btn btn-default" ><i class="icon-trash mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div> {{if $mail.can_recall}} - <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div> + <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon btn btn-default" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div> {{/if}} <div class="mail-conv-outside-wrapper-end"></div> </div> diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 6b06f6127..1d499e12f 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -3,6 +3,6 @@ <span class="mail-list">{{$from_name}}</span> <span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$id}}" class="mail-link">{{$subject}}</a></span> <span class="mail-list" title="{{$date}}">{{$date}}</span> - <span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span> + <span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default btn-sm" ><i class="icon-trash mail-icons drop-icons"></i></a></span> <div class="clear"> </div> </div> diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl index c8f3d2e06..d423e6691 100755 --- a/view/tpl/main_slider.tpl +++ b/view/tpl/main_slider.tpl @@ -17,6 +17,8 @@ var slideTimer = null; function networkRefresh() { + $("#profile-jot-text-loading").show(); + if((document.readyState !== "complete") || (slideTimer !== null)) return; if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax)) diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index bb862fef0..35ad91937 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -9,7 +9,7 @@ {{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-remove 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> +<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}} diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 2c1ded6cc..dc5b0e9f9 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -10,7 +10,7 @@ {{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-remove btn btn-default"></i></a> <a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li> +<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> {{/if}} diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl index cb7ae17ba..31b654374 100755 --- a/view/tpl/photo_drop.tpl +++ b/view/tpl/photo_drop.tpl @@ -1,4 +1,4 @@ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" > - <a href="item/drop/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></a> + <a href="item/drop/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-trash drop-icons"></i></a> </div> <div class="wall-item-delete-end"></div> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 3ece68876..52ef161ba 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -7,6 +7,11 @@ {{if $tools}} <a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a> {{/if}} + {{if $map}} + <div class="btn-group btn-group"> + <i class="icon-globe btn btn-default btn-xs" title="{{$map_text}}" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); }" ></i> + </div> + {{/if}} <div class="btn-group btn-group dropdown"> {{if $edit}} @@ -31,6 +36,9 @@ <div class="clear"></div> </div> + <div id="photo-map"> + {{$map}} + </div> <div id="photo-edit" class="section-content-tools-wrapper"> <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form"> <input type="hidden" name="item_id" value="{{$edit.item_id}}" /> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 6cd7e3eb9..06e3ef612 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -21,12 +21,8 @@ <div class="form-group"> <input id="photos-upload-choose" type="file" name="userfile" /> </div> + {{include file="field_checkbox.tpl" field=$visible}} <div class="pull-right btn-group form-group"> - <div class="btn-group" data-toggle="buttons"> - <label class="btn btn-default btn-sm" title="{{$nosharetext}}"> - <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /><i class="icon-ban-circle"></i> - </label> - </div> <div class="btn-group"> {{if $lockstate}} <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> @@ -41,12 +37,9 @@ <div class="clear"></div> {{if $uploader}} + + {{include file="field_checkbox.tpl" field=$visible}} <div id="photos-upload-perms" class="btn-group pull-right"> - <div class="btn-group" data-toggle="buttons"> - <label class="btn btn-default btn-sm" title="{{$nosharetext}}"> - <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /><i class="icon-ban-circle"></i> - </label> - </div> {{if $lockstate}} <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index cae920c5d..2964d9c4b 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -16,7 +16,7 @@ {{/if}} <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> - + {{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl index b7378806b..aefcd51a8 100644 --- a/view/tpl/removeaccount.tpl +++ b/view/tpl/removeaccount.tpl @@ -1,22 +1,20 @@ -<h1>{{$title}}</h1> - -<div id="remove-account-wrapper"> - -<div id="remove-account-desc">{{$desc}}</div> - -<form action="{{$basedir}}/removeaccount" autocomplete="off" method="post" > -<input type="hidden" name="verify" value="{{$hash}}" /> - -<div id="remove-account-pass-wrapper"> -<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> -<input type="password" id="remove-account-pass" name="qxz_password" /> -</div> -<div id="remove-account-pass-end"></div> - -{{include file="field_checkbox.tpl" field=$global}} - -<input type="submit" name="submit" value="{{$submit}}" /> - -</form> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-danger-wrapper" id="remove-account-desc"> + <strong>{{$desc.0}}</strong>{{$desc.1}}<strong>{{$desc.2}}</strong> + </div> + <div class="section-content-tools-wrapper"> + <form action="{{$basedir}}/removeaccount" autocomplete="off" method="post" > + <input type="hidden" name="verify" value="{{$hash}}" /> + <div class="form-group" id="remove-account-pass-wrapper"> + <label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> + <input class="form-control" type="password" id="remove-account-pass" name="qxz_password" /> + </div> + {{include file="field_checkbox.tpl" field=$global}} + <button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button> + </form> + </div> </div> diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl index c42eaf0e1..5b329dd6d 100755 --- a/view/tpl/removeme.tpl +++ b/view/tpl/removeme.tpl @@ -1,22 +1,20 @@ -<h1>{{$title}}</h1> - -<div id="remove-account-wrapper"> - -<div id="remove-account-desc">{{$desc}}</div> - -<form action="{{$basedir}}/removeme" autocomplete="off" method="post" > -<input type="hidden" name="verify" value="{{$hash}}" /> - -<div id="remove-account-pass-wrapper"> -<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> -<input type="password" id="remove-account-pass" name="qxz_password" /> -</div> -<div id="remove-account-pass-end"></div> - -{{include file="field_checkbox.tpl" field=$global}} - -<input type="submit" name="submit" value="{{$submit}}" /> - -</form> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-danger-wrapper" id="remove-account-desc"> + <strong>{{$desc.0}}</strong>{{$desc.1}}<strong>{{$desc.2}}</strong> + </div> + <div class="section-content-tools-wrapper"> + <form action="{{$basedir}}/removeme" autocomplete="off" method="post" > + <input type="hidden" name="verify" value="{{$hash}}" /> + <div class="form-group" id="remove-account-pass-wrapper"> + <label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> + <input class="form-control" type="password" id="remove-account-pass" name="qxz_password" /> + </div> + {{include file="field_checkbox.tpl" field=$global}} + <button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button> + </form> + </div> </div> diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index 73987f192..1f7861078 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -5,7 +5,7 @@ <ul id="saved-search-list" class="nav nav-pills nav-stacked"> {{foreach $saved as $search}} <li id="search-term-{{$search.id}}"> - <a class="pull-right group-edit-icon" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove" ></i></a> + <a class="pull-right group-edit-tool" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="group-edit-icon icon-trash" ></i></a> <a id="saved-search-term-{{$search.id}}"{{if $search.selected}} class="search-selected"{{/if}} href="{{$search.srchlink}}">{{$search.displayterm}}</a> </li> {{/foreach}} diff --git a/view/tpl/section_title.tpl b/view/tpl/section_title.tpl new file mode 100644 index 000000000..338e57042 --- /dev/null +++ b/view/tpl/section_title.tpl @@ -0,0 +1,5 @@ +<div class="section-title-wrapper"> + <h2>{{$title}}</h2> + <div class="clear"></div> +</div> + diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 894f0fe83..eb497bbb5 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,152 +1,164 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$ptitle}}</h1> - -{{$nickname_block}} - -<form action="settings" id="settings-form" method="post" autocomplete="off" > -<input type='hidden' name='form_security_token' value='{{$form_security_token}}' /> - -<h3 class="settings-heading">{{$h_basic}}</h3> - -{{include file="field_input.tpl" field=$username}} -{{include file="field_select_grouped.tpl" field=$timezone}} -{{include file="field_input.tpl" field=$defloc}} -{{include file="field_checkbox.tpl" field=$allowloc}} - -{{include file="field_checkbox.tpl" field=$adult}} - -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> -</div> - - -<h3 class="settings-heading">{{$h_prv}}</h3> - -{{include file="field_select_grouped.tpl" field=$role}} - -<div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> -{{include file="field_checkbox.tpl" field=$hide_presence}} - -<button type="button" class="btn btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button> - -<div class="collapse well" id="settings-permissions-wrapper"> - -{{foreach $permiss_arr as $permit}} - {{include file="field_select.tpl" field=$permit}} -{{/foreach}} - <div class="settings-submit-wrapper" > - <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i> {{$removeme}}</a> + <h2>{{$ptitle}}</h2> + <div class="clear"></div> </div> -</div> - -<div id="settings-default-perms" class="settings-default-perms" > - <button class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> - {{$aclselect}} - <div id="settings-default-perms-menu-end"></div> -</div> -<br/> -<div id="settings-default-perms-end"></div> - -{{$group_select}} - -{{$profile_in_dir}} - -</div> - -<div class="settings-common-perms"> - - - -{{$suggestme}} - -{{include file="field_checkbox.tpl" field=$blocktags}} - - -{{include file="field_input.tpl" field=$expire}} - -</div> - - - -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> -</div> - - - -<h3 class="settings-heading">{{$h_not}}</h3> -<div id="settings-notifications"> - -<div id="settings-activity-desc">{{$activity_options}}</div> -{{*not yet implemented *}} -{{*include file="field_checkbox.tpl" field=$post_joingroup*}} -{{include file="field_checkbox.tpl" field=$post_newfriend}} -{{include file="field_checkbox.tpl" field=$post_profilechange}} - - -<div id="settings-notify-desc">{{$lbl_not}}</div> - -<div class="group"> -{{include file="field_intcheckbox.tpl" field=$notify1}} -{{include file="field_intcheckbox.tpl" field=$notify2}} -{{include file="field_intcheckbox.tpl" field=$notify3}} -{{include file="field_intcheckbox.tpl" field=$notify4}} -{{include file="field_intcheckbox.tpl" field=$notify5}} -{{include file="field_intcheckbox.tpl" field=$notify6}} -{{include file="field_intcheckbox.tpl" field=$notify7}} -{{include file="field_intcheckbox.tpl" field=$notify8}} -</div> - -<div id="settings-vnotify-desc">{{$lbl_vnot}}</div> - -<div class="group"> -{{include file="field_intcheckbox.tpl" field=$vnotify1}} -{{include file="field_intcheckbox.tpl" field=$vnotify2}} -{{include file="field_intcheckbox.tpl" field=$vnotify3}} -{{include file="field_intcheckbox.tpl" field=$vnotify4}} -{{include file="field_intcheckbox.tpl" field=$vnotify5}} -{{include file="field_intcheckbox.tpl" field=$vnotify6}} -{{include file="field_intcheckbox.tpl" field=$vnotify10}} -{{include file="field_intcheckbox.tpl" field=$vnotify7}} -{{include file="field_intcheckbox.tpl" field=$vnotify8}} -{{include file="field_intcheckbox.tpl" field=$vnotify9}} -{{include file="field_intcheckbox.tpl" field=$vnotify11}} -{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}} - -{{*include file="field_intcheckbox.tpl" field=$vnotify11*}} -</div> - -{{include file="field_input.tpl" field=$evdays}} - - - -</div> - -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> -</div> - - -{{if $menus}} -<h3 class="settings-heading">{{$lbl_misc}}</h3> - - - -<div id="settings-menu-desc">{{$menu_desc}}</div> -<div class="settings-channel-menu-div"> -<select name="channel_menu" class="settings-channel-menu-sel"> -{{foreach $menus as $menu }} -<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option> -{{/foreach}} -</select> -</div> -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> -</div> -<div id="settings-channel-menu-end"></div> -{{/if}} -<div id="settings-remove-account-link"> -<button title="{{$permanent}}" class="btn btn-danger" type="submit" formaction="removeme">{{$removeme}}</button> -</div> - + {{$nickname_block}} + <form action="settings" id="settings-form" method="post" autocomplete="off" > + <input type='hidden' name='form_security_token' value='{{$form_security_token}}' /> + <div class="panel-group" id="settings" role="tablist" aria-multiselectable="true"> + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="basic-settings"> + <h3> + <a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse" aria-expanded="true" aria-controls="basic-settings-collapse"> + {{$h_basic}} + </a> + </h3> + </div> + <div id="basic-settings-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="basic-settings"> + <div class="section-content-tools-wrapper"> + {{include file="field_input.tpl" field=$username}} + {{include file="field_select_grouped.tpl" field=$timezone}} + {{include file="field_input.tpl" field=$defloc}} + {{include file="field_checkbox.tpl" field=$allowloc}} + {{include file="field_checkbox.tpl" field=$adult}} + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="privacy-settings"> + <h3> + <a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse" aria-expanded="true" aria-controls="privacy-settings-collapse"> + {{$h_prv}} + </a> + </h3> + </div> + <div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings"> + <div class="section-content-tools-wrapper"> + {{include file="field_select_grouped.tpl" field=$role}} + <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> + <div class="form-group"> + <button type="button" class="btn btn-default" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> + </div> + <div class="modal" id="apsModal"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> + <h4 class="modal-title">{{$lbl_p2macro}}</h4> + </div> + <div class="modal-body"> + {{foreach $permiss_arr as $permit}} + {{include file="field_select.tpl" field=$permit}} + {{/foreach}} + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + <div id="settings-default-perms" class="form-group" > + <button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon"></i> {{$permissions}}</button> + {{$aclselect}} + </div> + {{$group_select}} + {{include file="field_checkbox.tpl" field=$hide_presence}} + {{$profile_in_dir}} + </div> + <div class="settings-common-perms"> + {{$suggestme}} + {{include file="field_checkbox.tpl" field=$blocktags}} + {{include file="field_input.tpl" field=$expire}} + </div> + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="notification-settings"> + <h3> + <a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse" aria-expanded="true" aria-controls="notification-settings-collapse"> + {{$h_not}} + </a> + </h3> + </div> + <div id="notification-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="notification-settings"> + <div class="section-content-tools-wrapper"> + <div id="settings-notifications"> + <h3>{{$activity_options}}</h3> + <div class="group"> + {{*not yet implemented *}} + {{*include file="field_checkbox.tpl" field=$post_joingroup*}} + {{include file="field_checkbox.tpl" field=$post_newfriend}} + {{include file="field_checkbox.tpl" field=$post_profilechange}} + </div> + <h3>{{$lbl_not}}</h3> + <div class="group"> + {{include file="field_intcheckbox.tpl" field=$notify1}} + {{include file="field_intcheckbox.tpl" field=$notify2}} + {{include file="field_intcheckbox.tpl" field=$notify3}} + {{include file="field_intcheckbox.tpl" field=$notify4}} + {{include file="field_intcheckbox.tpl" field=$notify5}} + {{include file="field_intcheckbox.tpl" field=$notify6}} + {{include file="field_intcheckbox.tpl" field=$notify7}} + {{include file="field_intcheckbox.tpl" field=$notify8}} + </div> + <h3>{{$lbl_vnot}}</h3> + <div class="group"> + {{include file="field_intcheckbox.tpl" field=$vnotify1}} + {{include file="field_intcheckbox.tpl" field=$vnotify2}} + {{include file="field_intcheckbox.tpl" field=$vnotify3}} + {{include file="field_intcheckbox.tpl" field=$vnotify4}} + {{include file="field_intcheckbox.tpl" field=$vnotify5}} + {{include file="field_intcheckbox.tpl" field=$vnotify6}} + {{include file="field_intcheckbox.tpl" field=$vnotify10}} + {{include file="field_intcheckbox.tpl" field=$vnotify7}} + {{include file="field_intcheckbox.tpl" field=$vnotify8}} + {{include file="field_intcheckbox.tpl" field=$vnotify9}} + {{include file="field_intcheckbox.tpl" field=$vnotify11}} + {{include file="field_intcheckbox.tpl" field=$always_show_in_notices}} + {{include file="field_input.tpl" field=$evdays}} + </div> + </div> + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + {{if $menus}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings"> + <h3> + <a data-toggle="collapse" data-parent="#settings" href="#miscellaneous-settings-collapse" aria-expanded="true" aria-controls="miscellaneous-settings-collapse"> + {{$lbl_misc}} + </a> + </h3> + </div> + <div id="miscellaneous-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous-settings"> + <div class="section-content-wrapper"> + <div class="form-group"> + <label for="channel_menu">{{$menu_desc}}</label> + <select name="channel_menu" class="form-control"> + {{foreach $menus as $menu }} + <option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option> + {{/foreach}} + </select> + </div> + <div class="settings-submit-wrapper" > + <input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> + </div> + </div> + </div> + </div> + {{/if}} + </div> + </form> </div> diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 36bb494d8..9f550fe4a 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -1,28 +1,20 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> - - -<form action="settings/account" id="settings-account-form" method="post" autocomplete="off" > -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - -{{include file="field_input.tpl" field=$email}} - - -<h3 class="settings-heading">{{$h_pass}}</h3> - -{{include file="field_password.tpl" field=$password1}} -{{include file="field_password.tpl" field=$password2}} - - -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <a title="{{$removeaccount}}" class="btn btn-danger btn-xs pull-right" href="removeaccount"><i class="icon-trash"></i> {{$removeme}}</a> + <h2>{{$title}}</h2> + <div class="clear"></div> + </div> + <form action="settings/account" id="settings-account-form" method="post" autocomplete="off" > + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <div class="section-content-tools-wrapper"> + {{include file="field_input.tpl" field=$email}} + {{include file="field_password.tpl" field=$password1}} + {{include file="field_password.tpl" field=$password2}} + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + {{$account_settings}} + </div> + </form> </div> -{{$account_settings}} - -<div id="settings-remove-account-link"> -<h3 class="settings-heading">{{$removeme}}</h3> -<div id="settings-remove-account-desc">{{$removeaccount}}</div> -<button title="{{$permanent}}" class="btn btn-danger" type="submit" formaction="removeaccount">{{$removeme}}</button> -</div> -</div> diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl index a18f57658..9297a282a 100755 --- a/view/tpl/settings_addons.tpl +++ b/view/tpl/settings_addons.tpl @@ -1,21 +1,33 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <form action="settings/featured" method="post" autocomplete="off"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <div class="panel-group" id="settings" role="tablist"> + {{if $diaspora_enabled}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="dspr-settings"> + <h3> + <a title="{{$dsprdesc}}" data-toggle="collapse" data-parent="#settings" href="#dspr-settings-content" aria-controls="dspr-settings-content"> + {{$dsprtitle}} + </a> + </h3> + </div> + <div id="dspr-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="dspr-settings"> + <div class="section-content-tools-wrapper"> -<form action="settings/featured" method="post" autocomplete="off"> -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - -{{if $diaspora_enabled}} -<div class="settings-block"> -<button class="btn btn-default" data-target="#settings-dspr-wrapper" data-toggle="collapse" type="button">{{$dsprtitle}}</button> -<div id="settings-dspr-wrapper" class="collapse well"> -<div id="dspr-settings-wrapper"> -<label id="dspr-pubcomment-label" for="dspr-pubcomment-checkbox">{{$dsprhelp}}</label> -<input id="dspr-pubcomment-checkbox" type="checkbox" name="dspr_pubcomment" value="1" ' . {{if $pubcomments}} checked="checked" {{/if}} /> -</div><div class="clear"></div> -<div class="settings-submit-wrapper" ><input type="submit" name="dspr-submit" class="settings-submit" value="{{$dsprsubmit}}" /></div></div></div> -{{/if}} -{{$settings_addons}} - -</form> + {{include file="field_checkbox.tpl" field=$pubcomments}} + {{include file="field_checkbox.tpl" field=$hijacking}} + <div class="settings-submit-wrapper" > + <button type="submit" name="dspr-submit" class="btn btn-primary" value="{{$dsprsubmit}}">{{$dsprsubmit}}</button> + </div> + </div> + </div> + </div> + {{/if}} + {{$settings_addons}} + </div> + </form> </div> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 8bf4dc0cc..6532b4ec1 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -1,35 +1,81 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$ptitle}}</h1> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$ptitle}}</h2> + </div> + <form action="settings/display" id="settings-form" method="post" autocomplete="off" > + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> -<form action="settings/display" id="settings-form" method="post" autocomplete="off" > -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - -{{include file="field_themeselect.tpl" field=$theme}} -{{include file="field_themeselect.tpl" field=$mobile_theme}} -{{if $expert}} -{{include file="field_checkbox.tpl" field=$user_scalable}} -{{/if}} -{{include file="field_input.tpl" field=$ajaxint}} -{{include file="field_input.tpl" field=$itemspage}} -{{include file="field_input.tpl" field=$channel_divmore_height}} -{{include file="field_input.tpl" field=$network_divmore_height}} -{{include file="field_checkbox.tpl" field=$nosmile}} -{{include file="field_checkbox.tpl" field=$title_tosource}} -{{include file="field_checkbox.tpl" field=$channel_list_mode}} -{{include file="field_checkbox.tpl" field=$network_list_mode}} - -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> -</div> - -<br /> -<a href="pdledit">{{$layout_editor}}</a> -<br /> - -{{if $theme_config}} -<h2>Theme settings</h2> -{{$theme_config}} -{{/if}} - -</form> + <div class="panel-group" id="settings" role="tablist" aria-multiselectable="true"> + {{if $theme || $mobile_theme}} + <div class="panel"> + <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 + </a> + </h3> + </div> + <div id="theme-settings-content" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="theme-settings"> + <div class="section-content-tools-wrapper"> + {{if $theme}} + {{include file="field_themeselect.tpl" field=$theme}} + {{/if}} + {{if $mobile_theme}} + {{include file="field_themeselect.tpl" field=$mobile_theme}} + {{/if}} + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + {{/if}} + <div class="panel"> + <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 + </a> + </h3> + </div> + <div id="custom-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings"> + <div class="section-content-tools-wrapper"> + {{if $theme_config}} + {{$theme_config}} + {{/if}} + </div> + </div> + </div> + <div class="panel"> + <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 + </a> + </h3> + </div> + <div id="content-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings"> + <div class="section-content-wrapper"> + {{include file="field_input.tpl" field=$ajaxint}} + {{include file="field_input.tpl" field=$itemspage}} + {{include file="field_input.tpl" field=$channel_divmore_height}} + {{include file="field_input.tpl" field=$network_divmore_height}} + {{include file="field_checkbox.tpl" field=$nosmile}} + {{include file="field_checkbox.tpl" field=$title_tosource}} + {{include file="field_checkbox.tpl" field=$channel_list_mode}} + {{include file="field_checkbox.tpl" field=$network_list_mode}} + {{include file="field_checkbox.tpl" field=$user_scalable}} + {{if $expert}} + <div class="form-group"> + <a class="btn btn-default "href="pdledit">{{$layout_editor}}</a> + </div> + {{/if}} + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + </div> + </form> </div> diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index 3ede4c76d..75eb34fb9 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -1,21 +1,30 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> - - -<form action="settings/features" method="post" autocomplete="off"> -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - -{{foreach $features as $f}} -<h3 class="settings-heading">{{$f.0}}</h3> - -{{foreach $f.1 as $fcat}} - {{include file="field_checkbox.tpl" field=$fcat}} -{{/foreach}} -{{/foreach}} - -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" /> -</div> - -</form> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <form action="settings/features" method="post" autocomplete="off"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <div class="panel-group" id="settings" role="tablist" aria-multiselectable="true"> + {{foreach $features as $g => $f}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title"> + <h3> + <a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse"> + {{$f.0}} + </a> + </h3> + </div> + <div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} in{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title"> + <div class="section-content-tools-wrapper"> + {{foreach $f.1 as $fcat}} + {{include file="field_checkbox.tpl" field=$fcat}} + {{/foreach}} + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + {{/foreach}} + </div> </div> diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl index ae11c00c8..2460952fe 100755 --- a/view/tpl/settings_nick_set.tpl +++ b/view/tpl/settings_nick_set.tpl @@ -1,4 +1,4 @@ -<div id="settings-nick-wrapper" > -<div id="settings-nickname-desc" class="info-message">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div> +<div id="settings-nick-wrapper" class="section-content-info-wrapper"> +<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div> </div> <div id="settings-nick-end" ></div> diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index f7b4a0b1a..20e8f458f 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -24,7 +24,7 @@ {{/if}} {{if $app.my}} <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="icon-pencil btn btn-default"></i></a> - <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="icon-remove btn btn-default"></i></a> + <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="icon-trash btn btn-default"></i></a> {{/if}} </div> {{/foreach}} diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl index c48912918..9aacc8958 100644 --- a/view/tpl/show_thing.tpl +++ b/view/tpl/show_thing.tpl @@ -7,7 +7,7 @@ {{if $canedit}} <div class="thing-edit-links"> <a href="thing/edit/{{$thing.term_hash}}" title="{{$edit}}" class="btn btn-default" ><i class="icon-pencil thing-edit-icon"></i></a> -<a href="thing/drop/{{$thing.term_hash}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default" ><i class="icon-remove drop-icons"></i></a> +<a href="thing/drop/{{$thing.term_hash}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default" ><i class="icon-trash drop-icons"></i></a> </div> <div class="thing-edit-links-end"></div> {{/if}} |