diff options
| -rw-r--r-- | mod/sitepages/languages/en.php | 18 | ||||
| -rw-r--r-- | mod/sitepages/views/default/sitepages/forms/edit.php | 15 | ||||
| -rw-r--r-- | mod/sitepages/views/default/sitepages/forms/editfront.php | 14 | ||||
| -rw-r--r-- | mod/sitepages/views/default/sitepages/forms/editmeta.php | 16 | ||||
| -rw-r--r-- | mod/sitepages/views/default/sitepages/keywords.php | 3 | ||||
| -rw-r--r-- | mod/sitepages/views/default/sitepages/menu.php | 1 | ||||
| -rw-r--r-- | mod/sitepages/views/default/sitepages/metatags.php | 2 |
7 files changed, 30 insertions, 39 deletions
diff --git a/mod/sitepages/languages/en.php b/mod/sitepages/languages/en.php index 92cddb949..7690d0ca3 100644 --- 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 16100c10a..72fb42ccf 100644 --- 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 e13f16f6e..d42d496e2 100644 --- 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 3939a8447..cb67bd41d 100644 --- 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"); $form_body = <<<___EOT
- <h3 class='settings'>$description</h3>
- <p class='longtext_editarea'>$input_description</p><br />
- <h3 class='settings'>$metatags</h3>
- <p class='longtext_editarea'>$input_keywords</p>
-
- $hidden_guid
- <br />
- $submit_input
+<p><label>$description
+$input_description</p></label>
+
+<p><label>$metatags
+$input_keywords</p></label>
+
+$hidden_guid
+$submit_input
___EOT;
diff --git a/mod/sitepages/views/default/sitepages/keywords.php b/mod/sitepages/views/default/sitepages/keywords.php index d46efb5bc..457ab99c7 100644 --- 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 "
<h3>$title</h3>
<p>$instructions</p>
-<span id=\"sitepagesKeywordMoreInfo\" class=\"xhidden\">$more_info</span>
-
+$more_info
<ul>
$keywords_html
</ul>
diff --git a/mod/sitepages/views/default/sitepages/menu.php b/mod/sitepages/views/default/sitepages/menu.php index 5cffc610a..9913a3ff7 100644 --- 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 107a5871a..d3939f73e 100644 --- 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) {
echo <<<___END
- <style>
+ <style type="text/css">
{$custom_css->css}
</style>
|