diff options
Diffstat (limited to 'mod')
19 files changed, 102 insertions, 103 deletions
diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php index 3dd0aff6a..47f306ba1 100644 --- a/mod/blog/views/default/forms/blog/save.php +++ b/mod/blog/views/default/forms/blog/save.php @@ -106,45 +106,45 @@ echo <<<___HTML $draft_warning -<p> +<div> <label for="blog_title">$title_label</label> $title_input -</p> +</div> -<p> +<div> <label for="blog_excerpt">$excerpt_label</label> $excerpt_input -</p> +</div> <label for="blog_description">$body_label</label> $body_input <br /> -<p> +<div> <label for="blog_tags">$tags_label</label> $tags_input -</p> +</div> -<p> +<div> <label for="blog_comments_on">$comments_label</label> $comments_input -</p> +</div> -<p> +<div> <label for="blog_access_id">$access_label</label> $access_input -</p> +</div> -<p> +<div> <label for="blog_status">$status_label</label> $status_input -</p> +</div> $categories_input -<p class="elgg-subtext pvm mbn bta"> +<div class="elgg-subtext pvm mbn bta"> $save_status <span class="blog-save-status-time">$saved</span> -</p> +</div> $guid_input $container_guid_input diff --git a/mod/blog/views/default/widgets/blog/edit.php b/mod/blog/views/default/widgets/blog/edit.php index fa2dac9aa..4c3b1d4e2 100644 --- a/mod/blog/views/default/widgets/blog/edit.php +++ b/mod/blog/views/default/widgets/blog/edit.php @@ -16,7 +16,7 @@ $params = array( $dropdown = elgg_view('input/dropdown', $params); ?> -<p> +<div> <?php echo elgg_echo('blog:numbertodisplay'); ?>: <?php echo $dropdown; ?> -</p> +</div> diff --git a/mod/categories/views/default/input/categories.php b/mod/categories/views/default/input/categories.php index 6f57a0c29..9b7371e4c 100644 --- a/mod/categories/views/default/input/categories.php +++ b/mod/categories/views/default/input/categories.php @@ -25,7 +25,7 @@ if (!empty($categories)) { ?> -<p class="categories"> +<div class="categories"> <label><?php echo elgg_echo('categories'); ?></label><br /> <?php echo elgg_view('input/checkboxes', array( @@ -36,7 +36,7 @@ if (!empty($categories)) { ?> <input type="hidden" name="universal_category_marker" value="on" /> -</p> +</div> <?php diff --git a/mod/diagnostics/views/default/forms/diagnostics/download.php b/mod/diagnostics/views/default/forms/diagnostics/download.php index de19332f1..b0abe8434 100644 --- a/mod/diagnostics/views/default/forms/diagnostics/download.php +++ b/mod/diagnostics/views/default/forms/diagnostics/download.php @@ -1,2 +1,5 @@ <?php +/** + * Diagnostics download form + */ echo elgg_view('input/submit', array('value' => elgg_echo('diagnostics:download')));
\ No newline at end of file diff --git a/mod/file/views/default/forms/file/upload.php b/mod/file/views/default/forms/file/upload.php index 2ab1ce3e5..06b97388b 100644 --- a/mod/file/views/default/forms/file/upload.php +++ b/mod/file/views/default/forms/file/upload.php @@ -21,35 +21,35 @@ if ($guid) { } ?> -<p> +<div> <label><?php echo $file_label; ?></label><br /> <?php echo elgg_view('input/file', array('internalname' => 'upload')); ?> -</p> -<p> +</div> +<div> <label><?php echo elgg_echo('title'); ?></label><br /> <?php echo elgg_view('input/text', array('internalname' => 'title', 'value' => $title)); ?> -</p> -<p> +</div> +<div> <label><?php echo elgg_echo('description'); ?></label> <?php echo elgg_view('input/longtext', array('internalname' => 'description', 'value' => $desc)); ?> -</p> -<p> +</div> +<div> <label><?php echo elgg_echo('tags'); ?></label> <?php echo elgg_view('input/tags', array('internalname' => 'tags', 'value' => $tags)); ?> -</p> +</div> <?php $categories = elgg_view('input/categories', $vars); if ($categories) { - echo "<p>$categories</p>"; + echo $categories; } ?> -<p> +<div> <label><?php echo elgg_echo('access'); ?></label><br /> <?php echo elgg_view('input/access', array('internalname' => 'access_id', 'value' => $access_id)); ?> -</p> -<p> +</div> +<div> <?php echo elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $container_guid)); @@ -66,4 +66,4 @@ if ($guid) { echo elgg_view('input/submit', array('value' => elgg_echo("save"))); ?> -</p> +</div> diff --git a/mod/file/views/default/widgets/filerepo/edit.php b/mod/file/views/default/widgets/filerepo/edit.php index 7da7e9401..6de77fc78 100644 --- a/mod/file/views/default/widgets/filerepo/edit.php +++ b/mod/file/views/default/widgets/filerepo/edit.php @@ -19,7 +19,7 @@ $params = array( $dropdown = elgg_view('input/dropdown', $params); ?> -<p> +<div> <?php echo elgg_echo('file:num_files'); ?>: <?php echo $dropdown; ?> -</p> +</div> diff --git a/mod/groups/views/default/widgets/a_users_groups/edit.php b/mod/groups/views/default/widgets/a_users_groups/edit.php index c7391620e..4d61b3259 100644 --- a/mod/groups/views/default/widgets/a_users_groups/edit.php +++ b/mod/groups/views/default/widgets/a_users_groups/edit.php @@ -19,7 +19,7 @@ $params = array( $dropdown = elgg_view('input/dropdown', $params); ?> -<p> +<div> <?php echo elgg_echo('groups:widget:num_display'); ?>: <?php echo $dropdown; ?> -</p> +</div> diff --git a/mod/invitefriends/views/default/forms/invitefriends/invite.php b/mod/invitefriends/views/default/forms/invitefriends/invite.php index 555311dd0..2597598de 100644 --- a/mod/invitefriends/views/default/forms/invitefriends/invite.php +++ b/mod/invitefriends/views/default/forms/invitefriends/invite.php @@ -13,18 +13,18 @@ if (elgg_get_config('allow_registration')) { $default = elgg_echo('invitefriends:message:default', array($site->name)); echo <<< HTML -<p class="margin-top"> +<div> <label> $introduction <textarea class="elgg-input-textarea" name="emails" ></textarea> </label> -</p> -<p> +</div> +<div> <label> $message <textarea class="elgg-input-textarea" name="emailmessage" >$default</textarea> </label> -</p> +</div> HTML; echo elgg_view('input/submit', array('value' => elgg_echo('send'))); diff --git a/mod/messages/views/default/forms/messages/reply.php b/mod/messages/views/default/forms/messages/reply.php index 22c982ec2..4c1832672 100644 --- a/mod/messages/views/default/forms/messages/reply.php +++ b/mod/messages/views/default/forms/messages/reply.php @@ -17,25 +17,25 @@ echo elgg_view('input/hidden', array( )); ?> -<p> +<div> <label><?php echo elgg_echo("messages:title"); ?>: <br /></label> <?php echo elgg_view('input/text', array( 'internalname' => 'subject', 'value' => $reply_title, )); ?> -</p> -<p> +</div> +<div> <label><?php echo elgg_echo("messages:message"); ?>:</label> <?php echo elgg_view("input/longtext", array( 'internalname' => 'body', 'value' => '', )); ?> -</p> -<p> +</div> +<div> <?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?> -</p> +</div> <script type="text/javascript"> $(document).ready(function() { diff --git a/mod/messages/views/default/forms/messages/send.php b/mod/messages/views/default/forms/messages/send.php index 214ff23f9..3ddb25fd9 100644 --- a/mod/messages/views/default/forms/messages/send.php +++ b/mod/messages/views/default/forms/messages/send.php @@ -22,26 +22,26 @@ $recipient_drop_down = elgg_view('input/dropdown', array( )); ?> -<p> +<div> <label><?php echo elgg_echo("messages:to"); ?>: </label> <?php echo $recipient_drop_down; ?> -</p> -<p> +</div> +<div> <label><?php echo elgg_echo("messages:title"); ?>: <br /></label> <?php echo elgg_view('input/text', array( 'internalname' => 'subject', 'value' => $subject, )); ?> -</p> -<p> +</div> +<div> <label><?php echo elgg_echo("messages:message"); ?>:</label> <?php echo elgg_view("input/longtext", array( 'internalname' => 'body', 'value' => $body, )); ?> -</p> -<p> +</div> +<div> <?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?> -</p> +</div> diff --git a/mod/notifications/views/default/forms/notificationsettings/groupsave.php b/mod/notifications/views/default/forms/notificationsettings/groupsave.php index 632e34a54..a38fe48d0 100644 --- a/mod/notifications/views/default/forms/notificationsettings/groupsave.php +++ b/mod/notifications/views/default/forms/notificationsettings/groupsave.php @@ -6,7 +6,7 @@ */ global $NOTIFICATION_HANDLERS; -foreach($NOTIFICATION_HANDLERS as $method => $foo) { +foreach ($NOTIFICATION_HANDLERS as $method => $foo) { $subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'group', 'limit' => 99999)); $tmparray = array(); if ($subsbig[$method]) { @@ -24,22 +24,19 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) { <?php echo elgg_view('notifications/subscriptions/jsfuncs',$vars); ?> - - <p> + <div> <?php - echo elgg_echo('notifications:subscriptions:groups:description'); - ?> - </p> + </div> <?php if (isset($vars['groups']) && !empty($vars['groups'])) { ?> - <table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%"> - <tr> - <td> </td> + <table id="notificationstable" cellspacing="0" cellpadding="4" width="100%"> + <tr> + <td> </td> <?php $i = 0; @@ -48,13 +45,13 @@ if (isset($vars['groups']) && !empty($vars['groups'])) { echo "<td class='spacercolumn'> </td>"; } ?> - <td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></td> + <td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></td> <?php $i++; } ?> - <td> </td> - </tr> + <td> </td> + </tr> <?php foreach($vars['groups'] as $group) { @@ -79,24 +76,22 @@ END; } ?> - <tr> - <td class="namefield"> - <p> + <tr> + <td class="namefield"> + <div> <?php echo $group->name; ?> - </p> - </td> -<?php - echo $fields; -?> - <td> </td> - </tr> + </div> + </td> + <?php echo $fields; ?> + <td> </td> + </tr> <?php } ?> - </table> + </table> <?php } ?> - <input type="submit" value="<?php echo elgg_echo('save'); ?>" /> + <input type="submit" value="<?php echo elgg_echo('save'); ?>" /> </div> </div> diff --git a/mod/notifications/views/default/forms/notificationsettings/save.php b/mod/notifications/views/default/forms/notificationsettings/save.php index ec0c9c701..0306080b8 100644 --- a/mod/notifications/views/default/forms/notificationsettings/save.php +++ b/mod/notifications/views/default/forms/notificationsettings/save.php @@ -1,4 +1,7 @@ <?php +/** + * Personal notifications form body + */ echo elgg_view('notifications/subscriptions/personal'); echo elgg_view('notifications/subscriptions/collections'); diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php index 8daae6f4f..28d9fb5b8 100644 --- a/mod/notifications/views/default/notifications/subscriptions/collections.php +++ b/mod/notifications/views/default/notifications/subscriptions/collections.php @@ -22,7 +22,7 @@ <p class="margin-none"> <?php echo elgg_echo('notifications:subscriptions:friends:description'); ?> </p> -<table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%"> +<table id="notificationstable" cellspacing="0" cellpadding="4" width="100%"> <tr> <td> </td> <?php diff --git a/mod/notifications/views/default/notifications/subscriptions/personal.php b/mod/notifications/views/default/notifications/subscriptions/personal.php index e75bda758..7dac908fc 100644 --- a/mod/notifications/views/default/notifications/subscriptions/personal.php +++ b/mod/notifications/views/default/notifications/subscriptions/personal.php @@ -11,7 +11,7 @@ global $NOTIFICATION_HANDLERS; </h3> </div> </div> -<table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%"> +<table id="notificationstable" cellspacing="0" cellpadding="4" width="100%"> <tr> <td> </td> <?php diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php index e4188a29b..793e5c39e 100644 --- a/mod/pages/views/default/forms/pages/edit.php +++ b/mod/pages/views/default/forms/pages/edit.php @@ -1,6 +1,6 @@ <?php /** - * Page edit form. + * Page edit form body * * @package ElggPages */ @@ -8,24 +8,24 @@ $variables = elgg_get_config('pages'); foreach ($variables as $name => $type) { ?> -<p> +<div> <label><?php echo elgg_echo("pages:$name") ?></label><br /> <?php echo elgg_view("input/$type", array( 'internalname' => $name, 'value' => $vars[$name], )); ?> -</p> +</div> <?php } $cats = elgg_view('categories', $vars); if (!empty($cats)) { - echo "<p>$cats</p>"; + echo $cats; } -echo '<p>'; +echo '<div>'; if ($vars['guid']) { echo elgg_view('input/hidden', array( 'internalname' => 'page_guid', @@ -45,4 +45,4 @@ if ($vars['parent_guid']) { echo elgg_view('input/submit', array('value' => elgg_echo('save'))); -echo '</p>'; +echo '</div>'; diff --git a/mod/pages/views/default/widgets/pages/edit.php b/mod/pages/views/default/widgets/pages/edit.php index a67f76ab0..69710e50a 100644 --- a/mod/pages/views/default/widgets/pages/edit.php +++ b/mod/pages/views/default/widgets/pages/edit.php @@ -18,7 +18,7 @@ $params = array( $dropdown = elgg_view('input/dropdown', $params); ?> -<p> +<div> <?php echo elgg_echo('pages:num'); ?>: <?php echo $dropdown; ?> -</p> +</div> diff --git a/mod/reportedcontent/views/default/reportedcontent/form.php b/mod/reportedcontent/views/default/reportedcontent/form.php index 83076c282..b520d4060 100644 --- a/mod/reportedcontent/views/default/reportedcontent/form.php +++ b/mod/reportedcontent/views/default/reportedcontent/form.php @@ -21,7 +21,7 @@ $owner = elgg_get_logged_in_user_entity(); <form action="<?php echo elgg_get_site_url(); ?>action/reportedcontent/add" method="post" class="mtm"> <?php echo elgg_view('input/securitytoken'); ?> - <p> + <div> <label> <?php echo elgg_echo('reportedcontent:title'); ?> <?php @@ -33,8 +33,8 @@ $owner = elgg_get_logged_in_user_entity(); ?> </label> - </p> - <p> + </div> + <div> <label> <?php echo elgg_echo('reportedcontent:address'); ?> <?php @@ -46,8 +46,8 @@ $owner = elgg_get_logged_in_user_entity(); ?> </label> - </p> - <p> + </div> + <div> <label> <?php echo elgg_echo('reportedcontent:description'); ?> </label> @@ -59,9 +59,8 @@ $owner = elgg_get_logged_in_user_entity(); )); ?> - </p> - <p> + </div> + <div> <input type="submit" value="<?php echo elgg_echo('reportedcontent:report'); ?>" /> - </p> - + </div> </form> diff --git a/mod/reportedcontent/views/default/widgets/reportedcontent/edit.php b/mod/reportedcontent/views/default/widgets/reportedcontent/edit.php index e247a9299..810d549af 100644 --- a/mod/reportedcontent/views/default/widgets/reportedcontent/edit.php +++ b/mod/reportedcontent/views/default/widgets/reportedcontent/edit.php @@ -16,8 +16,7 @@ $params = array( $dropdown = elgg_view('input/dropdown', $params); ?> -<p> +<div> <?php echo elgg_echo('reportedcontent:numbertodisplay'); ?>: <?php echo $dropdown; ?> -</p> - +</div> diff --git a/mod/twitterservice/views/default/usersettings/twitterservice/edit.php b/mod/twitterservice/views/default/usersettings/twitterservice/edit.php index 11afa6671..66f5c54f5 100644 --- a/mod/twitterservice/views/default/usersettings/twitterservice/edit.php +++ b/mod/twitterservice/views/default/usersettings/twitterservice/edit.php @@ -9,14 +9,14 @@ $access_key = get_plugin_usersetting('access_key', $user_id, 'twitterservice'); $access_secret = get_plugin_usersetting('access_secret', $user_id, 'twitterservice'); $site_name = elgg_get_site_entity()->name; -echo '<p>' . elgg_echo('twitterservice:usersettings:description', array($site_name)) . '</p>'; +echo '<div>' . elgg_echo('twitterservice:usersettings:description', array($site_name)) . '</div>'; if (!$access_key || !$access_secret) { // send user off to validate account $request_link = twitterservice_get_authorize_url(); - echo '<p>' . elgg_echo('twitterservice:usersettings:request', array($request_link, $site_name)) . '</p>'; + echo '<div>' . elgg_echo('twitterservice:usersettings:request', array($request_link, $site_name)) . '</div>'; } else { $url = elgg_get_site_url() . "pg/twitterservice/revoke"; - echo '<p class="twitter_anywhere">' . elgg_echo('twitterservice:usersettings:authorized', array($site_name, $twitter_name)) . '</p>'; - echo '<p>' . sprintf(elgg_echo('twitterservice:usersettings:revoke'), $url) . '</p>'; + echo '<div class="twitter_anywhere">' . elgg_echo('twitterservice:usersettings:authorized', array($site_name, $twitter_name)) . '</div>'; + echo '<div>' . sprintf(elgg_echo('twitterservice:usersettings:revoke'), $url) . '</div>'; } |