diff options
Diffstat (limited to 'view/tpl')
37 files changed, 832 insertions, 387 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 2e02de33b..ebc69c5f8 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -20,12 +20,14 @@ </div> {{if $abook_prev || $abook_next}} <div class="btn-group"> - {{if $abook_prev}} - <a href="connedit/{{$abook_prev}}{{if $section}}?f=§ion={{$section}}{{/if}}" class="btn btn-default btn-xs" ><i class="fa fa-backward"></i></a> - {{/if}} - {{if $abook_next}} - <a href="connedit/{{$abook_next}}{{if $section}}?f=§ion={{$section}}{{/if}}" class="btn btn-default btn-xs" ><i class="fa fa-forward"></i></a> - {{/if}} + <a href="connedit/{{$abook_prev}}{{if $section}}?f=§ion={{$section}}{{/if}}" class="btn btn-default btn-xs{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a> + <button class="btn btn-default btn-xs{{if $is_pending}} disabled{{/if}}" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button> + <a href="connedit/{{$abook_next}}{{if $section}}?f=§ion={{$section}}{{/if}}" class="btn btn-default btn-xs{{if ! $abook_next}} disabled{{/if}}" ><i class="fa fa-forward"></i></a> + <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel"> + {{foreach $sections as $s}} + <li><a href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a></li> + {{/foreach}} + </ul> </div> {{/if}} </div> @@ -87,17 +89,299 @@ </div> </div> {{/if}} + {{if ! $is_pending}} + <div id="template-form-vcard-org" class="form-group form-vcard-org"> + <div class="form-group form-vcard-org"> + <input type="text" name="org" value="" placeholder="{{$org_label}}"> + <i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + </div> + + <div id="template-form-vcard-title" class="form-group form-vcard-title"> + <div class="form-group form-vcard-title"> + <input type="text" name="title" value="" placeholder="{{$title_label}}"> + <i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + </div> + + <div id="template-form-vcard-tel" class="form-group form-vcard-tel"> + <select name="tel_type[]"> + <option value="CELL">{{$mobile}}</option> + <option value="HOME">{{$home}}</option> + <option value="WORK">{{$work}}</option> + <option value="OTHER">{{$other}}</option> + </select> + <input type="text" name="tel[]" value="" placeholder="{{$tel_label}}"> + <i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + + <div id="template-form-vcard-email" class="form-group form-vcard-email"> + <select name="email_type[]"> + <option value="HOME">{{$home}}</option> + <option value="WORK">{{$work}}</option> + <option value="OTHER">{{$other}}</option> + </select> + <input type="text" name="email[]" value="" placeholder="{{$email_label}}"> + <i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + + <div id="template-form-vcard-impp" class="form-group form-vcard-impp"> + <select name="impp_type[]"> + <option value="HOME">{{$home}}</option> + <option value="WORK">{{$work}}</option> + <option value="OTHER">{{$other}}</option> + </select> + <input type="text" name="impp[]" value="" placeholder="{{$impp_label}}"> + <i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + + <div id="template-form-vcard-url" class="form-group form-vcard-url"> + <select name="url_type[]"> + <option value="HOME">{{$home}}</option> + <option value="WORK">{{$work}}</option> + <option value="OTHER">{{$other}}</option> + </select> + <input type="text" name="url[]" value="" placeholder="{{$url_label}}"> + <i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + + <div id="template-form-vcard-adr" class="form-group form-vcard-adr"> + <div class="form-group"> + <select name="adr_type[]"> + <option value="HOME">{{$home}}</option> + <option value="WORK">{{$work}}</option> + <option value="OTHER">{{$other}}</option> + </select> + <label>{{$adr_label}}</label> + <i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + <div class="form-group"> + <input type="text" name="" value="" placeholder="{{$po_box}}"> + </div> + <div class="form-group"> + <input type="text" name="" value="" placeholder="{{$extra}}"> + </div> + <div class="form-group"> + <input type="text" name="" value="" placeholder="{{$street}}"> + </div> + <div class="form-group"> + <input type="text" name="" value="" placeholder="{{$locality}}"> + </div> + <div class="form-group"> + <input type="text" name="" value="" placeholder="{{$region}}"> + </div> + <div class="form-group"> + <input type="text" name="" value="" placeholder="{{$zip_code}}"> + </div> + <div class="form-group"> + <input type="text" name="" value="" placeholder="{{$country}}"> + </div> + </div> + + <div id="template-form-vcard-note" class="form-group form-vcard-note"> + <label>{{$note_label}}</label> + <i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + <textarea name="note" class="form-control"></textarea> + </div> + + <div class="section-content-wrapper-np"> + <div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div> + <div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field"> + <button data-toggle="dropdown" type="button" class="btn btn-default btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button> + <ul class="dropdown-menu"> + <li class="add-vcard-org"{{if $vcard.org}} style="display: none"{{/if}}><a href="#" data-add="vcard-org" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$org_label}}</a></li> + <li class="add-vcard-title"{{if $vcard.title}} style="display: none"{{/if}}><a href="#" data-add="vcard-title" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$title_label}}</a></li> + <li class="add-vcard-tel"><a href="#" data-add="vcard-tel" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$tel_label}}</a></li> + <li class="add-vcard-email"><a href="#" data-add="vcard-email" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$email_label}}</a></li> + <li class="add-vcard-impp"><a href="#" data-add="vcard-impp" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$impp_label}}</a></li> + <li class="add-vcard-url"><a href="#" data-add="vcard-url" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$url_label}}</a></li> + <li class="add-vcard-adr"><a href="#" data-add="vcard-adr" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$adr_label}}</a></li> + <li class="add-vcard-note"{{if $vcard.note}} style="display: none"{{/if}}><a href="#" data-add="vcard-note" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$note_label}}</a></li> + </ul> + </div> + <div id="vcard-header-{{$vcard.id}}" class="vcard-header" data-id="{{$vcard.id}}" data-action="open"> + <i class="vcard-fn-preview fa fa-address-card-o"></i> + <span id="vcard-preview-{{$vcard.id}}" class="vcard-preview"> + {{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}} + {{if $vcard.emails.0.address}}<span class="vcard-email-preview hidden-xs"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}} + {{if $vcard.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-default btn-xs" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}} + </span> + <input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}"> + </div> + </div> + <div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper"> - {{if $affinity }} + <div class="vcard-org form-group"> + <div class="form-vcard-org-wrapper"> + {{if $vcard.org}} + <div class="form-group form-vcard-org"> + <input type="text" name="org" value="{{$vcard.org}}" size="{{$vcard.org|count_characters:true}}" placeholder="{{$org_label}}"> + <i data-remove="vcard-org" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + {{/if}} + </div> + </div> + + <div class="vcard-title form-group"> + <div class="form-vcard-title-wrapper"> + {{if $vcard.title}} + <div class="form-group form-vcard-title"> + <input type="text" name="title" value="{{$vcard.title}}" size="{{$vcard.title|count_characters:true}}" placeholder="{{$title_label}}"> + <i data-remove="vcard-title" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + {{/if}} + </div> + </div> + + + <div class="vcard-tel form-group"> + <div class="form-vcard-tel-wrapper"> + {{if $vcard.tels}} + {{foreach $vcard.tels as $tel}} + <div class="form-group form-vcard-tel"> + <select name="tel_type[]"> + <option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option> + <option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option> + <option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> + <option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option> + <option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option> + </select> + <input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}"> + <i data-remove="vcard-tel" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + {{/foreach}} + {{/if}} + </div> + </div> + + + <div class="vcard-email form-group"> + <div class="form-vcard-email-wrapper"> + {{if $vcard.emails}} + {{foreach $vcard.emails as $email}} + <div class="form-group form-vcard-email"> + <select name="email_type[]"> + <option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option> + <option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> + <option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option> + <option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option> + </select> + <input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}"> + <i data-remove="vcard-email" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + {{/foreach}} + {{/if}} + </div> + </div> + + <div class="vcard-impp form-group"> + <div class="form-vcard-impp-wrapper"> + {{if $vcard.impps}} + {{foreach $vcard.impps as $impp}} + <div class="form-group form-vcard-impp"> + <select name="impp_type[]"> + <option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option> + <option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> + <option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option> + <option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option> + </select> + <input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}"> + <i data-remove="vcard-impp" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + {{/foreach}} + {{/if}} + </div> + </div> + + <div class="vcard-url form-group"> + <div class="form-vcard-url-wrapper"> + {{if $vcard.urls}} + {{foreach $vcard.urls as $url}} + <div class="form-group form-vcard-url"> + <select name="url_type[]"> + <option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option> + <option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> + <option value="WORK"{{if $url.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option> + <option value="OTHER"{{if $url.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option> + </select> + <input type="text" name="url[]" value="{{$url.address}}" size="{{$url.address|count_characters:true}}" placeholder="{{$url_label}}"> + <i data-remove="vcard-url" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + {{/foreach}} + {{/if}} + </div> + </div> + + <div class="vcard-adr form-group"> + <div class="form-vcard-adr-wrapper"> + {{if $vcard.adrs}} + {{foreach $vcard.adrs as $adr}} + <div class="form-group form-vcard-adr"> + <div class="form-group"> + <label>{{$adr_label}}</label> + <select name="adr_type[]"> + <option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option> + <option value="HOME"{{if $adr.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> + <option value="WORK"{{if $adr.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option> + <option value="OTHER"{{if $adr.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option> + </select> + <i data-remove="vcard-adr" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + <div class="form-group"> + <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}"> + </div> + <div class="form-group"> + <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}"> + </div> + <div class="form-group"> + <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}"> + </div> + <div class="form-group"> + <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}"> + </div> + <div class="form-group"> + <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}"> + </div> + <div class="form-group"> + <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}"> + </div> + <div class="form-group"> + <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}"> + </div> + </div> + {{/foreach}} + {{/if}} + </div> + </div> + + <div class="vcard-note form-group form-vcard-note"> + <div class="form-vcard-note-wrapper"> + {{if $vcard.note}} + <label>{{$note_label}}</label> + <i data-remove="vcard-note" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + <textarea name="note" class="form-control">{{$vcard.note}}</textarea> + {{/if}} + </div> + </div> + + + <div class="settings-submit-wrapper" > + <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button> + </div> + + </div> + {{/if}} + + {{if $affinity}} <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="affinity-tool"> <h3> <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#affinity-tool-collapse" aria-expanded="true" aria-controls="affinity-tool-collapse"> - {{$affinity }} + {{$affinity}} </a> </h3> </div> - <div id="affinity-tool-collapse" class="panel-collapse collapse{{if !$is_pending || $section == 'affinity'}} in{{/if}}" role="tabpanel" aria-labelledby="affinity-tool"> + <div id="affinity-tool-collapse" class="panel-collapse collapse{{if $section == 'affinity'}} in{{/if}}" role="tabpanel" aria-labelledby="affinity-tool"> <div class="section-content-tools-wrapper"> {{if $slide}} <div class="form-group"><strong>{{$lbl_slider}}</strong></div> @@ -105,7 +389,7 @@ <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> {{/if}} - {{if $multiprofs }} + {{if $multiprofs}} <div class="form-group"> <strong>{{$lbl_vis2}}</strong> {{$profile_select}} @@ -128,7 +412,7 @@ </a> </h3> </div> - <div id="fitert-tool-collapse" class="panel-collapse collapse{{if ( !$is_pending && !($slide || $multiprofs)) || $section == 'filter' }} in{{/if}}" role="tabpanel" aria-labelledby="fitert-tool"> + <div id="fitert-tool-collapse" class="panel-collapse collapse{{if $section == 'filter' }} in{{/if}}" role="tabpanel" aria-labelledby="fitert-tool"> <div class="section-content-tools-wrapper"> {{include file="field_textarea.tpl" field=$incl}} {{include file="field_textarea.tpl" field=$excl}} @@ -152,7 +436,7 @@ </a> </h3> </div> - <div id="rating-tool-collapse" class="panel-collapse collapse{{if !$is_pending && !($slide || $multiprofs) && !$connfilter}} in{{/if}}" role="tabpanel" aria-labelledby="rating-tool"> + <div id="rating-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="rating-tool"> <div class="section-content-tools-wrapper"> <div class="section-content-warning-wrapper"> {{$rating_info}} @@ -189,6 +473,12 @@ {{if $self}}{{$permnote_self}}{{/if}} </div> + {{if $permcat_enable}} + <div class="loading-role-rotator"></div> + <a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i> {{$permcat_new}}</a> + {{include file="field_select.tpl" field=$permcat}} + {{/if}} + <table id="perms-tool-table" class=form-group> <tr> <td></td> diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 993a4dea2..4360aa30c 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,8 +1,10 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> + {{if $allowManageRepos}} <div class="pull-right"> <button class="btn btn-success btn-xs" onclick="openClose('form');">{{$managerepos}}</button> </div> + {{/if}} <h2 id="title">{{$title}} - {{$page}}</h2> <div class="clear"></div> </div> @@ -18,7 +20,7 @@ {{foreach $addonrepos as $repo}} <tr> <td style="width: 70%;"> - <span class="pull-left">{{$repo.name}}</span> + <span class="pull-left">{{$repo.name}}</span><span id="update-message-{{$repo.name}}" style="margin-left: 20px;"></span> </td> <td style="width: 15%;"> <button class="btn btn-xs btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i> {{$repoUpdateButton}}</button> @@ -139,10 +141,20 @@ function(response) { if (response.success) { window.console.log('Addon repo '+repoName+' successfully updated :' + response['message']); - alert('Addon repo updated.'); + //alert('Addon repo updated.'); + $('#update-message-' + repoName).css('background-color', 'yellow'); + $('#update-message-' + repoName).html('Repo updated!'); + setTimeout(function () { + $('#update-message-' + repoName).html(''); + }, 60000); } else { window.console.log('Error updating repo :' + response['message']); - alert('Error updating addon repo!'); + //alert('Error updating addon repo!'); + $('#update-message-' + repoName).css('background-color', 'red'); + $('#update-message-' + repoName).html('Error updating repo!'); + setTimeout(function () { + $('#update-message-' + repoName).html(''); + }, 60000); } return false; }, diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 3e6b71b29..5ff205c53 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,6 +1,7 @@ +{{if !$navapps}} <div class="app-container"> - <div class="app-detail"> - <a href="{{$app.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}><img src="{{$app.photo}}" width="80" height="80" /> + <div class="app-detail{{if $deleted}} app-deleted{{/if}}"> + <a href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $app.desc}} title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}} <div class="app-name" style="text-align:center;">{{$app.name}}</div> </a> </div> @@ -10,16 +11,20 @@ <a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="fa fa-external"></i></a> </div> {{/if}} - {{if $install || $update || $delete }} + {{if $install || $update || $delete || $feature}} <div class="app-tools"> <form action="{{$hosturl}}appman" method="post"> <input type="hidden" name="papp" value="{{$app.papp}}" /> - {{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></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="fa fa-pencil" ></i></button>{{/if}} - {{if $delete}}<button type="submit" name="delete" value="{{$delete}}" class="btn btn-default" title="{{$delete}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}} + {{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default btn-xs" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}} + {{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default btn-xs" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}} + {{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-default btn-xs" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}} + {{if $feature}}<button type="submit" name="feature" value="feature" class="btn btn-default btn-xs" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-star"{{if $featured}} style="color: gold"{{/if}}></i></button>{{/if}} </form> </div> {{/if}} {{/if}} </div> +{{else}} +<li><a href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a></li> +{{/if}} diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl index 06fbcaaa7..7a0521436 100644 --- a/view/tpl/app_create.tpl +++ b/view/tpl/app_create.tpl @@ -1,35 +1,40 @@ -<h2>{{$banner}}</h2> - - -<form action="appman" method="post"> -{{if $guid}} -<input type="hidden" name="guid" value="{{$guid}}" /> -{{/if}} -{{if $author}} -<input type="hidden" name="author" value="{{$author}}" /> -{{/if}} -{{if $addr}} -<input type="hidden" name="addr" value="{{$addr}}" /> -{{/if}} - -<input type="hidden" name="requires" value="{{$requires}}" /> -<input type="hidden" name="system" value="{{$system}}" /> - - -{{include file="field_input.tpl" field=$name}} -{{include file="field_input.tpl" field=$categories}} -{{include file="field_input.tpl" field=$url}} -{{include file="field_textarea.tpl" field=$desc}} -{{include file="field_input.tpl" field=$photo}} -{{include file="field_input.tpl" field=$version}} -{{include file="field_input.tpl" field=$price}} -{{include file="field_input.tpl" field=$page}} - -{{if $embed}} -{{include file="field_textarea.tpl" field=$embed}} -{{/if}} - -<input type="submit" name="submit" value="{{$submit}}" /> - -</form> - +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$banner}}</h2> + </div> + + <div class="section-content-wrapper"> + <form action="appman" method="post"> + {{if $guid}} + <input type="hidden" name="guid" value="{{$guid}}" /> + {{/if}} + {{if $author}} + <input type="hidden" name="author" value="{{$author}}" /> + {{/if}} + {{if $addr}} + <input type="hidden" name="addr" value="{{$addr}}" /> + {{/if}} + + <input type="hidden" name="requires" value="{{$requires}}" /> + <input type="hidden" name="system" value="{{$system}}" /> + <input type="hidden" name="plugin" value="{{$plugin}}" /> + + + {{include file="field_input.tpl" field=$name}} + {{include file="field_input.tpl" field=$categories}} + {{include file="field_input.tpl" field=$url}} + {{include file="field_textarea.tpl" field=$desc}} + {{include file="field_input.tpl" field=$photo}} + {{include file="field_input.tpl" field=$version}} + {{include file="field_input.tpl" field=$price}} + {{include file="field_input.tpl" field=$page}} + + {{if $embed}} + {{include file="field_textarea.tpl" field=$embed}} + {{/if}} + + <input type="submit" name="submit" value="{{$submit}}" /> + + </form> + </div> +</div> diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl deleted file mode 100644 index 93049d522..000000000 --- a/view/tpl/app_select.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{if $authed}} -<div class="widget"> -<h3>{{$title}}</h3> -<ul class="nav nav-pills nav-stacked"> -<li><a href="appman"><i class="fa fa-plus"></i> {{$new}}</a></li> -<li><a href="apps/edit"><i class="fa fa-pencil"></i> {{$edit}}</a></li> -</ul> -</div> -{{/if}} - diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl index 6974e4d30..2028d6181 100755 --- a/view/tpl/channel_import.tpl +++ b/view/tpl/channel_import.tpl @@ -26,13 +26,16 @@ <label for="import-posts" id="label-import-posts">{{$label_import_posts}}</label> <div id="import-posts-end" class="import-field-end"></div> - <div id="import-common-desc" class="descriptive-paragraph">{{$common}}</div> <input type="checkbox" name="make_primary" id="import-make-primary" value="1" /> <label for="import-make-primary" id="label-import-make-primary">{{$label_import_primary}}</label> <div id="import-make-primary-end" class="import-field-end"></div> + <input type="checkbox" name="moving" id="import-moving" value="1" /> + <label for="import-moving" id="label-import-moving">{{$label_import_moving}}</label> + <div id="import-moving-end" class="import-field-end"></div> + <input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" /> <div id="import-submit-end" class="import-field-end"></div> diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index a238f5bc7..64d27e609 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -14,7 +14,7 @@ </form> {{/if}} </div> - <h3>{{if $contact.public_forum}}<i class="fa fa-comments-o"></i> {{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3> + <h3>{{if $contact.public_forum}}<i class="fa fa-comments-o"></i> {{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a>{{if $contact.phone}} <a class="btn btn-default btn-xs" href="tel:{{$contact.phone}}" title="{{$contact.call}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</h3> </div> <div class="section-content-tools-wrapper"> <div class="contact-photo-wrapper" > diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 1f7aa05b7..f85adc592 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -17,12 +17,10 @@ </div> <div id="contacts-search-form" class="section-content-tools-wrapper"> <form action="{{$cmd}}" method="get" > - <div class="form-group"> - <div class="input-group"> - <input type="text" name="search" id="contacts-search" class="widget-input" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" /> - <div class="input-group-btn"> - <button id="contacts-search-submit" class="btn btn-default btn-sm" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-search"></i></button> - </div> + <div class="input-group form-group"> + <input type="text" name="search" id="contacts-search" class="form-control input-sm" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" /> + <div class="input-group-btn"> + <button id="contacts-search-submit" class="btn btn-default btn-sm" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-fw fa-search"></i></button> </div> </div> </form> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 35c3d18e7..e73ee7fb5 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -143,41 +143,50 @@ </button> <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> {{if $item.share}} - <li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="fa fa-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li> + <li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a></li> {{/if}} {{if $item.plink}} - <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="fa fa-external-link"></i> {{$item.plink.title}}</a></li> + <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a></li> {{/if}} {{if $item.edpost}} - <li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost fa fa-pencil"></i> {{$item.edpost.1}}</a></li> + <li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a></li> {{/if}} {{if $item.tagger}} - <li role="presentation"><a role="menuitem" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="fa fa-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a></li> + <li role="presentation"><a role="menuitem" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a></li> {{/if}} {{if $item.filer}} - <li role="presentation"><a role="menuitem" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="fa fa-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a></li> + <li role="presentation"><a role="menuitem" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a></li> {{/if}} {{if $item.bookmark}} - <li role="presentation"><a role="menuitem" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="fa fa-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a></li> + <li role="presentation"><a role="menuitem" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a></li> {{/if}} {{if $item.addtocal}} - <li role="presentation"><a role="menuitem" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="fa fa-calendar" title="{{$item.addtocal}}"></i> {{$item.addtocal}}</a></li> + <li role="presentation"><a role="menuitem" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a></li> {{/if}} {{if $item.star}} - <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="fa fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li> + <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a></li> {{/if}} + + {{if $item.thread_action_menu}} + {{foreach $item.thread_action_menu as $mitem}} + <li role="presentation"><a role="menuitem" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a></li> + {{/foreach}} + {{/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="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li> + <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="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a></li> {{/if}} - {{if $item.item_photo_menu}} + + {{if $item.thread_author_menu}} <li role="presentation" class="divider"></li> - {{$item.item_photo_menu}} + {{foreach $item.thread_author_menu as $mitem}} + <li role="presentation"><a role="menuitem" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a></li> + {{/foreach}} + {{/if}} {{if $item.edpost && $item.dreport}} <li role="presentation"><a role="menuitem" href="dreport/{{$item.mid}}">{{$item.dreport}}</a></li> {{/if}} - - {{/if}} </ul> </div> </div> diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 2c1fc762c..8a06567c1 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -10,6 +10,10 @@ {{include file="field_input.tpl" field=$summary}} + {{if $tz_choose}} + {{include file="field_select_grouped.tpl" field=$timezone}} + {{/if}} + {{$s_dsel}} {{$f_dsel}} diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index 9c19a288d..a211a65b6 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -1,12 +1,10 @@ <div id="follow-sidebar" class="widget"> <h3>{{$connect}}</h3> <form action="follow" method="post" /> - <div class="form-group"> - <div class="input-group"> - <input class="widget-input" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" /> - <div class="input-group-btn"> - <button class="btn btn-default btn-sm" type="submit" name="submit" value="{{$follow}}"><i class="fa fa-plus"></i></button> - </div> + <div class="input-group"> + <input class="form-control input-sm" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" /> + <div class="input-group-btn"> + <button class="btn btn-success btn-sm" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button> </div> </div> </form> @@ -14,4 +12,3 @@ <div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div> {{/if}} </div> - diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index 6a14906f6..577269b6f 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,5 +1,5 @@ <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> <ul id="nav-notifications-template" rel="template"> - <li class="{5}"><a href="{0}" title="{2} {3}"><img class="dropdown-menu-img-sm" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li> + <li class="{5}"><a href="{0}" title="{2} {3}"><img class="dropdown-menu-img-sm" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span><div class="clear"></div></a></li> </ul> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 7e7155fec..5f874426c 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -5,9 +5,8 @@ {{$head_css}} {{$js_strings}} {{$head_js}} -<link rel="shortcut icon" href="{{$icon}}" /> -<link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" title="{{$osearch}}" /> -<link rel="EditURI" type="application/rsd+xml" href="{{$baseurl}}/rsd.xml" /> +{{$linkrel}} +{{$plugins}} <script> var updateInterval = {{$update_interval}}; var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}}; diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index edabee2da..d846f3e34 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -490,8 +490,9 @@ function enableOnUser(){ $('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>'); for(var i=0; i<albums.length; i++) { var albumName = albums[i].text; - var albumLink = '<li>'; - albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + albumName + '\');return false;">' + albumName + '</a>'; + var jsAlbumName = albums[i].jstext; + var albumLink = '<li>'; + albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>'; albumLink += '</li>'; $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink); } diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index a3bfad842..377eef453 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -180,7 +180,7 @@ {{/if}} {{if $showacl}} <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form"> - <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{if $bang}} <i class="fa fa-exclamation jot-icons"></i>{{/if}} + <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons{{if $bang}} jot-lock-warn{{/if}}"></i> </button> {{/if}} <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex="3" name="button-submit">{{$share}}</button> diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index d56c8f272..3d3faa41c 100755 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -1,4 +1,3 @@ -<div class="generic-content-wrapper-styled"> <form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <input type="hidden" name="auth-params" value="login" /> <div id="login-main"> @@ -17,5 +16,6 @@ <input type="hidden" name="{{$k}}" value="{{$v}}" /> {{/foreach}} </form> -</div> +{{if $login_page}} <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script> +{{/if}} diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index c654993b7..d0c741bf4 100755 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -1,8 +1,18 @@ -<div class="generic-content-wrapper-styled"> -<h3>{{$title}}{{$cat}}</h3> - -{{foreach $apps as $ap}} -{{$ap}} -{{/foreach}} -<div class="clear"></div> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + {{if $authed}} + {{if $create}} + <a href="appman" class="pull-right btn btn-success btn-xs"><i class="fa fa-pencil-square-o"></i> {{$create}}</a> + {{else}} + <a href="apps/edit{{if $cat}}/?f=&cat={{$cat}}{{/if}}" class="pull-right btn btn-primary btn-xs">{{$manage}}</a> + {{/if}} + {{/if}} + <h2>{{$title}}{{if $cat}} - {{$cat}}{{/if}}</h2> + </div> + <div class="section-content-wrapper"> + {{foreach $apps as $ap}} + {{$ap}} + {{/foreach}} + <div class="clear"></div> + </div> </div> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index bc1e64416..0581989ec 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,220 +1,215 @@ - <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <button id="expand-tabs" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#tabs-collapse-1"> - <i class="fa fa-arrow-circle-down" id="expand-tabs-icon"></i> - </button> - <button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1"> - <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> - </button> - {{if $nav.help.6}} - <button id="context-help-btn" class="navbar-toggle" type="button" onclick="contextualHelp(); return false;"> - <i class="fa fa-question-circle"></i> - </button> - {{/if}} - {{if $userinfo}} - <div class="usermenu-head dropdown-toggle fakelink" data-toggle="dropdown"> - <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"> - <span class="caret" id="usermenu-caret"></span> - </div> - {{if $localuser}} - <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> - {{foreach $nav.usermenu as $usermenu}} - <li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a></li> - {{/foreach}} - <li role="presentation" class="divider"></li> - {{if $nav.profiles}}<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a></li>{{/if}} - {{if $nav.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a></li>{{/if}} - {{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a></li>{{/if}} - {{if $nav.channels}} - {{foreach $nav.channels as $chan}} - <li role="presentation" class="nav-channel-select"><a href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a></li> - {{/foreach}} - {{/if}} - {{if $nav.admin}} - <li role="presentation" class="divider"></li> - <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a></li> - {{/if}} - {{if $nav.logout}} - <li role="presentation" class="divider"></li> - <li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a></li> - {{/if}} - </ul> - {{else}} - {{if $nav.rusermenu}} - <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> - <li role="presentation"><a href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a></li> - <li role="presentation"><a href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a></li> - </ul> - {{/if}} - {{/if}} - {{/if}} +<div class="container-fluid"> + <div class="navbar-header dropdown"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-2"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + {{if $nav.login && !$userinfo}} + <button type="button" class="navbar-toggle navbar-toggle-extra-left" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login"> + {{$nav.loginmenu.1.1}} + </button> + {{if $nav.register}} + <a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" class="navbar-toggle navbar-toggle-extra-left"> + {{$nav.register.1}} + </a> + {{/if}} + {{/if}} + {{if $localuser}} + <button id="notifications-btn" type="button" class="navbar-toggle navbar-toggle-extra" data-toggle="collapse" data-target="#navbar-collapse-1" style="color: grey;"> + <i class="fa fa-exclamation-circle"></i> + </button> + {{/if}} + <button id="expand-tabs" type="button" class="navbar-toggle navbar-toggle-extra" data-toggle="collapse" data-target="#tabs-collapse-1"> + <i class="fa fa-arrow-circle-down" id="expand-tabs-icon"></i> + </button> + <button id="expand-aside" type="button" class="navbar-toggle navbar-toggle-extra" data-toggle="offcanvas" data-target="#region_1"> + <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> + </button> + {{if $nav.help.6}} + <button id="context-help-btn" class="navbar-toggle navbar-toggle-extra" type="button" onclick="contextualHelp(); return false;"> + <i class="fa fa-question-circle"></i> + </button> + {{/if}} + {{if $userinfo}} + <div class="usermenu-head dropdown-toggle fakelink" data-toggle="dropdown"> + <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"> + <span class="caret" id="usermenu-caret"></span> </div> - <div class="collapse navbar-collapse" id="navbar-collapse-1"> - <ul class="nav navbar-nav navbar-left"> - + {{if $localuser}} + <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> + {{foreach $nav.usermenu as $usermenu}} + <li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a></li> + {{/foreach}} + {{if $nav.manage}} + <li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a></li> + {{/if}} + {{if $nav.channels}} + {{foreach $nav.channels as $chan}} + <li role="presentation" class="nav-channel-select"><a href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a></li> + {{/foreach}} + {{/if}} + <li role="presentation" class="divider"></li> + {{if $nav.profiles}} + <li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a></li> + {{/if}} + {{if $nav.settings}} + <li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a></li> + {{/if}} + {{if $nav.admin}} + <li role="presentation" class="divider"></li> + <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a></li> + {{/if}} + {{if $nav.logout}} + <li role="presentation" class="divider"></li> + <li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a></li> + {{/if}} + </ul> + {{else}} + {{if $nav.rusermenu}} + <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> + <li role="presentation"><a href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a></li> + <li role="presentation"><a href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a></li> + </ul> + {{/if}} + {{/if}} + {{/if}} + </div> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav navbar-left"> {{if $nav.network}} - <li class="{{$sel.network}} hidden-xs"> - <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" id="{{$nav.network.4}}"><i class="fa fa-th"></i></a> - <span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span> - <ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network"> - {{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}} - <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - <li class="{{$sel.network}} visible-xs"> - <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="fa fa-th"></i></a> - <span class="net-update badge" rel="#nav-network-menu"></span> - </li> + <li class="{{$sel.network}} net-button" style="display: none;"> + <a href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu"> + <i class="fa fa-fw fa-th"></i> + <span class="net-update badge"></span> + </a> + <ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network"> + <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> + <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> {{/if}} - {{if $nav.home}} - <li class="{{$sel.home}} hidden-xs"> - <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" id="{{$nav.home.4}}"><i class="fa fa-home"></i></a> - <span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span> - <ul id="nav-home-menu" class="dropdown-menu" rel="home"> - {{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}} - <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - <li class="{{$sel.home}} visible-xs"> - <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="fa fa-home"></i></a> - <span class="home-update badge" rel="#nav-home-menu"></span> - </li> + <li class="{{$sel.home}} home-button" style="display: none;"> + <a class="{{$nav.home.2}}" href="#" title="{{$nav.home.3}}" id="{{$nav.home.4}}" data-toggle="dropdown" rel="#nav-home-menu"> + <i class="fa fa-fw fa-home"></i> + <span class="home-update badge"></span> + </a> + <ul id="nav-home-menu" class="dropdown-menu" rel="home"> + <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> + <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> {{/if}} - {{if $nav.messages}} - <li class="{{$sel.messages}} hidden-xs"> - <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}"><i class="fa fa-envelope"></i></a> - <span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span> - <ul id="nav-messages-menu" class="dropdown-menu" rel="messages"> - <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> - <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - <li class="{{$sel.messages}} visible-xs"> - <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope"></i></a> - <span class="mail-update badge" rel="#nav-messages-menu"></span> - </li> + <li class="{{$sel.messages}} mail-button" style="display: none;"> + <a class="{{$nav.messages.2}}" href="#" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}" data-toggle="dropdown" rel="#nav-messages-menu"> + <i class="fa fa-fw fa-envelope"></i> + <span class="mail-update badge"></span> + </a> + <ul id="nav-messages-menu" class="dropdown-menu" rel="messages"> + <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> + <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> {{/if}} - {{if $nav.all_events}} - <li class="{{$sel.all_events}} hidden-xs"> - <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" id='{{$nav.all_events.4}}'><i class="fa fa-calendar"></i></a> - <span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span> - <ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> - <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> - <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - <li class="{{$sel.all_events}} visible-xs"> - <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="fa fa-calendar"></i></a> - <span class="all_events-update badge" rel="#nav-all_events-menu"></span> - </li> + <li class="{{$sel.all_events}} all_events-button" style="display: none;"> + <a class="{{$nav.all_events.2}}" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu"> + <i class="fa fa-fw fa-calendar"></i> + <span class="all_events-update badge"></span> + </a> + <ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> + <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> + <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> {{/if}} - {{if $nav.intros}} - <li class="{{$sel.intros}} hidden-xs"> - <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}"><i class="fa fa-user"></i></a> - <span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span> - <ul id="nav-intros-menu" class="dropdown-menu" rel="intros"> - <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - <li class="{{$sel.intros}} visible-xs"> - <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="fa fa-user"></i></a> - <span class="intro-update badge" rel="#nav-intros-menu"></span> - </li> - {{/if}} - + <li class="{{$sel.intros}} intro-button" style="display: none;"> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu"> + <i class="fa fa-fw fa-users"></i> + <span class="intro-update badge"></span> + </a> + <ul id="nav-intros-menu" class="dropdown-menu" rel="intros"> + <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + {{/if}} {{if $nav.notifications}} - <li class="{{$sel.notifications}} hidden-xs"> - <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}"><i class="fa fa-exclamation"></i></a> - <span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span> - <ul id="nav-notify-menu" class="dropdown-menu" rel="notify"> - <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> - <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - <li class="{{$sel.notifications}} visible-xs"> - <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-exclamation"></i></a> - <span class="notify-update badge" rel="#nav-notify-menu"></span> - </li> + <li class="{{$sel.notifications}} notify-button" style="display: none;"> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu"> + <i class="fa fa-fw fa-exclamation"></i> + <span class="notify-update badge"></span> + </a> + <ul id="nav-notify-menu" class="dropdown-menu" rel="notify"> + <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> + <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> {{/if}} - - {{if $nav.loginmenu && !$userinfo}} - <li class="{{$nav.loginmenu.0.2}} hidden-xs"> - <a data-toggle="dropdown" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a> - <ul class="dropdown-menu" role="menu"> - {{foreach $nav.loginmenu as $loginmenu}} - <li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li> - {{/foreach}} - </ul> - </li> - {{foreach $nav.loginmenu as $loginmenu}} - <li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li> - {{/foreach}} + {{if $nav.login && !$userinfo}} + <li class=""> + <a href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a> + </li> {{/if}} - {{if $nav.register}} - <li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a></li> + <li class="{{$nav.register.2}} hidden-xs"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a></li> {{/if}} - {{if $nav.alogout}} - <li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a></li> - {{/if}} - </ul> - - <ul class="nav navbar-nav navbar-right"> - <li class="hidden-xs"> - <form method="get" action="search" role="search"> - <div id="nav-search-spinner"></div><input class="fa-search" id="nav-search-text" type="text" value="" placeholder=" {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/> - </form> - </li> - <li class="visible-xs"> - <a href="/search" title="{{$nav.search.3}}"><i class="fa fa-search"></i></a> - </li> - - {{if $powered_by}} - <div id="powered-by">{{$powered_by}}</div> - {{/if}} - - {{if $nav.directory}} - <li class="{{$sel.directory}}"> - <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" id="{{$nav.directory.4}}"><i class="fa fa-sitemap"></i></a> - </li> + <li class="{{$nav}}-alogout.2 hidden-xs"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a></li> {{/if}} - - {{if $nav.apps}} - <li class="{{$sel.apps}}"> - <a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" id="{{$nav.apps.4}}"><i class="fa fa-cogs"></i></a> - </li> + </ul> + <ul class="nav navbar-nav navbar-right hidden-xs"> + <li class=""> + <form method="get" action="search" role="search"> + <div id="nav-search-spinner"></div><input class="fa-search" id="nav-search-text" type="text" value="" placeholder=" {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/> + </form> + </li> + {{if $nav.help.6}} + <li class="{{$sel.help}}"> + <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-question-circle"></i></a> + </li> {{/if}} - - {{if $nav.help}} - <li class="{{$sel.help}}{{if $nav.help.6}} hidden-xs{{/if}}"> - <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"{{if $nav.help.6}} onclick="contextualHelp(); return false;"{{/if}}>{{if $nav.help.6}}<i class="fa fa-question-circle"></i>{{else}}<i class="fa fa-question"></i>{{/if}}</a> - </li> + <li class=""> + <a href="#" data-toggle="dropdown"><i class="fa fa-bars"></i></a> + <ul class="dropdown-menu"> + {{foreach $navapps as $navapp}} + {{$navapp}} + {{/foreach}} + {{if $localuser}} + <li class="divider"></li> + <li><a href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a></li> + {{/if}} + </ul> + </li> + </ul> + </div> + <div class="collapse navbar-collapse" id="navbar-collapse-2"> + <ul class="nav navbar-nav navbar-left hidden-sm hidden-md hidden-lg"> + {{foreach $navapps as $navapp}} + {{$navapp}} + {{/foreach}} + {{if $localuser}} + <li class="divider"></li> + <li><a href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a></li> {{/if}} - </ul> - </div> + </ul> </div> + {{if $nav.help.6}} <div id="contextual-help-content" class="contextual-help-content"> {{$nav.help.5}} <div class="pull-right"> - <a class="contextual-help-tool" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-question"></i></a> - <a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-times"></i></a> + <a class="btn btn-primary btn-xs" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-fw fa-question"></i> {{$fulldocs}}</a> + <a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-times"></i></a> </div> </div> {{/if}} +</div> diff --git a/view/tpl/nav_login.tpl b/view/tpl/nav_login.tpl new file mode 100644 index 000000000..8f106b41c --- /dev/null +++ b/view/tpl/nav_login.tpl @@ -0,0 +1,18 @@ +{{if $nav.login && !$userinfo}} +<div id="nav-login" class="modal" tabindex="-1" role="dialog"> + <div class="modal-dialog" role="document"> + <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> + <h3 class="modal-title">{{$nav.loginmenu.1.1}}</h3> + </div> + <div class="modal-body"> + <div class="form-group"> + {{$nav.login}} + {{$nav.remote_login}} + </div> + </div> + </div> + </div> +</div> +{{/if}} diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl index c4da3783b..c6d5d8a73 100644 --- a/view/tpl/notes.tpl +++ b/view/tpl/notes.tpl @@ -5,10 +5,12 @@ var noteSaveTimer = null; var noteText = $('#note-text'); - noteText.on('change keyup keydown paste cut', function () { - $(this).height(0).height(this.scrollHeight); - $(document.body).trigger("sticky_kit:recalc"); - }).change(); + $(document).ready(function(e){ + noteText.on('change keyup keydown paste cut', function () { + noteText.height(0).height(noteText[0].scrollHeight); + $(document.body).trigger("sticky_kit:recalc"); + }).change(); + }); $(document).on('focusout',"#note-text",function(e){ if(noteSaveTimer) diff --git a/view/tpl/nwiki_page_history.tpl b/view/tpl/nwiki_page_history.tpl new file mode 100644 index 000000000..d99f83863 --- /dev/null +++ b/view/tpl/nwiki_page_history.tpl @@ -0,0 +1,59 @@ +<style> + .diff { + width:100%; + word-break: break-all; + } + + .diff td{ + padding:0 0.667em; + vertical-align:top; + white-space:pre; + white-space:pre-wrap; + font-family:Consolas,'Courier New',Courier,monospace; + font-size:1.0em; + line-height:1.333; + } + + .diff span{ + display:block; + min-height:1.333em; + margin-top:-1px; + padding:0 3px; + } + + * html .diff span{ + height:1.333em; + } + + .diff span:first-child{ + margin-top:0; + } + + .diffDeleted span{ + border:1px solid rgb(255,192,192); + background:rgb(255,224,224); + } + + .diffInserted span{ + border:1px solid rgb(192,255,192); + background:rgb(224,255,224); + } +</style> +<table class="table-striped table-responsive table-hover" style="width: 100%;"> + {{foreach $pageHistory as $commit}} + <tr><td> + <table id="rev-{{$commit.revision}}" onclick="$('#details-{{$commit.revision}}').show()" width="100%"> + <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td> + <td rowspan="3" width="20%" align="right"> + {{if $permsWrite}} + <button id="revert-{{$commit.revision}}" class="btn btn-danger btn-xs" onclick="wiki_revert_page('{{$commit.revision}}')">Revert</button> + <br><br> + {{/if}} + <button id="compare-{{$commit.revision}}" class="btn btn-warning btn-xs" onclick="wiki_compare_page('{{$commit.revision}}')">Compare</button> + </td></tr> + <tr><td>{{$name_lbl}}</td><td>{{$commit.name}}</td></tr> + <tr><td>{{$msg_label}}</td><td>{{$commit.title}}</td></tr> + </table> + </td></tr> + {{/foreach}} +</table> diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl deleted file mode 100755 index f247e3401..000000000 --- a/view/tpl/opensearch.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>Hubzilla@{{$nodename}}</ShortName> - <Description>Search in Hubzilla@{{$nodename}}</Description> - <Contact>http://github.com/redmatrix/hubzilla/</Contact> - <Image height="16" width="16" type="image/png">{{$baseurl}}/images/hz-16.png</Image> - <Image height="64" width="64" type="image/png">{{$baseurl}}/images/hz-64.png</Image> - <Url type="text/html" - template="{{$baseurl}}/search?search={searchTerms}"/> - <Url type="application/opensearchdescription+xml" - rel="self" - template="{{$baseurl}}/opensearch" /> -</OpenSearchDescription> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index ae0b7f1ea..8318f050d 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,12 +1,10 @@ <div id="peoplefind-sidebar" class="widget"> <h3>{{$findpeople}}</h3> <form action="directory" method="post" /> - <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}}" /> - <div class="input-group-btn"> - <button class="btn btn-default btn-sm" type="submit" name="submit"><i class="fa fa-search"></i></button> - </div> + <div class="input-group form-group"> + <input class="form-control input-sm" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" /> + <div class="input-group-btn"> + <button class="btn btn-default btn-sm" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button> </div> </div> </form> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 66d0fcc94..6289f5321 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -12,10 +12,6 @@ <button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> {{/if}} </div> - {{if !$no_fullscreen_btn}} - <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> - <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> - {{/if}} </div> <h2>{{$album}}</h2> <div class="clear"></div> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 4cb1bc306..92e70692f 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -4,8 +4,6 @@ {{if $can_post}} <button class="btn btn-xs btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> {{/if}} - <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> - <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> </div> <h2>{{$title}}</h2> <div class="clear"></div> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 59490ccc1..4000f39d6 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -34,6 +34,11 @@ <a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i> {{$editmenu.edit.3}}</a> </div> {{/if}} + {{if $exportlink}} + <div class="btn-group"> + <a class="btn btn-default btn-xs" href="{{$exportlink}}" ><i class="fa fa-vcard"></i> {{$export}}</a> + </div> + {{/if}} </div> <h2>{{$title}}</h2> <div class="clear"></div> diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 0c9b9ba1d..e4e923ddb 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -7,10 +7,9 @@ {{/if}} <div id="prvmail-wrapper" > <form id="prvmail-form" action="mail" method="post" > - <input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" /> <input type="hidden" name="media_str" id="jot-media" value="" /> - + <input type="hidden" name="preview" id="mail-preview" value="0" /> {{if $new}} <div class="form-group"> <label for="recip">{{$to}}</label> @@ -22,20 +21,18 @@ <input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" /> </div> {{/if}} - {{if $reply}} <input type="hidden" name="replyto" value="{{$parent}}" /> <input type="hidden" name="messageto" value="{{$recphash}}" /> <input type="hidden" name="subject" value="{{$subjtxt}}" /> {{/if}} - <div class="form-group"> <label for="prvmail-text">{{$yourmessage}}</label> <textarea class="form-control" id="prvmail-text" name="body">{{$text}}</textarea> </div> - <div id="prvmail-submit-wrapper" class="form-group"> - <div id="prvmail-submit" class="pull-right"> + <div id="prvmail-submit" class="pull-right btn-group"> + <button class="btn btn-default btn-sm" id="prvmail-preview" title="{{$preview}}" onclick="preview_mail(); return false;"><i class="fa fa-eye"></i></button> <button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button> </div> <div id="prvmail-tools" class="btn-toolbar pull-left"> @@ -78,7 +75,6 @@ {{/if}} </div> {{/if}} - <div class="btn-group visible-xs visible-sm"> <button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <i id="more-tools-icon" class="fa fa-caret-down jot-icons"></i> @@ -93,14 +89,13 @@ {{/if}} </ul> </div> - - </div> <div id="prvmail-rotator-wrapper" class="pull-left"> <div id="prvmail-rotator"></div> </div> <div class="clear"></div> </div> + <div id="mail-preview-content" style="display: none;"></div> </form> </div> {{if $new}} diff --git a/view/tpl/remote_login.tpl b/view/tpl/remote_login.tpl new file mode 100644 index 000000000..e6d387265 --- /dev/null +++ b/view/tpl/remote_login.tpl @@ -0,0 +1 @@ +<a href="rmagic" class="btn btn-block btn-success rmagic-button">{{$title}}</a> diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl index d0f7aab64..9d84e4a36 100755 --- a/view/tpl/rmagic.tpl +++ b/view/tpl/rmagic.tpl @@ -1,13 +1,9 @@ <div class="generic-content-wrapper-styled"> -<h3>{{$title}}</h3> - -<form action="rmagic" method="post" > - - <label for="rmagic-address" id="label-rmagic-address" class="rmagic-label">{{$desc}}</label> - <input type="text" maxlength="255" size="32" name="address" id="rmagic-address" class="rmagic-input" value="" /> - - <input type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" /> - <div id="rmagic-submit-end" class="rmagic-field-end"></div> - -</form> + <h3>{{$title}}</h3> + <form action="rmagic" method="post" > + <div class="form-group"> + {{include file="field_input.tpl" field=$address}} + <input class="btn btn-primary" type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" /> + </div> + </form> </div> diff --git a/view/tpl/rsd.tpl b/view/tpl/rsd.tpl deleted file mode 100644 index 9fd02c472..000000000 --- a/view/tpl/rsd.tpl +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd"> - <service> - <engineName>{{$project}}</engineName> - <engineLink>{{$baseurl}}</engineLink> - <apis> - <api name="Twitter" preferred="true" apiLink="{{$apipath}}" blogID=""> - <settings> - <docs>http://status.net/wiki/TwitterCompatibleAPI</docs> - <setting name="OAuth">true</setting> - </settings> - </api> - </apis> - </service> -</rsd>
\ No newline at end of file diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 51fa8b8dc..a490cb473 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -74,13 +74,20 @@ <i class="fa fa-caret-down"></i> </button> <ul class="dropdown-menu"> - {{if $item.item_photo_menu}} - {{$item.item_photo_menu}} + {{if $item.thread_action_menu}} + {{foreach $item.thread_action_menu as $mitem}} + <li role="presentation"><a role="menuitem" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-{{$mitem.icon}}"></i> {{$mitem.title}}</a></li> + {{/foreach}} {{/if}} {{if $item.drop.dropping}} - <li role="presentation" class="divider"></li> <li><a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li> {{/if}} + {{if $item.thread_author_menu}} + <li role="presentation" class="divider"></li> + {{foreach $item.thread_author_menu as $mitem}} + <li role="presentation"><a role="menuitem" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a></li> + {{/foreach}} + {{/if}} </ul> </div> {{if $item.attachments}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 05e531ba7..19c2b42d5 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -25,7 +25,9 @@ {{include file="field_checkbox.tpl" field=$adult}} {{include file="field_input.tpl" field=$photo_path}} {{include file="field_input.tpl" field=$attach_path}} - + {{if $basic_addon}} + {{$basic_addon}} + {{/if}} <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> @@ -82,6 +84,13 @@ {{include file="field_checkbox.tpl" field=$blocktags}} {{include file="field_input.tpl" field=$expire}} </div> + {{if $permcat_enable}} + {{include file="field_select.tpl" field=$defpermcat}} + {{/if}} + + {{if $sec_addon}} + {{$sec_addon}} + {{/if}} <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> @@ -135,6 +144,9 @@ {{include file="field_input.tpl" field=$evdays}} </div> </div> + {{if $notify_addon}} + {{$notify_addon}} + {{/if}} <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> @@ -152,9 +164,6 @@ </div> <div id="miscellaneous-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous-settings"> <div class="section-content-tools-wrapper"> - <div class="ffsapilink"> - <a type="button" class="btn btn-default" href="/ffsapi">{{$firefoxshare}}</a> - </div> {{if $menus}} <div class="form-group channel-menu"> <label for="channel_menu">{{$menu_desc}}</label> @@ -166,6 +175,11 @@ </div> {{/if}} {{include file="field_checkbox.tpl" field=$cal_first_day}} + + {{if $misc_addon}} + {{$misc_addon}} + {{/if}} + <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> diff --git a/view/tpl/settings_permcats.tpl b/view/tpl/settings_permcats.tpl new file mode 100644 index 000000000..f6bb9b036 --- /dev/null +++ b/view/tpl/settings_permcats.tpl @@ -0,0 +1,64 @@ +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + <div class="clear"></div> + </div> + <div class="section-content-tools-wrapper"> + <div class="section-content-info-wrapper"> + {{$desc}} + </div> + + <form action="settings/permcats" id="settings-permcats-form" method="post" autocomplete="off" > + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + {{include file="field_input.tpl" field=$name}} + + <div class="settings-submit-wrapper form-group"> + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="perms-tool"> + <h3> + <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> + {{$permlbl}} + </a> + </h3> + </div> + <div id="perms-tool-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="perms-tool"> + <div class="section-content-tools-wrapper"> + <div class="section-content-warning-wrapper"> + {{$permnote}} + </div> + + <table id="perms-tool-table" class=form-group> + <tr> + <td></td><td colspan="2" class="abook-me">{{$me}}</td> + </tr> + {{foreach $perms as $prm}} + {{include file="field_acheckbox.tpl" field=$prm}} + {{/foreach}} + </table> + + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + {{if $permcats}} + <div class="section-content-wrapper-np"> + <table id="permcat-index"> + {{foreach $permcats as $k => $v}} + <tr class="permcat-row-{{$k}}"> + <td width="99%"><a href="settings/permcats/{{$k}}">{{$k}}</a></td> + <td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td> + </tr> + {{/foreach}} + </table> + </div> + {{/if}} + + </div> + </form> + +</div> diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl index 6f08ce971..48190c00c 100644 --- a/view/tpl/settings_tokens.tpl +++ b/view/tpl/settings_tokens.tpl @@ -35,7 +35,7 @@ <table id="perms-tool-table" class=form-group> <tr> - <td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td> + <td></td><td colspan="2" class="abook-me">{{$me}}</td> </tr> {{foreach $perms as $prm}} {{include file="field_acheckbox.tpl" field=$prm}} diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 1b0b06132..ea31c23a3 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -107,7 +107,7 @@ <script> window.wiki_resource_id = '{{$resource_id}}'; window.wiki_page_name = '{{$page}}'; - window.wiki_page_content = {{if !$mimeType || $mimeType == 'text/markdown'}}{{$content}}{{else}}`{{$content}}`{{/if}}; + window.wiki_page_content = `{{$content}}`; window.wiki_page_commit = '{{$commit}}'; $("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary'); @@ -368,7 +368,7 @@ $.post("embedphotos/album", {name: album}, function(data) { if (data['status']) { - $('#embedPhotoModalLabel').html('{{$modalchooseimages}}'); + $('#embedPhotoModalLabel').html("{{$modalchooseimages}}"); $('#embedPhotoModalBodyAlbumDialog').html('\ <div><ul class="nav">\n\ <li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\ @@ -402,7 +402,7 @@ $('#editor').val(currentContent + ddata['photolink']); {{/if}} } else { - window.console.log('{{$modalerrorlink}}' + ':' + ddata['errormsg']); + window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']); } return false; }, @@ -413,7 +413,7 @@ $('#embedPhotoModal').modal('hide'); }); } else { - window.console.log('{{$modalerroralbum}} ' + JSON.stringify(album) + ':' + data['errormsg']); + window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']); } return false; }, @@ -425,19 +425,20 @@ function(data) { if (data['status']) { var albums = data['albumlist']; //JSON.parse(data['albumlist']); - $('#embedPhotoModalLabel').html('{{$modalchoosealbum}}'); + $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}"); $('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>'); - for(var i=0; i<albums.length; i++) { + for(var i = 0; i < albums.length; i++) { var albumName = albums[i].text; + var jsAlbumName = albums[i].jstext; var albumLink = '<li>'; - albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + albumName + '\');return false;">' + albumName + '</a>'; + albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>'; albumLink += '</li>'; $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink); } $('#embedPhotoModalBodyAlbumDialog').addClass('hide'); $('#embedPhotoModalBodyAlbumListDialog').removeClass('hide'); } else { - window.console.log('{{$modalerrorlist}}' + ':' + data['errormsg']); + window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']); } return false; }, diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index ef2b41490..78657ec10 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -5,7 +5,7 @@ {{if $pages}} {{foreach $pages as $page}} <li id="{{$page.link_id}}"> - {{if $page.resource_id && $canadd}} + {{if $page.resource_id && $candel}} <i class="widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.url}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i> {{/if}} <a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a> @@ -19,6 +19,7 @@ {{if $canadd}} <div id="new-page-form-wrapper" class="sub-menu" style="display:none;"> <form id="new-page-form" action="wiki/{{$channel}}/create/page" method="post" > + <input type="hidden" name="resource_id" value="{{$resource_id}}"> {{include file="field_input.tpl" field=$pageName}} <button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button> </form> @@ -29,7 +30,7 @@ <script> $('#new-page-submit').click(function (ev) { - $.post("wiki/{{$channel}}/create/page", {name: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, + $.post("wiki/{{$channel}}/create/page", {pageName: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, function(data) { if(data.success) { window.location = data.url; diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index eeaf7cd7e..916552e03 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -30,7 +30,7 @@ <th width="96%">{{$name}}</th> <th width="1%">{{$type}}</th> <th width="1%" class="wikis-index-tool"></th> - <th width="1%" class="wikis-index-tool"></th> + <!-- th width="1%" class="wikis-index-tool"></th --> {{if $owner}} <th width="1%"></th> {{/if}} @@ -45,7 +45,7 @@ <ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul> {{/if}} </td> - <td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td> + <!-- td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td --> {{if $owner}} <td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td> {{/if}} |