diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 361 | ||||
| -rwxr-xr-x | view/tpl/contact_slider.tpl | 20 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/conv_list.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/cropbody.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/dir_sort_links.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/directory_header.tpl | 12 | ||||
| -rwxr-xr-x | view/tpl/edpost_head.tpl | 22 | ||||
| -rwxr-xr-x | view/tpl/events-js.tpl | 18 | ||||
| -rwxr-xr-x | view/tpl/field_acheckbox.tpl | 21 | ||||
| -rw-r--r-- | view/tpl/menuedit.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/mitemedit.tpl | 71 | ||||
| -rw-r--r-- | view/tpl/mitemlist.tpl | 61 | ||||
| -rwxr-xr-x | view/tpl/page_display.tpl | 19 | ||||
| -rwxr-xr-x | view/tpl/photo_item.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 77 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/rating_slider.tpl | 19 | ||||
| -rwxr-xr-x | view/tpl/search_item.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/xchan_vcard.tpl | 2 |
20 files changed, 435 insertions, 300 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index d118cbb9c..0a7cf2d4d 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -1,140 +1,223 @@ -<div class="generic-content-wrapper-styled"> -<h2>{{$header}}</h2> - -<h3>{{$addr}}</h3> - -{{if $notself}} -<div id="connection-flag-tabs"> -{{$tabs}} -</div> -<div id="connection-edit-buttons"> -{{foreach $buttons as $b }} -<button class="btn btn-sm btn-default" title="{{$b.title}}" onclick="window.location.href='{{$b.url}}'; return false;">{{$b.label}}</button> -{{/foreach}} -{{/if}} - - -<div id="contact-edit-wrapper"> -<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" > - -<div class="abook-permsnew" style="display: none;"> -<div class="abook-perms-msg">{{$perms_step1}}</div> -</div> - -<div class="abook-permsmsg" style="display: none;"> -<div class="abook-perms-msg">{{$perms_new}}</div> -</div> - - -<div class="abook-permssave" style="display: none;"> -<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> -</div> - -{{if $last_update}} -{{$lastupdtext}} {{$last_update}} -{{/if}} - - -{{if $is_pending}} -<div class="abook-pending-contact"> -{{include file="field_checkbox.tpl" field=$unapproved}} -</div> -{{/if}} - - -{{if $notself}} -{{if $slide}} -<h3>{{$lbl_slider}}</h3> - -{{$slide}} - -{{/if}} - -{{if $connfilter}} - {{include file="field_textarea.tpl" field=$incl}} - {{include file="field_textarea.tpl" field=$excl}} -{{else}} - <input type="hidden" name="{{$incl.0}}" value="{{$incl.2}}" /> - <input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" /> -{{/if}} - -{{if $rating}} -<h3>{{$lbl_rating}}</h3> - -{{$rating}} - - -{{/if}} - - - -{{/if}} - - -{{if $self}} -<div class="abook-autotext"> -<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div> -{{include file="field_checkbox.tpl" field=$autoperms}} -</div> -{{/if}} - -<input type="hidden" name="contact_id" value="{{$contact_id}}"> -<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> -<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" /> - - -{{if $rating}} -{{if $notself}} - {{include file="field_textarea.tpl" field=$rating_text}} -{{/if}} -{{/if}} - -{{if $notself}} -{{if $multiprofs }} -<div> -<h3>{{$lbl_vis1}}</h3> -<div>{{$lbl_vis2}}</div> - -{{$profile_select}} -</div> -{{/if}} -{{/if}} - -<h3>{{$permlbl}}</h3> - -{{if $notself}} -<div id="connedit-perms-wrap" class="fakelink" onclick="openClose('connedit-perms');">{{$clickme}}</div> -<div id="connedit-perms" style="display: none;" > -{{/if}} - -<div id="perm-desc" class="descriptive-text">{{$permnote}}</div> -<table> -<tr><td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td><td></td></tr> -<tr><td colspan="5"><hr /></td></tr> -{{foreach $perms as $prm}} -{{include file="field_acheckbox.tpl" field=$prm}} -{{/foreach}} -<tr><td colspan="5"><hr /></td></tr> -</table> - -</div> - -{{if $notself}} -</div> -{{/if}} - -<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> - -{{if $self && $noperms}} -<script> - if(typeof(connectDefaultShare) !== 'undefined') - connectDefaultShare(); - else - connectFullShare(); - abook_perms_msg(); -</script> -{{/if}} - -</form> -</div> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + {{if $notself}} + <div class="dropdown pull-right"> + <button id="connection-dropdown" class="btn btn-default btn-xs" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <i class="icon-caret-down"></i> + </button> + <ul class="dropdown-menu" aria-labelledby="dLabel"> + <li><a href="{{$buttons.view.url}}" title="{{$buttons.view.title}}">{{$buttons.view.label}}</a></li> + <li><a href="{{$buttons.recent.url}}" title="{{$buttons.recent.title}}">{{$buttons.recent.label}}</a></li> + <li class="divider"></li> + <li><a href="#" title="{{$buttons.refresh.title}}" onclick="window.location.href='{{$buttons.refresh.url}}'; return false;">{{$buttons.refresh.label}}</a></li> + <li><a href="#" title="{{$buttons.block.title}}" onclick="window.location.href='{{$buttons.block.url}}'; return false;">{{$buttons.block.label}}</a></li> + <li><a href="#" title="{{$buttons.ignore.title}}" onclick="window.location.href='{{$buttons.ignore.url}}'; return false;">{{$buttons.ignore.label}}</a></li> + <li><a href="#" title="{{$buttons.archive.title}}" onclick="window.location.href='{{$buttons.archive.url}}'; return false;">{{$buttons.archive.label}}</a></li> + <li><a href="#" title="{{$buttons.hide.title}}" onclick="window.location.href='{{$buttons.hide.url}}'; return false;">{{$buttons.hide.label}}</a></li> + <li><a href="#" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</a></li> + </ul> + </div> + {{/if}} + <h2>{{$header}}</h2> + </div> + <div class="section-content-wrapper-np"> + {{if $notself}} + {{foreach $buttons as $b}} + {{if $b.info}} + <div class="section-content-danger-wrapper"> + <div> + {{$b.info}} + </div> + </div> + {{/if}} + {{/foreach}} + <div class="section-content-info-wrapper"> + <div> + {{$addr_text}} <strong>'{{$addr}}'</strong> + </div> + {{if $last_update}} + <div> + {{$lastupdtext}} {{$last_update}} + </div> + {{/if}} + </div> + {{/if}} + + <form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" > + + <input type="hidden" name="contact_id" value="{{$contact_id}}"> + + <div class="panel-group" id="contact-edit-tools" role="tablist" aria-multiselectable="true"> + {{if $notself}} + + {{if $is_pending}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="pending-tool"> + <h3> + <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse"> + {{$pending_label}} + </a> + </h3> + </div> + <div id="pending-tool-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="pending-tool"> + <div class="section-content-tools-wrapper"> + {{include file="field_checkbox.tpl" field=$unapproved}} + <div class="settings-submit-wrapper" > + <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + <div class="modal" id="abook-pending-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> + <h4 class="modal-title" id="myModalLabel">{{$pending_modal_title}}</h4> + </div> + <div class="modal-body"> + <strong>{{$name}}</strong> {{$pending_modal_body}} + </div> + <div class="modal-footer"> + <button class="btn btn-sm btn-danger pull-left" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</button> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$pending_modal_dismiss}}</button> + <button type="submit" class="btn btn-primary" name="pending" value="1">{{$pending_modal_approve}}</button> + </div> + </div> + </div> + </div> + <script>$('#abook-pending-modal').modal('show');</script> + {{/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 }} + </a> + </h3> + </div> + <div id="affinity-tool-collapse" class="panel-collapse collapse{{if !$is_pending}} 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> + {{$slide}} + <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> + {{/if}} + + {{if $multiprofs }} + <div class="form-group"> + <strong>{{$lbl_vis2}}</strong> + {{$profile_select}} + </div> + {{/if}} + <div class="settings-submit-wrapper" > + <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + {{/if}} + + {{if $connfilter}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="fitert-tool"> + <h3> + <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#fitert-tool-collapse" aria-expanded="true" aria-controls="fitert-tool-collapse"> + {{$connfilter_label}} + </a> + </h3> + </div> + <div id="fitert-tool-collapse" class="panel-collapse collapse{{if !$is_pending && !($slide || $multiprofs)}} 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}} + <div class="settings-submit-wrapper" > + <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + {{else}} + <input type="hidden" name="{{$incl.0}}" value="{{$incl.2}}" /> + <input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" /> + {{/if}} + + {{if $rating}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="rating-tool"> + <h3> + <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#rating-tool-collapse" aria-expanded="true" aria-controls="rating-tool-collapse"> + {{$lbl_rating}} + </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 class="section-content-tools-wrapper"> + <div class="section-content-warning-wrapper"> + {{$rating_info}} + </div> + <div class="form-group"><strong>{{$lbl_rating_label}}</strong></div> + {{$rating}} + {{include file="field_textarea.tpl" field=$rating_text}} + <input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" /> + <div class="settings-submit-wrapper" > + <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + {{/if}} + + {{/if}} + + <div class="panel"> + {{if $notself}} + <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> + {{/if}} + <div id="perms-tool-collapse" class="panel-collapse collapse{{if $self}} in{{/if}}" role="tabpanel" aria-labelledby="perms-tool"> + <div class="section-content-tools-wrapper"> + <div class="section-content-warning-wrapper"> + {{if $notself}}{{$permnote}}{{/if}} + {{if $self}}{{$permnote_self}}{{/if}} + </div> + + <table id="perms-tool-table" class=form-group> + <tr> + <td></td> + {{if $notself}} + <td class="abook-them">{{$them}}</td> + {{/if}} + <td colspan="2" class="abook-me">{{$me}}</td> + </tr> + {{foreach $perms as $prm}} + {{include file="field_acheckbox.tpl" field=$prm}} + {{/foreach}} + </table> + + {{if $self}} + <div> + <div class="section-content-info-wrapper"> + {{$autolbl}} + </div> + {{include file="field_checkbox.tpl" field=$autoperms}} + </div> + {{/if}} + + <div class="settings-submit-wrapper" > + <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + </div> + </form> + </div> </div> diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl index 5c15e1c2c..550abc147 100755 --- a/view/tpl/contact_slider.tpl +++ b/view/tpl/contact_slider.tpl @@ -1,4 +1,20 @@ -<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div> +<div id="contact-slider" class="slider form-group"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div> <script> - $("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } }); +$(document).ready(function() { + // The slider does not render correct if width is given in % and + // the slider container is hidden (display: none) during rendering. + // So let's unhide it to render and hide again afterwards. + if(!$("#affinity-tool-collapse").hasClass("in")) { + $("#affinity-tool-collapse").addClass("in"); + makeContactSlider(); + $("#affinity-tool-collapse").removeClass("in"); + } + else { + makeContactSlider(); + } +}); + +function makeContactSlider() { + $("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: [{{$labels}}], width:'98%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } }); +} </script> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 27632d770..30a007bd6 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -165,8 +165,7 @@ </div> <div class="clear"></div> </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> + <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> {{if $item.toplevel}} {{foreach $item.children as $child}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index cb2fb8959..5487d5937 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -179,8 +179,7 @@ </div> <div class="clear"></div> </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> + <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> {{if $item.comment_lastcollapsed}} diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl index da5b1e859..4794c0b83 100755 --- a/view/tpl/cropbody.tpl +++ b/view/tpl/cropbody.tpl @@ -25,8 +25,8 @@ 'croppa', { previewWrap: 'previewWrap', - minWidth: 175, - minHeight: 175, + minWidth: 300, + minHeight: 300, maxWidth: 640, maxHeight: 640, ratioDim: { x: 100, y:100 }, diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl index 5cefe2f28..9346a7455 100644 --- a/view/tpl/dir_sort_links.tpl +++ b/view/tpl/dir_sort_links.tpl @@ -5,11 +5,4 @@ {{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 /> - </div> diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 26739efc3..79598fc9a 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -1,6 +1,18 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> + <div class="btn-group pull-right"> + <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> + <i class="icon-sort"></i> + </button> + <ul class="dropdown-menu"> + <li><a href="directory?f=&order=date{{$suggest}}">{{$date}}</a></li> + <li><a href="directory?f=&order=normal{{$suggest}}">{{$normal}}</a></li> + <li><a href="directory?f=&order=reversedate{{$suggest}}">{{$reversedate}}</a></li> + <li><a href="directory?f=&order=reverse{{$suggest}}">{{$reverse}}</a></li> + </ul> + </div> <h2>{{$dirlbl}}{{if $search}}: {{$safetxt}}{{/if}}</h2> + <div class="clear"></div> </div> {{foreach $entries as $entry}} {{include file="direntry.tpl"}} diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl index 20e597909..3be40e978 100755 --- a/view/tpl/edpost_head.tpl +++ b/view/tpl/edpost_head.tpl @@ -1,12 +1,14 @@ -<div class="section-title-wrapper"> - {{if $delete}} - <div class="pull-right"> - <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + {{if $delete}} + <div class="pull-right"> + <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a> + </div> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> + </div> + <div id="webpage-editor" class="section-content-tools-wrapper"> + {{$editor}} </div> - {{/if}} - <h2>{{$title}}</h2> - <div class="clear"></div> -</div> -<div id="webpage-editor" class="section-content-tools-wrapper"> - {{$editor}} </div> diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 9812291bf..c91419783 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -2,9 +2,20 @@ <div class="generic-content-wrapper-styled"> <h2>{{$title}}</h2> +<div class="pull-right"> +<button class="btn btn-xs" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button> <button class="btn btn-xs" onclick="exportDate(); return false;" >{{$export.1}}</button> <button class="btn btn-xs btn-success" onclick="openClose('event-upload-form');"><i class="icon-upload"></i> {{$upload}}</button> +</div> -<div id="export-event-link"><button class="btn btn-default btn-sm" onclick="exportDate(); return false;" >{{$export.1}}</button></div> -<div id="new-event-link"><button class="btn btn-default btn-sm" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button></div> +<div id="event-upload-form" style="display:none;"> + <div class="section-content-tools-wrapper"> + <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form"> + <div class="form-group"> + <input id="event-upload-choose" type="file" name="userfile" /> + </div> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> + </form> + </div> +</div> <script> function exportDate() { @@ -13,6 +24,7 @@ function exportDate() { window.location.href=sT; } </script> - +<div class="clear"></div> +<br /> <div id="events-calendar"></div> </div> diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 816af2a65..e99128bbb 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -1,17 +1,22 @@ -<tr> +<tr class="highlight"> <td> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='me_id_{{$field.0}}'>{{$field.1}}</label><br> + <span class='field_abook_help'>{{$field.6}}</span> </td> + {{if $notself}} <td class="abook-them"> - <input type="checkbox" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} /> + {{if $field.2}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}} </td> + {{/if}} <td class="abook-me"> + {{if $self || !$field.5}} <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> + {{/if}} + {{if $notself && $field.5}} + {{if $field.3}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}} + {{/if}} </td> <td> - {{if $field.5}}<span class="permission-inherited">{{$inherited}}</span> {{/if}} - </td> - <td> - <span class='field_abook_help'>{{$field.6}}</span> + {{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="icon-check"></i>{{else}} <i class="icon-check-empty"></i>{{/if}}{{/if}}</span>{{/if}} </td> -</tr>
\ No newline at end of file +</tr> diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 7fc17471c..5c8734ef7 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -1,8 +1,9 @@ {{if $header}} +<div class="generic-content-wrapper"> <div class="section-title-wrapper"> - {{if $menu_id}} + {{if $menu_edit_link}} <div class="pull-right"> - <a href="mitem/{{$menu_id}}" title="{{$hintedit}}" class="btn btn-xs btn-success"><i class="icon-edit"></i> {{$editcontents}}</a> + <a href="{{$menu_edit_link}}" title="{{$hintedit}}" class="btn btn-xs btn-success"><i class="icon-edit"></i> {{$editcontents}}</a> </div> {{/if}} <h2>{{$header}}</h2> @@ -27,3 +28,6 @@ <div class="clear"></div> </form> </div> +{{if $header}} +</div> +{{/if}} diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index cdc022c5c..f9dc4e2cc 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -1,37 +1,42 @@ {{if $header}} -<div class="section-title-wrapper"> - <h2>{{$header}}</h2> -</div> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$header}}</h2> + </div> {{/if}} -<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> - <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" > - <input type="hidden" name="menu_id" value="{{$menu_id}}" /> - {{if $mitem_id}} - <input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> - {{/if}} - {{include file="field_input.tpl" field=$mitem_desc}} - {{include file="field_input.tpl" field=$mitem_link}} - {{if $menu_names}} - <datalist id="menu-names"> - {{foreach $menu_names as $menu_name}} - <option value="{{$menu_name}}"> - {{/foreach}} - </datalist> - {{/if}} - {{include file="field_input.tpl" field=$mitem_order}} - {{include file="field_checkbox.tpl" field=$usezid}} - {{include file="field_checkbox.tpl" field=$newwin}} - <div class="pull-right form-group"> - <div class="btn-group"> - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> - </button> - {{if $submit_more}} - <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}} <i class="icon-caret-right"></i></button> - {{/if}} - <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> + <div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> + <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" > + <input type="hidden" name="menu_id" value="{{$menu_id}}" /> + {{if $mitem_id}} + <input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> + {{/if}} + {{include file="field_input.tpl" field=$mitem_desc}} + {{include file="field_input.tpl" field=$mitem_link}} + {{if $menu_names}} + <datalist id="menu-names"> + {{foreach $menu_names as $menu_name}} + <option value="{{$menu_name}}"> + {{/foreach}} + </datalist> + {{/if}} + {{include file="field_input.tpl" field=$mitem_order}} + {{include file="field_checkbox.tpl" field=$usezid}} + {{include file="field_checkbox.tpl" field=$newwin}} + <div class="pull-right form-group"> + <div class="btn-group"> + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> + {{if $submit_more}} + <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}} <i class="icon-caret-right"></i></button> + {{/if}} + <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> + </div> + {{$aclselect}} </div> - {{$aclselect}} - </div> - </form> + <div class="clear"></div> + </form> + </div> +{{if $header}} </div> +{{/if}} diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 4e606654f..8686d4204 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -1,35 +1,34 @@ -<div class="section-title-wrapper"> - <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i> {{$hintnew}}</button> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i> {{$hintnew}}</button> + </div> + <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2> + <div class="clear"></div> </div> - <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2> - <div class="clear"></div> -</div> -{{$create}} + {{$create}} -{{if $mlist }} -<div id="mitemlist-content-wrapper" class="section-content-wrapper-np"> - <table id="mitem-list-table"> - <tr> - <th width="1%">{{$nametitle}}</th> - <th width="96%">{{$targettitle}}</th> - <th width="1%"></th> - <th width="1%"></th> - <th width="1%"></th> - </tr> - {{foreach $mlist as $m }} - <tr id="mitem-list-item-{{$m.mitem_id}}"> - <td width="1%">{{$m.mitem_desc}}</td> - <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td> - <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td> - <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td> - <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> - </tr> - {{/foreach}} - </table> + {{if $mlist }} + <div id="mitemlist-content-wrapper" class="section-content-wrapper-np"> + <table id="mitem-list-table"> + <tr> + <th width="1%">{{$nametitle}}</th> + <th width="96%">{{$targettitle}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + </tr> + {{foreach $mlist as $m }} + <tr id="mitem-list-item-{{$m.mitem_id}}"> + <td width="1%">{{$m.mitem_desc}}</td> + <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td> + <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td> + <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td> + <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> + </tr> + {{/foreach}} + </table> + </div> + {{/if}} </div> -{{/if}} - - - diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index 5328648b9..a320920c7 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -1,9 +1,14 @@ <div class="page"> - -<div class="generic-content-wrapper" id="page-content-wrapper" > - {{if $title}}<h2 class="page-title">{{$title}}</h2>{{/if}} - <div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> - <div class="page-date">{{$date}}</div> - <div class="page-body">{{$body}}</div> -</div> + <div class="generic-content-wrapper" id="page-content-wrapper" > + {{if $title}} + <div class="section-title-wrapper"> + <h2 class="page-title">{{$title}}</h2> + </div> + {{/if}} + <div class="section-content-wrapper"> + <div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> + <div class="page-date">{{$date}}</div> + <div class="page-body">{{$body}}</div> + </div> + </div> </div> diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl index 16f9a76c2..2ea7aa9f3 100755 --- a/view/tpl/photo_item.tpl +++ b/view/tpl/photo_item.tpl @@ -21,7 +21,7 @@ {{$comment}} - <div class="wall-item-outside-wrapper-end{{$indent}}" ></div> + <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 63d5ad778..f5ff23700 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -2,7 +2,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> - {{if $tools}} <a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a> {{/if}} @@ -11,7 +10,6 @@ <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}} <i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i> @@ -29,11 +27,8 @@ {{/if}} </div> </div> - <h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2> - <div class="clear"></div> - </div> <div id="photo-map"> {{$map}} @@ -88,12 +83,9 @@ </form> <div id="photo-edit-end" class="clear"></div> </div> - <div id="photo-view-wrapper"> - <div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div> <div id="photo-photo-end" class="clear"></div> - {{if $tags}} <div class="photo-item-tools-left" id="in-this-photo"> <span id="in-this-photo-text">{{$tag_hdr}}</span> @@ -102,31 +94,29 @@ {{/foreach}} </div> {{/if}} - <div class="photo-item-tools"> - - {{if $responses.count }} - <div class="photo-item-tools-left pull-left"> - <div class="{{if $responses.count > 1}}btn-group{{/if}}"> - {{foreach $responses as $verb=>$response}} - {{if $response.count}} - <div class="btn-group"> - <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button> - {{if $response.list_part}} - <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> - {{else}} - <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> - {{/if}} - {{if $response.list_part}} + {{if $responses.count }} + <div class="photo-item-tools-left pull-left"> + <div class="{{if $responses.count > 1}}btn-group{{/if}}"> + {{foreach $responses as $verb=>$response}} + {{if $response.count}} + <div class="btn-group"> + <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button> + {{if $response.list_part}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + {{else}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + {{/if}} + {{if $response.list_part}} <div class="modal" id="{{$verb}}Modal-{{$id}}"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title">{{$response.title}}</h4> + <h4 class="modal-title">{{$response.title}}</h4> </div> <div class="modal-body"> - <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> </div> <div class="modal-footer clear"> <button type="button" class="btn btn-default" data-dismiss="modal">{{$modal_dismiss}}</button> @@ -134,37 +124,34 @@ </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> + {{/if}} + </div> {{/if}} + {{/foreach}} </div> - {{/if}} - {{/foreach}} - </div> - {{/if}} - </div> - {{if $likebuttons}} - <div class="photo-item-tools-right btn-group pull-right"> - <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false"> - <i class="icon-thumbs-up-alt" title="{{$likethis}}"></i> - </button> - <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false"> - <i class="icon-thumbs-down-alt" title="{{$nolike}}"></i> - </button> + </div> + {{/if}} + {{if $likebuttons}} + <div class="photo-item-tools-right btn-group pull-right"> + <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false"> + <i class="icon-thumbs-up-alt" title="{{$likethis}}"></i> + </button> + <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false"> + <i class="icon-thumbs-down-alt" title="{{$nolike}}"></i> + </button> + </div> + <div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div> + {{/if}} + <div class="clear"></div> </div> - <div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div> - {{/if}} - <div class="clear"></div> </div> - {{$comments}} - {{if $commentbox}} <div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" > {{$commentbox}} </div> {{/if}} - <div class="clear"></div> </div> - {{$paginate}} diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 2964d9c4b..bea0d894f 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,5 +1,5 @@ <div class="vcard"> - + <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> {{if $profile.edit}} <div class="dropdown"> <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> @@ -18,7 +18,6 @@ <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/rating_slider.tpl b/view/tpl/rating_slider.tpl index 4702fc65b..4c36504e6 100644 --- a/view/tpl/rating_slider.tpl +++ b/view/tpl/rating_slider.tpl @@ -1,4 +1,19 @@ -<div id="rating-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div> +<div id="rating-slider" class="slider form-group"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div> <script> - $("#rating-range").jRange({ from: -10, to: 10, step: 1, width:'100%', showLabels: false, showScale: true, scale : [ '-10','-8','-6','-4','-2','0','2','4','6','8','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); } }); +$(document).ready(function() { + // The slider does not render correct if width is given in % and + // the slider container is hidden (display: none) during rendering. + // So let's unhide it to render and hide again afterwards. + if(!$("#rating-tool-collapse").hasClass("in")) { + $("#rating-tool-collapse").addClass("in"); + makeRatingSlider(); + $("#rating-tool-collapse").removeClass("in"); + } + else { + makeRatingSlider(); + } +}); +function makeRatingSlider() { + $("#rating-range").jRange({ from: -10, to: 10, step: 1, width:'98%', showLabels: false, showScale: true, scale : [ '-10','-8','-6','-4','-2','0','2','4','6','8','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); } }); +} </script> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index dee33f1b3..256443b84 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -57,7 +57,7 @@ <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a> </div> {{/if}} - <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> + <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index ca0fe76be..2acbb24e4 100755 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -1,6 +1,6 @@ <div class="vcard"> -<div class="fn">{{$name}}</div> <div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div> +<div class="fn">{{$name}}</div> </div> |