1
0
mirror of https://github.com/e107inc/e107.git synced 2025-04-20 20:51:53 +02:00

Work on signup page, bbcode buttons, tooltips etc.

This commit is contained in:
CaMer0n 2012-06-02 08:12:16 +00:00
parent 98117308f2
commit 9197fadc54
21 changed files with 541 additions and 329 deletions

View File

@ -561,7 +561,7 @@ $array_functions = array(
6 => array(e_ADMIN.'db.php', ADLAN_44, ADLAN_45, '0', 4, E_16_DATAB, E_32_DATAB),
// 7 => array(e_ADMIN.'download.php', ADLAN_24, ADLAN_25, 'R', 3, E_16_DOWNL, E_32_DOWNL),
8 => array(e_ADMIN.'emoticon.php', ADLAN_58, ADLAN_59, 'F', 1, E_16_EMOTE, E_32_EMOTE),
9 => array(e_ADMIN.'filemanager.php', ADLAN_30, ADLAN_31, '6', 5, E_16_FILE, E_32_FILE),
// 9 => array(e_ADMIN.'filemanager.php', ADLAN_30, ADLAN_31, '6', 5, E_16_FILE, E_32_FILE), // replaced by media-manager
10 => array(e_ADMIN.'frontpage.php', ADLAN_60, ADLAN_61, 'G', 1, E_16_FRONT, E_32_FRONT),
11 => array(e_ADMIN.'image.php', LAN_MEDIAMANAGER, ADLAN_106, 'A', 5, E_16_IMAGES, E_32_IMAGES),
12 => array(e_ADMIN.'links.php', ADLAN_138, ADLAN_139, 'I', 1, E_16_LINKS, E_32_LINKS),
@ -575,7 +575,7 @@ $array_functions = array(
20 => array(e_ADMIN.'search.php', ADLAN_142, ADLAN_143, 'X', 1, E_16_SEARCH, E_32_SEARCH),
21 => array(e_ADMIN.'admin_log.php', ADLAN_155, ADLAN_156, 'S', 4, E_16_ADMINLOG, E_32_ADMINLOG),
22 => array(e_ADMIN.'theme.php', ADLAN_140, ADLAN_141, '1', 5, E_16_THEMEMANAGER, E_32_THEMEMANAGER),
23 => array(e_ADMIN.'upload.php', ADLAN_72, ADLAN_73, 'V', 3, E_16_UPLOADS, E_32_UPLOADS),
// 23 => array(e_ADMIN.'upload.php', ADLAN_72, ADLAN_73, 'V', 3, E_16_UPLOADS, E_32_UPLOADS),
24 => array(e_ADMIN.'users.php', ADLAN_36, ADLAN_37, '4|U0|U1|U2|U3', 2, E_16_USER, E_32_USER),
25 => array(e_ADMIN.'userclass2.php', ADLAN_38, ADLAN_39, '4', 2, E_16_USERCLASS, E_32_USERCLASS),
26 => array(e_ADMIN.'language.php', ADLAN_132, ADLAN_133, '0', 1, E_16_LANGUAGE, E_32_LANGUAGE),

View File

@ -45,7 +45,11 @@ e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2);
e107::js("core", "plupload/customUpload.js","jquery",3);
e107::js("core", "core/mediaManager.js","jquery",3);
e107::js("core", "tooltip/jquery.tipsy.js","jquery",3);
e107::css('core', 'tooltip/tipsy.css', 'jquery');
e107::js("core", "tags/jquery.tagit.js","jquery",3);
e107::css('core', 'tags/jquery.tagit.css', 'jquery');
// e107::js("core", "tooltip/jquery.qtip-1.0.0-rc3.min.js","jquery",3);

View File

@ -74,7 +74,6 @@ class media_admin extends e_admin_dispatcher
'main/import' => array('caption'=> "Media Import", 'perm' => 'A|A2'),
'cat/list' => array('caption'=> 'Media Categories', 'perm' => 'A'),
'cat/create' => array('caption'=> "Create Category", 'perm' => 'A'), // is automatic.
// 'main/icons' => array('caption'=> IMALAN_71, 'perm' => 'A'),
'main/settings' => array('caption'=> LAN_PREFS, 'perm' => 'A'),
'main/avatar' => array('caption'=> IMALAN_23, 'perm' => 'A')
@ -84,8 +83,7 @@ class media_admin extends e_admin_dispatcher
$var['main']['text'] = IMALAN_7;
$var['main']['link'] = e_SELF;
$var['icons']['text'] = IMALAN_71;
$var['icons']['link'] = e_SELF."?icons";
$var['avatars']['text'] = IMALAN_23;
$var['avatars']['link'] = e_SELF."?avatars";
@ -387,7 +385,7 @@ class media_admin_ui extends e_admin_ui
if($this->getQuery('bbcode'))
{
//TODO this is not really used when jquery is running.
e107::getJS()->headerInline("
/* Send the generated IMG bbcode back to the textarea/window */
@ -628,7 +626,173 @@ class media_admin_ui extends e_admin_ui
function settingsPage()
{
main_config();
global $pref;
$frm = e107::getForm();
$tp = e107::getParser();
$sql = e107::getDb();
$ns = e107::getRender();
$mes = e107::getMessage();
if(function_exists('gd_info'))
{
$gd_info = gd_info();
$gd_version = $gd_info['GD Version'];
}
else
{
$gd_version = "<span class='error'> ".IMALAN_55."</span>";
}
if($pref['resize_method'] == "ImageMagick" && (!vartrue(e107::getFolder('imagemagick'))))
{
$mes->addWarning('Please add: <b>$IMAGEMAGICK_DIRECTORY="'.$pref['im_path'].'";</b> to your e107_config.php file');
}
//$IM_NOTE = "";
$im_path = vartrue(e107::getFolder('imagemagick'));
if($im_path != "")
{
$im_file = $im_path.'convert';
if(!file_exists($im_file))
{
//$IM_NOTE = "<span class='error'>".IMALAN_52."</span>";
$mes->addWarning(IMALAN_52);
}
else
{
$cmd = "{$im_file} -version";
$tmp = `$cmd`;
if(strpos($tmp, "ImageMagick") === FALSE)
{
//$IM_NOTE = "<span class='error'>".IMALAN_53."</span>";
$mes->addWarning(IMALAN_53);
}
}
}
$text = "
<form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-image-settings'>
<legend class='e-hideme'>".IMALAN_7."</legend>
<table class='adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tbody>
<tr>
<td class='label'>
".IMALAN_1."
</td>
<td class='control'>
<div class='auto-toggle-area autocheck'>
".$frm->checkbox('image_post', 1, $pref['image_post'])."
<div class='field-help'>".IMALAN_2."</div>
</div>
</td>
</tr>
<tr>
<td class='label'>
".IMALAN_10."
</td>
<td class='control'>
".r_userclass('image_post_class',$pref['image_post_class'],"off","public,guest,nobody,member,admin,main,classes")."
<div class='field-help'>".IMALAN_11."</div>
</td>
</tr>
<tr>
<td class='label'>
".IMALAN_12."
</td>
<td class='control'>
".$frm->select_open('image_post_disabled_method')."
".$frm->option(IMALAN_14, '0', ($pref['image_post_disabled_method'] == "0"))."
".$frm->option(IMALAN_15, '1', ($pref['image_post_disabled_method'] == "1"))."
".$frm->select_close()."
<div class='field-help'>".IMALAN_13."</div>
</td>
</tr>";
list($img_import_w,$img_import_h) = explode("x",$pref['img_import_resize']);
//TODO LANS
$text .= "
<tr>
<td class='label'>Resize images during media import<div class='label-note'>Leave empty to disable</div></td>
<td class='control'>
".$frm->text('img_import_resize_w', $img_import_w,4)."px X ".$frm->text('img_import_resize_h', $img_import_h,4)."px
</td>
</tr>
<tr>
<td class='label'>".IMALAN_3."<div class='label-note'>".IMALAN_54." {$gd_version}</div></td>
<td class='control'>
".$frm->select_open('resize_method')."
".$frm->option('gd1', 'gd1', ($pref['resize_method'] == "gd1"))."
".$frm->option('gd2', 'gd2', ($pref['resize_method'] == "gd2"))."
".$frm->option('ImageMagick', 'ImageMagick', ($pref['resize_method'] == "ImageMagick"))."
".$frm->select_close()."
<div class='field-help'>".IMALAN_4."</div>
</td>
</tr>";
/*
$text .= "
// Removed to prevent mod_security blocks, and show only when relevant (non-GD2 users)
<tr>
<td class='label'>".IMALAN_5."<div class='label-note'>{$IM_NOTE}</div></td>
<td class='control'>
".$frm->text('im_path', $pref['im_path'])."
<div class='field-help'>".IMALAN_6."</div>
</td>
</tr>";
// Removed as IE6 should no longer be supported. A 3rd-party plugin can be made for this functionality if really needed.
$text .= "
<tr>
<td class='label'>".IMALAN_34."
</td>
<td class='control'>
<div class='auto-toggle-area autocheck'>
".$frm->checkbox('enable_png_image_fix', 1, ($pref['enable_png_image_fix']))."
<div class='field-help'>".IMALAN_35."</div>
</div>
</td>
</tr>";
*/
$text .= "
<tr>
<td class='label'>".IMALAN_36."</td>
<td class='control'>
".$frm->admin_button('check_avatar_sizes', ADLAN_145)."
</td>
</tr>
</tbody>
</table>
<div class='buttons-bar center'>
".$frm->admin_button('update_options', IMALAN_8, 'update')."
</div>
</fieldset>
</form>";
echo $mes->render().$text;
return;
// $ns->tablerender(LAN_MEDIAMANAGER." :: ".IMALAN_7, $mes->render().$text);
}
function avatarPage()
@ -1630,163 +1794,7 @@ if (isset($_POST['check_avatar_sizes']))
$ns->tablerender(IMALAN_37, $emessage->render().$text);
}
/*
* MAIN CONFIG SCREEN
*/
function main_config()
{
global $pref;
$frm = e107::getForm();
$tp = e107::getParser();
$sql = e107::getDb();
$ns = e107::getRender();
$mes = e107::getMessage();
if(function_exists('gd_info'))
{
$gd_info = gd_info();
$gd_version = $gd_info['GD Version'];
}
else
{
$gd_version = "<span class='error'> ".IMALAN_55."</span>";
}
$IM_NOTE = "";
if($pref['im_path'] != "")
{
$im_file = $pref['im_path'].'convert';
if(!file_exists($im_file))
{
$IM_NOTE = "<span class='error'>".IMALAN_52."</span>";
}
else
{
$cmd = "{$im_file} -version";
$tmp = `$cmd`;
if(strpos($tmp, "ImageMagick") === FALSE)
{
$IM_NOTE = "<span class='error'>".IMALAN_53."</span>";
}
}
}
$text = "
<form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-image-settings'>
<legend class='e-hideme'>".IMALAN_7."</legend>
<table class='adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tbody>
<tr>
<td class='label'>
".IMALAN_1."
</td>
<td class='control'>
<div class='auto-toggle-area autocheck'>
".$frm->checkbox('image_post', 1, $pref['image_post'])."
<div class='field-help'>".IMALAN_2."</div>
</div>
</td>
</tr>
<tr>
<td class='label'>
".IMALAN_10."
</td>
<td class='control'>
".r_userclass('image_post_class',$pref['image_post_class'],"off","public,guest,nobody,member,admin,main,classes")."
<div class='field-help'>".IMALAN_11."</div>
</td>
</tr>
<tr>
<td class='label'>
".IMALAN_12."
</td>
<td class='control'>
".$frm->select_open('image_post_disabled_method')."
".$frm->option(IMALAN_14, '0', ($pref['image_post_disabled_method'] == "0"))."
".$frm->option(IMALAN_15, '1', ($pref['image_post_disabled_method'] == "1"))."
".$frm->select_close()."
<div class='field-help'>".IMALAN_13."</div>
</td>
</tr>";
list($img_import_w,$img_import_h) = explode("x",$pref['img_import_resize']);
//TODO LANS
$text .= "
<tr>
<td class='label'>Resize images during media import<div class='label-note'>Leave empty to disable</div></td>
<td class='control'>
".$frm->text('img_import_resize_w', $img_import_w,4)."px X ".$frm->text('img_import_resize_h', $img_import_h,4)."px
<div class='field-help'>".IMALAN_6."</div>
</td>
</tr>
<tr>
<td class='label'>".IMALAN_3."<div class='label-note'>".IMALAN_54." {$gd_version}</div></td>
<td class='control'>
".$frm->select_open('resize_method')."
".$frm->option('gd1', 'gd1', ($pref['resize_method'] == "gd1"))."
".$frm->option('gd2', 'gd2', ($pref['resize_method'] == "gd2"))."
".$frm->option('ImageMagick', 'ImageMagick', ($pref['resize_method'] == "ImageMagick"))."
".$frm->select_close()."
<div class='field-help'>".IMALAN_4."</div>
</td>
</tr>
<tr>
<td class='label'>".IMALAN_5."<div class='label-note'>{$IM_NOTE}</div></td>
<td class='control'>
".$frm->text('im_path', $pref['im_path'])."
<div class='field-help'>".IMALAN_6."</div>
</td>
</tr>";
// Removed as IE6 should no longer be supported. A 3rd-party plugin can be made for this functionality if really needed.
/*
$text .= "
<tr>
<td class='label'>".IMALAN_34."
</td>
<td class='control'>
<div class='auto-toggle-area autocheck'>
".$frm->checkbox('enable_png_image_fix', 1, ($pref['enable_png_image_fix']))."
<div class='field-help'>".IMALAN_35."</div>
</div>
</td>
</tr>";
*/
$text .= "
<tr>
<td class='label'>".IMALAN_36."</td>
<td class='control'>
".$frm->admin_button('check_avatar_sizes', ADLAN_145)."
</td>
</tr>
</tbody>
</table>
<div class='buttons-bar center'>
".$frm->admin_button('update_options', IMALAN_8, 'update')."
</div>
</fieldset>
</form>";
echo $mes->render().$text;
return;
$ns->tablerender(LAN_MEDIAMANAGER." :: ".IMALAN_7, $mes->render().$text);
}
//Just in case...
if(!e_AJAX_REQUEST) require_once("footer.php");

View File

@ -1800,7 +1800,7 @@ class admin_newspost
$this->_pre_create();
require_once(e_HANDLER."userclass_class.php");
require_once(e_HANDLER."form_handler.php");
// require_once(e_HANDLER."form_handler.php");
// $frm = new e_form(true); //enable inner tabindex counter
$frm = e107::getForm();
@ -1913,6 +1913,9 @@ class admin_newspost
".$frm->text('news_summary', $tp->post_toForm($_POST['news_summary']), 250)."
</td>
</tr>
";
@ -2076,9 +2079,14 @@ class admin_newspost
</tr>
<tr>
<td class='label'>Meta keywords: </td>
<td class='control'>".$frm->text('news_meta_keywords', $tp->post_toForm($_POST['news_meta_keywords']), 255)."</td>
<td class='label'>".LAN_KEYWORDS.": </td>
<td class='control'>".$frm->tags('news_meta_keywords', $tp->post_toForm($_POST['news_meta_keywords']), 255)."
<div class='field-help'>Keywords/tags associated to associate with this news item</div>
</td>
</tr>
<tr>
<td class='label'>Meta description: </td>
<td class='control'>".$frm->textarea('news_meta_description', $tp->post_toForm($_POST['news_meta_description']), 7)."</td>
@ -2114,8 +2122,7 @@ class admin_newspost
";
$text .= "
".$frm->radio_multi('news_render_type', $this->news_renderTypes, $_POST['news_render_type'], true)."
$text .= $frm->radio_multi('news_render_type', $this->news_renderTypes, $_POST['news_render_type'], true,array(NWSLAN_74))."
<div class='field-help'>
".NWSLAN_74."
</div>
@ -2181,9 +2188,9 @@ class admin_newspost
<tr>
<td class='label'>".LAN_NEWS_28.":</td>
<td class='control'>
".$frm->checkbox('news_sticky', '1', $_POST['news_sticky']).$frm->label(LAN_NEWS_30, 'news_sticky', '1')."
".$frm->checkbox('news_sticky', '1', $_POST['news_sticky']).$frm->label(LAN_NEWS_29, 'news_sticky', '1')."
<div class='field-help'>
".LAN_NEWS_29."
".LAN_NEWS_30."
</div>
</td>
</tr>

View File

@ -588,7 +588,12 @@ $text .= "
<tr>
<td class='label'>".PRFLAN_184."</td>
<td class='control'>".$frm->select_open('allowEmailLogin');
$login_list = array(PRFLAN_201,PRFLAN_202,PRFLAN_203);
// $login_list = array(PRFLAN_201,PRFLAN_202,PRFLAN_203);
$login_list = array(
2 => PRFLAN_203,
1 => PRFLAN_202,
0 => PRFLAN_201
);
foreach($login_list as $l => $l_title)
{
$text .= $frm->option($l_title, $l, ($pref['allowEmailLogin'] == $l));
@ -1057,7 +1062,7 @@ $text .= "
<tr>
<td class='label'>".PRFLAN_43.":</td>
<td class='control'>
".$frm->textarea('profanity_words', $pref['profanity_words'], 2, 59)."
".$frm->tags('profanity_words', $pref['profanity_words'])."
<div class='field-help'>".PRFLAN_44."</div>
</td>
</tr>

View File

@ -30,13 +30,13 @@ class bbcode_shortcodes extends e_shortcode
function bb_format($id)
{
$text = "<select class='e-bb' id='{$id}' title='Format text' onchange=\"addtext(this.value);this.value=''\">
$text = "<select class='e-bb bbcode_buttons e-pointer' id='{$id}' title='Format text' onchange=\"addtext(this.value);this.value=''\">
<option value=''>Format</option>
<option value='[p][/p]'>Paragraph [p]</option>
<option value='[h2][/h2]'>Heading [h2]</option>
<option value='[block][/block]'>Block [div]</option>
<option value='[blockquote][/blockquote]'>Quote [blockquote]</option>
<option value='[code][/code]'>Code [code]</option>
<option value='[p][/p]'>Paragraph</option>
<option value='[h2][/h2]'>Heading</option>
<option value='[block][/block]'>Block</option>
<option value='[blockquote][/blockquote]'>Quote</option>
<option value='[code][/code]'>Code</option>
</select>";
return $text;
@ -49,8 +49,8 @@ class bbcode_shortcodes extends e_shortcode
// $data = "[table]\n[tr]\n\t[td]Cell 1[/td]\n\t[td]Cell 2[/td]\n[/tr]\n[/table]"; // works with jquery, but not onclick.
$data = "[table][tr][td]Cell 1[/td][td]Cell 2[/td][/tr][/table]";
$event = $this->getEvent('addtext',$data,'Insert a table',1);
$text = "<a {$event} class='e-bb' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' title='Insert a table' data-bbcode='{$data}'>";
$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/table.png' alt='' /></a>";
$text = "<a {$event} class='e-bb' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' data-bbcode='{$data}'>";
$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/table.png' alt='' title='Insert a table' /></a>";
return $text;
}
@ -59,8 +59,8 @@ class bbcode_shortcodes extends e_shortcode
// $data = "[table]\n[tr]\n\t[td]Cell 1[/td]\n\t[td]Cell 2[/td]\n[/tr]\n[/table]"; // works with jquery, but not onclick.
$data = "[newpage]";
$event = $this->getEvent('addtext',$data,LANHELP_34,1);
$text = "<a {$event} class='e-bb e-tabs-add' id='{$id}' data-url='".e_SELF."?mode=dialog&action=dialog&iframe=1' data-function='add' href='#{$this->var['tagid']}' title='Insert a table' data-bbcode='{$data}'>";
$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/newpage.png' alt='' /></a>";
$text = "<a {$event} class='e-bb e-tabs-add' id='{$id}' data-url='".e_SELF."?mode=dialog&action=dialog&iframe=1' data-function='add' href='#{$this->var['tagid']}' data-bbcode='{$data}'>";
$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/newpage.png' alt='' title='".LANHELP_34."' /></a>";
return $text;
}
@ -72,8 +72,8 @@ class bbcode_shortcodes extends e_shortcode
$data = "[list][*]Item 1[*]Item 2[/list]";
// $data = "[list]\n[*]Item 1\n[*]Item 2\n[/list]"; // works with jquery, but not onclick.
$event = $this->getEvent('addtext',$data,LANHELP_36);
$text = "<a {$event} class='e-bb' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' title='".LANHELP_36."' data-bbcode='{$data}'>";
$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/list.png' alt='' /></a>";
$text = "<a {$event} class='e-bb' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' data-bbcode='{$data}'>";
$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/list.png' alt='' title='".nl2br(LANHELP_36)."' /></a>";
return $text;
}
@ -81,8 +81,8 @@ class bbcode_shortcodes extends e_shortcode
{
$data = "[youtube]*[/youtube]";
$event = $this->getEvent('addinput',$data,LANHELP_48);
$text = "<a {$event} class='e-bb' id='{$id}' data-function='input' href='#{$this->var['tagid']}' title='".LANHELP_48."' data-bbcode='{$data}'>
<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/youtube.png' alt='' /></a>";
$text = "<a {$event} class='e-bb' id='{$id}' data-function='input' href='#{$this->var['tagid']}' data-bbcode='{$data}'>";
$text .="<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/youtube.png' alt='' title='".nl2br(LANHELP_48)."' /></a>";
return $text;
}
@ -90,8 +90,8 @@ class bbcode_shortcodes extends e_shortcode
{
$data = "[link=*]*[/link]";
$event = $this->getEvent('addinput',$data,LANHELP_35);
$text = "<a {$event} class='e-bb' id='{$id}' data-function='input' href='#{$this->var['tagid']}' title='".LANHELP_35."' data-bbcode='{$data}'>
<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/link.png' alt='' /></a>";
$text = "<a {$event} class='e-bb ' id='{$id}' data-function='input' href='#{$this->var['tagid']}' data-bbcode='{$data}'>\n";
$text .="<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/link.png' alt='' title='".nl2br(LANHELP_23)."' /></a>";
return $text;
}
@ -107,7 +107,7 @@ class bbcode_shortcodes extends e_shortcode
list($tag,$tmp) = explode("--",$this->var['tagid']); // works with $frm->bbarea to detect textarea from first half of tag.
}
$text = "<a class='e-dialog' id='{$id}' href='".e_ADMIN."image.php?mode=main&action=dialog&for=".$this->var['template']."&tagid=".$tag."&iframe=1&bbcode=1' >";
$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/preimage.png' alt='' />";
$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/preimage.png' title='".LANHELP_45."' alt='' />";
$text .= "</a>\n";
return $text;
}
@ -123,25 +123,25 @@ class bbcode_shortcodes extends e_shortcode
list($tag,$tmp) = explode("--",$this->var['tagid']); // works with $frm->bbarea to detect textarea from first half of tag.
}
$text = "<a class='e-dialog' id='{$id}' href='".e_ADMIN."image.php?mode=dialog&action=list&for=download_file&tagid=".$tag."&iframe=1&bbcode=1' >";
$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/prefile.png' alt='' />";
$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/prefile.png' title='".LANHELP_39."' alt='' />";
$text .= "</a>\n";
return $text;
}
function bb_fontsize($id)
function bb_fontsize($id) // FIXME CSS issues
{
$data = "size";
$formid = $id."_";
$event = $this->getEvent('expandit',$formid, LANHELP_22);
$text = "<a {$event} class='e-bb' data-function='show' href='#{$this->var['tagid']}' title='".LANHELP_22."' data-bbcode='{$data}'>
<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/fontsize.png' alt='' /></a>";
$text = "<a {$event} class='e-bb e-expandit' onclick=\"expandit('{$this->var['tagid']}')\" data-function='show' href='#{$this->var['tagid']}' title='".LANHELP_22."' data-bbcode='{$data}'>
<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/fontsize.png' alt='' title='".LANHELP_22."' /></a>";
$text .="<!-- Start of Size selector -->
<div style='margin-left:0px;margin-right:0px; position: absolute; left:340px; top:60px;z-index:1000;display:none' id='{$formid}'>";
$text .="<div style='position:absolute; bottom:30px; left:125px; width:100px'>";
<div id='{$this->var['tagid']}' style='display:none;margin-left:0px;margin-right:0px; position: absolute; left:340px; top:60px;z-index:5000;' >";
$text .="<div style='position:relative;bottom:30px; left:125px; width:100px'>";
$text .= "<table class='fborder' style='background-color: #fff'>
<tr><td class='forumheader3'>
<select class='tbox' name='preimageselect' onchange=\"addtext(this.value); expandit('{$formid}')\">
@ -156,10 +156,10 @@ class bbcode_shortcodes extends e_shortcode
return $text;
}
function bb_fontcol($id)
function bb_fontcol($id) // JS in this breaks ajax loading.
{
return '';
// $bbcode['fontcol'] = array("e-expandit","col_selector_".$rand, LANHELP_21,"fontcol.png","Color_Select",'col_selector_'.$rand);
@ -169,7 +169,7 @@ class bbcode_shortcodes extends e_shortcode
$text = "<a {$event} class='e-bb' id='{id}' data-function='show' href='#{$this->var['tagid']}' title='".LANHELP_22."' data-bbcode='{$data}'>
<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/fontcol.png' alt='' /></a>";
<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/fontcol.png' alt='' title='".LANHELP_21."' /></a>";
// return $text;
@ -269,10 +269,12 @@ class bbcode_shortcodes extends e_shortcode
{
$meth = "bb_".$parm;
$mes = e107::getMessage();
$mes->debug("Loaded BB: ".$parm);
// $mes->debug("Loaded BB: ".$parm);
$unique = $this->var['template']."--".$parm; // works in conjunction with media-manager category
return "\n\n<!-- {$parm} -->\n".$this->$meth($unique);
}
// NOTE: everything below here could be replaced with separate 'bb_xxxx' methods if need be. (see above)
//FIXME - cachevars/getcachedvars!
@ -385,7 +387,7 @@ class bbcode_shortcodes extends e_shortcode
if($bbcode[$parm]) // default - insert text.
{
$text = $pre;
$text .= "<img class='bbcode bbcode_buttons e-pointer' src='".$iconpath[$parm]."' alt='' title='".$_helptxt."' onclick=\"{$_onclick_func}('".$_onclick_var."')\" ".($bbcode_helpactive ? "onmouseout=\"{$bbcode_help}(''{$bbcode_tag})\" onmouseover=\"{$bbcode_help}('".$_helptxt."'{$bbcode_tag})\"" : "" )." />";
$text .= "<img class='bbcode bbcode_buttons e-pointer' src='".$iconpath[$parm]."' alt='' title=\"".nl2br($_helptxt)."\" onclick=\"{$_onclick_func}('".$_onclick_var."')\" ".($bbcode_helpactive ? "onmouseout=\"{$bbcode_help}(''{$bbcode_tag})\" onmouseover=\"{$bbcode_help}('".$_helptxt."'{$bbcode_tag})\"" : "" )." />";
$text .= $post;
}
@ -404,6 +406,7 @@ class bbcode_shortcodes extends e_shortcode
function sc_bb_help($parm)
{
return ''; // Use tooltips instead.
/*
global $bbcode_helpactive,$bbcode_helptag, $bbcode_helpsize;
if($parm) $bbcode_helptag = $parm;

View File

@ -83,30 +83,40 @@ class signup_shortcodes extends e_shortcode
{
return LAN_SIGNUP_67;
}
if ($pref['signup_option_loginname'])
// if ($pref['signup_option_loginname'])
{
$log_name_length = varset($pref['loginname_maxlength'],30);
return $rs->form_text("loginname", 30, ($_POST['loginname'] ? $_POST['loginname'] : $loginname), $log_name_length);
$options = array('size'=>30,'required'=>1);
$options['title'] = str_replace("[x]",$log_name_length,LAN_SIGNUP_109); // Password must be at least
return e107::getForm()->text('loginname', ($_POST['loginname'] ? $_POST['loginname'] : $loginname), $log_name_length, $options);
// return $rs->form_text("loginname", 30, , $log_name_length);
}
}
function sc_signup_realname()
{
global $rs, $pref;
if ($pref['signup_option_realname'])
{
return $rs->form_text("realname", 30, ($_POST['realname'] ? $_POST['realname'] : $realname), 100);
}
$pref = e107::getPref('signup_option_realname');
if($pref < 1){ return; }
$options = array('size'=>30);
$options['required'] = ($pref==2) ? 1 : 0;
$options['title'] = LAN_SIGNUP_110;
return e107::getForm()->text('realname', ($_POST['realname'] ? $_POST['realname'] : $realname), 100, $options);
//return $rs->form_text("realname", 30, ($_POST['realname'] ? $_POST['realname'] : $realname), 100);
}
function sc_signup_password1()
{
$options = array('size'=>30,'class'=>'e-password tbox','required'=>1);
// $options['title'] = 'Password must contain at least 6 characters, including UPPER/lowercase and numbers';
$len = vartrue(e107::getPref('signup_pass_len'),6);
// $options['pattern'] = '(?=.*\d)(?=.*[a-z])(?=.*[A-Z])\w{'.$len.',}'; // at least one number, one lowercase and uppercase.
$options['pattern'] = '\w{'.$len.',}'; // word of minimum length
$options['title'] = str_replace("[x]",$len,LAN_SIGNUP_107); // Password must be at least
$options['pattern'] = '(?=.*\d)(?=.*[a-z])(?=.*[A-Z])\w{'.$len.',}'; // at least one number, one lowercase and uppercase.
// $options['pattern'] = '\w{'.$len.',}'; // word of minimum length
return e107::getForm()->password('password1', '', 20, $options);
}
@ -131,6 +141,7 @@ class signup_shortcodes extends e_shortcode
function sc_signup_email()
{
$options = array('size'=>30,'required'=>1,'class'=>'tbox input-text e-email');
$options['title'] = LAN_SIGNUP_108; // Must be a valid email address.
$text = e107::getForm()->email('email',($_POST['email'] ? $_POST['email'] : $email),100,$options);
$text .= "<div class='e-email-hint' style='display:none' data-hint='Did you mean <b>[x]</b>?'><!-- --></div>";
return $text;
@ -267,9 +278,11 @@ class signup_shortcodes extends e_shortcode
global $pref, $SIGNUP_SIGNATURE_START, $SIGNUP_SIGNATURE_END;
if($pref['signup_option_signature'])
{
require_once(e_HANDLER."ren_help.php");
$SIGNUP_SIGNATURE_START = str_replace("{REN_HELP}", display_help('helpb', 2), $SIGNUP_SIGNATURE_START);
$SIGNUP_SIGNATURE_END = str_replace("{REN_HELP}", display_help('helpb', 2), $SIGNUP_SIGNATURE_END);
$frm = e107::getForm();
return $frm->bbarea('signature', $sig, 'signature','helpb','small');
// require_once(e_HANDLER."ren_help.php");
$SIGNUP_SIGNATURE_START = str_replace("{REN_HELP}", $area, $SIGNUP_SIGNATURE_START);
$SIGNUP_SIGNATURE_END = str_replace("{REN_HELP}", $area, $SIGNUP_SIGNATURE_END);
$sig = ($_POST['signature'] ? $_POST['signature'] : $signature);
return $SIGNUP_SIGNATURE_START.$sig.$SIGNUP_SIGNATURE_END;
}
@ -285,10 +298,10 @@ class signup_shortcodes extends e_shortcode
$text = "
<input class='tbox' style='width:80%' id='avatar' type='text' name='image' size='40' value='$image' maxlength='100' />
<input class='button' type ='button' style='cursor:pointer' size='30' value='".LAN_SIGNUP_27."' onclick='expandit(this)' />
<div style='display:none' >";
<input class='button' type ='button' style='cursor:pointer' size='30' value='".LAN_SIGNUP_27."' onclick=\"expandit(this)\" />
<div id='signup-avatar' style='display:none' >";
$avatarlist[0] = "";
$handle = opendir(e_IMAGE."avatars/");
$handle = opendir(e_MEDIA."avatars/");
while ($file = readdir($handle))
{
if ($file != "." && $file != ".." && $file != "CVS" && $file != "index.html")

View File

@ -10,7 +10,7 @@
<core name="adminstyle">infopanel</core>
<core name="admintheme">jayya</core>
<core name="allowCommentEdit">0</core>
<core name="allowEmailLogin">0</core>
<core name="allowEmailLogin">2</core>
<core name="anon_post">0</core>
<core name="antiflood1">1</core>
<core name="antiflood_timeout">10</core>
@ -156,14 +156,14 @@
<core name="signcode">0</core>
<core name="signup_disallow_text"></core>
<core name="signup_maxip">3</core>
<core name="signup_option_class">1</core>
<core name="signup_option_class">0</core>
<core name="signup_option_customtitle">0</core>
<core name="signup_option_email_confirm">0</core>
<core name="signup_option_image">0</core>
<core name="signup_option_realname">1</core>
<core name="signup_option_realname">0</core>
<core name="signup_option_signature">0</core>
<core name="signup_option_hideemail">0</core>
<core name="signup_pass_len">4</core>
<core name="signup_pass_len">6</core>
<core name="signup_remote_emailcheck">0</core>
<core name="signup_text"></core>
<core name="signup_text_after"></core>

View File

@ -1,26 +1,34 @@
$(document).ready(function()
{
/*
$(".field-help").each(function(c) {
$(this).before("<a class='field-tip-"+c+"' href='#'><img src='../e107_images/admin_images/info_16.png' /></a>");
$(this).hide();
$(".field-tip-"+c).qtip({
content: $(this).html(),
show: 'mouseover',
hide: 'mouseout',
style: {
name: 'dark', // Inherit from preset style
border: { width: 1, radius: 5 },
tip: 'topLeft'
}
})
$("input,textarea,select,.e-tip").each(function(c) {
$(this).nextAll(".field-help").hide();
// alert('hello');
$(this).tipsy({title: function() {
var tip = $(this).nextAll(".field-help").text();
if(!tip)
{
var tip = $(this).find(".field-help").text();
}
return tip;
},
fade: true,
html: true,
gravity: 'w'
});
});
*/
$(".e-radio-multi").each(function() {
// $(this).nextAll(".field-help").hide();
// $(this).nextAll(":input").tipsy({title: 'hello'});
});
$(".e-tags").tagit();
$(".e-multiselect").chosen();
@ -75,7 +83,13 @@ $(document).ready(function()
});
// backend
$(".e-password-admin").pwdMeter({
minLength: 6,
displayGeneratePassword: true,
generatePassText: "Generate",
randomPassLength: 12
});

View File

@ -11,6 +11,6 @@ img.e-rate { }
.e-rate-status-download { text-align:left; }
.e-rate-votes { vertical-align:middle; display:inline-block; width:100px }
select.e-bb { margin-top:4px; display:inline-block; vertical-align:top }
.bbcode_buttons { border:1px solid transparent }
.bbcode_buttons { border:1px solid transparent; background-color: #FFFFFF }
.bbcode_buttons:hover { background-color: silver; border:1px solid black; }

View File

@ -9,8 +9,7 @@ $(document).ready(function()
$(id).toggle("slow");
});
// Date
$(function() {
// Dates --------------------------------------------------
$("input.e-date").each(function() {
$(this).datepicker({
@ -58,12 +57,11 @@ $(document).ready(function()
$(this).datetimepicker('setDate', $("#"+newid).val());
});
});
// Tabs -----------------------------------------------------
// Tabs
$(function() {
$( "#tab-container" ).tabs({cache: true});
});
@ -87,6 +85,9 @@ $(document).ready(function()
return false;
});
// --------------- Email ----------------------------------------
$('.e-email').on('blur', function() {
// alert('hello');
$(this).mailcheck({
@ -103,16 +104,21 @@ $(document).ready(function()
}
});
});
// --------------- Passwords -----------------------------
// front-end
$('.e-password').on('keyup', function() {
// var len = $(this).val().length;
//data-minlength
});
// Tooltips for bbarea.
$(".bbcode_buttons").tipsy({gravity: 's',opacity: 1.0, fade: true,html: true});
// var tabs = $('#tab-container').clone(true);
// $('#htmlEditor').append(tabs);
@ -187,18 +193,6 @@ $(document).ready(function()
// $(".e-multiselect").chosen();
// Password
$(function() {
$(".e-password-admin").pwdMeter({
minLength: 6,
displayGeneratePassword: true,
generatePassText: "Generate",
randomPassLength: 12
});
});
// Character Counter
// $("textarea").before("<p class=\"remainingCharacters\" id=\"" + $("textarea").attr("name")+ "-remainingCharacters\">&nbsp;</p>");
@ -215,12 +209,34 @@ $(document).ready(function()
// Dialog
$("a.e-dialog").colorbox({
iframe:true,
iframe:true,
width:"60%",
height:"70%",
speed:100
});
/*
$("a.e-dialog").live('click',function() {
var link = $(this).attr("href");
$(this).dialog({
modal: true,
open: function ()
{
$(this).load(link);
},
height: 600,
iframe: true,
width: 700,
title: 'Dynamically Loaded Page'
});
return false;
});
*/
$(".e-dialog-close").click(function () {
parent.$.colorbox.close()
});
@ -232,10 +248,13 @@ $(document).ready(function()
$(id).dialog({
minWidth: 800,
maxHeight: 700,
modal: true
});
});
$(".e-shake" ).effect("shake","",100);
@ -302,7 +321,7 @@ $(document).ready(function()
});
// Text-area AutoGrow
// $("textarea.e-autoheight").elastic();
$("textarea.e-autoheight").elastic();
@ -320,7 +339,9 @@ $(document).ready(function()
function expandit(e) {
var href = $(e).attr("href");
var href = ($(e).is("a")) ? $(e).attr("href") : '';
if(href === "#" || href == "")
{

View File

@ -442,7 +442,66 @@ class e_bbcode
{
$this->setClass();
}
}
// NEW bbcode button rendering function. replacing displayHelp();
function renderButtons($template,$id='')
{
$tp = e107::getParser();
require_once(e107::coreTemplatePath('bbcode')); //correct way to load a core template.
$pref = e107::getPref('e_bb_list');
if (!empty($pref)) // Load the Plugin bbcode AFTER the templates, so they can modify or replace.
{
foreach($pref as $val)
{
if(is_readable(e_PLUGIN.$val."/e_bb.php"))
{
require(e_PLUGIN.$val."/e_bb.php");
}
}
}
$temp = array();
$temp['news'] = $BBCODE_TEMPLATE_NEWSPOST;
$temp['submitnews'] = $BBCODE_TEMPLATE_SUBMITNEWS;
$temp['extended'] = $BBCODE_TEMPLATE_NEWSPOST;
$temp['admin'] = $BBCODE_TEMPLATE_ADMIN;
$temp['mailout'] = $BBCODE_TEMPLATE_MAILOUT;
$temp['page'] = $BBCODE_TEMPLATE_CPAGE;
$temp['maintenance']= $BBCODE_TEMPLATE_ADMIN;
$temp['comment'] = $BBCODE_TEMPLATE;
$temp['signature'] = $BBCODE_TEMPLATE_SIGNATURE;
if(isset($temp[$template]))
{
$BBCODE_TEMPLATE = $temp[$template];
}
$bbcode_shortcodes = e107::getScBatch('bbcode');
$data = array(
'tagid' => $id,
'template' => $template,
'trigger' => $addtextfunc,
// 'hint_func' => $helpfunc, // unused
// 'hint_active' => $bbcode_helpactive, // unused
'size' => $helpsize
);
$bbcode_shortcodes->setParserVars($data);
return "<div id='bbcode-panel-".$id."' class='mceToolbar bbcode-panel' {$visible}>".$tp->parseTemplate($BBCODE_TEMPLATE,TRUE)."</div>";
}
} // end Class

View File

@ -73,12 +73,17 @@ class comment
}
//FIXME - e_REQUEST_URI?
//e_SELF."?".e_QUERY
$text = "\n<div id='e-comment-form' style='text-align:center'>\n".e107::getMessage()->render('postcomment', true, false, false);//temporary here
$text .= "<form method='post' action='".str_replace('http:', '', $_SERVER['REQUEST_URI'])."' id='dataform' >\n<table style='width:100%'>";
$text .= "<form method='post' action='".str_replace('http:', '', $_SERVER['REQUEST_URI'])."' id='dataform' >\n
<table style='width:100%'>";
if ($pref['nested_comments'])
{
$text .= "<tr>\n<td style='width:20%'>".COMLAN_324."</td>\n<td style='width:80%'>\n
<input class='tbox comment subject' type='text' name='subject' size='61' value='".$tp->toForm($subject)."' maxlength='100' />\n</td>\n</tr>";
$text2 = "";
}
else
@ -149,18 +154,39 @@ class comment
}
$rate = $rater->composerating($table, $itemid, $enter = TRUE, USERID, TRUE);
$rate = "<tr><td style='width:20%; vertical-align:top;'>".COMLAN_327.":</td>\n<td style='width:80%;'>".$rate."</td></tr>\n";
} //end rating area
if (ANON == TRUE && USER == FALSE)
{ // Box for author name (anonymous comments - if allowed)
if (ANON == TRUE && USER == FALSE) // Box for author name (anonymous comments - if allowed)
{
$text .= "<tr>\n<td style='width:20%; vertical-align:top;'>".COMLAN_16."</td>\n<td style='width:80%'>\n<input class='tbox comment author' type='text' name='author_name' size='61' value='{$author_name}' maxlength='100' />\n</td>\n</tr>";
}
$text .= $rate."<tr> \n
<td style='width:20%; vertical-align:top;'>".COMLAN_8.":</td>\n<td id='commentform' style='width:80%;'>\n<textarea class='e-wysiwyg tbox comment' id='comment' name='comment' cols='62' rows='7' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>".trim($comval)."</textarea>\n<br />
".display_help('helpb', "comment")."</td></tr>\n<tr style='vertical-align:top'> \n<td style='width:20%'>".$text2."</td>\n
<td style='width:20%; vertical-align:top;'>".COMLAN_8.":</td>\n<td id='commentform' style='width:80%;'>\n";
$text .= e107::getForm()->bbarea('comment',trim($comval),'comment','comment-'.$itemid,'large',array('autofocus'=>1));
$text .= "</td></tr>
<tr style='vertical-align:top'>
<td style='width:20%'>".$text2."</td>\n";
$text .= "
<td id='commentformbutton' style='width:80%;'>
".(isset($action) && $action == "reply" ? "<input type='hidden' name='pid' value='{$id}' />" : '').(isset($eaction) && $eaction == "edit" ? "<input type='hidden' name='editpid' value='{$id}' />" : "").(isset($content_type) && $content_type ? "<input type='hidden' name='content_type' value='{$content_type}' />" : '')."<input class='button' type='submit' name='".$action."submit' value='".(isset($eaction) && $eaction == "edit" ? COMLAN_320 : COMLAN_9)."' />\n
</td>\n</tr>\n
</table>
<div>
<input type='hidden' name='e-token' value='".e_TOKEN."' />\n
".(isset($action) && $action == "reply" ? "<input type='hidden' name='pid' value='{$id}' />" : '').(isset($eaction) && $eaction == "edit" ? "<input type='hidden' name='editpid' value='{$id}' />" : "").(isset($content_type) && $content_type ? "<input type='hidden' name='content_type' value='{$content_type}' />" : '')."<input class='button' type='submit' name='".$action."submit' value='".(isset($eaction) && $eaction == "edit" ? COMLAN_320 : COMLAN_9)."' />\n</td>\n</tr>\n</table>\n</form></div>";
</div>
</form>
</div>";
if ($tablerender)
{
$text = $ns->tablerender($caption, $text, '', TRUE);

View File

@ -103,6 +103,13 @@ class e_form
$this->_required_string = $string;
return $this;
}
// For Comma separated keyword tags.
function tags($name, $value, $maxlength = 200, $options = array())
{
$options['class'] = 'tbox input-text e-tags';
return $this->text($name, $value, $maxlength, $options);
}
function text($name, $value, $maxlength = 200, $options = array())
{
@ -588,9 +595,9 @@ class e_form
}
/**
* Bbcode Area. Name, value, help_mode, form-id, size, counter
* Bbcode Area. Name, value, template, form-id, size, options array eg. counter
*/
function bbarea($name, $value, $help_mod = '', $help_tagid='', $size = 'large', $counter = false)
function bbarea($name, $value, $template = '', $help_tagid='', $size = 'large', $options = array())
{
//size - large|medium|small
//width should be explicit set by current admin theme
@ -612,26 +619,28 @@ class e_form
}
// auto-height support
$options = array('class' => 'tbox bbarea '.($size ? ' '.$size : '').' e-wysiwyg');
$options['class'] = 'tbox bbarea '.($size ? ' '.$size : '').' e-wysiwyg e-autoheight';
$bbbar = '';
// FIXME - see ren_help.php
require_once(e_HANDLER."ren_help.php");
$help_tagid = $this->name2id($name)."--preview"; // required as it needs to have some matching name with textarea.
// require_once(e_HANDLER."ren_help.php"); // Ren-help no longer required.
// $bbbar = display_help($help_tagid, $template, 'addtext', 'help', $size);
$help_tagid = $this->name2id($name)."--preview"; // not really needed, but a unique name is always welcome
$options['other'] = "onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'";
$bbbar = display_help($help_tagid, $help_mod, 'addtext', 'help', $size);
$counter = vartrue($options['counter'],false);
$ret = "
<div class='bbarea {$size}'>
<div class='field-spacer'><!-- --></div>
{$bbbar}
".$this->textarea($name, $value, $rows, 50, $options, $counter)."
<div class='field-spacer'><!-- --></div>\n";
$ret .= e107::getBB()->renderButtons($template,$help_tagid);
$ret .= $this->textarea($name, $value, $rows, 50, $options, $counter);
</div>
";
$ret .= "</div>\n";
return $ret;
// Quick fix - hide TinyMCE links if not installed, dups are handled by JS handler
/*
@ -644,7 +653,7 @@ class e_form
");
*/
return $ret;
}
/**
@ -752,7 +761,7 @@ class e_form
function label($text, $name = '', $value = '')
{
$for_id = $this->_format_id('', $name, $value, 'for');
return "<label$for_id>{$text}</label>";
return "<label$for_id class='e-tip'>{$text}</label>";
}
function help($text)
@ -1038,6 +1047,10 @@ class e_form
if($optval) $ret .= " required='required'";
break;
case 'autofocus':
if($optval) $ret .= " autofocus='autofocus'";
break;
case 'placeholder':
if($optval) $ret .= " placeholder='{$optval}'";
break;
@ -1122,21 +1135,22 @@ class e_form
if(isset($this->_cached_attributes[$type])) return $this->_cached_attributes[$type];
$def_options = array(
'id' => '',
'class' => '',
'title' => '',
'size' => '',
'readonly' => false,
'selected' => false,
'checked' => false,
'disabled' => false,
'required' => false,
// 'multiple' => false, - see case 'select'
'tabindex' => 0,
'label' => '',
'placeholder' => '',
'pattern' => '',
'other' => ''
'id' => '',
'class' => '',
'title' => '',
'size' => '',
'readonly' => false,
'selected' => false,
'checked' => false,
'disabled' => false,
'required' => false,
'autofocus' => false,
'tabindex' => 0,
'label' => '',
'placeholder' => '',
'pattern' => '',
'other' => ''
// 'multiple' => false, - see case 'select'
);
switch ($type) {
@ -1912,7 +1926,8 @@ class e_form
break;
case 'bbarea':
return $this->bbarea($key, $value, vartrue($parms['help']), vartrue($parms['helptag']), vartrue($parms['size'], 'medium'), varset($parms['counter'], false));
$options = array('counter' => varset($parms['counter'], false));
return $this->bbarea($key, $value, vartrue($parms['help']), vartrue($parms['helptag']), vartrue($parms['size'], 'medium'),$options );
break;
case 'image': //TODO - thumb, image list shortcode, js tooltip...

View File

@ -16,7 +16,8 @@
if (!defined('e107_INIT')) { exit; }
// IMPORTANT : Entire file is deprecated. see: bbcode_shortcodes.php and bbcode_hanlder.php
// Left in place only for BC.
function ren_help($mode = 1, $addtextfunc = "addtext", $helpfunc = "help")
{
@ -30,6 +31,14 @@ function ren_help($mode = 1, $addtextfunc = "addtext", $helpfunc = "help")
// FIXME - full rewrite, EVERYTHING - bbcode class (php + JS), core callbacks, tooltip help, optimize
function display_help($tagid="helpb", $mode = 1, $addtextfunc = "addtext", $helpfunc = "help", $helpsize = '')
{
return e107::getBB()->renderButtons($mode,'data'); // guessing the name of the textarea as 'data' no indicator unfortunately.
// may cause pre-image and pre-file selector issues.
// if(defsettrue('e_WYSIWYG')) { return; }
global $tp, $pref, $eplug_bb, $bbcode_func, $register_bb, $bbcode_help, $bbcode_helpactive, $bbcode_helptag, $bbcode_helpsize;
$bbcode_helpsize = $helpsize;
@ -76,7 +85,8 @@ function display_help($tagid="helpb", $mode = 1, $addtextfunc = "addtext", $help
$temp['mailout'] = $BBCODE_TEMPLATE_MAILOUT;
$temp['page'] = $BBCODE_TEMPLATE_CPAGE;
$temp['maintenance']= $BBCODE_TEMPLATE_ADMIN;
$temp['comment'] = "{BB_HELP}<br />".$BBCODE_TEMPLATE;
$temp['comment'] = $BBCODE_TEMPLATE;
$temp['signature'] = $BBCODE_TEMPLATE_SIGNATURE;
if(isset($temp[$mode]))
{

View File

@ -40,8 +40,8 @@ define("IMALAN_29", "No images");
// define("IMALAN_31", "Guests only");
// define("IMALAN_32", "Members only");
// define("IMALAN_33", "Admin only");
define("IMALAN_34", "Enable PNG Fix");
define("IMALAN_35", "Fixes transparent PNG-24's with alpha transparency in IE 5 / 6 (Applies Sitewide)");
//define("IMALAN_34", "Enable PNG Fix");
//define("IMALAN_35", "Fixes transparent PNG-24's with alpha transparency in IE 5 / 6 (Applies Sitewide)");
define("IMALAN_36", "Validate avatar size and access");
define("IMALAN_37", "Avatar Validation");
@ -82,8 +82,7 @@ define('IMALAN_68', 'Close');
define('IMALAN_69', 'Folder');
define('IMALAN_70', 'Non-system folder is found!');
define("IMALAN_71", "Icon Pool");
define("IMALAN_72", "Icons");
// define("IMALAN_72", "Icons");
?>

View File

@ -31,14 +31,14 @@ define("LANHELP_20", "Massive");
define("LANHELP_21", "Click to open color dialog ...");
define("LANHELP_22", "Click to open size dialog ...");
define("LANHELP_23", "Insert link: [link]http://mysite.com[/link] or [link=http://yoursite.com]Visit My Site[/link]");
define("LANHELP_24", "Bold text: [b]This text will be bold[/b]", "font-weight:bold; width: 20px");
define("LANHELP_25", "Italic text: [i]This text will be italicised[/i]", "font-style:italic; width: 20px");
define("LANHELP_26", "Underline text: [u]This text will be underlined[/u]", "text-decoration: underline; width: 20px");
define("LANHELP_27", "Insert image: [img]mypicture.jpg[/img]");
define("LANHELP_28", "Center align: [center]This text will be centered[/center]");
define("LANHELP_29", "Left align: [left]This text will be left aligned[/left]");
define("LANHELP_30", "Right align: [right]This text will be right aligned[/right]");
define("LANHELP_23", "Insert link:\n[link]http://mysite.com[/link] or [link=http://yoursite.com]Visit My Site[/link]");
define("LANHELP_24", "Bold text:\n[b]This text will be bold[/b]", "font-weight:bold; width: 20px");
define("LANHELP_25", "Italic text:\n[i]This text will be italicised[/i]", "font-style:italic; width: 20px");
define("LANHELP_26", "Underline text:\n[u]This text will be underlined[/u]", "text-decoration: underline; width: 20px");
define("LANHELP_27", "Insert image:\n[img]mypicture.jpg[/img]");
define("LANHELP_28", "Center align:\n[center]This text will be centered[/center]");
define("LANHELP_29", "Left align:\n[left]This text will be left aligned[/left]");
define("LANHELP_30", "Right align:\n[right]This text will be right aligned[/right]");
define("LANHELP_31", "Blockquote text: [blockquote]This text will be blockquoted (indented)[/blockquote]");
define("LANHELP_32", "Code - preformatted text: [code]\$foo = bah;[/code]");
define("LANHELP_33", "HTML - removes linebreaks from text: [html]&lt;table&gt;&lt;tr&gt;&lt;td&gt; etc[/html]");
@ -65,5 +65,5 @@ define("LANHELP_49", "Paragraph: [p=class name]Paragraph text[/p]");
define("LANHELP_50", "Heading: for H2 [h]Heading text[/h] or [h=2]Heading text[/h]");
define("LANHELP_51", "Disable HTML new lines for enclosed text: [nobr]text[/nobr]");
define("LANHELP_52", "New line (HTML): [br]");
define("LANHELP_53", "Justify align: [justify]This text will be justified[/justify]");
define("LANHELP_53", "Justify align:\n[justify]This text will be justified[/justify]");
define("LANHELP_54", "HTML block (div tag): [block]Your content[/block]");

View File

@ -67,7 +67,7 @@ define("LAN_SIGNUP_25", "Upload your avatar");
define("LAN_SIGNUP_26", "Upload your photograph");
define("LAN_SIGNUP_27", "Show");
//define("LAN_SIGNUP_28", "choice of Content/Mail-lists"); Now LAN_USER_73
define("LAN_SIGNUP_29", "A verification email will be sent to the email address you enter here so it must be valid.");
//define("LAN_SIGNUP_29", "A verification email will be sent to the email address you enter here so it must be valid.");
define("LAN_SIGNUP_30", "If you do not wish to display your email address on this site, please select 'Yes' for the 'Hide email address?' option.");
//define("LAN_SIGNUP_31", "URL to your XUP file");
//define("LAN_SIGNUP_32", "What's an XUP file?");
@ -129,7 +129,7 @@ define('LAN_SIGNUP_85', 'Usernames and passwords are <b>case-sensitive</b>.'); /
define('LAN_SIGNUP_89', 'Display Name: '); // LAN_7
define('LAN_SIGNUP_90', 'the name that will be displayed on site'); // LAN_8
define('LAN_SIGNUP_91', 'Real Name: '); // LAN_308
define('LAN_SIGNUP_92', 'your real name, including first and last name'); // LAN_310
//define('LAN_SIGNUP_92', 'your real name, including first and last name'); // LAN_310
define('LAN_SIGNUP_93', 'Signature: '); // LAN_120
define('LAN_SIGNUP_94', 'Avatar: '); // LAN_121
define('LAN_SIGNUP_95', 'Enter code visible in the image'); // LAN_410
@ -150,5 +150,9 @@ define("LAN_LOGINNAME", "Username");
define("LAN_PASSWORD", "Password");
define("LAN_USERNAME", "Display Name");
define("LAN_SIGNUP_107", "Password must be a minimum of [x] characters and include at least one UPPERCASE letter and a digit");
define("LAN_SIGNUP_108", "Must be a valid email address");
define("LAN_SIGNUP_109", "Must not contain any spaces");//TODO check against regex requirements
define("LAN_SIGNUP_110", "Your full name");
?>
?>

View File

@ -15,14 +15,25 @@
// $register_bb['blank'] = array("", "[blank][/blank]","Blank example helper text",e_IMAGE."bbcode/template.png");
// Simplified default bbcode bar - removed P, H, BR and NOBR bbcodes
// This is used on the front-end. ie. comments etc.
$BBCODE_TEMPLATE = "
{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=format}{BB=justify}{BB=center}{BB=left}{BB=right}
{BB=bq}{BB=list}{BB=table}{BB=fontcol}{BB=fontsize}{BB=emotes}{BB=youtube}
{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=justify}{BB=center}{BB=left}{BB=right}
{BB=bq}{BB=list}{BB=emotes}
<div class='field-spacer'><!-- --></div>
";
// $BBCODE_TEMPLATE .= "{BB=blank}";
$BBCODE_TEMPLATE_SIGNATURE = "
{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=justify}{BB=center}{BB=left}{BB=right}
{BB=bq}{BB=list}
<div class='field-spacer'><!-- --></div>
";
// $sc_style['BB_HELP']['pre'] = "<div style='text-align:center'>";
// $sc_style['BB_HELP']['post'] = "</div>";

View File

@ -23,15 +23,19 @@ define('ADMIN_AREA',FALSE);
$e107 = e107::getInstance();
$e107->sql->db_Mark_Time('(Header Top)');
e107::css('core', 'password/style.css', 'jquery');
e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2);
e107::js('core', 'jquery.mailcheck.min.js','jquery',2);
e107::js('core', 'colorbox/jquery.colorbox-min.js', 'jquery', 2);
e107::css('core', 'colorbox/colorbox.css', 'jquery');
// Used for Signup form elements - could be on any page of the site.
e107::js('core', 'jquery.mailcheck.min.js','jquery',2);
e107::js("core", "tooltip/jquery.tipsy.js","jquery",3);
e107::css('core', 'tooltip/tipsy.css', 'jquery');
// ------------------
e107::js('core', 'rate/js/jquery.raty.js', 'jquery', 2);
e107::css('core', 'core/all.jquery.css', 'jquery');
e107::js("core", "core/front.jquery.js","jquery",5); // Load all default functions.
e107::js("core", "core/all.jquery.js","jquery",5); // Load all default functions.
@ -153,7 +157,7 @@ $e_pref = e107::getConfig('core');
if (/*!defined("PREVIEWTHEME") && */!isset($no_core_css) || !$no_core_css)
{
//echo "<link rel='stylesheet' href='".e_FILE_ABS."e107.css' type='text/css' />\n";
$e_js->otherCSS('{e_FILE}e107.css');
$e_js->otherCSS('{e_WEB_CSS}e107.css');
}
// Load Plugin Header Files, allow them to load CSS/JSS via JS Manager early enouhg

