swapping sitepages for externalpages since the external pages is easier to integrate into 1.8 . sitepages needs more work before it is ready for release (plus we would need an upgrade script)

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

14 files changed, 0 insertions, 394 deletions

diff --git a/mod/sitepages/views/default/admin/site/sitepages.php b/mod/sitepages/views/default/admin/site/sitepages.php
deleted file mode 100644
index c323eb875..000000000
--- a/mod/sitepages/views/default/admin/site/sitepages.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Settings Site Pages
- *
- * @package SitePages
- */
-
-$page_type = 'front';
-if (isset($vars['page'][2])) {
-	$page_type = $vars['page'][2];
-}
-
-echo sitepages_get_edit_section_content($page_type, $vars['entity']);
diff --git a/mod/sitepages/views/default/canvas/layouts/frontpage.php b/mod/sitepages/views/default/canvas/layouts/frontpage.php
deleted file mode 100644
index bef8b8396..000000000
--- a/mod/sitepages/views/default/canvas/layouts/frontpage.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php

-

-?>

-<div id="elgg-content" class="clearfix">

-	<div id="elgg-sidebar" class="frontpage">

-		<?php 

-			if (isset($vars['area2'])) echo $vars['area2']; 

-			if (isset($vars['area3'])) echo $vars['area3'];	

-		?>

-	</div>

-	

-	<div id="elgg-page-contents" class="frontpage clearfix">

-		<?php 

-			if (isset($vars['area1'])) echo $vars['area1'];

-		?>

-	</div>

-</div>

diff --git a/mod/sitepages/views/default/sitepages/css.php b/mod/sitepages/views/default/sitepages/css.php
deleted file mode 100644
index 0034e2fba..000000000
--- a/mod/sitepages/views/default/sitepages/css.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php

-/**

- * Sitepages CSS

- */

-?>

-#elgg-sidebar.frontpage {

-	margin-top:0;

-}

-#elgg-sidebar.frontpage .sitepages_sidebar_object {

-	margin-bottom: 30px;

-}

-#elgg-sidebar.frontpage .sitepages_sidebar_object h3 {

-	margin-top:12px;

-}

-#elgg-page-contents.frontpage .sitepages_welcome {

-	margin-bottom: 20px;

-}

-#elgg-page-contents.frontpage .sitepages_message {

-	margin-top: 10px;

-}
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/custom_frontpage.php b/mod/sitepages/views/default/sitepages/custom_frontpage.php
deleted file mode 100644
index 95310e1e5..000000000
--- a/mod/sitepages/views/default/sitepages/custom_frontpage.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Custom front page.
- * This is in a view so we can parse it for keywords.
- *
- * @package SitePages
- */
-
-$sitepage = sitepages_get_sitepage_object('front');
-
-if ($sitepage) {
-	if (elgg_get_logged_in_user_guid()) {
-		echo $sitepage->logged_in_content;
-	} else {
-		echo $sitepage->logged_out_content;
-	}
-}
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/forms/edit.php b/mod/sitepages/views/default/sitepages/forms/edit.php
deleted file mode 100644
index 83373ad80..000000000
--- a/mod/sitepages/views/default/sitepages/forms/edit.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Edit non front or SEO site pages.
- *
- * @package Elggsitepages
- *
- */
-
-$page_type = $vars['page_type'];
-
-if ($sitepages_object = sitepages_get_sitepage_object($page_type)) {
-		$tags = $sitepages_object->tags;
-		$description = $sitepages_object->description;
-		$guid = $sitepages_object->getGUID();
-} else {
-	$tags = array();
-	$description = '';
-	$guid = '';
-}
-
-// set the required form variables
-$input_area = elgg_view('input/longtext', array(
-	'internalname' => 'sitepages_content',
-	'value' => $description
-));
-$tag_input = elgg_view('input/tags', array(
-	'internalname' => 'sitepages_tags',
-	'value' => $tags
-));
-
-$hidden_value = elgg_view('input/hidden', array(
-	'internalname' => 'page_type',
-	'value' => $page_type
-));
-
-$tag_label = elgg_echo('tags');
-$external_page_title = elgg_echo("sitepages:$page_type");
-
-$form_body = <<<___EOT
-
-<p><label>$external_page_title
-$input_area</p></label>
-
-<p><label>$tag_label
-$tag_input</p></label>
-
-$hidden_value
-
-___EOT;
-
-echo $form_body;
diff --git a/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php b/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php
deleted file mode 100644
index c01c13f23..000000000
--- a/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php

-/**

- * Edit form for the custom front page

- *

- * @package SitePages

- */

-

-if($sitepages_object = sitepages_get_sitepage_object('frontsimple')){

-	$welcometitle = $sitepages_object->welcometitle;

-	$welcomemessage = $sitepages_object->welcomemessage;

-	$sidebartitle = $sitepages_object->sidebartitle;

-	$sidebarmessage = $sitepages_object->sidebarmessage;

-}else{

-	$welcometitle = '';

-	$welcomemessage = '';

-	$sidebartitle = '';

-	$sidebarmessage = '';

-}

