diff --git a/controllers/group_controller.php b/controllers/group_controller.php index 886e796f6..b1f9204ad 100644 --- a/controllers/group_controller.php +++ b/controllers/group_controller.php @@ -222,6 +222,7 @@ class GroupController extends Controller implements CrawlConstants "num" => 'int', "page_id" => 'int', "show" => 'int', + "diff" => 'int', "diff1" => 'int', "diff2" => 'int', "revert" => 'int' @@ -316,12 +317,13 @@ class GroupController extends Controller implements CrawlConstants "<a href='$history_link'>". tl("group_controller_back") . "</a></div>". tl("group_controller_history_page", - $data["PAGE_NAME"], date("r", $show)) . + $data["PAGE_NAME"], date("c", $show)) . "</div>" . $parsed_page; $data["DISCUSS_THREAD"] = $page_info["DISCUSS_THREAD"]; } - } else if(isset($diff1) && isset($diff2)) { + } else if(isset($diff) && $diff && + isset($diff1) && isset($diff2)) { $page_info1 = $group_model->getHistoryPage( $page_id, $diff1); $page_info2 = $group_model->getHistoryPage( @@ -349,8 +351,8 @@ class GroupController extends Controller implements CrawlConstants "<a href='$history_link'>". tl("group_controller_back") . "</a></div>". tl("group_controller_diff_page", - $data["PAGE_NAME"], date("r", $diff1), - date("r", $diff2)) . + $data["PAGE_NAME"], date("c", $diff1), + date("c", $diff2)) . "</div>" . "$out_diff"; } else if(isset($revert)) { $page_info = $group_model->getHistoryPage( @@ -361,7 +363,7 @@ class GroupController extends Controller implements CrawlConstants $page_info["PAGE"], $locale_tag, tl('group_controller_page_revert_to', - date('r', $revert))); + date('c', $revert))); $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >". tl("group_controller_page_reverted"). @@ -380,6 +382,13 @@ class GroupController extends Controller implements CrawlConstants $data["HISTORY"]) = $group_model->getPageHistoryList($page_id, $limit, $num); + if((!isset($diff1) || !isset($diff2))) { + $data['diff1'] = $data["HISTORY"][0]["PUBDATE"]; + $data['diff2'] = $data["HISTORY"][0]["PUBDATE"]; + if(count($data["HISTORY"]) > 1) { + $data['diff2'] = $data["HISTORY"][1]["PUBDATE"]; + } + } } $data['page_id'] = $page_id; break; @@ -392,6 +401,9 @@ class GroupController extends Controller implements CrawlConstants if(!isset($filter)) { $filter = ""; } + if(isset($page_name)) { + $data['PAGE_NAME'] = $page_name; + } $data["LIMIT"] = $limit; $data["RESULTS_PER_PAGE"] = $num; $data["FILTER"] = $filter; diff --git a/css/search.css b/css/search.css index 818842e7f..3594abe20 100755 --- a/css/search.css +++ b/css/search.css @@ -1876,7 +1876,7 @@ div.group-result font-size: 16pt; max-width: 9in; min-height: 6in; - min-width: 8.5in; + min-width: 9in; padding-left: 0.1in; padding-right: 0.1in; padding-bottom: 0.1in; diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini index c14e0f888..f8e4cef4d 100755 --- a/locale/ar/configure.ini +++ b/locale/ar/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "تمرير الاختيار." ; system_component.php line: 1041 system_component_using_local_config = "استخدام configs/local_config.php حتى تغيير دليل العمل أعلاه قد لا تعمل." ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/bn/configure.ini b/locale/bn/configure.ini index 5fa1a29aa..4ad624a65 100755 --- a/locale/bn/configure.ini +++ b/locale/bn/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/de/configure.ini b/locale/de/configure.ini index f51950771..acddf5c64 100755 --- a/locale/de/configure.ini +++ b/locale/de/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index f84415774..9f996ce9e 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "Check Passed." ; system_component.php line: 1041 system_component_using_local_config = "Using configs/local_config.php so changing work directory above may not work." ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "Missing Fields!" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "Page Saved!" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "Back" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "Historical Version of %s from %s." ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "Back" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "%s line differences between %s and %s." ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "Revert to %s." ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "Page Reverted!" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "Error Reverting Page!" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "Main" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "Comment" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "Start New Thread" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "Edit" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "Delete" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = " (%s posts)" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "Comment" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "Start New Thread" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "Add a Comment" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "Save" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "Start New Thread" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "Subject" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "Post" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "Save" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "Edit Post" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "Subject" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "Post" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "Save" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "Group Feeds No Longer Updating!" ; ; machinelog_element.php line: 61 @@ -3337,10 +3337,10 @@ wiki_element_savebutton = "Save" wiki_view_wiki_page_list = "%s Group Wiki Page List" ; ; wiki_view.php line: 290 -wiki_view_filter_or_create = "Search through group pages by title" +wiki_view_filter_or_create = "Search group page titles" ; ; wiki_view.php line: 293 -wiki_element_search = "Go" +wiki_element_go = "Go" ; ; wiki_view.php line: 297 wiki_view_create_page = "Create Page: %s" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "Create Page: %s" ; wiki_view.php line: 334 wiki_view_back = "Back" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "Cur" +; wiki_view.php line: 349 +wiki_view_difference = "Difference:" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "Next" +; wiki_view.php line: 355 +wiki_view_go = "Go" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "Cur" +; wiki_view.php line: 373 +wiki_view_diff_first = "First" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "Next" +; wiki_view.php line: 376 +wiki_view_diff_second = "Second" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "Edited by %s. " ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "(%s bytes)." ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "Revert" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "Revert" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/es/configure.ini b/locale/es/configure.ini index 42b77bc82..4e85c9a03 100755 --- a/locale/es/configure.ini +++ b/locale/es/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "Entrada Aprobada" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/fa/configure.ini b/locale/fa/configure.ini index 0c0b71772..06835c89b 100755 --- a/locale/fa/configure.ini +++ b/locale/fa/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "در بررسی مشکلی پیدا نشد." ; system_component.php line: 1041 system_component_using_local_config = "از configs/local_config.php استفاده می‌شود، بنابراین ممکن است تغییر بالا عمل نکند." ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index ec57caebc..619a7a888 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/he/configure.ini b/locale/he/configure.ini index 375a1fe29..fba5c3056 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini index 7beb1dfb5..31ab5ce99 100755 --- a/locale/hi/configure.ini +++ b/locale/hi/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index 31622344f..f76318f1a 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/it/configure.ini b/locale/it/configure.ini index 5d16b9360..b9094ca66 100755 --- a/locale/it/configure.ini +++ b/locale/it/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "Controllo passato." ; system_component.php line: 1041 system_component_using_local_config = "Usando configs/local_config.php la Cartella di Lavoro sopra potrebbe non funzionare." ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index 26b550c76..d10637623 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini index c3bbee022..e16adc613 100755 --- a/locale/kn/configure.ini +++ b/locale/kn/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "ಪರಿಶೀಲನೆ ತೇರ್ಗಡೆ ; system_component.php line: 1041 system_component_using_local_config = "configs/local_config.php ಉಪಯೋಗದಲ್ಲಿದೆ, ಅದರಿಂದ ಮೇಲಿನ ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ಬದಲಾವಣೆ ನಿಷ್ಕ್ರಿಯವಾಗಬಹುದು " ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index e091dcfe0..9f032f3c7 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini index e66618667..38b0733b2 100755 --- a/locale/pl/configure.ini +++ b/locale/pl/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini index 580e565f3..ce5e91b11 100755 --- a/locale/pt/configure.ini +++ b/locale/pt/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini index 126968c40..e1e5baa53 100755 --- a/locale/ru/configure.ini +++ b/locale/ru/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/te/configure.ini b/locale/te/configure.ini index 9b3514707..bd8cc0f8f 100755 --- a/locale/te/configure.ini +++ b/locale/te/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/te/statistics.txt b/locale/te/statistics.txt index fe8cd74a8..b046d72ad 100755 --- a/locale/te/statistics.txt +++ b/locale/te/statistics.txt @@ -1 +1 @@ -d:7; \ No newline at end of file +d:6; \ No newline at end of file diff --git a/locale/th/configure.ini b/locale/th/configure.ini index 492ea49aa..0bcc62fb5 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini index 5076229be..b59ca4d2a 100755 --- a/locale/tr/configure.ini +++ b/locale/tr/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index e3d8788dc..fe2c66031 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "Kiểm tra được thông qua" ; system_component.php line: 1041 system_component_using_local_config = "" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index dcc72b280..9b4388107 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -1011,34 +1011,34 @@ system_component_check_passed = "通過檢查" ; system_component.php line: 1041 system_component_using_local_config = "使用當地語言" ; -; group_controller.php line: 272 +; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 280 +; group_controller.php line: 281 group_controller_page_saved = "" ; -; group_controller.php line: 316 +; group_controller.php line: 317 group_controller_back = "" ; -; group_controller.php line: 317 +; group_controller.php line: 318 group_controller_history_page = "" ; -; group_controller.php line: 349 +; group_controller.php line: 351 group_controller_back = "" ; -; group_controller.php line: 350 +; group_controller.php line: 352 group_controller_diff_page = "" ; -; group_controller.php line: 362 +; group_controller.php line: 364 group_controller_page_revert_to = "" ; -; group_controller.php line: 366 +; group_controller.php line: 368 group_controller_page_reverted = "" ; -; group_controller.php line: 371 +; group_controller.php line: 373 group_controller_revert_error = "" ; -; group_controller.php line: 419 +; group_controller.php line: 428 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1789,52 +1789,52 @@ groupfeed_element_comment = "" ; groupfeed_element.php line: 147 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 173 +; groupfeed_element.php line: 174 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 178 +; groupfeed_element.php line: 179 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 190 +; groupfeed_element.php line: 191 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 214 +; groupfeed_element.php line: 215 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 221 +; groupfeed_element.php line: 222 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 295 +; groupfeed_element.php line: 296 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 300 +; groupfeed_element.php line: 301 groupfeed_element_save = "" ; -; groupfeed_element.php line: 327 +; groupfeed_element.php line: 328 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 330 +; groupfeed_element.php line: 331 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 336 +; groupfeed_element.php line: 337 groupfeed_element_post = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 342 groupfeed_element_save = "" ; -; groupfeed_element.php line: 371 +; groupfeed_element.php line: 372 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 374 +; groupfeed_element.php line: 375 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 379 +; groupfeed_element.php line: 380 groupfeed_element_post = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 386 groupfeed_element_save = "" ; -; groupfeed_element.php line: 414 +; groupfeed_element.php line: 415 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -3340,7 +3340,7 @@ wiki_view_wiki_page_list = "" wiki_view_filter_or_create = "" ; ; wiki_view.php line: 293 -wiki_element_search = "" +wiki_element_go = "" ; ; wiki_view.php line: 297 wiki_view_create_page = "" @@ -3348,28 +3348,28 @@ wiki_view_create_page = "" ; wiki_view.php line: 334 wiki_view_back = "" ; -; wiki_view.php line: 347 -wiki_view_diff_current = "" +; wiki_view.php line: 349 +wiki_view_difference = "" ; -; wiki_view.php line: 348 -wiki_view_diff_next = "" +; wiki_view.php line: 355 +wiki_view_go = "" ; -; wiki_view.php line: 353 -wiki_view_diff_current = "" +; wiki_view.php line: 373 +wiki_view_diff_first = "" ; -; wiki_view.php line: 356 -wiki_view_diff_next = "" +; wiki_view.php line: 376 +wiki_view_diff_second = "" ; -; wiki_view.php line: 362 +; wiki_view.php line: 381 wiki_view_edited_by = "" ; -; wiki_view.php line: 366 +; wiki_view.php line: 385 wiki_view_page_len = "" ; -; wiki_view.php line: 368 +; wiki_view.php line: 387 wiki_view_revert = "" ; -; wiki_view.php line: 371 +; wiki_view.php line: 390 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/models/group_model.php b/models/group_model.php index bbb6d3fb3..aa5e27b59 100644 --- a/models/group_model.php +++ b/models/group_model.php @@ -656,7 +656,7 @@ class GroupModel extends Model MIN(G.OWNER_ID) AS OWNER_ID, MIN(G.MEMBER_ACCESS) AS MEMBER_ACCESS, MIN(G.GROUP_NAME) AS GROUP_NAME, MIN(P.USER_NAME) AS USER_NAME, - MIN(P.USER_ID) AS USER_ID "; + MIN(P.USER_ID) AS USER_ID, MIN(GI.TYPE) AS TYPE"; } else { $group_by = ""; $select = "SELECT DISTINCT GI.ID AS ID, @@ -665,7 +665,7 @@ class GroupModel extends Model GI.PUBDATE AS PUBDATE, G.OWNER_ID AS OWNER_ID, G.MEMBER_ACCESS AS MEMBER_ACCESS, G.GROUP_NAME AS GROUP_NAME, P.USER_NAME AS USER_NAME, - P.USER_ID AS USER_ID "; + P.USER_ID AS USER_ID, GI.TYPE AS TYPE "; } $sql = "$select FROM GROUP_ITEM GI, GROUPS G, USER_GROUP UG, USERS P diff --git a/views/elements/groupfeed_element.php b/views/elements/groupfeed_element.php index 6e1488345..1298268f3 100644 --- a/views/elements/groupfeed_element.php +++ b/views/elements/groupfeed_element.php @@ -165,7 +165,8 @@ class GroupfeedElement extends Element implements CrawlConstants if($page["MEMBER_ACCESS"] == GROUP_READ_WRITE && $page['USER_ID'] != "" && isset($_SESSION['USER_ID']) && ($page['USER_ID'] == $_SESSION['USER_ID'] || - $_SESSION['USER_ID'] == ROOT_ID)) { + $_SESSION['USER_ID'] == ROOT_ID) && + $page['TYPE'] != WIKI_GROUP_ITEM) { ?> <div class="float-opposite" ><?php if(!isset($page['NO_EDIT'])) { diff --git a/views/wiki_view.php b/views/wiki_view.php index 5237f0a18..6cd64025c 100644 --- a/views/wiki_view.php +++ b/views/wiki_view.php @@ -81,7 +81,7 @@ class WikiView extends View if($data["MODE"] == $name) { ?> <li class="outer"><b><?php e($translation); ?></b></li> <?php - } else if($data["MODE"] == "pages") { ?> + } else if(!isset($data["PAGE_NAME"]) || $data["PAGE_NAME"]=="") { ?> <li class="outer"><span class="gray"><?php e($translation); ?></span></li> <?php @@ -291,7 +291,7 @@ class WikiView extends View placeholder="<?php e(tl("wiki_view_filter_or_create")); ?>" value="<?php e($data['FILTER'])?>" /> <button class="button-box" type="submit"><?php - e(tl('wiki_element_search')); ?></button> + e(tl('wiki_element_go')); ?></button> </form> <?php if($data["FILTER"] != "") { @@ -333,6 +333,32 @@ class WikiView extends View '&arg=edit&a=wiki&page_name='. $data['PAGE_NAME']); ?>"><?php e(tl("wiki_view_back")); ?></a></div> + <?php + if(count($data['HISTORY']) > 1) { ?> + <div> + <form id="differenceForm" method="get" action='#'> + <input type="hidden" name="c" value="group" /> + <input type="hidden" name="<?php e(CSRF_TOKEN); ?>" value="<?php + e($data[CSRF_TOKEN]); ?>" /> + <input type="hidden" name="a" value="wiki" /> + <input type="hidden" name="arg" value="history" /> + <input type="hidden" name="group_id" value="<?php + e($data['GROUP']['GROUP_ID']); ?>" /> + <input type="hidden" name="page_id" value="<?php + e($data["page_id"]); ?>" /> + <input type="hidden" name="diff" value="1" /> + <b><?php e(tl('wiki_view_difference')); ?></b> + <input type="text" id="diff-1" name="diff1" + value="<?php e($data['diff1']); ?>" /> - + <input type="text" id="diff-2" name="diff2" + value="<?php e($data['diff2']); ?>" /> + <button class="button-box" type="submit"><?php + e(tl('wiki_view_go')); ?></button> + </form> + </div> + <?php + } + ?> <div> </div> <?php $time = time(); @@ -344,22 +370,23 @@ class WikiView extends View ?> <div class='group-result'> <?php - if($first && $data['LIMIT'] == 0) { ?> - (<b><?php e(tl("wiki_view_diff_current")); - ?></b>| <b><?php e(tl("wiki_view_diff_next")); ?></b>) + if(count($data['HISTORY']) > 1) { ?> + (<a href="javascript:updateFirst('<?php + e($item['PUBDATE']); ?>');" ><?php + e(tl("wiki_view_diff_first")); + ?></a> | <a href="javascript:updateSecond('<?php + e($item['PUBDATE']);?>');" ><?php + e(tl("wiki_view_diff_second")); + ?></a>) <?php } else { ?> - (<a href="<?php e($base_query.'&diff2='. - $current."&diff1=".$item['PUBDATE']);?>" ><?php - e(tl("wiki_view_diff_current")); - ?></a> | <a href="<?php e($base_query.'&diff2='. - $next."&diff1=".$item['PUBDATE']);?>" ><?php - e(tl("wiki_view_diff_next")); - ?></a>) + (<b><?php e(tl("wiki_view_diff_first")); + ?></b> | <b><?php e(tl("wiki_view_diff_second")); + ?></b>) <?php } e("<a href='$base_query&show={$item['PUBDATE']}'>" . - date("r",$item["PUBDATE"])."</a>. <b>{$item['PUBDATE']}</b>. "); + date("c",$item["PUBDATE"])."</a>. <b>{$item['PUBDATE']}</b>. "); e(tl("wiki_view_edited_by", $item["USER_NAME"])); if(strlen($item["EDIT_REASON"]) > 0) { e("<i>{$item["EDIT_REASON"]}</i>. "); @@ -383,6 +410,16 @@ class WikiView extends View $data['LIMIT'], $data['RESULTS_PER_PAGE'], $data['TOTAL_ROWS']); ?> </div> + <script type="text/javascript"> + function updateFirst(val) + { + elt('diff-1').value=val; + } + function updateSecond(val) + { + elt('diff-2').value=val; + } + </script> <?php } }