From c0ad4763b30238aead8f1187efd669080c52a149 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Nov 2014 15:18:06 -0800 Subject: add unseen count and way to mark unseen to list mode. Also fix automatic mark of unseen so as to work with list mode. --- include/ItemObject.php | 24 ++++++++++++++++++++++++ mod/network.php | 29 +++++++++++++++++++++++------ mod/ping.php | 16 ++++++++++++---- version.inc | 2 +- view/js/main.js | 7 +++++++ view/tpl/conv_list.tpl | 3 ++- 6 files changed, 69 insertions(+), 12 deletions(-) diff --git a/include/ItemObject.php b/include/ItemObject.php index 4aa6857c1..6f1c76fa1 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -79,6 +79,7 @@ class Item extends BaseObject { $indent = ''; $osparkle = ''; $total_children = $this->count_descendants(); + $unseen_comments = (($item->real_uid) ? 0 : $this->count_unseen_descendants()); $conv = $this->get_conversation(); $observer = $conv->get_observer(); @@ -233,6 +234,8 @@ class Item extends BaseObject { $comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children ); + $list_unseen_txt = (($unseen_comments) ? sprintf('%d unseen',$unseen_comments) : ''); + $children = $this->get_children(); $tmp_item = array( @@ -290,8 +293,12 @@ class Item extends BaseObject { 'drop' => $drop, 'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''), // end toolbar buttons + + 'unseen_comments' => $unseen_comments, 'comment_count' => $total_children, 'comment_count_txt' => $comment_count_txt, + 'list_unseen_txt' => $list_unseen_txt, + 'markseen' => t('Mark all seen'), 'like_count' => $like_count, 'like_list' => $like_list, 'like_list_part' => $like_list_part, @@ -545,6 +552,23 @@ class Item extends BaseObject { return $total; } + private function count_unseen_descendants() { + $children = $this->get_children(); + $total = count($children); + if($total > 0) { + $total = 0; + foreach($children as $child) { + if((! visible_activity($child->data)) || array_key_exists('author_blocked',$child->data)) { + continue; + } + if($child->data['item_flags'] & ITEM_UNSEEN) + $total ++; + } + } + return $total; + } + + /** * Get the template for the comment box */ diff --git a/mod/network.php b/mod/network.php index d6c19eca7..c79ff8d6a 100644 --- a/mod/network.php +++ b/mod/network.php @@ -317,6 +317,11 @@ function network_content(&$a, $update = 0, $load = false) { $uids = " and item.uid = " . local_user() . " "; } + if(get_pconfig(local_user(),'system','network_list_mode')) + $page_mode = 'list'; + else + $page_mode = 'client'; + $simple_update = (($update) ? " and ( item.item_flags & " . intval(ITEM_UNSEEN) . " ) > 0 " : ''); // This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day @@ -414,9 +419,25 @@ function network_content(&$a, $update = 0, $load = false) { $items = array(); } - if($parents_str) - $update_unseen = ' AND parent IN ( ' . dbesc($parents_str) . ' )'; + if($page_mode === 'list') { + + /** + * in "list mode", only mark the parent item and any like activities as "seen". + * We won't distinguish between comment likes and post likes. The important thing + * is that the number of unseen comments will be accurate. The SQL to separate the + * comment likes could also get somewhat hairy. + */ + if($parents_str) { + $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )"; + $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) "; + } + } + else { + if($parents_str) { + $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )"; + } + } } if(($update_unseen) && (! $firehose)) @@ -429,10 +450,6 @@ function network_content(&$a, $update = 0, $load = false) { $mode = (($nouveau) ? 'network-new' : 'network'); - if(get_pconfig(local_user(),'system','network_list_mode')) - $page_mode = 'list'; - else - $page_mode = 'client'; $o .= conversation($a,$items,$mode,$update,$page_mode); diff --git a/mod/ping.php b/mod/ping.php index d7b9e3d2e..20cfbe120 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -150,14 +150,14 @@ function ping_init(&$a) { if(x($_REQUEST, 'markRead') && local_user()) { switch($_REQUEST['markRead']) { case 'network': - $r = q("update item set item_flags = ( item_flags & ~%d ) where (item_flags & %d)>0 and uid = %d", + $r = q("update item set item_flags = ( item_flags & ~%d ) where (item_flags & %d) > 0 and uid = %d", intval(ITEM_UNSEEN), intval(ITEM_UNSEEN), intval(local_user()) ); break; case 'home': - $r = q("update item set item_flags = ( item_flags & ~%d ) where (item_flags & %d)>0 and (item_flags & %d) and uid = %d", + $r = q("update item set item_flags = ( item_flags & ~%d ) where (item_flags & %d) > 0 and (item_flags & %d) > 0 and uid = %d", intval(ITEM_UNSEEN), intval(ITEM_UNSEEN), intval(ITEM_WALL), @@ -165,14 +165,14 @@ function ping_init(&$a) { ); break; case 'messages': - $r = q("update mail set mail_flags = ( mail_flags | %d ) where channel_id = %d and not (mail_flags & %d)>0", + $r = q("update mail set mail_flags = ( mail_flags | %d ) where channel_id = %d and not (mail_flags & %d) > 0", intval(MAIL_SEEN), intval(local_user()), intval(MAIL_SEEN) ); break; case 'all_events': - $r = q("update event set `ignore` = 1 where `ignore` = 0 and uid = %d", + $r = q("update event set ignore = 1 where ignore = 0 and uid = %d", intval(local_user()) ); break; @@ -186,6 +186,14 @@ function ping_init(&$a) { } } + if(x($_REQUEST, 'markItemRead') && local_user()) { + $r = q("update item set item_flags = ( item_flags & ~%d ) where parent = %d and uid = %d", + intval(ITEM_UNSEEN), + intval($_REQUEST['markItemRead']), + intval(local_user()) + ); + } + /** diff --git a/version.inc b/version.inc index 664554361..d1f09608f 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-16.861 +2014-11-17.862 diff --git a/view/js/main.js b/view/js/main.js index bec35ba72..9b5c1b1b2 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -180,6 +180,13 @@ timer = setTimeout(NavUpdate,2000); } + function markItemRead(itemId) { + $.get('ping?f=&markItemRead='+itemId); + $('.unseen-wall-indicator-'+itemId).hide(); + } + + + var src = null; var prev = null; var livetime = null; diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 71554a9b3..b9a966e93 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -164,7 +164,8 @@ {{/if}}
-
{{$item.comment_count_txt}}
+
{{$item.comment_count_txt}}{{if $item.unseen_comments}} +, {{$item.list_unseen_txt}}{{/if}}{{if $item.unseen_comments}}   
-- cgit v1.2.3 From 13a7637d9d17a2ea8adcdb635842ca12dfc0a632 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Nov 2014 15:26:32 -0800 Subject: whitespace --- mod/ping.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mod/ping.php b/mod/ping.php index 20cfbe120..451370779 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -245,7 +245,7 @@ function ping_init(&$a) { if(argc() > 1 && argv(1) === 'messages') { $channel = $a->get_channel(); $t = q("select mail.*, xchan.* from mail left join xchan on xchan_hash = from_xchan - where channel_id = %d and not ( mail_flags & %d )>0 and not (mail_flags & %d )>0 + where channel_id = %d and not ( mail_flags & %d ) > 0 and not (mail_flags & %d ) > 0 and from_xchan != '%s' order by created desc limit 50", intval(local_user()), intval(MAIL_SEEN), @@ -275,7 +275,7 @@ function ping_init(&$a) { $result = array(); $r = q("SELECT * FROM item - WHERE item_restrict = %d and ( item_flags & %d )>0 and uid = %d", + WHERE item_restrict = %d and ( item_flags & %d ) > 0 and uid = %d", intval(ITEM_VISIBLE), intval(ITEM_UNSEEN), intval(local_user()) @@ -297,7 +297,7 @@ function ping_init(&$a) { if(argc() > 1 && (argv(1) === 'intros')) { $result = array(); - $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d)>0 and not ((abook_flags & %d)>0 or (xchan_flags & %d)>0)", + $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or (xchan_flags & %d) > 0)", intval(local_user()), intval(ABOOK_FLAG_PENDING), intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), @@ -381,7 +381,7 @@ function ping_init(&$a) { if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) { $r = q("SELECT id, item_restrict, item_flags FROM item - WHERE (item_restrict = %d) and ( item_flags & %d )>0 and uid = %d", + WHERE (item_restrict = %d) and ( item_flags & %d ) > 0 and uid = %d", intval(ITEM_VISIBLE), intval(ITEM_UNSEEN), intval(local_user()) @@ -408,7 +408,7 @@ function ping_init(&$a) { $t2 = dba_timer(); if($vnotify & VNOTIFY_INTRO) { - $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d)>0 and not ((abook_flags & %d)>0 or (xchan_flags & %d)>0)", + $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or (xchan_flags & %d) > 0)", intval(local_user()), intval(ABOOK_FLAG_PENDING), intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), @@ -426,7 +426,7 @@ function ping_init(&$a) { if($vnotify & VNOTIFY_MAIL) { $mails = q("SELECT count(id) as total from mail - WHERE channel_id = %d AND not (mail_flags & %d)>0 and from_xchan != '%s' ", + WHERE channel_id = %d AND not (mail_flags & %d) > 0 and from_xchan != '%s' ", intval(local_user()), intval(MAIL_SEEN), dbesc($channel['channel_hash']) @@ -437,7 +437,7 @@ function ping_init(&$a) { if($vnotify & VNOTIFY_REGISTER) { if ($a->config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) { - $regs = q("SELECT count(account_id) as total from account where (account_flags & %d)>0", + $regs = q("SELECT count(account_id) as total from account where (account_flags & %d) > 0", intval(ACCOUNT_PENDING) ); if($regs) -- cgit v1.2.3 From 65a6121014b1b985d176ea482077400cfee1c3a9 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Nov 2014 15:43:03 -0800 Subject: fix the update_unseen stuff on the channel page also --- mod/channel.php | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index 1cc2dc02c..b91b6bcef 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -137,6 +137,11 @@ function channel_content(&$a, $update = 0, $load = false) { $sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups); + if(get_pconfig($a->profile['profile_uid'],'system','channel_list_mode')) + $page_mode = 'list'; + else + $page_mode = 'client'; + if(($update) && (! $load)) { if ($mid) { @@ -279,12 +284,31 @@ function channel_content(&$a, $update = 0, $load = false) { } + $update_unseen = ''; + if($page_mode === 'list') { - if($is_owner) { + /** + * in "list mode", only mark the parent item and any like activities as "seen". + * We won't distinguish between comment likes and post likes. The important thing + * is that the number of unseen comments will be accurate. The SQL to separate the + * comment likes could also get somewhat hairy. + */ + if($parents_str) { + $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )"; + $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) "; + } + } + else { + if($parents_str) { + $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )"; + } + } + + if($is_owner && $update_unseen) { $r = q("UPDATE item SET item_flags = (item_flags & ~%d) - WHERE (item_flags & %d)>0 AND (item_flags & %d)>0 AND uid = %d ", + WHERE (item_flags & %d) > 0 AND (item_flags & %d) > 0 AND uid = %d $update_unseen", intval(ITEM_UNSEEN), intval(ITEM_UNSEEN), intval(ITEM_WALL), @@ -293,12 +317,6 @@ function channel_content(&$a, $update = 0, $load = false) { } - if(get_pconfig($a->profile['profile_uid'],'system','channel_list_mode')) - $page_mode = 'list'; - else - $page_mode = 'client'; - - if($_COOKIE['jsAvailable'] == 1) { $o .= conversation($a,$items,'channel',$update,$page_mode); } else { -- cgit v1.2.3 From af9015c8ed7fa99b9639dd8c7746f8f658835187 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Nov 2014 18:29:57 -0800 Subject: place holder --- include/items.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/items.php b/include/items.php index 6447de4e7..19de52e92 100755 --- a/include/items.php +++ b/include/items.php @@ -66,6 +66,8 @@ function collect_recipients($item,&$private_envelope) { // by the directives in $item['public_policy']. $private_envelope = false; + require_once('include/identity.php'); + $sys = get_sys_channel(); if(array_key_exists('public_policy',$item) && $item['public_policy'] !== 'self') { $r = q("select abook_xchan, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d)>0 ", @@ -95,6 +97,9 @@ function collect_recipients($item,&$private_envelope) { } } } +// we probably want to check that discovery channel delivery is allowed before uncommenting this. +// if($policy === 'pub') +// $recipients[] = $sys['xchan_hash']; } } -- cgit v1.2.3 From 7e8f3e4dfb7dfda96c1bba5ea42ebc7ea875e30d Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Nov 2014 18:46:57 -0800 Subject: requote ignore --- mod/ping.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/ping.php b/mod/ping.php index 451370779..ef8afd91c 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -172,7 +172,7 @@ function ping_init(&$a) { ); break; case 'all_events': - $r = q("update event set ignore = 1 where ignore = 0 and uid = %d", + $r = q("update event set `ignore` = 1 where `ignore` = 0 and uid = %d", intval(local_user()) ); break; -- cgit v1.2.3 From 7b39fac5f07cd2e85e4e978de8b259d40c03a173 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Nov 2014 20:11:05 -0800 Subject: forgot to add catcloud to the widget doc --- doc/Widgets.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/Widgets.md b/doc/Widgets.md index 48006adcd..dcf8dfb48 100644 --- a/doc/Widgets.md +++ b/doc/Widgets.md @@ -39,6 +39,12 @@ Some/many of these widgets have restrictions which may restrict the type of page * categories - categories filter (channel page) * tagcloud_wall - tagcloud for channel page only + * args: 'limit' - number of tags to return (default 50) +
 
+ +* catcloud_wall - tagcloud for channel page categories + * args: 'limit' - number of categories to return (default 50) +
 
* affinity - affinity slider for network page - must be logged in -- cgit v1.2.3 From db3015e34ed3827e68d8debc70321ed6df5dc699 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Nov 2014 23:48:03 -0800 Subject: allow members to set the per-item "show more" height (separately for network and matrix, display and search are system pages and therefore set at 400) --- mod/channel.php | 7 ++++++- mod/network.php | 9 ++++++++- mod/settings.php | 11 +++++++++++ view/js/main.js | 20 ++++---------------- view/tpl/settings_display.tpl | 2 ++ 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index b91b6bcef..54b25ad8b 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -251,9 +251,14 @@ function channel_content(&$a, $update = 0, $load = false) { // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, // because browser prefetching might change it on us. We have to deliver it with the page. + $maxheight = get_pconfig($a->profile['profile_uid'],'system','channel_divmore_height'); + if(! $maxheight) + $maxheight = 400; + $o .= '
' . "\r\n"; $o .= "\r\n"; + . "; var netargs = '?f='; var profile_page = " . $a->pager['page'] + . "; divmore_height = " . intval($maxheight) . "; \r\n"; $a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( '$baseurl' => z_root(), diff --git a/mod/network.php b/mod/network.php index c79ff8d6a..522622f03 100644 --- a/mod/network.php +++ b/mod/network.php @@ -208,8 +208,15 @@ function network_content(&$a, $update = 0, $load = false) { if($gid || $cid || $cmin || ($cmax != 99) || $star || $liked || $conv || $spam || $nouveau || $list) $firehose = 0; + $maxheight = get_pconfig(local_user(),'system','network_divmore_height'); + if(! $maxheight) + $maxheight = 400; + + $o .= '
' . "\r\n"; - $o .= ""; + $o .= "\r\n"; $a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( '$baseurl' => z_root(), diff --git a/mod/settings.php b/mod/settings.php index 725825b34..ab6638ccb 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -143,6 +143,12 @@ function settings_post(&$a) { $channel_list_mode = ((x($_POST,'channel_list_mode')) ? intval($_POST['channel_list_mode']) : 0); $network_list_mode = ((x($_POST,'network_list_mode')) ? intval($_POST['network_list_mode']) : 0); + $channel_divmore_height = ((x($_POST,'channel_divmore_height')) ? intval($_POST['channel_divmore_height']) : 400); + if($channel_divmore_height < 50) + $channel_divmore_height = 50; + $network_divmore_height = ((x($_POST,'network_divmore_height')) ? intval($_POST['network_divmore_height']) : 400); + if($network_divmore_height < 50) + $network_divmore_height = 50; $browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0); $browser_update = $browser_update * 1000; @@ -165,6 +171,8 @@ function settings_post(&$a) { set_pconfig(local_user(),'system','title_tosource',$title_tosource); set_pconfig(local_user(),'system','channel_list_mode', $channel_list_mode); set_pconfig(local_user(),'system','network_list_mode', $network_list_mode); + set_pconfig(local_user(),'system','channel_divmore_height', $channel_divmore_height); + set_pconfig(local_user(),'system','network_divmore_height', $network_divmore_height); if ($theme == $a->channel['channel_theme']){ // call theme_post only if theme has not been changed @@ -810,6 +818,9 @@ function settings_content(&$a) { '$expert' => feature_enabled(local_user(),'expert'), '$channel_list_mode' => array('channel_list_mode', t('Use blog/list mode on channel page'), get_pconfig(local_user(),'system','channel_list_mode'), t('(comments displayed separately)')), '$network_list_mode' => array('network_list_mode', t('Use blog/list mode on matrix page'), get_pconfig(local_user(),'system','network_list_mode'), t('(comments displayed separately)')), + '$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_user(),'system','channel_divmore_height')) ? get_pconfig(local_user(),'system','channel_divmore_height') : 400), t('click to expand content exceeding this height')), + '$network_divmore_height' => array('network_divmore_height', t('Matrix page max height of content (in pixels)'), ((get_pconfig(local_user(),'system','network_divmore_height')) ? get_pconfig(local_user(),'system','network_divmore_height') : 400) , t('click to expand content exceeding this height')), + )); diff --git a/view/js/main.js b/view/js/main.js index 9b5c1b1b2..8939f4a09 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -207,6 +207,7 @@ var loadingPage = true; var pageHasMoreContent = true; var updateCountsOnly = false; + var divmore_height = 400; $(function() { $.ajaxSetup({cache: false}); @@ -591,27 +592,14 @@ function updateConvItems(mode,data) { function collapseHeight() { - var isListMode = false; - $(".wall-item-listbody").each(function() { - isListMode = true; - if($(this).height() > 210) { + $(".wall-item-body").each(function() { + if($(this).height() > divmore_height + 10) { if(! $(this).hasClass('divmore')) { - $(this).divgrow({ initialHeight: 200, moreText: aStr['divgrowmore'], lessText: aStr['divgrowless'], showBrackets: false }); + $(this).divgrow({ initialHeight: divmore_height, moreText: aStr['divgrowmore'], lessText: aStr['divgrowless'], showBrackets: false }); $(this).addClass('divmore'); } } }); - - $(".wall-item-body").each(function() { - if(! isListMode) { - if($(this).height() > 410) { - if(! $(this).hasClass('divmore')) { - $(this).divgrow({ initialHeight: 400, moreText: aStr['divgrowmore'], lessText: aStr['divgrowless'], showBrackets: false }); - $(this).addClass('divmore'); - } - } - } - }); } function liveUpdate() { diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 8e870ba0e..8bf4dc0cc 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -11,6 +11,8 @@ {{/if}} {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} +{{include file="field_input.tpl" field=$channel_divmore_height}} +{{include file="field_input.tpl" field=$network_divmore_height}} {{include file="field_checkbox.tpl" field=$nosmile}} {{include file="field_checkbox.tpl" field=$title_tosource}} {{include file="field_checkbox.tpl" field=$channel_list_mode}} -- cgit v1.2.3 From 1d96e165e00ed54df0573bda79c2a274f21aeb16 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 18 Nov 2014 00:24:32 -0800 Subject: undo disabled submit buttons now that ACL is initialised when page loaded --- version.inc | 2 +- view/js/acl.js | 1 - view/tpl/attach_edit.tpl | 4 ++-- view/tpl/chatroom_new.tpl | 4 ++-- view/tpl/jot.tpl | 4 ++-- view/tpl/mitemedit.tpl | 2 +- view/tpl/photo_view.tpl | 4 ++-- view/tpl/photos_upload.tpl | 4 ++-- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/version.inc b/version.inc index d1f09608f..2679ebdf3 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-17.862 +2014-11-18.863 diff --git a/view/js/acl.js b/view/js/acl.js index f9fd66bab..f9428e1c5 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -273,6 +273,5 @@ ACL.prototype.populate = function(data){ $(el).removeAttr("data-src"); }); that.update_view(); - $('#dbtn-submit, #dbtn-acl').prop('disabled', false); } diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 1254c713b..a2a4af16b 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -5,7 +5,7 @@
- {{$aclselect}} {{$file.filename}} @@ -30,7 +30,7 @@
- + diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index bb1121924..a559dba54 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -2,12 +2,12 @@
{{include file="field_input.tpl" field=$name}} - + {{$acl}}


- +
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index c77d49a74..f172a6dfa 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -76,7 +76,7 @@
{{if $showacl}} - {{/if}} @@ -85,7 +85,7 @@ {{/if}} - +
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index f398cf02c..a18fbb0ef 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -26,7 +26,7 @@
- +
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 4652f33c6..a741a5ce7 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -68,10 +68,10 @@
- - +
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 2dd7de9b2..a04038aa2 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -22,10 +22,10 @@
- - +
{{/if}} -- cgit v1.2.3