]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Convert spaces to tabs.
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Thu, 15 Jul 2010 16:38:16 +0000 (16:38 +0000)
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Thu, 15 Jul 2010 16:38:16 +0000 (16:38 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@6713 36083f99-b078-4883-b0ff-0f9b5a30f544

19 files changed:
mod/pages/actions/pages/editwelcome.php
mod/pages/history.php
mod/pages/index.php
mod/pages/languages/en.php
mod/pages/new.php
mod/pages/start.php
mod/pages/views/default/forms/pages/editwelcome.php
mod/pages/views/default/pages/breadcrumbs.php
mod/pages/views/default/pages/css.php
mod/pages/views/default/pages/groupprofile_pages.php
mod/pages/views/default/pages/pageprofile.php
mod/pages/views/default/pages/sidebar/tree.php
mod/pages/views/default/pages/welcome.php
mod/pages/views/default/river/object/page/update.php
mod/pages/views/default/river/object/page_top/update.php
mod/pages/views/default/widgets/pages/edit.php
mod/pages/views/default/widgets/pages/view.php
mod/pages/welcome.php
mod/pages/world.php

index 5d29a5fd97c6b0987e1c331a0dcc52594f4c6b23..30d8bc1b886263abd03b0b8331af250b0e32fedb 100644 (file)
        
        //check to see if this is an edit or new welcome message
        if($object_guid){
-       
-       //it is an edit so grab the object
-       $welcome = get_entity($object_guid);
+t      
+t      //it is an edit so grab the object
+t      $welcome = get_entity($object_guid);
                if ($welcome->getSubtype() == "pages_welcome" && $welcome->canEdit()) {
-               
-               $welcome->description = $message;
-               $welcome->access_id = $access_id; 
-               $welcome->save();
-               system_message(elgg_echo("pages:welcomeposted"));
-               
+t              
+t              $welcome->description = $message;
+t              $welcome->access_id = $access_id; 
+t              $welcome->save();
+t              system_message(elgg_echo("pages:welcomeposted"));
+t              
                } else {
-               
-               register_error(elgg_echo("pages:welcomeerror"));
-               
+t              
+t              register_error(elgg_echo("pages:welcomeerror"));
+t              
                }
-       
-       
+t      
+t      
        }else{
        
-        //it is a new welcome object
-       if ($owner_guid){
-               
-               $welcome = new ElggObject();
-               // Tell the system it's a pages welcome message
-               $welcome->subtype = "pages_welcome";
-               $welcome->title = "Welcome";
-               $welcome->description = $message;
-               $welcome->access_id = $access_id;
-               
-               // Set the owner
-               $welcome->owner_guid = $owner_guid;
-               
-           // save
-               if (!$welcome->save()){
-                       register_error(elgg_echo("pages:welcomeerror"));
-               } else {
-                       system_message(elgg_echo("pages:welcomeposted"));
-               }
-    
-               
-       } else {
-               
-               register_error(elgg_echo("pages:welcomeerror"));
-               
-       }
-       
+tt//it is a new welcome object
+t      if ($owner_guid){
+tt     
+t              $welcome = new ElggObject();
+t              // Tell the system it's a pages welcome message
+t              $welcome->subtype = "pages_welcome";
+t              $welcome->title = "Welcome";
+t              $welcome->description = $message;
+t              $welcome->access_id = $access_id;
+t              
+t              // Set the owner
+t              $welcome->owner_guid = $owner_guid;
+t              
+t      t// save
+t              if (!$welcome->save()){
+t                      register_error(elgg_echo("pages:welcomeerror"));
+t              } else {
+tt             system_message(elgg_echo("pages:welcomeposted"));
+t              }
+t
+t              
+t      } else {
+tt     
+tt     register_error(elgg_echo("pages:welcomeerror"));
+tt     
+t      }
+t      
        }//end of first if statement
-       
+t      
        // Forward to the main blog page
        forward("pg/pages/owned/" . get_user($owner_guid)->username);
        exit;
index fec7702ba75fdcc96afaa00c94ff357a42f156df..215d5ea585074449adc5e07802f2f0c111d59499 100644 (file)
@@ -14,7 +14,7 @@
                
        $page_guid = get_input('page_guid');
                
-    $pages = get_entity($page_guid);
+t$pages = get_entity($page_guid);
        if ($pages->container_guid) {
                set_page_owner($pages->container_guid);
        } else {
index 6c1487c818f9ff0c632c645a6dae30ec4b7f7de0..02d13a3a77580d33f58b349896b923e6d1decc8c 100644 (file)
        // Add menus
        $owner = page_owner_entity();
        if (!($owner instanceof ElggGroup)) {
-               add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
-               add_submenu_item(elgg_echo('pages:all'),$CONFIG->wwwroot."mod/pages/world.php", 'pageslinksgeneral');
+t              add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+t              add_submenu_item(elgg_echo('pages:all'),$CONFIG->wwwroot."mod/pages/world.php", 'pageslinksgeneral');
        }
-    if (($owner instanceof ElggEntity) && (can_write_to_container(0,$owner->guid))){
-        add_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/?container_guid=" . page_owner(), 'pagesactions');
-        if ($owner instanceof ElggUser) add_submenu_item(elgg_echo('pages:welcome'), $CONFIG->url . "pg/pages/welcome/", 'pagesactions');
-    }
-    
+tif (($owner instanceof ElggEntity) && (can_write_to_container(0,$owner->guid))){
+ttadd_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/?container_guid=" . page_owner(), 'pagesactions');
+ttif ($owner instanceof ElggUser) add_submenu_item(elgg_echo('pages:welcome'), $CONFIG->url . "pg/pages/welcome/", 'pagesactions');
+t}
+t
        // access check for closed groups
        group_gatekeeper();
        
index b31c595724b139593d1b7e69b5ae2d9bbf43d390..2eb2469d8f26fc2840780b27e7bd3dd8d8ed660d 100644 (file)
@@ -31,7 +31,7 @@
                        'pages:welcomeerror' => "There was a problem saving your welcome message",
                        'pages:welcomeposted' => "Your welcome message has been posted",
                        'pages:navigation' => "Page navigation",
-               'pages:via' => "via pages",
+       tt'pages:via' => "via pages",
                        'item:object:page_top' => 'Top-level pages',
                        'item:object:page' => 'Pages',
                        'item:object:pages_welcome' => 'Pages welcome blocks',
                * River
                **/
                
-                   'pages:river:annotate' => "a comment on this page",
-                   'pages:river:created' => "%s wrote",
-               'pages:river:updated' => "%s updated",
-               'pages:river:posted' => "%s posted",
+               t'pages:river:annotate' => "a comment on this page",
+               t'pages:river:created' => "%s wrote",
+       tt'pages:river:updated' => "%s updated",
+       tt'pages:river:posted' => "%s posted",
                        'pages:river:create' => "a new page titled",
-               'pages:river:update' => "a page titled",
-               'page:river:annotate' => "a comment on this page",
-               'page_top:river:annotate' => "a comment on this page",
+       tt'pages:river:update' => "a page titled",
+       tt'page:river:annotate' => "a comment on this page",
+       tt'page_top:river:annotate' => "a comment on this page",
        
                /**
                 * Form fields
@@ -86,7 +86,7 @@
                 * Widget
                 **/
                 
-                   'pages:num' => 'Number of pages to display',
+               t'pages:num' => 'Number of pages to display',
                        'pages:widget:description' => "This is a list of your pages.",
        
                /**
index b47d91164abe2bc88fd16fa952aafbcc2c638bc4..7cf46d1c3e08836838b9e0d959658cd800315401 100644 (file)
 
        //if it is a sub page, provide a link back to parent
        if(get_input('parent_guid')){
-           $parent = get_entity(get_input('parent_guid'));
-           
-           // Breadcrumbs
-           $area2 .= elgg_view('pages/breadcrumbs', array('page_owner' => $page_owner, 'parent' => $parent, 'add' => true));
-    }
-    
-    global $CONFIG;
+       t$parent = get_entity(get_input('parent_guid'));
+       t
+       t// Breadcrumbs
+       t$area2 .= elgg_view('pages/breadcrumbs', array('page_owner' => $page_owner, 'parent' => $parent, 'add' => true));
+t}
+t
+tglobal $CONFIG;
        add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
-    
+t
        $title = elgg_echo("pages:new");
        $area2 .= elgg_view_title($title);
        $area2 .= elgg_view("forms/pages/edit");
index eee04b4ed2305293178e3c37903534d179e2c006..308a241f583c19f7d0de4ef4fc93be8bcd69f956 100644 (file)
                // Listen to notification events and supply a more useful message
                        register_plugin_hook('notify:entity:message', 'object', 'page_notify_message');
                        
-               // add the group pages tool option     
-            add_group_tool_option('pages',elgg_echo('groups:enablepages'),true);
+               // add the group pages tool optiont 
+tttadd_group_tool_option('pages',elgg_echo('groups:enablepages'),true);
 
                
                //add a widget
-           add_widget_type('pages',elgg_echo('pages'),elgg_echo('pages:widget:description'));
+       tadd_widget_type('pages',elgg_echo('pages'),elgg_echo('pages:widget:description'));
                
                // For now, we'll hard code the groups profile items as follows:
                // TODO make this user configurable
                
                // Group submenu option 
                        if ($page_owner instanceof ElggGroup && get_context() == 'groups') {
-                       if($page_owner->pages_enable != "no"){
-                                   add_submenu_item(sprintf(elgg_echo("pages:group"),$page_owner->name), $CONFIG->wwwroot . "pg/pages/owned/" . $page_owner->username);
-                           }
+t                      if($page_owner->pages_enable != "no"){
+                               tadd_submenu_item(sprintf(elgg_echo("pages:group"),$page_owner->name), $CONFIG->wwwroot . "pg/pages/owned/" . $page_owner->username);
+                       t}
                        }
-    }
+t}
        
        /**
         * Pages page handler.
                        {
                                case "new" :
                                        include($CONFIG->pluginspath . "pages/new.php");
-                       break;
-                       case "welcome" :
+tt             break;
+tt             case "welcome" :
                                        include($CONFIG->pluginspath . "pages/welcome.php");
-                       break;
-                       case "world":  
+tt             break;
+t                      case "world":  
                                        include($CONFIG->pluginspath . "pages/world.php");
-                       break;
-                       case "owned" :
-                               // Owned by a user
-                               if (isset($page[1]))
-                                       set_input('username',$page[1]);
-                                       
-                               include($CONFIG->pluginspath . "pages/index.php");      
-                       break;
-                       case "edit" :
-                               if (isset($page[1]))
-                                       set_input('page_guid', $page[1]);
-                                       
-                                $entity = get_entity($page[1]);
-                                add_submenu_item(elgg_echo('pages:label:view'), $CONFIG->url . "pg/pages/view/{$page[1]}", 'pageslinks');
-                                // add_submenu_item(elgg_echo('pages:user'), $CONFIG->wwwroot . "pg/pages/owned/" . $_SESSION['user']->username, 'pageslinksgeneral');
-                                if (($entity) && ($entity->canEdit())) add_submenu_item(elgg_echo('pages:label:edit'), $CONFIG->url . "pg/pages/edit/{$page[1]}", 'pagesactions');
-                                add_submenu_item(elgg_echo('pages:label:history'), $CONFIG->url . "pg/pages/history/{$page[1]}", 'pageslinks');
+tt             break;
+t                      case "owned" :
+t                              // Owned by a user
+t                              if (isset($page[1]))
+t                                      set_input('username',$page[1]);
+t                                      
+t                              include($CONFIG->pluginspath . "pages/index.php");      
+t                      break;
+t                      case "edit" :
+t                              if (isset($page[1]))
+t                                      set_input('page_guid', $page[1]);
+t                                      
+t                               $entity = get_entity($page[1]);
+t                               add_submenu_item(elgg_echo('pages:label:view'), $CONFIG->url . "pg/pages/view/{$page[1]}", 'pageslinks');
+t                               // add_submenu_item(elgg_echo('pages:user'), $CONFIG->wwwroot . "pg/pages/owned/" . $_SESSION['user']->username, 'pageslinksgeneral');
+t                               if (($entity) && ($entity->canEdit())) add_submenu_item(elgg_echo('pages:label:edit'), $CONFIG->url . "pg/pages/edit/{$page[1]}", 'pagesactions');
+t                               add_submenu_item(elgg_echo('pages:label:history'), $CONFIG->url . "pg/pages/history/{$page[1]}", 'pageslinks');
 
-                               include($CONFIG->pluginspath . "pages/edit.php");
-                       break;
-                       case "view" :
-                               
-                               if (isset($page[1]))
-                                       set_input('page_guid', $page[1]);
-                                       
-                                elgg_extend_view('metatags','pages/metatags');
-                                       
-                                $entity = get_entity($page[1]);
-                                //add_submenu_item(elgg_echo('pages:label:view'), $CONFIG->url . "pg/pages/view/{$page[1]}", 'pageslinks');
-                                if (($entity) && ($entity->canEdit())) add_submenu_item(elgg_echo('pages:label:edit'), $CONFIG->url . "pg/pages/edit/{$page[1]}", 'pagesactions');
-                                add_submenu_item(elgg_echo('pages:label:history'), $CONFIG->url . "pg/pages/history/{$page[1]}", 'pageslinks');
-                                       
-                               include($CONFIG->pluginspath . "pages/view.php");
-                       break;   
-                       case "history" :
-                               if (isset($page[1]))
-                                       set_input('page_guid', $page[1]);
-                                       
-                                elgg_extend_view('metatags','pages/metatags');
-                                       
-                                $entity = get_entity($page[1]);
-                                add_submenu_item(elgg_echo('pages:label:view'), $CONFIG->url . "pg/pages/view/{$page[1]}", 'pageslinks');
-                                if (($entity) && ($entity->canEdit())) add_submenu_item(elgg_echo('pages:label:edit'), $CONFIG->url . "pg/pages/edit/{$page[1]}", 'pagesactions');
-                                add_submenu_item(elgg_echo('pages:label:history'), $CONFIG->url . "pg/pages/history/{$page[1]}", 'pageslinks');
-                                       
-                               include($CONFIG->pluginspath . "pages/history.php");
-                       break;                          
-                       default:
-                               include($CONFIG->pluginspath . "pages/new.php");
-                       break;
+t                              include($CONFIG->pluginspath . "pages/edit.php");
+t                      break;
+t                      case "view" :
+t                              
+t                              if (isset($page[1]))
+t                                      set_input('page_guid', $page[1]);
+t                                      
+t                               elgg_extend_view('metatags','pages/metatags');
+t                                      
+t                               $entity = get_entity($page[1]);
+t                               //add_submenu_item(elgg_echo('pages:label:view'), $CONFIG->url . "pg/pages/view/{$page[1]}", 'pageslinks');
+t                               if (($entity) && ($entity->canEdit())) add_submenu_item(elgg_echo('pages:label:edit'), $CONFIG->url . "pg/pages/edit/{$page[1]}", 'pagesactions');
+t                               add_submenu_item(elgg_echo('pages:label:history'), $CONFIG->url . "pg/pages/history/{$page[1]}", 'pageslinks');
+t                                      
+t                              include($CONFIG->pluginspath . "pages/view.php");
+t                      break;   
+t                      case "history" :
+t                              if (isset($page[1]))
+t                                      set_input('page_guid', $page[1]);
+t                                      
+t                               elgg_extend_view('metatags','pages/metatags');
+t                                      
+t                               $entity = get_entity($page[1]);
+t                               add_submenu_item(elgg_echo('pages:label:view'), $CONFIG->url . "pg/pages/view/{$page[1]}", 'pageslinks');
+t                               if (($entity) && ($entity->canEdit())) add_submenu_item(elgg_echo('pages:label:edit'), $CONFIG->url . "pg/pages/edit/{$page[1]}", 'pagesactions');
+t                               add_submenu_item(elgg_echo('pages:label:history'), $CONFIG->url . "pg/pages/history/{$page[1]}", 'pageslinks');
+t                                      
+t                              include($CONFIG->pluginspath . "pages/history.php");
+t                      break;                          
+t                      default:
+t                              include($CONFIG->pluginspath . "pages/new.php");
+t                      break;
                        }
                }
                
index 39d8d05ca08dea34bf408290dd4e11b109a1e4ae..dc8c24b3e4a69c675051443f8bc72c4b996171b3 100644 (file)
         
         //set some variables
         if($vars['entity']){
-        foreach($vars['entity'] as $welcome){
-           $current_message = $welcome->description;
-           $object_guid = $welcome->guid;
-           $access_id = $welcome->access_id;
-           }
+t       foreach($vars['entity'] as $welcome){
+t      t$current_message = $welcome->description;
+t      t$object_guid = $welcome->guid;
+t      t$access_id = $welcome->access_id;
+       t}
         }else{
-        $current_message = '';
-        $object_guid = '';
-        $access_id = ACCESS_PRIVATE;
+t       $current_message = '';
+t       $object_guid = '';
+t       $access_id = ACCESS_PRIVATE;
         }
         
         $page_owner = $vars['owner']->guid;
@@ -27,7 +27,7 @@
 ?>
 <form action="<?php echo $vars['url']; ?>action/pages/editwelcome" method="post">
 
-    <p class="longtext_inputarea">
+t<p class="longtext_inputarea">
                <label>
                        <?php echo elgg_view("input/longtext",array(
                                'internalname' => "pages_welcome",
        <?php
                echo elgg_view('input/securitytoken');
 
-           //if it is editing, include the object guid
-           if($object_guid != ''){
-    ?>
-           <input type="hidden" name="object_guid" value="<?php echo $object_guid; ?>" />
+       t//if it is editing, include the object guid
+       tif($object_guid != ''){
+t?>
+       t<input type="hidden" name="object_guid" value="<?php echo $object_guid; ?>" />
        <?php
-        }
-    ?>
-    
+tt}
+t?>
+t
        <input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" />
 </form>
index a6626ca39c3a88d2a8855d58370c4f3efb08ad73..eddcfa7df551ac270c31987a211ff68191f26416 100644 (file)
@@ -4,25 +4,25 @@
                $parent = $vars['parent'];
 
                $breadcrumbs = '';
-           
-           $owner_url = $CONFIG->wwwroot . "pg/pages/owned/" . get_entity($page_owner)->username;
-           echo "<div id='breadcrumbs'><b><a href=\"{$owner_url}\">" . elgg_echo('pages:user') . "</a></b>";
-           
-           //see if the new page's parent has a parent
-        $getparent = get_entity($parent->parent_guid);
-        while ($getparent instanceof ElggObject){
-             
-             $breadcrumbs = " &gt; <a href=\"{$getparent->getURL()}\">$getparent->title</a>" . $breadcrumbs;
-             $getparent = get_entity($getparent->parent_guid);
-             
-        }
-        
-        echo $breadcrumbs;
-        //if it is adding a page, make the last page a link, otherwise, don't
-        if($vars['add']){
-               echo " &gt; <a href=\"{$parent->getURL()}\">$parent->title</a></div>";
-        }else{
-            echo " &gt; $parent->title</div>";
-        }
+       t
+       t$owner_url = $CONFIG->wwwroot . "pg/pages/owned/" . get_entity($page_owner)->username;
+       techo "<div id='breadcrumbs'><b><a href=\"{$owner_url}\">" . elgg_echo('pages:user') . "</a></b>";
+       t
+       t//see if the new page's parent has a parent
+tt$getparent = get_entity($parent->parent_guid);
+ttwhile ($getparent instanceof ElggObject){
+ttt 
+ttt $breadcrumbs = " &gt; <a href=\"{$getparent->getURL()}\">$getparent->title</a>" . $breadcrumbs;
+ttt $getparent = get_entity($getparent->parent_guid);
+ttt 
+tt}
+tt
+ttecho $breadcrumbs;
+tt//if it is adding a page, make the last page a link, otherwise, don't
+ttif($vars['add']){
+       ttecho " &gt; <a href=\"{$parent->getURL()}\">$parent->title</a></div>";
+tt}else{
+tttecho " &gt; $parent->title</div>";
+tt}
 
 ?>
index c396d45f77cb44a269427f68d16b7dcb9a2daffd..0320836b9266e0373af8396a9e5ffd17451bab71 100644 (file)
 }
 
 #pages_page .strapline {
-    text-align:right;
-    border-top:1px solid #efefef;
-    margin:10px 0 10px 0;
-    color:#666666;
+ttext-align:right;
+tborder-top:1px solid #efefef;
+tmargin:10px 0 10px 0;
+tcolor:#666666;
 }
 #pages_page .categories {
-    border:none !important;
-    padding:0 !important;
+tborder:none !important;
+tpadding:0 !important;
 }
 
 #pages_page .tags {
-    padding:0 0 0 16px;
-    margin:10px 0 4px 0;
+tpadding:0 0 0 16px;
+tmargin:10px 0 4px 0;
        background:transparent url(<?php echo $vars['url']; ?>_graphics/icon_tag.gif) no-repeat scroll left 2px;
 }
 
        background:white;
        -webkit-border-radius: 8px; 
        -moz-border-radius: 8px;
-    padding:10px;
-    margin:0 10px 10px 10px;
+tpadding:10px;
+tmargin:0 10px 10px 10px;
 }
 #sidebar_page_tree h3 {
        background: none;
index 006a0587779d8510006582712156aa478bc665d5..323b02f2bb8c28bde398af35e134cbc422d68bc9 100644 (file)
@@ -1,9 +1,9 @@
 <?php
  
-    // pages on the group index page
+t// pages on the group index page
 
-    //check to make sure this group forum has been activated
-    if($vars['entity']->pages_enable != 'no'){
+t//check to make sure this group forum has been activated
+tif($vars['entity']->pages_enable != 'no'){
 
 ?>
 
@@ -11,9 +11,9 @@
 <h2><?php echo elgg_echo("pages:groupprofile"); ?></h2>
 <?php
 
-    $objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => 5, 'full_view' => FALSE));
+t$objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => 5, 'full_view' => FALSE));
        
-    if($objects)
+tif($objects)
                echo $objects;
        else
                echo "<div class=\"forum_latest\">" . elgg_echo("pages:nogroup") . "</div>";
@@ -23,5 +23,5 @@
 </div>
 
 <?php
-    }
+t}
 ?>
index b1081d9f72f2418111109d974f6523c3b2325b3d..93191967c1c3d05201fd862f22d70fa6519e57bb 100644 (file)
@@ -66,7 +66,7 @@
 
        <p class="strapline">
                <?php
-                
+tttt
                        $time_updated = $latest->time_created;
                        $owner_guid = $latest->owner_guid;
                        $owner = get_entity($owner_guid);
index 07de1beb5a969f4cd00ed0640e4013513c4939ce..768127e9c3347752b12dcf06c0dd19511eaebfbb 100644 (file)
@@ -2,7 +2,7 @@
 
 ?>
 <div id="sidebar_page_tree">
-           <h3><?php echo elgg_echo("pages:navigation"); ?></h3>       
+       t<h3><?php echo elgg_echo("pages:navigation"); ?></h3>  
                <div id="pagesTree" class="pagesTreeContainer"></div>
 </div>
 <br class="clearfloat" />
index a390a9d6533431e603636d2480ee3be02e5dba0d..beb58bef359923fcabfd49989caf98c60aaa8ae1 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-    /**
+t/**
         * Elgg Pages welcome message
         * 
         * @package ElggPages
         */
         
         if($vars['entity']){
-        
-        foreach($vars['entity'] as $welcome){
-        
-           echo "<div class=\"contentWrapper pageswelcome\">" . $welcome->description . "</div>";
-           
-           }
-        
+t       
+t       foreach($vars['entity'] as $welcome){
+t       
+t      techo "<div class=\"contentWrapper pageswelcome\">" . $welcome->description . "</div>";
+t      t
+       t}
+t       
         } else {
 
 ?>
 
 <div class="contentWrapper pageswelcome"><p><?php echo sprintf(elgg_echo('pages:welcomemessage'), $vars['config']->sitename); ?></p></div>
-    
+t
 <?php
-    }
+t}
 ?>
index 2b20a9ed8d357b9fc7c883cfa9c54a2eceda0794..e08a26b853b362e5f0e6a2da79b7f4bb158e1b7d 100644 (file)
@@ -8,7 +8,7 @@
        $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
        $string = sprintf(elgg_echo("pages:river:updated"),$url) . " ";
        $string .= elgg_echo("pages:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-    
+t
 ?>
 
 <?php echo $string; ?>
index febe2965df371521c92ee9229b3e3a81172494a4..1e7333515741285f3e650f5e27596d42af2212a7 100644 (file)
@@ -6,9 +6,9 @@
        
        $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
        $string = sprintf(elgg_echo("pages:river:updated"),$url) . " ";
-    $string .= elgg_echo("pages:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+t$string .= elgg_echo("pages:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
        //$string .= "<div class=\"river_content\">Title: " . $object->title . "</div>";
-    
+t
 ?>
 
 <?php echo $string; ?>
index 6459a037310215bbbb7c50d98e3b05907627f27d..ccef69c063cc53c30cf23086fab6ff7295a25d8f 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 
-    /**
+t/**
         * Elgg pages widget edit
         *
         * @package ElggPages
index d975dcdc063aa299973c75e18a3e25051a64cd36..0ea1e20561ec34e0ba3366a1beb95da778093987 100644 (file)
@@ -1,11 +1,11 @@
 <style type="text/css">
 #pages_widget .pagination {
-    display:none;
+tdisplay:none;
 }
 </style>
 <?php
 
-     /**
+t /**
         * Elgg pages widget edit
         *
         * @package ElggPages
         * @copyright Curverider Ltd 2008-2010
         * @link http://elgg.com/
         */
-     
-     $num_display = (int) $vars['entity']->pages_num;
+t 
+t $num_display = (int) $vars['entity']->pages_num;
         if (!$num_display) {
                 $num_display = 4;
         }
-     
-     $pages = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => $num_display, 'full_view' => FALSE));
+t 
+t $pages = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => $num_display, 'full_view' => FALSE));
         
         if ($pages) {
                $pagesurl = $vars['url'] . "pg/pages/owned/" . page_owner_entity()->username;
                $pages .= "<div class=\"pages_widget_singleitem_more\"><a href=\"{$pagesurl}\">" . elgg_echo('pages:more') . "</a></div>";
         }
 
