diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/php/theme_init.php | 8 | ||||
| -rwxr-xr-x | view/tpl/_conv_item.tpl | 118 | ||||
| -rwxr-xr-x | view/tpl/_group_side.tpl | 33 | ||||
| -rwxr-xr-x | view/tpl/_saved_searches_aside.tpl | 15 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 24 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 35 |
6 files changed, 229 insertions, 4 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php index e1625b3e5..509df8fef 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -10,10 +10,15 @@ head_add_css('library/jgrowl/jquery.jgrowl.css'); head_add_css('library/jslider/css/jslider.css'); head_add_css('library/prettyphoto/css/prettyPhoto.css'); head_add_css('library/colorbox/colorbox.css'); + // head_add_css('library/font_awesome/css/font-awesome.min.css'); head_add_css('view/css/conversation.css'); head_add_css('view/css/bootstrap-red.css'); head_add_css('view/css/widgets.css'); +<<<<<<< HEAD +head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'); +======= +>>>>>>> upstream/master head_add_js('js/jquery.js'); head_add_js('library/bootstrap/js/bootstrap.min.js'); @@ -43,7 +48,8 @@ head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.js'); head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js'); head_add_js('library/colorbox/jquery.colorbox-min.js'); - +head_add_js('library/bootstrap-datetimepicker/js/moment.js'); +head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'); /** * Those who require this feature will know what to do with it. * Those who don't, won't. diff --git a/view/tpl/_conv_item.tpl b/view/tpl/_conv_item.tpl new file mode 100755 index 000000000..b6e3df7c4 --- /dev/null +++ b/view/tpl/_conv_item.tpl @@ -0,0 +1,118 @@ +{{if $item.comment_firstcollapsed}} + <div class="hide-comments-outer"> + <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span> + </div> + <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> +{{/if}} +<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}"> +<a name="{{$item.id}}" ></a> +<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" > + <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" > + <div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}"> + {{if $item.owner_url}} + <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" > + <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}"> + <img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a> + </div> + <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div> + {{/if}} + <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" + onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" + onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)"> + <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"> + <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a> + <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span> + <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}"> + <ul> + {{$item.item_photo_menu}} + </ul> + </div> + + </div> + <div class="wall-item-photo-end"></div> + <div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" > + {{if $item.lock}}<i class="wall-item-lock icon-lock lockview" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i> + {{else}}<div class="wall-item-lock"></div>{{/if}} + <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div> + </div> + </div> + <div class="wall-item-author"> + <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}<br /> + + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> + </div> + <div class="wall-item-content" id="wall-item-content-{{$item.id}}" > + <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div> + <div class="wall-item-title-end"></div> + <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}} + <div class="body-tag"> + {{foreach $item.tags as $tag}} + <span class='tag'>{{$tag}}</span> + {{/foreach}} + </div> + {{if $item.has_cats}} + <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} + </div> + {{/if}} + + {{if $item.has_folders}} + <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} + </div> + {{/if}} + </div> + </div> + <div class="wall-item-tools" id="wall-item-tools-{{$item.id}}"> + {{if $item.like}} + <i class="icon-thumbs-up-alt item-tool" title="{{$item.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></i> + {{/if}} + {{if $item.dislike}} + <i class="icon-thumbs-down-alt item-tool" title="{{$item.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></i> + {{/if}} + {{if $item.share}} + <i class="icon-retweet item-tool" title="{{$item.share.0}}" onclick="jotShare({{$item.id}}); return false"></i> + {{/if}} + {{if $item.plink}} + <i class="icon-external-link item-tool" onclick="window.location.href='{{$item.plink.href}}'; return false;" title="{{$item.plink.title}}"></i> + {{/if}} + {{if $item.edpost}} + <i class="editpost icon-pencil item-tool" onclick="window.location.href='{{$item.edpost.0}}'; return false;" title="{{$item.edpost.1}}"></i> + {{/if}} + {{if $item.star}} + <i id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item item-tool {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> + {{/if}} + {{if $item.tagger}} + <i id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon-tag item-tool" title="{{$item.tagger.tagit}}"></i> + {{/if}} + {{if $item.filer}} + <i id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon-folder-open item-tool" title="{{$item.filer}}"></i> + {{/if}} + <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> + + <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" > + {{if $item.drop.dropping}}<a class="wall-item-delete-link" id="wall-item-delete-link-{{$item.id}}" href="item/drop/{{$item.id}}" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ><i class="icon-remove drop-icons item-tool"></i></a>{{/if}} + </div> + {{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}} + <div class="wall-item-delete-end"></div> + <div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.showlike}}</div> + <div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.showdislike}}</div> + + </div> + </div> + + <div class="wall-item-wrapper-end"></div> + +<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> +</div> +{{if $item.toplevel}} +{{foreach $item.children as $child}} + {{include file="{{$child.template}}" item=$child}} +{{/foreach}} +{{/if}} + +<div class="wall-item-comment-wrapper" > + {{$item.comment}} +</div> + + +</div> +{{if $item.comment_lastcollapsed}}</div>{{/if}} diff --git a/view/tpl/_group_side.tpl b/view/tpl/_group_side.tpl new file mode 100755 index 000000000..e350087f0 --- /dev/null +++ b/view/tpl/_group_side.tpl @@ -0,0 +1,33 @@ +<div class="panel panel-default" id="group-sidebar"> +<div class="panel-heading"><h3 class="panel-title">{{$title}}</h3></div> + +<div class="panel-body" id="sidebar-group-list"> + <ul id="sidebar-group-ul"> + {{foreach $groups as $group}} + <li class="sidebar-group-li"> + {{if $group.cid}} + <input type="checkbox" + class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" + onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;" + {{if $group.ismember}}checked="checked"{{/if}} + /> + {{/if}} + {{if $group.edit}} + <a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"></span></a> + {{/if}} + <a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a> + </li> + {{/foreach}} + </ul> + <div id="sidebar-new-group"> + <a href="group/new">{{$createtext}}</a> + </div> + {{if $ungrouped}} + <div id="sidebar-ungrouped"> + <a href="nogroup">{{$ungrouped}}</a> + </div> + {{/if}} + </div> +</div> + + diff --git a/view/tpl/_saved_searches_aside.tpl b/view/tpl/_saved_searches_aside.tpl new file mode 100755 index 000000000..2ca2ef6ea --- /dev/null +++ b/view/tpl/_saved_searches_aside.tpl @@ -0,0 +1,15 @@ +<div class="panel panel-default" id="saved-search-list"> +<div class="panel-heading"> <h3 class="panel-title" id="search">{{$title}}</h3></div> +<div class="panel-body"> + {{$searchbox}} + + <ul id="saved-search-ul"> + {{foreach $saved as $search}} + <li id="search-term-{{$search.id}}" class="saved-search-li clear"> + <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&remove=1&search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop" ></i></a> + <a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&search={{$search.encodedterm}}">{{$search.displayterm}}</a> + </li> + {{/foreach}} + </ul></div> + <div class="clear"></div> +</div> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 1ceca04c6..09d035979 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -194,10 +194,17 @@ function enableOnUser(){ } function jotGetExpiry() { - reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); - if(reply && reply.length) { + //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + $('#expiryModal').modal(); + $('#expiry-modal-OKButton').on('click', function() { + reply=$('#expiration-date').val(); + if(reply && reply.length) { $('#jot-expire').val(reply); + $('#expiryModal').modal('hide'); } +}) + + } function jotShare(id) { @@ -299,3 +306,16 @@ function enableOnUser(){ </script> +<!-- +<script> +$( document ).on( "click", ".wall-item-delete-link", function(e) { + var link = $(this).attr("href"); // "get" the intended link in a var + e.preventDefault(); + bootbox.confirm("<h4>Delete item?</h4>", function(result) { + if (result) { + document.location.href = link;} + }); + }); +</script> + --> + diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 666fae9cd..abe1c0924 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -90,9 +90,42 @@ {{$jotnets}} </div> </div> +<!-- Modal for item expiry--> +<div class="modal fade" id="expiryModal" 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="expiryModalLabel">{{$expires}}</h4> + </div> + <!-- <div class="modal-body"> --> + <div class="modal-body form-group" style="width:90%"> + <div class="input-group input-group-sm date" id="datetimepicker1"> + <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span> + </span> + <input id="expiration-date" 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">{{$expiryModalCANCEL}}</button> + <button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> +</div><!-- /.modal --> +<script type="text/javascript"> + $(function() { + $('#datetimepicker1').datetimepicker({ + language: 'us' + }); + }); +</script> +</div> + + -</div> <div id="profile-jot-end"></div> </form> |