diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php index 4dc05f763..5103fdc83 100644 --- a/e107_admin/emoticon.php +++ b/e107_admin/emoticon.php @@ -149,46 +149,50 @@ class emotec $frm = e107::getForm(); $fl = e107::getFile(); $ns = e107::getRender(); - $mes = e107::getMessage(); - + $mes = e107::getMessage(); $text = " -
-
"; /* In BBCODE-Mode this dialog rerturns an [img] bbcode to the 'tagid' container with the appropriate parms generated. * eg. [img style=float:left;margin-right:3px]{e_MEDIA_IMAGE}someimage.jpg[/img] @@ -1510,7 +1511,7 @@ class media_admin_ui extends e_admin_ui // $files = $fl->get_files(e_MEDIA."temp/"); $files = $fl->get_files(e_TEMP); - e107::js('core','core/admin.js','prototype'); + // e107::js('core','core/admin.js','prototype'); //TODO Detect XML file, and if found - read that instead of the directory. diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index 06399968d..8f68596f2 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -33,7 +33,7 @@ $gen = new convert(); //Handle Ajax Calls if($newspost->ajax_observer()) exit; -e107::js('core','core/admin.js','prototype'); +// e107::js('core','core/admin.js','prototype'); //e107::getJs()->requireCoreLib('core/admin.js'); class news_admin extends e_admin_dispatcher diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index d110fa044..a58877378 100644 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -1455,38 +1455,40 @@ class pluginBuilder } $text = $frm->open('newplugin-step3','post', e_SELF.'?mode=create&newplugin='.$newplug.'&step=3'); - $text .= "
\n"; - $text .= "
"; + - $text .= "
\n"; - $text .= $this->pluginXml(); - $text .= "
"; $text .= ""; @@ -1581,7 +1583,7 @@ class pluginBuilder } } - $text = ""; + $text = "
"; foreach($data as $key=>$val) { diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index cbd675a1a..95770ef42 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -1762,7 +1762,7 @@ $text .= " "; - + /* e107::js('inline'," \$\$('#e-jslib-nocombine', '#e-jslib-nocombine-1').invoke('observe', 'change', function(event) { var element = event.findElement('input'), check = !parseInt(element.value); @@ -1781,7 +1781,7 @@ $text .= " eHandleJsForm(".($pref['e_jslib_nocombine'] ? 'false' : 'true')."); ","prototype"); - + */ //Advanced Features diff --git a/e107_admin/theme.php b/e107_admin/theme.php index 5a32a095e..457be7aee 100644 --- a/e107_admin/theme.php +++ b/e107_admin/theme.php @@ -160,7 +160,7 @@ else echo ' -
- - - - - - - - - - "; - - $text .= ""; - $text .= ""; - $text .= ""; - - $text .= ""; - $text .= ""; - $text .= " - "; - - // site theme.. - if($mode == 1) - { - - $text .= " +
+
+
".TPVLAN_11."".$theme['version']."".$thumbnail."
".TPVLAN_4.":".$author."
".TPVLAN_5.":".$website."
".TPVLAN_6.":".$theme['date']."
".TPVLAN_7.":".$theme['info']."
".LAN_CATEGORY.":".$theme['category']."
".TPVLAN_49.":"; - $text .= ($theme['xhtmlcompliant']) ? "W3C XHTML ".$theme['xhtmlcompliant'] : "Not Specified"; - $text .= ($theme['csscompliant']) ? " & CSS ".$theme['csscompliant'] : ""; - $text .= "
+ + + + + - - - "; - - $text .= " - - - - "; - } + + + + "; - // New in 0.8 ---- site theme. - if($mode == 1) - { - - $itext = " - - "; + } // $itext .= !$mode ? "" : ""; - if($mode == 2) - { - - $astext = ""; - $file = e107::getFile(); - - $adminstyles = $file->get_files(e_ADMIN."includes"); - - $astext = "\n"; - - $text .= " - - - - - \n"; - } + if($mode == 2) + { + + $astext = ""; + $file = e107::getFile(); + + $adminstyles = $file->get_files(e_ADMIN."includes"); + + $astext = "\n"; + + $text .= " + + + + + \n"; + } - $text .= $itext; - - if(array_key_exists("multipleStylesheets", $theme) && $mode) - { - $text .= " - -
".TPVLAN_53.""; - - if(varset($theme['plugins'])) - { - foreach ($theme['plugins'] as $key=>$val) - { - $text .= $this->renderPlugins($theme['plugins']); - $text .= " "; - } - } - - $text .= " 
".TPVLAN_30." - ".TPVLAN_28."   - ".TPVLAN_29." -
".TPVLAN_11."".$theme['version']."".$thumbnail."
".TPVLAN_50.": - - - - - - - - "; - $itext .= ($mode == 1) ? "" : ""; - $itext .= " - - - - - \n"; - - - foreach ($theme['layouts'] as $key=>$val) - { - $itext .= " - "; - if($mode == 1) - { - if(!$pref['sitetheme_deflayout']) - { - $pref['sitetheme_deflayout'] = ($val['@attributes']['default'] == 'true') ? $key : ""; - } - $itext .= ""; + $text .= ""; + $text .= ""; - $itext .= " - - "; - } - - $itext .= ""; + $text .= ""; + $text .= " + "; + + // site theme.. + if($mode == 1) { - $custompage_diz .= "".trim($cp)." "; - if($count > 4) + + $text .= " + + + - "; - - $itext .= " - + + $text .= " "; - } + + $text .= " + + + + "; + } + + // New in 0.8 ---- site theme. + if($mode == 1) + { + + $itext = " + + "; - } + \n"; + + + foreach ($theme['layouts'] as $key=>$val) + { + $itext .= " + "; + if($mode == 1) + { + if(!$pref['sitetheme_deflayout']) + { + $pref['sitetheme_deflayout'] = ($val['@attributes']['default'] == 'true') ? $key : ""; + } + $itext .= ""; + } + + $itext .= " + "; + + $itext .= " + + "; + } + + $itext .= "
".TPVLAN_55."".TPVLAN_52."".TPVLAN_56."".TPVLAN_54."
\n"; + $text .= "
".TPVLAN_4.":".$author."
".TPVLAN_5.":".$website."
".TPVLAN_6.":".$theme['date']."
"; - // $itext .= ($val['@attributes']['previewFull']) ? "" : ""; - $itext .= $val['@attributes']['title']; - // $itext .= ($val['@attributes']['previewFull']) ? "" : ""; - - $custompage_count = (isset($pref['sitetheme_custompages'][$key])) ? " [".count($pref['sitetheme_custompages'][$key])."]" : ""; - $custompage_diz = ""; - $count = 1; - if(isset($pref['sitetheme_custompages'][$key]) && count($pref['sitetheme_custompages'][$key]) > 0) - { - foreach ($pref['sitetheme_custompages'][$key] as $cp) + $text .= "
".TPVLAN_7.":".$theme['info']."
".LAN_CATEGORY.":".$theme['category']."
".TPVLAN_49.":"; + $text .= ($theme['xhtmlcompliant']) ? "W3C XHTML ".$theme['xhtmlcompliant'] : "Not Specified"; + $text .= ($theme['csscompliant']) ? " & CSS ".$theme['csscompliant'] : ""; + $text .= "
".TPVLAN_53.""; + + if(varset($theme['plugins'])) { - $custompage_diz .= "..."; - break; + foreach ($theme['plugins'] as $key=>$val) + { + $text .= $this->renderPlugins($theme['plugins']); + $text .= " "; + } } - $count++; - } - } - else - { - $custompage_diz = "None "; - } - - - $itext .= ""; - // Default - $itext .= ($pref['sitetheme_deflayout'] != $key) ? $custompage_diz."
\n" : TPVLAN_55; - - $itext .= "		"; - - $itext .= (varset($val['menuPresets'])) ? $this->frm->admin_button("setMenuPreset[".$key."]", "Use Preset") : ""; - $itext .= "
".TPVLAN_30." + ".TPVLAN_28."   + ".TPVLAN_29." +
".TPVLAN_50.": + + + + + + + + "; + $itext .= ($mode == 1) ? "" : ""; + $itext .= " + + + - $itext .= "
".TPVLAN_55."".TPVLAN_52."".TPVLAN_56."".TPVLAN_54."
\n"; + + $itext .= " + + "; + // $itext .= ($val['@attributes']['previewFull']) ? "" : ""; + $itext .= $val['@attributes']['title']; + // $itext .= ($val['@attributes']['previewFull']) ? "" : ""; + + $custompage_count = (isset($pref['sitetheme_custompages'][$key])) ? " [".count($pref['sitetheme_custompages'][$key])."]" : ""; + $custompage_diz = ""; + $count = 1; + if(isset($pref['sitetheme_custompages'][$key]) && count($pref['sitetheme_custompages'][$key]) > 0) + { + foreach ($pref['sitetheme_custompages'][$key] as $cp) + { + $custompage_diz .= "".trim($cp)." "; + if($count > 4) + { + $custompage_diz .= "..."; + break; + } + $count++; + } + } + else + { + $custompage_diz = "None "; + } + + + $itext .= ""; + // Default + $itext .= ($pref['sitetheme_deflayout'] != $key) ? $custompage_diz."
\n" : TPVLAN_55; + + $itext .= "		"; + + $itext .= (varset($val['menuPresets'])) ? $this->frm->admin_button("setMenuPreset[".$key."]", "Use Preset") : ""; + $itext .= "
".TPVLAN_8.":".$previewbutton.$selectmainbutton.$selectadminbutton."
".TPVLAN_41.":".$astext."
".TPVLAN_41.":".$astext."
".TPVLAN_22.": - - - - - - "; - - - foreach ($theme['css'] as $css) - { + $text .= $itext; - $text2 = ""; - - - - if($mode == 2) // ADMIN MODE - { - if($css['name'] == "style.css" || !vartrue($css['info'])) // Hide the admin css unless it has a header. eg. /* info: Default stylesheet */ + if(array_key_exists("multipleStylesheets", $theme) && $mode) { - continue; + $text .= " + + "; } - - if(!$css['nonadmin']) + + + if($mode == 1) { - $text2 = " - - - \n"; - } - } - - if($mode == 1) // SITE-THEME Mode - { - if(substr($css['name'], 0, 6) == "admin_") - { - continue; + $text .= $this->renderThemeConfig(); } - $text2 = " - - - \n"; - } - - $text .= ($text2) ? "".$text2."" : ""; + $text .= "
".TPVLAN_55."".TPVLAN_52."".TPVLAN_7."
".TPVLAN_22.": + + + + + + "; + + + foreach ($theme['css'] as $css) + { + + $text2 = ""; + + + + if($mode == 2) // ADMIN MODE + { + if($css['name'] == "style.css" || !vartrue($css['info'])) // Hide the admin css unless it has a header. eg. /* info: Default stylesheet */ + { + continue; + } + + if(!$css['nonadmin']) + { + $text2 = " + + + \n"; + } + } + + if($mode == 1) // SITE-THEME Mode + { + if(substr($css['name'], 0, 6) == "admin_") + { + continue; + } + + $text2 = " + + + \n"; + } + + $text .= ($text2) ? "".$text2."" : ""; + + } + + $text .= "
".TPVLAN_55."".TPVLAN_52."".TPVLAN_7."
". + $frm->radio('admincss', $css['name'], vartrue($pref['admincss'],"admin_style.css"))." + ".($css['info'] ? $css['info'] : ($css['name'] == "admin_style.css" ? TPVLAN_23 : TPVLAN_24))." + + ".$css['name']." + ".($css['info'] ? $css['info'] : ($css['name'] == "style.css" ? TPVLAN_23 : TPVLAN_24))."
". - $frm->radio('admincss', $css['name'], vartrue($pref['admincss'],"admin_style.css"))." - ".($css['info'] ? $css['info'] : ($css['name'] == "admin_style.css" ? TPVLAN_23 : TPVLAN_24))." - - ".$css['name']." - ".($css['info'] ? $css['info'] : ($css['name'] == "style.css" ? TPVLAN_23 : TPVLAN_24))."
+ + +
"; - } + if($mode == 2) // admin + { + $mainid = "selectmain[".$theme['id']."]"; + $text .= $this->frm->admin_button('submit_adminstyle', TPVLAN_35, 'update'); + $text .= $this->frm->admin_button($mainid, TPVLAN_10, 'other'); + + } + else // main + { + $adminid = "selectadmin[".$theme['id']."]"; + $text .= $this->frm->admin_button('submit_style', TPVLAN_35, 'update'); + $text .= $this->frm->admin_button($adminid, TPVLAN_32, 'other'); + } + + $text .= ""; - $text .= "
"; - } - - - if($mode == 1) - { - $text .= $this->renderThemeConfig(); - } - - $text .= " - - -
"; - - if($mode == 2) // admin - { - $mainid = "selectmain[".$theme['id']."]"; - $text .= $this->frm->admin_button('submit_adminstyle', TPVLAN_35, 'update'); - $text .= $this->frm->admin_button($mainid, TPVLAN_10, 'other'); - - } - else // main - { - $adminid = "selectadmin[".$theme['id']."]"; - $text .= $this->frm->admin_button('submit_style', TPVLAN_35, 'update'); - $text .= $this->frm->admin_button($adminid, TPVLAN_32, 'other'); - } - - $text .= ""; - - $text .= " -
- - - - - - -
".$this->renderThemeHelp()."
- + $text .= " + + +
".$this->renderThemeHelp()."
\n"; diff --git a/e107_plugins/download/handlers/adminDownload_class.php b/e107_plugins/download/handlers/adminDownload_class.php index ae92edccb..21a841d47 100644 --- a/e107_plugins/download/handlers/adminDownload_class.php +++ b/e107_plugins/download/handlers/adminDownload_class.php @@ -619,7 +619,7 @@ class adminDownload extends download $text = "
-
"; + + + "; // $ns->tablerender(ADLAN_24, $text); echo $text; } @@ -1938,16 +1942,17 @@ $columnInfo = array( ); $text = " -
-
+
- +
@@ -2022,10 +2027,10 @@ $columnInfo = array(
- -
+
+
- +
@@ -2044,10 +2049,10 @@ $columnInfo = array(
- -
+
+
- +
@@ -2058,12 +2063,13 @@ $columnInfo = array(
- +
- + + "; // $ns->tablerender(LAN_DL_OPTIONS, $text); echo $text;