Restructuring HTML paragraph edit , reply, and new forum

1.9.x
aragonc 11 years ago
parent 09b01b9be6
commit b5ca2baa37
  1. 8
      main/css/base.css
  2. 21
      main/forum/editpost.php
  3. 5
      main/forum/forumfunction.inc.php
  4. 5
      main/forum/newthread.php
  5. 15
      main/forum/reply.php

@ -3898,14 +3898,16 @@ a.forum_group_link {
.forum_description {
color: #000;
font-weight: normal;
font-size: 11px;
font-size: 15px;
padding-top: 1em;
padding-bottom: .5em;
}
.forum_description p{
font-size: 11px;
}
.forum_title {
.forum_title h1{
color: #000;
font-size: 14px;
padding-top: 1em;
}
.forum_low_description {
color: #737780;

@ -184,19 +184,22 @@ if ($origin != 'learnpath') {
/* Display Forum Category and the Forum information */
echo "<table class=\"forum_table\" width=\"100%\">";
// The forum category
echo "<tr><th class=\"forum_head\" colspan=\"2\">";
echo '<a href="viewforum.php?&amp;origin='.$origin.'&amp;forum='.$current_forum['forum_id'].'" '.class_visible_invisible($current_forum['visibility']).'>'.prepare4display($current_forum['forum_title']).'</a><br />';
echo '<span class="forum_description">'.prepare4display($current_forum['forum_comment']).'</span>';
echo "</th>";
echo "</tr>";
echo '</table>';
/*New display forum div*/
echo '<div class="row">';
echo '<div class="span12">';
echo '<div class="forum_title">';
echo '<h1><a href="viewforum.php?&amp;origin='.$origin.'&amp;forum='.$current_forum['forum_id'].'" '.class_visible_invisible($current_forum['visibility']).'>'.prepare4display($current_forum['forum_title']).'</a></h1>';
echo '<p class="forum_description">'.prepare4display($current_forum['forum_comment']).'</p>';
echo '</div></div></div>';
/* End new display forum */
// Set forum attachment data into $_SESSION
getAttachedFiles($current_forum['forum_id'], $current_thread['thread_id'], $current_post['post_id']);
// The form for the reply
echo '<div class="row">';
echo '<div class="span12">';
$values = show_edit_post_form($forum_setting, $current_post, $current_thread, $current_forum, isset($_SESSION['formelements']) ? $_SESSION['formelements'] : '');
echo '</div></div>';
if (!empty($values) and isset($_POST['SubmitPost'])) {
store_edit_post($values);
@ -219,8 +222,10 @@ if (!empty($values) and isset($_POST['SubmitPost'])) {
}
} else {
// Only show Forum attachment ajax form when do not pass form submit
echo '<div class="row"><div class="span12">';
$attachmentAjaxForm = getAttachmentAjaxForm($current_forum['forum_id'], $current_thread['thread_id'], $current_post['post_id']);
echo $attachmentAjaxForm;
echo '</div></div>';
}
// Footer

@ -65,6 +65,7 @@ $(function () {
uploadTable: $('.files'),
downloadTable: $('.files'),
buildUploadRow: function (files, index) {
advanced_parameters();
return $('<tr><td>' + files[index].name + '<\/td>' +
'<td class=\"file_upload_progress\"><div><\/div><\/td>' +
'<td class=\"file_upload_cancel\">' +
@ -2439,11 +2440,11 @@ function show_add_post_form($current_forum, $forum_setting, $action = '', $id =
$form->addElement('hidden', 'sec_token');
$form->setConstants(array('sec_token' => $token));
$iframe = null;
/*$iframe = null;
$myThread = Security::remove_XSS($myThread);
if ($forum_setting['show_thread_iframe_on_reply'] && $action != 'newthread' && !empty($myThread)) {
$iframe = "<iframe style=\"border: 1px solid black\" src=\"iframe_thread.php?forum=".Security::remove_XSS($my_forum)."&amp;thread=".$myThread."#".Security::remove_XSS($my_post)."\" width=\"100%\"></iframe>";
}
}*/
if (!empty($iframe)) {
$form->addElement('label', get_lang('Thread'), $iframe);

@ -159,15 +159,20 @@ echo '<a href="viewforum.php?origin='.$origin.'&forum='.Security::remove_XSS($_G
echo '</div>';
// Set forum attachment data into $_SESSION
echo '<div class="row">';
echo '<div class="span12">';
getAttachedFiles($current_forum['forum_id'], 0, 0);
$values = show_add_post_form($current_forum, $forum_setting, 'newthread', '', isset($_SESSION['formelements']) ? $_SESSION['formelements'] : null);
echo '</div></div>';
if (!empty($values) && isset($values['SubmitPost'])) {
// Add new thread in table forum_thread.
store_thread($current_forum, $values);
} else {
// Only show Forum attachment ajax form when do not pass form submit
echo '<div class="row"><div class="span12">';
$attachmentAjaxForm = getAttachmentAjaxForm($current_forum['forum_id'], $current_thread['thread_id'], 0);
echo $attachmentAjaxForm;
echo '</div></div>';
}
/* FOOTER */

@ -149,14 +149,21 @@ if ($origin != 'learnpath') {
} else {
echo '<div style="height:15px">&nbsp;</div>';
}
/*New display forum div*/
echo '<div class="row">';
echo '<div class="span12">';
echo '<div class="forum_title">';
echo '<h1><a href="viewforum.php?&amp;origin='.$origin.'&amp;forum='.$current_forum['forum_id'].'" '.class_visible_invisible($current_forum['visibility']).'>'.prepare4display($current_forum['forum_title']).'</a></h1>';
echo '<p class="forum_description">'.prepare4display($current_forum['forum_comment']).'</p>';
echo '</div></div></div>';
/* End new display forum */
// The form for the reply
$my_action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : '';
$my_post = isset($_GET['post']) ? Security::remove_XSS($_GET['post']) : '';
$my_elements = isset($_SESSION['formelements']) ? $_SESSION['formelements'] : '';
$values = show_add_post_form($current_forum, $forum_setting, $my_action, $my_post, $my_elements);
echo '<div class="row"><div class="span12">';
$values = show_add_post_form($current_forum, $forum_setting, $my_action, $my_post, $my_elements);
echo '</div></div>';
if (!empty($values) AND isset($_POST['SubmitPost'])) {
$result = store_reply($current_forum, $values);
//@todo split the show_add_post_form function

Loading…
Cancel
Save