From 0b3724c9b87f891b48c41ad61c1caf3486cc0799 Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 13 Feb 2011 23:10:18 +0000 Subject: updates externalpages to 1.8 git-svn-id: http://code.elgg.org/elgg/trunk@8209 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/externalpages/actions/add.php | 54 --------- mod/externalpages/actions/addfront.php | 48 -------- mod/externalpages/actions/edit.php | 25 ++++ mod/externalpages/index.php | 30 ----- mod/externalpages/languages/en.php | 63 ++++------ mod/externalpages/manifest.xml | 23 ++-- mod/externalpages/read.php | 35 ------ mod/externalpages/start.php | 128 +++++++++------------ .../views/default/expages/analytics.php | 21 ---- mod/externalpages/views/default/expages/css.php | 13 --- .../views/default/expages/footer_menu.php | 17 --- .../views/default/expages/forms/edit.php | 82 ------------- .../views/default/expages/forms/editfront.php | 75 ------------ .../views/default/expages/front_left.php | 23 ---- .../views/default/expages/front_right.php | 36 ------ mod/externalpages/views/default/expages/menu.php | 51 ++++++-- .../views/default/forms/expages/edit.php | 55 +++++++++ mod/externalpages/views/default/object/expages.php | 10 -- 18 files changed, 214 insertions(+), 575 deletions(-) delete mode 100644 mod/externalpages/actions/add.php delete mode 100644 mod/externalpages/actions/addfront.php create mode 100644 mod/externalpages/actions/edit.php delete mode 100644 mod/externalpages/index.php delete mode 100644 mod/externalpages/read.php delete mode 100644 mod/externalpages/views/default/expages/analytics.php delete mode 100644 mod/externalpages/views/default/expages/css.php delete mode 100644 mod/externalpages/views/default/expages/footer_menu.php delete mode 100644 mod/externalpages/views/default/expages/forms/edit.php delete mode 100644 mod/externalpages/views/default/expages/forms/editfront.php delete mode 100644 mod/externalpages/views/default/expages/front_left.php delete mode 100644 mod/externalpages/views/default/expages/front_right.php create mode 100644 mod/externalpages/views/default/forms/expages/edit.php delete mode 100644 mod/externalpages/views/default/object/expages.php diff --git a/mod/externalpages/actions/add.php b/mod/externalpages/actions/add.php deleted file mode 100644 index fed637c55..000000000 --- a/mod/externalpages/actions/add.php +++ /dev/null @@ -1,54 +0,0 @@ -subtype = $type; - // Set its owner to the current user - $expages->owner_guid = get_loggedin_userid(); - // For now, set its access to public - $expages->access_id = ACCESS_PUBLIC; - // Set its title and description appropriately - $expages->title = $type; - $expages->description = $contents; - // Before we can set metadata, save - if (!$expages->save()) { - register_error(elgg_echo("expages:error")); - forward(REFERER); - } - - // Success message - system_message(elgg_echo("expages:posted")); - // add to river - add_to_river('river/expages/create','create',get_loggedin_userid(),$expages->guid); - // Remove the cache - unset($_SESSION['expages_content']); unset($_SESSION['expagestitle']); - - - // Forward back to the page - forward("pg/expages/index.php?type={$type}"); - -?> \ No newline at end of file diff --git a/mod/externalpages/actions/addfront.php b/mod/externalpages/actions/addfront.php deleted file mode 100644 index f0a457df9..000000000 --- a/mod/externalpages/actions/addfront.php +++ /dev/null @@ -1,48 +0,0 @@ -subtype = "front"; - // Set its owner to the current user - $frontpage->owner_guid = get_loggedin_userid(); - // For now, set its access to public - $frontpage->access_id = ACCESS_PUBLIC; - // Set its title and description appropriately - $frontpage->title = $contents_left; - $frontpage->description = $contents_right; - - // Before we can set metadata, save - if (!$frontpage->save()) { - register_error(elgg_echo("expages:error")); - forward("pg/expages/index.php?type=front"); - } - - // Success message - system_message(elgg_echo("expages:posted")); - - - // Forward back to the page - forward("pg/expages/index.php?type=front"); - -?> diff --git a/mod/externalpages/actions/edit.php b/mod/externalpages/actions/edit.php new file mode 100644 index 000000000..edfffe168 --- /dev/null +++ b/mod/externalpages/actions/edit.php @@ -0,0 +1,25 @@ +subtype = $type; +$expages->owner_guid = get_loggedin_userid(); +$expages->access_id = ACCESS_PUBLIC; +$expages->title = $type; +$expages->description = $contents; +if (!$expages->save()) { + register_error(elgg_echo("expages:error")); + forward(REFERER); +} + +system_message(elgg_echo("expages:posted")); +forward(REFERER); diff --git a/mod/externalpages/index.php b/mod/externalpages/index.php deleted file mode 100644 index 78a0bb1a3..000000000 --- a/mod/externalpages/index.php +++ /dev/null @@ -1,30 +0,0 @@ - $type)); - - // Display the menu - $body = elgg_view('page_elements/contentwrapper',array('body' => elgg_view('expages/menu', array('type' => $type)).$edit)); - - // Display - page_draw(elgg_echo('expages'),elgg_view_layout("two_column_left_sidebar", '', $title . $body)); -?> \ No newline at end of file diff --git a/mod/externalpages/languages/en.php b/mod/externalpages/languages/en.php index 8d80ee9f2..1c80d5f3f 100644 --- a/mod/externalpages/languages/en.php +++ b/mod/externalpages/languages/en.php @@ -1,42 +1,27 @@ "External pages", - 'expages:frontpage' => "Frontpage", - 'expages:about' => "About", - 'expages:terms' => "Terms", - 'expages:privacy' => "Privacy", - 'expages:analytics' => "Analytics", - 'expages:contact' => "Contact", - 'expages:nopreview' => "No preview yet available", - 'expages:preview' => "Preview", - 'expages:notset' => "This page has not been set up yet.", - 'expages:lefthand' => "The lefthand information pane", - 'expages:righthand' => "The righthand information pane", - 'expages:addcontent' => "You can add content here via your admin tools. Look for the external pages link under admin.", - 'item:object:front' => 'Front page items', - - /** - * Status messages - */ - - 'expages:posted' => "Your page was successfully updated.", - 'expages:deleted' => "Your page post was successfully deleted.", - - /** - * Error messages - */ - - 'expages:deleteerror' => "There was a problem deleting the old page", - 'expages:error' => "There has been an error, please try again and if the problem persists, contact the administrator", - - ); - - add_translation("en",$english); +$english = array( -?> \ No newline at end of file + /** + * Menu items and titles + */ + 'expages' => "External pages", + 'admin:site:expages' => "External pages", + 'expages:about' => "About", + 'expages:terms' => "Terms", + 'expages:privacy' => "Privacy", + 'expages:contact' => "Contact", + + 'expages:notset' => "This page has not been set up yet.", + + /** + * Status messages + */ + 'expages:posted' => "Your page was successfully updated.", + 'expages:error' => "Unable to save this page.", +); + +add_translation("en", $english); diff --git a/mod/externalpages/manifest.xml b/mod/externalpages/manifest.xml index 3793d7803..235074276 100644 --- a/mod/externalpages/manifest.xml +++ b/mod/externalpages/manifest.xml @@ -1,10 +1,15 @@ - - - - - - - - - + + External Pages + Curverider + 1.8 + Create simple web pages for about, contact, privacy, and terms. + http://www.elgg.org/ + (C) Curverider 2008-2010 + GNU Public License version 2 + + elgg_version + 2010030101 + + advanced + \ No newline at end of file diff --git a/mod/externalpages/read.php b/mod/externalpages/read.php deleted file mode 100644 index 3faceb083..000000000 --- a/mod/externalpages/read.php +++ /dev/null @@ -1,35 +0,0 @@ - 'object', 'subtype' => $type, 'limit' => 1)); - - if($contents){ - foreach($contents as $c){ - $area1 .= elgg_view('page_elements/contentwrapper',array('body' => $c->description)); - } - }else - $area1 .= elgg_view('page_elements/contentwrapper',array('body' => elgg_echo("expages:notset"))); - - // Display through the correct canvas area - $body = elgg_view_layout("one_column", $area1); - - // Display page - page_draw($title,$body); - -?> \ No newline at end of file diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php index 33bd7e189..86d5894f7 100644 --- a/mod/externalpages/start.php +++ b/mod/externalpages/start.php @@ -1,74 +1,60 @@ wwwroot . 'pg/expages/'); - } - } - - function expages_url($expage) { - - global $CONFIG; - return $CONFIG->url . "pg/expages/"; - - } - - - function expages_page_handler($page) - { - global $CONFIG; - - if ($page[0]) - { - switch ($page[0]) - { - case "read": set_input('expages',$page[1]); - include(dirname(__FILE__) . "/read.php"); - break; - default : include($CONFIG->pluginspath . "externalpages/index.php"); - } - } - else - include($CONFIG->pluginspath . "externalpages/index.php"); +register_elgg_event_handler('init', 'system', 'expages_init'); + +function expages_init() { + + // Register a page handler, so we can have nice URLs + register_page_handler('expages', 'expages_page_handler'); + + // add a menu item for the admin edit page + elgg_add_admin_menu_item('expages', elgg_echo('expages'), 'site'); + + // add footer links + expages_setup_footer_menu(); + + // register action + $actions_base = elgg_get_plugins_path() . 'externalpages/actions'; + elgg_register_action("expages/edit", "$actions_base/edit.php", 'admin'); +} + +/** + * Setup the links to site pages + */ +function expages_setup_footer_menu() { + $pages = array('about', 'terms', 'privacy'); + foreach ($pages as $page) { + $url = "pg/expages/read/$page"; + $item = new ElggMenuItem($page, elgg_echo("expages:$page"), $url); + elgg_register_menu_item('footer', $item); + } +} + +/** + * External pages page handler + * + * @param array $page + */ +function expages_page_handler($page) { + $type = strtolower($page[1]); + + $title = elgg_echo("expages:$type"); + $content = elgg_view_title($title); + + $object = elgg_get_entities(array( + 'type' => 'object', + 'subtype' => $type, + 'limit' => 1, + )); + if ($object) { + $content .= elgg_view('output/longtext', array('value' => $object[0]->description)); + } else { + $content .= elgg_echo("expages:notset"); } - - // Initialise log browser - register_elgg_event_handler('init','system','expages_init'); - register_elgg_event_handler('pagesetup','system','expages_pagesetup'); - - // Register actions - global $CONFIG; - register_action("expages/add",false,$CONFIG->pluginspath . "externalpages/actions/add.php"); - register_action("expages/addfront",false,$CONFIG->pluginspath . "externalpages/actions/addfront.php"); - register_action("expages/edit",false,$CONFIG->pluginspath . "externalpages/actions/edit.php"); - register_action("expages/delete",false,$CONFIG->pluginspath . "externalpages/actions/delete.php"); - -?> \ No newline at end of file + + $body = elgg_view_layout("one_sidebar", array('content' => $content)); + echo elgg_view_page($title, $body); +} diff --git a/mod/externalpages/views/default/expages/analytics.php b/mod/externalpages/views/default/expages/analytics.php deleted file mode 100644 index 40f7b6a8d..000000000 --- a/mod/externalpages/views/default/expages/analytics.php +++ /dev/null @@ -1,21 +0,0 @@ - 'object', 'subtype' => 'analytics', 'limit' => 1)); - - if($contents){ - foreach($contents as $c){ - echo $c->description; - } - } - -?> - diff --git a/mod/externalpages/views/default/expages/css.php b/mod/externalpages/views/default/expages/css.php deleted file mode 100644 index 609f77f69..000000000 --- a/mod/externalpages/views/default/expages/css.php +++ /dev/null @@ -1,13 +0,0 @@ - - -/* IE6 */ -* html #front_left_tbl { width:676px !important; } -* html #front_right_tbl { width:676px !important; } \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/footer_menu.php b/mod/externalpages/views/default/expages/footer_menu.php deleted file mode 100644 index a2e1616d2..000000000 --- a/mod/externalpages/views/default/expages/footer_menu.php +++ /dev/null @@ -1,17 +0,0 @@ - - - \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/forms/edit.php b/mod/externalpages/views/default/expages/forms/edit.php deleted file mode 100644 index 1cdec4198..000000000 --- a/mod/externalpages/views/default/expages/forms/edit.php +++ /dev/null @@ -1,82 +0,0 @@ - 'object', 'subtype' => $type, 'limit' => 1)); - - if($page_contents){ - foreach($page_contents as $pc){ - $description = $pc->description; - $guid = $pc->guid; - } - }else { - $description = ""; - } - - // set the required form variables - $input_area = elgg_view('input/longtext', array('internalname' => 'expagescontent', 'value' => $description)); - $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save'))); - $hidden_value = elgg_view('input/hidden', array('internalname' => 'content_type', 'value' => $type)); - $hidden_guid = elgg_view('input/hidden', array('internalname' => 'expage_guid', 'value' => $guid)); - - //type - $type = $vars['type']; - //set the url - $url = $vars['url'] . "pg/expages/index.php?type="; - - if($type == 'about') { - $external_page_title = elgg_echo('expages:about'); - } - else if($type == 'terms') { - $external_page_title = elgg_echo('expages:terms'); - } - else if($type == 'privacy') { - $external_page_title = elgg_echo('expages:privacy'); - } - //preview link - // echo "
" . elgg_echo('expages:preview') . "
"; - - //construct the form - $form_body = <<$external_page_title -

