diff --git a/e107_admin/auth.php b/e107_admin/auth.php index e4b06022c..1537c253c 100644 --- a/e107_admin/auth.php +++ b/e107_admin/auth.php @@ -9,8 +9,8 @@ * Administration Area Authorization * * $Source: /cvs_backup/e107_0.8/e107_admin/auth.php,v $ - * $Revision: 1.6 $ - * $Date: 2008-12-10 16:59:19 $ + * $Revision: 1.7 $ + * $Date: 2009-01-07 15:40:06 $ * $Author: secretr $ */ @@ -23,6 +23,11 @@ if (ADMIN) define("ADMIN_PAGE", true); //don't include it if it'a an AJAX call or not wanted if(!e_AJAX_REQUEST && !defset('NO_HEADER')) require_once(e_ADMIN."header.php"); + /* + * FIXME - missing $style for tablerender + * The Solution: parse_admin() without sending it to the browser if it's an ajax call + * The Problem: doubled render time for the ajax called page!!! + */ } else { @@ -239,4 +244,4 @@ class auth } //------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// -?> +?> \ No newline at end of file diff --git a/e107_admin/meta.php b/e107_admin/meta.php index 5f667c6e2..fff40b2ca 100644 --- a/e107_admin/meta.php +++ b/e107_admin/meta.php @@ -9,8 +9,8 @@ * Administration Area - Meta Tags * * $Source: /cvs_backup/e107_0.8/e107_admin/meta.php,v $ - * $Revision: 1.5 $ - * $Date: 2008-12-21 12:53:11 $ + * $Revision: 1.6 $ + * $Date: 2009-01-07 15:40:06 $ * $Author: secretr $ * */ @@ -142,10 +142,8 @@ require_once("footer.php"); */ function headerjs() { - require_once(e_HANDLER.'js_helper.php'); $ret = " + + "; + + return $ret; +} ?> \ No newline at end of file diff --git a/e107_files/shortcode/batch/bbcode_shortcodes.php b/e107_files/shortcode/batch/bbcode_shortcodes.php index 397077d00..8275eebc1 100644 --- a/e107_files/shortcode/batch/bbcode_shortcodes.php +++ b/e107_files/shortcode/batch/bbcode_shortcodes.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/bbcode_shortcodes.php,v $ -| $Revision: 1.8 $ -| $Date: 2008-12-29 15:23:06 $ +| $Revision: 1.9 $ +| $Date: 2009-01-07 15:40:06 $ | $Author: secretr $ +----------------------------------------------------------------------------+ */ @@ -28,7 +28,7 @@ SC_BEGIN BB //FIXME - cachevars/getcachedvars! global $pref, $eplug_bb, $bbcode_func, $bbcode_help, $bbcode_filedir, $bbcode_imagedir, $bbcode_helpactive, $bbcode_helptag, $register_bb, $imode; -if(e_WYSIWYG){ return; } +if(defsettrue('e_WYSIWYG')){ return; } $bbcode_func = ($bbcode_func) ? $bbcode_func : "addtext"; $bbcode_help = ($bbcode_help) ? $bbcode_help : "help"; @@ -39,7 +39,7 @@ $imagedir_display = str_replace("../","",$bbcode_imagedir); if($parm == "emotes") { - if ($pref['comments_emoticons'] && $pref['smiley_activate'] && !e_WYSIWYG) + if ($pref['comments_emoticons'] && $pref['smiley_activate'] && !defsettrue('e_WYSIWYG')) { $bbcode['emotes'] = array("expandit","emoticon_selector_".$rand, LANHELP_44, "emotes.png", "Emoticon_Select", "emoticon_selector_".$rand); } @@ -72,7 +72,7 @@ $bbcode['prefile'] = array("expandit","prefile_selector_".$rand, LANHELP_39,"pre if(!isset($iconpath[$parm])) { - $iconpath[$parm] = (file_exists(THEME."bbcode/bold.png") ? THEME."bbcode/" : e_IMAGE."packs/".$imode."/bbcode/"); + $iconpath[$parm] = (file_exists(THEME."bbcode/bold.png") ? THEME_ABS."bbcode/" : e_IMAGE_ABS."bbcode/"); $iconpath[$parm] .= $bbcode[$parm][3]; } @@ -135,19 +135,19 @@ SC_END SC_BEGIN BB_HELP - if(e_WYSIWYG){ return; } + if(defsettrue('e_WYSIWYG')) { return; } global $bbcode_helpactive,$bbcode_helptag; if($parm) $bbcode_helptag = $parm; elseif(!varset($bbcode_helptag)) $bbcode_helptag = 'helpb'; $bbcode_helpactive = TRUE; //FIXME - better bb help - return "\n"; + return ""; SC_END SC_BEGIN BB_PREIMAGEDIR - if(e_WYSIWYG){ return; } + if(defsettrue('e_WYSIWYG')) { return; } global $bbcode_imagedir; $bbcode_imagedir = $parm; return; diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 928ad51fc..6cea2ddbc 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -9,8 +9,8 @@ * Form Handler * * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $ - * $Revision: 1.13 $ - * $Date: 2008-12-30 13:51:41 $ + * $Revision: 1.14 $ + * $Date: 2009-01-07 15:40:06 $ * $Author: secretr $ * */ @@ -100,6 +100,28 @@ class e_form return ""; } + function bbarea($name, $value, $help_mod = '', $help_tagid='') + { + $options = array('class' => 'tbox large'); + if(!defsettrue('e_WYSIWYG')) + { + require_once(e_HANDLER."ren_help.php"); + $options['other'] = "onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'"; + $bbbar = display_help($help_tagid, $help_mod); + } + + $ret = " +
+
+ ".$this->textarea($name, $value, 15, 50, $options)." +
+ {$bbbar} +
+ "; + + return $ret; + } + function checkbox($name, $value, $checked = false, $options = array()) { $options['checked'] = $checked; //comes as separate argument just for convenience diff --git a/e107_handlers/ren_help.php b/e107_handlers/ren_help.php index 342ecfe56..561f7e43a 100644 --- a/e107_handlers/ren_help.php +++ b/e107_handlers/ren_help.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/ren_help.php,v $ -| $Revision: 1.7 $ -| $Date: 2008-11-20 20:34:44 $ -| $Author: e107steved $ +| $Revision: 1.8 $ +| $Date: 2009-01-07 15:40:06 $ +| $Author: secretr $ +----------------------------------------------------------------------------+ */ @@ -33,7 +33,7 @@ function ren_help($mode = 1, $addtextfunc = "addtext", $helpfunc = "help") function display_help($tagid="helpb", $mode = 1, $addtextfunc = "addtext", $helpfunc = "help") { - if(e_WYSIWYG){ return; } + if(defsettrue('e_WYSIWYG')) { return; } global $tp, $pref, $eplug_bb, $bbcode_func, $register_bb, $bbcode_help, $bbcode_helpactive, $bbcode_helptag; $bbcode_func = $addtextfunc; @@ -68,7 +68,7 @@ function display_help($tagid="helpb", $mode = 1, $addtextfunc = "addtext", $help } $temp['news'] = $BBCODE_TEMPLATE_NEWSPOST; - $temp['submitnews'] = $BBCODE_TEMPLATE_SUBMITNEWS; + $temp['submitnews'] = $BBCODE_TEMPLATE_SUBMITNEWS; $temp['extended'] = $BBCODE_TEMPLATE_NEWSPOST; $temp['admin'] = $BBCODE_TEMPLATE_ADMIN; $temp['mailout'] = $BBCODE_TEMPLATE_ADMIN."{BB=shortcode}"; diff --git a/e107_languages/English/admin/lan_ugflag.php b/e107_languages/English/admin/lan_ugflag.php index 6341b1b4b..5c16d7dec 100644 --- a/e107_languages/English/admin/lan_ugflag.php +++ b/e107_languages/English/admin/lan_ugflag.php @@ -4,17 +4,17 @@ | e107 website system - Language File. | | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_ugflag.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:34:42 $ -| $Author: mcfly_e107 $ +| $Revision: 1.2 $ +| $Date: 2009-01-07 15:40:06 $ +| $Author: secretr $ +----------------------------------------------------------------------------+ */ -define("UGFLAN_1", "maintenance setting updated"); +define("UGFLAN_1", "Maintenance settings updated"); define("UGFLAN_2", "Activate maintenance flag"); define("UGFLAN_3", "Update Maintenance Setting"); define("UGFLAN_4", "Maintenance Setting"); define("UGFLAN_5", "Text to display when site down"); define("UGFLAN_6", "Leave blank to display default message"); - +define("UGFLAN_7","Update unsuccessful as no changes were made."); ?> \ No newline at end of file diff --git a/e107_themes/_blank/admin_style.css b/e107_themes/_blank/admin_style.css index fa8c14c43..a2220b4b4 100644 --- a/e107_themes/_blank/admin_style.css +++ b/e107_themes/_blank/admin_style.css @@ -123,6 +123,7 @@ select, .tbox, .helpbox { } option { padding-right: 10px;} input.input-text, textarea, .tbox, .helpbox { padding:2px; } +.tbox.large { width: 95% !important; } select.tbox { min-height:17px; padding: 0px; /* setting the height of empty selects */ } .select.order { width: 40px !important; } .select.time-offset { width: 60px !important; } @@ -169,6 +170,7 @@ label { cursor: pointer; } .adminedit .select { width: 280px; } .adminedit .input-text { width: 274px;} .adminedit td.control textarea { width: 274px;} +.adminedit td.control textarea.large { width: 400px; } .adminedit td.label {} .adminedit td.control {} diff --git a/e107_themes/_blank/admin_theme.php b/e107_themes/_blank/admin_theme.php new file mode 100644 index 000000000..f23e77aad --- /dev/null +++ b/e107_themes/_blank/admin_theme.php @@ -0,0 +1,100 @@ + 'all', + 'jslib/core/tabs.js' => 'admin' +); + +$register_sc[]='FS_ADMIN_ALT_NAV'; +$no_core_css = TRUE; + +function theme_head() { + $ret = ''; + $ret .= ' + + + + '; + + $ret .= " + "; + return $ret; +} + +function tablestyle($caption, $text, $mod) { + global $style; + $class = ''; + if(is_string($mod) && $mod == 'admin_help') $class = ' '.str_replace('_', '-', $mod); + + switch(varset($style, 'admin_content')) { + + case 'admin_menu' : + echo ' +
+