View File

@ -34,7 +34,7 @@ $sc_style['SIGNUP_DISPLAYNAME']['post'] = "
$sc_style['SIGNUP_REALNAME']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_91."".req($pref['signup_option_realname'])."<br /><span class='smalltext'>".LAN_SIGNUP_92."</span></td>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_91."".req($pref['signup_option_realname'])."</td>
<td class='forumheader3' style='width:70%' >
";
$sc_style['SIGNUP_REALNAME']['post'] = "
@ -110,6 +110,7 @@ if(!defined($EXTENDED_USER_FIELD_REQUIRED))
$EXTENDED_USER_FIELD_REQUIRED = "<span class='required'> *</span>";
}
/* // DEPRECATED
$SIGNUP_SIGNATURE_START = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap;vertical-align:top' >".LAN_SIGNUP_93." ".req($pref['signup_option_signature'])."</td>
@ -121,8 +122,17 @@ $SIGNUP_SIGNATURE_END = "
<div style='".USER_WIDTH."'>{REN_HELP}</div>
</td></tr>
";
*/
$sc_style['SIGNUP_SIGNATURE']['pre'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap;vertical-align:top' >".LAN_SIGNUP_93." ".req($pref['signup_option_signature'])."</td>
<td class='forumheader3' style='width:70%' >";
$sc_style['SIGNUP_SIGNATURE']['post'] = "
</td></tr>";
$sc_style['SIGNUP_IMAGES']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%; vertical-align:top;white-space:nowrap' >".LAN_SIGNUP_94.req($pref['signup_option_image'])."<br /><span class='smalltext'>(".LAN_SIGNUP_33.")</span></td>
@ -237,7 +247,6 @@ $SIGNUP_BODY = "<div class='signup-other'>{FB=login}{TW=login}</div>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_83."<span class='required'> *</span></td>
<td class='forumheader3' style='width:70%'>
{SIGNUP_PASSWORD1}
{SIGNUP_PASSWORD_LEN}
</td>
</tr>
<tr>