-	

-

-// set the required form variables

-$welcometitle_form = elgg_view('input/text', array(

-	'internalname' => 'welcometitle',

-	'value' => $welcometitle

-));

-$welcomemessage_form = elgg_view('input/longtext', array(

-	'internalname' => 'welcomemessage',

-	'value' => $welcomemessage,

-	'class' => 'elgg-input-textarea monospace'

-));

-$sidebartitle_form = elgg_view('input/text', array(

-	'internalname' => 'sidebartitle',

-	'value' => $sidebartitle

-));

-$sidebarmessage_form = elgg_view('input/longtext', array(

-	'internalname' => 'sidebarmessage',

-	'value' => $sidebarmessage,

-	'class' => 'elgg-input-textarea monospace'

-));;

-

-$page_type = elgg_view('input/hidden', array(

-	'internalname' => 'page_type',

-	'value' => 'frontsimple',

-));

-

-$welcomemessage_title = elgg_echo('sitepages:welcomemessage');

-$sidebarmessage_title = elgg_echo('sitepages:sidebarmessage');

-$welcometitle_title = elgg_echo('sitepages:welcometitle');

-$sidebartitle_title = elgg_echo('sitepages:sidebartitle');

-$welcome_intro = elgg_echo('sitepages:welcomeintro');

-$sidebar_intro = elgg_echo('sitepages:sidebarintro');

-

-$ownfrontpage_message = elgg_echo('sitepages:ownfront');

-$ownfrontpage = elgg_view('input/dropdown', array(

-	'internalname' => 'params[ownfrontpage]',

-	'value' => isset($vars['entity']->ownfrontpage) ? $vars['entity']->ownfrontpage : 'no',

-	'options_values' => array(

-		'yes' => elgg_echo('option:yes'),

-		'no' => elgg_echo('option:no'),

-	),

-));

-

-//construct the form

-$form_body = <<<___EOT

-

-	<p>

-		$ownfrontpage_message

-		$ownfrontpage

-	</p>

-

-	<h2>$welcome_intro</h2>

-	<p><label>$welcometitle_title

-	$welcometitle_form</label></p>

-	<p><label>$welcomemessage_title

-	$welcomemessage_form</label></p>

-

-	<h2>$sidebar_intro</h2>

-	<p><label>$sidebartitle_title

-	$sidebartitle_form</label></p>

-	<p><label>$sidebarmessage_title

-	$sidebarmessage_form</label></p>

-	

-	$page_type

-

-___EOT;

-

-echo $form_body;

diff --git a/mod/sitepages/views/default/sitepages/forms/editmeta.php b/mod/sitepages/views/default/sitepages/forms/editmeta.php
deleted file mode 100644
index 999624153..000000000
--- a/mod/sitepages/views/default/sitepages/forms/editmeta.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Edit form for the custom meta tags and desc
- *
- * @package SitePages
- */
-
-if ($sitepages_object = sitepages_get_sitepage_object('seo')) {
-	$meta_tags = $sitepages_object->title;
-	$meta_description = $sitepages_object->description;
-} else {
-	$meta_tags = '';
-	$meta_description = '';
-}
-
-$description = elgg_echo('sitepages:metadescription');
-$input_description = elgg_view('input/plaintext', array(
-	'internalname' => 'description',
-	'value' => $meta_description
-));
-
-$metatags = elgg_echo('sitepages:metatags');
-$input_keywords = elgg_view('input/text', array(
-	'internalname' => 'metatags',
-	'value' => $meta_tags
-));
-
-$page_type = elgg_view('input/hidden', array(
-	'internalname' => 'page_type',
-	'value' => 'seo',
-));
-
-$form_body = <<<___EOT
-<p><label>$description $input_description</p></label>
-<p><label>$metatags $input_keywords</p></label>
-$page_type
-___EOT;
-
-//display the form
-echo $form_body;
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/keywords/sitestats.php b/mod/sitepages/views/default/sitepages/keywords/sitestats.php
deleted file mode 100644
index 689c2282a..000000000
--- a/mod/sitepages/views/default/sitepages/keywords/sitestats.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * Site stats
- *
- * @package SitePages
- */
-
-echo "N/A";
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/keywords/userlist.php b/mod/sitepages/views/default/sitepages/keywords/userlist.php
deleted file mode 100644
index 64c3d82ac..000000000
--- a/mod/sitepages/views/default/sitepages/keywords/userlist.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Lists users
- *
- * @package SitePages
- */
-
-$db_prefix = elgg_get_config('dbprefix');
-
-$only_with_avatars = (isset($vars['only_with_avatars'])) ? $vars['only_with_avatars'] : TRUE;
-$list_type = (isset($vars['list_type'])) ? $vars['list_type'] : 'new';
-$limit = (isset($vars['limit'])) ? $vars['limit'] : 10;
-
-$options = array(
-	'type' => 'user',
-	'limit' => $limit
-);
-
-if ($only_with_avatars == TRUE) {
-	$options['metadata_name_value_pairs'] = array('name' => 'icontime', 'operand' => '!=', 'value' => 0);
-}
-
-switch ($list_type) {
-	case 'new':
-		$options['order_by'] = 'e.time_created DESC';
-		break;
-
-	case 'online':
-		// show people with a last action of < 10 minutes.
-		$last_action = time() - 10 * 60;
-		$options['joins'] = array("JOIN {$db_prefix}users_entity ue on ue.guid = e.guid");
-		$options['wheres'] = array("ue.last_action > $last_action");
-		break;
-
-	case 'random':
-		$options['order_by'] = 'RAND()';
-		break;
-
-	default:
-		break;
-}
-
-$users = elgg_get_entities_from_metadata($options);
-
-echo elgg_view_entity_list($users, count($users), 0, $limit, FALSE, FALSE, FALSE);
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/members.php b/mod/sitepages/views/default/sitepages/members.php
deleted file mode 100644
index 9ca33064e..000000000
--- a/mod/sitepages/views/default/sitepages/members.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="sidebar_container clearfix">

