Remove the option to hide/show pending changes. The option didn't work properly (it wasn't "sticky"), wasn't applied consistently, and was rarely used.

1 files changed, 16 insertions, 25 deletions

diff --git a/repo.php b/repo.php
index c2a6d70b28..aa42a9ae9e 100644
--- a/repo.php
+++ b/repo.php
@@ -33,31 +33,22 @@ $controller->init();
 
 if ($controller->repository && $controller->repository->canDisplayName()) {
 	print_header($controller->getPageTitle());
-	if (WT_USER_CAN_EDIT || WT_USER_CAN_ACCEPT) {
-		if ($controller->repository->isMarkedDeleted()) {
-			echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted, but the deletion needs to be reviewed by a moderator.');
-			if (WT_USER_CAN_ACCEPT) {
-				echo ' <a href="', $controller->repository->getHtmlUrl(), '&amp;action=accept">', WT_I18N::translate('Accept the changes.'), '</a>';
-				echo ' <a href="', $controller->repository->getHtmlUrl(), '&amp;action=undo">', WT_I18N::translate('Reject the changes.'), '</a>';
-			}
-			echo '</p>';
-		} elseif (find_updated_record($controller->repository->getXref(), WT_GED_ID)!==null) {
-			echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed, but the changes need to be reviewed by a moderator.');
-			if ($controller->show_changes) {
-				echo ' <a href="', $controller->repository->getHtmlUrl(), '&amp;show_changes=no">', WT_I18N::translate('Hide the changes.'), '</a>';
-				if (WT_USER_CAN_ACCEPT) {
-					echo ' <a href="', $controller->repository->getHtmlUrl(), '&amp;action=accept">', WT_I18N::translate('Accept the changes.'), '</a>';
-					echo ' <a href="', $controller->repository->getHtmlUrl(), '&amp;action=undo">', WT_I18N::translate('Reject the changes.'), '</a>';
-				}
-			} else {
-				echo ' <a href="', $controller->repository->getHtmlUrl(), '&amp;show_changes=yes">', WT_I18N::translate('Show the changes.'), '</a>';
-			}
-			echo '</p>';
-		} elseif ($controller->accept_success) {
-			echo '<p class="ui-state-highlight">', WT_I18N::translate('The changes have been accepted.'), '</p>';
-		} elseif ($controller->reject_success) {
-			echo '<p class="ui-state-highlight">', WT_I18N::translate('The changes have been rejected.'), '</p>';
+	if ($controller->repository->isMarkedDeleted()) {
+		if (WT_USER_CAN_ACCEPT) {
+			echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted.  You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> this deletion.', $controller->repository->getHtmlUrl().'&amp;action=accept', $controller->repository->getHtmlUrl().'&amp;action=undo'), '</p>';
+		} elseif (WT_USER_CAN_EDIT) {
+			echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been deleted, but the deletion needs to be reviewed by a moderator.'), '</p>';
 		}
+	} elseif (find_updated_record($controller->repository->getXref(), WT_GED_ID)!==null) {
+		if (WT_USER_CAN_ACCEPT) {
+			echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed.  You can <a href="%1$s">accept</a> or <a href="%2$s">reject</a> the changes.', $controller->repository->getHtmlUrl().'&amp;action=accept', $controller->repository->getHtmlUrl().'&amp;action=undo'), '</p>';
+		} elseif (WT_USER_CAN_EDIT) {
+			echo '<p class="ui-state-highlight">', WT_I18N::translate('This record has been changed, but the changes need to be reviewed by a moderator.'), '</p>';
+		}
+	} elseif ($controller->accept_success) {
+		echo '<p class="ui-state-highlight">', WT_I18N::translate('The changes have been accepted.'), '</p>';
+	} elseif ($controller->reject_success) {
+		echo '<p class="ui-state-highlight">', WT_I18N::translate('The changes have been rejected.'), '</p>';
 	}
 } else {
 	print_header(WT_I18N::translate('Repository'));
@@ -81,7 +72,7 @@ echo 'function show_gedcom_record() {';
 echo ' var recwin=window.open("gedrecord.php?pid=', $controller->rid, '", "_blank", "top=0, left=0, width=600, height=400, scrollbars=1, scrollable=1, resizable=1");';
 echo '}';
 echo 'function showchanges() {';
-echo ' window.location="repo.php?rid=', $controller->rid, '&show_changes=yes"';
+echo ' window.location="repo.php?rid=', $controller->rid, '"';
 echo '}';
 echo WT_JS_END;