Added dynamic keywords for view and entity.

Separated logged in and logged out front page views.
Fixed a problem with saving metatags.
Added PHPDoc headers.
Updated language strings.


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

1 files changed, 33 insertions, 1 deletions

diff --git a/mod/sitepages/languages/en.php b/mod/sitepages/languages/en.php
index ec08493c9..92cddb949 100644
--- a/mod/sitepages/languages/en.php
+++ b/mod/sitepages/languages/en.php
@@ -29,7 +29,8 @@ $english = array(
 	'sitepages:metadescription' => "Meta description for search engines",
 	'sitepages:metatags' => "Meta tags for search engines (use a comma)",
 	'sitepages:seocreated' => "Your search engine information has been added",
-	'sitepages:front_content' => "Frontpage content",
+	'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:addcontent' => "You can add content here via your admin tools. Look for the external pages link under admin.",
 	'item:object:front' => 'Front page items',
@@ -45,6 +46,37 @@ $english = array(
 	 */
 	'sitepages:deleteerror' => "There was a problem deleting the old page",
 	'sitepages:error' => "There has been an error, please try again and if the problem persists, contact the administrator",
+
+	/**
+	 * Key words
+	 */
+	'sitepages:keywords_title' => 'Keywords',
+	'sitepages:keywords_instructions' =>
+		'Keywords are replaced with content when viewed.  They must be surrounded by
+		two square brackets ([[ and ]]).  You can build your own or use the ones listed below.
+		Hover over a keyword to read its description.',
+
+	'sitepages:keywords_instructions_more' =>
+		'
+		You can build your own keywords for views and entities.<br /><br />
+
+		[[entity: type=type, subtype=subtype, owner=username, limit=number]]<br />
+
+		EX: To show 5 blog posts by admin:<br />
+		[[entity: type=object, subtype=blog, owner=admin, limit=5]]
+
+		<br /><br />
+
+		You can also specify a valid Elgg view:<br />
+		[[view: elgg_view, name=value]]<br />
+
+		Ex: To show a text input with a default value:<br />
+		[[view: input/text, value=This is a default value]]
+
+		<br /><br />',
+
+	'sitepages:keywords:login_box' => 'A standard login box.  Useful for the logged out content area.',
+	'sitepages:keywords:site_stats' => 'This does not exist yet.',
 );
 
 add_translation('en', $english);
\ No newline at end of file