-     echo "<div id=\"pages_widget\">" . $pages . "</div>";
-     
+t echo "<div id=\"pages_widget\">" . $pages . "</div>";
+t 
 ?>
index 3ff0c3aae6f7255884d2309a59a664fb100b6337..8c9228e6322062c4b12f5ffcf5ac5e49ec3e4033 100644 (file)
                        $page_owner = $_SESSION['user'];
                        set_page_owner($page_owner->getGUID());
                }
-    
+t
        //get the owners welcome message if it exists
        $welcome_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'pages_welcome', 'owner_guid' => $page_owner->getGUID(), 'limit' => 1));
        global $CONFIG;
        add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
-    
+t
        $title = elgg_echo("pages:welcome");
        $area2 .= elgg_view_title($title);
        $area2 .= elgg_view("forms/pages/editwelcome", array('entity' => $welcome_message, 'owner' => $page_owner));
index 65f054dfbee01e65d05de11f8bc17a6693de4b5e..2b638574526e3019b9d2fff93e8ab82ca58465bb 100644 (file)
                        set_page_owner($_SESSION['guid']);
                }
                
-    if (($page_owner instanceof ElggEntity) && ($page_owner->canWriteToContainer())){
-        add_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/", 'pagesactions');
-        add_submenu_item(elgg_echo('pages:welcome'), $CONFIG->url . "pg/pages/welcome/", 'pagesactions');
-    }
-    
-    if(isloggedin())
-       add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
-    
-    add_submenu_item(elgg_echo('pages:all'),$CONFIG->wwwroot."mod/pages/world.php", 'pageslinksgeneral');
-    
+tif (($page_owner instanceof ElggEntity) && ($page_owner->canWriteToContainer())){
+ttadd_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/", 'pagesactions');
+ttadd_submenu_item(elgg_echo('pages:welcome'), $CONFIG->url . "pg/pages/welcome/", 'pagesactions');
+t}
+t
+tif(isloggedin())
+t      add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+t
+tadd_submenu_item(elgg_echo('pages:all'),$CONFIG->wwwroot."mod/pages/world.php", 'pageslinksgeneral');
+t
        $limit = get_input("limit", 10);
        $offset = get_input("offset", 0);