mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Fixes #760, Fixes #963 - Disabling WYSIWYG on Subtmit news was failing. Bbarea panel and textarea now have a matching width.

Browse Source
This commit is contained in:
Cameron
2015-04-17 12:18:08 -07:00
parent 4a4e2447a1
commit 654fd32677
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_web/css/e107.css
View File

@@ -119,7 +119,7 @@ a.cpage-np.current { text-decoration: none; }
.image-preview {} .image-preview {}
/* BBcode textareas */ /* BBcode textareas */
div.bbarea.large, .tbox.large, .helpbox.large { width: 95% !important; } div.bbarea.large, .tbox.large, .helpbox.large, .bbcode-panel { width: 95% !important; }
div.bbarea.medium, .tbox.medium, .helpbox.medium { width: 60% !important; } div.bbarea.medium, .tbox.medium, .helpbox.medium { width: 60% !important; }
div.bbarea.small, .tbox.small, .helpbox.small { width: 250px !important; } div.bbarea.small, .tbox.small, .helpbox.small { width: 250px !important; }

40
submitnews.php
View File

@@ -24,6 +24,8 @@ if (!isset($pref['subnews_class']))
$pref['subnews_class'] = e_UC_MEMBER; $pref['subnews_class'] = e_UC_MEMBER;
} }
if (!check_class($pref['subnews_class'])) if (!check_class($pref['subnews_class']))
{ {
$ns->tablerender(NWSLAN_12, NWSLAN_11); $ns->tablerender(NWSLAN_12, NWSLAN_11);
@@ -136,20 +138,27 @@ if (isset($_POST['submitnews_submit']) && $_POST['submitnews_title'] && $_POST['
} }
} }
$text = "";
if (!defined("USER_WIDTH")) { define("USER_WIDTH","width:95%"); } if (!defined("USER_WIDTH")) { define("USER_WIDTH","width:95%"); }
$text = "
<div style='text-align:center'>
if (!empty($pref['news_subheader']))
{
$text .= "
<div class='alert alert-block alert-info '>
".$tp->toHTML($pref['news_subheader'], true, "BODY")."
</div>";
}
$text .= "
<div>
<form id='dataform' method='post' action='".e_SELF."' enctype='multipart/form-data' onsubmit='return frmVerify()'> <form id='dataform' method='post' action='".e_SELF."' enctype='multipart/form-data' onsubmit='return frmVerify()'>
<table class='table fborder'>"; <table class='table fborder'>";
if (!empty($pref['news_subheader']))
{
$text .= "
<tr>
<td colspan='2' class='forumheader3'>".$tp->toHTML($pref['news_subheader'], TRUE, "TITLE")."<br /></td>
</tr>";
}
if (!USER) if (!USER)
{ {
@@ -173,14 +182,14 @@ $text .= "
<td style='width:20%' class='forumheader3'>".NWSLAN_6.": </td> <td style='width:20%' class='forumheader3'>".NWSLAN_6.": </td>
<td style='width:80%' class='forumheader3'>"; <td style='width:80%' class='forumheader3'>";
if (!$sql->db_Select("news_category")) if (!$sql->select("news_category"))
{ {
$text .= NWSLAN_10; $text .= NWSLAN_10;
} }
else else
{ {
$text .= " $text .= "
<select name='cat_id' class='tbox'>"; <select name='cat_id' class='tbox form-control'>";
while (list($cat_id, $cat_name, $cat_icon) = $sql->db_Fetch(MYSQL_NUM)) while (list($cat_id, $cat_name, $cat_icon) = $sql->db_Fetch(MYSQL_NUM))
{ {
$sel = (varset($_POST['cat_id'],'') == $cat_id) ? "selected='selected'" : ""; $sel = (varset($_POST['cat_id'],'') == $cat_id) ? "selected='selected'" : "";
@@ -195,7 +204,7 @@ $text .= "
<tr> <tr>
<td style='width:20%' class='forumheader3'>".LAN_62."</td> <td style='width:20%' class='forumheader3'>".LAN_62."</td>
<td style='width:80%' class='forumheader3'> <td style='width:80%' class='forumheader3'>
<input class='tbox' type='text' id='submitnews_title' name='submitnews_title' size='60' value='".$tp->toHTML(vartrue($_POST['submitnews_title']),TRUE,'USER_TITLE')."' maxlength='200' style='width:90%' required /> <input class='tbox form-control' type='text' id='submitnews_title' name='submitnews_title' size='60' value='".$tp->toHTML(vartrue($_POST['submitnews_title']),TRUE,'USER_TITLE')."' maxlength='200' style='width:90%' required />
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -230,6 +239,13 @@ $text .= "
$ns->tablerender(LAN_136, $text); $ns->tablerender(LAN_136, $text);
if(!vartrue($pref['subnews_htmlarea'])) // check after bbarea is called.
{
e107::wysiwyg(false);
}
require_once(FOOTERF); require_once(FOOTERF);