$input_area

- $hidden_value - $hidden_guid -
- $submit_input - -EOT; -?> - "{$vars['url']}action/$action", 'body' => $form_body)); -?> - - - \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/forms/editfront.php b/mod/externalpages/views/default/expages/forms/editfront.php deleted file mode 100644 index 3e7e8c83b..000000000 --- a/mod/externalpages/views/default/expages/forms/editfront.php +++ /dev/null @@ -1,75 +0,0 @@ - 'object', 'subtype' => 'front', 'limit' => 1)); - - if($page_contents){ - foreach($page_contents as $pc){ - $description_right = $pc->description; - $description_left = $pc->title; - $guid = $pc->guid; - } - }else { - $description = ""; - } - - // set the required form variables - $input_area_left = elgg_view('input/longtext', array('internalname' => 'front_left', 'value' => $description_left)); - $input_area_right = elgg_view('input/longtext', array('internalname' => 'front_right', 'value' => $description_right)); - $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save'))); - $hidden_guid = elgg_view('input/hidden', array('internalname' => 'front_guid', 'value' => $guid)); - $lefthand = elgg_echo("expages:lefthand"); - $righthand = elgg_echo("expages:righthand"); - - //preview link - // echo ""; - - //construct the form - $form_body = <<$lefthand -

$input_area_left