-<?php

-	$newest_members = $vars['members'];

-?>

-<h3><?php echo elgg_echo('riverdashboard:recentmembers') ?></h3>

-<?php 

-	foreach($newest_members as $mem){

-		echo "<div class='entity-listing-icon'>" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'small')) . "</div>";

-	}

-?>

-</div>
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/menu.php b/mod/sitepages/views/default/sitepages/menu.php
deleted file mode 100644
index aed424af7..000000000
--- a/mod/sitepages/views/default/sitepages/menu.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Displays the tabbed menu for editing site pages.
- *
- * @package SitePages
- */
-
-$page_type = $vars['page_type'];
-$url = elgg_get_site_url()."pg/admin/plugin_settings/sitepages/";
-?>
-
-<div class="elgg-tabs margin-top">
-<ul>
-<?php
-	// @todo let users be able to add static content pages.
-	$pages = array('front', 'about', 'terms', 'privacy', 'seo');
-
-	foreach ($pages as $page) {
-		$selected = ($page_type == $page) ? 'class = "selected"' : '';
-		echo "<li $selected><a href=\"$url$page\">" . elgg_echo("sitepages:$page") . "</a></li>";
-	}
-?>
-</ul>
-</div>
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/metatags.php b/mod/sitepages/views/default/sitepages/metatags.php
deleted file mode 100644
index 6213dde52..000000000
--- a/mod/sitepages/views/default/sitepages/metatags.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Add any additional defined metatags or CSS.
- *
- * @package SitePages
- */
-
-$meta_details = sitepages_get_sitepage_object('seo');
-
-if ($meta_details) {
-	$metatags = $meta_details->title;
-	$description = $meta_details->description;
-
-	echo <<<___END
-
-	<meta name="description" content="$description" />
-	<meta name="keywords" content="$metatags" />
-
-___END;
-}
-
-// only show on the custom front page.
-if (elgg_get_context() == 'sitepages:front') {
-	$custom_css = sitepages_get_sitepage_object('front');
-
-	if ($custom_css && $custom_css->css) {
-		echo <<<___END
-
-		<style type="text/css">
-		{$custom_css->css}
-		</style>
-
-___END;
-	}
-}
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/sidebar.php b/mod/sitepages/views/default/sitepages/sidebar.php
deleted file mode 100644
index 8326a3087..000000000
--- a/mod/sitepages/views/default/sitepages/sidebar.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php

-/**

- * Admin welcome message

- **/

-

-$sitepages_object = sitepages_get_sitepage_object('frontsimple');

-$sidebartitle = $sitepages_object->sidebartitle;

-$sidebarmessage = $sitepages_object->sidebarmessage;

- 

-if($sidebarmessage){

-	echo "<div class='sidebar_container clearfix'><h3>" . $sidebartitle . "</h3>";

-	echo $sidebarmessage ."</div>";

-}
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/welcome.php b/mod/sitepages/views/default/sitepages/welcome.php
deleted file mode 100644
index 584dd1c0b..000000000
--- a/mod/sitepages/views/default/sitepages/welcome.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php

-/**

- * Admin welcome message

- **/

- 

-$sitepages_object = sitepages_get_sitepage_object('frontsimple');

-$welcometitle = $sitepages_object->welcometitle;

-$welcomemessage = $sitepages_object->welcomemessage;

-

-if($welcomemessage){

-	echo "<div class='sitepages_welcome clearfix'><h2>" . $welcometitle . "</h2>";

-	echo "<div class='sitepages_message clearfix'>".$welcomemessage."</div></div>";

-}
\ No newline at end of file