diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/atom_feed.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/connection_template.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/connections.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/contactsajax.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/diaspora_vcard.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 106 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/photosajax.tpl | 4 |
9 files changed, 121 insertions, 10 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 930486b5f..788fef457 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -65,6 +65,7 @@ <h3>{{$corporate}}</h3> {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$verify_email}} {{include file="field_checkbox.tpl" field=$diaspora_enabled}} {{include file="field_checkbox.tpl" field=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl index 2c8024d47..9e5b5a5be 100755 --- a/view/tpl/atom_feed.tpl +++ b/view/tpl/atom_feed.tpl @@ -15,6 +15,7 @@ <title>{{$feed_title}}</title> <generator uri="http://getzot.com" version="{{$version}}">{{$red}}</generator> <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" /> + <link rel="alternate" type="text/html" href="{{$profile_page}}" /> {{if $hub}} {{$hub}} {{/if}} diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index 44866c323..7aef7f2e1 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -4,6 +4,6 @@ </div> <div class="contact-entry-photo-end" ></div> <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div></a> - <div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$edit}}</a></div> + <div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$contact.edit}}</a></div> <div class="contact-entry-end" ></div> </div> diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index c69dcde50..1429576b1 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -13,13 +13,16 @@ {{$tabs}} - +<div id="connections-wrapper"> {{foreach $contacts as $contact}} {{include file="connection_template.tpl"}} {{/foreach}} +<div id="page-end"></div> +</div> <div id="contact-edit-end"></div> +<script>$(document).ready(function() { loadingPage = false;});</script> +<div id="page-spinner"></div> -{{$paginate}} diff --git a/view/tpl/contactsajax.tpl b/view/tpl/contactsajax.tpl new file mode 100644 index 000000000..1cce0f105 --- /dev/null +++ b/view/tpl/contactsajax.tpl @@ -0,0 +1,3 @@ +{{foreach $contacts as $contact}} + {{include file="connection_template.tpl"}} +{{/foreach}} diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl index 9d234a398..f9dac9306 100644 --- a/view/tpl/diaspora_vcard.tpl +++ b/view/tpl/diaspora_vcard.tpl @@ -2,7 +2,7 @@ <dl class='entity_nickname'> <dt>Nickname</dt> <dd> - <a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.nickname}}</a> + <a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.fullname}}</a> </dd> </dl> <dl class='entity_fn'> diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index bfdf4d0b6..af10e6c73 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -1,7 +1,8 @@ <h3>{{$title}}</h3> <p> -{{$desc}} +{{if ! $bootstrap}} +{{$format_desc}} {{/if}}{{$desc}} </p> <form action="{{$post}}" method="post" > @@ -10,18 +11,30 @@ <input type="hidden" name="xchan" value="{{$xchan}}" /> <input type="hidden" name="mid" value="{{$mid}}" /> +<div id="event-summary-text">{{$t_text}}</div> +<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" /> + <div id="event-start-text">{{$s_text}}</div> +{{if $bootstrap}} +<i class="icon-calendar btn btn-default" onclick="eventGetStart(); return false;" /></i> <input type="text" name="start_text" id="start-text" value="{{$stext}}" /> +{{else}} {{$s_dsel}} {{$s_tsel}} +{{/if}} <div class="clear"></div><br /> -<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div> +<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} onclick="showHideFinishDate(); return true;" /> <div id="event-nofinish-text">{{$n_text}}</div> <div id="event-nofinish-break"></div> - +<div id="event-finish-wrapper"> <div id="event-finish-text">{{$f_text}}</div> +{{if $bootstrap}} +<i class="icon-calendar btn btn-default" onclick="eventGetFinish(); return false;" /></i> <input type="text" name="finish_text" id="finish-text" value="{{$ftext}}" /> +{{else}} {{$f_dsel}} {{$f_tsel}} +{{/if}} +</div> <div id="event-datetime-break"></div> @@ -30,8 +43,14 @@ <div id="event-adjust-break"></div> -<div id="event-summary-text">{{$t_text}}</div> -<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" /> + + +{{if $catsenabled}} +<div id="event-category-wrap"> + <input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" /> +</div> +{{/if}} + <div id="event-desc-text">{{$d_text}}</div> @@ -51,4 +70,81 @@ <input id="event-submit" type="submit" name="submit" value="{{$submit}}" /> </form> +<!-- Modal for item expiry--> +<div class="modal" id="startModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="startModalLabel">{{$s_text}}</h4> + </div> + <!-- <div class="modal-body"> --> + <div class="modal-body form-group" style="width:90%"> + <div class="input-group input-group-sm date" id="datetimepickerstart"> + <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> --> + <span class="icon-calendar"></span> + </span> + <input id="start-date" value='{{$stext}}' type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/> + </div> + </div> + <!-- </div> --> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$ModalCANCEL}}</button> + <button id="start-modal-OKButton" type="button" class="btn btn-primary">{{$ModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> +</div><!-- /.modal --> +<script type="text/javascript"> + $(function() { + $('#datetimepickerstart').datetimepicker({ + language: 'us', + icons: { + time: "icon-time", + date: "icon-calendar", + up: "icon-arrow-up", + down: "icon-arrow-down" + } + }); + }); +</script> + +<!-- Modal for item expiry--> +<div class="modal" id="finishModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="finishModalLabel">{{$s_text}}</h4> + </div> + <!-- <div class="modal-body"> --> + <div class="modal-body form-group" style="width:90%"> + <div class="input-group input-group-sm date" id="datetimepickerfinish"> + <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> --> + <span class="icon-calendar"></span> + </span> + <input id="finish-date" value='{{$ftext}}' type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/> + </div> + </div> + <!-- </div> --> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$ModalCANCEL}}</button> + <button id="finish-modal-OKButton" type="button" class="btn btn-primary">{{$ModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> +</div><!-- /.modal --> +<script type="text/javascript"> + $(function() { + $('#datetimepickerfinish').datetimepicker({ + language: 'us', + icons: { + time: "icon-time", + date: "icon-calendar", + up: "icon-arrow-up", + down: "icon-arrow-down" + } + }); + }); +</script> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 43a22a017..386979de5 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -3,9 +3,12 @@ <a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a> {{/if}} -<div class="photos"> +<div id="photo-album-contents" class="photos"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} +<div id="page-end"></div> </div> <div class="photos-end"></div> +<script>$(document).ready(function() { loadingPage = false;});</script> +<div id="page-spinner"></div> diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl new file mode 100755 index 000000000..a88682e8b --- /dev/null +++ b/view/tpl/photosajax.tpl @@ -0,0 +1,4 @@ +<!-- --> +{{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} +{{/foreach}} |