diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/conversation.css | 4 | ||||
| -rw-r--r-- | view/js/main.js | 3 | ||||
| -rw-r--r-- | view/js/mod_articles.js | 9 | ||||
| -rw-r--r-- | view/pdl/mod_articles.pdl | 8 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/search_item.tpl | 3 |
6 files changed, 29 insertions, 2 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index d2736acaa..77a600deb 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -87,6 +87,10 @@ margin-left:10px; } +.wall-item-divider { + margin: 5px; +} + .wall-item-lock { float: left; } diff --git a/view/js/main.js b/view/js/main.js index ddd876689..c39d6c84c 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -439,8 +439,9 @@ function NavUpdate() { if($('#live-display').length) { src = 'display'; liveUpdate(); } if($('#live-search').length) { src = 'search'; liveUpdate(); } // if($('#live-cards').length) { src = 'cards'; liveUpdate(); } + // if($('#live-articles').length) { src = 'articles'; liveUpdate(); } - if($('#live-photos').length || $('#live-cards').length) { + if($('#live-photos').length || $('#live-cards').length || $('#live-articles').length ) { if(liking) { liking = 0; window.location.href=window.location.href; diff --git a/view/js/mod_articles.js b/view/js/mod_articles.js new file mode 100644 index 000000000..8b31c0f52 --- /dev/null +++ b/view/js/mod_articles.js @@ -0,0 +1,9 @@ +$(document).ready( function() { + $(".autotime").timeago(); + + /* autocomplete @nicknames */ + $(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl?f=&n=1"); + /* autocomplete bbcode */ + $(".comment-edit-form textarea").bbco_autocomplete('bbcode'); + +});
\ No newline at end of file diff --git a/view/pdl/mod_articles.pdl b/view/pdl/mod_articles.pdl new file mode 100644 index 000000000..c7599a008 --- /dev/null +++ b/view/pdl/mod_articles.pdl @@ -0,0 +1,8 @@ +[region=aside] +[widget=categories][var=articles]1[/var][/widget] +[widget=tasklist][/widget] +[widget=notes][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[/region] diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index b0e1cb6fb..e9f507f1e 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -46,7 +46,9 @@ {{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="fa fa-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} </div> </div> - + {{if $item.divider}} + <hr class="wall-item-divider"> + {{/if}} {{if $item.body}} <div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}"> <div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" > diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 0a8f12d4f..ebfb6a256 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -39,6 +39,9 @@ {{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="fa fa-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} </div> </div> + {{if $item.divider}} + <hr class="wall-item-divider"> + {{/if}} {{if $item.body}} <div class="p-2 clrearfix {{if $item.is_photo}} wall-photo-item{{else}} wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}"> <div class="wall-item-body" id="wall-item-body-{{$item.id}}" > |