diff --git a/e107_admin/ad_links.php b/e107_admin/ad_links.php index a9c00033c..c2b9b7d60 100644 --- a/e107_admin/ad_links.php +++ b/e107_admin/ad_links.php @@ -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), diff --git a/e107_admin/header.php b/e107_admin/header.php index 27a428be0..1ac4d440e 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -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); diff --git a/e107_admin/image.php b/e107_admin/image.php index 1e684c7c5..2009561c5 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -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 = " ".IMALAN_55.""; + } + + if($pref['resize_method'] == "ImageMagick" && (!vartrue(e107::getFolder('imagemagick')))) + { + + $mes->addWarning('Please add: $IMAGEMAGICK_DIRECTORY="'.$pref['im_path'].'"; 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 = "".IMALAN_52.""; + $mes->addWarning(IMALAN_52); + } + else + { + $cmd = "{$im_file} -version"; + $tmp = `$cmd`; + if(strpos($tmp, "ImageMagick") === FALSE) + { + //$IM_NOTE = "".IMALAN_53.""; + $mes->addWarning(IMALAN_53); + } + } + } + + + + + + + $text = " +
+
+ ".IMALAN_7." + + + + + + + + + + + + + + + + + + + "; + + list($img_import_w,$img_import_h) = explode("x",$pref['img_import_resize']); + + //TODO LANS + $text .= " + + + + + + + + + "; + /* + $text .= " + // Removed to prevent mod_security blocks, and show only when relevant (non-GD2 users) + + + + "; + + // Removed as IE6 should no longer be supported. A 3rd-party plugin can be made for this functionality if really needed. + + + + $text .= " + + + + "; + + */ + + + $text .= " + + + + + + +
+ ".IMALAN_1." + +
+ ".$frm->checkbox('image_post', 1, $pref['image_post'])." +
".IMALAN_2."
+
+
+ ".IMALAN_10." + + ".r_userclass('image_post_class',$pref['image_post_class'],"off","public,guest,nobody,member,admin,main,classes")." +
".IMALAN_11."
+
+ ".IMALAN_12." + + ".$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()." +
".IMALAN_13."
+
Resize images during media import
Leave empty to disable
 + ".$frm->text('img_import_resize_w', $img_import_w,4)."px X ".$frm->text('img_import_resize_h', $img_import_h,4)."px +
".IMALAN_3."
".IMALAN_54." {$gd_version}
 + ".$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()." +
".IMALAN_4."
+
".IMALAN_5."
{$IM_NOTE}
 + ".$frm->text('im_path', $pref['im_path'])." +
".IMALAN_6."
+
".IMALAN_34." + +
+ ".$frm->checkbox('enable_png_image_fix', 1, ($pref['enable_png_image_fix']))." +
".IMALAN_35."
+
+
".IMALAN_36." + ".$frm->admin_button('check_avatar_sizes', ADLAN_145)." +
+
+ ".$frm->admin_button('update_options', IMALAN_8, 'update')." +
+
+
"; + + 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 = " ".IMALAN_55.""; - } - - $IM_NOTE = ""; - if($pref['im_path'] != "") - { - $im_file = $pref['im_path'].'convert'; - if(!file_exists($im_file)) - { - $IM_NOTE = "".IMALAN_52.""; - } - else - { - $cmd = "{$im_file} -version"; - $tmp = `$cmd`; - if(strpos($tmp, "ImageMagick") === FALSE) - { - $IM_NOTE = "".IMALAN_53.""; - } - } - } - - $text = " -
-
- ".IMALAN_7." - - - - - - - - - - - - - - - - - - - "; - - list($img_import_w,$img_import_h) = explode("x",$pref['img_import_resize']); - - //TODO LANS - $text .= " - - - - - - - - - - - - - - "; - - // Removed as IE6 should no longer be supported. A 3rd-party plugin can be made for this functionality if really needed. - /* - - - $text .= " - - - - "; - - */ - - - $text .= " - - - - - - -
- ".IMALAN_1." - -
- ".$frm->checkbox('image_post', 1, $pref['image_post'])." -
".IMALAN_2."
-
-
- ".IMALAN_10." - - ".r_userclass('image_post_class',$pref['image_post_class'],"off","public,guest,nobody,member,admin,main,classes")." -
".IMALAN_11."
-
- ".IMALAN_12." - - ".$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()." -
".IMALAN_13."
-
Resize images during media import
Leave empty to disable
 - ".$frm->text('img_import_resize_w', $img_import_w,4)."px X ".$frm->text('img_import_resize_h', $img_import_h,4)."px -
".IMALAN_6."
-
".IMALAN_3."
".IMALAN_54." {$gd_version}
 - ".$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()." -
".IMALAN_4."
-
".IMALAN_5."
{$IM_NOTE}
 - ".$frm->text('im_path', $pref['im_path'])." -
".IMALAN_6."
-
".IMALAN_34." - -
- ".$frm->checkbox('enable_png_image_fix', 1, ($pref['enable_png_image_fix']))." -
".IMALAN_35."
-
-
".IMALAN_36." - ".$frm->admin_button('check_avatar_sizes', ADLAN_145)." -
-
- ".$frm->admin_button('update_options', IMALAN_8, 'update')." -
-
-
"; - - 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"); diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index bc9e21304..137151704 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -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)." + + + "; @@ -2076,9 +2079,14 @@ class admin_newspost - Meta keywords: - ".$frm->text('news_meta_keywords', $tp->post_toForm($_POST['news_meta_keywords']), 255)." + ".LAN_KEYWORDS.": + ".$frm->tags('news_meta_keywords', $tp->post_toForm($_POST['news_meta_keywords']), 255)." +
Keywords/tags associated to associate with this news item
+ + + + Meta description: ".$frm->textarea('news_meta_description', $tp->post_toForm($_POST['news_meta_description']), 7)." @@ -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))."
".NWSLAN_74."
@@ -2181,9 +2188,9 @@ class admin_newspost ".LAN_NEWS_28.": - ".$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')."
- ".LAN_NEWS_29." + ".LAN_NEWS_30."
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index c0d3059de..93d7228ba 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -588,7 +588,12 @@ $text .= " ".PRFLAN_184." ".$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 .= " ".PRFLAN_43.": - ".$frm->textarea('profanity_words', $pref['profanity_words'], 2, 59)." + ".$frm->tags('profanity_words', $pref['profanity_words'])."
".PRFLAN_44."
diff --git a/e107_core/shortcodes/batch/bbcode_shortcodes.php b/e107_core/shortcodes/batch/bbcode_shortcodes.php index 81d9703a4..097d01607 100644 --- a/e107_core/shortcodes/batch/bbcode_shortcodes.php +++ b/e107_core/shortcodes/batch/bbcode_shortcodes.php @@ -30,13 +30,13 @@ class bbcode_shortcodes extends e_shortcode function bb_format($id) { - $text = " - - - - - + + + + + "; 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 = ""; - $text .= ""; + $text = ""; + $text .= ""; 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 = ""; - $text .= ""; + $text = ""; + $text .= ""; 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 = ""; - $text .= ""; + $text = ""; + $text .= ""; return $text; } @@ -81,8 +81,8 @@ class bbcode_shortcodes extends e_shortcode { $data = "[youtube]*[/youtube]"; $event = $this->getEvent('addinput',$data,LANHELP_48); - $text = " - "; + $text = ""; + $text .=""; return $text; } @@ -90,8 +90,8 @@ class bbcode_shortcodes extends e_shortcode { $data = "[link=*]*[/link]"; $event = $this->getEvent('addinput',$data,LANHELP_35); - $text = " - "; + $text = "\n"; + $text .=""; 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 = ""; - $text .= ""; + $text .= ""; $text .= "\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 = ""; - $text .= ""; + $text .= ""; $text .= "\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 = " - "; + $text = "var['tagid']}')\" data-function='show' href='#{$this->var['tagid']}' title='".LANHELP_22."' data-bbcode='{$data}'> + "; $text .=" - \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 "{$text}"; + return "{$text}"; } 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... diff --git a/e107_handlers/ren_help.php b/e107_handlers/ren_help.php index cc19883b0..5ad47cdea 100644 --- a/e107_handlers/ren_help.php +++ b/e107_handlers/ren_help.php @@ -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}
".$BBCODE_TEMPLATE; + $temp['comment'] = $BBCODE_TEMPLATE; + $temp['signature'] = $BBCODE_TEMPLATE_SIGNATURE; if(isset($temp[$mode])) { diff --git a/e107_languages/English/admin/lan_image.php b/e107_languages/English/admin/lan_image.php index a5f3555ae..bb8a86fbb 100644 --- a/e107_languages/English/admin/lan_image.php +++ b/e107_languages/English/admin/lan_image.php @@ -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"); ?> \ No newline at end of file diff --git a/e107_languages/English/lan_ren_help.php b/e107_languages/English/lan_ren_help.php index 182e7bed3..c6ded52f8 100644 --- a/e107_languages/English/lan_ren_help.php +++ b/e107_languages/English/lan_ren_help.php @@ -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]<table><tr><td> 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]"); \ No newline at end of file diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php index ea3b6839c..c1b2c7a14 100644 --- a/e107_languages/English/lan_signup.php +++ b/e107_languages/English/lan_signup.php @@ -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 case-sensitive.'); / 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"); -?> +?> \ No newline at end of file diff --git a/e107_themes/templates/bbcode_template.php b/e107_themes/templates/bbcode_template.php index c9004a733..214e9fe18 100644 --- a/e107_themes/templates/bbcode_template.php +++ b/e107_themes/templates/bbcode_template.php @@ -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}
"; // $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} +
+"; + + + // $sc_style['BB_HELP']['pre'] = "
"; // $sc_style['BB_HELP']['post'] = "
"; diff --git a/e107_themes/templates/header_default.php b/e107_themes/templates/header_default.php index 433fa1883..3851a2b18 100644 --- a/e107_themes/templates/header_default.php +++ b/e107_themes/templates/header_default.php @@ -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 "\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 diff --git a/e107_themes/templates/signup_template.php b/e107_themes/templates/signup_template.php index dbf2c9e41..4666f6f83 100755 --- a/e107_themes/templates/signup_template.php +++ b/e107_themes/templates/signup_template.php @@ -34,7 +34,7 @@ $sc_style['SIGNUP_DISPLAYNAME']['post'] = " $sc_style['SIGNUP_REALNAME']['pre'] = " -".LAN_SIGNUP_91."".req($pref['signup_option_realname'])."
".LAN_SIGNUP_92." +".LAN_SIGNUP_91."".req($pref['signup_option_realname'])." "; $sc_style['SIGNUP_REALNAME']['post'] = " @@ -110,6 +110,7 @@ if(!defined($EXTENDED_USER_FIELD_REQUIRED)) $EXTENDED_USER_FIELD_REQUIRED = " *"; } +/* // DEPRECATED $SIGNUP_SIGNATURE_START = " ".LAN_SIGNUP_93." ".req($pref['signup_option_signature'])." @@ -121,8 +122,17 @@ $SIGNUP_SIGNATURE_END = "
{REN_HELP}
"; +*/ +$sc_style['SIGNUP_SIGNATURE']['pre'] = " + ".LAN_SIGNUP_93." ".req($pref['signup_option_signature'])." + "; + +$sc_style['SIGNUP_SIGNATURE']['post'] = " + "; + + $sc_style['SIGNUP_IMAGES']['pre'] = " ".LAN_SIGNUP_94.req($pref['signup_option_image'])."
(".LAN_SIGNUP_33.") @@ -237,7 +247,6 @@ $SIGNUP_BODY = " ".LAN_SIGNUP_83." * {SIGNUP_PASSWORD1} -{SIGNUP_PASSWORD_LEN}