Refs #1334. Move the page parent input to pages/input/parent.

3 files changed, 14 insertions, 6 deletions

diff --git a/mod/pages/actions/pages/edit.php b/mod/pages/actions/pages/edit.php
index 29fbf022b..40215e02e 100644
--- a/mod/pages/actions/pages/edit.php
+++ b/mod/pages/actions/pages/edit.php
@@ -72,7 +72,7 @@ if (sizeof($input) > 0) {
 $page->container_guid = $container_guid;
 
 if ($parent_guid && $parent_guid != $page_guid) {
-	// Check if parent isn't below of the page in the tree
+	// Check if parent isn't below the page in the tree
 	if ($page_guid) {
 		$tree_page = get_entity($parent_guid);
 		while ($tree_page->parent_guid > 0 && $page_guid != $tree_page->guid) {
diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php
index 653a7ee47..e14ff19ec 100644
--- a/mod/pages/views/default/forms/pages/edit.php
+++ b/mod/pages/views/default/forms/pages/edit.php
@@ -18,10 +18,18 @@ foreach ($variables as $name => $type) {
 	if (($type == 'access' || $type == 'write_access') && !$can_change_access) {
 		continue;
 	}
+	
 	// don't show parent picker input for top or new pages.
 	if ($name == 'parent_guid' && (!$vars['parent_guid'] || !$vars['guid'])) {
 		continue;
 	}
+
+	if ($type == 'parent') {
+		$input_view = "pages/input/$type";
+	} else {
+		$input_view = "input/$type";
+	}
+
 ?>
 <div>
 	<label><?php echo elgg_echo("pages:$name") ?></label>
@@ -30,7 +38,7 @@ foreach ($variables as $name => $type) {
 			echo '<br />';
 		}
 
-		echo elgg_view("input/$type", array(
+		echo elgg_view($input_view, array(
 			'name' => $name,
 			'value' => $vars[$name],
 			'entity' => ($name == 'parent_guid') ? $vars['entity'] : null,
diff --git a/mod/pages/views/default/input/parent.php b/mod/pages/views/default/pages/input/parent.php
index f354129fe..c5ee3c3fb 100644
--- a/mod/pages/views/default/input/parent.php
+++ b/mod/pages/views/default/pages/input/parent.php
@@ -2,10 +2,10 @@
 /**
  * Parent picker
  *
- * @uses $vars['value'] The current value, if any
+ * @uses $vars['value']          The current value, if any
  * @uses $vars['options_values']
- * @uses $vars['name'] The name of the input field
- * @uses $vars['entity'] Optional. The child entity (uses container_guid)
+ * @uses $vars['name']           The name of the input field
+ * @uses $vars['entity']         Optional. The child entity (uses container_guid)
  */
 
 elgg_load_library('elgg:pages');
@@ -28,7 +28,7 @@ foreach ($pages as $page) {
 }
 
 $defaults = array(
-	'class' => 'elgg-input-parent-picker',
+	'class' => 'elgg-pages-input-parent-picker',
 	'options_values' => $options,
 );