Updated SitePages to new code standards & UI.

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

diff --git a/mod/sitepages/languages/en.php b/mod/sitepages/languages/en.php
index 92cddb94979ecea6930c868df889585be3e8c09f..7690d0ca3d41d5c2ade3ca9baa3a5934a722012f 100644 (file)
--- a/mod/sitepages/languages/en.php
+++ b/mod/sitepages/languages/en.php
@@ -58,22 +58,18 @@ $english = array(
 
        'sitepages:keywords_instructions_more' =>
                '
-               You can build your own keywords for views and entities.<br /><br />
+               <p>You can build your own keywords for views and entities.</p>
 
-               [[entity: type=type, subtype=subtype, owner=username, limit=number]]<br />
+               <p>[[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]]
+               [[entity: type=object, subtype=blog, owner=admin, limit=5]]</p>
 
-               <br /><br />
+               <p>You can also specify a valid Elgg view:<br />
+               [[view: elgg_view, name=value]]</p>
 
-               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 />',
+               <p>Ex: To show a text input with a default value:<br />
+               [[view: input/text, value=This is a default value]]</p>',
 
        'sitepages:keywords:login_box' => 'A standard login box.  Useful for the logged out content area.',
        'sitepages:keywords:site_stats' => 'This does not exist yet.',

diff --git a/mod/sitepages/views/default/sitepages/forms/edit.php b/mod/sitepages/views/default/sitepages/forms/edit.php
index 16100c10a9fb75d6e5405c319d9269f3c62670e1..72fb42ccf9809322e309aeda01c0de2b2423e6c3 100644 (file)
--- a/mod/sitepages/views/default/sitepages/forms/edit.php
+++ b/mod/sitepages/views/default/sitepages/forms/edit.php
@@ -30,20 +30,19 @@ $tag_input = elgg_view('input/tags', array('internalname' => 'sitepages_tags', '
 $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
 $hidden_value = elgg_view('input/hidden', array('internalname' => 'page_type', 'value' => $page_type));
 
-$tag_label = '<h3>' . elgg_echo('tags') . '</h3>';
+$tag_label = elgg_echo('tags');
 $external_page_title = elgg_echo("sitepages:$page_type");
 
 $form_body = <<<___EOT
 
-<h3 class='settings'>$external_page_title</h3>
-<p class='longtext_editarea'>$input_area</p>
-<p>
-       $tag_label
-       $tag_input
-</p>
+<p><label>$external_page_title
+$input_area</p></label>
+
+<p><label>$tag_label
+$tag_input</p></label>
+
 $hidden_value
 $hidden_guid
-<br />
 $submit_input
 
 ___EOT;

diff --git a/mod/sitepages/views/default/sitepages/forms/editfront.php b/mod/sitepages/views/default/sitepages/forms/editfront.php
index e13f16f6e8885d808793056989b9abb6a9155781..d42d496e2b80feba20d7bc8de85b97895e104d76 100644 (file)
--- a/mod/sitepages/views/default/sitepages/forms/editfront.php
+++ b/mod/sitepages/views/default/sitepages/forms/editfront.php
@@ -38,18 +38,16 @@ $css_title = elgg_echo("sitepages:css");
 //construct the form
 $form_body = <<<___EOT
 
-       <h3 class='settings'>$css_title</h3>
-       <p class='longtext_editarea'>$input_css</p><br />
+       <p><label>$css_title
+       $input_css</label></p>
 
+       <p><label>$logged_in_content_title
+       $input_logged_in_content</label></p>
 
-       <h3 class='settings'>$logged_in_content_title</h3>
-       <p class='longtext_editarea'>$input_logged_in_content</p><br />
-
-       <h3 class='settings'>$logged_out_content_title</h3>
-       <p class='longtext_editarea'>$input_logged_out_content</p>
+       <p><label>$logged_out_content_title
+       $input_logged_out_content</label></p>
 
        $hidden_guid
-       <br />
        $submit_input
        $preview
 

diff --git a/mod/sitepages/views/default/sitepages/forms/editmeta.php b/mod/sitepages/views/default/sitepages/forms/editmeta.php
index 3939a8447f89eb972424ab4e39c052ef9e1e9807..cb67bd41da93c0c83065debad6f2067b084755b3 100644 (file)
--- a/mod/sitepages/views/default/sitepages/forms/editmeta.php
+++ b/mod/sitepages/views/default/sitepages/forms/editmeta.php
@@ -28,14 +28,14 @@ $metatags = elgg_echo("sitepages:metatags");
 \r
 $form_body = <<<___EOT\r
 \r
-       <h3 class='settings'>$description</h3>\r
-       <p class='longtext_editarea'>$input_description</p><br />\r
-       <h3 class='settings'>$metatags</h3>\r
-       <p class='longtext_editarea'>$input_keywords</p>\r
-\r
-       $hidden_guid\r
-       <br />\r
-       $submit_input\r
+<p><label>$description\r
+$input_description</p></label>\r
+\r
+<p><label>$metatags\r
+$input_keywords</p></label>\r
+\r
+$hidden_guid\r
+$submit_input\r
 \r
 ___EOT;\r
 \r

diff --git a/mod/sitepages/views/default/sitepages/keywords.php b/mod/sitepages/views/default/sitepages/keywords.php
index d46efb5bc3a9585d7d608b3effa9825dc085d253..457ab99c720f226e32c78d222ea4b3e406b41cc5 100644 (file)
--- a/mod/sitepages/views/default/sitepages/keywords.php
+++ b/mod/sitepages/views/default/sitepages/keywords.php
@@ -23,8 +23,7 @@ foreach ($keywords as $keyword => $info) {
 echo "\r
 <h3>$title</h3>\r
 <p>$instructions</p>\r
-<span id=\"sitepagesKeywordMoreInfo\" class=\"xhidden\">$more_info</span>\r
-\r
+$more_info\r
 <ul>\r
        $keywords_html\r
 </ul>\r

diff --git a/mod/sitepages/views/default/sitepages/menu.php b/mod/sitepages/views/default/sitepages/menu.php
index 5cffc610ae265c0c9bb4736202cd73ef64ee4c8d..9913a3ff7a912eea0b088c8ecc55c014c9826a25 100644 (file)
--- a/mod/sitepages/views/default/sitepages/menu.php
+++ b/mod/sitepages/views/default/sitepages/menu.php
@@ -11,7 +11,6 @@
 
 $page_type = $vars['page_type'];
 $url = $vars['url'] . 'pg/sitepages/edit/';
-
 ?>
 
 <div class="elgg_horizontal_tabbed_nav margin_top">

diff --git a/mod/sitepages/views/default/sitepages/metatags.php b/mod/sitepages/views/default/sitepages/metatags.php
index 107a5871aeb84a985b2906fc78b6975323215630..d3939f73ed45e1c3ed99c41061216a0c551b5930 100644 (file)
--- a/mod/sitepages/views/default/sitepages/metatags.php
+++ b/mod/sitepages/views/default/sitepages/metatags.php
@@ -30,7 +30,7 @@ if (get_context() == 'sitepages:front') {
        if ($custom_css && $custom_css->css) {\r
                echo <<<___END\r
 \r
-               <style>\r
+               <style type="text/css">\r
                {$custom_css->css}\r
                </style>\r
 \r