-

$righthand

-

$input_area_right

- - $hidden_guid -
- $submit_input - -EOT; -?> - "{$vars['url']}action/$action", 'body' => $form_body)); -?> - - - \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/front_left.php b/mod/externalpages/views/default/expages/front_left.php deleted file mode 100644 index 14d999ead..000000000 --- a/mod/externalpages/views/default/expages/front_left.php +++ /dev/null @@ -1,23 +0,0 @@ - 'object', 'subtype' => 'front', 'limit' => 1)); - - if($contents){ - foreach($contents as $c){ - echo $c->title; // title is the left hand content - } - }else{ - echo "

" . elgg_echo("expages:addcontent") . "

"; - } - -?> - diff --git a/mod/externalpages/views/default/expages/front_right.php b/mod/externalpages/views/default/expages/front_right.php deleted file mode 100644 index ab999f890..000000000 --- a/mod/externalpages/views/default/expages/front_right.php +++ /dev/null @@ -1,36 +0,0 @@ - 'object', 'subtype' => 'front', 'limit' => 1)); - - // nothing to show so we return TRUE to indicate the view was valid - if ($contents == FALSE) { - return TRUE; - } - - $show = ''; - foreach($contents as $cont){ - $show = $cont->description; - } - - if($show != ''){ - echo "
"; - - if($contents){ - foreach($contents as $c){ - echo $c->description; - } - }else{ - echo elgg_echo("expages:addcontent"); - } - echo "
"; - } - -?> \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/menu.php b/mod/externalpages/views/default/expages/menu.php index d91418065..e471619b8 100644 --- a/mod/externalpages/views/default/expages/menu.php +++ b/mod/externalpages/views/default/expages/menu.php @@ -1,17 +1,44 @@ elgg_echo("expages:$page"), + 'url' => "pg/admin/site/expages?type=$page", + 'selected' => $page == $type, + ); +} + +echo elgg_view('navigation/tabs', array('tabs' => $tabs)); + +return true; + +/** + * Tab navigation + * + * @uses string $vars['type'] horizontal || vertical - Defaults to horizontal + * @uses string $vars['class'] Additional class to add to ul + * @uses array $vars['tabs'] A multi-dimensional array of tab entries in the format array( + * 'title' => string, // Title of link + * 'url' => string, // URL for the link + * 'class' => string // Class of the li element + * 'id' => string, // ID of the li element + * 'selected' => bool // if this li element is currently selected + * 'url_class' => string, // Class to pass to the link + * 'url_id' => string, // ID to pass to the link + * ) + */ ?> diff --git a/mod/externalpages/views/default/forms/expages/edit.php b/mod/externalpages/views/default/forms/expages/edit.php new file mode 100644 index 000000000..afe091337 --- /dev/null +++ b/mod/externalpages/views/default/forms/expages/edit.php @@ -0,0 +1,55 @@ + 'object', + 'subtype' => $type, + 'limit' => 1, +)); + +if ($page_contents) { + $description = $page_contents[0]->description; + $guid = $page_contents[0]->guid; +} else { + $description = ""; + $guid = 0; +} + +// set the required form variables +$input_area = elgg_view('input/longtext', array( + 'internalname' => 'expagescontent', + 'value' => $description, +)); +$submit_input = elgg_view('input/submit', array( + 'internalname' => 'submit', + 'value' => elgg_echo('save'), +)); +$hidden_type = elgg_view('input/hidden', array( + 'internalname' => 'content_type', + 'value' => $type, +)); +$hidden_guid = elgg_view('input/hidden', array( + 'internalname' => 'guid', + 'value' => $guid, +)); + +$external_page_title = elgg_echo("expages:$type"); + +//construct the form +echo <<$external_page_title +
$input_area
+ $hidden_value + $hidden_type + $submit_input + +EOT; + diff --git a/mod/externalpages/views/default/object/expages.php b/mod/externalpages/views/default/object/expages.php deleted file mode 100644 index 69ec7233e..000000000 --- a/mod/externalpages/views/default/object/expages.php +++ /dev/null @@ -1,10 +0,0 @@ - \ No newline at end of file -- cgit v1.2.3