'.$caption.'

+ '.$text.' +
+ '; + break; + + case 'site_info' : + echo ' +
+

'.$caption.'

+
+ '.$text.' +
+
+ '; + break; + + case 'admin_content': + echo ' +
+

'.$caption.'

+
+ '.$text.' +
+
+ '; + break; + + default: + echo ' +
+

'.$caption.'

+
+ '.$text.' +
+
+ '; + break; + } +} + +$HEADER = ''; +$FOOTER = ''; + +?> \ No newline at end of file diff --git a/e107_themes/templates/bbcode_template.php b/e107_themes/templates/bbcode_template.php index f28017886..6cfe03411 100644 --- a/e107_themes/templates/bbcode_template.php +++ b/e107_themes/templates/bbcode_template.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_themes/templates/bbcode_template.php,v $ -| $Revision: 1.4 $ -| $Date: 2007-11-13 07:54:33 $ -| $Author: e107coders $ +| $Revision: 1.5 $ +| $Date: 2009-01-07 15:40:06 $ +| $Author: secretr $ +----------------------------------------------------------------------------+ */ // How to register your own BBcode button. @@ -22,8 +22,10 @@ // $register_bb['blank'] = array("", "[blank][/blank]","Blank example helper text",e_IMAGE."packs/".$imode."/bbcode/template.png"); $BBCODE_TEMPLATE = " - {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right} - {BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes} +
+ {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right} + {BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes} +
"; // $BBCODE_TEMPLATE .= "{BB=blank}"; @@ -33,41 +35,54 @@ $BBCODE_TEMPLATE = " // $sc_style['BB_HELP']['post'] = ""; $BBCODE_TEMPLATE_SUBMITNEWS = " - {BB_HELP}
- {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right} - {BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}{BB=flash} +
+ {BB_HELP} +
+
+ {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right} + {BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}{BB=flash} +
"; // -------- Admin Templates ---------------------- $BBCODE_TEMPLATE_ADMIN = " - {BB_HELP=admin}
- {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left} - {BB=right}{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes} - {BB_PREIMAGEDIR=".e_IMAGE."} - {BB=preimage}{BB=prefile}{BB=flash} +
+ {BB_HELP=admin} +
+
+ {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left} + {BB=right}{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes} + {BB_PREIMAGEDIR=".e_IMAGE."} + {BB=preimage}{BB=prefile}{BB=flash} +
"; // $BBCODE_TEMPLATE_ADMIN .= "{BB=blank}"; $BBCODE_TEMPLATE_NEWSPOST = " - {BB_HELP=$mode}
- {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left} - {BB=right}{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes} - {BB_PREIMAGEDIR=".e_IMAGE."newspost_images/} - {BB=preimage}{BB=prefile}{BB=flash} +
+ {BB_HELP=$mode} +
+
+ {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left} + {BB=right}{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes} + {BB_PREIMAGEDIR=".e_IMAGE."newspost_images/} + {BB=preimage}{BB=prefile}{BB=flash} +
"; $BBCODE_TEMPLATE_CPAGE = " - {BB_HELP}
- {BB=newpage} - {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right} - {BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes} - {BB_PREIMAGEDIR=".e_IMAGE."custom/} - {BB=preimage}{BB=prefile}{BB=flash} +
+ {BB_HELP} +
+
+ {BB=newpage} + {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right} + {BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes} + {BB_PREIMAGEDIR=".e_IMAGE."custom/} + {BB=preimage}{BB=prefile}{BB=flash} +
"; - - - ?> \ No newline at end of file