Обновление под новые ББ коды

vponomarev · Nov 30, 2016 · b0d93cf · b0d93cf
1 parent 2c8cd12
commit b0d93cf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/engine/actions/static.php b/engine/actions/static.php
@@ -297,7 +297,7 @@ function addEditStaticForm($operationMode = 1, $sID = 0){
 			if ($editMode) {
 				$v->editStaticForm($row['id'], $row, $tVars);
 			} else {
-				$v->addStaticForm($row['id'], $row, $tVars);
+				$v->addStaticForm($tVars);
 			}
 		}
 

diff --git a/engine/skins/default/tpl/news/add.tpl b/engine/skins/default/tpl/news/add.tpl
@@ -83,13 +83,13 @@ function changeActive(name) {
    <td><input type="text" class="important" size="79" id="newsTitle" name="title" value="" tabindex="1" /></td>
   </tr>
   <tr>
-   <td valign="top" colspan=3>{% if (not includ_bb) %}{{ quicktags }}<br /> {{ smilies }}<br />{% else %}<br />{% endif %}
+   <td valign="top" colspan=3>{% if (not isBBCode) %}{{ quicktags }}<br /> {{ smilies }}<br />{% else %}<br />{% endif %}
 {% if (flags.edit_split) %}
-    <div id="container.content.short" class="contentActive">{{ DisplayTextForm({'type' : 'textarea', class : '', name : 'ng_news_content_short' , 'options' : 'style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive(\'short\');" onfocus="changeActive(\'short\');" rows="10" tabindex="2"' }) }}</div>
+	<div id="container.content.short" class="contentActive"><textarea style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive('short');" onfocus="changeActive('short');" name="ng_news_content_short" {% if (isBBCode) %}class="{{ attributBB }}"{% else %}id="ng_news_content"{% endif %} rows="10" tabindex="2"></textarea></div>
 {% if (flags.extended_more) %}    <table cellspacing="2" cellpadding="0" width="100%"><tr><td nowrap>{{ lang.addnews['editor.divider'] }}: &nbsp;</td><td style="width: 90%"><input tabindex="2" type="text" name="content_delimiter" style="width: 99%;" value=""/></td></tr></table>{% endif %}
-    <div id="container.content.full" class="contentInactive">{{ DisplayTextForm({'type' : 'textarea', id : '', class : '', name : 'ng_news_content_full' , 'options' : 'style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive(\'short\');" onfocus="changeActive(\'short\');" rows="10" tabindex="2"' }) }}</div>
+	<div id="container.content.full" class="contentInactive"><textarea style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive('full');" onfocus="changeActive('full');" name="ng_news_content_full" {% if (isBBCode) %}class="{{ attributBB }}"{% else %}id="ng_news_content"{% endif %} rows="10" tabindex="2"></textarea></div>
 {% else %}
-    <div id="container.content" class="contentActive">{{ DisplayTextForm({'type' : 'textarea', id : '', class : '', name : 'ng_news_content' , 'options' : 'style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive(\'short\');" onfocus="changeActive(\'short\');" rows="10" tabindex="2"' }) }}</div>
+	<div id="container.content" class="contentActive"><textarea style="width: 99%; padding: 1px; margin: 1px;" name="ng_news_content" {% if (isBBCode) %}class="{{ attributBB }}"{% else %}id="ng_news_content"{% endif %} rows="10" tabindex="2"></textarea></div>
 {% endif %}
 	</td>
 </tr>

diff --git a/engine/skins/default/tpl/news/edit.tpl b/engine/skins/default/tpl/news/edit.tpl
@@ -1,4 +1,3 @@
-
 <script type="text/javascript" src="{{ home }}/lib/ajax.js"></script>
 <script type="text/javascript" src="{{ home }}/lib/libsuggest.js"></script>
 <script language="javascript" type="text/javascript">
@@ -95,13 +94,13 @@ function changeActive(name) {
    <td><input type="text" class="important" size="79" id="newsTitle" name="title" value="{{ title }}" tabindex="1" /></td>
   </tr>
   <tr>
-   <td valign="top" colspan=3>{% if (not includ_bb) %}{{ quicktags }}<br /> {{ smilies }}<br />{% else %}<br />{% endif %}
+   <td valign="top" colspan=3>{% if (not isBBCode) %}{{ quicktags }}<br /> {{ smilies }}<br />{% else %}<br />{% endif %}
 {% if (flags.edit_split) %}
-    <div id="container.content.short" class="contentActive">{{ DisplayTextForm({'type' : 'textarea', class : '', name : 'ng_news_content_short' , 'options' : 'style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive(\'short\');" onfocus="changeActive(\'short\');" rows="10" tabindex="2"' }) }}</div>
-{% if (flags.extended_more) %}    <table cellspacing="2" cellpadding="0" width="100%"><tr><td nowrap>{{ lang.editnews['editor.divider'] }}: &nbsp;</td><td style="width: 90%"><input tabindex="2" type="text" name="content_delimiter" style="width: 99%;" value="{{ content.delimiter }}"/></td></tr></table>{% endif %}
-    <div id="container.content.full" class="contentInactive">{{ DisplayTextForm({'type' : 'textarea', id : '', class : '', name : 'ng_news_content_full' , 'options' : 'style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive(\'short\');" onfocus="changeActive(\'short\');" rows="10" tabindex="2"' }) }}</div>
+	<div id="container.content.short" class="contentActive"><textarea style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive('short');" onfocus="changeActive('short');" name="ng_news_content_short" {% if (isBBCode) %}class="{{ attributBB }}"{% else %}id="ng_news_content"{% endif %} rows="10" tabindex="2"></textarea></div>
+{% if (flags.extended_more) %}    <table cellspacing="2" cellpadding="0" width="100%"><tr><td nowrap>{{ lang.addnews['editor.divider'] }}: &nbsp;</td><td style="width: 90%"><input tabindex="2" type="text" name="content_delimiter" style="width: 99%;" value=""/></td></tr></table>{% endif %}
+	<div id="container.content.full" class="contentInactive"><textarea style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive('full');" onfocus="changeActive('full');" name="ng_news_content_full" {% if (isBBCode) %}class="{{ attributBB }}"{% else %}id="ng_news_content"{% endif %} rows="10" tabindex="2"></textarea></div>
 {% else %}
-    <div id="container.content" class="contentActive">{{ DisplayTextForm({'type' : 'textarea', id : '', class : '', name : 'ng_news_content' , 'options' : 'style="width: 99%; padding: 1px; margin: 1px;" onclick="changeActive(\'short\');" onfocus="changeActive(\'short\');" rows="10" tabindex="2"' }) }}</div>
+	<div id="container.content" class="contentActive"><textarea style="width: 99%; padding: 1px; margin: 1px;" name="ng_news_content" {% if (isBBCode) %}class="{{ attributBB }}"{% else %}id="ng_news_content"{% endif %} rows="10" tabindex="2"></textarea></div>
 {% endif %}
 	</td>
 </tr>

diff --git a/engine/skins/default/tpl/static/edit.tpl b/engine/skins/default/tpl/static/edit.tpl
@@ -1,7 +1,7 @@
 <script language="javascript" type="text/javascript">
 var currentInputAreaID = 'content';
 </script>
-
+{{ includ_bb }}
 <table border="0" width="100%" cellpadding="0" cellspacing="0">
 <tr>
 <td width=100% colspan="5" class="contentHead"><img src="{{ skins_url }}/images/nav.gif" hspace="8"><a href="?mod=static">{{ lang['static_title'] }}</a> &#8594; {% if (flags.editMode) %}{{ lang['static_title_edit'] }} "{{ data.title }}"{% else %}{{ lang['static_title_add'] }}{% endif %}</td>
@@ -41,8 +41,8 @@ var currentInputAreaID = 'content';
    <td><input type="text" class="important" size="79" name="url" readonly="readonly" value="{{ data.url }}" tabindex="1" /> [ <a target="_blank" href="{{ data.url }}">îòêðûòü</a> ]</td>
   </tr>{% endif %}
   <tr>
-   <td valign="top" colspan=3>{{ quicktags }}<br /> {{ smilies }}<br />
-   <textarea style="margin-left: 0px; margin-right: 0px; margin-top: 1px; width: 99%;" name="content" id="content" rows="16" tabindex="2">{{ data.content }}</textarea></td>
+   <td valign="top" colspan=3>{% if (not isBBCode) %}{{ quicktags }}<br /> {{ smilies }}<br />{% else %}<br />{% endif %}
+   <textarea style="margin-left: 0px; margin-right: 0px; margin-top: 1px; width: 99%;" name="content" {% if (isBBCode) %}class="{{ attributBB }}"{% else %}id="content"{% endif %} rows="16" tabindex="2">{{ data.content }}</textarea></td>
   </tr>
 
 {% if (flags.meta) %}