more clean up of the pages plugin to use new HTML/CSS

git-svn-id: http://code.elgg.org/elgg/trunk@7898 36083f99-b078-4883-b0ff-0f9b5a30f544

8 files changed, 99 insertions, 165 deletions

diff --git a/mod/pages/views/default/pages/css.php b/mod/pages/views/default/pages/css.php
index 48991b904..245c39b47 100644
--- a/mod/pages/views/default/pages/css.php
+++ b/mod/pages/views/default/pages/css.php
@@ -6,6 +6,11 @@
  */
 ?>
 
+.pages-nav .elgg-child-menu {
+	display: none;
+	margin-left: 15px;
+}
+
 .treeview, .treeview ul {
 	padding: 0;
 	margin: 0;
diff --git a/mod/pages/views/default/pages/group_module.php b/mod/pages/views/default/pages/group_module.php
new file mode 100644
index 000000000..2e6b7f6ec
--- /dev/null
+++ b/mod/pages/views/default/pages/group_module.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Group pages
+ *
+ * @package ElggPages
+ */
+
+
+$group = elgg_get_page_owner();
+
+if ($group->pages_enable == "no") {
+	return true;
+}
+
+$all_link = elgg_view('output/url', array(
+	'href' => "pg/pages/group/$group->guid/owner",
+	'text' => elgg_echo('link:view:all'),
+));
+
+$header = "<span class=\"group-widget-viewall\">$all_link</span>";
+$header .= '<h3>' . elgg_echo('pages:group') . '</h3>';
+
+
+elgg_push_context('widgets');
+$options = array(
+	'type' => 'object',
+	'subtype' => 'page_top',
+	'container_guid' => elgg_get_page_owner_guid(),
+	'limit' => 6,
+	'full_view' => false,
+	'pagination' => false,
+);
+$content = elgg_list_entities($options);
+elgg_pop_context();
+
+if (!$content) {
+	$content = '<p>' . elgg_echo('pages:none') . '</p>';
+}
+
+$new_link = elgg_view('output/url', array(
+	'href' => "pg/pages/add/$group->guid",
+	'text' => elgg_echo('pages:add'),
+));
+$content .= "<span class='elgg-widget-more'>$new_link</span>";
+
+
+$params = array(
+	'header' => $header,
+	'body' => $content,
+);
+echo elgg_view('layout/objects/module', $params);
diff --git a/mod/pages/views/default/pages/groupprofile_pages.php b/mod/pages/views/default/pages/groupprofile_pages.php
deleted file mode 100644
index 8069cdd8b..000000000
--- a/mod/pages/views/default/pages/groupprofile_pages.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Page icon override medium
- *
- * @package ElggPages
- */
-
-//check to make sure this group forum has been activated
-if ($vars['entity']->pages_enable != 'no') {
-?>
-
-<div id="group_pages_widget">
-<h2><?php echo elgg_echo("pages:groupprofile"); ?></h2>
-<?php
-
-	$objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => 5, 'full_view' => FALSE));
-
-	if($objects)
-		echo $objects;
-	else
-		echo "<div class=\"forum_latest\">" . elgg_echo("pages:nogroup") . "</div>";
-
-?>
-<br class="clearfloat" />
-</div>
-
-<?php
-	}
diff --git a/mod/pages/views/default/pages/icon.php b/mod/pages/views/default/pages/icon.php
new file mode 100644
index 000000000..fd084bca7
--- /dev/null
+++ b/mod/pages/views/default/pages/icon.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Page icon
+ *
+ * @package ElggPages
+ *
+ * @uses $vars['entity']
+ * @uses $vars['annotation']
+ */
+
+$annotation = $vars['annotation'];
+$entity = get_entity($annotation->entity_guid);
+
+// Get size
+if (!in_array($vars['size'], array('small','medium','large','tiny','master','topbar'))) {
+	$vars['size'] = "medium";
+}
+
+if (!empty($vars['align'])) {
+	$align = " align=\"{$vars['align']}\" ";
+} else {
+	$align = "";
+}
+
+?>
+
+<a href="<?php echo $annotation->getURL(); ?>"><img src="<?php echo $entity->getIcon($vars['size']); ?>" <?php echo $align; ?> /></a>
diff --git a/mod/pages/views/default/pages/pagegallery.php b/mod/pages/views/default/pages/pagegallery.php
deleted file mode 100644
index 0dadb63c2..000000000
--- a/mod/pages/views/default/pages/pagegallery.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Elgg Pages gallery listing.
- *
- * @package ElggPages
- */
-
-$icon = elgg_view(
-		"graphics/icon", array(
-		'entity' => $vars['entity'],
-		'size' => 'medium',
-	)
-);
-
-$info = "<div><p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->title . "</a></b></p></div>";
-
-$latest = $vars['entity']->getAnnotations('page', 1, 0, 'desc');
-if ($latest) {
-	$latest = $latest[0];
-
-	$time_updated = $latest->time_created;
-	$owner_guid = $latest->owner_guid;
-	$owner = get_entity($owner_guid);
-
-
-	$info .= "<br /><div>".
-		strip_tags(substr($latest->value, 0, 100))
-	. "</div>";
-}
-
-echo elgg_view_listing($icon, $info);
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/pagelisting.php b/mod/pages/views/default/pages/pagelisting.php
deleted file mode 100644
index b5034313f..000000000
--- a/mod/pages/views/default/pages/pagelisting.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Elgg Pages flat listing
- *
- * @package ElggPages
- */
-
-$icon = elgg_view(
-		"graphics/icon", array(
-		'entity' => $vars['entity'],
-		'size' => 'small',
-	)
-	);
-
-$info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->title . "</a></b></p>";
-
-$latest = $vars['entity']->getAnnotations('page', 1, 0, 'desc');
-if ($latest) {
-	$latest = $latest[0];
-
-	$time_updated = $latest->time_created;
-	$owner_guid = $latest->owner_guid;
-	$owner = get_entity($owner_guid);
-
-
-	$info .= "<p class=\"owner_timestamp\">" . elgg_echo("pages:strapline",
-					array(elgg_view_friendly_time($time_updated),
-					"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
-	)) . "</p>";
-}
-
-echo elgg_view_listing($icon, $info);
diff --git a/mod/pages/views/default/pages/pageprofile.php b/mod/pages/views/default/pages/pageprofile.php
deleted file mode 100644
index f8399556a..000000000
--- a/mod/pages/views/default/pages/pageprofile.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Elgg Pages profile
- *
- * @package ElggPages
- */
-
-// Output body
-$entity = $vars['entity'];
-
-$rev = (int)get_input('rev');
-
-if ($rev) {
-	$latest = get_annotation($rev);
-} else {
-	$latest = $entity->getAnnotations('page', 1, 0, 'desc');
-	if ($latest) $latest = $latest[0];
-}
-?>
-<div class="contentWrapper">
-	<div id="pages_page">
-
-	<?php
-	if ($entity) {
-		echo elgg_view('output/longtext', array('value' => /*$entity->description*/ $latest->value));
-
-		$tags = $vars['entity']->tags;
-		if (!empty($tags)) {
-
-	?>
-		<!-- display tags -->
-		<p class="tags">
-			<?php
-
-				echo elgg_view('output/tags', array('tags' => $tags));
-
-			?>
-		</p>
-
-	<?php
-
-		}
-		$cats = elgg_view('categories/view',$vars);
-		if (!empty($cats)) {
-
-	?>
-		<p class="categories">
-			<?php echo $cats; ?>
-		</p>
-	<?php
-
-		}
-	}
-
-	// last edit & by whome
-	?>
-
-	<p class="strapline">
-		<?php
-
-			$time_updated = $latest->time_created;
-			$owner_guid = $latest->owner_guid;
-			$owner = get_entity($owner_guid);
-
-			echo elgg_echo("pages:strapline",
-							array(elgg_view_friendly_time($time_updated),
-							"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
-			));
-
-		?>
-	</p>
-	</div>
-
-</div>
diff --git a/mod/pages/views/default/pages/sidebar/navigation.php b/mod/pages/views/default/pages/sidebar/navigation.php
new file mode 100644
index 000000000..ddd931dab
--- /dev/null
+++ b/mod/pages/views/default/pages/sidebar/navigation.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Navigation menu for a user's or a group's pages
+ */
+
+$title = elgg_echo('pages:navigation');
+
+pages_register_navigation_tree(elgg_get_page_owner());
+
+$content = elgg_view_menu('pages_nav', array('class' => 'pages-nav'));
+
+echo elgg_view('layout/objects/module', array(
+	'title' => $title,
+	'body' => $content,
+	'class' => 'elgg-aside-module',
+));