]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
a simple version of the sitepages index - we will need to turn this into a basic...
authordave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
Mon, 24 May 2010 10:27:53 +0000 (10:27 +0000)
committerdave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
Mon, 24 May 2010 10:27:53 +0000 (10:27 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@6153 36083f99-b078-4883-b0ff-0f9b5a30f544

mod/sitepages/actions/addfrontsimple.php [new file with mode: 0644]
mod/sitepages/index.php [new file with mode: 0644]
mod/sitepages/languages/en.php
mod/sitepages/sitepages_functions.php
mod/sitepages/start.php
mod/sitepages/views/default/canvas/layouts/frontpage.php [new file with mode: 0644]
mod/sitepages/views/default/sitepages/css.php [new file with mode: 0644]
mod/sitepages/views/default/sitepages/forms/editfrontsimple.php [new file with mode: 0644]
mod/sitepages/views/default/sitepages/members.php [new file with mode: 0644]
mod/sitepages/views/default/sitepages/sidebar.php [new file with mode: 0644]
mod/sitepages/views/default/sitepages/welcome.php [new file with mode: 0644]

diff --git a/mod/sitepages/actions/addfrontsimple.php b/mod/sitepages/actions/addfrontsimple.php
new file mode 100644 (file)
index 0000000..ee26723
--- /dev/null
@@ -0,0 +1,45 @@
+<?php\r
+/**\r
+ * Site pages front page save/edit\r
+ *\r
+ * @package SitePages\r
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2\r
+ * @author Curverider Ltd <info@elgg.com>\r
+ * @copyright Curverider Ltd 2008-2010\r
+ * @link http://elgg.com/\r
+ *\r
+ */\r
+\r
+admin_gatekeeper();\r
+\r
+$logged_in_content = get_input('logged_in_content', '', FALSE);\r
+$logged_out_content = get_input('logged_out_content', '', FALSE);\r
+\r
+$welcometitle = get_input('welcometitle', '', FALSE);\r
+$welcomemessage = get_input('welcomemessage', '', FALSE);\r
+$sidebartitle = get_input('sidebartitle', '', FALSE);\r
+$sidebarmessage = get_input('sidebarmessage', '', FALSE);\r
+\r
+$loggedin_user_guid = get_loggedin_userid();\r
+\r
+// Cache to the session for sticky forms\r
+// @todo does nothing yet.\r
+$_SESSION['sitepages:content'] = $content;\r
+$_SESSION['sitepages:css'] = $css;\r
+\r
+if (!$sitepagesimple = sitepages_get_sitepage_object('frontsimple')) {\r
+       $sitepagesimple = sitepages_create_sitepage_object('frontsimple');\r
+}\r
+\r
+$sitepagesimple->welcometitle = $welcometitle;\r
+$sitepagesimple->welcomemessage = $welcomemessage;\r
+$sitepagesimple->sidebartitle = $sidebartitle;\r
+$sitepagesimple->sidebarmessage = $sidebarmessage;\r
+\r
+if ($sitepagesimple->save()) {\r
+       system_message(elgg_echo("sitepagessimple:posted"));\r
+} else {\r
+       register_error(elgg_echo("sitepages:error"));\r
+}\r
+\r
+forward($_SERVER['HTTP_REFERER']);\r
diff --git a/mod/sitepages/index.php b/mod/sitepages/index.php
new file mode 100644 (file)
index 0000000..516763b
--- /dev/null
@@ -0,0 +1,37 @@
+<?php\r
+/**\r
+ * Elgg index page\r
+ *\r
+ */\r
+\r
+/**\r
+ * Start the Elgg engine\r
+ */\r
+\r
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
+\r
+//Load the front page\r
+$content = elgg_view('sitepages/welcome');\r
+$content .= elgg_view_title(elgg_echo('content:latest'));\r
+set_context('search');\r
+$offset = (int)get_input('offset', 0);\r
+if(is_plugin_enabled('riverdashboard'))\r
+       $content .= elgg_view_river_items(0, 0, "", "", "", '', 10, 0, 0, true, true);\r
+else\r
+       $content .= elgg_list_registered_entities(array('limit' => 10, 'offset' => $offset, 'full_view' => FALSE, 'allowed_types' => array('object','group')));\r
+set_context('main');\r
+global $autofeed;\r
+$autofeed = FALSE;\r
+\r
+$members = elgg_get_entities_from_metadata(array(\r
+       'metadata_names' => 'icontime',\r
+       'types' => 'user',\r
+       'owner_guid' => 0,\r
+       'limit' => 10\r
+));\r
+//include sidebar free text\r
+$sidebar = elgg_view('sitepages/sidebar');\r
+$sidebar .= elgg_view('sitepages/members', array('members' => $members));\r
+               \r
+$content = elgg_view_layout('frontpage', $content, $sidebar);\r
+page_draw(null, $content);\r
index 4e009a4a54217db502891e46b807cee604a4fb5a..c9fdb46a8f08c48818950de35b672df15c248418 100644 (file)
@@ -31,7 +31,7 @@ $english = array(
        'sitepages:seocreated' => "Your search engine information has been added",
        'sitepages:logged_in_front_content' => "Logged in front page content",
        'sitepages:logged_out_front_content' => "Logged out front page content",
-       'sitepages:ownfront' => "Construct your own frontpage for this network. (Note:you will need to know html and css)",
+       'sitepages:ownfront' => "Turn on the custom frontpage for this network.",
        'sitepages:addcontent' => "You can add content here via your admin tools. Look for the external pages link under admin.",
        'item:object:front' => 'Front page items',
 
@@ -42,6 +42,19 @@ $english = array(
         */
        'sitepages:posted' => "Your page was successfully posted.",
        'sitepages:deleted' => "Your page was successfully deleted.",
+       
+       /**
+        * Frontpage form
+        **/
+
+       'sitepages:welcometitle' => 'Welcome title',
+       'sitepages:welcomemessage' => 'Welcome message.',
+       'sitepages:welcomeintro' => 'Use the following fields to construct a welcome title and message for your users.',
+       'sitepages:sidebarintro' => 'Use the following input boxes to set a title and some content for the sidebar freeform content area.',
+       'sitepages:sidebartitle' => 'Title',
+       'sitepages:sidebarmessage' => 'Message.',
+       'sitepages:warning' => 'We recommend that you keep this to less than 300 characters.',
+       'sitepagessimple:posted' => 'The frontpage has successfully updated.',
 
        /**
         * Error messages
index ac1f7d9f1d72c0e8a281284702e37a198936c0a8..5e9a4adc2ddca104f13774d51440f573a0ca7d65 100644 (file)
@@ -67,7 +67,7 @@ function sitepages_get_edit_section_content($page_type) {
 
        switch ($page_type) {
                case 'front':
-                       $view = 'sitepages/forms/editfront';
+                       $view = 'sitepages/forms/editfrontsimple';
                        break;
 
                case 'seo':
index 2ce1d331206c4da397d8cc0666a8dbbdd971c9fc..457ed583c8dc0aac382de39cace24a9f4953416c 100644 (file)
@@ -39,7 +39,7 @@ function sitepages_init() {
        elgg_extend_view('metatags', 'sitepages/metatags');
 
        // Replace the default index page if user has requested and the site is not running walled garden
-       if ((get_plugin_setting('ownfrontpage', 'sitepages') == 'yes') && (!is_plugin_enabled('walledgarden'))) {
+       if (get_plugin_setting('ownfrontpage', 'sitepages') == 'yes') {
                register_plugin_hook('index', 'system', 'sitepages_custom_index');
        }
 
@@ -52,6 +52,7 @@ function sitepages_init() {
 
        register_action("sitepages/add", FALSE, $CONFIG->pluginspath . "sitepages/actions/add.php");
        register_action("sitepages/addfront", FALSE, $CONFIG->pluginspath . "sitepages/actions/addfront.php");
+       register_action("sitepages/addfrontsimple", FALSE, $CONFIG->pluginspath . "sitepages/actions/addfrontsimple.php");
        register_action("sitepages/addmeta", FALSE, $CONFIG->pluginspath . "sitepages/actions/addmeta.php");
        register_action("sitepages/edit", FALSE, $CONFIG->pluginspath . "sitepages/actions/edit.php");
        register_action("sitepages/delete", FALSE, $CONFIG->pluginspath . "sitepages/actions/delete.php");
@@ -74,21 +75,25 @@ function sitepages_runonce() {
  */
 function sitepages_custom_index() {
        // context is checked by the extended metatags view to print out its custom CSS
-       $context = get_context();
-       set_context('sitepages:front');
+       //$context = get_context();
+       //set_context('sitepages:front');
 
-       if ($contents = elgg_view('sitepages/custom_frontpage')) {
-               page_draw(FALSE, $contents);
+       //if ($contents = elgg_view('sitepages/custom_frontpage')) {
+       //      page_draw(FALSE, $contents);
 
-               set_context($context);
+       //      set_context($context);
                // return TRUE to tell index.php we've got its content right here.
-               return TRUE;
-       }
+       //      return TRUE;
+       //}
 
-       set_context($context);
+       //set_context($context);
 
        // return NULL to pass this to next in chain, or back to standard index.php.
-       return NULL;
+       //return NULL;
+       if (!include_once(dirname(dirname(__FILE__))) . "/sitepages/index.php") {
+               return false;
+       }
+       return true;
 }
 
 /**
diff --git a/mod/sitepages/views/default/canvas/layouts/frontpage.php b/mod/sitepages/views/default/canvas/layouts/frontpage.php
new file mode 100644 (file)
index 0000000..04ae755
--- /dev/null
@@ -0,0 +1,17 @@
+<?php\r
+\r
+?>\r
+<div id="elgg_content" class="clearfloat">\r
+       <div id="elgg_sidebar" class="frontpage">\r
+               <?php \r
+                       if (isset($vars['area2'])) echo $vars['area2']; \r
+                       if (isset($vars['area3'])) echo $vars['area3']; \r
+               ?>\r
+       </div>\r
+       \r
+       <div id="elgg_page_contents" class="frontpage clearfloat">\r
+               <?php \r
+                       if (isset($vars['area1'])) echo $vars['area1'];\r
+               ?>\r
+       </div>\r
+</div>\r
diff --git a/mod/sitepages/views/default/sitepages/css.php b/mod/sitepages/views/default/sitepages/css.php
new file mode 100644 (file)
index 0000000..9a2b841
--- /dev/null
@@ -0,0 +1,7 @@
+#elgg_sidebar.frontpage { /* elgg sidebar */\r
+       width:260px;\r
+}\r
+\r
+#elgg_page_contents.frontpage { /* main page contents */\r
+       width:680px;\r
+}
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php b/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php
new file mode 100644 (file)
index 0000000..89f4e56
--- /dev/null
@@ -0,0 +1,61 @@
+<?php\r
+/**\r
+ * Edit form for the custom front page\r
+ *\r
+ * @package SitePages\r
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2\r
+ * @author Curverider Ltd\r
+ * @copyright Curverider Ltd 2008-2010\r
+ * @link http://elgg.org/\r
+ */\r
+\r
+$action = 'sitepages/addfrontsimple';\r
+\r
+if($sitepages_object = sitepages_get_sitepage_object('frontsimple')){\r
+       $welcometitle = $sitepages_object->welcometitle;\r
+       $welcomemessage = $sitepages_object->welcomemessage;\r
+       $sidebartitle = $sitepages_object->sidebartitle;\r
+       $sidebarmessage = $sitepages_object->sidebarmessage;\r
+}else{\r
+       $welcometitle = "";\r
+       $welcomemessage = "";\r
+       $sidebartitle = "";\r
+       $sidebarmessage = "";\r
+}\r
+       \r
+\r
+// set the required form variables\r
+$welcometitle_form = elgg_view('input/text', array('internalname' => 'welcometitle', 'value' => $welcometitle));\r
+$welcomemessage_form = elgg_view('input/longtext', array('internalname' => 'welcomemessage', 'value' => $welcomemessage, 'class' => 'input_textarea monospace'));\r
+$sidebartitle_form = elgg_view('input/text', array('internalname' => 'sidebartitle', 'value' => $sidebartitle));\r
+$sidebarmessage_form = elgg_view('input/longtext', array('internalname' => 'sidebarmessage', 'value' => $sidebarmessage, 'class' => 'input_textarea monospace'));;\r
+$submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));\r
+\r
+$welcomemessage_title = elgg_echo("sitepages:welcomemessage");\r
+$sidebarmessage_title = elgg_echo("sitepages:sidebarmessage");\r
+$welcometitle_title = elgg_echo("sitepages:welcometitle");\r
+$sidebartitle_title = elgg_echo("sitepages:sidebartitle");\r
+$welcome_intro = elgg_echo("sitepages:welcomeintro");\r
+$sidebar_intro = elgg_echo("sitepages:sidebarintro");\r
+\r
+//construct the form\r
+$form_body = <<<___EOT\r
+\r
+       <h2>$welcome_intro</h2>\r
+       <p><label>$welcometitle_title\r
+       $welcometitle_form</label></p>\r
+       <p><label>$welcomemessage_title\r
+       $welcomemessage_form</label></p>\r
+\r
+       <h2>$sidebar_intro</h2>\r
+       <p><label>$sidebartitle_title\r
+       $sidebartitle_form</label></p>\r
+       <p><label>$sidebarmessage_title\r
+       $sidebarmessage_form</label></p>\r
+\r
+       $hidden_guid\r
+       $submit_input\r
+       \r
+___EOT;\r
+\r
+echo elgg_view('input/form', array('action' => "{$vars['url']}action/$action", 'body' => $form_body));
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/members.php b/mod/sitepages/views/default/sitepages/members.php
new file mode 100644 (file)
index 0000000..3559f49
--- /dev/null
@@ -0,0 +1,9 @@
+<?php\r
+       $newest_members = $vars['members'];\r
+?>\r
+<h3><?php echo elgg_echo('riverdashboard:recentmembers') ?></h3>\r
+<?php \r
+       foreach($newest_members as $mem){\r
+               echo "<div class='entity_listing_icon'>" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'small')) . "</div>";\r
+       }\r
+?>
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/sidebar.php b/mod/sitepages/views/default/sitepages/sidebar.php
new file mode 100644 (file)
index 0000000..8ec177f
--- /dev/null
@@ -0,0 +1,13 @@
+<?php\r
+/**\r
+ * Admin welcome message\r
+ **/\r
+\r
+$sitepages_object = sitepages_get_sitepage_object('frontsimple');\r
+$sidebartitle = $sitepages_object->sidebartitle;\r
+$sidebarmessage = $sitepages_object->sidebarmessage;\r
\r
+if($sidebarmessage){\r
+       echo "<h3>" . $sidebartitle . "</h3>";\r
+       echo $sidebarmessage;\r
+}
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/welcome.php b/mod/sitepages/views/default/sitepages/welcome.php
new file mode 100644 (file)
index 0000000..bf97eb8
--- /dev/null
@@ -0,0 +1,13 @@
+<?php\r
+/**\r
+ * Admin welcome message\r
+ **/\r
\r
+$sitepages_object = sitepages_get_sitepage_object('frontsimple');\r
+$welcometitle = $sitepages_object->welcometitle;\r
+$welcomemessage = $sitepages_object->welcomemessage;\r
+\r
+if($welcomemessage){\r
+       echo "<h2>" . $welcometitle . "</h2>";\r
+       echo $welcomemessage;\r
+}
\ No newline at end of file