mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

Fixes #1132 - Usersettings signature wrapper issue and textarea size.

Browse Source
This commit is contained in:
Cameron
2015-07-20 12:11:49 -07:00
parent 385275344c
commit 0ffc92cde4
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
e107_core/templates/usersettings_template.php
View File

@@ -220,12 +220,12 @@ $USERSETTINGS_WRAPPER['edit']['USERCLASSES'] = "<div class='form-group'>
"; ";
$USERSETTINGS_WRAPPER['edit']['AVATAR_UPLOAD'] = "<div class='form-group'> $USERSETTINGS_WRAPPER['edit']['AVATAR_UPLOAD'] = "<div class='form-group'>
<label for='customtitle' class='col-sm-3 control-label'>".LAN_USET_26."</label> <label for='avatar' class='col-sm-3 control-label'>".LAN_USET_26."</label>
<div class='col-sm-9'>{---}</div> <div class='col-sm-9'>{---}</div>
</div> </div>
"; ";
$USERSETTINGS_WRAPPER['edit']['PHOTO_UPLOAD'] = "<div class='form-group'> $USERSETTINGS_WRAPPER['edit']['PHOTO_UPLOAD'] = "<div class='form-group'>
<label for='customtitle' class='col-sm-3 control-label'>".LAN_USER_06."</label> <label for='photo' class='col-sm-3 control-label'>".LAN_USER_06."</label>
<div class='col-sm-9'>{---}</div> <div class='col-sm-9'>{---}</div>
</div> </div>
"; ";
@@ -238,7 +238,7 @@ $USERSETTINGS_WRAPPER['edit']['SIGNATURE'] = "<div class='form-group'>
</div> </div>
"; ";
// $USERSETTINGS_WRAPPER['edit']['USEREXTENDED_ALL'] = "<div class='form-group'>{---}</div>";
@@ -249,8 +249,9 @@ $USERSETTINGS_WRAPPER['edit']['SIGNATURE'] = "<div class='form-group'>
$USERSETTINGS_TEMPLATE['edit'] = " $USERSETTINGS_TEMPLATE['edit'] = "
<div> <div>
{USERNAME} {USERNAME}
{LOGINNAME} {LOGINNAME}
@@ -271,7 +272,7 @@ $USERSETTINGS_TEMPLATE['edit'] = "
{CUSTOMTITLE} {CUSTOMTITLE}
{PASSWORD1} {PASSWORD1}
{PASSWORD_LEN}
{PASSWORD2} {PASSWORD2}
@@ -281,7 +282,7 @@ $USERSETTINGS_TEMPLATE['edit'] = "
{HIDEEMAIL=radio} {HIDEEMAIL=radio}
</div> </div>
</div> </div>
<div class='form-group'> <div class='form-group'>
<label for='loginname' class='col-sm-3 control-label'>".LAN_USER_07.req($pref['signup_option_image'])."</label> <label for='loginname' class='col-sm-3 control-label'>".LAN_USER_07.req($pref['signup_option_image'])."</label>
<div class='col-sm-9'> <div class='col-sm-9'>
@@ -292,11 +293,11 @@ $USERSETTINGS_TEMPLATE['edit'] = "
{AVATAR_UPLOAD} {AVATAR_UPLOAD}
{PHOTO_UPLOAD} {PHOTO_UPLOAD}
{USERCLASSES} {USERCLASSES}
{USEREXTENDED_ALL=tabs} {USEREXTENDED_ALL=tabs}
{SIGNATURE}
{SIGNATURE=cols=58&rows=4}
{SIGNATURE_HELP} {SIGNATURE_HELP}
<div class='form-group'> <div class='form-group'>

7
e107_handlers/form_handler.php
View File

@@ -1333,7 +1333,8 @@ class e_form
case 'small': case 'small':
$rows = '7'; $rows = '7';
$height = "style='height:250px'"; // inline required for wysiwyg $height = "style='height:230px'"; // inline required for wysiwyg
$size = "input-block-level";
break; break;
case 'medium': case 'medium':
@@ -1363,7 +1364,7 @@ class e_form
$ret = "<div class='bbarea {$size}'> $ret = "<div class='bbarea {$size}'>
<div class='field-spacer'><!-- --></div>\n"; <div class='field-spacer'><!-- --></div>\n";
$ret .= e107::getBB()->renderButtons($template,$help_tagid); $ret .= e107::getBB()->renderButtons($template,$help_tagid);
$ret .= $this->textarea($name, $value, $rows, 70, $options, $counter); // higher thank 70 will break some layouts. $ret .= $this->textarea($name, $value, $rows, 70, $options, $counter); // higher thank 70 will break some layouts.
@@ -1371,7 +1372,7 @@ class e_form
$ret .= "</div>\n"; $ret .= "</div>\n";
$_SESSION['media_category'] = $mediaCat; // used by TinyMce. $_SESSION['media_category'] = $mediaCat; // used by TinyMce.
e107::wysiwyg(true); // bbarea loaded, so activate wysiwyg (if enabled in preferences) e107::wysiwyg(true); // bbarea loaded, so activate wysiwyg (if enabled in preferences)

15
e107_handlers/shortcode_handler.php
View File

@@ -718,9 +718,9 @@ class e_parse_shortcode
$this->addedCodes = NULL; $this->addedCodes = NULL;
// former $sc_style - do it once here and not on every doCode loop - performance // former $sc_style - do it once here and not on every doCode loop - performance
$this->sc_style = e107::scStyle(); //FIXME - BC Problems and conflicts. - XXX Commenting this out will fix #3 below. $this->sc_style = e107::scStyle(); //FIXME - BC Problems and conflicts.
/* --------- BUG TEST Scenario -------------- /* --------- BUG TEST Scenario --------------
* Front-end Theme: Bootstrap * Front-end Theme: Bootstrap
* MENU-1 contains '{NAVIGATION=side}' on top and chatbox_menu below * MENU-1 contains '{NAVIGATION=side}' on top and chatbox_menu below
@@ -756,9 +756,14 @@ class e_parse_shortcode
// Do it only once per parsing cylcle and not on every doCode() loop - performance // Do it only once per parsing cylcle and not on every doCode() loop - performance
if(method_exists($this->addedCodes, 'wrapper')) if(method_exists($this->addedCodes, 'wrapper'))
{ {
$this->wrappers = e107::templateWrapper($this->addedCodes->wrapper()); $tmpWrap = e107::templateWrapper($this->addedCodes->wrapper());
if(!empty($tmpWrap)) // FIX for #3 above.
{
$this->wrappers = array_merge($this->wrappers,$tmpWrap);
}
} }
/* /*
$classname = get_class($extraCodes); $classname = get_class($extraCodes);