diff --git a/src/css/search.css b/src/css/search.css index 54193fac0..7172c2ddd 100755 --- a/src/css/search.css +++ b/src/css/search.css @@ -106,6 +106,10 @@ p { margin: 0; } +.no-min-height +{ + min-height: unset !important; +} .inline div, .inline form, .inline p @@ -687,6 +691,7 @@ body.mobile } .mobile .nav-bar h1 { + font-size:14pt; min-width: unset; max-width: unset; } @@ -979,6 +984,14 @@ body.mobile { width: 1.5in; } +.group-comment +{ + margin: 10px 8px 10px 8px !important; +} +.mobile .group-comment +{ + margin: 10px 14px 10px 14px !important; +} .mobile .logo img { left: -8px; @@ -1077,7 +1090,7 @@ body.mobile z-index: 5; } -.mobile .admin-heading span +.mobile .admin-heading { left: 70px; position: relative; @@ -2479,6 +2492,11 @@ td.admin-edit-form margin: 3px; -webkit-appearance: menulist-button; } +.mobile #browse-state, +.mobile #browse-state option +{ + font-size: 14pt; +} .name-table, .name-table th, .name-table td diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini index d3191158b..5fa97ef77 100755 --- a/src/locale/ar/configure.ini +++ b/src/locale/ar/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini index e9df1aa2d..4d2f3c0f1 100755 --- a/src/locale/bn/configure.ini +++ b/src/locale/bn/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini index 7fc194086..679462cd1 100755 --- a/src/locale/de/configure.ini +++ b/src/locale/de/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini index 789ab10c4..0037d1eb8 100644 --- a/src/locale/en_US/configure.ini +++ b/src/locale/en_US/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "No Matching Strings Left To Translate!" editlocales_element_save = "Save" ; ; GroupbarElement.php +groupbar_element_groups = "Groups" groupbar_element_page_list = "Page List" groupbar_element_page_thread = " %s Page at %s Group Discussion" groupbar_element_groupfeed = "%s Feed" diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini index c46c0f211..2bae318d1 100755 --- a/src/locale/es/configure.ini +++ b/src/locale/es/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini index d686c7fab..8ed05bd46 100755 --- a/src/locale/fa/configure.ini +++ b/src/locale/fa/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini index 6e6265f84..704bf49b1 100755 --- a/src/locale/fr_FR/configure.ini +++ b/src/locale/fr_FR/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini index 82f3146a2..2ad67e00d 100755 --- a/src/locale/he/configure.ini +++ b/src/locale/he/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini index e80611aea..0ae64d3c4 100755 --- a/src/locale/hi/configure.ini +++ b/src/locale/hi/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/in_ID/configure.ini b/src/locale/in_ID/configure.ini index 0beedf0cc..d232dcae9 100755 --- a/src/locale/in_ID/configure.ini +++ b/src/locale/in_ID/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini index 1e8f65de9..4dbbe39d4 100755 --- a/src/locale/it/configure.ini +++ b/src/locale/it/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini index f563684c6..8ea9920a8 100755 --- a/src/locale/ja/configure.ini +++ b/src/locale/ja/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini index 3bcf50f85..ff309b3b4 100755 --- a/src/locale/kn/configure.ini +++ b/src/locale/kn/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini index 8f6bf9c6b..a7c02ddd5 100755 --- a/src/locale/ko/configure.ini +++ b/src/locale/ko/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini index 918a2f3ab..ffc323578 100644 --- a/src/locale/nl/configure.ini +++ b/src/locale/nl/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "Geen Matching Strings Left To Translate!" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini index 11bcbbef8..ff01ae25c 100755 --- a/src/locale/pl/configure.ini +++ b/src/locale/pl/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini index ceed898e2..0f8766f58 100755 --- a/src/locale/pt/configure.ini +++ b/src/locale/pt/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini index 58dff7aa6..5811889b9 100755 --- a/src/locale/ru/configure.ini +++ b/src/locale/ru/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini index 63dffd6b8..26ef2b469 100644 --- a/src/locale/te/configure.ini +++ b/src/locale/te/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "అనువదించడానికి editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini index 92e361368..3a98c6dcf 100755 --- a/src/locale/th/configure.ini +++ b/src/locale/th/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini index c23f1ea75..6178ec740 100755 --- a/src/locale/tr/configure.ini +++ b/src/locale/tr/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini index c46806b72..799318162 100755 --- a/src/locale/vi_VN/configure.ini +++ b/src/locale/vi_VN/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini index b2461b80c..b87310d63 100755 --- a/src/locale/zh_CN/configure.ini +++ b/src/locale/zh_CN/configure.ini @@ -1153,6 +1153,7 @@ editlocales_element_no_matching = "" editlocales_element_save = "" ; ; GroupbarElement.php +groupbar_element_groups = "" groupbar_element_page_list = "" groupbar_element_page_thread = "" groupbar_element_groupfeed = "" diff --git a/src/views/elements/AdminbarElement.php b/src/views/elements/AdminbarElement.php index 749b03805..5859c159f 100644 --- a/src/views/elements/AdminbarElement.php +++ b/src/views/elements/AdminbarElement.php @@ -75,9 +75,7 @@ class AdminbarElement extends Element } else { e(tl('adminbar_element_admin')); } - if (!$_SERVER["MOBILE"]) { - e(' ['.$data['CURRENT_ACTIVITY'].']'); - } + e(' ['.$data['CURRENT_ACTIVITY'].']'); ?></span></h1> </div> </div> diff --git a/src/views/elements/GroupbarElement.php b/src/views/elements/GroupbarElement.php index 98549b9bc..304ff57a6 100644 --- a/src/views/elements/GroupbarElement.php +++ b/src/views/elements/GroupbarElement.php @@ -65,16 +65,17 @@ class GroupbarElement extends Element $base_query = ($is_wiki) ? htmlentities(B\wikiUrl("", true, $data['CONTROLLER'], $data["GROUP"]["GROUP_ID"])) : B\feedsUrl("", "", true, $data['CONTROLLER']) . $token_string; - ?> + $admin_url = htmlentities(B\controllerUrl('admin', true)); ?> <div id='nav-bar' class="nav-bar"> - <div class='inner-bar'> - <?php $this->renderSettingsToggle($logged_in); ?> + <div class='inner-bar'><?php + $this->renderSettingsToggle($logged_in); ?> <h1><a href="<?=C\BASE_URL ?><?php if ($logged_in) { e("?$token_string"); } ?>"><img src="<?= C\BASE_URL . $logo ?>" alt="<?= - $this->view->logo_alt_text ?>" /></a><span> - <?php + $this->view->logo_alt_text ?>" /></a><span> - + <?php if (!empty($data['ACTIVITY_METHOD']) && $data['ACTIVITY_METHOD'] == 'wiki') { $page_name = str_replace("_", " ", $data['PAGE_NAME']); diff --git a/src/views/elements/GroupfeedElement.php b/src/views/elements/GroupfeedElement.php index 785e5e080..5ce0f5865 100644 --- a/src/views/elements/GroupfeedElement.php +++ b/src/views/elements/GroupfeedElement.php @@ -60,8 +60,8 @@ class GroupfeedElement extends Element implements CrawlConstants $paging_query = $data['PAGING_QUERY'] . $token_string; if (!$is_status) { ?> - <div id="feedstatus" class="small-margin-current-activity" > - <span id="feedtime" data-time="<?=time() ?>" class='none'></span> + <div id="feedstatus" class="small-margin-current-activity + no-min-height" > <?php if ($logged_in) { if (isset($data['SUBSCRIBE_LINK'])) { @@ -88,7 +88,7 @@ class GroupfeedElement extends Element implements CrawlConstants } ?> <div> - + <span id="feedtime" data-time="<?=time() ?>" class='none'> </span> </div> <?php if (isset($data['MODE']) && $data['MODE'] == 'grouped') { @@ -98,14 +98,21 @@ class GroupfeedElement extends Element implements CrawlConstants $page = $this->renderUngroupedView($logged_in, $base_query, $paging_query, $data); } + $data['TOTAL_ROWS'] = empty($data['TOTAL_ROWS']) ? 0 : + $data['TOTAL_ROWS']; + $this->view->helper("pagination")->render($paging_query, + $data['LIMIT'], $data['RESULTS_PER_PAGE'], $data['TOTAL_ROWS'], + false, $logged_in); ?> + </div><?php $data['FRAGMENT'] = ""; - if (isset($data['JUST_THREAD']) && $logged_in && $page && + if (isset($data['JUST_THREAD']) && $logged_in && $page && !$is_status && isset($data['GROUP_STATUS']) && $data['GROUP_STATUS'] == C\ACTIVE_STATUS) { $data['FRAGMENT'] = '#result-'.$page['ID']; ?> - <div class='button-group-result'> - <button class="button-box" onclick='comment_form(<?= + <div class='small-margin-current-activity button-group-result'> + <button + class="button-box group-comment" onclick='commentForm(<?= "\"add-comment\", ". "{$data['PAGES'][0]['PARENT_ID']},". "{$data['PAGES'][0]['GROUP_ID']}" ?>)'><?= @@ -116,16 +123,8 @@ class GroupfeedElement extends Element implements CrawlConstants <div id='add-comment'></div> <?php }?> - </div><?php + </div><?php } - $data['TOTAL_ROWS'] = empty($data['TOTAL_ROWS']) ? 0 : - $data['TOTAL_ROWS']; - $this->view->helper("pagination")->render($paging_query, - $data['LIMIT'], $data['RESULTS_PER_PAGE'], $data['TOTAL_ROWS'], - false, $logged_in); - ?> - </div> - <?php if (!$is_status) { $this->renderScripts($data); } @@ -212,7 +211,7 @@ class GroupfeedElement extends Element implements CrawlConstants if (isset($data['JUST_THREAD'])) { ?> <div class='button-group-result'> - <button class="button-box" onclick='comment_form(<?= + <button class="button-box" onclick='commentForm(<?= "\"add-comment\", {$parent_id},". "{$group_id}" ?>)'><?= tl('groupfeed_element_comment') ?></button><?php @@ -229,7 +228,7 @@ class GroupfeedElement extends Element implements CrawlConstants in_array($member_access, $start_thread)) { ?> <div class='button-group-result'> - <button class="button-box" onclick='start_thread_form(<?= + <button class="button-box" onclick='startThreadForm(<?= "\"add-comment\", {$data['PAGES'][0]['GROUP_ID']}" ?>)'><?= tl('groupfeed_element_start_thread') ?></button> <div id='add-comment'></div> @@ -242,7 +241,7 @@ class GroupfeedElement extends Element implements CrawlConstants //no read case where no posts yet ?> <div class='button-group-result'> - <button class="button-box" onclick='start_thread_form(<?= + <button class="button-box" onclick='startThreadForm(<?= "\"add-comment\", {$data['JUST_GROUP_ID']}" ?>)'><?= tl('groupfeed_element_start_thread') ?></button> <div id='add-comment'></div> @@ -292,7 +291,7 @@ class GroupfeedElement extends Element implements CrawlConstants ?> <div class="float-opposite"><?php if (!isset($page['NO_EDIT'])) { - ?>[<a href="javascript:update_post_form(<?=$page['ID'] + ?>[<a href="javascript:updatePostForm(<?=$page['ID'] ?>)"><?=tl('groupfeed_element_edit') ?></a>]<?php } ?> @@ -360,7 +359,7 @@ class GroupfeedElement extends Element implements CrawlConstants in_array($page["MEMBER_ACCESS"], $start_thread) && !$is_wiki_page_with_feedback) { ?> - <a class='gray-link' href='javascript:start_thread_form(<?= + <a class='gray-link' href='javascript:startThreadForm(<?= "{$page['ID']}, {$page['GROUP_ID']},\"". tl('groupfeed_element_start_thread_in_group', $page[self::SOURCE_NAME]) ?>")' title='<?= @@ -438,7 +437,7 @@ class GroupfeedElement extends Element implements CrawlConstants <?php if (!isset($data['JUST_GROUP_ID']) && in_array($page["MEMBER_ACCESS"], $can_comment) && !isset($data['JUST_THREAD'])){?> - <a href='javascript:comment_form(<?= + <a href='javascript:commentForm(<?= "{$page['ID']}, {$page['PARENT_ID']}, ". "{$page['GROUP_ID']}" ?>)'><?= tl('groupfeed_element_comment') ?></a>.<?php @@ -570,9 +569,8 @@ class GroupfeedElement extends Element implements CrawlConstants $click_link_text = tl('groupfeed_element_click_textarea'); ?> var feed_update_id = null; - function comment_form(id, parent_id, group_id) + function commentForm(id, parent_id, group_id) { - clearInterval(feed_update_id); tmp = '<div class="post<?= $clear ?>"></div>'; start_elt = elt(id).innerHTML.substr(0, tmp.length); if (start_elt != tmp) { @@ -619,7 +617,7 @@ class GroupfeedElement extends Element implements CrawlConstants elt(id).innerHTML = ""; } } - function start_thread_form(id, group_id, group_name) + function startThreadForm(id, group_id, group_name) { clearInterval(feed_update_id); tmp = '<div class="post<?=$clear ?>"></div>'; @@ -676,12 +674,13 @@ class GroupfeedElement extends Element implements CrawlConstants editorize(description_id); } else { elt(id).innerHTML = ""; + doUpdate(); } } - function update_post_form(id) + function updatePostForm(id) { clearInterval(feed_update_id); - var title = elt('title'+id).innerHTML; + var title = elt('title' + id).innerHTML; var description = elt('old-description'+id).innerHTML; var tmp = '<div class="post<?= $clear ?>"></div>'; start_elt = elt(id).innerHTML.substr(0, tmp.length) @@ -735,6 +734,7 @@ class GroupfeedElement extends Element implements CrawlConstants } else { elt(id).innerHTML = ""; setDisplay('result-'+id, true); + doUpdate(); } } function feedStatusUpdate() @@ -765,7 +765,6 @@ class GroupfeedElement extends Element implements CrawlConstants feed_update_time = 15; feed_update_id = setInterval("feedStatusUpdate()", feed_update_time * sec); - setTimeout("clearUpdate()", 20 * minute + sec); } </script> diff --git a/src/views/elements/GroupoptionsElement.php b/src/views/elements/GroupoptionsElement.php index d2fd988de..14ae480de 100644 --- a/src/views/elements/GroupoptionsElement.php +++ b/src/views/elements/GroupoptionsElement.php @@ -231,10 +231,10 @@ class GroupoptionsElement extends Element implements CrawlConstants $data['PAGES'][0][self::SOURCE_NAME], "", true); } else { $groupfeed_url = htmlentities(B\feedsUrl("group", - $data['PAGES'][0]["GROUP_ID"], false, - $data['CONTROLLER'])). $token_string; + $data['PAGES'][0]["GROUP_ID"], true, + $data['CONTROLLER'])) . $token_string; $groupfeed_group_url = htmlentities(B\feedsUrl("group", - $data['PAGES'][0]["GROUP_ID"], true, "group")). + $data['PAGES'][0]["GROUP_ID"], true, "group")) . $token_string; $groupwiki_url = htmlentities(B\wikiUrl("Main", true, $data['CONTROLLER'],$data['PAGES'][0]["GROUP_ID"])). @@ -256,7 +256,7 @@ class GroupoptionsElement extends Element implements CrawlConstants } } else if (isset($data['JUST_GROUP_ID'])){ $groupfeed_url = htmlentities(B\feedsUrl("group", - $data['JUST_GROUP_ID'], false, $data['CONTROLLER'])). + $data['JUST_GROUP_ID'], true, $data['CONTROLLER'])). $token_string; $groupfeed_group_url = htmlentities(B\feedsUrl("group", $data['JUST_GROUP_ID'], true, "group")). diff --git a/src/views/helpers/SearchformHelper.php b/src/views/helpers/SearchformHelper.php index 74af2b6cd..b3e88e562 100644 --- a/src/views/helpers/SearchformHelper.php +++ b/src/views/helpers/SearchformHelper.php @@ -106,6 +106,7 @@ class SearchformHelper extends Helper "$label</label>"); e($item_sep); $out_name = $name; + $out_id_name = $name; if ($postfix != "") { $out_name = $name . "_$postfix"; $out_id_name = $name . "-$postfix";